From 725a3a8a10931d837a25008c9ae3a9bc637e3c1c Mon Sep 17 00:00:00 2001 From: Boblet Date: Wed, 26 Jun 2024 15:19:45 +0200 Subject: [PATCH] bedrock ore item autogen --- changelog | 2 + src/main/java/com/hbm/items/ModItems.java | 5 +- .../hbm/items/special/ItemBedrockOreNew.java | 133 ++++++++++++++++++ .../java/com/hbm/main/CraftingManager.java | 2 +- .../assets/hbm/textures/items/bedrock_ore.png | Bin 2400 -> 2968 bytes .../hbm/textures/items/bedrock_ore_final.png | Bin 0 -> 2606 bytes .../hbm/textures/items/wire_aluminium.png | Bin 397 -> 461 bytes 7 files changed, 140 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/hbm/items/special/ItemBedrockOreNew.java create mode 100644 src/main/resources/assets/hbm/textures/items/bedrock_ore_final.png diff --git a/changelog b/changelog index 0c583cd7e..64f839ba2 100644 --- a/changelog +++ b/changelog @@ -18,6 +18,8 @@ * Replaced recipes for the wind turbine and atomic disassembler * Added a config option for toggling Mekanism compat * Added recipe caching to the combinator funnel, meaning it no longer has to iterate over the entire recipe list all the time for compression/automation, this should improve performance by a fair bit +* Diodes now use silicon nuggets instead of nether quartz +* Aluminium wire's coloring is now consistent with the ingot ## Fixed * Fixed crash caused by PRISM updating unloaded worlds diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 801e6db41..95cf47526 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -213,6 +213,7 @@ public class ModItems { public static Item ore_seared; //public static Item ore_radcleaned; public static Item ore_enriched; //final stage + public static Item bedrock_ore; public static Item billet_uranium; public static Item billet_u233; @@ -1085,7 +1086,7 @@ public class ModItems { public static Item waste_u233; public static Item waste_u235; public static Item waste_schrabidium; - public static Item waste_zfb_mox; //TODO: remind me to smite these useless waste items and condense em like the rbmk waste + public static Item waste_zfb_mox; public static Item waste_plate_u233; public static Item waste_plate_u235; @@ -2720,6 +2721,7 @@ public class ModItems { ore_seared = new ItemBedrockOre().setUnlocalizedName("ore_seared").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ore_seared"); //ore_radcleaned = new ItemBedrockOre().setUnlocalizedName("ore_radcleaned").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ore_radcleaned"); ore_enriched = new ItemBedrockOre().setUnlocalizedName("ore_enriched").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ore_enriched"); + bedrock_ore = new ItemBedrockOreNew().setUnlocalizedName("bedrock_ore").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":bedrock_ore_base"); ingot_lanthanium = new ItemCustomLore().setUnlocalizedName("ingot_lanthanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_lanthanium"); ingot_actinium = new ItemCustomLore().setUnlocalizedName("ingot_actinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_actinium"); @@ -5940,6 +5942,7 @@ public class ModItems { //GameRegistry.registerItem(ore_radcleaned, ore_radcleaned.getUnlocalizedName()); GameRegistry.registerItem(ore_enriched, ore_enriched.getUnlocalizedName()); GameRegistry.registerItem(ore_byproduct, ore_byproduct.getUnlocalizedName()); + GameRegistry.registerItem(bedrock_ore, bedrock_ore.getUnlocalizedName()); //Crystals GameRegistry.registerItem(crystal_coal, crystal_coal.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java b/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java new file mode 100644 index 000000000..e8534972f --- /dev/null +++ b/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java @@ -0,0 +1,133 @@ +package com.hbm.items.special; + +import static com.hbm.inventory.OreDictManager.*; + +import java.util.List; + +import com.hbm.items.ModItems; +import com.hbm.util.EnumUtil; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import com.hbm.items.ItemEnums.EnumChunkType; +import com.hbm.lib.RefStrings; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +public class ItemBedrockOreNew extends Item { + + public IIcon[] icons = new IIcon[BedrockOreType.values().length * BedrockOreGrade.values().length]; + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister reg) { + super.registerIcons(reg); + + for(int i = 0; i < BedrockOreGrade.values().length; i++) { + BedrockOreGrade grade = BedrockOreGrade.values()[i]; + for(int j = 0; j < BedrockOreType.values().length; j++) { + BedrockOreType type = BedrockOreType.values()[j]; + this.icons[i * BedrockOreType.values().length + j] = reg.registerIcon(RefStrings.MODID + ":bedrock_ore_" + grade.prefix + "_" + type.suffix); + } + } + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tab, List list) { + + for(int i = 0; i < BedrockOreGrade.values().length; i++) { + BedrockOreGrade grade = BedrockOreGrade.values()[i]; + for(int j = 0; j < BedrockOreType.values().length; j++) { + BedrockOreType type = BedrockOreType.values()[j]; + list.add(this.make(grade, type)); + } + } + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamageForRenderPass(int meta, int pass) { + int icon = this.getGrade(meta).ordinal() * BedrockOreType.values().length + this.getType(meta).ordinal(); + return icons[Math.abs(icon % icons.length)]; + } + + public static enum BedrockOreType { + // primary sulfuric solvent radsolvent + LIGHT_METAL( "light", IRON, CU, TI, AL, AL, CHLOROCALCITE, LI, NA, CHLOROCALCITE, LI, NA), + HEAVY_METAL( "heavy", W, PB, GOLD, GOLD, BE, W, PB, GOLD, BI, BI, GOLD), + RARE_EARTH( "rare", CO, DictFrame.fromOne(ModItems.chunk_ore, EnumChunkType.RARE), B, LA, NB, ND, B, ZR, CO, ND, ZR), + ACTINIDE( "actinide", U, TH232, RA226, RA226, PO210, RA226, RA226, PO210, TC99, TC99, U238), + NON_METAL( "nonmetal", COAL, S, LIGNITE, KNO, F, P_RED, F, S, CHLOROCALCITE, SI, SI), + CRYSTALLINE( "crystal", DIAMOND, SODALITE, CINNABAR, ASBESTOS, REDSTONE, CINNABAR, ASBESTOS, EMERALD, BORAX, MOLYSITE, SODALITE); + + public String suffix; + public Object primary1, primary2; + public Object byproductAcid1, byproductAcid2, byproductAcid3; + public Object byproductSolvent1, byproductSolvent2, byproductSolvent3; + public Object byproductRad1, byproductRad2, byproductRad3; + + private BedrockOreType(String suffix, Object p1, Object p2, Object bA1, Object bA2, Object bA3, Object bS1, Object bS2, Object bS3, Object bR1, Object bR2, Object bR3) { + this.suffix = suffix; + this.primary1 = p1; this.primary2 = p2; + this.byproductAcid1 = bA1; this.byproductAcid2 = bA2; this.byproductAcid3 = bA3; + this.byproductSolvent1 = bS1; this.byproductSolvent2 = bS2; this.byproductSolvent3 = bS3; + this.byproductRad1 = bR1; this.byproductRad2 = bR2; this.byproductRad3 = bR3; + } + } + + public static enum BedrockOreGrade { + BASE("base"), //from the slopper + BASE_ROASTED("base"), //optional combination oven step, yields vitriol + BASE_WASHED("base"), //primitive-ass acidizer with water + PRIMARY("primary"), //centrifuging for more primary + PRIMARY_ROASTED("primary"), //optional comboven + PRIMARY_SULFURIC("primary"), //sulfuric acid + PRIMARY_NOSULFURIC("primary"), //from centrifuging, sulfuric byproduct removed + PRIMARY_SOLVENT("primary"), //solvent + PRIMARY_NOSOLVENT("primary"), //solvent byproduct removed + PRIMARY_RAD("primary"), //radsolvent + PRIMARY_NORAD("primary"), //radsolvent byproduct removed + PRIMARY_FIRST("primary"), //higher first material yield + PRIMARY_SECOND("primary"), //higher second material yield + CRUMBS("crumbs"), //endpoint for primary, recycling + + SULFURIC_BYPRODUCT("sulfuric"), //from centrifuging + SULFURIC_ROASTED("sulfuric"), //comboven again + SULFURIC_ARC("sulfuric"), //alternate step + SULFURIC_WASHED("sulfuric"), //sulfuric endpoint + + SOLVENT_BYPRODUCT("solvent"), //from centrifuging + SOLVENT_ROASTED("solvent"), //comboven again + SOLVENT_ARC("solvent"), //alternate step + SOLVENT_WASHED("solvent"), //solvent endpoint + + RAD_BYPRODUCT("rad"), //from centrifuging + RAD_ROASTED("rad"), //comboven again + RAD_ARC("rad"), //alternate step + RAD_WASHED("rad"); //rad endpoint + + public String prefix; + + private BedrockOreGrade(String prefix) { + this.prefix = prefix; + } + } + + public static ItemStack make(BedrockOreGrade grade, BedrockOreType type) { + return new ItemStack(ModItems.bedrock_ore, 1, grade.ordinal() << 4 | type.ordinal()); + } + + public BedrockOreGrade getGrade(int meta) { + return EnumUtil.grabEnumSafely(BedrockOreGrade.class, meta >> 4); + } + + public BedrockOreType getType(int meta) { + return EnumUtil.grabEnumSafely(BedrockOreType.class, meta & 15); + } +} diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index dab2e5e44..a349a3ac8 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -254,7 +254,7 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModBlocks.red_cable_paintable, 16), new Object[] { "WRW", "RIR", "WRW", 'W', STEEL.plate(), 'I', MINGRADE.ingot(), 'R', MINGRADE.wireFine() }); addRecipeAuto(new ItemStack(ModBlocks.cable_switch, 1), new Object[] { "S", "W", 'S', Blocks.lever, 'W', ModBlocks.red_wire_coated }); addRecipeAuto(new ItemStack(ModBlocks.cable_detector, 1), new Object[] { "S", "W", 'S', REDSTONE.dust(), 'W', ModBlocks.red_wire_coated }); - addRecipeAuto(new ItemStack(ModBlocks.cable_diode, 1), new Object[] { " Q ", "CAC", " Q ", 'Q', NETHERQUARTZ.gem(), 'C', ModBlocks.red_cable, 'A', AL.ingot() }); + addRecipeAuto(new ItemStack(ModBlocks.cable_diode, 1), new Object[] { " Q ", "CAC", " Q ", 'Q', SI.nugget(), 'C', ModBlocks.red_cable, 'A', AL.ingot() }); addRecipeAuto(new ItemStack(ModBlocks.machine_detector, 1), new Object[] { "IRI", "CTC", "IRI", 'I', ModItems.plate_polymer, 'R', REDSTONE.dust(), 'C', MINGRADE.wireFine(), 'T', ModItems.coil_tungsten }); addRecipeAuto(new ItemStack(ModBlocks.red_cable, 16), new Object[] { " W ", "RRR", " W ", 'W', ModItems.plate_polymer, 'R', MINGRADE.wireFine() }); addShapelessAuto(new ItemStack(ModBlocks.red_cable_classic, 1), new Object[] { ModBlocks.red_cable }); diff --git a/src/main/resources/assets/hbm/textures/items/bedrock_ore.png b/src/main/resources/assets/hbm/textures/items/bedrock_ore.png index e2687f007dd40c69db4a4dd9f1c0ffa480cc046a..e62d194c0add58a16bc781470bf8876dda628bdd 100644 GIT binary patch literal 2968 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 O0000 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 Q0ssI207*qoM6N<$g7}dcN&o-= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/wire_aluminium.png b/src/main/resources/assets/hbm/textures/items/wire_aluminium.png index e4c210ec1c941721a6c03056aa321efbe0c709f6..a3ff6c135709fcc39df6418938d83f22fb891b64 100644 GIT binary patch delta 434 zcmV;j0Zsmm1I+`FC4X~5NmK|32nc)#WQYI&0fb3JK~y-6rBY2x0#Ot_qvHpP%*I6_ zR0J)Gpg-fPUC<&h3W^p%(ZY6-D}@$8Ah>ZUy6`u&iZt`1u^Pur8w<$+XXedq7udWk z>MZX)AMYL>@J|T5VO8l85y7%7`2BtuhJmHIX)agfiF3Ie7=L5%dc7D72Cys(C0QlL z7*-Z$gl`Qh4;{+q^Vo~6JJLd-5SgZl%0q`1XQ#NY!R_NS#ZQwo;bfGX?TLHTTD@-x zwN~%P00&C4N>}wqsw!PdoLxA?+*=gwo%;Pgg25ot=`;d?0Nidjx0|s+Rq2vxnkWIC>+RZSBfXd9sEwZ#9(*6b3Ie*VHP18hO*U`3ZGze zTmV>><*@)_*9HoK!)teF15K`R#dzU7PmzQRn5HQNg|Hk~G0+7aAsD)S(*t-vj^hw2 zJC4I9wQWmPRcg_?uDk~5EC*yDDF^}z!%#pj@+M*APeo+NKT`={1qg>*bKkctOK}ZZ zP=x@vt}8^eEQ|Ji7gOOXbzKWTR*?Bh@)fv(VHlL>ITc00u6J|%4Vv}~N-wpkRk{=< P00000NkvXXu0mjfaiW(C