diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 24ebe2f4c..b564d1736 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -849,6 +849,7 @@ public class ModBlocks { public static Block struct_iter_core; public static Block struct_plasma_core; public static Block struct_watz_core; + public static Block struct_icf_core; public static Block factory_titanium_hull; @Deprecated public static Block factory_titanium_furnace; @@ -892,6 +893,7 @@ public class ModBlocks { public static Block plasma_heater; public static Block machine_icf_press; + public static Block icf_component; public static Block icf; public static Block icf_controller; public static Block icf_laser_component; @@ -1969,6 +1971,7 @@ public class ModBlocks { struct_iter_core = new BlockITERStruct(Material.iron).setBlockName("struct_iter_core").setLightLevel(1F).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":struct_iter_core"); struct_plasma_core = new BlockPlasmaStruct(Material.iron).setBlockName("struct_plasma_core").setLightLevel(1F).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":struct_plasma_core"); struct_watz_core = new BlockWatzStruct(Material.iron).setBlockName("struct_watz_core").setLightLevel(1F).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":struct_watz_core"); + struct_icf_core = new BlockICFStruct(Material.iron).setBlockName("struct_icf_core").setLightLevel(1F).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":struct_icf_core"); factory_titanium_hull = new BlockGeneric(Material.iron).setBlockName("factory_titanium_hull").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":factory_titanium_hull"); factory_titanium_furnace = new FactoryHatch(Material.iron).setBlockName("factory_titanium_furnace").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":factory_titanium_furnace"); @@ -2011,6 +2014,7 @@ public class ModBlocks { machine_icf_press = new MachineICFPress().setBlockName("machine_icf_press").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); icf = new MachineICF().setBlockName("icf").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); + icf_component = new BlockICFComponent().setBlockName("icf_component").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":icf_component"); icf_controller = new MachineICFController().setBlockName("icf_controller").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":icf_casing"); icf_laser_component = new BlockICFLaserComponent().setBlockName("icf_laser_component").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab); icf_block = new BlockICF(Material.iron).setBlockName("icf_block").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":icf_block"); @@ -3292,6 +3296,7 @@ public class ModBlocks { GameRegistry.registerBlock(struct_iter_core, struct_iter_core.getUnlocalizedName()); GameRegistry.registerBlock(struct_plasma_core, struct_plasma_core.getUnlocalizedName()); GameRegistry.registerBlock(struct_watz_core, struct_watz_core.getUnlocalizedName()); + GameRegistry.registerBlock(struct_icf_core, struct_icf_core.getUnlocalizedName()); //Absorbers GameRegistry.registerBlock(absorber, absorber.getUnlocalizedName()); @@ -3348,6 +3353,7 @@ public class ModBlocks { register(icf_laser_component); register(icf_controller); register(icf_block); + register(icf_component); register(icf); GameRegistry.registerBlock(watz_element, watz_element.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/generic/BlockToolConversion.java b/src/main/java/com/hbm/blocks/generic/BlockToolConversion.java index 5eecc281b..46bb571e5 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockToolConversion.java +++ b/src/main/java/com/hbm/blocks/generic/BlockToolConversion.java @@ -134,7 +134,8 @@ public class BlockToolConversion extends BlockMulti implements IToolable, ILookO } if(!materials.isEmpty()) { - ILookOverlay.printGeneric(event, I18nUtil.resolveKey(this.getUnlocalizedName() + ".name"), 0xffff00, 0x404000, text); + int meta = world.getBlockMetadata(x, y, z); + ILookOverlay.printGeneric(event, I18nUtil.resolveKey(this.getUnlocalizedName(new ItemStack(this, 1, meta)) + ".name"), 0xffff00, 0x404000, text); } } @@ -152,6 +153,8 @@ public class BlockToolConversion extends BlockMulti implements IToolable, ILookO public static void registerRecipes() { conversions.put(new Pair(ToolType.BOLT, new MetaBlock(ModBlocks.watz_end, 0)), new Pair(new AStack[] {new OreDictStack(OreDictManager.DURA.bolt(), 4)}, new MetaBlock(ModBlocks.watz_end, 1))); conversions.put(new Pair(ToolType.TORCH, new MetaBlock(ModBlocks.fusion_conductor, 0)), new Pair(new AStack[] {new OreDictStack(OreDictManager.STEEL.plateCast())}, new MetaBlock(ModBlocks.fusion_conductor, 1))); + conversions.put(new Pair(ToolType.TORCH, new MetaBlock(ModBlocks.icf_component, 1)), new Pair(new AStack[] {new OreDictStack(OreDictManager.ANY_BISMOIDBRONZE.plateCast())}, new MetaBlock(ModBlocks.icf_component, 2))); + conversions.put(new Pair(ToolType.BOLT, new MetaBlock(ModBlocks.icf_component, 3)), new Pair(new AStack[] {new OreDictStack(OreDictManager.STEEL.plateCast()), new OreDictStack(OreDictManager.DURA.bolt(), 4)}, new MetaBlock(ModBlocks.icf_component, 4))); } public static HashMap bufferedRecipes = new HashMap(); diff --git a/src/main/java/com/hbm/blocks/machine/BlockICFComponent.java b/src/main/java/com/hbm/blocks/machine/BlockICFComponent.java new file mode 100644 index 000000000..e2b8ec26c --- /dev/null +++ b/src/main/java/com/hbm/blocks/machine/BlockICFComponent.java @@ -0,0 +1,13 @@ +package com.hbm.blocks.machine; + +import com.hbm.blocks.generic.BlockToolConversion; + +import net.minecraft.block.material.Material; + +public class BlockICFComponent extends BlockToolConversion { + + public BlockICFComponent() { + super(Material.iron); + this.addVariant(".vessel", ".vessel_welded", ".structure", ".structure_bolted"); + } +} diff --git a/src/main/java/com/hbm/blocks/machine/BlockICFStruct.java b/src/main/java/com/hbm/blocks/machine/BlockICFStruct.java new file mode 100644 index 000000000..b356b570c --- /dev/null +++ b/src/main/java/com/hbm/blocks/machine/BlockICFStruct.java @@ -0,0 +1,27 @@ +package com.hbm.blocks.machine; + +import com.hbm.tileentity.machine.TileEntityICFStruct; + +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; + +public class BlockICFStruct extends BlockContainer { + + public BlockICFStruct(Material mat) { super(mat); } + @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityICFStruct(); } + @Override public boolean isOpaqueCube() { return false; } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { + int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + if(i == 0) world.setBlockMetadataWithNotify(x, y, z, 2, 2); + if(i == 1) world.setBlockMetadataWithNotify(x, y, z, 5, 2); + if(i == 2) world.setBlockMetadataWithNotify(x, y, z, 3, 2); + if(i == 3) world.setBlockMetadataWithNotify(x, y, z, 4, 2); + } +} diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 9e561dcef..8f0d59a7b 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -356,6 +356,7 @@ public class ClientProxy extends ServerProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileEntityITERStruct.class, new RenderITERMultiblock()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPlasmaStruct.class, new RenderPlasmaMultiblock()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityWatzStruct.class, new RenderWatzMultiblock()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityICFStruct.class, new RenderICFMultiblock()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCustomMachine.class, new RenderCustomMachine()); //RBMK ClientRegistry.bindTileEntitySpecialRenderer(TileEntityRBMKControlManual.class, new RenderRBMKControlRod()); diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java index 943a74c94..9a1a64d07 100644 --- a/src/main/java/com/hbm/main/ModEventHandler.java +++ b/src/main/java/com/hbm/main/ModEventHandler.java @@ -896,8 +896,7 @@ public class ModEventHandler { if(player.getCurrentArmor(2) == null && !player.onGround) { boolean isBob = player.getUniqueID().toString().equals(ShadyUtil.HbMinecraft) || player.getDisplayName().equals("HbMinecraft"); - boolean isOther = player.getUniqueID().toString().equals(ShadyUtil.SolsticeUnlimitd) || player.getDisplayName().equals("SolsticeUnlimitd") || - player.getUniqueID().toString().equals(ShadyUtil.the_NCR) || player.getDisplayName().equals("the_NCR"); + boolean isOther = player.getUniqueID().toString().equals(ShadyUtil.the_NCR) || player.getDisplayName().equals("the_NCR"); if(isBob || isOther) { diff --git a/src/main/java/com/hbm/main/ModEventHandlerClient.java b/src/main/java/com/hbm/main/ModEventHandlerClient.java index cb9787e5c..6e0742fb0 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerClient.java +++ b/src/main/java/com/hbm/main/ModEventHandlerClient.java @@ -577,8 +577,6 @@ public class ModEventHandlerClient { } if(player.getCurrentArmor(2) == null && !player.isPotionActive(Potion.invisibility)) { - if(player.getUniqueID().toString().equals(ShadyUtil.SolsticeUnlimitd) || player.getDisplayName().equals("SolsticeUnlimitd")) - RenderAccessoryUtility.renderSol(event); if(player.getUniqueID().toString().equals(ShadyUtil.HbMinecraft) || player.getDisplayName().equals("HbMinecraft")) RenderAccessoryUtility.renderWings(event, 2); if(player.getUniqueID().toString().equals(ShadyUtil.the_NCR) || player.getDisplayName().equals("the_NCR")) diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java index fa6578bf5..c4a2895d6 100644 --- a/src/main/java/com/hbm/main/ResourceManager.java +++ b/src/main/java/com/hbm/main/ResourceManager.java @@ -860,7 +860,6 @@ public class ResourceManager { public static final IModelCustom armor_bismuth = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/bismuth.obj")); public static final IModelCustom armor_mod_tesla = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/mod_tesla.obj")); public static final IModelCustom armor_wings = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/murk.obj")); - public static final IModelCustom armor_solstice = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/solstice.obj")); public static final IModelCustom player_manly_af = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/armor/player_fem.obj")); public static final IModelCustom armor_envsuit = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/envsuit.obj")); public static final IModelCustom armor_trenchmaster = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/trenchmaster.obj")); @@ -1024,7 +1023,6 @@ public class ResourceManager { public static final ResourceLocation wings_murk = new ResourceLocation(RefStrings.MODID, "textures/armor/wings_murk.png"); public static final ResourceLocation wings_bob = new ResourceLocation(RefStrings.MODID, "textures/armor/wings_bob.png"); public static final ResourceLocation wings_black = new ResourceLocation(RefStrings.MODID, "textures/armor/wings_black.png"); - public static final ResourceLocation wings_solstice = new ResourceLocation(RefStrings.MODID, "textures/armor/wings_solstice.png"); public static final ResourceLocation hat = new ResourceLocation(RefStrings.MODID, "textures/armor/hat.png"); public static final ResourceLocation no9 = new ResourceLocation(RefStrings.MODID, "textures/armor/no9.png"); diff --git a/src/main/java/com/hbm/render/model/ModelArmorSolstice.java b/src/main/java/com/hbm/render/model/ModelArmorSolstice.java deleted file mode 100644 index 868254bb4..000000000 --- a/src/main/java/com/hbm/render/model/ModelArmorSolstice.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hbm.render.model; - -import com.hbm.main.ResourceManager; -import com.hbm.render.loader.ModelRendererObj; - -import net.minecraft.util.ResourceLocation; - -public class ModelArmorSolstice extends ModelArmorWings { - - public ModelArmorSolstice() { - super(0); - - wingLB = new ModelRendererObj(ResourceManager.armor_solstice, "WingLB"); - wingLT = new ModelRendererObj(ResourceManager.armor_solstice, "WingLT"); - wingRB = new ModelRendererObj(ResourceManager.armor_solstice, "WingRB"); - wingRT = new ModelRendererObj(ResourceManager.armor_solstice, "WingRT"); - } - - @Override - protected boolean doesRotateZ() { - return false; - } - - @Override - protected ResourceLocation getTexture() { - return ResourceManager.wings_solstice; - } -} diff --git a/src/main/java/com/hbm/render/tileentity/RenderICFMultiblock.java b/src/main/java/com/hbm/render/tileentity/RenderICFMultiblock.java new file mode 100644 index 000000000..a44dd345d --- /dev/null +++ b/src/main/java/com/hbm/render/tileentity/RenderICFMultiblock.java @@ -0,0 +1,48 @@ +package com.hbm.render.tileentity; + +import org.lwjgl.opengl.GL11; + +import com.hbm.blocks.ModBlocks; +import com.hbm.render.util.SmallBlockPronter; + +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; + +public class RenderICFMultiblock extends TileEntitySpecialRenderer { + + @Override + public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float interp) { + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5, y, z + 0.5); + + switch(tile.getBlockMetadata()) { + case 2: GL11.glRotatef(270, 0F, 1F, 0F); break; + case 4: GL11.glRotatef(0, 0F, 1F, 0F); break; + case 3: GL11.glRotatef(90, 0F, 1F, 0F); break; + case 5: GL11.glRotatef(180, 0F, 1F, 0F); break; + } + + GL11.glTranslated(-0.5, 0, -0.5); + + bindTexture(TextureMap.locationBlocksTexture); + SmallBlockPronter.startDrawing(); + + for(int i = -8; i <= 8; i++) { + SmallBlockPronter.drawSmolBlockAt(ModBlocks.icf_component, 0, 1F, 0F, i); + if(i != 0) SmallBlockPronter.drawSmolBlockAt(ModBlocks.icf_component, 0, 0F, 0F, i); + SmallBlockPronter.drawSmolBlockAt(ModBlocks.icf_component, 0, -1F, 0F, i); + SmallBlockPronter.drawSmolBlockAt(ModBlocks.icf_component, 2, 0F, 3F, i); + for(int j = -1; j <= 1; j++) SmallBlockPronter.drawSmolBlockAt(ModBlocks.icf_component, Math.abs(i) <= 2 ? 2 : 4, j, 1F, i); + for(int j = -2; j <= 2; j++) SmallBlockPronter.drawSmolBlockAt(ModBlocks.icf_component, Math.abs(i) <= 2 ? 2 : 4, j, 2F, i); + for(int j = -2; j <= 2; j++) if(j != 0) SmallBlockPronter.drawSmolBlockAt(ModBlocks.icf_component, Math.abs(i) <= 2 ? 2 : 4, j, 3F, i); + for(int j = -2; j <= 2; j++) SmallBlockPronter.drawSmolBlockAt(ModBlocks.icf_component, Math.abs(i) <= 2 ? 2 : 4, j, 4F, i); + for(int j = -1; j <= 1; j++) SmallBlockPronter.drawSmolBlockAt(ModBlocks.icf_component, Math.abs(i) <= 2 ? 2 : 4, j, 5F, i); + } + + SmallBlockPronter.draw(); + + GL11.glPopMatrix(); + } + +} diff --git a/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java b/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java index cc33c6880..9629ff429 100644 --- a/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java +++ b/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java @@ -2,7 +2,6 @@ package com.hbm.render.util; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.render.model.ModelArmorSolstice; import com.hbm.render.model.ModelArmorWings; import com.hbm.util.ShadyUtil; @@ -141,28 +140,6 @@ public class RenderAccessoryUtility { return null; } - private static ModelBiped solModel; - public static void renderSol(RenderPlayerEvent.SetArmorModel event) { - - if(solModel == null) - solModel = new ModelArmorSolstice(); - - RenderPlayer renderer = event.renderer; - ModelBiped model = renderer.modelArmor; - EntityPlayer player = event.entityPlayer; - - solModel.isSneak = model.isSneak; - - float interp = event.partialRenderTick; - float yawHead = player.prevRotationYawHead + (player.rotationYawHead - player.prevRotationYawHead) * interp; - float yawOffset = player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * interp; - float yaw = yawHead - yawOffset; - float yawWrapped = MathHelper.wrapAngleTo180_float(yawHead - yawOffset); - float pitch = player.rotationPitch; - - solModel.render(event.entityPlayer, 0.0F, 0.0F, yawWrapped, yaw, pitch, 0.0625F); - } - private static ModelBiped[] wingModels = new ModelBiped[10]; public static void renderWings(RenderPlayerEvent.SetArmorModel event, int mode) { diff --git a/src/main/java/com/hbm/tileentity/TileMappings.java b/src/main/java/com/hbm/tileentity/TileMappings.java index c501d3ead..cc0aca22e 100644 --- a/src/main/java/com/hbm/tileentity/TileMappings.java +++ b/src/main/java/com/hbm/tileentity/TileMappings.java @@ -170,6 +170,7 @@ public class TileMappings { put(TileEntityTrappedBrick.class, "tileentity_trapped_brick"); put(TileEntityPlasmaStruct.class, "tileentity_plasma_struct"); put(TileEntityWatzStruct.class, "tileentity_watz_struct"); + put(TileEntityICFStruct.class, "tileentity_icf_struct"); put(TileEntityHadronDiode.class, "tileentity_hadron_diode"); put(TileEntityHadronPower.class, "tileentity_hadron_power"); put(TileEntityHadron.class, "tileentity_hadron"); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityICFStruct.java b/src/main/java/com/hbm/tileentity/machine/TileEntityICFStruct.java new file mode 100644 index 000000000..8ac3eaa0a --- /dev/null +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityICFStruct.java @@ -0,0 +1,7 @@ +package com.hbm.tileentity.machine; + +import net.minecraft.tileentity.TileEntity; + +public class TileEntityICFStruct extends TileEntity { + +} diff --git a/src/main/java/com/hbm/util/ShadyUtil.java b/src/main/java/com/hbm/util/ShadyUtil.java index 6e8db2e2a..f416debc0 100644 --- a/src/main/java/com/hbm/util/ShadyUtil.java +++ b/src/main/java/com/hbm/util/ShadyUtil.java @@ -46,7 +46,6 @@ public class ShadyUtil { public static String lag_add = "259785a0-20e9-4c63-9286-ac2f93ff528f"; public static String Pu_238 = "c95fdfd3-bea7-4255-a44b-d21bc3df95e3"; public static String Tankish = "609268ad-5b34-49c2-abba-a9d83229af03"; - public static String SolsticeUnlimitd = "f5574fd2-ec28-4927-9d11-3c0c731771f4"; public static String FrizzleFrazzle = "fc4cc2ee-12e8-4097-b26a-1c6cb1b96531"; public static String the_NCR = "28ae585f-4431-4491-9ce8-3def6126e3c6"; public static String Barnaby99_x = "b04cf173-cff0-4acd-aa19-3d835224b43d"; diff --git a/src/main/resources/assets/hbm/models/armor/solstice.obj b/src/main/resources/assets/hbm/models/armor/solstice.obj deleted file mode 100644 index 11fe36888..000000000 --- a/src/main/resources/assets/hbm/models/armor/solstice.obj +++ /dev/null @@ -1,570 +0,0 @@ -# Blender v2.79 (sub 0) OBJ File: 'solstice.blend' -# www.blender.org -o WingLB -v 1.000000 5.000000 3.000000 -v 0.999999 3.000000 3.000000 -v 1.000000 5.000000 2.000000 -v 0.999999 3.000000 2.000000 -v 17.000000 4.999995 3.000000 -v 17.000000 2.999995 3.000000 -v 17.000000 4.999995 2.000000 -v 17.000000 2.999995 2.000000 -v 14.999999 4.999996 2.250000 -v 17.000000 4.999995 2.250000 -v 15.500004 18.499996 2.250000 -v 16.500004 18.499996 2.250000 -v 14.999999 4.999996 2.750000 -v 17.000000 4.999995 2.750000 -v 15.500004 18.499996 2.750000 -v 16.500004 18.499996 2.750000 -v 14.292892 4.292889 2.375000 -v 15.707107 5.707102 2.375000 -v 5.100508 14.192387 2.375000 -v 5.807615 14.899494 2.375000 -v 14.292892 4.292889 2.625000 -v 15.707107 5.707102 2.625000 -v 5.100508 14.192387 2.625000 -v 5.807615 14.899494 2.625000 -v 1.000000 5.000000 2.500000 -v 15.999999 4.999995 2.500000 -v 16.000004 17.999996 2.500000 -v 6.000003 13.999999 2.500000 -v 12.000003 14.999997 2.500000 -v 4.000000 7.999999 2.500000 -v 1.000000 5.000000 2.500000 -v 15.999999 4.999995 2.500000 -v 16.000004 17.999996 2.500000 -v 6.000003 13.999999 2.500000 -v 12.000003 14.999997 2.500000 -v 4.000000 7.999999 2.500000 -vt -0.000000 0.818182 -vt 0.057143 0.939394 -vt 0.057143 0.818182 -vt 0.057143 0.818182 -vt 0.971429 0.939394 -vt 0.971429 0.818182 -vt 0.000000 0.818182 -vt 0.057143 0.939394 -vt 0.971429 0.939394 -vt 0.971429 0.818182 -vt 0.057143 1.000000 -vt 0.971429 0.939394 -vt 0.057143 0.939394 -vt 0.057143 1.000000 -vt 0.971429 1.000000 -vt 0.971429 0.000000 -vt 0.885714 0.818182 -vt 1.000000 0.818182 -vt 1.000000 0.818182 -vt 0.914286 0.000000 -vt 0.885714 0.818182 -vt 0.857143 0.000000 -vt 0.885714 0.000000 -vt 0.857143 0.000000 -vt 0.857143 0.818182 -vt 0.000000 1.000000 -vt 0.057143 0.969697 -vt 0.000000 0.969697 -vt 0.971429 0.000000 -vt 0.885714 0.818182 -vt 1.000000 0.818182 -vt 0.885714 0.818182 -vt 0.971429 -0.000000 -vt 0.914286 -0.000000 -vt 0.857143 0.000000 -vt 0.871429 0.818182 -vt 0.871429 0.000000 -vt 0.871429 0.818182 -vt 0.857143 0.000000 -vt 0.857143 0.818182 -vt 0.057143 0.984848 -vt 0.000000 1.000000 -vt 0.057143 1.000000 -vt 0.857143 0.818182 -vt 0.628571 0.212121 -vt 0.171429 0.636364 -vt 0.857143 0.818182 -vt 0.171429 0.636364 -vt 0.628571 0.212121 -vt -0.000000 0.939394 -vt 0.000000 0.939394 -vt 0.971429 1.000000 -vt 0.914286 -0.000000 -vt 0.971429 -0.000000 -vt 0.857143 0.818182 -vt 0.885714 0.000000 -vt 0.057143 1.000000 -vt 0.914286 0.000000 -vt 1.000000 0.818182 -vt 0.857143 0.818182 -vt 0.871429 0.000000 -vt 0.000000 0.984848 -vt 0.000000 0.818182 -vt 0.857143 0.030303 -vt 0.285714 0.272727 -vt 0.857143 0.030303 -vt 0.000000 0.818182 -vt 0.285714 0.272727 -vn -1.0000 0.0000 0.0000 -vn 0.0000 0.0000 -1.0000 -vn 1.0000 0.0000 0.0000 -vn 0.0000 0.0000 1.0000 -vn 0.0000 1.0000 0.0000 -vn -0.0000 -1.0000 0.0000 -vn 0.9993 0.0370 0.0000 -vn -0.9993 0.0370 0.0000 -vn 0.6805 0.7328 0.0000 -vn -0.7328 -0.6805 0.0000 -vn -0.7071 0.7071 0.0000 -s off -f 3/1/1 2/2/1 1/3/1 -f 7/4/2 4/5/2 3/6/2 -f 5/7/3 8/8/3 7/4/3 -f 1/3/4 6/9/4 5/10/4 -f 1/11/5 7/12/5 3/13/5 -f 6/9/6 4/14/6 8/15/6 -f 11/16/2 10/17/2 9/18/2 -f 14/19/4 15/20/4 13/21/4 -f 16/22/7 10/17/7 12/23/7 -f 13/21/8 11/24/8 9/25/8 -f 15/26/5 12/27/5 11/28/5 -f 19/29/2 18/30/2 17/31/2 -f 21/32/4 24/33/4 23/34/4 -f 24/35/9 18/36/9 20/37/9 -f 21/38/10 19/39/10 17/40/10 -f 23/41/11 20/42/11 19/43/11 -f 26/44/4 29/45/4 30/46/4 -f 32/47/2 36/48/2 35/49/2 -f 3/1/1 4/50/1 2/2/1 -f 7/4/2 8/8/2 4/5/2 -f 5/7/3 6/51/3 8/8/3 -f 1/3/4 2/2/4 6/9/4 -f 1/11/5 5/52/5 7/12/5 -f 6/9/6 2/2/6 4/14/6 -f 11/16/2 12/53/2 10/17/2 -f 14/19/4 16/54/4 15/20/4 -f 16/22/7 14/55/7 10/17/7 -f 13/21/8 15/56/8 11/24/8 -f 15/26/5 16/57/5 12/27/5 -f 19/29/2 20/58/2 18/30/2 -f 21/32/4 22/59/4 24/33/4 -f 24/35/9 22/60/9 18/36/9 -f 21/38/10 23/61/10 19/39/10 -f 23/41/11 24/62/11 20/42/11 -f 25/63/4 26/44/4 30/46/4 -f 26/44/4 27/64/4 29/45/4 -f 29/45/4 28/65/4 30/46/4 -f 33/66/2 32/47/2 35/49/2 -f 32/47/2 31/67/2 36/48/2 -f 36/48/2 34/68/2 35/49/2 -o WingLT -v 15.000000 5.000000 3.062500 -v 15.000000 3.000000 3.062500 -v 15.000000 5.000000 2.062500 -v 15.000000 3.000000 2.062500 -v 31.000000 4.999995 3.062500 -v 31.000000 3.999995 3.062500 -v 31.000000 4.999995 2.062500 -v 31.000000 3.999995 2.062500 -v 17.707108 4.292892 2.437500 -v 16.292894 5.707107 2.437500 -v 26.899498 14.192384 2.437500 -v 26.192390 14.899492 2.437500 -v 26.192390 14.899492 2.687500 -v 26.899498 14.192384 2.687500 -v 16.292894 5.707107 2.687500 -v 17.707108 4.292892 2.687500 -v 16.010000 5.010002 2.562500 -v 30.975857 5.009997 2.562500 -v 16.010004 17.980001 2.562500 -v 25.992420 13.991125 2.562500 -v 19.995955 14.990538 2.562500 -v 27.991261 7.994596 2.562500 -v 16.010000 5.010002 2.562500 -v 30.975857 5.009997 2.562500 -v 16.010004 17.980001 2.562500 -v 25.992420 13.991125 2.562500 -v 19.995955 14.990538 2.562500 -v 27.991261 7.994596 2.562500 -vt 0.000000 0.818182 -vt 0.057143 0.939394 -vt 0.057143 0.818182 -vt 0.971429 0.818182 -vt 0.057143 0.878788 -vt 0.971429 0.939394 -vt 0.000000 0.818182 -vt 0.057143 0.818182 -vt 0.971429 0.878788 -vt 0.971429 0.818182 -vt 0.057143 1.000000 -vt 0.971429 0.939394 -vt 0.057143 0.939394 -vt 0.971429 0.939394 -vt 0.057143 1.000000 -vt 0.971429 1.000000 -vt 0.885714 0.818182 -vt 0.971429 -0.000000 -vt 0.914286 -0.000000 -vt 0.057143 0.984848 -vt -0.000000 1.000000 -vt 0.057143 1.000000 -vt 0.871429 0.818182 -vt 0.857143 0.000000 -vt 0.857143 0.818182 -vt 0.000000 1.000000 -vt 0.057143 0.984848 -vt -0.000000 0.984848 -vt 0.857143 -0.000000 -vt 0.871429 0.818182 -vt 0.871429 -0.000000 -vt 0.971429 0.000000 -vt 0.885714 0.818182 -vt 1.000000 0.818182 -vt 0.857143 0.818182 -vt 0.171429 0.636364 -vt 0.628571 0.212121 -vt 0.857143 0.818182 -vt 0.628571 0.212121 -vt 0.171429 0.636364 -vt 0.000000 0.939394 -vt 0.000000 0.878788 -vt 0.971429 1.000000 -vt 1.000000 0.818182 -vt -0.000000 0.984848 -vt 0.871429 0.000000 -vt 0.057143 1.000000 -vt 0.857143 0.818182 -vt 0.914286 0.000000 -vt 0.857143 0.030303 -vt 0.000000 0.818182 -vt 0.285714 0.272727 -vt 0.000000 0.818182 -vt 0.857143 0.030303 -vt 0.285714 0.272727 -vn -1.0000 0.0000 0.0000 -vn 0.0000 0.0000 -1.0000 -vn 1.0000 0.0000 0.0000 -vn 0.0000 0.0000 1.0000 -vn 0.0000 1.0000 0.0000 -vn 0.0624 -0.9981 0.0000 -vn -0.7071 -0.7071 0.0000 -vn -0.6805 0.7328 0.0000 -vn 0.7071 0.7071 0.0000 -vn 0.7328 -0.6805 0.0000 -s off -f 39/69/12 38/70/12 37/71/12 -f 39/72/13 44/73/13 40/74/13 -f 41/75/14 44/73/14 43/76/14 -f 37/71/15 42/77/15 41/78/15 -f 37/79/16 43/80/16 39/81/16 -f 42/82/17 40/83/17 44/84/17 -f 45/85/13 48/86/13 47/87/13 -f 52/88/18 46/89/18 45/90/18 -f 51/91/19 48/92/19 46/93/19 -f 49/94/20 47/95/20 48/96/20 -f 50/97/21 45/98/21 47/99/21 -f 50/100/15 51/101/15 52/102/15 -f 53/103/15 58/104/15 57/105/15 -f 59/106/13 63/107/13 64/108/13 -f 39/69/12 40/109/12 38/70/12 -f 39/72/13 43/76/13 44/73/13 -f 41/75/14 42/110/14 44/73/14 -f 37/71/15 38/70/15 42/77/15 -f 37/79/16 41/111/16 43/80/16 -f 42/82/17 38/70/17 40/83/17 -f 45/85/13 46/112/13 48/86/13 -f 52/88/18 51/113/18 46/89/18 -f 51/91/19 49/114/19 48/92/19 -f 49/94/20 50/115/20 47/95/20 -f 50/97/21 52/116/21 45/98/21 -f 50/100/15 49/117/15 51/101/15 -f 55/118/15 53/103/15 57/105/15 -f 53/103/15 54/119/15 58/104/15 -f 58/104/15 56/120/15 57/105/15 -f 60/121/13 59/106/13 64/108/13 -f 59/106/13 61/122/13 63/107/13 -f 63/107/13 62/123/13 64/108/13 -o WingRT -v -15.000000 5.000001 3.062500 -v -15.000000 3.000001 3.062500 -v -15.000000 5.000001 2.062500 -v -15.000000 3.000001 2.062500 -v -31.000000 5.000007 3.062500 -v -31.000000 4.000007 3.062500 -v -31.000000 5.000007 2.062500 -v -31.000000 4.000007 2.062500 -v -17.707108 4.292896 2.437500 -v -16.292892 5.707109 2.437500 -v -26.899492 14.192393 2.437500 -v -26.192383 14.899500 2.437500 -v -26.192383 14.899500 2.687500 -v -26.899492 14.192393 2.687500 -v -16.292892 5.707109 2.687500 -v -17.707108 4.292896 2.687500 -v -16.010000 5.010004 2.562500 -v -30.975857 5.010009 2.562500 -v -16.009995 17.980003 2.562500 -v -25.992414 13.991133 2.562500 -v -19.995947 14.990541 2.562500 -v -27.991259 7.994606 2.562500 -v -16.010000 5.010004 2.562500 -v -30.975857 5.010009 2.562500 -v -16.009995 17.980003 2.562500 -v -25.992414 13.991133 2.562500 -v -19.995947 14.990541 2.562500 -v -27.991259 7.994606 2.562500 -vt 0.057143 0.939394 -vt 0.000000 0.818182 -vt 0.057143 0.818182 -vt 0.971429 0.818182 -vt 0.057143 0.878788 -vt 0.057143 0.818182 -vt 0.000000 0.818182 -vt 0.971429 0.878788 -vt 0.971429 0.818182 -vt 0.971429 0.939394 -vt 0.057143 1.000000 -vt 0.057143 0.939394 -vt 0.057143 1.000000 -vt 0.971429 0.939394 -vt 0.971429 1.000000 -vt 0.914286 -0.000000 -vt 1.000000 0.818182 -vt 0.885714 0.818182 -vt -0.000000 1.000000 -vt 0.057143 0.984848 -vt 0.057143 1.000000 -vt 0.857143 0.000000 -vt 0.871429 0.818182 -vt 0.857143 0.818182 -vt 0.057143 0.984848 -vt 0.000000 1.000000 -vt -0.000000 0.984848 -vt 0.871429 0.818182 -vt 0.857143 -0.000000 -vt 0.871429 -0.000000 -vt 1.000000 0.818182 -vt 0.914286 0.000000 -vt 0.971429 0.000000 -vt 0.857143 0.818182 -vt 0.628571 0.212121 -vt 0.171429 0.636364 -vt 0.857143 0.818182 -vt 0.171429 0.636364 -vt 0.628571 0.212121 -vt 0.000000 0.939394 -vt 0.971429 0.939394 -vt 0.000000 0.878788 -vt 0.971429 1.000000 -vt 0.971429 -0.000000 -vt -0.000000 0.984848 -vt 0.871429 0.000000 -vt 0.057143 1.000000 -vt 0.857143 0.818182 -vt 0.885714 0.818182 -vt 0.000000 0.818182 -vt 0.857143 0.030303 -vt 0.285714 0.272727 -vt 0.857143 0.030303 -vt 0.000000 0.818182 -vt 0.285714 0.272727 -vn 1.0000 0.0000 0.0000 -vn 0.0000 0.0000 -1.0000 -vn -1.0000 0.0000 0.0000 -vn -0.0000 0.0000 1.0000 -vn 0.0000 1.0000 0.0000 -vn -0.0624 -0.9981 0.0000 -vn 0.7071 -0.7071 0.0000 -vn 0.6805 0.7328 0.0000 -vn -0.7071 0.7071 0.0000 -vn -0.7328 -0.6805 0.0000 -s off -f 66/124/22 67/125/22 65/126/22 -f 67/127/23 72/128/23 71/129/23 -f 72/128/24 69/130/24 71/129/24 -f 70/131/25 65/126/25 69/132/25 -f 71/133/26 65/134/26 67/135/26 -f 68/136/27 70/137/27 72/138/27 -f 75/139/23 74/140/23 73/141/23 -f 74/142/28 80/143/28 73/144/28 -f 76/145/29 79/146/29 74/147/29 -f 75/148/30 77/149/30 76/150/30 -f 73/151/31 78/152/31 75/153/31 -f 80/154/25 77/155/25 78/156/25 -f 81/157/25 85/158/25 86/159/25 -f 87/160/23 92/161/23 91/162/23 -f 66/124/22 68/163/22 67/125/22 -f 67/127/23 68/164/23 72/128/23 -f 72/128/24 70/165/24 69/130/24 -f 70/131/25 66/124/25 65/126/25 -f 71/133/26 69/166/26 65/134/26 -f 68/136/27 66/124/27 70/137/27 -f 75/139/23 76/167/23 74/140/23 -f 74/142/28 79/168/28 80/143/28 -f 76/145/29 77/169/29 79/146/29 -f 75/148/30 78/170/30 77/149/30 -f 73/151/31 80/171/31 78/152/31 -f 80/154/25 79/172/25 77/155/25 -f 82/173/25 81/157/25 86/159/25 -f 81/157/25 83/174/25 85/158/25 -f 85/158/25 84/175/25 86/159/25 -f 89/176/23 87/160/23 91/162/23 -f 87/160/23 88/177/23 92/161/23 -f 92/161/23 90/178/23 91/162/23 -o WingRB -v -1.000001 5.000000 3.000000 -v -1.000001 3.000000 3.000000 -v -1.000001 5.000000 2.000000 -v -1.000001 3.000000 2.000000 -v -17.000000 5.000005 3.000000 -v -17.000000 3.000005 3.000000 -v -17.000000 5.000005 2.000000 -v -17.000000 3.000005 2.000000 -v -15.000001 5.000004 2.250000 -v -17.000000 5.000005 2.250000 -v -15.499996 18.500004 2.250000 -v -16.499996 18.500004 2.250000 -v -15.000001 5.000004 2.750000 -v -17.000000 5.000005 2.750000 -v -15.499996 18.500004 2.750000 -v -16.499996 18.500004 2.750000 -v -14.292894 4.292897 2.375000 -v -15.707107 5.707111 2.375000 -v -5.100502 14.192389 2.375000 -v -5.807610 14.899496 2.375000 -v -14.292894 4.292897 2.625000 -v -15.707107 5.707111 2.625000 -v -5.100502 14.192389 2.625000 -v -5.807610 14.899496 2.625000 -v -1.000001 5.000000 2.500000 -v -16.000000 5.000005 2.500000 -v -15.999996 18.000004 2.500000 -v -5.999998 14.000001 2.500000 -v -11.999997 15.000003 2.500000 -v -4.000000 8.000000 2.500000 -v -1.000001 5.000000 2.500000 -v -16.000000 5.000005 2.500000 -v -15.999996 18.000004 2.500000 -v -5.999998 14.000001 2.500000 -v -11.999997 15.000003 2.500000 -v -4.000000 8.000000 2.500000 -vt 0.057143 0.939394 -vt -0.000000 0.818182 -vt 0.057143 0.818182 -vt 0.971429 0.939394 -vt 0.057143 0.818182 -vt 0.971429 0.818182 -vt 0.057143 0.939394 -vt 0.000000 0.818182 -vt 0.971429 0.939394 -vt 0.971429 0.818182 -vt 0.971429 0.939394 -vt 0.057143 1.000000 -vt 0.057143 0.939394 -vt 0.057143 1.000000 -vt 0.971429 1.000000 -vt 0.885714 0.818182 -vt 0.971429 0.000000 -vt 1.000000 0.818182 -vt 0.914286 0.000000 -vt 1.000000 0.818182 -vt 0.885714 0.818182 -vt 0.857143 0.000000 -vt 0.885714 0.000000 -vt 0.857143 0.000000 -vt 0.857143 0.818182 -vt 0.057143 0.969697 -vt 0.000000 1.000000 -vt 0.000000 0.969697 -vt 1.000000 0.818182 -vt 0.914286 0.000000 -vt 0.971429 0.000000 -vt 0.914286 -0.000000 -vt 1.000000 0.818182 -vt 0.885714 0.818182 -vt 0.871429 0.818182 -vt 0.857143 0.000000 -vt 0.871429 0.000000 -vt 0.857143 0.000000 -vt 0.871429 0.818182 -vt 0.857143 0.818182 -vt 0.000000 1.000000 -vt 0.057143 0.984848 -vt 0.057143 1.000000 -vt 0.857143 0.818182 -vt 0.171429 0.636364 -vt 0.628571 0.212121 -vt 0.857143 0.818182 -vt 0.628571 0.212121 -vt 0.171429 0.636364 -vt -0.000000 0.939394 -vt 0.000000 0.939394 -vt 0.971429 1.000000 -vt 0.914286 -0.000000 -vt 0.971429 -0.000000 -vt 0.857143 0.818182 -vt 0.885714 0.000000 -vt 0.057143 1.000000 -vt 0.885714 0.818182 -vt 0.971429 -0.000000 -vt 0.857143 0.818182 -vt 0.871429 0.000000 -vt 0.000000 0.984848 -vt 0.857143 0.030303 -vt 0.000000 0.818182 -vt 0.285714 0.272727 -vt 0.000000 0.818182 -vt 0.857143 0.030303 -vt 0.285714 0.272727 -vn 1.0000 -0.0000 0.0000 -vn 0.0000 0.0000 -1.0000 -vn -1.0000 0.0000 0.0000 -vn 0.0000 0.0000 1.0000 -vn 0.0000 1.0000 0.0000 -vn -0.0000 -1.0000 0.0000 -vn -0.9993 0.0370 0.0000 -vn 0.9993 0.0370 0.0000 -vn -0.6805 0.7328 0.0000 -vn 0.7328 -0.6805 0.0000 -vn 0.7071 0.7071 0.0000 -s off -f 94/179/32 95/180/32 93/181/32 -f 96/182/33 99/183/33 95/184/33 -f 100/185/34 97/186/34 99/183/34 -f 98/187/35 93/181/35 97/188/35 -f 99/189/36 93/190/36 95/191/36 -f 96/192/37 98/187/37 100/193/37 -f 102/194/33 103/195/33 101/196/33 -f 107/197/35 106/198/35 105/199/35 -f 102/194/38 108/200/38 104/201/38 -f 103/202/39 105/199/39 101/203/39 -f 104/204/36 107/205/36 103/206/36 -f 109/207/33 112/208/33 111/209/33 -f 115/210/35 114/211/35 113/212/35 -f 110/213/40 116/214/40 112/215/40 -f 111/216/41 113/217/41 109/218/41 -f 112/219/42 115/220/42 111/221/42 -f 118/222/35 122/223/35 121/224/35 -f 124/225/33 127/226/33 128/227/33 -f 94/179/32 96/228/32 95/180/32 -f 96/182/33 100/185/33 99/183/33 -f 100/185/34 98/229/34 97/186/34 -f 98/187/35 94/179/35 93/181/35 -f 99/189/36 97/230/36 93/190/36 -f 96/192/37 94/179/37 98/187/37 -f 102/194/33 104/231/33 103/195/33 -f 107/197/35 108/232/35 106/198/35 -f 102/194/38 106/233/38 108/200/38 -f 103/202/39 107/234/39 105/199/39 -f 104/204/36 108/235/36 107/205/36 -f 109/207/33 110/236/33 112/208/33 -f 115/210/35 116/237/35 114/211/35 -f 110/213/40 114/238/40 116/214/40 -f 111/216/41 115/239/41 113/217/41 -f 112/219/42 116/240/42 115/220/42 -f 119/241/35 118/222/35 121/224/35 -f 118/222/35 117/242/35 122/223/35 -f 122/223/35 120/243/35 121/224/35 -f 123/244/33 124/225/33 128/227/33 -f 124/225/33 125/245/33 127/226/33 -f 127/226/33 126/246/33 128/227/33 diff --git a/src/main/resources/assets/hbm/textures/armor/axepack.png b/src/main/resources/assets/hbm/textures/armor/axepack.png new file mode 100644 index 000000000..cdb9e0f1a Binary files /dev/null and b/src/main/resources/assets/hbm/textures/armor/axepack.png differ diff --git a/src/main/resources/assets/hbm/textures/armor/wings_solstice.png b/src/main/resources/assets/hbm/textures/armor/wings_solstice.png deleted file mode 100644 index 4b9aa3424..000000000 Binary files a/src/main/resources/assets/hbm/textures/armor/wings_solstice.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_component.png b/src/main/resources/assets/hbm/textures/blocks/icf_component.png new file mode 100644 index 000000000..38dd3e1e6 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/icf_component.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_component.structure.png b/src/main/resources/assets/hbm/textures/blocks/icf_component.structure.png new file mode 100644 index 000000000..7092409ad Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/icf_component.structure.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_component.structure_bolted.png b/src/main/resources/assets/hbm/textures/blocks/icf_component.structure_bolted.png new file mode 100644 index 000000000..16d62d59f Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/icf_component.structure_bolted.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_component.vessel.png b/src/main/resources/assets/hbm/textures/blocks/icf_component.vessel.png new file mode 100644 index 000000000..7e17c653e Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/icf_component.vessel.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/icf_component.vessel_welded.png b/src/main/resources/assets/hbm/textures/blocks/icf_component.vessel_welded.png new file mode 100644 index 000000000..777afe710 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/icf_component.vessel_welded.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/struct_icf_core.png b/src/main/resources/assets/hbm/textures/blocks/struct_icf_core.png new file mode 100644 index 000000000..ec8a2f64f Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/struct_icf_core.png differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit.analog.png b/src/main/resources/assets/hbm/textures/items/circuit.analog.png index a76569026..dfed87d2d 100644 Binary files a/src/main/resources/assets/hbm/textures/items/circuit.analog.png and b/src/main/resources/assets/hbm/textures/items/circuit.analog.png differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit.png b/src/main/resources/assets/hbm/textures/items/circuit.png index 578cbdc37..ea79ff8ec 100644 Binary files a/src/main/resources/assets/hbm/textures/items/circuit.png and b/src/main/resources/assets/hbm/textures/items/circuit.png differ diff --git a/src/main/resources/assets/hbm/textures/models/machines/icf.png b/src/main/resources/assets/hbm/textures/models/machines/icf.png index c336610bb..511e78779 100644 Binary files a/src/main/resources/assets/hbm/textures/models/machines/icf.png and b/src/main/resources/assets/hbm/textures/models/machines/icf.png differ