diff --git a/changelog b/changelog index b2534b4d8..e3f002b80 100644 --- a/changelog +++ b/changelog @@ -10,7 +10,7 @@ ## Changed * Bedrock ores now spawn in the nether - * Nether bedrock ores include red phosphorus and glowstone, both yielding powders instead of ores + * Nether bedrock ores include red phosphorus, quartz and glowstone, all yielding the items directly instead of ores * All current nether bedrock ores are tier 1 and do not require any bore fluid * Custom machines now show their recipes in NEI * All it took was battling NEI's source code for 3 hours and my sanity @@ -18,6 +18,8 @@ * Mixed chlorocalcite solution now requires flux as a reducing agent * All chlorine producing electrolysis recipes have been moved to the electrolysis machine and can no longer be done in the chemical plant * If only there was a much simpler recipe that may have existed at some point, life could be a dream +* Zirconium and lithium are now recognized crucible materials +* Glowstone now yields 100mB of chlorine in the combination oven instead of the initial 50mB ## Fixed * Fixed custom machines not sending fluid diff --git a/gradle.properties b/gradle.properties index fb976de9d..f40234eee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_version=1.0.27 # Empty build number makes a release type -mod_build_number=4671 +mod_build_number=4683 credits=HbMinecraft, rodolphito (explosion algorithms), grangerave (explosion algorithms),\ \ Hoboy (textures, models), Doctor17 (russian localization), Drillgon200 (effects, models,\ diff --git a/src/main/java/com/hbm/config/WorldConfig.java b/src/main/java/com/hbm/config/WorldConfig.java index c2ac4bbb3..7e389cec0 100644 --- a/src/main/java/com/hbm/config/WorldConfig.java +++ b/src/main/java/com/hbm/config/WorldConfig.java @@ -50,6 +50,7 @@ public class WorldConfig { public static int bedrockRedstoneSpawn = 50; public static int bedrockGlowstoneSpawn = 100; public static int bedrockPhosphorusSpawn = 50; + public static int bedrockQuartzSpawn = 100; public static int ironClusterSpawn = 4; public static int titaniumClusterSpawn = 2; @@ -159,6 +160,7 @@ public class WorldConfig { bedrockGlowstoneSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.BN00_bedrockGlowstoneWeight", "Spawn weight for glowstone bedrock ore", 100); bedrockPhosphorusSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.BN01_bedrockPhosphorusWeight", "Spawn weight for phosphorus bedrock ore", 50); + bedrockQuartzSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.BN01_bedrockQuartzWeight", "Spawn weight for quartz bedrock ore", 100); ironClusterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.C00_ironClusterSpawn", "Amount of iron cluster veins per chunk", 4); titaniumClusterSpawn = CommonConfig.createConfigInt(config, CATEGORY_OREGEN, "2.C01_titaniumClusterSpawn", "Amount of titanium cluster veins per chunk", 2); diff --git a/src/main/java/com/hbm/inventory/material/Mats.java b/src/main/java/com/hbm/inventory/material/Mats.java index 58ccaad64..b4adf18aa 100644 --- a/src/main/java/com/hbm/inventory/material/Mats.java +++ b/src/main/java/com/hbm/inventory/material/Mats.java @@ -106,6 +106,8 @@ public class Mats { public static final NTMMaterial MAT_BERYLLIUM = makeSmeltable(400, BE, 0xB2B2A6, 0x0F0F03, 0xAE9572).setShapes(NUGGET, INGOT, DUST, BLOCK); public static final NTMMaterial MAT_COBALT = makeSmeltable(2700, CO, 0xC2D1EE, 0x353554, 0x8F72AE).setShapes(NUGGET, DUSTTINY, BILLET, INGOT, DUST, BLOCK); public static final NTMMaterial MAT_BORON = makeSmeltable(500, B, 0xBDC8D2, 0x29343E, 0xAD72AE).setShapes(DUSTTINY, INGOT, DUST, BLOCK); + public static final NTMMaterial MAT_ZIRCONIUM = makeSmeltable(4000, ZR, 0xE3DCBE, 0x3E3719, 0xADA688).setShapes(NUGGET, DUSTTINY, BILLET, INGOT, DUST, CASTPLATE, BLOCK); + 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_OSMIRIDIUM = makeSmeltable(7699, OSMIRIDIUM, 0xDBE3EF, 0x7891BE, 0xACBDD9).setShapes(NUGGET, INGOT, CASTPLATE); diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index de0d35584..2c37aaa5d 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -1001,6 +1001,16 @@ public class AssemblerRecipes { new ComparableStack(ModItems.motor, 3), new ComparableStack(ModItems.circuit_red_copper, 1) }, 200); + + makeRecipe(new ComparableStack(ModBlocks.machine_electrolyser, 1), new AStack[] { + new OreDictStack(STEEL.plateCast(), 8), + new OreDictStack(CU.plate528(), 16), + new OreDictStack(RUBBER.ingot(), 8), + new ComparableStack(ModItems.ingot_firebrick, 16), + new ComparableStack(ModItems.tank_steel, 3), + new ComparableStack(ModItems.coil_copper, 16), + new ComparableStack(ModItems.circuit_gold, 2) + }, 200); makeRecipe(new ComparableStack(ModItems.euphemium_capacitor, 1), new AStack[] { diff --git a/src/main/java/com/hbm/inventory/recipes/CombinationRecipes.java b/src/main/java/com/hbm/inventory/recipes/CombinationRecipes.java index f1d5d7658..a84cae509 100644 --- a/src/main/java/com/hbm/inventory/recipes/CombinationRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/CombinationRecipes.java @@ -37,7 +37,6 @@ public class CombinationRecipes extends SerializableRecipe { recipes.put(COAL.gem(), new Pair(DictFrame.fromOne(ModItems.coke, EnumCokeType.COAL), new FluidStack(Fluids.COALCREOSOTE, 100))); recipes.put(COAL.dust(), new Pair(DictFrame.fromOne(ModItems.coke, EnumCokeType.COAL), new FluidStack(Fluids.COALCREOSOTE, 100))); recipes.put(new ComparableStack(DictFrame.fromOne(ModItems.briquette, EnumBriquetteType.COAL)), new Pair(DictFrame.fromOne(ModItems.coke, EnumCokeType.COAL), new FluidStack(Fluids.COALCREOSOTE, 150))); - recipes.put(LIGNITE.gem(), new Pair(DictFrame.fromOne(ModItems.coke, EnumCokeType.LIGNITE), new FluidStack(Fluids.COALCREOSOTE, 50))); recipes.put(LIGNITE.dust(), new Pair(DictFrame.fromOne(ModItems.coke, EnumCokeType.LIGNITE), new FluidStack(Fluids.COALCREOSOTE, 50))); @@ -45,7 +44,7 @@ public class CombinationRecipes extends SerializableRecipe { recipes.put(CINNABAR.crystal(), new Pair(new ItemStack(ModItems.sulfur), new FluidStack(Fluids.MERCURY, 100))); //recipes.put(CHLOROCALCITE.dust(), new Pair(new ItemStack(ModItems.powder_calcium), new FluidStack(Fluids.CHLORINE, 250))); - recipes.put(new ComparableStack(Items.glowstone_dust), new Pair(new ItemStack(ModItems.sulfur), new FluidStack(Fluids.CHLORINE, 50))); + recipes.put(new ComparableStack(Items.glowstone_dust), new Pair(new ItemStack(ModItems.sulfur), new FluidStack(Fluids.CHLORINE, 100))); recipes.put(new ComparableStack(DictFrame.fromOne(ModBlocks.stone_resource, EnumStoneType.BAUXITE)), new Pair(new ItemStack(ModItems.ingot_aluminium, 2), new FluidStack(Fluids.REDMUD, 250))); recipes.put(KEY_LOG, new Pair(new ItemStack(Items.coal, 1 ,1), new FluidStack(Fluids.WOODOIL, 250))); diff --git a/src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java b/src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java index 781d7a1da..aabebb3a4 100644 --- a/src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ElectrolyserMetalRecipes.java @@ -35,12 +35,99 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe { recipes.put(new ComparableStack(ModItems.crystal_iron), new ElectrolysisMetalRecipe( new MaterialStack(Mats.MAT_IRON, MaterialShapes.INGOT.q(6)), new MaterialStack(Mats.MAT_TITANIUM, MaterialShapes.INGOT.q(2)), - new ItemStack(ModItems.powder_lithium_tiny, 1))); + new ItemStack(ModItems.powder_lithium_tiny, 3))); + recipes.put(new ComparableStack(ModItems.crystal_gold), new ElectrolysisMetalRecipe( - new MaterialStack(Mats.MAT_IRON, MaterialShapes.INGOT.q(6)), + new MaterialStack(Mats.MAT_GOLD, MaterialShapes.INGOT.q(6)), new MaterialStack(Mats.MAT_LEAD, MaterialShapes.INGOT.q(2)), - new ItemStack(ModItems.powder_lithium_tiny, 1), - new ItemStack(ModItems.ingot_mercury, 1))); + new ItemStack(ModItems.powder_lithium_tiny, 3), + new ItemStack(ModItems.ingot_mercury, 2))); + + recipes.put(new ComparableStack(ModItems.crystal_uranium), new ElectrolysisMetalRecipe( + new MaterialStack(Mats.MAT_URANIUM, MaterialShapes.INGOT.q(6)), + new MaterialStack(Mats.MAT_RADIUM, MaterialShapes.NUGGET.q(4)), + new ItemStack(ModItems.powder_lithium_tiny, 3))); + + recipes.put(new ComparableStack(ModItems.crystal_thorium), new ElectrolysisMetalRecipe( + new MaterialStack(Mats.MAT_THORIUM, MaterialShapes.INGOT.q(6)), + new MaterialStack(Mats.MAT_URANIUM, MaterialShapes.INGOT.q(2)), + new ItemStack(ModItems.powder_lithium_tiny, 3))); + + recipes.put(new ComparableStack(ModItems.crystal_plutonium), new ElectrolysisMetalRecipe( + new MaterialStack(Mats.MAT_PLUTONIUM, MaterialShapes.INGOT.q(6)), + new MaterialStack(Mats.MAT_POLONIUM, MaterialShapes.INGOT.q(2)), + new ItemStack(ModItems.powder_lithium_tiny, 3))); + + recipes.put(new ComparableStack(ModItems.crystal_titanium), new ElectrolysisMetalRecipe( + new MaterialStack(Mats.MAT_TITANIUM, MaterialShapes.INGOT.q(6)), + new MaterialStack(Mats.MAT_IRON, MaterialShapes.INGOT.q(2)), + new ItemStack(ModItems.powder_lithium_tiny, 3))); + + recipes.put(new ComparableStack(ModItems.crystal_copper), new ElectrolysisMetalRecipe( + new MaterialStack(Mats.MAT_COPPER, MaterialShapes.INGOT.q(6)), + new MaterialStack(Mats.MAT_LEAD, MaterialShapes.NUGGET.q(4)), + new ItemStack(ModItems.powder_lithium_tiny, 3), + new ItemStack(ModItems.sulfur, 2))); + + recipes.put(new ComparableStack(ModItems.crystal_tungsten), new ElectrolysisMetalRecipe( + new MaterialStack(Mats.MAT_TUNGSTEN, MaterialShapes.INGOT.q(6)), + new MaterialStack(Mats.MAT_IRON, MaterialShapes.INGOT.q(2)), + new ItemStack(ModItems.powder_lithium_tiny, 3))); + + recipes.put(new ComparableStack(ModItems.crystal_aluminium), new ElectrolysisMetalRecipe( + new MaterialStack(Mats.MAT_ALUMINIUM, MaterialShapes.INGOT.q(6)), + new MaterialStack(Mats.MAT_IRON, MaterialShapes.INGOT.q(2)), + new ItemStack(ModItems.powder_lithium_tiny, 3))); + + recipes.put(new ComparableStack(ModItems.crystal_beryllium), new ElectrolysisMetalRecipe( + new MaterialStack(Mats.MAT_BERYLLIUM, MaterialShapes.INGOT.q(6)), + new MaterialStack(Mats.MAT_LEAD, MaterialShapes.NUGGET.q(4)), + new ItemStack(ModItems.powder_lithium_tiny, 3), + new ItemStack(ModItems.powder_quartz, 2))); + + recipes.put(new ComparableStack(ModItems.crystal_lead), new ElectrolysisMetalRecipe( + new MaterialStack(Mats.MAT_LEAD, MaterialShapes.INGOT.q(6)), + new MaterialStack(Mats.MAT_GOLD, MaterialShapes.INGOT.q(2)), + new ItemStack(ModItems.powder_lithium_tiny, 3))); + + recipes.put(new ComparableStack(ModItems.crystal_schraranium), new ElectrolysisMetalRecipe( + new MaterialStack(Mats.MAT_SCHRABIDIUM, MaterialShapes.NUGGET.q(5)), + new MaterialStack(Mats.MAT_URANIUM, MaterialShapes.NUGGET.q(2)), + new ItemStack(ModItems.nugget_plutonium, 2))); + + recipes.put(new ComparableStack(ModItems.crystal_schrabidium), new ElectrolysisMetalRecipe( + new MaterialStack(Mats.MAT_SCHRABIDIUM, MaterialShapes.INGOT.q(6)), + new MaterialStack(Mats.MAT_PLUTONIUM, MaterialShapes.INGOT.q(2)), + new ItemStack(ModItems.powder_lithium_tiny, 3))); + + recipes.put(new ComparableStack(ModItems.crystal_rare), new ElectrolysisMetalRecipe( + new MaterialStack(Mats.MAT_ZIRCONIUM, MaterialShapes.NUGGET.q(6)), + new MaterialStack(Mats.MAT_BORON, MaterialShapes.NUGGET.q(2)), + new ItemStack(ModItems.powder_desh_mix, 3))); + + recipes.put(new ComparableStack(ModItems.crystal_trixite), new ElectrolysisMetalRecipe( + new MaterialStack(Mats.MAT_PLUTONIUM, MaterialShapes.INGOT.q(3)), + new MaterialStack(Mats.MAT_COBALT, MaterialShapes.INGOT.q(4)), + new ItemStack(ModItems.powder_niobium, 4), + new ItemStack(ModItems.powder_nitan_mix, 2))); + + recipes.put(new ComparableStack(ModItems.crystal_lithium), new ElectrolysisMetalRecipe( + new MaterialStack(Mats.MAT_LITHIUM, MaterialShapes.INGOT.q(6)), + new MaterialStack(Mats.MAT_BORON, MaterialShapes.INGOT.q(2)), + new ItemStack(ModItems.powder_quartz, 2), + new ItemStack(ModItems.fluorite, 2))); + + recipes.put(new ComparableStack(ModItems.crystal_starmetal), new ElectrolysisMetalRecipe( + new MaterialStack(Mats.MAT_DURA, MaterialShapes.INGOT.q(4)), + new MaterialStack(Mats.MAT_COBALT, MaterialShapes.INGOT.q(4)), + new ItemStack(ModItems.powder_astatine, 3), + new ItemStack(ModItems.ingot_mercury, 8))); + + recipes.put(new ComparableStack(ModItems.crystal_cobalt), new ElectrolysisMetalRecipe( + new MaterialStack(Mats.MAT_COBALT, MaterialShapes.INGOT.q(3)), + new MaterialStack(Mats.MAT_IRON, MaterialShapes.INGOT.q(4)), + new ItemStack(ModItems.powder_copper, 4), + new ItemStack(ModItems.powder_lithium_tiny, 3))); } public static ElectrolysisMetalRecipe getRecipe(ItemStack stack) { @@ -66,7 +153,7 @@ public class ElectrolyserMetalRecipes extends SerializableRecipe { for(Entry entry : ElectrolyserMetalRecipes.recipes.entrySet()) { ElectrolysisMetalRecipe recipe = entry.getValue(); - Object[] input = new Object[] { entry.getKey().copy(), new ComparableStack(ItemFluidIcon.make(Fluids.NITRIC_ACID, 100)) }; + Object[] input = new Object[] { entry.getKey().copy(), ItemFluidIcon.make(Fluids.NITRIC_ACID, 100) }; List outputs = new ArrayList(); if(recipe.output1 != null) outputs.add(ItemScraps.create(recipe.output1, true)); if(recipe.output2 != null) outputs.add(ItemScraps.create(recipe.output2, true)); diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 81bc67970..3d7045278 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (4671)"; + public static final String VERSION = "1.0.27 BETA (4683)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/world/feature/BedrockOre.java b/src/main/java/com/hbm/world/feature/BedrockOre.java index 15077d50f..19895823d 100644 --- a/src/main/java/com/hbm/world/feature/BedrockOre.java +++ b/src/main/java/com/hbm/world/feature/BedrockOre.java @@ -43,6 +43,7 @@ public class BedrockOre { registerBedrockOre(weightedOresNether, new BedrockOreDefinition(new ItemStack(Items.glowstone_dust, 4), 1, 0xF9FF4D), WorldConfig.bedrockGlowstoneSpawn); registerBedrockOre(weightedOresNether, new BedrockOreDefinition(new ItemStack(ModItems.powder_fire, 4), 1, 0xD7341F), WorldConfig.bedrockPhosphorusSpawn); + registerBedrockOre(weightedOresNether, new BedrockOreDefinition(new ItemStack(Items.quartz, 4), 1, 0xF0EFDD), WorldConfig.bedrockQuartzSpawn); } public static void registerBedrockOre(List list, BedrockOreDefinition def, int weight) { diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index d7e063169..81d7d7848 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -337,6 +337,7 @@ container.machineCompressor=Kompressor container.machineCrucible=Schmelztiegel container.machineDiesel=Dieselgenerator container.machineElectricBoiler=Elektrischer Ölwärmer +container.machineElectrolyser=Electrolysegerät container.machineFEL=FEL container.machineITER=Kernfusionsreaktor container.machineLargeTurbine=Industrielle Dampfturbine @@ -832,6 +833,7 @@ hbmmat.watzmud=Giftiger Schlamm hbmmat.whitephosphorus=Weißer Phosphor hbmmat.workersalloy=Desh hbmmat.wroughtiron=Schmiedeeisen +hbmmat.zirconium=Zirkonium matshape.block=%s Block matshape.blocks=%s Blöcke @@ -1711,6 +1713,10 @@ item.elec_shovel.name=Spiralbohrer item.elec_sword.name=Elektroimpulswaffe item.energy_core.name=Selbstgebauter Energiekern item.entanglement_kit.name=Verschränkungskit +item.envsuit_boots.name=M1TTY Umgebungsanzug Stiefel +item.envsuit_helmet.name=M1TTY Umgebungsanzug Helm +item.envsuit_legs.name=M1TTY Umgebungsanzug Hose +item.envsuit_plate.name=M1TTY Umgebungsanzug Brustplatte item.euphemium_boots.name=Euphemiumstiefel item.euphemium_helmet.name=Euphemiumstiefel item.euphemium_kit.name=Euphemium Kit @@ -3991,6 +3997,7 @@ tile.machine_dineutronium_battery.name=Spark Energiespeicherblock tile.machine_drill.name=Automatischer Minenbohrer tile.machine_electric_furnace_off.name=Elektrischer Ofen tile.machine_electric_furnace_on.name=Elektrischer Ofen +tile.machine_electrolyser.name=Electrolysegerät tile.machine_epress.name=Hydraulische Presse tile.machine_excavator.name=Großer Minenbohrer tile.machine_fel.name=FEL diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index e3e38d04a..9c2194b06 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -695,6 +695,7 @@ container.machineCompressor=Compressor container.machineCrucible=Crucible container.machineDiesel=Diesel Generator container.machineElectricBoiler=Electric Oil Heater +container.machineElectrolyser=Electrolysis Machine container.machineFEL=FEL container.machineITER=Fusion Reactor container.machineLargeTurbine=Industrial Steam Turbine @@ -1479,6 +1480,7 @@ hbmmat.watzmud=Poisonous Mud hbmmat.whitephosphorus=White Phosphorus hbmmat.workersalloy=Desh hbmmat.wroughtiron=Wroght Iron +hbmmat.zirconium=Zirconium matshape.block=%s Block matshape.blocks=%s Blocks @@ -2410,6 +2412,10 @@ item.elec_sword.name=Stunstick item.energy_core.name=Makeshift Energy Core item.entanglement_kit.name=Entanglement Kit item.entanglement_kit.desc=Teleporter crafting item.$Enables dimension-shifting via a$beryllium-enhanced resource scanner. +item.envsuit_boots.name=M1TTY Environment Suit Boots +item.envsuit_helmet.name=M1TTY Environment Suit Helmet +item.envsuit_legs.name=M1TTY Environment Suit Leggings +item.envsuit_plate.name=M1TTY Environment Suit Chestplate item.euphemium_boots.name=Euphemium Boots item.euphemium_capacitor.name=Euphemium Capacitor item.euphemium_capacitor.desc=Permits passive dispersion of accumulated positive energy. @@ -4915,6 +4921,7 @@ tile.machine_dineutronium_battery.name=Spark Energy Storage Block tile.machine_drill.name=Automatic Mining Drill tile.machine_electric_furnace_off.name=Electric Furnace tile.machine_electric_furnace_on.name=Electric Furnace +tile.machine_electrolyser.name=Electrolysis Machine tile.machine_epress.name=Electric Press tile.machine_excavator.name=Large Mining Drill tile.machine_fel.name=FEL diff --git a/src/main/resources/assets/hbm/textures/models/weapons/grenade_launcher.png b/src/main/resources/assets/hbm/textures/models/weapons/grenade_launcher.png new file mode 100644 index 000000000..9c37723a2 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/models/weapons/grenade_launcher.png differ