From 9a2751b7a4856887baa9d88348a1d17f94d69985 Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 14 Sep 2021 19:16:23 +0200 Subject: [PATCH] some more fixes, recipes, chemistry icons --- .../hbm/blocks/machine/MachineTowerLarge.java | 9 +++- .../com/hbm/crafting/ConsumableRecipes.java | 2 +- .../java/com/hbm/main/CraftingManager.java | 9 ++-- .../java/com/hbm/packet/ItemFolderPacket.java | 40 ++++++------------ .../machine/TileEntityTowerLarge.java | 4 +- src/main/resources/assets/hbm/lang/de_DE.lang | 5 +++ src/main/resources/assets/hbm/lang/en_US.lang | 5 +++ .../hbm/textures/items/chem_icon_GASOLINE.png | Bin 0 -> 549 bytes .../hbm/textures/items/chem_icon_TEL.png | Bin 0 -> 185 bytes .../hbm/textures/items/chem_icon_VIT_GAS.png | Bin 0 -> 316 bytes .../textures/items/chem_icon_VIT_LIQUID.png | Bin 0 -> 336 bytes 11 files changed, 39 insertions(+), 35 deletions(-) create mode 100644 src/main/resources/assets/hbm/textures/items/chem_icon_GASOLINE.png create mode 100644 src/main/resources/assets/hbm/textures/items/chem_icon_TEL.png create mode 100644 src/main/resources/assets/hbm/textures/items/chem_icon_VIT_GAS.png create mode 100644 src/main/resources/assets/hbm/textures/items/chem_icon_VIT_LIQUID.png diff --git a/src/main/java/com/hbm/blocks/machine/MachineTowerLarge.java b/src/main/java/com/hbm/blocks/machine/MachineTowerLarge.java index 2f92ca090..d393dc138 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineTowerLarge.java +++ b/src/main/java/com/hbm/blocks/machine/MachineTowerLarge.java @@ -1,6 +1,7 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; +import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.machine.TileEntityTowerLarge; import net.minecraft.block.material.Material; @@ -19,6 +20,10 @@ public class MachineTowerLarge extends BlockDummyable { if(meta >= 12) return new TileEntityTowerLarge(); + + if(meta >= 8) + return new TileEntityProxyCombo(false, false, true); + return null; } @@ -43,8 +48,8 @@ public class MachineTowerLarge extends BlockDummyable { ForgeDirection dr2 = ForgeDirection.getOrientation(i); ForgeDirection rot = dr2.getRotation(ForgeDirection.UP); this.makeExtra(world, x + dr2.offsetX * 4, y, z + dr2.offsetZ * 4); - this.makeExtra(world, x + dr2.offsetX * 4 + rot.offsetX * 2, y, z + dr2.offsetZ * 4 + rot.offsetZ * 2); - this.makeExtra(world, x + dr2.offsetX * 4 + rot.offsetX * -2, y, z + dr2.offsetZ * 4 + rot.offsetZ * -2); + this.makeExtra(world, x + dr2.offsetX * 4 + rot.offsetX * 3, y, z + dr2.offsetZ * 4 + rot.offsetZ * 3); + this.makeExtra(world, x + dr2.offsetX * 4 + rot.offsetX * -3, y, z + dr2.offsetZ * 4 + rot.offsetZ * -3); } } } diff --git a/src/main/java/com/hbm/crafting/ConsumableRecipes.java b/src/main/java/com/hbm/crafting/ConsumableRecipes.java index 58bfca048..17de1c100 100644 --- a/src/main/java/com/hbm/crafting/ConsumableRecipes.java +++ b/src/main/java/com/hbm/crafting/ConsumableRecipes.java @@ -48,7 +48,7 @@ public class ConsumableRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.med_ptsd, 1), new Object[] { ModItems.med_ipecac }); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pancake, 1), new Object[] { "dustRedstone", "dustDiamond", Items.wheat, ModItems.bolt_tungsten, ModItems.wire_copper, "plateSteel" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.pancake, 1), new Object[] { "dustRedstone", "dustEmerald", Items.wheat, ModItems.bolt_tungsten, ModItems.wire_copper, "plateSteel" })); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.chocolate_milk, 1), new Object[] { "paneGlass", new ItemStack(Items.dye, 1, 3), Items.milk_bucket, ModBlocks.block_niter, ModItems.sulfur, ModItems.sulfur, ModItems.sulfur, ModItems.powder_fire })); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.chocolate_milk, 1), new Object[] { "paneGlass", new ItemStack(Items.dye, 1, 3), Items.milk_bucket, "blockNiter", "dustSulfur", "dustSulfur", "dustSulfur", "dustPhosphorous" })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.loops), new Object[] { ModItems.flame_pony, Items.wheat, Items.sugar }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.loop_stew), new Object[] { ModItems.loops, ModItems.can_smart, Items.bowl }); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.coffee), new Object[] { "dustCoal", Items.milk_bucket, Items.potionitem, Items.sugar })); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 46f6167ad..28f1c15e4 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -195,8 +195,8 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.shimmer_axe, 1), new Object[] { "H", "G", "G", 'G', ModItems.shimmer_handle, 'H', ModItems.shimmer_axe_head }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.definitelyfood, 1), new Object[] { "DDD", "SDS", "DDD", 'D', Blocks.dirt, 'S', "plateSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.blade_tungsten, 2), new Object[] { "IP", "TP", "TI", 'P', "plateTitanium", 'T', "ingotTitanium", 'I', "ingotTungsten" })); - GameRegistry.addRecipe(new ItemStack(ModItems.turbine_tungsten, 1), new Object[] { "BBB", "BSB", "BBB", 'B', ModItems.blade_tungsten, 'S', "ingotDuraSteel" }); - GameRegistry.addRecipe(new ItemStack(ModItems.ring_starmetal, 1), new Object[] { " S ", "S S", " S ", 'S', "ingotStarmetal" }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.turbine_tungsten, 1), new Object[] { "BBB", "BSB", "BBB", 'B', ModItems.blade_tungsten, 'S', "ingotDuraSteel" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ring_starmetal, 1), new Object[] { " S ", "S S", " S ", 'S', "ingotStarmetal" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.flywheel_beryllium, 1), new Object[] { "BBB", "BTB", "BBB", 'B', "blockBeryllium", 'T', ModItems.bolt_compound })); ItemStack infinity = new ItemStack(Items.enchanted_book); @@ -811,8 +811,9 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.name_tag), new Object[] { "SB ", "BPB", " BP", 'S', Items.string, 'B', "slimeball", 'P', Items.paper })); GameRegistry.addRecipe(new ItemStack(Items.name_tag), new Object[] { "SB ", "BPB", " BP", 'S', Items.string, 'B', ModItems.oil_tar, 'P', Items.paper }); GameRegistry.addRecipe(new ItemStack(ModItems.rag, 4), new Object[] { "SW", "WS", 'S', Items.string, 'W', Blocks.wool }); - - GameRegistry.addRecipe(new ItemStack(ModBlocks.machine_tower_large), new Object[] { "C C", "C C", "CCC", 'C', ModBlocks.concrete_smooth }); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_condenser), new Object[] { "SIS", "ICI", "SIS", 'S', "ingotSteel", 'I', "plateIron", 'C', ModItems.board_copper })); + GameRegistry.addRecipe(new ItemStack(ModBlocks.machine_tower_large), new Object[] { "C C", "C C", "DDD", 'C', ModBlocks.concrete_smooth, 'D', ModBlocks.machine_condenser }); if(GeneralConfig.enableBabyMode) { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.cordite, 3), new Object[] { ModItems.ballistite, Items.gunpowder, new ItemStack(Blocks.wool, 1, OreDictionary.WILDCARD_VALUE) }); diff --git a/src/main/java/com/hbm/packet/ItemFolderPacket.java b/src/main/java/com/hbm/packet/ItemFolderPacket.java index 1e37c7370..28d7db25c 100644 --- a/src/main/java/com/hbm/packet/ItemFolderPacket.java +++ b/src/main/java/com/hbm/packet/ItemFolderPacket.java @@ -86,42 +86,32 @@ public class ItemFolderPacket implements IMessage { if(stack.getItem() == ModItems.stamp_iron_plate || stack.getItem() == ModItems.stamp_iron_wire || stack.getItem() == ModItems.stamp_iron_circuit) { - if(p.inventory.hasItem(ModItems.stamp_iron_flat)) { - tryConvert(p, ModItems.stamp_iron_flat, stack.getItem()); - return null; - } + tryConvert(p, ModItems.stamp_iron_flat, stack.getItem()); + return null; } if(stack.getItem() == ModItems.stamp_steel_plate || stack.getItem() == ModItems.stamp_steel_wire || stack.getItem() == ModItems.stamp_steel_circuit) { - if(p.inventory.hasItem(ModItems.stamp_steel_flat)) { - tryConvert(p, ModItems.stamp_steel_flat, stack.getItem()); - return null; - } + tryConvert(p, ModItems.stamp_steel_flat, stack.getItem()); + return null; } if(stack.getItem() == ModItems.stamp_titanium_plate || stack.getItem() == ModItems.stamp_titanium_wire || stack.getItem() == ModItems.stamp_titanium_circuit) { - if(p.inventory.hasItem(ModItems.stamp_titanium_flat)) { - tryConvert(p, ModItems.stamp_titanium_flat, stack.getItem()); - return null; - } + tryConvert(p, ModItems.stamp_titanium_flat, stack.getItem()); + return null; } if(stack.getItem() == ModItems.stamp_obsidian_plate || stack.getItem() == ModItems.stamp_obsidian_wire || stack.getItem() == ModItems.stamp_obsidian_circuit) { - if(p.inventory.hasItem(ModItems.stamp_obsidian_flat)) { - tryConvert(p, ModItems.stamp_obsidian_flat, stack.getItem()); - return null; - } + tryConvert(p, ModItems.stamp_obsidian_flat, stack.getItem()); + return null; } if(stack.getItem() == ModItems.stamp_schrabidium_plate || stack.getItem() == ModItems.stamp_schrabidium_wire || stack.getItem() == ModItems.stamp_schrabidium_circuit) { - if(p.inventory.hasItem(ModItems.stamp_schrabidium_flat)) { - tryConvert(p, ModItems.stamp_schrabidium_flat, stack.getItem()); - return null; - } + tryConvert(p, ModItems.stamp_schrabidium_flat, stack.getItem()); + return null; } //} @@ -139,7 +129,7 @@ public class ItemFolderPacket implements IMessage { } if(o instanceof String) { - if(InventoryUtil.hasOreDictMatches(player, (String)o, 1)) + if(!InventoryUtil.hasOreDictMatches(player, (String)o, 1)) return; } } @@ -148,13 +138,11 @@ public class ItemFolderPacket implements IMessage { for(Object o : ingredients) { if(o instanceof Item) { - if(!player.inventory.hasItem((Item)o)) - return; + player.inventory.consumeInventoryItem((Item)o); } if(o instanceof String) { - if(InventoryUtil.hasOreDictMatches(player, (String)o, 1)) - return; + InventoryUtil.consumeOreDictMatches(player, (String)o, 1); } } @@ -169,7 +157,7 @@ public class ItemFolderPacket implements IMessage { ItemStack stack = player.inventory.mainInventory[i]; if(stack != null && stack.getItem() == target) { - stack = new ItemStack(result, stack.stackSize, stack.getItemDamage()); + player.inventory.mainInventory[i] = new ItemStack(result, stack.stackSize, stack.getItemDamage()); return; } } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityTowerLarge.java b/src/main/java/com/hbm/tileentity/machine/TileEntityTowerLarge.java index c9fcbf984..f465ee304 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityTowerLarge.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityTowerLarge.java @@ -24,8 +24,8 @@ public class TileEntityTowerLarge extends TileEntityCondenser { ForgeDirection dir = ForgeDirection.getOrientation(i); ForgeDirection rot = dir.getRotation(ForgeDirection.UP); fillFluid(xCoord + dir.offsetX * 5, yCoord, zCoord + dir.offsetZ * 5, getTact(), type); - fillFluid(xCoord + dir.offsetX * 5 + rot.offsetX * 2, yCoord, zCoord + dir.offsetZ * 5 + rot.offsetZ * 2, getTact(), type); - fillFluid(xCoord + dir.offsetX * 5 + rot.offsetX * -2, yCoord, zCoord + dir.offsetZ * 5 + rot.offsetZ * -2, getTact(), type); + fillFluid(xCoord + dir.offsetX * 5 + rot.offsetX * 3, yCoord, zCoord + dir.offsetZ * 5 + rot.offsetZ * 3, getTact(), type); + fillFluid(xCoord + dir.offsetX * 5 + rot.offsetX * -3, yCoord, zCoord + dir.offsetZ * 5 + rot.offsetZ * -3, getTact(), type); } } diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 089e92cdd..1ebdc20af 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -138,6 +138,7 @@ chem.FP_NAPHTHA=Mitteldestillatsverarbeitung chem.FP_SMEAR=Industrieölverarbeitung chem.FR_PETROIL=Gemischherstellung chem.FR_REOIL=Öl-Wiederaufbereitung +chem.GASOLINE=Benzinherstellung chem.KEVLAR=Kevlarverbundherstellung chem.NITAN=NITAN-Supertreibstoff mischen chem.OIL_SAND=Teersand-Extraktion @@ -165,6 +166,7 @@ chem.SF_RECLAIMED=Verfestigung von wiederaufbereitetem Industrieöl chem.SF_SMEAR=Industrieölverfestigung chem.SOLID_FUEL=Festbrennstoffherstellung chem.STEAM=Wasser kochen +chem.TEL=TEL mischen chem.TEST=Test chem.UF6=Uranhexafluoridproduktion chem.VIT_GAS=Gas-Atommüllvitrifizierung @@ -451,6 +453,7 @@ hbmfluid.reclaimed=Wiederaufbetreitetes Industrieöl hbmfluid.sas3=Schrabidiumtrisulfat hbmfluid.schrabidic=Schrabidische Säure hbmfluid.smear=Industrieöl +hbmfluid.spentsteam=Niedrigdruckdampf hbmfluid.steam=Dampf hbmfluid.superhotsteam=Superverdichteter Dampf hbmfluid.tritium=Tritium @@ -2985,6 +2988,7 @@ tile.machine_chungus.name=Leviathan-Dampfturbine tile.machine_coal_off.name=Verbrennungsgenerator tile.machine_coal_on.name=Verbrennungsgenerator tile.machine_combine_factory.name=CMB-Stahl Hochofen +tile.machine_condenser.name=Dampfkondensierer tile.machine_controller.name=Reaktorfernsteuerung tile.machine_converter_he_rf.name=HE zu RF Konverter tile.machine_converter_rf_he.name=RF zu HE Konverter @@ -3098,6 +3102,7 @@ tile.oil_pipe.name=Rohölrohr tile.ore_aluminium.name=Aluminiumerz tile.ore_asbestos.name=Asbesterz tile.ore_australium.name=Australisches Erz +tile.ore_bedrock_coltan.name=Bedrock-Coltanerz tile.ore_beryllium.name=Berylliumerz tile.ore_cinnebar.name=Zinnobererz tile.ore_coal_oil.name=Öliges Kohleerz diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 433ac19cf..f2ef640c3 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -206,6 +206,7 @@ chem.FP_NAPHTHA=Naphtha Processing chem.FP_SMEAR=Industrial Oil Processing chem.FR_PETROIL=Petroil Mixing chem.FR_REOIL=Oil Reprocessing +chem.GASOLINE=Gasoline Production chem.KEVLAR=Kevlar Compound Production chem.NITAN=NITAN Super Fuel Mixing chem.OIL_SAND=Tar Sand Extraction @@ -233,6 +234,7 @@ chem.SF_RECLAIMED=Reclaimed Oil Solidification chem.SF_SMEAR=Industrial Oil Solidification chem.SOLID_FUEL=Solid Rocket Fuel Production chem.STEAM=Water Boiling +chem.TEL=TEL Mixing chem.TEST=Test chem.UF6=Uranium Hexafluoride Production chem.VIT_GAS=Gaseous Nuclear Waste Vitrification @@ -519,6 +521,7 @@ hbmfluid.reclaimed=Reclaimed Industrial Oil hbmfluid.sas3=Schrabidium Trisulfide hbmfluid.schrabidic=Schrabidic Acid hbmfluid.smear=Industrial Oil +hbmfluid.spentsteam=Low-Pressure Steam hbmfluid.steam=Steam hbmfluid.superhotsteam=Super Dense Steam hbmfluid.tritium=Tritium @@ -3068,6 +3071,7 @@ tile.machine_chungus.name=Leviathan Steam Turbine tile.machine_coal_off.name=Combustion Generator tile.machine_coal_on.name=Combustion Generator tile.machine_combine_factory.name=CMB Steel Furnace +tile.machine_condenser.name=Steam Condenser tile.machine_controller.name=Reactor Remote Control Block tile.machine_converter_he_rf.name=HE to RF Converter tile.machine_converter_rf_he.name=RF to HE Converter @@ -3181,6 +3185,7 @@ tile.oil_pipe.name=Crude Oil Extraction Pipe tile.ore_aluminium.name=Aluminium Ore tile.ore_asbestos.name=Asbestos Ore tile.ore_australium.name=Australian Ore +tile.ore_bedrock_coltan.name=Bedrock Coltan Ore tile.ore_beryllium.name=Beryllium Ore tile.ore_cinnebar.name=Cinnabar Ore tile.ore_coal_oil.name=Oily Coal Ore diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_GASOLINE.png b/src/main/resources/assets/hbm/textures/items/chem_icon_GASOLINE.png new file mode 100644 index 0000000000000000000000000000000000000000..b1e66d63617a56a9f3d735397134de2f588d1e60 GIT binary patch literal 549 zcmV+=0^0qFP)OUsYi3x*XTxAj5hzr3d7!Y)kxA5WS8Qf** z8)TtO7K72)$rz&jSNFQ8p6MhrSkN^0z&ZEl90M?!OmsS(vREw0^PKH=Yi6_A5jLOC z4Uar~ShQqLvDIqz7#DyDV7XjAAm3sCBLf%!`{9MkW&`wY>IcoP>(ME6(7>?%vNrz!beQp6o*c+700000NkvXXu0mjfZz=n` literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_TEL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_TEL.png new file mode 100644 index 0000000000000000000000000000000000000000..5aa581db83d009d40f27c778e43f275a42adbe6c GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfaxtyaR8ylP2o@0k&TCcOVFfi(G5HMk2yO7L%N`xbxTsX9)Cf~S^0OOloEh6O<$VD zAVD0*BSW%JW?=(BS(c+>5ebrg(zzgafGg+Vp#dQL2r=KLPgAI(zaOsR!Ryvq0IJUl z5ebYjoU3yWncaf^(lnQb=F%V{L0#1VY{PAzW)e`S!fTtB_1l`w`-Zxz*@ZiN-^bo; z@0osdUwuBR8c0 O0000KAvdz}Oi2?{^sWZxy)*aSdGMdQy}7QA?K$bXNRp%%mZquKdj09~p&H`C zh5G|s_R6ncKfjp&IJvt&DvLb_msfGCAc~`2*dE|*DO=4V6hv`Uxga;d=HS|XetGp= zfVCF$Whhk%Kqj*`;E?sY86f}25uv~s!#ZC#kltU=pBlAMsEtB|f+8;fn9L?kHl2V> zW?rdEMyDgjXJd-IU^<)P`#yGOo4U?TbVmq+003hQc4yIA4;!J@>V1V=NN-zi(OM%H ivNOAui{JL(&-w<*#dv6koiGFd0000