diff --git a/changelog b/changelog index 5cf0ff5ab..ac144268b 100644 --- a/changelog +++ b/changelog @@ -26,4 +26,6 @@ * Fixed size 15 dual kerosene thruster not rendering at all * Fixed HUD/jetpack toggle popup not working at all on multiplayer servers * Fixed assembly machine NEI handler not being able to handle all thirteen inputs at once -* Fixed RBMK fuel channels playing the meltdown sound when broken while hot with meltdowns disabled \ No newline at end of file +* Fixed RBMK fuel channels playing the meltdown sound when broken while hot with meltdowns disabled +* Fixed destroyer and crate minecarts having the same entity IDs, causing them to turn into each other when loading a save +* Fixed GL state leak for ICF lasers \ No newline at end of file diff --git a/src/main/java/com/hbm/entity/EntityMappings.java b/src/main/java/com/hbm/entity/EntityMappings.java index 66d1fd6fe..233a8e1e7 100644 --- a/src/main/java/com/hbm/entity/EntityMappings.java +++ b/src/main/java/com/hbm/entity/EntityMappings.java @@ -181,10 +181,8 @@ public class EntityMappings { addEntity(EntityGrenadeBouncyGeneric.class, "entity_grenade_bouncy_generic", 250); addEntity(EntityGrenadeImpactGeneric.class, "entity_grenade_impact_generic", 250); addEntity(EntityMinecartCrate.class, "entity_ntm_cart_crate", 250, false); - addEntity(EntityMinecartDestroyer.class, "entity_ntm_cart_crate", 250, false); + addEntity(EntityMinecartDestroyer.class, "entity_ntm_cart_destroyer", 250, false); addEntity(EntityMinecartOre.class, "entity_ntm_cart_ore", 250, false); - addEntity(EntityMinecartBogie.class, "entity_ntm_cart_bogie", 250, false); - addEntity(EntityMagnusCartus.class, "entity_ntm_cart_chungoid", 250, false); addEntity(EntityMinecartPowder.class, "entity_ntm_cart_powder", 250, false); addEntity(EntityMinecartSemtex.class, "entity_ntm_cart_semtex", 250, false); addEntity(EntityNukeTorex.class, "entity_effect_torex", 250, false); diff --git a/src/main/java/com/hbm/entity/cart/EntityMinecartBogie.java b/src/main/java/com/hbm/entity/cart/EntityMinecartBogie.java deleted file mode 100644 index c4c4e1bbf..000000000 --- a/src/main/java/com/hbm/entity/cart/EntityMinecartBogie.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.hbm.entity.cart; - -import net.minecraft.entity.item.EntityMinecart; -import net.minecraft.world.World; - -public class EntityMinecartBogie extends EntityMinecart { - - public EntityMinecartBogie(World world) { - super(world); - } - - public EntityMinecartBogie(World world, double x, double y, double z) { - super(world, x, y ,z); - } - - @Override - public int getMinecartType() { - return -1; - } -} diff --git a/src/main/java/com/hbm/entity/item/EntityMagnusCartus.java b/src/main/java/com/hbm/entity/item/EntityMagnusCartus.java deleted file mode 100644 index 1737cc72c..000000000 --- a/src/main/java/com/hbm/entity/item/EntityMagnusCartus.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.hbm.entity.item; - -import com.hbm.entity.cart.EntityMinecartBogie; -import com.hbm.handler.threading.PacketThreading; -import com.hbm.packet.toclient.AuxParticlePacketNT; - -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityMinecart; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; - -public class EntityMagnusCartus extends EntityMinecart { - - public EntityMinecartBogie bogie; - - public EntityMagnusCartus(World world) { - super(world); - } - - public EntityMagnusCartus(World p_i1713_1_, double p_i1713_2_, double p_i1713_4_, double p_i1713_6_) { - super(p_i1713_1_, p_i1713_2_, p_i1713_4_, p_i1713_6_); - } - - @Override - public int getMinecartType() { - return -1; - } - - @Override - protected void entityInit() { - super.entityInit(); - this.dataWatcher.addObject(25, new Integer(0)); - } - - public void setBogie(EntityMinecartBogie bogie) { - this.bogie = bogie; - this.dataWatcher.updateObject(25, bogie.getEntityId()); - } - - public int getBogieID() { - return this.dataWatcher.getWatchableObjectInt(25); - } - - @Override - public void onUpdate() { - super.onUpdate(); - - if(!worldObj.isRemote) { - - double dist = 3.0D; - double force = 0.3D; - - if(bogie == null) { - Vec3 vec = Vec3.createVectorHelper(dist, 0, 0); - vec.rotateAroundY(rand.nextFloat() * 6.28F); - EntityMinecartBogie bog = new EntityMinecartBogie(worldObj, posX + vec.xCoord, posY + vec.yCoord, posZ + vec.zCoord); - this.setBogie(bog); - worldObj.spawnEntityInWorld(bog); - } - - Vec3 delta = Vec3.createVectorHelper(posX - bogie.posX, posY - bogie.posY, posZ - bogie.posZ); - delta = delta.normalize(); - delta.xCoord *= dist; - delta.yCoord *= dist; - delta.zCoord *= dist; - - double x = posX - delta.xCoord; - double y = posY - delta.yCoord; - double z = posZ - delta.zCoord; - - NBTTagCompound data = new NBTTagCompound(); - data.setString("type", "vanillaExt"); - data.setString("mode", "reddust"); - PacketThreading.createAllAroundThreadedPacket(new AuxParticlePacketNT(data, x, y, z), new TargetPoint(this.dimension, x, y, z, 25)); - - Vec3 pull = Vec3.createVectorHelper(x - bogie.posX, y - bogie.posY, z - bogie.posZ); - bogie.motionX += pull.xCoord * force; - bogie.motionY += pull.yCoord * force; - bogie.motionZ += pull.zCoord * force; - - if(pull.lengthVector() > 1) { - this.motionX -= pull.xCoord * force; - this.motionY -= pull.yCoord * force; - this.motionZ -= pull.zCoord * force; - } - } - } - - @Override - protected void readEntityFromNBT(NBTTagCompound nbt) { - super.readEntityFromNBT(nbt); - int bogieID = nbt.getInteger("bogie"); - Entity e = worldObj.getEntityByID(bogieID); - - if(e instanceof EntityMinecartBogie) { - this.setBogie((EntityMinecartBogie) e); - } - } - - @Override - protected void writeEntityToNBT(NBTTagCompound nbt) { - super.writeEntityToNBT(nbt); - nbt.setInteger("bogie", this.getBogieID()); - } -} diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 610786c2a..a2f00e00a 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -728,7 +728,6 @@ public class ClientProxy extends ServerProxy { RenderingRegistry.registerEntityRenderingHandler(EntityMinecartTest.class, new RenderMinecartTest()); RenderingRegistry.registerEntityRenderingHandler(EntityMinecartCrate.class, new RenderMinecart()); RenderingRegistry.registerEntityRenderingHandler(EntityMinecartNTM.class, new RenderNeoCart()); - RenderingRegistry.registerEntityRenderingHandler(EntityMagnusCartus.class, new RenderMagnusCartus()); RenderingRegistry.registerEntityRenderingHandler(EntityBoatRubber.class, new RenderBoatRubber()); //trains RenderingRegistry.registerEntityRenderingHandler(SeatDummyEntity.class, new RenderEmpty()); diff --git a/src/main/java/com/hbm/render/entity/item/RenderMagnusCartus.java b/src/main/java/com/hbm/render/entity/item/RenderMagnusCartus.java deleted file mode 100644 index 1633ff18c..000000000 --- a/src/main/java/com/hbm/render/entity/item/RenderMagnusCartus.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hbm.render.entity.item; - -import org.lwjgl.opengl.GL11; - -import com.hbm.entity.cart.EntityMinecartBogie; -import com.hbm.entity.item.EntityMagnusCartus; -import com.hbm.main.ResourceManager; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; - -public class RenderMagnusCartus extends Render { - - @Override - public void doRender(Entity entity, double x, double y, double z, float f0, float f1) { - EntityMagnusCartus cart = (EntityMagnusCartus) entity; - Entity e = entity.worldObj.getEntityByID(cart.getBogieID()); - EntityMinecartBogie bogie = null; - - if(e instanceof EntityMinecartBogie) { - bogie = (EntityMinecartBogie) e; - } - - if(bogie == null) - return; - - Vec3 vec = Vec3.createVectorHelper(cart.posX - bogie.posX, cart.posY - bogie.posY, cart.posZ - bogie.posZ); - - GL11.glPushMatrix(); - GL11.glTranslated(x - vec.xCoord * 0.5, y - vec.yCoord * 0.5, z - vec.zCoord * 0.5); - GL11.glScaled(1.2, 1.2, 1.2); - GL11.glRotated(Math.atan2(vec.xCoord, vec.zCoord) / Math.PI * 180D - 90, 0, 1, 0); - this.bindTexture(this.getEntityTexture(cart)); - ResourceManager.b29.renderAll(); - GL11.glPopMatrix(); - } - - @Override - protected ResourceLocation getEntityTexture(Entity entity) { - return ResourceManager.b29_0_tex; - } -} diff --git a/src/main/java/com/hbm/render/tileentity/RenderICFController.java b/src/main/java/com/hbm/render/tileentity/RenderICFController.java index 9bc0d69ba..528e84042 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderICFController.java +++ b/src/main/java/com/hbm/render/tileentity/RenderICFController.java @@ -38,6 +38,7 @@ public class RenderICFController extends TileEntitySpecialRenderer { BeamPronter.prontBeam(Vec3.createVectorHelper(controller.laserLength, 0, 0), EnumWaveType.SPIRAL, EnumBeamType.SOLID, 0x202020, 0x100000, 0, 1, 0F, 10, 0.125F); GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopAttrib(); + GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glPopMatrix(); } diff --git a/src/main/java/com/hbm/tileentity/machine/fusion/TileEntityFusionPlasmaForge.java b/src/main/java/com/hbm/tileentity/machine/fusion/TileEntityFusionPlasmaForge.java index 9a00199d4..36b1f549b 100644 --- a/src/main/java/com/hbm/tileentity/machine/fusion/TileEntityFusionPlasmaForge.java +++ b/src/main/java/com/hbm/tileentity/machine/fusion/TileEntityFusionPlasmaForge.java @@ -396,6 +396,9 @@ public class TileEntityFusionPlasmaForge extends TileEntityMachineBase implement public void updateArm() { for(int i = 0; i < angles.length; i++) prevAngles[i] = angles[i]; + + if(!didProcess()) this.state = ForgeArmState.RETIRE; + if(this.state == ForgeArmState.RETIRE) this.actionDelay = 0; if(this.actionDelay > 0) { this.actionDelay--; @@ -481,11 +484,6 @@ public class TileEntityFusionPlasmaForge extends TileEntityMachineBase implement public static Consumer STRIKER_STATE_MACHINE = (arm) -> { - if(!arm.didProcess()) { - arm.state = ForgeArmState.RETIRE; - arm.actionDelay = 0; - } - switch(arm.state) { case REPOSITION: { if(arm.move()) { @@ -548,11 +546,6 @@ public class TileEntityFusionPlasmaForge extends TileEntityMachineBase implement @SuppressWarnings("incomplete-switch") // shut up public static Consumer JET_STATE_MACHINE = (arm) -> { - - if(!arm.didProcess()) { - arm.state = ForgeArmState.RETIRE; - arm.actionDelay = 0; - } switch(arm.state) { case REPOSITION: { diff --git a/src/main/resources/assets/hbm/textures/items/ams_focus_blank.png b/src/main/resources/assets/hbm/textures/items/ams_focus_blank.png deleted file mode 100644 index 6a5ca07bc..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/ams_focus_blank.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/ams_focus_booster.png b/src/main/resources/assets/hbm/textures/items/ams_focus_booster.png deleted file mode 100644 index d3490973c..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/ams_focus_booster.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/ams_focus_limiter.png b/src/main/resources/assets/hbm/textures/items/ams_focus_limiter.png deleted file mode 100644 index 1659c3ba1..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/ams_focus_limiter.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/ams_muzzle.png b/src/main/resources/assets/hbm/textures/items/ams_muzzle.png deleted file mode 100644 index c13af34a8..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/ams_muzzle.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/casing_357.png b/src/main/resources/assets/hbm/textures/items/casing_357.png deleted file mode 100644 index 3a11a867a..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/casing_357.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/casing_44.png b/src/main/resources/assets/hbm/textures/items/casing_44.png deleted file mode 100644 index eee52bf5f..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/casing_44.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/casing_50.png b/src/main/resources/assets/hbm/textures/items/casing_50.png deleted file mode 100644 index 9a53d933b..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/casing_50.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/casing_9.png b/src/main/resources/assets/hbm/textures/items/casing_9.png deleted file mode 100644 index fe5b343e8..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/casing_9.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/casing_buckshot.png b/src/main/resources/assets/hbm/textures/items/casing_buckshot.png deleted file mode 100644 index abcff8db1..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/casing_buckshot.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/catalyst_rare.png b/src/main/resources/assets/hbm/textures/items/catalyst_rare.png deleted file mode 100644 index 55a36c9b3..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/catalyst_rare.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/catalyst_ten.png b/src/main/resources/assets/hbm/textures/items/catalyst_ten.png deleted file mode 100644 index 4df53dc3c..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/catalyst_ten.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/catalyst_xen.png b/src/main/resources/assets/hbm/textures/items/catalyst_xen.png deleted file mode 100644 index 759cbebeb..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/catalyst_xen.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/catgem.png b/src/main/resources/assets/hbm/textures/items/catgem.png deleted file mode 100644 index 1454b14d0..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/catgem.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/centrifuge_tower.png b/src/main/resources/assets/hbm/textures/items/centrifuge_tower.png deleted file mode 100644 index e9112f9ee..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/centrifuge_tower.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chainsaw_alt.png b/src/main/resources/assets/hbm/textures/items/chainsaw_alt.png deleted file mode 100644 index f9e6d8820..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chainsaw_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_ARSENIC.png b/src/main/resources/assets/hbm/textures/items/chem_icon_ARSENIC.png deleted file mode 100644 index 97adc5a69..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_ARSENIC.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_ASPHALT.png b/src/main/resources/assets/hbm/textures/items/chem_icon_ASPHALT.png deleted file mode 100644 index 37438f615..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_ASPHALT.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_BAKELITE.png b/src/main/resources/assets/hbm/textures/items/chem_icon_BAKELITE.png deleted file mode 100644 index 038990e50..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_BAKELITE.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_BALEFIRE.png b/src/main/resources/assets/hbm/textures/items/chem_icon_BALEFIRE.png deleted file mode 100644 index a8fba2928..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_BALEFIRE.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_BP_BIOFUEL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_BP_BIOFUEL.png deleted file mode 100644 index 73bca44c7..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_BP_BIOFUEL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_BP_BIOGAS.png b/src/main/resources/assets/hbm/textures/items/chem_icon_BP_BIOGAS.png deleted file mode 100644 index f0f4ebbe2..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_BP_BIOGAS.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_C4.png b/src/main/resources/assets/hbm/textures/items/chem_icon_C4.png deleted file mode 100644 index a2bd93346..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_C4.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_CC_CENTRIFUGE.png b/src/main/resources/assets/hbm/textures/items/chem_icon_CC_CENTRIFUGE.png deleted file mode 100644 index bd40743a8..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_CC_CENTRIFUGE.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_CC_ELECTROLYSIS.png b/src/main/resources/assets/hbm/textures/items/chem_icon_CC_ELECTROLYSIS.png deleted file mode 100644 index fd9229fc2..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_CC_ELECTROLYSIS.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_CC_HEATING.png b/src/main/resources/assets/hbm/textures/items/chem_icon_CC_HEATING.png deleted file mode 100644 index d1c82542e..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_CC_HEATING.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_CC_HEAVY.png b/src/main/resources/assets/hbm/textures/items/chem_icon_CC_HEAVY.png deleted file mode 100644 index e0f0d88f1..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_CC_HEAVY.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_CC_I.png b/src/main/resources/assets/hbm/textures/items/chem_icon_CC_I.png deleted file mode 100644 index efbf998ee..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_CC_I.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_CC_NAPHTHA.png b/src/main/resources/assets/hbm/textures/items/chem_icon_CC_NAPHTHA.png deleted file mode 100644 index ffbf1caba..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_CC_NAPHTHA.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_CC_OIL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_CC_OIL.png deleted file mode 100644 index aa029c58a..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_CC_OIL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_CIRCUIT_4.png b/src/main/resources/assets/hbm/textures/items/chem_icon_CIRCUIT_4.png deleted file mode 100644 index c250c1c41..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_CIRCUIT_4.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_CIRCUIT_5.png b/src/main/resources/assets/hbm/textures/items/chem_icon_CIRCUIT_5.png deleted file mode 100644 index 714fc1262..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_CIRCUIT_5.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_CO2.png b/src/main/resources/assets/hbm/textures/items/chem_icon_CO2.png deleted file mode 100644 index 135ccf596..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_CO2.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_COALGAS_LEADED.png b/src/main/resources/assets/hbm/textures/items/chem_icon_COALGAS_LEADED.png deleted file mode 100644 index eddc981fb..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_COALGAS_LEADED.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_COLTAN_CLEANING.png b/src/main/resources/assets/hbm/textures/items/chem_icon_COLTAN_CLEANING.png deleted file mode 100644 index 2e1bc1ab3..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_COLTAN_CLEANING.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_COLTAN_CRYSTAL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_COLTAN_CRYSTAL.png deleted file mode 100644 index fa4fddb32..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_COLTAN_CRYSTAL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_COLTAN_PAIN.png b/src/main/resources/assets/hbm/textures/items/chem_icon_COLTAN_PAIN.png deleted file mode 100644 index 9b1dbd746..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_COLTAN_PAIN.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_CONCRETE.png b/src/main/resources/assets/hbm/textures/items/chem_icon_CONCRETE.png deleted file mode 100644 index fb0237d0e..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_CONCRETE.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_CONCRETE_ASBESTOS.png b/src/main/resources/assets/hbm/textures/items/chem_icon_CONCRETE_ASBESTOS.png deleted file mode 100644 index ca71ab0a6..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_CONCRETE_ASBESTOS.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_COOLANT.png b/src/main/resources/assets/hbm/textures/items/chem_icon_COOLANT.png deleted file mode 100644 index f811c1206..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_COOLANT.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_CORDITE.png b/src/main/resources/assets/hbm/textures/items/chem_icon_CORDITE.png deleted file mode 100644 index 9738c1b09..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_CORDITE.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_CRYOGEL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_CRYOGEL.png deleted file mode 100644 index 218d7d63a..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_CRYOGEL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_DESH.png b/src/main/resources/assets/hbm/textures/items/chem_icon_DESH.png deleted file mode 100644 index 7a048c5ba..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_DESH.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_DEUTERIUM.png b/src/main/resources/assets/hbm/textures/items/chem_icon_DEUTERIUM.png deleted file mode 100644 index 6d60f0df0..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_DEUTERIUM.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_DUCRETE.png b/src/main/resources/assets/hbm/textures/items/chem_icon_DUCRETE.png deleted file mode 100644 index 3c3654469..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_DUCRETE.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_DYNAMITE.png b/src/main/resources/assets/hbm/textures/items/chem_icon_DYNAMITE.png deleted file mode 100644 index f044bbf39..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_DYNAMITE.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_ELECTROLYSIS.png b/src/main/resources/assets/hbm/textures/items/chem_icon_ELECTROLYSIS.png deleted file mode 100644 index e0f0ea8fa..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_ELECTROLYSIS.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_EPEARL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_EPEARL.png deleted file mode 100644 index 0d8077cb5..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_EPEARL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_ETHANOL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_ETHANOL.png deleted file mode 100644 index 7950c4d2c..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_ETHANOL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_FC_BITUMEN.png b/src/main/resources/assets/hbm/textures/items/chem_icon_FC_BITUMEN.png deleted file mode 100644 index c3466cd85..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_FC_BITUMEN.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_FC_DIESEL_KEROSENE.png b/src/main/resources/assets/hbm/textures/items/chem_icon_FC_DIESEL_KEROSENE.png deleted file mode 100644 index 61401b931..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_FC_DIESEL_KEROSENE.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_FC_GAS_PETROLEUM.png b/src/main/resources/assets/hbm/textures/items/chem_icon_FC_GAS_PETROLEUM.png deleted file mode 100644 index 2e94b85b0..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_FC_GAS_PETROLEUM.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_FC_I_NAPHTHA.png b/src/main/resources/assets/hbm/textures/items/chem_icon_FC_I_NAPHTHA.png deleted file mode 100644 index 7e28e9430..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_FC_I_NAPHTHA.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_FC_KEROSENE_PETROLEUM.png b/src/main/resources/assets/hbm/textures/items/chem_icon_FC_KEROSENE_PETROLEUM.png deleted file mode 100644 index e0a74f413..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_FC_KEROSENE_PETROLEUM.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_FP_HEAVYOIL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_FP_HEAVYOIL.png deleted file mode 100644 index f43936e13..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_FP_HEAVYOIL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_FP_LIGHTOIL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_FP_LIGHTOIL.png deleted file mode 100644 index ee8bb41eb..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_FP_LIGHTOIL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_FP_NAPHTHA.png b/src/main/resources/assets/hbm/textures/items/chem_icon_FP_NAPHTHA.png deleted file mode 100644 index c0a874164..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_FP_NAPHTHA.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_FP_SMEAR.png b/src/main/resources/assets/hbm/textures/items/chem_icon_FP_SMEAR.png deleted file mode 100644 index 302af341c..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_FP_SMEAR.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_FRACKSOL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_FRACKSOL.png deleted file mode 100644 index e13bc6fe7..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_FRACKSOL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_FR_PETROIL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_FR_PETROIL.png deleted file mode 100644 index c22443dee..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_FR_PETROIL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_FR_REOIL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_FR_REOIL.png deleted file mode 100644 index c14934e6b..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_FR_REOIL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_GASOLINE.png b/src/main/resources/assets/hbm/textures/items/chem_icon_GASOLINE.png deleted file mode 100644 index b1e66d636..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_GASOLINE.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_GASOLINE_LEADED.png b/src/main/resources/assets/hbm/textures/items/chem_icon_GASOLINE_LEADED.png deleted file mode 100644 index 866e8540e..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_GASOLINE_LEADED.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_HEAVY_ELECTROLYSIS.png b/src/main/resources/assets/hbm/textures/items/chem_icon_HEAVY_ELECTROLYSIS.png deleted file mode 100644 index 9e2d4d08d..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_HEAVY_ELECTROLYSIS.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_HELIUM3.png b/src/main/resources/assets/hbm/textures/items/chem_icon_HELIUM3.png deleted file mode 100644 index 2eee44a08..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_HELIUM3.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_KEVLAR.png b/src/main/resources/assets/hbm/textures/items/chem_icon_KEVLAR.png deleted file mode 100644 index 091ff9b2f..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_KEVLAR.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_LAMINATE.png b/src/main/resources/assets/hbm/textures/items/chem_icon_LAMINATE.png deleted file mode 100644 index 545b791dd..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_LAMINATE.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_LPG.png b/src/main/resources/assets/hbm/textures/items/chem_icon_LPG.png deleted file mode 100644 index 8432087dd..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_LPG.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_LUBRICANT.png b/src/main/resources/assets/hbm/textures/items/chem_icon_LUBRICANT.png deleted file mode 100644 index 8e172c483..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_LUBRICANT.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_MEAT_PROCESSING.png b/src/main/resources/assets/hbm/textures/items/chem_icon_MEAT_PROCESSING.png deleted file mode 100644 index 44f694ed7..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_MEAT_PROCESSING.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_METH.png b/src/main/resources/assets/hbm/textures/items/chem_icon_METH.png deleted file mode 100644 index 79ce51d5d..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_METH.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_NITAN.png b/src/main/resources/assets/hbm/textures/items/chem_icon_NITAN.png deleted file mode 100644 index cae26a5f0..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_NITAN.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_NITRIC_ACID.png b/src/main/resources/assets/hbm/textures/items/chem_icon_NITRIC_ACID.png deleted file mode 100644 index fa0bcdc67..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_NITRIC_ACID.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_OIL_SAND.png b/src/main/resources/assets/hbm/textures/items/chem_icon_OIL_SAND.png deleted file mode 100644 index 6fc383db8..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_OIL_SAND.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_OSMIRIDIUM_DEATH.png b/src/main/resources/assets/hbm/textures/items/chem_icon_OSMIRIDIUM_DEATH.png deleted file mode 100644 index 08461ee13..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_OSMIRIDIUM_DEATH.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_PC.png b/src/main/resources/assets/hbm/textures/items/chem_icon_PC.png deleted file mode 100644 index 23d18b260..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_PC.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_PC_ELECTROLYSIS.png b/src/main/resources/assets/hbm/textures/items/chem_icon_PC_ELECTROLYSIS.png deleted file mode 100644 index 7d41a1928..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_PC_ELECTROLYSIS.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_PEROXIDE.png b/src/main/resources/assets/hbm/textures/items/chem_icon_PEROXIDE.png deleted file mode 100644 index 0656d79bc..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_PEROXIDE.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_PET.png b/src/main/resources/assets/hbm/textures/items/chem_icon_PET.png deleted file mode 100644 index afa54e96b..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_PET.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_PETROIL_LEADED.png b/src/main/resources/assets/hbm/textures/items/chem_icon_PETROIL_LEADED.png deleted file mode 100644 index 00b082deb..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_PETROIL_LEADED.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_POLYMER.png b/src/main/resources/assets/hbm/textures/items/chem_icon_POLYMER.png deleted file mode 100644 index 23d8fabf2..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_POLYMER.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_PUF6.png b/src/main/resources/assets/hbm/textures/items/chem_icon_PUF6.png deleted file mode 100644 index 9464a5ac6..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_PUF6.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_PVC.png b/src/main/resources/assets/hbm/textures/items/chem_icon_PVC.png deleted file mode 100644 index 3d0fbdd1c..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_PVC.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_RUBBER.png b/src/main/resources/assets/hbm/textures/items/chem_icon_RUBBER.png deleted file mode 100644 index 98e9aeddf..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_RUBBER.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_RUSTY_DECO_STEEL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_RUSTY_DECO_STEEL.png deleted file mode 100644 index cb791dade..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_RUSTY_DECO_STEEL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SAS3.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SAS3.png deleted file mode 100644 index e0e439150..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SAS3.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SATURN.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SATURN.png deleted file mode 100644 index af0895d30..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SATURN.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SCHRABIDATE.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SCHRABIDATE.png deleted file mode 100644 index 5b8880eeb..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SCHRABIDATE.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SCHRABIDIC.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SCHRABIDIC.png deleted file mode 100644 index 77f4eaec6..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SCHRABIDIC.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_BIOFUEL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SF_BIOFUEL.png deleted file mode 100644 index 5514b756f..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_BIOFUEL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_BIOGAS.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SF_BIOGAS.png deleted file mode 100644 index 2480860cb..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_BIOGAS.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_DIESEL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SF_DIESEL.png deleted file mode 100644 index 338ac8ddd..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_DIESEL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_GAS.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SF_GAS.png deleted file mode 100644 index c81d12a7f..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_GAS.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_HEATINGOIL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SF_HEATINGOIL.png deleted file mode 100644 index 06f059560..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_HEATINGOIL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_HEAVYOIL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SF_HEAVYOIL.png deleted file mode 100644 index 19bf8aa09..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_HEAVYOIL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_KEROSENE.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SF_KEROSENE.png deleted file mode 100644 index 5a8602241..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_KEROSENE.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_LIGHTOIL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SF_LIGHTOIL.png deleted file mode 100644 index 178ea10e6..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_LIGHTOIL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_LUBRICANT.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SF_LUBRICANT.png deleted file mode 100644 index dca30e9d1..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_LUBRICANT.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_NAPHTHA.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SF_NAPHTHA.png deleted file mode 100644 index 6d9b196ef..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_NAPHTHA.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_OIL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SF_OIL.png deleted file mode 100644 index 6da485d23..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_OIL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_PETROIL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SF_PETROIL.png deleted file mode 100644 index 84bb29e18..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_PETROIL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_PETROLEUM.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SF_PETROLEUM.png deleted file mode 100644 index cd10e6add..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_PETROLEUM.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_RECLAIMED.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SF_RECLAIMED.png deleted file mode 100644 index 5b0e27ba8..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_RECLAIMED.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_SMEAR.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SF_SMEAR.png deleted file mode 100644 index 318306a97..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SF_SMEAR.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SHELL_CHLORINE.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SHELL_CHLORINE.png deleted file mode 100644 index 21ce59d82..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SHELL_CHLORINE.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SHELL_MUSTARD.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SHELL_MUSTARD.png deleted file mode 100644 index dd8ee6c2a..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SHELL_MUSTARD.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SHELL_PHOSGENE.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SHELL_PHOSGENE.png deleted file mode 100644 index 36509d7c4..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SHELL_PHOSGENE.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SOLID_FUEL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SOLID_FUEL.png deleted file mode 100644 index 1414fb44b..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SOLID_FUEL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SOLVENT.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SOLVENT.png deleted file mode 100644 index 16dee86f2..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SOLVENT.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_STEAM.png b/src/main/resources/assets/hbm/textures/items/chem_icon_STEAM.png deleted file mode 100644 index 2fc7a8898..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_STEAM.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SULFURIC_ACID.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SULFURIC_ACID.png deleted file mode 100644 index 072ced5c2..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_SULFURIC_ACID.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_TATB.png b/src/main/resources/assets/hbm/textures/items/chem_icon_TATB.png deleted file mode 100644 index bb413aed8..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_TATB.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_TEL.png b/src/main/resources/assets/hbm/textures/items/chem_icon_TEL.png deleted file mode 100644 index ef8ac0a37..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_TEL.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_TEST.png b/src/main/resources/assets/hbm/textures/items/chem_icon_TEST.png deleted file mode 100644 index e936eab6f..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_TEST.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_THORIUM_SALT.png b/src/main/resources/assets/hbm/textures/items/chem_icon_THORIUM_SALT.png deleted file mode 100644 index 734d6b435..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_THORIUM_SALT.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_TNT.png b/src/main/resources/assets/hbm/textures/items/chem_icon_TNT.png deleted file mode 100644 index fcda7da8f..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_TNT.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_UF6.png b/src/main/resources/assets/hbm/textures/items/chem_icon_UF6.png deleted file mode 100644 index b9023fe89..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_UF6.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_VIT_GAS.png b/src/main/resources/assets/hbm/textures/items/chem_icon_VIT_GAS.png deleted file mode 100644 index b546bae41..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_VIT_GAS.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_VIT_LIQUID.png b/src/main/resources/assets/hbm/textures/items/chem_icon_VIT_LIQUID.png deleted file mode 100644 index e56e0d6bc..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_VIT_LIQUID.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_XENON.png b/src/main/resources/assets/hbm/textures/items/chem_icon_XENON.png deleted file mode 100644 index e1a0df961..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_XENON.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_XENON_OXY.png b/src/main/resources/assets/hbm/textures/items/chem_icon_XENON_OXY.png deleted file mode 100644 index 927dfa0ca..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chem_icon_XENON_OXY.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chemistry_template.png b/src/main/resources/assets/hbm/textures/items/chemistry_template.png deleted file mode 100644 index 926e0ee24..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chemistry_template.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chemistry_template_alt.png b/src/main/resources/assets/hbm/textures/items/chemistry_template_alt.png deleted file mode 100644 index eb008e07e..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chemistry_template_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/chemistry_template_secret.png b/src/main/resources/assets/hbm/textures/items/chemistry_template_secret.png deleted file mode 100644 index b27c9d086..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/chemistry_template_secret.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit_demo.png b/src/main/resources/assets/hbm/textures/items/circuit_demo.png deleted file mode 100644 index bf2fda53f..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/circuit_demo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit_demo2.png b/src/main/resources/assets/hbm/textures/items/circuit_demo2.png deleted file mode 100644 index bb8dc5ab3..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/circuit_demo2.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit_demo3.png b/src/main/resources/assets/hbm/textures/items/circuit_demo3.png deleted file mode 100644 index 31d0830ff..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/circuit_demo3.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit_demo4.png b/src/main/resources/assets/hbm/textures/items/circuit_demo4.png deleted file mode 100644 index 96d055865..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/circuit_demo4.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit_demo5.png b/src/main/resources/assets/hbm/textures/items/circuit_demo5.png deleted file mode 100644 index b2e7c5b4b..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/circuit_demo5.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit_demo6.png b/src/main/resources/assets/hbm/textures/items/circuit_demo6.png deleted file mode 100644 index 2665167a3..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/circuit_demo6.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit_tantalium.png b/src/main/resources/assets/hbm/textures/items/circuit_tantalium.png deleted file mode 100644 index ac10f87ad..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/circuit_tantalium.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit_tantalium_raw.png b/src/main/resources/assets/hbm/textures/items/circuit_tantalium_raw.png deleted file mode 100644 index 9e9114a42..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/circuit_tantalium_raw.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit_targeting_burnt.png b/src/main/resources/assets/hbm/textures/items/circuit_targeting_burnt.png deleted file mode 100644 index 351d6a4cb..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/circuit_targeting_burnt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier1.png b/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier1.png deleted file mode 100644 index 88f593cc1..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier1.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier2.png b/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier2.png deleted file mode 100644 index ca55bb611..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier2.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier3.png b/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier3.png deleted file mode 100644 index e55738dfe..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier3.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier4.png b/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier4.png deleted file mode 100644 index 9f0ade52d..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier4.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier5.png b/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier5.png deleted file mode 100644 index e5f061e16..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier5.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier6.png b/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier6.png deleted file mode 100644 index 10e0b5a03..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/circuit_targeting_tier6.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/cyclotron_tower.png b/src/main/resources/assets/hbm/textures/items/cyclotron_tower.png deleted file mode 100644 index 15068c38e..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/cyclotron_tower.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/egg_balefire_blank.png b/src/main/resources/assets/hbm/textures/items/egg_balefire_blank.png deleted file mode 100644 index 821de3938..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/egg_balefire_blank.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/flame_1.png b/src/main/resources/assets/hbm/textures/items/flame_1.png deleted file mode 100644 index 9392faaeb..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/flame_1.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/flame_10.png b/src/main/resources/assets/hbm/textures/items/flame_10.png deleted file mode 100644 index de70d8de4..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/flame_10.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/flame_2.png b/src/main/resources/assets/hbm/textures/items/flame_2.png deleted file mode 100644 index f87131035..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/flame_2.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/flame_3.png b/src/main/resources/assets/hbm/textures/items/flame_3.png deleted file mode 100644 index 5e0f503f8..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/flame_3.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/flame_4.png b/src/main/resources/assets/hbm/textures/items/flame_4.png deleted file mode 100644 index fb5727ada..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/flame_4.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/flame_5.png b/src/main/resources/assets/hbm/textures/items/flame_5.png deleted file mode 100644 index 3aeb5467b..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/flame_5.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/flame_6.png b/src/main/resources/assets/hbm/textures/items/flame_6.png deleted file mode 100644 index 8402314a0..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/flame_6.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/flame_7.png b/src/main/resources/assets/hbm/textures/items/flame_7.png deleted file mode 100644 index a010e4163..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/flame_7.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/flame_8.png b/src/main/resources/assets/hbm/textures/items/flame_8.png deleted file mode 100644 index e46390472..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/flame_8.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/flame_9.png b/src/main/resources/assets/hbm/textures/items/flame_9.png deleted file mode 100644 index fcfbe93a6..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/flame_9.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/grenade_cluster.png b/src/main/resources/assets/hbm/textures/items/grenade_cluster.png deleted file mode 100644 index 259e28fda..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/grenade_cluster.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/grenade_electric.png b/src/main/resources/assets/hbm/textures/items/grenade_electric.png deleted file mode 100644 index 0b647ef95..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/grenade_electric.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/grenade_fire.png b/src/main/resources/assets/hbm/textures/items/grenade_fire.png deleted file mode 100644 index 8509aecee..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/grenade_fire.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/grenade_flare.png b/src/main/resources/assets/hbm/textures/items/grenade_flare.png deleted file mode 100644 index 5387acc1d..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/grenade_flare.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/grenade_frag.png b/src/main/resources/assets/hbm/textures/items/grenade_frag.png deleted file mode 100644 index 01aa37d30..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/grenade_frag.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/grenade_gas.png b/src/main/resources/assets/hbm/textures/items/grenade_gas.png deleted file mode 100644 index 87c680e7b..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/grenade_gas.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/grenade_nuke.png b/src/main/resources/assets/hbm/textures/items/grenade_nuke.png deleted file mode 100644 index 658fb3ab9..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/grenade_nuke.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/grenade_plasma.png b/src/main/resources/assets/hbm/textures/items/grenade_plasma.png deleted file mode 100644 index 26b215610..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/grenade_plasma.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/grenade_poison.png b/src/main/resources/assets/hbm/textures/items/grenade_poison.png deleted file mode 100644 index 8fa0c4a8a..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/grenade_poison.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/grenade_schrabidium.png b/src/main/resources/assets/hbm/textures/items/grenade_schrabidium.png deleted file mode 100644 index 246e6b9f1..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/grenade_schrabidium.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/grenade_tau.png b/src/main/resources/assets/hbm/textures/items/grenade_tau.png deleted file mode 100644 index 64f6311cd..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/grenade_tau.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/ingot_selenium.png b/src/main/resources/assets/hbm/textures/items/ingot_selenium.png deleted file mode 100644 index 0f9c81f14..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/ingot_selenium.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/ingot_staballoy.png b/src/main/resources/assets/hbm/textures/items/ingot_staballoy.png deleted file mode 100644 index 0aaf57dc7..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/ingot_staballoy.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/plate_cast_alt.png b/src/main/resources/assets/hbm/textures/items/plate_cast_alt.png deleted file mode 100644 index 9036a9bf6..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/plate_cast_alt.png and /dev/null differ