From 14c5941bab60f252243684f032d4a4067f39790d Mon Sep 17 00:00:00 2001 From: Boblet Date: Wed, 5 Jun 2024 12:11:18 +0200 Subject: [PATCH] even more throughput --- changelog | 12 ++++++- src/main/java/com/hbm/blocks/ModBlocks.java | 6 ---- .../generic/BlockConcreteColoredExt.java | 4 ++- .../com/hbm/blocks/generic/BlockGoldSand.java | 31 ------------------ .../java/com/hbm/crafting/MineralRecipes.java | 3 -- .../java/com/hbm/hazard/HazardRegistry.java | 1 - .../ContainerMachineArcFurnaceLarge.java | 15 ++++++++- .../java/com/hbm/items/machine/ItemMold.java | 2 +- .../java/com/hbm/main/CraftingManager.java | 2 ++ src/main/java/com/hbm/main/MainRegistry.java | 2 ++ .../TileEntityMachineArcFurnaceLarge.java | 31 +++++++++++++++--- .../TileEntityMachineElectricFurnace.java | 4 +++ .../machine/TileEntityMicrowave.java | 9 +++-- src/main/resources/assets/hbm/lang/de_DE.lang | 2 ++ src/main/resources/assets/hbm/lang/en_US.lang | 2 ++ .../blocks/concrete_colored_ext.bronze.png | Bin 0 -> 620 bytes .../blocks/concrete_colored_ext.sand.png | Bin 0 -> 528 bytes .../hbm/textures/blocks/rbmk_heatex.png | Bin 701 -> 0 bytes .../hbm/textures/blocks/reactor_computer.png | Bin 620 -> 0 bytes .../textures/blocks/reactor_computer_alt.png | Bin 675 -> 0 bytes .../blocks/reactor_conductor_side.png | Bin 439 -> 0 bytes .../blocks/reactor_conductor_side_alt.png | Bin 594 -> 0 bytes .../textures/blocks/reactor_conductor_top.png | Bin 429 -> 0 bytes .../blocks/reactor_conductor_top_alt.png | Bin 536 -> 0 bytes .../textures/blocks/reactor_control_base.png | Bin 417 -> 0 bytes .../textures/blocks/reactor_control_side.png | Bin 483 -> 0 bytes .../textures/blocks/reactor_control_top.png | Bin 609 -> 0 bytes .../hbm/textures/blocks/reactor_ejector.png | Bin 655 -> 0 bytes .../textures/blocks/reactor_element_base.png | Bin 422 -> 0 bytes .../textures/blocks/reactor_element_side.png | Bin 485 -> 0 bytes .../textures/blocks/reactor_element_top.png | Bin 526 -> 0 bytes .../hbm/textures/blocks/reactor_hatch.png | Bin 572 -> 0 bytes .../hbm/textures/blocks/reactor_hatch_alt.png | Bin 587 -> 0 bytes .../hbm/textures/blocks/reactor_inserter.png | Bin 652 -> 0 bytes .../assets/hbm/textures/blocks/sand_gold.png | Bin 613 -> 0 bytes .../assets/hbm/textures/blocks/stone_gems.png | Bin 768 -> 0 bytes .../hbm/textures/blocks/watz_cooler.png | Bin 420 -> 0 bytes .../assets/hbm/textures/blocks/watz_end.png | Bin 441 -> 0 bytes .../assets/hbm/textures/blocks/watz_hatch.png | Bin 414 -> 0 bytes .../hbm/textures/blocks/white_cable.png | Bin 344 -> 0 bytes .../hbm/textures/blocks/white_cable_icon.png | Bin 293 -> 0 bytes .../hbm/textures/blocks/white_wire_coated.png | Bin 424 -> 0 bytes 42 files changed, 71 insertions(+), 55 deletions(-) delete mode 100644 src/main/java/com/hbm/blocks/generic/BlockGoldSand.java create mode 100644 src/main/resources/assets/hbm/textures/blocks/concrete_colored_ext.bronze.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/concrete_colored_ext.sand.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/rbmk_heatex.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/reactor_computer.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/reactor_computer_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/reactor_conductor_side.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/reactor_conductor_side_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/reactor_conductor_top.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/reactor_conductor_top_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/reactor_control_base.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/reactor_control_side.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/reactor_control_top.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/reactor_ejector.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/reactor_element_base.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/reactor_element_side.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/reactor_element_top.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/reactor_hatch.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/reactor_hatch_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/reactor_inserter.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/sand_gold.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/stone_gems.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/watz_cooler.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/watz_end.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/watz_hatch.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/white_cable.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/white_cable_icon.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/white_wire_coated.png diff --git a/changelog b/changelog index f3be1b444..3e4a0766f 100644 --- a/changelog +++ b/changelog @@ -16,6 +16,16 @@ * CRTs are now crafted in the crafting table instead of via assembler, making use of vacuum tubes * Chainlink fences now only create posts on edges or intersections * The new chainlink fence post block will always create a post, emulating the behavior of the old fences +* Removed gold sands (frees up 2 block IDs) +* There's now two new variants of builder's choice concrete, desert storm (the texture from the launch pad) and bronze plating (the old ICF laser texture) +* Microwaves are no longer electric furnace copies, instead their recipes are restricted to things considered food +* Electric furnaces now cause minor pollution (does not connect to smoke stacks!) +* Increased the arc furnace's liquid buffer to 128 blocks (from 24) +* The arc furnace can now accept up to *16* items per slot (effective amount is lower depending on the output in order to prevent >64 stacks) + * Due to technical limitations, clicking into a slot once will only place a single item, however after the item is present, the slot's capacity extends to 16 + * This is especially apparent when clicking items into slots by hand, and still noticeable when shift clicking by how the items spred out + * This does not affect automation at all, items will stack up nicely without spreading out unnecessarily +* Reduced arc furnace pollution from 15 to 10 soot per cycle ## Fixed * Fixed dupe regarding conveyor grabbers @@ -23,4 +33,4 @@ * Fixed a bug where missile debris would always spawn with a stack size of 1 and a meta of 0 * Fixed FM radios disassembling into incorrect parts * Fixed 256k tanks yielding too much steel when shredded -* Fixed the wire mold only creating 1 wie instead of the intended 8 due to the changes to the wire oredict \ No newline at end of file +* Fixed the wire mold only creating 1 wire instead of the intended 8 due to the changes to the wire oredict \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index fbb9d13e4..88e2f7e82 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -454,8 +454,6 @@ public class ModBlocks { public static Block sand_uranium; public static Block sand_polonium; public static Block sand_quartz; - public static Block sand_gold; - public static Block sand_gold198; public static Block ash_digamma; public static Block glass_boron; public static Block glass_lead; @@ -1644,8 +1642,6 @@ public class ModBlocks { sand_uranium = new BlockFalling(Material.sand).setBlockName("sand_uranium").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.machineTab).setHardness(0.5F).setBlockTextureName(RefStrings.MODID + ":sand_uranium"); sand_polonium = new BlockFalling(Material.sand).setBlockName("sand_polonium").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.machineTab).setHardness(0.5F).setBlockTextureName(RefStrings.MODID + ":sand_polonium"); sand_quartz = new BlockFalling(Material.sand).setBlockName("sand_quartz").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.machineTab).setHardness(0.5F).setBlockTextureName(RefStrings.MODID + ":sand_quartz"); - sand_gold = new BlockGoldSand(Material.sand).setBlockName("sand_gold").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.machineTab).setHardness(0.5F).setBlockTextureName(RefStrings.MODID + ":sand_gold"); - sand_gold198 = new BlockGoldSand(Material.sand).setBlockName("sand_gold198").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.machineTab).setHardness(0.5F).setBlockTextureName(RefStrings.MODID + ":sand_gold"); glass_boron = new BlockNTMGlassCT(0, RefStrings.MODID + ":glass_boron", Material.glass).setBlockName("glass_boron").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.machineTab).setHardness(0.3F); glass_lead = new BlockNTMGlassCT(0, RefStrings.MODID + ":glass_lead", Material.glass).setBlockName("glass_lead").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.machineTab).setHardness(0.3F); glass_uranium = new BlockNTMGlassCT(1, RefStrings.MODID + ":glass_uranium", Material.glass).setBlockName("glass_uranium").setLightLevel(5F/15F).setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.machineTab).setHardness(0.3F); @@ -2943,8 +2939,6 @@ public class ModBlocks { GameRegistry.registerBlock(sand_uranium, sand_uranium.getUnlocalizedName()); GameRegistry.registerBlock(sand_polonium, sand_polonium.getUnlocalizedName()); GameRegistry.registerBlock(sand_quartz, sand_quartz.getUnlocalizedName()); - GameRegistry.registerBlock(sand_gold, sand_gold.getUnlocalizedName()); - GameRegistry.registerBlock(sand_gold198, sand_gold198.getUnlocalizedName()); GameRegistry.registerBlock(glass_boron, glass_boron.getUnlocalizedName()); GameRegistry.registerBlock(glass_lead, glass_lead.getUnlocalizedName()); GameRegistry.registerBlock(glass_uranium, glass_uranium.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/generic/BlockConcreteColoredExt.java b/src/main/java/com/hbm/blocks/generic/BlockConcreteColoredExt.java index 929d2281a..5e0e6ced3 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockConcreteColoredExt.java +++ b/src/main/java/com/hbm/blocks/generic/BlockConcreteColoredExt.java @@ -30,6 +30,8 @@ public class BlockConcreteColoredExt extends BlockEnumMulti { INDIGO, PURPLE, PINK, - HAZARD + HAZARD, + SAND, + BRONZE } } diff --git a/src/main/java/com/hbm/blocks/generic/BlockGoldSand.java b/src/main/java/com/hbm/blocks/generic/BlockGoldSand.java deleted file mode 100644 index d8da15f8e..000000000 --- a/src/main/java/com/hbm/blocks/generic/BlockGoldSand.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hbm.blocks.generic; - -import com.hbm.blocks.ModBlocks; -import com.hbm.extprop.HbmLivingProps; -import com.hbm.extprop.HbmLivingProps.ContaminationEffect; - -import net.minecraft.block.BlockFalling; -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.DamageSource; -import net.minecraft.world.World; - -public class BlockGoldSand extends BlockFalling { - - public BlockGoldSand(Material mat) { - super(mat); - } - - @Override - public void onEntityWalking(World world, int x, int y, int z, Entity entity) { - - if(entity instanceof EntityLivingBase) { - entity.attackEntityFrom(DamageSource.inFire, 2F); - - if(this == ModBlocks.sand_gold198) { - HbmLivingProps.addCont((EntityLivingBase)entity, new ContaminationEffect(5F, 300, false)); - } - } - } -} diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index 59e90e880..6321aebff 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -32,9 +32,6 @@ public class MineralRecipes { add1To9Pair(ModItems.dust, ModItems.dust_tiny); add1To9Pair(ModItems.powder_coal, ModItems.powder_coal_tiny); add1To9Pair(ModItems.ingot_mercury, ModItems.nugget_mercury); - - add1To9Pair(ModBlocks.sand_gold, ModItems.powder_gold); - add1To9Pair(ModBlocks.sand_gold198, ModItems.powder_au198); add1To9Pair(ModBlocks.block_aluminium, ModItems.ingot_aluminium); add1To9Pair(ModBlocks.block_graphite, ModItems.ingot_graphite); diff --git a/src/main/java/com/hbm/hazard/HazardRegistry.java b/src/main/java/com/hbm/hazard/HazardRegistry.java index 93efb26d3..0653efe8c 100644 --- a/src/main/java/com/hbm/hazard/HazardRegistry.java +++ b/src/main/java/com/hbm/hazard/HazardRegistry.java @@ -216,7 +216,6 @@ public class HazardRegistry { HazardSystem.register(ancient_scrap, makeData(RADIATION, 150F)); HazardSystem.register(block_corium, makeData(RADIATION, 150F)); HazardSystem.register(block_corium_cobble, makeData(RADIATION, 150F)); - HazardSystem.register(sand_gold198, makeData(RADIATION, au198 * block * powder_mult)); HazardSystem.register(new ItemStack(ModBlocks.sellafield, 1, 0), makeData(RADIATION, 0.5F)); HazardSystem.register(new ItemStack(ModBlocks.sellafield, 1, 1), makeData(RADIATION, 1F)); diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineArcFurnaceLarge.java b/src/main/java/com/hbm/inventory/container/ContainerMachineArcFurnaceLarge.java index a3be25b0c..07f7b931b 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineArcFurnaceLarge.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineArcFurnaceLarge.java @@ -1,6 +1,8 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotNonRetarded; +import com.hbm.inventory.recipes.ArcFurnaceRecipes; +import com.hbm.inventory.recipes.ArcFurnaceRecipes.ArcFurnaceRecipe; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemMachineUpgrade; import com.hbm.tileentity.machine.TileEntityMachineArcFurnaceLarge; @@ -87,10 +89,21 @@ public class ContainerMachineArcFurnaceLarge extends Container { public SlotArcFurnace(IInventory inventory, int id, int x, int y) { super(inventory, id, x, y); } + + @Override + public boolean isItemValid(ItemStack stack) { + TileEntityMachineArcFurnaceLarge furnace = (TileEntityMachineArcFurnaceLarge) this.inventory; + if(furnace.liquidMode) return true; + ArcFurnaceRecipe recipe = ArcFurnaceRecipes.getOutput(stack, furnace.liquidMode); + if(recipe != null && recipe.solidOutput != null) { + return recipe.solidOutput.stackSize * stack.stackSize <= recipe.solidOutput.getMaxStackSize() && stack.stackSize <= TileEntityMachineArcFurnaceLarge.MAX_INPUT_STACK_SIZE; + } + return false; + } @Override public int getSlotStackLimit() { - return this.getHasStack() ? this.getStack().stackSize : 1; + return this.getHasStack() ? TileEntityMachineArcFurnaceLarge.MAX_INPUT_STACK_SIZE : 1; } } } diff --git a/src/main/java/com/hbm/items/machine/ItemMold.java b/src/main/java/com/hbm/items/machine/ItemMold.java index 0af9d253e..81b8fb0b8 100644 --- a/src/main/java/com/hbm/items/machine/ItemMold.java +++ b/src/main/java/com/hbm/items/machine/ItemMold.java @@ -45,7 +45,7 @@ public class ItemMold extends Item { registerMold(new MoldShape( 1, S, "billet", MaterialShapes.BILLET)); registerMold(new MoldShape( 2, S, "ingot", MaterialShapes.INGOT)); registerMold(new MoldShape( 3, S, "plate", MaterialShapes.PLATE)); - registerMold(new MoldShape( 4, S, "wires", MaterialShapes.WIRE, 8)); + registerMold(new MoldShape( 4, S, "wire", MaterialShapes.WIRE, 8)); registerMold(new MoldShape( 19, S, "plate_cast", MaterialShapes.CASTPLATE)); registerMold(new MoldShape( 20, S, "wire_dense", MaterialShapes.DENSEWIRE)); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 1652e12a5..c50aa9f5a 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -413,6 +413,8 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModBlocks.concrete_colored_ext, 6, EnumConcreteType.PURPLE.ordinal()), new Object[] { "CCC", "1 2", "CCC", 'C', ModBlocks.concrete_smooth, '1', KEY_PURPLE, '2', KEY_PURPLE }); addRecipeAuto(new ItemStack(ModBlocks.concrete_colored_ext, 6, EnumConcreteType.PINK.ordinal()), new Object[] { "CCC", "1 2", "CCC", 'C', ModBlocks.concrete_smooth, '1', KEY_PINK, '2', KEY_RED }); addRecipeAuto(new ItemStack(ModBlocks.concrete_colored_ext, 6, EnumConcreteType.HAZARD.ordinal()), new Object[] { "CCC", "1 2", "CCC", 'C', ModBlocks.concrete_smooth, '1', KEY_YELLOW, '2', KEY_BLACK }); + addRecipeAuto(new ItemStack(ModBlocks.concrete_colored_ext, 6, EnumConcreteType.SAND.ordinal()), new Object[] { "CCC", "1 2", "CCC", 'C', ModBlocks.concrete_smooth, '1', KEY_YELLOW, '2', KEY_GRAY }); + addRecipeAuto(new ItemStack(ModBlocks.concrete_colored_ext, 6, EnumConcreteType.BRONZE.ordinal()), new Object[] { "CCC", "1 2", "CCC", 'C', ModBlocks.concrete_smooth, '1', KEY_ORANGE, '2', KEY_BROWN }); addRecipeAuto(new ItemStack(ModBlocks.gneiss_tile, 4), new Object[] { "CC", "CC", 'C', ModBlocks.stone_gneiss }); addRecipeAuto(new ItemStack(ModBlocks.gneiss_brick, 4), new Object[] { "CC", "CC", 'C', ModBlocks.gneiss_tile }); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index de8468791..23a24261c 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -1330,6 +1330,8 @@ public class MainRegistry { ignoreMappings.add("hbm:tile.machine_generator"); ignoreMappings.add("hbm:item.v1"); ignoreMappings.add("hbm:item.arc_electrode_desh"); + ignoreMappings.add("hbm:tile.sand_gold"); + ignoreMappings.add("hbm:tile.sand_gold198"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnaceLarge.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnaceLarge.java index 5b07aa03a..f9b66932d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnaceLarge.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineArcFurnaceLarge.java @@ -71,7 +71,9 @@ public class TileEntityMachineArcFurnaceLarge extends TileEntityMachineBase impl public static final byte ELECTRODE_USED = 2; public static final byte ELECTRODE_DEPLETED = 3; - public static final int maxLiquid = MaterialShapes.BLOCK.q(24); + public static final int MAX_INPUT_STACK_SIZE = 16; + + public static final int maxLiquid = MaterialShapes.BLOCK.q(128); public List liquids = new ArrayList(); public TileEntityMachineArcFurnaceLarge() { @@ -127,7 +129,7 @@ public class TileEntityMachineArcFurnaceLarge extends TileEntityMachineBase impl this.process(); this.progress = 0; this.delay = (int) (120 / (upgrade * 0.5 + 1)); - PollutionHandler.incrementPollution(worldObj, xCoord, yCoord, zCoord, PollutionType.SOOT, 15F); + PollutionHandler.incrementPollution(worldObj, xCoord, yCoord, zCoord, PollutionType.SOOT, 10F); } } } @@ -280,7 +282,9 @@ public class TileEntityMachineArcFurnaceLarge extends TileEntityMachineBase impl if(recipe == null) continue; if(!liquidMode && recipe.solidOutput != null) { + int amount = slots[i].stackSize; slots[i] = recipe.solidOutput.copy(); + slots[i].stackSize *= amount; } if(liquidMode && recipe.fluidOutput != null) { @@ -330,17 +334,34 @@ public class TileEntityMachineArcFurnaceLarge extends TileEntityMachineBase impl @Override public boolean canInsertItem(int slot, ItemStack stack, int side) { - return this.isItemValidForSlot(slot, stack) && stack.stackSize <= 1 && this.lid > 0; + if(lid <= 0) return false; + if(slot < 3) return stack.getItem() == ModItems.arc_electrode; + if(slot > 4) { + ArcFurnaceRecipe recipe = ArcFurnaceRecipes.getOutput(stack, this.liquidMode); + if(recipe == null) return false; + if(liquidMode) { + return recipe.fluidOutput != null; + } else { + if(recipe.solidOutput == null) return false; + int sta = slots[slot] != null ? slots[slot].stackSize : 0; + sta += stack.stackSize; + return sta * recipe.solidOutput.stackSize <= recipe.solidOutput.getMaxStackSize() && sta <= MAX_INPUT_STACK_SIZE; + } + } + return false; } @Override public boolean isItemValidForSlot(int slot, ItemStack stack) { if(slot < 3) return stack.getItem() == ModItems.arc_electrode; if(slot > 4) { - if(slots[slot] != null) return false; ArcFurnaceRecipe recipe = ArcFurnaceRecipes.getOutput(stack, this.liquidMode); if(recipe == null) return false; - return liquidMode ? recipe.fluidOutput != null : recipe.solidOutput != null; + if(liquidMode) { + return recipe.fluidOutput != null; + } else { + return recipe.solidOutput != null; + } } return false; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java index 4636da4e2..87b0a777f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java @@ -4,6 +4,8 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.MachineElectricFurnace; +import com.hbm.handler.pollution.PollutionHandler; +import com.hbm.handler.pollution.PollutionHandler.PollutionType; import com.hbm.inventory.UpgradeManager; import com.hbm.inventory.container.ContainerElectricFurnace; import com.hbm.inventory.gui.GUIMachineElectricFurnace; @@ -195,6 +197,8 @@ public class TileEntityMachineElectricFurnace extends TileEntityMachineBase impl progress++; power -= consumption; + + if(worldObj.getTotalWorldTime() % 20 == 0) PollutionHandler.incrementPollution(worldObj, xCoord, yCoord, zCoord, PollutionType.SOOT, PollutionHandler.SOOT_PER_SECOND); if(this.progress >= maxProgress) { this.progress = 0; diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java index 781adaa14..d6bf0e065 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java @@ -17,6 +17,7 @@ import li.cil.oc.api.network.SimpleComponent; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; +import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; @@ -131,11 +132,9 @@ public class TileEntityMicrowave extends TileEntityMachineBase implements IEnerg ItemStack stack = FurnaceRecipes.smelting().getSmeltingResult(slots[0]); - if(slots[1] == null) - return true; - - if(!stack.isItemEqual(slots[1])) - return false; + if(!(slots[0].getItem() instanceof ItemFood) && !(stack.getItem() instanceof ItemFood)) return false; + if(slots[1] == null) return true; + if(!stack.isItemEqual(slots[1])) return false; return stack.stackSize + slots[1].stackSize <= stack.getMaxStackSize(); } diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 2aa6249d7..0bef59215 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -3864,12 +3864,14 @@ tile.concrete_colored.red.name=Roter Beton tile.concrete_colored.silver.name=Hellgrauer Beton tile.concrete_colored.white.name=Weißer Beton tile.concrete_colored.yellow.name=Gelber Beton +tile.concrete_colored_ext.bronze.name=Builder's Choice Concrete - Bronzeplatten tile.concrete_colored_ext.hazard.name=Builder's Choice Concrete - Gefahrenstreifen tile.concrete_colored_ext.indigo.name=Builder's Choice Concrete - Tiefes Indigo tile.concrete_colored_ext.machine.name=Builder's Choice Concrete - Industrieller Ton tile.concrete_colored_ext.machine_stripe.name=Builder's Choice Concrete - Industrieller Streifen tile.concrete_colored_ext.pink.name=Builder's Choice Concrete - Männliches Pink tile.concrete_colored_ext.purple.name=Builder's Choice Concrete - Mysteriöses Lila +tile.concrete_colored_ext.sand.name=Builder's Choice Concrete - Wüstensturm tile.concrete_pillar.name=Stahlbetonsäule tile.concrete_slab.asphalt.name=Asphaltstufe tile.concrete_slab.concrete.name=Betonfliesenstufe diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 6a33ffc9c..53e2d89c3 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -4915,12 +4915,14 @@ tile.concrete_colored.red.name=Red Concrete tile.concrete_colored.silver.name=Light Gray Concrete tile.concrete_colored.white.name=White Concrete tile.concrete_colored.yellow.name=Yellow Concrete +tile.concrete_colored_ext.bronze.name=Builder's Choice Concrete - Bronze Plating tile.concrete_colored_ext.hazard.name=Builder's Choice Concrete - Hazard Stripe tile.concrete_colored_ext.indigo.name=Builder's Choice Concrete - Deep Indigo tile.concrete_colored_ext.machine.name=Builder's Choice Concrete - Industrial Tinge tile.concrete_colored_ext.machine_stripe.name=Builder's Choice Concrete - Industrial Stripe tile.concrete_colored_ext.pink.name=Builder's Choice Concrete - Manly Pink tile.concrete_colored_ext.purple.name=Builder's Choice Concrete - Mysterious Purple +tile.concrete_colored_ext.sand.name=Builder's Choice Concrete - Desert Storm tile.concrete_pillar.name=Rebar Reinforced Concrete Pillar tile.concrete_slab.asphalt.name=Asphalt Slab tile.concrete_slab.concrete.name=Concrete Tile Slab diff --git a/src/main/resources/assets/hbm/textures/blocks/concrete_colored_ext.bronze.png b/src/main/resources/assets/hbm/textures/blocks/concrete_colored_ext.bronze.png new file mode 100644 index 0000000000000000000000000000000000000000..46677bde3534e5f335a3e375306300e438624986 GIT binary patch literal 620 zcmV-y0+aoTP)3PxsSmyCZ$x4-g)eu89_?WwhwA8v@ualAVR4H3z)-j z2i26(l-c{hvT(hhm9A@Hnxi>0raf~| z%mWowJc7Ls5WyWvt+Z*py}goBVm~@ZAGGHyni9Ddaw+K6I$P_Q2O^15D*fmx2++f?5%U#cGk-U57>{!Fb5INx)XgGs`->FKs6~Z>&h_a z=o3dU4*~&ApV%J3?Xi(_VL#fFSWugB1`;4C5fM*mPJ&!29zmZ*E|vSX<0yeJ+|f2B z_FOOzL{H2>(43iOgb2&B0)nK>-WvD)tXG$HVc2O{O6fDO?Pz#FD&-VN6n`pxd3i-s zru9K?V=}HE3^V?`Uq3xhIfDoy=h45{f3!ZR%R<0sxc>obH=H3**e+lI0000PjjcYhN|%S`Gu%Za$(^xhCrRFz1^nPMyq!j6`Q6CimV&dcP2PGHG3{^!%&|F5b82};1u+UY67}I#D z0>E(`4eJG!WQib$DG66ZKKK>^pAZ2jHubxntgtS}SZD^-(c1N-m>7gzw{E zzg#i*rHjgJC_)So>Ak`8$?bX_JXMG>VD6M$sP{VnB`0c~`fMBK4%_w79>7Ejb~gu*vFtyZstKwIZ#bq!>nMW*P@SouLuR+uQnRC8sr=Xy6|{Aujg5 SAonf+0000J4grw66p;eQKbRZ=2Tuhr-i+A_nopaAQ z_g*cN$tZy3{tEjghiu;{hGFo(nh(C=mK@gO;{bF4*tU&#uuHw>F?4x|rSddH?bFDr z!=rO=kVlfbDM=&}l*?thZujmY8x{6z9soT(J**{jq>E!6lB&bg#CwD=;0Pk7 z$bN~IU!GF+nn%QxY+gyD>w3Fsx){oQeEu!n-Q5Tw&~=@Gja48d(lVKh8XO!%2!RlS zt*xy#!QWZ-h(^zyS0Vos-93CFhYPE>RAsCi3GP=1tMONh$fLol02yp5w%%#CRsIK0iXli{dMzH z>Xu~@F(p?Ye&EuB7kD)f*L6FVqBi$xsg8nw%d#vYnry%8H4j(02qDh=)d5z`mr!-u zVOf@iG$q?Bv*eejLIT(ApsEf}`rmaF^!E1h%-(2+Xjv9{Qn;>*t6bdQF6DBWSS$ur zhqYvmMnmBHe#e5QX*|F1kBeApg-L0ot+)-8+&kg jcD#-g%C4I-!~lN)zmEa*-1#;@00000NkvXXu0mjfmoPcS diff --git a/src/main/resources/assets/hbm/textures/blocks/reactor_computer.png b/src/main/resources/assets/hbm/textures/blocks/reactor_computer.png deleted file mode 100644 index b0bf0b1fa3c84d8d6f5d8656c90f0cf9520b83b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 620 zcmV-y0+aoTP)q{q7ZSY zA5bHIg{as7e(;))<&j-hBH704Gm6j>E~>(^-L(ly9A9^!Niw6rz_G2-dc-tp=jq z;n%k=X_{tYIY6l?j@`L{KS&8YL+VP(LSkDD`kq0z8dPc}g51@9JMysAbbSYa_~A?b zt!(n=_YW$y62sN!{Jp(_KSPxRUCH#5D@0L*)*7ufNs?r?TaB@Ue9dyaDj^V35_pE*(&iXA8jT9>g0*doF$WIv zVF)3RH_oA5iAht+sMqQ>m54ilW^?yE5Ct+V)u8T8n5lo3>uBb9VMPqkP&EM+A`UfB8JO_3k5{=iyju z>GgVS?Cwr(^hg{&E^95;+U%IR-R=?Pyg(^cIPEYD3&8)4&HzXi1vddoQB7Cur0Ir6QD)K@kcrg-(SCUDBef&O)Uw zBDgrE)S(o~n4z5tg>D91y5t`y7$^-!$YN=hUJ#7u=Hw=!_jHH}{%GFugOB(5-g92D zva({0F$f{>JP*(Fa9tN61lC#x5<(D$Awq~-GuQWh78e%*NF)+Cj&p0d)9EluwOS3g z+wBs^F$)U|j3W7;bG=>%z|~q4MG<#N9=*@;d;c3z6p=YxrM_EYd?!o0P^MO^ad~-3 z7>2k~O48{x-ENo1A70UDXo3Jd1yK~CH?lMoWDZxU1R$>|CMPG6Qj!2L#-O$4=bNtp zI3JI>I5@@_gHjN@Epf8>8KppPWC_D?c#hj@wJ^poAbB_^VS1W;KHm>8{hYC4k-fb= z+J!O_kY{ITtWV0e5JK>G^C>|9T5HC}#)zVbUayDe zd1MY(QL4XWt;HDAe}z;k#mvkM&1RE}gJYJ9>-;c=?d@%*_h0fSe}vdt@+8k$2vqzd{FJK@C*b@xK zFdRV?w{Waj*$n{|qQKApKPfq%&pyvHB0`Lj7$YGBL-C z>rmCE_67Qc9^t?pfrV zIUMc??%py0nCJN^?R``awz--aBGC7Jowd8OEDJejLI~uXs}xmT0orAO=~3j4{tEiw z!PZSx`TF`-LeAS%Koz!UGh02_OL%*O)9FMh1$RePS(c??@bdCt;x;l>#r?U2d(qv% zuImV0*VV_AU>v7Lt18?`RG(CploDpvn)vzS12d~DykF%l%nZHd+hVg!3(q$slA{cc#R^Y_SORrf`n96 z<-mg=Ayrj5^oqnSH|`;hH)|)}?IDd7OK|9S8EIzc&o|$!oSd9^V+0ylh}Ier z!F$gJBEoz=M?`u)ou(;=hlc_bF5aYR})@>F3S>Y zEzUWfo}OOqc&+a_TOAR{G2`(Vfcbom&a#Z6C~(d(nM~N*+vA7&-Q&MlEP#kmLYB)V z!{HEsEX&XU#+Ys?)>@1h&fRfWz&VFf3Z*>O+CGJKd4I4 zG)O$Uo^z-v`r$QXZYZ?7o#?4u8E)|xq#qR$5rLH&Fyy6aU3zm5JDh?fcG9_45~^FV+^m?3u8=!`M&SDTrL1uYjMssm*;ur zuXsEj_+?p0DFKjDV%xSqFNg@vxd!v~;rV=iFoqCV*R`BujGRsrU`&y7z*p*a3IE5EagyD z>^B7f+qN+b1H&+|-|vf(+A@I6Un>ly-IcR!!cUzzI2>%1%rBJw%JTu^`i&o>s9W#N9m7obk6Dj|gC@63w^|Mubs X<(S;PGL2vX00000NkvXXu0mjfp0vL5 diff --git a/src/main/resources/assets/hbm/textures/blocks/reactor_conductor_top_alt.png b/src/main/resources/assets/hbm/textures/blocks/reactor_conductor_top_alt.png deleted file mode 100644 index e0bf9f0b9eb8dc8091f543e4af0cd1227e37be34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 536 zcmV+z0_XjSP)WyT5QV=Hsn~(#pEz+Y;GJ(#AnTr}H|VlA>KP1pXJirY z6-y#$TI6(Lh=|anK;Lpm&dhrsC@(KB>YPJFD9e(vEV0%iBB&~ZM1;0&5s^{NR#nAr zw*#Ok3XCzM$Ct~6uXH#ZuptCeN&uvk===W52cO9{O@sHIloF@Y>7Nq;CX)%9%?5zB zZL#zDob`H5N{Qp~$iu?}F-D4_Kt$-eZj{CKdS$g*0WhD>u>j7w9E$foHyCnBDPfF3 zRq@`BEp%O%8(3>`&Y`OOc>9fWP?jJ9KeykAF;Z0(=kpm6p=lcIY&K)F*$`vo_4Sp- zVu6TI)v((wNhxtSG#PK#b!@j=0II6O4n6^5jCk*{)^fd)>GVCQD#jSBwPOqC^Ep$P zPN#V92_X;y?Dq{J+${8cPmB>`40T;|cXxNAuvjd3dU`@cI3ACz*J}WNEx)6xTrL-i zqQJ%oKnNjIn9XK43vJuxl?Dm}fxN1<^nH&pCf8II`~Lo(DNH64y!WVTMkgXUi{VaP z*BE1P&S96!CC|^#q?CAkeEe&|5bS5VzrV+->d3#2AS&5<q&u4PZi$?%!ZTZeQF9@H{ zC%4-TKaL{+UDx59!+Vd2kaNa+4?qZEF+5EZkH-T5ug$~Zz%UF<)5N;I-!A~;IO3cm z=S)iJXQB2JLMTHa1lqO*pznJCVvHDLNGTOXg&^mQ+R^I!9`AkW#~3&23c)~^~i zAf-gpG>e{dZc9-6Re9@F>S2x9uR)rEs#@0uui*c-ubws5`p??8%GkCo)>^E!<$Ipz zg&I{<-^9X#h#(@o-){g;rxWl?LnBsYdrsS^!Ap}03PuYWr;Ol#@7no9F zzuy-%^`X`G;6;S4>$uz&{%Zxx{Ohb;#QI z;IQDEj6GPkW_k}xcV@B!g05DnrurdTEEaq^oj^oz&cQi{q9{N_U}nf6A{>uL5K)%1 zP19gLpCg2jy#xSbjK(2^Oz?0xV6|Go4#NNdSg+TJF`}v})OC%%?^Sd*o1yP}0KoNn zMbk9c?RNhz5k+e)-rxV=>FEc$uEQ`4czgT6%gZmcZHo{BUSEIX`S~Z>w#7J(AfitJ zQ3rr=98p!3Vku2%m} zn__0xF`KkLB0`K2%&ZfLF={M06*JNdAuuznwfYe=Yd-{wK;}S5%#5NaGE79;WM;-V zj-L)hAhqSaM+iZ22mzPNMe$@Z(Z(C;J~Qj%oXc=omRU}=mziP3YS(pmeEbF?LI?rV z=@j?(-(if=^?i7_%j^SyWoGR6du%ovd_CLkHp8<2sbf0~1D4CBCchG#bJ?%$y;lwq Z;V*Ll6I^3;$g2PV002ovPDHLkV1ff7(CGjG diff --git a/src/main/resources/assets/hbm/textures/blocks/reactor_control_top.png b/src/main/resources/assets/hbm/textures/blocks/reactor_control_top.png deleted file mode 100644 index bb7d99c144223c0ac04b15b6a11a64c8111ffebe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 609 zcmV-n0-pVeP)coPj{Zg)6~C@@SIu%Y}3$?cCKpb*oO*Iro-0J3Gtf^EpBYwAN^?QA#0%Aj>lH z5JE7WP7y*B)?~F>rQL3mBuSwNP%4#No+L?u@a5%&`}=$3YPAAjI2_`69#Tpwl?vnW z7%3%6DXg`;y}bbtMG@6%m8Yktk4th!tu@!zf9Q0ssMTtCo=30uK&NwswH6@+mzM*& z-CK+?#Bux~VOx(ehGw$~fKtlgIF5;;$l)x@oE%4BjN$nBfc1Kf)*9dUX}5nOr6f&L z%H=YLhu=SLmG0PvU^1C7pU;V+2x~2`udhs}Qvj^B%w{uYvl&V$eBa*~ohM2uE-ro( z1bsZuW4Tpc(zeT*>x+}#Zcf6Z>iVo0NmXCB?$VCAWc(bnx_AG;CUWNk~kbi5mHKr zl~NlC`MmG#?Qwegh4p$(9LHE|IXU@C7=~n7hVT2dTKmLt>!C>GPKX1@l7ru5Fh6TcR^T7N2#EOH_00000NkvXXu0mjfY$y|C diff --git a/src/main/resources/assets/hbm/textures/blocks/reactor_ejector.png b/src/main/resources/assets/hbm/textures/blocks/reactor_ejector.png deleted file mode 100644 index 7a48733893dac9438be5f9a5691b53a74e32ff45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 655 zcmV;A0&x9_P)2G+$|kVRauunVhle%)5zq6i zZj7<#-rgSle&5>K^E`qepe#$Y)`$r0cALp$0)U7RMG;CVT-Rk`VF3{#2m+K+Xn-h+ za9!7e#^W&$4-e#d4uJ3b^m;vBUS6oG$}$VXut|_*8DSWbB#8w9oDGKneBRjL^70aZ zBuQ9XTLU1^b6jH#bzM`IC3&9HYPE>tn6u%KRBKYL`TqEbF$QA{v)Rn{#BrR4K^(_C zKR?@-MT9R~Th^Wj)^&}D*!!X=8U~Zegr}z`j4}MUxd9+eQ%0i^qtS@jYzDy3`+JNr z3fI5+@6UteEaN^>xP{-Ec1 z{?31Ob%ikoS41$z;QKzO-L4IYqKKWH9eTYUT5BA~0pPUT#rJ(&*QG2=oTH+Eu*LCv? zbMbwjEXyd0f=}z~7JS_4kYyPnV(G7}tk7<^|1wxwTH@s7go}#{;yC8+?vCS5$0qJ} zyBK2-5tLGl$Kz%f{+%lLvte4ZySvNl>nrmn2SLEw+nX(Sd3m|Pou8lAN-2t>Ktu?` p&^BwHTq#9WRa8}l=XviI>NlRx{3ROr(YpWu002ovPDHLkV1f-=GY*OLqbFYJFsd;*Iq62|+S6oFzE*2&gJKXF>=7h)DJFJkNZ8ec$h_*mWJZ+l`!aA)3IlEC5W? zLj3Ec9)K7l&N-H4DIJwJa?Y3?L*Ms=5K2A9$QG4A+qOGG zN{Oavs+w7=1Ptr;wy6Mk@5`O4B3qKB092DVZ24lOd7gJ<^K7xMzif4Hiig7i?>*l8 za$YY_&bf%JJF6_HDyqsb3;-ODN8p}@MQj{9%X)EAO6A-%P07DxF2XpDWe%!}*i?;R z$Di?-eeQB^LN3!fjKyCH7zpIw>8iPPI@Hyl+3W%p~3x3LoZ10-YIIIV0o QC;$Ke07*qoM6N<$f=f}i1poj5 diff --git a/src/main/resources/assets/hbm/textures/blocks/reactor_element_side.png b/src/main/resources/assets/hbm/textures/blocks/reactor_element_side.png deleted file mode 100644 index 8ebff9842dc75d635e6d1f55a65ac824533811f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 485 zcmVez=5QV?-?g?88KOjYrXx8+hix6E>EY-AA;RFxbe!sOQk5eaH`o{3G%J+HcyVX-b-= zhzPZ^-P3ocIOk}_j%74shjVT*K(&Zd2xM6nHf&v0@?{hPNBc)O_h<6?x7AASoTKx; zb6cPa&8@4yPS4kD^HnWA+-l|FWf%B9@!JKp<=y_XsRF7>EqAbYwhO-d{|LTI>&s5@ zSX;h*<>o4$Pc9sk*SFJo3BHTm51jyun(xy7`l`6%s*1$VVqJf@&Uic~Ns>bS)O3FE(RBsQ34mGxT?x@GQ}o7q4&KPWGlFG>(}-( b9|+z68@{_(o=YN_00000NkvXXu0mjf`v2PH diff --git a/src/main/resources/assets/hbm/textures/blocks/reactor_element_top.png b/src/main/resources/assets/hbm/textures/blocks/reactor_element_top.png deleted file mode 100644 index cb37aec67b202380c84f62415264e4b4d7ad52ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 526 zcmV+p0`dKcP)TI5xbSD`8^=JPq;`|b#FD8_5swi641$z+nmz4u(N*Y4T* zG;cq;R858VzKf=6)=Ew5GK Q?*IS*07*qoM6N<$f&tk}@P)Xiq5QZQB1)3kCw(71@rCy>7#EP?U01k)53iS+Jp&J$~ z5UD~E+i@3sb{pxNjXfjJyzjg-7Msl`@E^;vEZvPU>0B-7qNwU)9hQA#1DWImr`ttHR%dkml~OP-#d65{1@NvHthI5L~fXxkR=eTo-F zfd=Thj-n_y9*^{WKWW7ngS9sK$K#Rr_jdsLzDFBl2qEB{qwjkjA0P4FBc((LLDzL? zt#Qr)aJ$_SJ0ZlK!D6xC>+36_SZfL4S6d+jT5CcG6E?#zAdN9xuUB4QUopnebsYfb z^O@7>#OZY6cDqeliVXU`N3T{Zlu~%_(|7=!bDYm-0N&o-7={5M1OV&xI*F+dhr?vn zahzJ~R7`6<5qH1eryLz;8bykUWm)p^@xgpP$2phKW1{!|4iD_U%V?U05W;;AqRnPAx~?OHz&MU5r4T|e zj^pHwl#-X17rghs463SPyWO(i?^!GsD5d!R{>ECHn8dAAN^!Yd?tkI$RwZTsElo6~ z6m?xEziAq(sv^&G#BR3>N-2h6z*KpWV`hrMET_GL<0Sk6? z(_PwBQ4+`YT~u{jdS_$LXnf}A%&}N37M}k^9LM3VwGQWeKIi@YJ>)8mW0EAH?|YO| z7-P7-y=A-I0$_|G%QB>tL{Y@`^)<#Ak|f#J0J1FO=H@0$EXy)X1#r%Bb#+Bu*H~*q zJxx;-K+`m&Y0Bf{BXwOPgg|SJ)|$3$5kdfvBndx1KLMa^Ta?xs?>&9rlVusx=@ft{ zijY#$w(XfVUteE=oe*NrU^pD|`}@miG{QLtz~|>DbzP&iMhL-dHoFkI>$*LI?RLv} zJf^BDnx?@yN0wzgJUn2nWwlySmL&kY-7YX_+ZOTi^5UhGSZi6Y*UV-!oO1{v@ZQrj z&DqrN?{A);pM#j{?d>h>bTXMx*Y%|-PQqHta=ASE;IPxa@7ZiN7XW?VhgC``gD%$E zy>||cMNv=`1^4&&IOp)*Bc)`w+noUp1_QkJIhI(72f-c2YpDI@K0+gal=4hSAp}trad&rzwf4v$&vTxho>(rI42Q!&-xxy_ML6fsT4Ri%C<@B5 z-2a7BR|RF23JeY`ilPX4RaNA9PLd>u*Vk7srKIaRj4`BXinSJFOfbyBC)QfxI6nJO Z{{Vsw0V8uxWWxXe002ovPDHLkV1i}R2zUSh diff --git a/src/main/resources/assets/hbm/textures/blocks/reactor_inserter.png b/src/main/resources/assets/hbm/textures/blocks/reactor_inserter.png deleted file mode 100644 index 9bf758d19317784bbb7770b8ea8b69da80848b54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 652 zcmV;70(1R|P)A$Tnb}Qt;~p`HrC_IAaYaBxBz~D(BOF*>b$TD; zu<|G#Z3q z=ta}%l)+$t)*65~j_Gtd%w{vnvh-wWnpO$&JSR<4`u)BaZC^bCU`7HQ{Qh43@Av!c z?(PDhwI)mVj%yyk5USy6wBq(_aq2{iXh7}o}ZsRnza_^ z9GvgHT?8p5&N-~L{+=-DJD>--zeRc0;A5^F8(cDwR`lz7g?V&MfVvotRs0GNIKyp}MEA{L7U&bjIpRuRWB zd7fj8p?Ud$841itP(L4%=Q-9|kH59GMXS|%C)n87;Oy*-o0}W5EaOi%UbFI-FMBAZ zu+}1kU^<;vv+&VX@HSyma(H;i%gYO^CMQY4>+7p8cXM;I(p_I)J0S$d7_7CVY3iG` mN-l(;EKAC=B#NT7f%*#>ybI%A?cLb`0000MV;s)Dk#sPPvm^A5bHeQ8k&KwkfUtd*})ieX61 zv(z{H5>@{oSu4!e!Z1KlK;MJ+@c0Oa186OBj4`B?7{`^@SJ0b{JelW;d4>=a#we;v zB<*&he_3RT%VptsTq#ONmVs`Xgmcg|iSYSA*CmWGEDKDN)V8-d&Ou!ZSy4dW&BO@0 z>%_oif#LB;+rm6YVwC2T;Bp#pPI36UCC{NOMN$Z$x}T(V6}{6Wg>ih75(49EL*IjQ zvKjA%)Q5uD_h@6pQEM&UE0huvfT3=fCfI)2(=fgSJu!m%^NkdOI6Th+)LOP7 z#JsOIuRMJ_qBU=ZTl8)xP51Xg(shvM7UzVZ2%bFTWSOQtjR5$Mdz6B{kCKBBBqVj6 z_@7K`WmIdgF)#0SG{0*=?rjTtyK^iHbY0^1&ZCqRje+wSnnuP?2~H0+Ste@)xVb^1 zthKP6PO#lxP2B8q#>?>T__|)V76k}Q#>McG~dnM9^=ynuM! zd!u>p_rCd!@H}stWf`N+e?B8)LiCKKM<-Q{F^n>#OFu(Y%^Q&6o|XI;Pen*9&HAx%@fqa%o8k|aS& zNuKA_+HGzEQ52D7831JfA;fIwZVpFdEX(5L!Sm*Tg6x+5DK@dzE zjzh=u5JGT!rA6<#i`KI_Ns<)Q^E_v5ZLP?|Fr<8be$LJ7LYk)Zp3k1@`1qJosZ`W0 z%OcNn`u#q(Z6l?`wrxs_i;L_90ZJ*-G%Y4umWAJJBBkW3oqd}3eBRu8M73H)YfZb= zLMb(a7)22P`}gnT_Iia}uhSupW4b-~{S@K>WR<`8{zQcn3!2BjDet@TV|H;2v) zq?D4T@6!c-177z1;sdR&t`h9Mk5cL%29wDIV+;Vp;gIF!Ww^c=11bmra2gHVgM*@( ya9wwLb#;X?hDxQvU@%~7YwLd|n)8{*oYUXe1~Z4S8WSb}0000N2bZe?^J zG%heMIczh2P5=M_B1uF+R5(wKlCe&OKoCXu#{eO~LIHuEKw?2<2|*KUTkB`yC)n6q z`3YA3jc2{j2@#{-O!m!N?wz?iyUu%m@ozwO{Pca_wr$sSB(_#nRTKqlS(YS1mSrwY z)4HzNz4{e!5Jyqu&?QN7xx@X-tHnIe(=?6aI1ED^$H*LAnx*!IVM=;SfQ!5S z!nSS9O@#%hfYL#rw*>UylrRjD^cN2K*%IeQ#(_wv0r;SmO;)}N-un;on?>!$q@2(I O0000N2bZe?^J zG%heMIczh2P5=M_H%UZ6R5(wKl22=cKoG_Ei>X!ARYB3aD3o9W@z7Ld(}PgRDc`z3 zckGgSD18i@$JFbwlN=XU%P z|p3wJw*L7{%`o2$@f~73Wd7hVL;Y1sM0m4MgPBD)7)F|4!Tj9N4 zS7+R~DD_(bSCEJjiihFjaxuFiq}%SF)$OvOw(kweTg{|HxF7==~(?Yhkt`B4GVstHvLKvVrP6@aLqgb#9YzUI= zTRJT6%|f=ua0DWWUi-HMSlsOg#u(N&b?9zf0oXl<^=O jdH@1)a>+?lptb%6F_r?Og!mAN00000NkvXXu0mjfFY>eZ diff --git a/src/main/resources/assets/hbm/textures/blocks/watz_hatch.png b/src/main/resources/assets/hbm/textures/blocks/watz_hatch.png deleted file mode 100644 index 546958c8989e8675205755f4c9104452be355ec9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 414 zcmV;P0b%}$P)N2bZe?^J zG%heMIczh2P5=M_97#k$R5(v%k;{sMKoCXqx%~m|-3p4v=SE%l0bvAjIShgi{Hq-M zc8r-Eu((xSuWoPVh39$y1fYfUjX4TVUuVAWUtMV+j(bx`4)!VpZjvMjmAMH}mSq@* zQ52#W3*p*b>G>tp|f)`WMqd0aqPxM~Ctk;bB3fl%laSJ!D{p0~i5E)=<#1^@s607*qo IM6N<$f*%y5!vFvP diff --git a/src/main/resources/assets/hbm/textures/blocks/white_cable.png b/src/main/resources/assets/hbm/textures/blocks/white_cable.png deleted file mode 100644 index c59723c58b18d1b6b2d04710c316f60a8ff17434..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_r(ZAk3I`t&Du0a>Xs#->%zM=+$ud mdYNclT;Z}!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33JdXgi>&V1%sDzav4#C1_cmLn4HqqBLF&-C8w<^OVTW3KeKT6r%`i$3P9 z*9xD{iM&@GbG>!t*0w1^zh8*YdSr9{yPSzpugkvUOE$jrKew~-+Mflb$GJ*uz-Dg< hZ0Z%t`6ItfTz}p%Uw58a+(73tc)I$ztaD0e0ssPyY4QL7 diff --git a/src/main/resources/assets/hbm/textures/blocks/white_wire_coated.png b/src/main/resources/assets/hbm/textures/blocks/white_wire_coated.png deleted file mode 100644 index be4a5f12912290d41b9cce0fc3caa27d626566a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 424 zcmV;Z0ayNsP)<{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J zG%heMIczh2P5=M_CP_p=R5(wSl1plZKoCXUm0+XsJMc4b0YUL0$s{BazuBF_19c#{ z2XP;{-PH#3A-s16MYmK}-MW_Ix~`^aj4{(RJo_s;az0(=n)iOC5qN%cg1S`~E6`9s;TmrKGlP$(%RAx~}`aZ`(GGqpW