diff --git a/changelog b/changelog index da1014a41..734a5925e 100644 --- a/changelog +++ b/changelog @@ -2,7 +2,8 @@ * Updated russian localization * Nerfed conventional explosives (dynamite, TNT, semtex, C4) in order to not outclass small nukes * Plastic explosive blocks no longer drop and blocks +* Sellafite diamond ore now shreds into diamond gravel ## Fixed -* Fixed missing localization for meteorite ores +* Fixed missing localization for meteorite ores and the new crucible materials * Removed the starmetal crystallization recipe, despite starmetal ore no longer existing diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index ebd11b692..eab0811e6 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -65,6 +65,8 @@ public class MineralRecipes { addMineralSet(ModItems.nugget_zirconium, ModItems.ingot_zirconium, ModBlocks.block_zirconium); addMineralSet(ModItems.nugget_dineutronium, ModItems.ingot_dineutronium, ModBlocks.block_dineutronium); addMineralSet(ModItems.nuclear_waste_vitrified_tiny, ModItems.nuclear_waste_vitrified, ModBlocks.block_waste_vitrified); + + add1To9Pair(ModItems.ingot_silicon, ModItems.nugget_silicon); add1To9Pair(ModItems.powder_boron, ModItems.powder_boron_tiny); add1To9Pair(ModItems.powder_sr90, ModItems.powder_sr90_tiny); @@ -129,8 +131,8 @@ public class MineralRecipes { addBillet(ModItems.billet_pb209, ModItems.ingot_pb209, ModItems.nugget_pb209, PB209.allNuggets()); //and so forth addBillet(ModItems.billet_ra226, ModItems.ingot_ra226, ModItems.nugget_ra226, RA226.allNuggets()); addBillet(ModItems.billet_actinium, ModItems.ingot_actinium, ModItems.nugget_actinium, AC227.allNuggets()); - addBillet(ModItems.billet_schrabidium, ModItems.ingot_schrabidium, ModItems.nugget_schrabidium, "nuggetSchrabidium"); - addBillet(ModItems.billet_solinium, ModItems.ingot_solinium, ModItems.nugget_solinium, "nuggetSolinium"); + addBillet(ModItems.billet_schrabidium, ModItems.ingot_schrabidium, ModItems.nugget_schrabidium, SA326.nugget()); + addBillet(ModItems.billet_solinium, ModItems.ingot_solinium, ModItems.nugget_solinium, SA327.nugget()); addBillet(ModItems.billet_gh336, ModItems.ingot_gh336, ModItems.nugget_gh336, GH336.allNuggets()); addBillet(ModItems.billet_uranium_fuel, ModItems.ingot_uranium_fuel, ModItems.nugget_uranium_fuel); addBillet(ModItems.billet_thorium_fuel, ModItems.ingot_thorium_fuel, ModItems.nugget_thorium_fuel); @@ -147,6 +149,7 @@ public class MineralRecipes { addBillet(ModItems.billet_beryllium, ModItems.ingot_beryllium, ModItems.nugget_beryllium, BE.nugget()); addBillet(ModItems.billet_zirconium, ModItems.ingot_zirconium, ModItems.nugget_zirconium, ZR.nugget()); addBillet(ModItems.billet_bismuth, ModItems.ingot_bismuth, ModItems.nugget_bismuth); + addBillet(ModItems.billet_silicon, ModItems.ingot_silicon, ModItems.nugget_silicon, SI.nugget()); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.billet_thorium_fuel, 6), new Object[] { ModItems.billet_th232, ModItems.billet_th232, ModItems.billet_th232, ModItems.billet_th232, ModItems.billet_th232, ModItems.billet_u233 }); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.billet_thorium_fuel, 1), new Object[] { "nuggetThorium232", "nuggetThorium232", "nuggetThorium232", "nuggetThorium232", "nuggetThorium232", "nuggetUranium233" })); diff --git a/src/main/java/com/hbm/inventory/OreDictManager.java b/src/main/java/com/hbm/inventory/OreDictManager.java index bddf26473..e7159dd8c 100644 --- a/src/main/java/com/hbm/inventory/OreDictManager.java +++ b/src/main/java/com/hbm/inventory/OreDictManager.java @@ -185,6 +185,8 @@ public class OreDictManager { public static final DictFrame CO = new DictFrame("Cobalt"); /** BORON */ public static final DictFrame B = new DictFrame("Boron"); + /** SILICON */ + public static final DictFrame SI = new DictFrame("Silicon"); public static final DictFrame GRAPHITE = new DictFrame("Graphite"); public static final DictFrame DURA = new DictFrame("DuraSteel"); public static final DictFrame POLYMER = new DictFrame("Polymer"); @@ -382,6 +384,7 @@ public class OreDictManager { BE .nugget(nugget_beryllium) .billet(billet_beryllium) .ingot(ingot_beryllium) .dust(powder_beryllium) .block(block_beryllium) .ore(ore_beryllium); CO .nugget(fragment_cobalt) .nugget(nugget_cobalt) .billet(billet_cobalt) .ingot(ingot_cobalt) .dust(powder_cobalt) .dustSmall(powder_cobalt_tiny) .block(block_cobalt) .ore(ore_cobalt, ore_nether_cobalt); B .nugget(fragment_boron) .ingot(ingot_boron) .dustSmall(powder_boron_tiny) .dust(powder_boron) .block(block_boron); + SI .nugget(nugget_silicon) .billet(billet_silicon) .ingot(ingot_silicon); GRAPHITE .ingot(ingot_graphite) .block(block_graphite); DURA .ingot(ingot_dura_steel) .dust(powder_dura_steel) .plate(plate_dura_steel) .block(block_dura_steel); POLYMER .ingot(ingot_polymer) .dust(powder_polymer) .block(block_polymer); diff --git a/src/main/java/com/hbm/inventory/material/Mats.java b/src/main/java/com/hbm/inventory/material/Mats.java index 803d934ca..67427e03e 100644 --- a/src/main/java/com/hbm/inventory/material/Mats.java +++ b/src/main/java/com/hbm/inventory/material/Mats.java @@ -114,6 +114,7 @@ public class Mats { public static final NTMMaterial MAT_CALCIUM = makeSmeltable(2000, CA, 0xCFCFA6, 0x747F6E, 0xB7B784).setShapes(INGOT, DUST); public static final NTMMaterial MAT_LITHIUM = makeSmeltable(300, LI, 0xFFFFFF, 0x818181, 0xD6D6D6).setShapes(INGOT, DUST, BLOCK); public static final NTMMaterial MAT_CADMIUM = makeSmeltable(4800, CD, 0xFFFADE, 0x350000, 0xA85600).setShapes(INGOT, DUST); + public static final NTMMaterial MAT_SILICON = makeSmeltable(1400, SI, 0xD1D7DF, 0x1A1A3D, 0x878B9E).setShapes(NUGGET, BILLET, INGOT); public static final NTMMaterial MAT_OSMIRIDIUM = makeSmeltable(7699, OSMIRIDIUM, 0xDBE3EF, 0x7891BE, 0xACBDD9).setShapes(NUGGET, INGOT, CASTPLATE, WELDEDPLATE); //Alloys diff --git a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java index 57aef7644..74de1cc03 100644 --- a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java @@ -194,6 +194,7 @@ public class ShredderRecipes extends SerializableRecipe { ShredderRecipes.setRecipe(ModBlocks.meteor_pillar, new ItemStack(ModItems.powder_meteorite, 1)); ShredderRecipes.setRecipe(ModBlocks.ore_rare, new ItemStack(ModItems.powder_desh_mix, 1)); ShredderRecipes.setRecipe(Blocks.diamond_ore, new ItemStack(ModBlocks.gravel_diamond, 2)); + ShredderRecipes.setRecipe(ModBlocks.ore_sellafield_diamond, new ItemStack(ModBlocks.gravel_diamond, 2)); ShredderRecipes.setRecipe(ModBlocks.boxcar, new ItemStack(ModItems.powder_steel, 32)); ShredderRecipes.setRecipe(ModItems.ingot_schrabidate, new ItemStack(ModItems.powder_schrabidate, 1)); ShredderRecipes.setRecipe(ModBlocks.block_schrabidate, new ItemStack(ModItems.powder_schrabidate, 9)); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index ce398a5a8..4b91dd80f 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -307,6 +307,9 @@ public class ModItems { public static Item nugget_arsenic; public static Item ingot_tantalium; public static Item nugget_tantalium; + public static Item ingot_silicon; + public static Item billet_silicon; + public static Item nugget_silicon; public static Item ingot_niobium; public static Item ingot_osmiridium; public static Item nugget_osmiridium; @@ -2804,6 +2807,9 @@ public class ModItems { nugget_arsenic = new Item().setUnlocalizedName("nugget_arsenic").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_arsenic"); ingot_tantalium = new ItemCustomLore().setUnlocalizedName("ingot_tantalium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_tantalium"); nugget_tantalium = new ItemCustomLore().setUnlocalizedName("nugget_tantalium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_tantalium"); + ingot_silicon = new Item().setUnlocalizedName("ingot_silicon").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_silicon"); + billet_silicon = new Item().setUnlocalizedName("billet_silicon").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":billet_silicon"); + nugget_silicon = new Item().setUnlocalizedName("nugget_silicon").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_silicon"); ingot_niobium = new Item().setUnlocalizedName("ingot_niobium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_niobium"); ingot_osmiridium = new ItemCustomLore().setRarity(EnumRarity.rare).setUnlocalizedName("ingot_osmiridium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_osmiridium"); nugget_osmiridium = new ItemCustomLore().setRarity(EnumRarity.rare).setUnlocalizedName("nugget_osmiridium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_osmiridium"); @@ -5654,6 +5660,7 @@ public class ModItems { GameRegistry.registerItem(ingot_calcium, ingot_calcium.getUnlocalizedName()); GameRegistry.registerItem(ingot_cadmium, ingot_cadmium.getUnlocalizedName()); GameRegistry.registerItem(ingot_tantalium, ingot_tantalium.getUnlocalizedName()); + GameRegistry.registerItem(ingot_silicon, ingot_silicon.getUnlocalizedName()); GameRegistry.registerItem(ingot_niobium, ingot_niobium.getUnlocalizedName()); GameRegistry.registerItem(ingot_beryllium, ingot_beryllium.getUnlocalizedName()); GameRegistry.registerItem(ingot_cobalt, ingot_cobalt.getUnlocalizedName()); @@ -5772,6 +5779,7 @@ public class ModItems { GameRegistry.registerItem(billet_pu238be, billet_pu238be.getUnlocalizedName()); GameRegistry.registerItem(billet_beryllium, billet_beryllium.getUnlocalizedName()); GameRegistry.registerItem(billet_bismuth, billet_bismuth.getUnlocalizedName()); + GameRegistry.registerItem(billet_silicon, billet_silicon.getUnlocalizedName()); GameRegistry.registerItem(billet_zirconium, billet_zirconium.getUnlocalizedName()); GameRegistry.registerItem(billet_zfb_bismuth, billet_zfb_bismuth.getUnlocalizedName()); GameRegistry.registerItem(billet_zfb_pu241, billet_zfb_pu241.getUnlocalizedName()); @@ -6016,6 +6024,7 @@ public class ModItems { GameRegistry.registerItem(nugget_bismuth, nugget_bismuth.getUnlocalizedName()); GameRegistry.registerItem(nugget_arsenic, nugget_arsenic.getUnlocalizedName()); GameRegistry.registerItem(nugget_tantalium, nugget_tantalium.getUnlocalizedName()); + GameRegistry.registerItem(nugget_silicon, nugget_silicon.getUnlocalizedName()); GameRegistry.registerItem(nugget_beryllium, nugget_beryllium.getUnlocalizedName()); GameRegistry.registerItem(nugget_schrabidium, nugget_schrabidium.getUnlocalizedName()); GameRegistry.registerItem(nugget_solinium, nugget_solinium.getUnlocalizedName()); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 9b1629a20..f8f285c8b 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -805,6 +805,7 @@ hbmmat.bismuthbronze=Bismutbronze hbmmat.borax=Borax hbmmat.boron=Bor hbmmat.cadmium=Cadmium +hbmmat.calcium=Kalzium hbmmat.carbon=Kohlenstoff hbmmat.cdalloy=Cadmiumstahl hbmmat.cinnabar=Zinnober @@ -864,7 +865,9 @@ hbmmat.saturnite=Saturnit hbmmat.schrabidate=Eisenschrabidat hbmmat.schrabidium=Schrabidium hbmmat.schraranium=Schraranium +hbmmat.silicon=Silizium hbmmat.slag=Schlacke +hbmmat.sodium=Natrium hbmmat.solinium=Solinium hbmmat.starmetal=Sternenmetall hbmmat.steel=Stahl @@ -1281,6 +1284,7 @@ item.billet_plutonium_fuel.name=Plutoniumkernbrennstoffbillet item.billet_ra226be.name=Ra226Be-Billet item.billet_schrabidium.name=Schrabidiumbillet item.billet_schrabidium_fuel.name=Schrabidiumkernbrennstoffbillet +item.billet_silicon.name=Siliziumwafer item.billet_solinium.name=Soliniumbillet item.billet_technetium.name=Technetium-99-Billet item.billet_th232.name=Thorium-232-Billet @@ -2206,6 +2210,7 @@ item.ingot_schrabidium.name=Schrabidiumbarren item.ingot_schrabidium_fuel.name=Schrabidiumkernbrennstoffbarren item.ingot_schraranium.name=Schraraniumbarren item.ingot_semtex.name=Semtextafel +item.ingot_silicon.name=Siliziumboule item.ingot_smore.name=S'morebarren item.ingot_solinium.name=Soliniumbarren item.ingot_starmetal.name=§9Sternenmetallbarren§r @@ -2582,6 +2587,7 @@ item.nugget_ra226.name=Radium-226-Nugget item.nugget_reiium.name=Reiiumnugget item.nugget_schrabidium.name=Schrabidiumnugget item.nugget_schrabidium_fuel.name=Schrabidiumkernbrennstoffnugget +item.nugget_silicon.name=Siliziumnugget item.nugget_solinium.name=Soliniumnugget item.nugget_tantalium.name=Tantalnugget item.nugget_technetium.name=Technetium-99-Nugget diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index f12535574..7cf1c2154 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -1507,6 +1507,7 @@ hbmmat.bismuthbronze=Bismuth Bronze hbmmat.borax=Borax hbmmat.boron=Boron hbmmat.cadmium=Cadmium +hbmmat.calcium=Calcium hbmmat.carbon=Carbon hbmmat.cdalloy=Cadmium Steel hbmmat.cinnabar=Cinnabar @@ -1566,7 +1567,9 @@ hbmmat.saturnite=Saturnite hbmmat.schrabidate=Ferric Schrabidate hbmmat.schrabidium=Schrabidium hbmmat.schraranium=Schraranium +hbmmat.silicon=Silicon hbmmat.slag=Slag +hbmmat.sodium=Sodium hbmmat.solinium=Solinium hbmmat.starmetal=Starmetal hbmmat.steel=Steel @@ -1994,6 +1997,7 @@ item.billet_ra226.name=Radium-226 Billet item.billet_ra226be.name=Ra226Be Billet item.billet_schrabidium.name=Schrabidium Billet item.billet_schrabidium_fuel.name=Schrabidium Fuel Billet +item.billet_silicon.name=Silicon Wafer item.billet_solinium.name=Solinium Billet item.billet_sr90.name=Strontium-90 Billet item.billet_technetium.name=Technetium-99 Billet @@ -3002,6 +3006,7 @@ item.ingot_schrabidium_fuel.name=Ingot of Schrabidium Fuel item.ingot_schraranium.name=Schraranium Ingot item.ingot_schraranium.desc=Made from uranium in a schrabidium transmutator item.ingot_semtex.name=Bar of Semtex +item.ingot_silicon.name=Silicon Boule item.ingot_smore.name=S'more Ingot item.ingot_solinium.name=Solinium Ingot item.ingot_sr90.name=Strontium-90 Ingot @@ -3396,6 +3401,7 @@ item.nugget_ra226.name=Radium-226 Nugget item.nugget_reiium.name=Reiium Nugget item.nugget_schrabidium.name=Schrabidium Nugget item.nugget_schrabidium_fuel.name=Nugget of Schrabidium Fuel +item.nugget_silicon.name=Silicon Nugget item.nugget_solinium.name=Solinium Nugget item.nugget_sr90.name=Strontium-90 Nugget item.nugget_tantalium.name=Tantalium Nugget diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_arc_furnace.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_arc_furnace.png new file mode 100644 index 000000000..e40997e29 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/processing/gui_arc_furnace.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_electrolyser_metal.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_electrolyser_metal.png index 0de879b3d..901353cf1 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/processing/gui_electrolyser_metal.png and b/src/main/resources/assets/hbm/textures/gui/processing/gui_electrolyser_metal.png differ diff --git a/src/main/resources/assets/hbm/textures/gui/processing/gui_soldering_station.png b/src/main/resources/assets/hbm/textures/gui/processing/gui_soldering_station.png new file mode 100644 index 000000000..69c16866b Binary files /dev/null and b/src/main/resources/assets/hbm/textures/gui/processing/gui_soldering_station.png differ diff --git a/src/main/resources/assets/hbm/textures/items/billet_silicon.png b/src/main/resources/assets/hbm/textures/items/billet_silicon.png new file mode 100644 index 000000000..7bafa26dd Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/billet_silicon.png differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit.advanced.png b/src/main/resources/assets/hbm/textures/items/circuit.advanced.png index 9a63ae15f..50757c873 100644 Binary files a/src/main/resources/assets/hbm/textures/items/circuit.advanced.png and b/src/main/resources/assets/hbm/textures/items/circuit.advanced.png differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit.bismoid.png b/src/main/resources/assets/hbm/textures/items/circuit.bismoid.png new file mode 100644 index 000000000..45055b103 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/circuit.bismoid.png differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit.capacitor_board.png b/src/main/resources/assets/hbm/textures/items/circuit.capacitor_board.png new file mode 100644 index 000000000..055731f1b Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/circuit.capacitor_board.png differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit.capacitor_tantalium.png b/src/main/resources/assets/hbm/textures/items/circuit.capacitor_tantalium.png new file mode 100644 index 000000000..117b2232f Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/circuit.capacitor_tantalium.png differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit.chip_bismoid.png b/src/main/resources/assets/hbm/textures/items/circuit.chip_bismoid.png new file mode 100644 index 000000000..3783133d4 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/circuit.chip_bismoid.png differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit.png b/src/main/resources/assets/hbm/textures/items/circuit.png index 2db45236a..811b8583c 100644 Binary files a/src/main/resources/assets/hbm/textures/items/circuit.png and b/src/main/resources/assets/hbm/textures/items/circuit.png differ diff --git a/src/main/resources/assets/hbm/textures/items/ingot_silicon.png b/src/main/resources/assets/hbm/textures/items/ingot_silicon.png new file mode 100644 index 000000000..b4dee7e60 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/ingot_silicon.png differ diff --git a/src/main/resources/assets/hbm/textures/items/nugget_silicon.png b/src/main/resources/assets/hbm/textures/items/nugget_silicon.png new file mode 100644 index 000000000..1c91cf6a4 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/nugget_silicon.png differ