From e4567bec16ee226e3c01929ad0b88d751f60489d Mon Sep 17 00:00:00 2001 From: Boblet Date: Tue, 23 Apr 2024 16:11:30 +0200 Subject: [PATCH] the malicious gigglefish from the silly dimension --- changelog | 2 + src/main/java/com/hbm/blocks/ModBlocks.java | 13 +- .../machine/BlockICFLaserComponent.java | 54 ++++++++ .../hbm/blocks/machine/MachineGenerator.java | 42 ------ .../hbm/blocks/network/RadioTorchLogic.java | 1 - .../hbm/handler/nei/BoilerRecipeHandler.java | 127 ------------------ .../gui/GUIScreenRadioTorchLogic.java | 4 - .../hbm/inventory/recipes/MachineRecipes.java | 34 ----- .../java/com/hbm/main/CraftingManager.java | 2 - src/main/java/com/hbm/main/MainRegistry.java | 1 + src/main/java/com/hbm/main/NEIRegistry.java | 49 +------ .../network/TileEntityRadioTorchLogic.java | 1 - .../hbm/world/dungeon/CrashedVertibird.java | 16 +-- .../com/hbm/world/dungeon/DesertAtom001.java | 2 +- .../com/hbm/world/dungeon/DesertAtom002.java | 2 +- .../com/hbm/world/dungeon/DesertAtom003.java | 2 +- .../java/com/hbm/world/dungeon/Spaceship.java | 4 +- .../java/com/hbm/world/dungeon/Vertibird.java | 16 +-- .../world/gen/component/CivilianFeatures.java | 2 +- .../world/gen/component/SiloComponent.java | 2 +- .../assets/hbm/textures/blocks/icf_block.png | Bin 0 -> 355 bytes .../hbm/textures/blocks/icf_block_ct.png | Bin 0 -> 1039 bytes .../textures/blocks/icf_capacitor_side.png | Bin 0 -> 443 bytes .../hbm/textures/blocks/icf_capacitor_top.png | Bin 0 -> 314 bytes .../assets/hbm/textures/blocks/icf_casing.png | Bin 0 -> 684 bytes .../assets/hbm/textures/blocks/icf_cell.png | Bin 0 -> 678 bytes .../hbm/textures/blocks/icf_concrete.png | Bin 0 -> 614 bytes .../hbm/textures/blocks/icf_controller.png | Bin 0 -> 737 bytes .../hbm/textures/blocks/icf_emitter.png | Bin 0 -> 476 bytes .../hbm/textures/blocks/icf_turbocharger.png | Bin 0 -> 453 bytes .../textures/blocks/industrial_generator.png | Bin 332 -> 0 bytes .../hbm/textures/blocks/machine_flare.png | Bin 195 -> 0 bytes .../hbm/textures/blocks/rtty_logic_on.png | Bin 277 -> 259 bytes 33 files changed, 88 insertions(+), 288 deletions(-) create mode 100644 src/main/java/com/hbm/blocks/machine/BlockICFLaserComponent.java delete mode 100644 src/main/java/com/hbm/blocks/machine/MachineGenerator.java delete mode 100644 src/main/java/com/hbm/handler/nei/BoilerRecipeHandler.java create mode 100644 src/main/resources/assets/hbm/textures/blocks/icf_block.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/icf_block_ct.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/icf_capacitor_side.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/icf_capacitor_top.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/icf_casing.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/icf_cell.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/icf_concrete.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/icf_controller.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/icf_emitter.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/icf_turbocharger.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/industrial_generator.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/machine_flare.png diff --git a/changelog b/changelog index 73897882e..6bfcac23b 100644 --- a/changelog +++ b/changelog @@ -14,6 +14,8 @@ * Rotary engine (1 ID) * FWatz (8 IDs) * Meteorite ores (10 IDs) + * Tiny nuclear rector (1 ID) +* The small oil heaters are no longer craftable and the NEI handler has been removed, however existing ones can still be used * The loot pool for meteorite treasure blocks has been updated * Treasures are no longer senselessly progression breaking, radioactive or plain stupid (whole-ass machines inside meteorites) * The treasure now consists of mainly some rarer earlygame ingots, circuits, some gear, a small selection of armor mods and alexandrite (rare) diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index d7dd15ab9..f8d1e7bde 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -690,8 +690,6 @@ public class ModBlocks { public static Block machine_rtg_furnace_off; public static Block machine_rtg_furnace_on; - public static Block machine_generator; - public static Block machine_industrial_generator; public static Block machine_cyclotron; @@ -895,6 +893,9 @@ public class ModBlocks { public static Block plasma_heater; public static Block icf; + public static Block icf_controller; + public static Block icf_laser_component; + public static Block icf_block; public static Block watz; public static Block watz_pump; @@ -1798,8 +1799,7 @@ public class ModBlocks { machine_rtg_furnace_off = new MachineRtgFurnace(false).setBlockName("machine_rtg_furnace_off").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); machine_rtg_furnace_on = new MachineRtgFurnace(true).setBlockName("machine_rtg_furnace_on").setHardness(5.0F).setLightLevel(1.0F).setResistance(10.0F); - machine_generator = new MachineGenerator(Material.iron).setBlockName("machine_generator").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null); - machine_industrial_generator = new MachineIGenerator(Material.iron).setBlockName("machine_industrial_generator").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":industrial_generator"); + machine_industrial_generator = new MachineIGenerator(Material.iron).setBlockName("machine_industrial_generator").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName("gold_block"); machine_cyclotron = new MachineCyclotron(Material.iron).setBlockName("machine_cyclotron").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":cyclotron"); machine_exposure_chamber = new MachineExposureChamber(Material.iron).setBlockName("machine_exposure_chamber").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_aluminium"); machine_radgen = new MachineRadGen(Material.iron).setBlockName("machine_radgen").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_radgen"); @@ -2010,6 +2010,7 @@ public class ModBlocks { plasma_heater = new MachinePlasmaHeater().setBlockName("plasma_heater").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":plasma_heater"); icf = new MachineICF().setBlockName("icf").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); + icf_laser_component = new BlockICFLaserComponent().setBlockName("icf_laser_component").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab); watz_element = new BlockPillar(Material.iron, RefStrings.MODID + ":watz_element_top").setBlockName("watz_element").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_element_side"); watz_control = new BlockPillar(Material.iron, RefStrings.MODID + ":watz_control_top").setBlockName("watz_control").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":watz_control_side"); @@ -3049,7 +3050,6 @@ public class ModBlocks { register(machine_wood_burner); register(machine_diesel); register(machine_combustion_engine); - GameRegistry.registerBlock(machine_generator, machine_generator.getUnlocalizedName()); GameRegistry.registerBlock(machine_controller, machine_controller.getUnlocalizedName()); GameRegistry.registerBlock(reactor_research, reactor_research.getUnlocalizedName()); GameRegistry.registerBlock(reactor_zirnox, reactor_zirnox.getUnlocalizedName()); @@ -3341,7 +3341,8 @@ public class ModBlocks { GameRegistry.registerBlock(iter, iter.getUnlocalizedName()); GameRegistry.registerBlock(plasma_heater, plasma_heater.getUnlocalizedName()); - GameRegistry.registerBlock(icf, icf.getUnlocalizedName()); + register(icf_laser_component); + register(icf); GameRegistry.registerBlock(watz_element, watz_element.getUnlocalizedName()); GameRegistry.registerBlock(watz_control, watz_control.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/machine/BlockICFLaserComponent.java b/src/main/java/com/hbm/blocks/machine/BlockICFLaserComponent.java new file mode 100644 index 000000000..6d37458fe --- /dev/null +++ b/src/main/java/com/hbm/blocks/machine/BlockICFLaserComponent.java @@ -0,0 +1,54 @@ +package com.hbm.blocks.machine; + +import com.hbm.blocks.BlockEnumMulti; +import com.hbm.lib.RefStrings; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + +public class BlockICFLaserComponent extends BlockEnumMulti { + + protected IIcon[] iconsTop; + + public BlockICFLaserComponent() { + super(Material.iron, EnumICFPart.class, true, true); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister reg) { + + Enum[] enums = theEnum.getEnumConstants(); + this.icons = new IIcon[enums.length]; + this.iconsTop = new IIcon[enums.length]; + + this.icons[0] = this.iconsTop[0] = reg.registerIcon(RefStrings.MODID + ":icf_casing"); + this.icons[1] = this.iconsTop[1] = reg.registerIcon(RefStrings.MODID + ":icf_cell"); + this.icons[2] = this.iconsTop[2] = reg.registerIcon(RefStrings.MODID + ":icf_emitter"); + this.icons[3] = reg.registerIcon(RefStrings.MODID + ":icf_capacitor_side"); + this.icons[4] = reg.registerIcon(RefStrings.MODID + ":icf_turbocharger"); + this.iconsTop[3] = this.iconsTop[4] = reg.registerIcon(RefStrings.MODID + ":icf_capacitor_top"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + return side == 0 || side == 1 ? this.iconsTop[meta % this.iconsTop.length] : this.icons[meta % this.icons.length]; + } + + @Override + public int getSubCount() { + return 5; + } + + public static enum EnumICFPart { + CASING, + CELL, + EMITTER, + CAPACITOR, + TURBO + } +} diff --git a/src/main/java/com/hbm/blocks/machine/MachineGenerator.java b/src/main/java/com/hbm/blocks/machine/MachineGenerator.java deleted file mode 100644 index 4efd72f33..000000000 --- a/src/main/java/com/hbm/blocks/machine/MachineGenerator.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.hbm.blocks.machine; - -import java.util.Random; - -import com.hbm.items.ModItems; -import com.hbm.lib.RefStrings; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.Item; -import net.minecraft.util.IIcon; - -public class MachineGenerator extends Block { - - @SideOnly(Side.CLIENT) - private IIcon iconSide; - - public MachineGenerator(Material p_i45386_1_) { - super(p_i45386_1_); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - this.iconSide = iconRegister.registerIcon(RefStrings.MODID + ":machine_generator_side"); - this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_generator"); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int metadata) { - return side == 0 ? blockIcon : (side == 1 ? blockIcon : iconSide); - } - - @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { - return ModItems.circuit_targeting_tier3; - } -} diff --git a/src/main/java/com/hbm/blocks/network/RadioTorchLogic.java b/src/main/java/com/hbm/blocks/network/RadioTorchLogic.java index d359389fc..13cc2d107 100644 --- a/src/main/java/com/hbm/blocks/network/RadioTorchLogic.java +++ b/src/main/java/com/hbm/blocks/network/RadioTorchLogic.java @@ -6,7 +6,6 @@ import java.util.List; import com.hbm.blocks.ILookOverlay; import com.hbm.inventory.gui.GUIScreenRadioTorchLogic; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.network.TileEntityRadioTorchBase; import com.hbm.tileentity.network.TileEntityRadioTorchLogic; import com.hbm.util.I18nUtil; diff --git a/src/main/java/com/hbm/handler/nei/BoilerRecipeHandler.java b/src/main/java/com/hbm/handler/nei/BoilerRecipeHandler.java deleted file mode 100644 index 776261ac4..000000000 --- a/src/main/java/com/hbm/handler/nei/BoilerRecipeHandler.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.hbm.handler.nei; - -import java.awt.Rectangle; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import com.hbm.inventory.gui.GUIMachineBoiler; -import com.hbm.inventory.gui.GUIMachineBoilerElectric; -import com.hbm.inventory.recipes.MachineRecipes; -import com.hbm.lib.RefStrings; - -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; - -public class BoilerRecipeHandler extends TemplateRecipeHandler { - - public LinkedList transferRectsRec = new LinkedList(); - public LinkedList transferRectsGui = new LinkedList(); - public LinkedList> guiRec = new LinkedList>(); - public LinkedList> guiGui = new LinkedList>(); - - public class SmeltingSet extends TemplateRecipeHandler.CachedRecipe { - PositionedStack input; - PositionedStack result; - - public SmeltingSet(ItemStack input, ItemStack result) { - input.stackSize = 1; - this.input = new PositionedStack(input, 21 + 9, 6 + 18); - this.result = new PositionedStack(result, 120, 24); - } - - @Override - public List getIngredients() { - return getCycledIngredients(cycleticks / 48, Arrays.asList(new PositionedStack[] { input })); - } - - @Override - public PositionedStack getResult() { - return result; - } - } - - @Override - public String getRecipeName() { - return "Boiler"; - } - - @Override - public String getGuiTexture() { - return RefStrings.MODID + ":textures/gui/nei/gui_nei_boiler.png"; - } - - @Override - public Class getGuiClass() { - return null; - } - - @Override - public TemplateRecipeHandler newInstance() { - return super.newInstance(); - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) { - if((outputId.equals("ntmboiler")) && getClass() == BoilerRecipeHandler.class) { - Map recipes = MachineRecipes.instance().getBoilerRecipes(); - for(Map.Entry recipe : recipes.entrySet()) { - this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack) recipe.getValue())); - } - } else { - super.loadCraftingRecipes(outputId, results); - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) { - Map recipes = MachineRecipes.instance().getBoilerRecipes(); - for(Map.Entry recipe : recipes.entrySet()) { - if(compareFluidStacks((ItemStack) recipe.getValue(), result) || compareFluidStacks((ItemStack) recipe.getValue(), result)) - this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack) recipe.getValue())); - } - } - - @Override - public void loadUsageRecipes(String inputId, Object... ingredients) { - if((inputId.equals("ntmboiler")) && getClass() == BoilerRecipeHandler.class) { - loadCraftingRecipes("ntmboiler", new Object[0]); - } else { - super.loadUsageRecipes(inputId, ingredients); - } - } - - @Override - public void loadUsageRecipes(ItemStack ingredient) { - Map recipes = MachineRecipes.instance().getBoilerRecipes(); - for(Map.Entry recipe : recipes.entrySet()) { - if(compareFluidStacks(ingredient, (ItemStack) recipe.getKey())) - this.arecipes.add(new SmeltingSet((ItemStack) recipe.getKey(), (ItemStack) recipe.getValue())); - } - } - - private boolean compareFluidStacks(ItemStack sta1, ItemStack sta2) { - return sta1.getItem() == sta2.getItem() && sta1.getItemDamage() == sta2.getItemDamage(); - } - - @Override - public void drawExtras(int recipe) { - drawProgressBar(80, 23, 0, 85, 6, 17, 240, 3); - } - - @Override - public void loadTransferRects() { - transferRectsGui = new LinkedList(); - guiGui = new LinkedList>(); - - transferRects.add(new RecipeTransferRect(new Rectangle(138 - 1 - 36 - 27 - 9, 23, 36, 18), "ntmboiler")); - transferRectsGui.add(new RecipeTransferRect(new Rectangle(18 * 2 + 2 + 36, 89 - 29 - 18 - 18, 18, 18 * 2), "ntmboiler")); - guiGui.add(GUIMachineBoiler.class); - guiGui.add(GUIMachineBoilerElectric.class); - RecipeTransferRectHandler.registerRectsToGuis(getRecipeTransferRectGuis(), transferRects); - RecipeTransferRectHandler.registerRectsToGuis(guiGui, transferRectsGui); - } -} diff --git a/src/main/java/com/hbm/inventory/gui/GUIScreenRadioTorchLogic.java b/src/main/java/com/hbm/inventory/gui/GUIScreenRadioTorchLogic.java index 42b495f45..c78ea3061 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIScreenRadioTorchLogic.java +++ b/src/main/java/com/hbm/inventory/gui/GUIScreenRadioTorchLogic.java @@ -6,20 +6,16 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.container.ContainerCounterTorch; import com.hbm.lib.RefStrings; import com.hbm.packet.NBTControlPacket; import com.hbm.packet.PacketDispatcher; -import com.hbm.tileentity.network.TileEntityRadioTorchCounter; import com.hbm.tileentity.network.TileEntityRadioTorchLogic; -import com.hbm.tileentity.network.TileEntityRadioTorchSender; import com.hbm.util.I18nUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; -import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java index 847c5b225..571777acd 100644 --- a/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java @@ -55,15 +55,6 @@ public class MachineRecipes { * this is the smoldering crater where once the 2016 shredder recipe code was */ - public Map getCMBRecipes() { - Map recipes = new HashMap(); - recipes.put(new ItemStack[] { new ItemStack(ModItems.ingot_advanced_alloy), new ItemStack(ModItems.ingot_magnetized_tungsten) }, - new ItemStack(ModItems.ingot_combine_steel, 4)); - recipes.put(new ItemStack[] { new ItemStack(ModItems.powder_advanced_alloy), new ItemStack(ModItems.powder_magnetized_tungsten) }, - new ItemStack(ModItems.ingot_combine_steel, 4)); - return recipes; - } - public ArrayList getBatteries() { ArrayList fuels = new ArrayList(); fuels.add(new ItemStack(ModItems.battery_potato)); @@ -144,31 +135,6 @@ public class MachineRecipes { return false; } - - public Map getBoilerRecipes() { - - Map recipes = new HashMap(); - - for(int i = 0; i < Fluids.getAll().length; i++) { - Object[] outs = getBoilerOutput(Fluids.fromID(i)); - - if(outs != null) { - - ItemStack in = new ItemStack(ModItems.fluid_icon, 1, i); - in.stackTagCompound = new NBTTagCompound(); - in.stackTagCompound.setInteger("fill", (Integer) outs[2]); - - ItemStack out = new ItemStack(ModItems.fluid_icon, 1, ((FluidType)outs[0]).getID()); - out.stackTagCompound = new NBTTagCompound(); - out.stackTagCompound.setInteger("fill", (Integer) outs[1]); - - recipes.put(in, out); - } - } - - return recipes; - } - public Map getFluidContainers() { Map map = new HashMap(); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 454ae9678..20840711d 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -293,8 +293,6 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModBlocks.capacitor_schrabidate, 1), new Object[] { "PPP", "ICI", "WWW", 'P', STEEL.plate(), 'I', ANY_RESISTANTALLOY.ingot(), 'C', SBD.block(), 'W', STEEL.ingot() }); //addRecipeAuto(new ItemStack(ModBlocks.machine_coal_off, 1), new Object[] { "STS", "SCS", "SFS", 'S', STEEL.ingot(), 'T', ModItems.tank_steel, 'C', MINGRADE.ingot(), 'F', Blocks.furnace }); addRecipeAuto(new ItemStack(ModBlocks.machine_wood_burner, 1), new Object[] { "PPP", "CFC", "I I" , 'P', STEEL.plate528(), 'C', ModItems.coil_copper, 'I', IRON.ingot(), 'F', Blocks.furnace}); - addRecipeAuto(new ItemStack(ModBlocks.machine_boiler_off, 1), new Object[] { "SPS", "TFT", "SPS", 'S', STEEL.ingot(), 'P', CU.plateCast(), 'T', ModItems.tank_steel, 'F', Blocks.furnace }); - addRecipeAuto(new ItemStack(ModBlocks.machine_boiler_electric_off, 1), new Object[] { "SPS", "TFT", "SPS", 'S', DESH.ingot(), 'P', CU.plateCast(), 'T', ModItems.tank_steel, 'F', ModBlocks.machine_electric_furnace_off }); addRecipeAuto(new ItemStack(ModBlocks.machine_turbine, 1), new Object[] { "SMS", "PTP", "SMS", 'S', STEEL.ingot(), 'T', ModItems.turbine_titanium, 'M', ModItems.coil_copper, 'P', ANY_PLASTIC.ingot() }); addRecipeAuto(new ItemStack(ModBlocks.machine_converter_he_rf, 1), new Object[] { "SSS", "CRB", "SSS", 'S', STEEL.ingot(), 'C', ModItems.coil_copper, 'R', ModItems.coil_copper_torus, 'B', REDSTONE.block() }); addRecipeAuto(new ItemStack(ModBlocks.machine_converter_rf_he, 1), new Object[] { "SSS", "BRC", "SSS", 'S', BE.ingot(), 'C', ModItems.coil_copper, 'R', ModItems.coil_copper_torus, 'B', REDSTONE.block() }); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 1a776c804..bab9ff66b 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -1327,6 +1327,7 @@ public class MainRegistry { ignoreMappings.add("hbm:tile.ore_meteor_lead"); ignoreMappings.add("hbm:tile.ore_meteor_lithium"); ignoreMappings.add("hbm:tile.ore_meteor_starmetal"); + ignoreMappings.add("hbm:tile.machine_generator"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); diff --git a/src/main/java/com/hbm/main/NEIRegistry.java b/src/main/java/com/hbm/main/NEIRegistry.java index d8bcfd593..1909c79e5 100644 --- a/src/main/java/com/hbm/main/NEIRegistry.java +++ b/src/main/java/com/hbm/main/NEIRegistry.java @@ -5,53 +5,7 @@ import java.util.List; import com.hbm.config.CustomMachineConfigJSON; import com.hbm.config.VersatileConfig; -import com.hbm.handler.nei.AlloyFurnaceRecipeHandler; -import com.hbm.handler.nei.AnvilRecipeHandler; -import com.hbm.handler.nei.ArcWelderHandler; -import com.hbm.handler.nei.AshpitHandler; -import com.hbm.handler.nei.AssemblerRecipeHandler; -import com.hbm.handler.nei.BoilerRecipeHandler; -import com.hbm.handler.nei.BoilingHandler; -import com.hbm.handler.nei.BookRecipeHandler; -import com.hbm.handler.nei.BreederRecipeHandler; -import com.hbm.handler.nei.CentrifugeRecipeHandler; -import com.hbm.handler.nei.ChemplantRecipeHandler; -import com.hbm.handler.nei.CokingHandler; -import com.hbm.handler.nei.CombinationHandler; -import com.hbm.handler.nei.ConstructionHandler; -import com.hbm.handler.nei.CrackingHandler; -import com.hbm.handler.nei.CrucibleAlloyingHandler; -import com.hbm.handler.nei.CrucibleCastingHandler; -import com.hbm.handler.nei.CrucibleSmeltingHandler; -import com.hbm.handler.nei.CrystallizerRecipeHandler; -import com.hbm.handler.nei.CustomMachineHandler; -import com.hbm.handler.nei.CyclotronRecipeHandler; -import com.hbm.handler.nei.ElectrolyserFluidHandler; -import com.hbm.handler.nei.ElectrolyserMetalHandler; -import com.hbm.handler.nei.ExposureChamberHandler; -import com.hbm.handler.nei.FluidRecipeHandler; -import com.hbm.handler.nei.FractioningHandler; -import com.hbm.handler.nei.FuelPoolHandler; -import com.hbm.handler.nei.FusionRecipeHandler; -import com.hbm.handler.nei.GasCentrifugeRecipeHandler; -import com.hbm.handler.nei.HadronRecipeHandler; -import com.hbm.handler.nei.HydrotreatingHandler; -import com.hbm.handler.nei.LiquefactionHandler; -import com.hbm.handler.nei.MixerHandler; -import com.hbm.handler.nei.OutgasserHandler; -import com.hbm.handler.nei.PressRecipeHandler; -import com.hbm.handler.nei.RTGRecipeHandler; -import com.hbm.handler.nei.RadiolysisRecipeHandler; -import com.hbm.handler.nei.RefineryRecipeHandler; -import com.hbm.handler.nei.ReformingHandler; -import com.hbm.handler.nei.SILEXRecipeHandler; -import com.hbm.handler.nei.SawmillHandler; -import com.hbm.handler.nei.ShredderRecipeHandler; -import com.hbm.handler.nei.SmithingRecipeHandler; -import com.hbm.handler.nei.SolidificationHandler; -import com.hbm.handler.nei.ToolingHandler; -import com.hbm.handler.nei.VacuumRecipeHandler; -import com.hbm.handler.nei.ZirnoxRecipeHandler; +import com.hbm.handler.nei.*; import codechicken.nei.recipe.TemplateRecipeHandler; @@ -76,7 +30,6 @@ public class NEIRegistry { handlers.add(new CrackingHandler()); handlers.add(new ReformingHandler()); handlers.add(new HydrotreatingHandler()); - handlers.add(new BoilerRecipeHandler()); handlers.add(new ChemplantRecipeHandler()); handlers.add(new CrystallizerRecipeHandler()); handlers.add(new BookRecipeHandler()); diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityRadioTorchLogic.java b/src/main/java/com/hbm/tileentity/network/TileEntityRadioTorchLogic.java index b5d87c8bf..4a44c3504 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntityRadioTorchLogic.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntityRadioTorchLogic.java @@ -10,7 +10,6 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; public class TileEntityRadioTorchLogic extends TileEntity implements INBTPacketReceiver, IControlReceiver { diff --git a/src/main/java/com/hbm/world/dungeon/CrashedVertibird.java b/src/main/java/com/hbm/world/dungeon/CrashedVertibird.java index f9ce89fe1..68b8f2cbb 100644 --- a/src/main/java/com/hbm/world/dungeon/CrashedVertibird.java +++ b/src/main/java/com/hbm/world/dungeon/CrashedVertibird.java @@ -267,9 +267,9 @@ public class CrashedVertibird extends WorldGenerator world.setBlock(x + 6, y + 7 - yOffset, z + 8, Block1, 0, 3); world.setBlock(x + 7, y + 7 - yOffset, z + 8, Block1, 0, 3); world.setBlock(x + 3, y + 7 - yOffset, z + 9, Block1, 0, 3); - world.setBlock(x + 4, y + 7 - yOffset, z + 9, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 4, y + 7 - yOffset, z + 9, ModBlocks.block_electrical_scrap, 0, 3); world.setBlock(x + 5, y + 7 - yOffset, z + 9, ModBlocks.red_wire_coated, 0, 3); - world.setBlock(x + 6, y + 7 - yOffset, z + 9, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 6, y + 7 - yOffset, z + 9, ModBlocks.block_electrical_scrap, 0, 3); world.setBlock(x + 7, y + 7 - yOffset, z + 9, Block1, 0, 3); world.setBlock(x + 5, y + 7 - yOffset, z + 10, Block4, 0, 3); world.setBlock(x + 6, y + 7 - yOffset, z + 10, Block1, 0, 3); @@ -304,13 +304,13 @@ public class CrashedVertibird extends WorldGenerator world.setBlock(x + 6, y + 8 - yOffset, z + 8, Block1, 0, 3); world.setBlock(x + 7, y + 8 - yOffset, z + 8, Block1, 0, 3); world.setBlock(x + 3, y + 8 - yOffset, z + 9, Block1, 0, 3); - world.setBlock(x + 4, y + 8 - yOffset, z + 9, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 4, y + 8 - yOffset, z + 9, ModBlocks.block_electrical_scrap, 0, 3); world.setBlock(x + 5, y + 8 - yOffset, z + 9, ModBlocks.red_wire_coated, 0, 3); - world.setBlock(x + 6, y + 8 - yOffset, z + 9, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 6, y + 8 - yOffset, z + 9, ModBlocks.block_electrical_scrap, 0, 3); world.setBlock(x + 7, y + 8 - yOffset, z + 9, Block1, 0, 3); - world.setBlock(x + 4, y + 8 - yOffset, z + 10, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 4, y + 8 - yOffset, z + 10, ModBlocks.block_electrical_scrap, 0, 3); world.setBlock(x + 5, y + 8 - yOffset, z + 10, ModBlocks.red_wire_coated, 0, 3); - world.setBlock(x + 6, y + 8 - yOffset, z + 10, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 6, y + 8 - yOffset, z + 10, ModBlocks.block_electrical_scrap, 0, 3); world.setBlock(x + 7, y + 8 - yOffset, z + 10, Block1, 0, 3); world.setBlock(x + 5, y + 8 - yOffset, z + 11, Block4, 0, 3); world.setBlock(x + 6, y + 8 - yOffset, z + 11, Block1, 0, 3); @@ -335,9 +335,9 @@ public class CrashedVertibird extends WorldGenerator world.setBlock(x + 4, y + 9 - yOffset, z + 9, Block1, 0, 3); world.setBlock(x + 5, y + 9 - yOffset, z + 9, Block4, 0, 3); world.setBlock(x + 6, y + 9 - yOffset, z + 9, Block1, 0, 3); - world.setBlock(x + 4, y + 9 - yOffset, z + 10, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 4, y + 9 - yOffset, z + 10, ModBlocks.block_electrical_scrap, 0, 3); world.setBlock(x + 5, y + 9 - yOffset, z + 10, ModBlocks.red_wire_coated, 0, 3); - world.setBlock(x + 6, y + 9 - yOffset, z + 10, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 6, y + 9 - yOffset, z + 10, ModBlocks.block_electrical_scrap, 0, 3); world.setBlock(x + 7, y + 9 - yOffset, z + 10, Block1, 0, 3); world.setBlock(x + 5, y + 9 - yOffset, z + 11, ModBlocks.red_wire_coated, 0, 3); world.setBlock(x + 6, y + 9 - yOffset, z + 11, Block1, 0, 3); diff --git a/src/main/java/com/hbm/world/dungeon/DesertAtom001.java b/src/main/java/com/hbm/world/dungeon/DesertAtom001.java index cb2c27ede..194aea997 100644 --- a/src/main/java/com/hbm/world/dungeon/DesertAtom001.java +++ b/src/main/java/com/hbm/world/dungeon/DesertAtom001.java @@ -31,7 +31,7 @@ public class DesertAtom001 extends WorldGenerator Block Block11 = ModBlocks.reinforced_glass; Block Block12 = ModBlocks.reinforced_lamp_off; Block Block13 = ModBlocks.pole_satellite_receiver; - Block Block14 = ModBlocks.machine_generator; + Block Block14 = ModBlocks.pwr_fuel; Block Block15 = ModBlocks.deco_titanium; Block Block16 = ModBlocks.block_lead; Block Block17 = ModBlocks.ore_schrabidium; diff --git a/src/main/java/com/hbm/world/dungeon/DesertAtom002.java b/src/main/java/com/hbm/world/dungeon/DesertAtom002.java index c272079dd..81fdc1634 100644 --- a/src/main/java/com/hbm/world/dungeon/DesertAtom002.java +++ b/src/main/java/com/hbm/world/dungeon/DesertAtom002.java @@ -31,7 +31,7 @@ public class DesertAtom002 Block Block11 = ModBlocks.reinforced_glass; Block Block12 = ModBlocks.reinforced_lamp_off; Block Block13 = ModBlocks.pole_satellite_receiver; - Block Block14 = ModBlocks.machine_generator; + Block Block14 = ModBlocks.pwr_fuel; Block Block15 = ModBlocks.deco_titanium; Block Block16 = ModBlocks.block_lead; Block Block17 = ModBlocks.ore_nether_plutonium; diff --git a/src/main/java/com/hbm/world/dungeon/DesertAtom003.java b/src/main/java/com/hbm/world/dungeon/DesertAtom003.java index 6aca90eec..de58b4283 100644 --- a/src/main/java/com/hbm/world/dungeon/DesertAtom003.java +++ b/src/main/java/com/hbm/world/dungeon/DesertAtom003.java @@ -34,7 +34,7 @@ public class DesertAtom003 Block Block11 = ModBlocks.reinforced_glass; Block Block12 = ModBlocks.reinforced_lamp_off; Block Block13 = ModBlocks.pole_satellite_receiver; - Block Block14 = ModBlocks.machine_generator; + Block Block14 = ModBlocks.pwr_fuel; Block Block15 = ModBlocks.deco_titanium; Block Block16 = ModBlocks.block_lead; Block Block17 = ModBlocks.ore_schrabidium; diff --git a/src/main/java/com/hbm/world/dungeon/Spaceship.java b/src/main/java/com/hbm/world/dungeon/Spaceship.java index b3deb1a02..4ab3bba36 100644 --- a/src/main/java/com/hbm/world/dungeon/Spaceship.java +++ b/src/main/java/com/hbm/world/dungeon/Spaceship.java @@ -889,14 +889,14 @@ public class Spaceship extends WorldGenerator world.setBlock(x + 10, y + -1, z + 29, Block3, 0, 3); world.setBlock(x + 11, y + -1, z + 29, Block3, 0, 3); world.setBlock(x + 2, y + -1, z + 30, Block3, 0, 3); - world.setBlock(x + 3, y + -1, z + 30, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 3, y + -1, z + 30, ModBlocks.pwr_control, 0, 3); world.setBlock(x + 4, y + -1, z + 30, ModBlocks.red_cable, 0, 3); world.setBlock(x + 5, y + -1, z + 30, Blocks.air, 0, 3); world.setBlock(x + 6, y + -1, z + 30, Blocks.air, 0, 3); world.setBlock(x + 7, y + -1, z + 30, Blocks.air, 0, 3); world.setBlock(x + 8, y + -1, z + 30, Blocks.air, 0, 3); world.setBlock(x + 9, y + -1, z + 30, ModBlocks.red_cable, 0, 3); - world.setBlock(x + 10, y + -1, z + 30, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 10, y + -1, z + 30, ModBlocks.pwr_control, 0, 3); world.setBlock(x + 11, y + -1, z + 30, Block3, 0, 3); world.setBlock(x + 2, y + -1, z + 31, Block2, 0, 3); world.setBlock(x + 3, y + -1, z + 31, Block3, 0, 3); diff --git a/src/main/java/com/hbm/world/dungeon/Vertibird.java b/src/main/java/com/hbm/world/dungeon/Vertibird.java index 9890ae66f..67b34f015 100644 --- a/src/main/java/com/hbm/world/dungeon/Vertibird.java +++ b/src/main/java/com/hbm/world/dungeon/Vertibird.java @@ -225,14 +225,14 @@ public class Vertibird extends WorldGenerator world.setBlock(x + 14, y + 4 - yOffset, z + 8, Block2, 0, 3); world.setBlock(x + 15, y + 4 - yOffset, z + 8, Block2, 0, 3); world.setBlock(x + 11, y + 4 - yOffset, z + 9, Block2, 0, 3); - world.setBlock(x + 12, y + 4 - yOffset, z + 9, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 12, y + 4 - yOffset, z + 9, ModBlocks.block_electrical_scrap, 0, 3); world.setBlock(x + 13, y + 4 - yOffset, z + 9, ModBlocks.red_wire_coated, 0, 3); - world.setBlock(x + 14, y + 4 - yOffset, z + 9, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 14, y + 4 - yOffset, z + 9, ModBlocks.block_electrical_scrap, 0, 3); world.setBlock(x + 15, y + 4 - yOffset, z + 9, Block2, 0, 3); world.setBlock(x + 11, y + 4 - yOffset, z + 10, Block2, 0, 3); - world.setBlock(x + 12, y + 4 - yOffset, z + 10, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 12, y + 4 - yOffset, z + 10, ModBlocks.block_electrical_scrap, 0, 3); world.setBlock(x + 13, y + 4 - yOffset, z + 10, ModBlocks.red_wire_coated, 0, 3); - world.setBlock(x + 14, y + 4 - yOffset, z + 10, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 14, y + 4 - yOffset, z + 10, ModBlocks.block_electrical_scrap, 0, 3); world.setBlock(x + 15, y + 4 - yOffset, z + 10, Block2, 0, 3); world.setBlock(x + 11, y + 4 - yOffset, z + 11, Block2, 0, 3); world.setBlock(x + 12, y + 4 - yOffset, z + 11, Block2, 0, 3); @@ -305,14 +305,14 @@ public class Vertibird extends WorldGenerator world.setBlock(x + 14, y + 5 - yOffset, z + 8, Block2, 0, 3); world.setBlock(x + 15, y + 5 - yOffset, z + 8, Block2, 0, 3); world.setBlock(x + 11, y + 5 - yOffset, z + 9, Block2, 0, 3); - world.setBlock(x + 12, y + 5 - yOffset, z + 9, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 12, y + 5 - yOffset, z + 9, ModBlocks.block_electrical_scrap, 0, 3); world.setBlock(x + 13, y + 5 - yOffset, z + 9, ModBlocks.red_wire_coated, 0, 3); - world.setBlock(x + 14, y + 5 - yOffset, z + 9, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 14, y + 5 - yOffset, z + 9, ModBlocks.block_electrical_scrap, 0, 3); world.setBlock(x + 15, y + 5 - yOffset, z + 9, Block2, 0, 3); world.setBlock(x + 11, y + 5 - yOffset, z + 10, Block2, 0, 3); - world.setBlock(x + 12, y + 5 - yOffset, z + 10, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 12, y + 5 - yOffset, z + 10, ModBlocks.block_electrical_scrap, 0, 3); world.setBlock(x + 13, y + 5 - yOffset, z + 10, ModBlocks.red_wire_coated, 0, 3); - world.setBlock(x + 14, y + 5 - yOffset, z + 10, ModBlocks.machine_generator, 0, 3); + world.setBlock(x + 14, y + 5 - yOffset, z + 10, ModBlocks.block_electrical_scrap, 0, 3); world.setBlock(x + 15, y + 5 - yOffset, z + 10, Block2, 0, 3); world.setBlock(x + 12, y + 5 - yOffset, z + 11, Block2, 0, 3); world.setBlock(x + 13, y + 5 - yOffset, z + 11, ModBlocks.red_wire_coated, 0, 3); diff --git a/src/main/java/com/hbm/world/gen/component/CivilianFeatures.java b/src/main/java/com/hbm/world/gen/component/CivilianFeatures.java index fd8e0b123..b6a335dd4 100644 --- a/src/main/java/com/hbm/world/gen/component/CivilianFeatures.java +++ b/src/main/java/com/hbm/world/gen/component/CivilianFeatures.java @@ -696,7 +696,7 @@ public class CivilianFeatures { this.fillWithBlocks(world, box, 2, 6, 1, 4, 6, 2, ModBlocks.steel_roof, Blocks.air, false); this.fillWithBlocks(world, box, 2, 1, 1, 2, 3, 1, ModBlocks.deco_red_copper, Blocks.air, false); this.fillWithBlocks(world, box, 3, 1, 1, 3, 1, 2, ModBlocks.deco_beryllium, Blocks.air, false); - this.placeBlockAtCurrentPosition(world, ModBlocks.machine_generator, 0, 4, 1, 1, box); + this.placeBlockAtCurrentPosition(world, ModBlocks.machine_amgen, 0, 4, 1, 1, box); this.placeBlockAtCurrentPosition(world, ModBlocks.machine_detector, 0, 4, 1, 2, box); this.fillWithBlocks(world, box, 5, 1, 1, 5, 1, 2, ModBlocks.deco_beryllium, Blocks.air, false); this.fillWithBlocks(world, box, 6, 1, 1, 6, 3, 1, ModBlocks.deco_red_copper, Blocks.air, false); diff --git a/src/main/java/com/hbm/world/gen/component/SiloComponent.java b/src/main/java/com/hbm/world/gen/component/SiloComponent.java index 96415db46..4dd2aaee0 100644 --- a/src/main/java/com/hbm/world/gen/component/SiloComponent.java +++ b/src/main/java/com/hbm/world/gen/component/SiloComponent.java @@ -412,7 +412,7 @@ public class SiloComponent extends Component { placeBlockAtCurrentPosition(world, Blocks.heavy_weighted_pressure_plate, 0, 34, 22, 18, box); placeBlockAtCurrentPosition(world, ModBlocks.capacitor_copper, decoE, 36, 21, 16, box); placeBlockAtCurrentPosition(world, ModBlocks.deco_steel, 0, 36, 21, 17, box); - placeBlockAtCurrentPosition(world, ModBlocks.machine_generator, 0, 36, 21, 19, box); + placeBlockAtCurrentPosition(world, ModBlocks.fusion_conductor, 0, 36, 21, 19, box); fillWithMetadataBlocks(world, box, 36, 22, 16, 36, 23, 16, ModBlocks.tape_recorder, decoE); placeBlockAtCurrentPosition(world, ModBlocks.deco_computer, decoModelW, 36, 22, 17, box); fillWithMetadataBlocks(world, box, 36, 21, 18, 36, 23, 18, ModBlocks.tape_recorder, decoE); diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_block.png b/src/main/resources/assets/hbm/textures/blocks/icf_block.png new file mode 100644 index 0000000000000000000000000000000000000000..f2c0b4c202fb228ab8a4892ebf271580d85e0ac1 GIT binary patch literal 355 zcmV-p0i6DcP)^NZ_~;JOl#6o_F2aWdvLs5}au5(N z4C27%iObC6pUQ0R8__2c|a;fT^mA7NL_@N3Q_`NEmMfB*DI7#jBduwp2>&D0Anp*=N=&? z+E@^hm=|T~mzFC4-7r!&4JpIuCVWgF1XAh6+=nF~h$%0Q%jG%U97s9S^+N%;ab>sL zk%0MXZ&klt=4AyJK-;!Ywew4#2|ynXho_SPz5#3RePwq3k9hz9002ovPDHLkV1lp5 Bj$;4- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_block_ct.png b/src/main/resources/assets/hbm/textures/blocks/icf_block_ct.png new file mode 100644 index 0000000000000000000000000000000000000000..5f9bb3080b0b6e8b34542b1fac45854cc6df0711 GIT binary patch literal 1039 zcmV+q1n~QbP)va}X=YGO~;8B>yF%Ff-Wh?z-opjlu5Gn5ZX5vh0WYPW^R!>eMg4|MqLmDdR%~QCzM&l-4wj#k!VU zA*M(!m7EJP7ko$*Kxxfa-#=%yTJ1kSKfQk|FW){pSZ`9yJh=ZgAs3u$_~s(h`+!m! z<61%tq*BSH;6r8zk+X9}uJHcyisN|p^vSLK=4ibMF*3x2wT>YKwtXPgiq_z}Yn-$A zm{3ZC2-aD0g%mTTO!nu)roWXx4yCj~X+s|(rH*B7n+9Vv+Gwsf9iS)`a;;QRh|;87 z$hA%rp5Twe6oerrjMn5*8Dc`0ijRr5Z7{|nN>N3qr4nKSQN&URDNPcd;wOT89}p2f zbOS@oIA>9MEZ2HFuvjb@Vqyr1ick@TFp5CbB;hH3BEW}4Ooj915~ataq7)%!oO7(Z zo{C_sW!nuD1Vo6bFg*_^`N?0Pw8mIVF5?v|wUBeAX&SCJOU14-rHt1*~)UlsP|NqP3k>0B0y=yS=$nGVF-zWkV_pqR_T4&ORcQ89mZJt!S5N0j>4^J>T{LYb{lT^qC*n4xWGBU-IMQdsF@v zKk(+&vjcv%ADGL}_5*YI*?wR)Ki3b;7 z#j<_y>G#q1gNsK12Yg-svG)UE=Lh28$vZ!=y#Mfkztc(h?%g}y{PY7MWkhL|8K3Nr zeqiw9(f-#_{Hfs**16FSq%!dXANRcz0WV&>*eCoieqgm)@h|xki1?jl;W_{S002ov JPDHLkV1n=d=_3FD literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_capacitor_side.png b/src/main/resources/assets/hbm/textures/blocks/icf_capacitor_side.png new file mode 100644 index 0000000000000000000000000000000000000000..71c3c138838a070253861e7e08130843e164eb14 GIT binary patch literal 443 zcmV;s0Yv_ZP)$iDA4uN=AiZZ)d?D5u&)y@? z2O-zrzY0Ym>~XJt9K?ZxTS7rT~OoIpV;W70IG zD2kyta!9M^1002ovPDHLkV1g;1%(4Ig literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_capacitor_top.png b/src/main/resources/assets/hbm/textures/blocks/icf_capacitor_top.png new file mode 100644 index 0000000000000000000000000000000000000000..ee5387e891dac2e769a278c0c13293dec3b9fa19 GIT binary patch literal 314 zcmV-A0mc4_P)b;z7(n4iYT3Vs1feWUDGNil-iE1XX^+*JwP$D*2@#aR z61AmR;FxsiPAo}j!gb*0V zk(@Ja+X67>sw_(mhXY^lZy2L7#;~cEeA`!=reV%iN{MkCF-G%TSBMeTtBT9-1@Ap` zUi5vBa}Hw+VgwPviY3N~_ntXdF-C@AU{fzyuPUrqthEfoKuU=@S0Mzv_k0#FxF5&u zmI>iRQ50ycne(UZcKgxyJt?LCs!Aau#29hTQI;k5eDV0;@qu&v0aPWM=*xuAFaQ7m M07*qoM6N<$f`*ZYod5s; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_casing.png b/src/main/resources/assets/hbm/textures/blocks/icf_casing.png new file mode 100644 index 0000000000000000000000000000000000000000..56d93d6291fa1380eea7cd3ab9368e5f9b8cfa2b GIT binary patch literal 684 zcmV;d0#p5oP)h=1K6d#YHj)D-Os}OE;Eg41|HOGy_o(MO!n>2WO|J+}!O!6j7yhr`F2zVP+uYQg}TqyuaIn z2;BpKtSOOl#v{1C+Oc-SeK1WE4=;z~PfiNvf#%G1yJd(XqIe8cRERN{TL%#$pw!B0 z&e_>1DJABmv9!+m8AVef*Fwq#o!8FXj;?QR_moacR&RnaQE>q#yDQSxxHgvR&uF)*zalP1&KvGV0^DF63@N2f2vsA@fGQ1RoCfL=bUz*zL}L$FjdTqwrxl$0idOj zQlgYh*S5s2L%b)1fOya8d`3mX^zKZR#$IO*EOn2N(oaX=R{7KTep7U?c2YYPN&OfjgV97 zX__(~-=wN*s;WX&IXE}~Gp1WpQjF}s-skn3H*9Tf_2X)UE_URUF*UCB06086Y-D?%un{?++jH^Xe)oC93M2>iit6XJ}@a zD$cncAcPSi1ibf*Mk|C6sLm@=N@yvZeK{lNjF|$i9~S8~&{9Y-5@W~w^pxG*U3PYM zP%W4lW!YCP?Ct%@{rlTEksA?ZQfB$}?SzJ+arjXg(++;GD3@UeBOU@a9oD;F@c>nI*kj9Ww;`4mY@$tz}bk5;K zhTo_qQ;K4$!)o3KR14wc$Oy_O`2U5=D(I;&Tx;fic`2OvKyR8pm zP9L4=fw|MVQTqT@EWoFc+Zfa_DP^Pf&g<^X2vUM}eX?zZHYTbGL?~Oq0_HG0AZyB~ z!`%m}il)So5&_HzKA#uIe&7KXL5LzEOj{(`5$c%alrRtKm?RI{m>kDW&IM5=L|k<$Ia1KZHNeeu1X!owiPrj+{deOo+ouoYM%r`Ak@BwAd1#D7}NQ9e@D~06jk~# zwr%5a-2_4|h1XSa1Vk9q2_UDO(UdTEhB+RNS+MUrzn|C2Y&fNasBOG5@p-?e7+D>a@jyu=WR?p zplpRcC+^Uvp`ya$YKSOz>pZTT<2>uQ9Kk#Y z1T@jU8t@1nuZx@ucWsMU6`gY(EI?8sBEFnQ2Cduf_#5|T85rDEECwJ}C)=9Zwu}Bf+f0=EgYcgL1ivR!s07*qoM6N<$f|ITf A*8l(j literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_controller.png b/src/main/resources/assets/hbm/textures/blocks/icf_controller.png new file mode 100644 index 0000000000000000000000000000000000000000..4ad1c003f6076aad88a93af9d49d212bdbbac68e GIT binary patch literal 737 zcmV<70v`Q|P)&w0O{Fq~*zBS)&zVjVs<~w6P zxb{{~Q5j%q$F5oKHVP-8=zM*ELUK3cw4K3S$f@DVj4@F$^JcLWFOA?`hkXrfIl(@eFHg70ce^ zoa5%5yG$k%Zq*H!_s$Yj@i8HT4;W)Od^`ZqG!1XOdI5~#hkL&;|6|S&BCqf5vbD7Z zz~Cbo0V9a_k(e?+E;4mp^X6+WVnq09_8Xsk@f9Ck|C0N^KEOK1&QpfzbjqFYe5hf}VepubmJ;(msQ`a?D zE?pqR#OCHEV+cIzjz}36%fxIppB4XVMH~95o}6;7*dAkpAqW1p=lb-bo%eG0>Etc&tvVLIgKJ@3{ex-$B1U| zF`*eQ@0}%T=JvPyPndY|rE?6UCuZo!k;lV8#$d~`B&1B=wv=UsVi-f<-02;hb12Y{ zp5^i{hA|LTvDP6)f%g&XV`6b|NKDGm9UkAeC_n^*kO1Eu;eEta6$+%3z!?4puw!+p T97HHr00000NkvXXu0mjfblh2d literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_emitter.png b/src/main/resources/assets/hbm/textures/blocks/icf_emitter.png new file mode 100644 index 0000000000000000000000000000000000000000..f077f304b6bfbd7e3496ab724af8c1f67bf670db GIT binary patch literal 476 zcmV<20VDp2P)$+M>!E78ya?W_~QB~|;N{O5^Ap}GO?>(2xg#Zv^q}EE# znNkWOf{0K`q1KA3GEEaA0)VQrSS%QZ0Vg6j=dftcB0{aTb+h+cE2We+SuoVUMKQ)U zjjFO-E*pR~QPm#`r4&>ZRi*EHoO9f6H|91B11~QxIOiHIfG`)((684ke=ViNdcEd+ zKDS9rDY$8xnpiPLhG8J3^wd8-K3J_*jf#lijQ_k-*L6>0O6gaws^Uy}?>*joQcAqO zzOvix{>79M-g}&Lgb;qBsc(~{lmIv$k58kGZxn*cuwL*d*AjHnOzq$-#7Uvvd*YqhWq9qZW&Wj7B3in+>PaiKc02+m`8c%49NOJRWn+ zP2cx;?>QciESF2HwHyuy>bj;V3Sw^BAK&#X&L{l!noZFB>&|S?Ld>-SH1EgD z<^KN`bA18?xYcU-lqz^d@CY$CcfV_-C@{+%)*B0&-JVaXgq01^dWF6-7K#N1TBW=K`>>FEjm@Ib!ZQawIWI)|FisqXKu vx>>DOFE&wvg(2^e~j=OdIx4MeO}Dwh)5s7=f-hh4u}X*6a~eW1K+^@^;uA;ah|dn eAw=k7{fRHtgN$laAV>)S0000`7RZ7MMF!{xepPAX-J pnYBW}(j6Y3jx1zka52;?W?cQvFlKSOMIO)<44$rjF6*2UngBL!LYe>o diff --git a/src/main/resources/assets/hbm/textures/blocks/rtty_logic_on.png b/src/main/resources/assets/hbm/textures/blocks/rtty_logic_on.png index 9ae22b7946c7f71814f0c81d24bd0e7a68701a07..752c65d562ee3e67faeed5d43f2d3fa703cf0c01 100644 GIT binary patch delta 231 zcmVQx_ew|sNFGSCpNo^W831C8^xlhriBvSkpzAudf&LLf2w-&1=_6QcKSmG%IcKzO zD*{FhUx`GbauO4HzCU@qJVb~%Nb?!7S}t@3-Y&4c>USYFJNRlN{_)#;@J)oNR1DP` hbzS2oy!rnpFs!2paR7gu>7zKkJ{AFPH55iC`X#k}0{|zASC({tH0sp51@qfx( zv7TJbAW&IZ`QOaU46gx9P#P=X;^JcX_wOH+M-G_s|35?78FKQy5E2sd-_X#Id@pEd zXb|)QUIT92xWVw}&mSmn6bw}WN{Jv$7658I_W1k%c_&}sH3V-$5@G+(;HxVR<&gu3 z$V_-$Q2Dfq!R$a5l!qPAwmhJ?NE-^}0Rsa7_BCTK=3-)x00000NkvXXu0mjfaav}M