From e12be50ce63917b48732549c757098e1c8eebbb9 Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 1 May 2022 21:18:12 +0200 Subject: [PATCH] small fixes --- .../hbm/inventory/recipes/MachineRecipes.java | 2 +- .../machine/storage/TileEntityMachineFENSU.java | 1 + .../hbm/textures/models/machines/assemfac.png | Bin 0 -> 6469 bytes 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/hbm/textures/models/machines/assemfac.png diff --git a/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java index 4e9bd666b..f20562842 100644 --- a/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java @@ -430,7 +430,7 @@ public class MachineRecipes { recipes.put(new ItemStack[] { new ItemStack(ModItems.ingot_cobalt), new ItemStack(ModBlocks.block_meteor) }, getFurnaceOutput(new ItemStack(ModItems.ingot_cobalt), new ItemStack(ModBlocks.block_meteor)).copy()); - if(GeneralConfig.enableLBSMFullSchrab && GeneralConfig.enableLBSMSimpleAlloy) { + if(GeneralConfig.enableLBSM && GeneralConfig.enableLBSMSimpleAlloy) { recipes.put(new ItemStack[] { new ItemStack(ModItems.canister_empty), new ItemStack(Items.coal) }, getFurnaceOutput(new ItemStack(ModItems.canister_empty), new ItemStack(Items.coal)).copy()); recipes.put(new ItemStack[] { new ItemStack(ModBlocks.block_meteor_cobble), new ItemStack(ModItems.ingot_steel) }, diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFENSU.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFENSU.java index a9c53bddc..95d02c061 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFENSU.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFENSU.java @@ -30,6 +30,7 @@ public class TileEntityMachineFENSU extends TileEntityMachineBattery { nbt.setLong("power", power); nbt.setShort("redLow", redLow); nbt.setShort("redHigh", redHigh); + nbt.setBoolean("childLock", childLock); this.networkPack(nbt, 250); } else { this.prevRotation = this.rotation; diff --git a/src/main/resources/assets/hbm/textures/models/machines/assemfac.png b/src/main/resources/assets/hbm/textures/models/machines/assemfac.png new file mode 100644 index 0000000000000000000000000000000000000000..a9d04cb335299831a0699c113514ae6a5f496a42 GIT binary patch literal 6469 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 W>UL;feZc=B5bC