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 000000000..46677bde3 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/concrete_colored_ext.bronze.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/concrete_colored_ext.sand.png b/src/main/resources/assets/hbm/textures/blocks/concrete_colored_ext.sand.png new file mode 100644 index 000000000..0082fedc4 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/concrete_colored_ext.sand.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/rbmk_heatex.png b/src/main/resources/assets/hbm/textures/blocks/rbmk_heatex.png deleted file mode 100644 index 469170a26..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/rbmk_heatex.png and /dev/null differ 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 b0bf0b1fa..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/reactor_computer.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/reactor_computer_alt.png b/src/main/resources/assets/hbm/textures/blocks/reactor_computer_alt.png deleted file mode 100644 index c78fc8be6..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/reactor_computer_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/reactor_conductor_side.png b/src/main/resources/assets/hbm/textures/blocks/reactor_conductor_side.png deleted file mode 100644 index f593dd4e5..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/reactor_conductor_side.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/reactor_conductor_side_alt.png b/src/main/resources/assets/hbm/textures/blocks/reactor_conductor_side_alt.png deleted file mode 100644 index cbd8c0906..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/reactor_conductor_side_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/reactor_conductor_top.png b/src/main/resources/assets/hbm/textures/blocks/reactor_conductor_top.png deleted file mode 100644 index 8ca00f7ab..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/reactor_conductor_top.png and /dev/null differ 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 e0bf9f0b9..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/reactor_conductor_top_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/reactor_control_base.png b/src/main/resources/assets/hbm/textures/blocks/reactor_control_base.png deleted file mode 100644 index cf5e55144..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/reactor_control_base.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/reactor_control_side.png b/src/main/resources/assets/hbm/textures/blocks/reactor_control_side.png deleted file mode 100644 index f6e308fed..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/reactor_control_side.png and /dev/null differ 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 bb7d99c14..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/reactor_control_top.png and /dev/null differ 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 7a4873389..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/reactor_ejector.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/reactor_element_base.png b/src/main/resources/assets/hbm/textures/blocks/reactor_element_base.png deleted file mode 100644 index 51471804a..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/reactor_element_base.png and /dev/null differ 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 8ebff9842..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/reactor_element_side.png and /dev/null differ 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 cb37aec67..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/reactor_element_top.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/reactor_hatch.png b/src/main/resources/assets/hbm/textures/blocks/reactor_hatch.png deleted file mode 100644 index 4f9ab082b..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/reactor_hatch.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/reactor_hatch_alt.png b/src/main/resources/assets/hbm/textures/blocks/reactor_hatch_alt.png deleted file mode 100644 index d5fc8d5af..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/reactor_hatch_alt.png and /dev/null differ 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 9bf758d19..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/reactor_inserter.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/sand_gold.png b/src/main/resources/assets/hbm/textures/blocks/sand_gold.png deleted file mode 100644 index 353d5e372..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/sand_gold.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/stone_gems.png b/src/main/resources/assets/hbm/textures/blocks/stone_gems.png deleted file mode 100644 index 6bf8cf21b..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/stone_gems.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/watz_cooler.png b/src/main/resources/assets/hbm/textures/blocks/watz_cooler.png deleted file mode 100644 index e44d47228..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/watz_cooler.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/watz_end.png b/src/main/resources/assets/hbm/textures/blocks/watz_end.png deleted file mode 100644 index 7abad325c..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/watz_end.png and /dev/null differ 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 546958c89..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/watz_hatch.png and /dev/null differ 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 c59723c58..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/white_cable.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/white_cable_icon.png b/src/main/resources/assets/hbm/textures/blocks/white_cable_icon.png deleted file mode 100644 index 1a4ff072c..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/white_cable_icon.png and /dev/null differ 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 be4a5f129..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/white_wire_coated.png and /dev/null differ