diff --git a/changelog b/changelog index 96cce6458c..3122e1cbf9 100644 --- a/changelog +++ b/changelog @@ -9,6 +9,16 @@ * Fat mines now have a base damage of exactly 100, being identical to demolition mini nukes * Fat mines now gib affected entities * IV bags now use `setHealth` operations instead of dealing damage, preventing health duplication by just avoiding the damage +* The settings tool can now copy and paste the "paint" from paintable cables and fluid ducts +* Changed the way taint works + * Instead of neon purple vines, taint is bow a greyish sludge + * Taint now actively replaces blocks instead of growing along them + * Taint is still limited in spread, however taint spread is lower underground, taint decays three times faster in intensity if the block is not exposed to air, making taint spread more along the surface + * Taint has a 25% chance of splashing down when replacing a block with no supports, causing structures to collapse and taint to spread faster + * Similar to soil sand, entities will sink in taint and get slowed down + * The sludge consumeth ## Fixed -* Fixed animation error on the MAS-36 \ No newline at end of file +* Fixed animation error on the MAS-36 +* Fixed drone docks, requester and provider crates not dropping their contents when broken +* Fixed all missing texture errors that appear in the startup log \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 6cf108b50a..7dac239ef6 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -2177,7 +2177,7 @@ private static void initializeBlock() { mass_storage = new BlockMassStorage().setBlockName("mass_storage").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); boxcar = new DecoBlock(Material.iron).setBlockName("boxcar").setStepSound(Block.soundTypeMetal).setHardness(10.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":boxcar"); - boat = new DecoBlock(Material.iron).setBlockName("boat").setStepSound(Block.soundTypeMetal).setHardness(10.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":boat"); + boat = new DecoBlock(Material.iron).setBlockName("boat").setStepSound(Block.soundTypeMetal).setHardness(10.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":asphalt"); machine_well = new MachineOilWell().setBlockName("machine_well").setHardness(5.0F).setResistance(20.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_well"); machine_pumpjack = new MachinePumpjack().setBlockName("machine_pumpjack").setHardness(5.0F).setResistance(20.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_pumpjack"); @@ -2279,7 +2279,7 @@ private static void initializeBlock() { crystal_virus = new CrystalVirus(Material.iron).setBlockName("crystal_virus").setHardness(15.0F).setResistance(Float.POSITIVE_INFINITY).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":crystal_virus"); crystal_hardened = new BlockGeneric(Material.iron).setBlockName("crystal_hardened").setHardness(15.0F).setResistance(Float.POSITIVE_INFINITY).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":crystal_hardened"); crystal_pulsar = new CrystalPulsar(Material.iron).setBlockName("crystal_pulsar").setHardness(15.0F).setResistance(Float.POSITIVE_INFINITY).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":crystal_pulsar"); - taint = new BlockTaint(Material.iron).setBlockName("taint").setHardness(15.0F).setResistance(10.0F).setCreativeTab(null); + taint = new BlockTaint(Material.iron).setBlockName("taint").setHardness(15.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":taint"); vent_chlorine = new BlockVent(Material.iron).setBlockName("vent_chlorine").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":vent_chlorine"); vent_cloud = new BlockVent(Material.iron).setBlockName("vent_cloud").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":vent_cloud"); @@ -3476,7 +3476,7 @@ private static void registerBlock() { GameRegistry.registerBlock(crystal_virus, crystal_virus.getUnlocalizedName()); GameRegistry.registerBlock(crystal_hardened, crystal_hardened.getUnlocalizedName()); GameRegistry.registerBlock(crystal_pulsar, crystal_pulsar.getUnlocalizedName()); - GameRegistry.registerBlock(taint, ItemTaintBlock.class, taint.getUnlocalizedName()); + register(taint); GameRegistry.registerBlock(cheater_virus, cheater_virus.getUnlocalizedName()); GameRegistry.registerBlock(cheater_virus_seed, cheater_virus_seed.getUnlocalizedName()); GameRegistry.registerBlock(ntm_dirt, ntm_dirt.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/bomb/BlockTaint.java b/src/main/java/com/hbm/blocks/bomb/BlockTaint.java index 3b92192de5..079058a64e 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockTaint.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockTaint.java @@ -4,169 +4,71 @@ import java.util.List; import java.util.Random; -import com.hbm.blocks.ModBlocks; +import com.hbm.blocks.ITooltipProvider; import com.hbm.entity.mob.EntityTaintCrab; import com.hbm.entity.mob.EntityCreeperTainted; import com.hbm.entity.mob.EntityTeslaCrab; import com.hbm.potion.HbmPotion; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; +import net.minecraft.block.BlockFalling; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.monster.EntityCreeper; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; -public class BlockTaint extends Block/*Container*/ { - - @SideOnly(Side.CLIENT) - private IIcon[] icons; +public class BlockTaint extends Block implements ITooltipProvider { - public BlockTaint(Material p_i45386_1_) { - super(p_i45386_1_); - this.setTickRandomly(true); + public BlockTaint(Material mat) { + super(mat); + this.setTickRandomly(true); } - /*@Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileEntityTaint(); - }*/ - - @SideOnly(Side.CLIENT) - public IIcon getIcon(int p_149691_1_, int meta) - { - return this.icons[meta % this.icons.length]; - } - - public int damageDropped(int meta) - { - return 0; - } - - public static int func_150032_b(int p_150032_0_) - { - return func_150031_c(p_150032_0_); - } - - public static int func_150031_c(int p_150031_0_) - { - return p_150031_0_ & 15; - } - - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_) - { - for (int i = 0; i < 16; ++i) - { - p_149666_3_.add(new ItemStack(p_149666_1_, 1, i)); - } - } - - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister p_149651_1_) - { - this.icons = new IIcon[16]; - - for (int i = 0; i < this.icons.length; ++i) - { - this.icons[i] = p_149651_1_.registerIcon("hbm:taint_" + i); - } - } - - public MapColor getMapColor(int p_149728_1_) - { - return MapColor.purpleColor; - } - - public static int renderID = RenderingRegistry.getNextAvailableRenderId(); - - @Override - public int getRenderType(){ - return renderID; - } + @Override public MapColor getMapColor(int meta) { return MapColor.grayColor; } + @Override public Item getItemDropped(int i, Random rand, int j) { return null; } - @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) - { - return null; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - @Override - public boolean renderAsNormalBlock() { - return false; - } - - public void onNeighborBlockChange(World world, int x, int y, int z, Block b) - { - if(!hasPosNeightbour(world, x, y, z) && !world.isRemote) - world.setBlockToAir(x, y, z); - } - - public void updateTick(World world, int x, int y, int z, Random rand) - { - int meta = world.getBlockMetadata(x, y, z); - if(!world.isRemote && meta < 15) { - - for(int i = 0; i < 15; i++) { - int a = rand.nextInt(11) + x - 5; - int b = rand.nextInt(11) + y - 5; - int c = rand.nextInt(11) + z - 5; - if(world.getBlock(a, b, c).isReplaceable(world, a, b, c) && hasPosNeightbour(world, a, b, c)) - world.setBlock(a, b, c, ModBlocks.taint, meta + 1, 2); - } - - for(int i = 0; i < 85; i++) { - int a = rand.nextInt(7) + x - 3; - int b = rand.nextInt(7) + y - 3; - int c = rand.nextInt(7) + z - 3; - if(world.getBlock(a, b, c).isReplaceable(world, a, b, c) && hasPosNeightbour(world, a, b, c)) - world.setBlock(a, b, c, ModBlocks.taint, meta + 1, 2); - } - } - } - - public static boolean hasPosNeightbour(World world, int x, int y, int z) { - Block b0 = world.getBlock(x + 1, y, z); - Block b1 = world.getBlock(x, y + 1, z); - Block b2 = world.getBlock(x, y, z + 1); - Block b3 = world.getBlock(x - 1, y, z); - Block b4 = world.getBlock(x, y - 1, z); - Block b5 = world.getBlock(x, y, z - 1); - boolean b = (b0.renderAsNormalBlock() && b0.getMaterial().isOpaque()) || - (b1.renderAsNormalBlock() && b1.getMaterial().isOpaque()) || - (b2.renderAsNormalBlock() && b2.getMaterial().isOpaque()) || - (b3.renderAsNormalBlock() && b3.getMaterial().isOpaque()) || - (b4.renderAsNormalBlock() && b4.getMaterial().isOpaque()) || - (b5.renderAsNormalBlock() && b5.getMaterial().isOpaque()); - return b; - } - - @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) - { - return null; + public void updateTick(World world, int x, int y, int z, Random rand) { + + int meta = world.getBlockMetadata(x, y, z); + if(meta >= 15) return; + + for(int i = -3; i <= 3; i++) for(int j = -3; j <= 3; j++) for(int k = -3; k <= 3; k++) { + if(Math.abs(i) + Math.abs(j) + Math.abs(k) > 4) continue; + if(rand.nextFloat() > 0.25F) continue; + Block b = world.getBlock(x + i, y + j, z + k); + if(!b.isNormalCube() || b.isAir(world, x + i, y + j, z + k)) continue; + int targetMeta = meta + 1; + boolean hasAir = false; + for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if(world.getBlock(x + i + dir.offsetX, y + j + dir.offsetY, z + k + dir.offsetZ).isAir(world, x + i + dir.offsetX, y + j + dir.offsetY, z + k + dir.offsetZ)) { + hasAir = true; + break; + } + } + if(!hasAir) targetMeta = meta + 3; + if(targetMeta > 15) continue; + if(b == this && world.getBlockMetadata(x + i, y + j, z + k) >= targetMeta) continue; + world.setBlock(x + i, y + j, z + k, this, targetMeta, 3); + if(rand.nextFloat() < 0.25F && BlockFalling.func_149831_e(world, x + i, y + j - 1, z + k)) { + EntityFallingBlock falling = new EntityFallingBlock(world, x + i + 0.5, y + j + 0.5, z + k + 0.5, this, targetMeta); + world.spawnEntityInWorld(falling); + } + } } - + @Override - public AxisAlignedBB getSelectedBoundingBoxFromPool(World par1World, int par2, int par3, int par4) - { - return AxisAlignedBB.getBoundingBox(par2, par3, par4, par2, par3, par4); + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { + return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 0.75, z + 1); } @Override @@ -174,36 +76,43 @@ public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity e int meta = world.getBlockMetadata(x, y, z); int level = 15 - meta; - - List list = new ArrayList(); - PotionEffect effect = new PotionEffect(HbmPotion.taint.id, 15 * 20, level); - effect.setCurativeItems(list); - - if(entity instanceof EntityLivingBase) { - if(world.rand.nextInt(50) == 0) { - ((EntityLivingBase)entity).addPotionEffect(effect); - } - } - - if(entity != null && entity.getClass().equals(EntityCreeper.class)) { - EntityCreeperTainted creep = new EntityCreeperTainted(world); - creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); - - if(!world.isRemote) { - entity.setDead(); - world.spawnEntityInWorld(creep); - } - } - - if(entity instanceof EntityTeslaCrab) { - EntityTaintCrab crab = new EntityTaintCrab(world); - crab.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); - - if(!world.isRemote) { - entity.setDead(); - world.spawnEntityInWorld(crab); - } - } + + entity.motionX *= 0.6; + entity.motionZ *= 0.6; + + List list = new ArrayList(); + PotionEffect effect = new PotionEffect(HbmPotion.taint.id, 15 * 20, level); + effect.setCurativeItems(list); + + if(entity instanceof EntityLivingBase) { + if(world.rand.nextInt(50) == 0) { + ((EntityLivingBase) entity).addPotionEffect(effect); + } + } + + if(entity != null && entity.getClass().equals(EntityCreeper.class)) { + EntityCreeperTainted creep = new EntityCreeperTainted(world); + creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); + + if(!world.isRemote) { + entity.setDead(); + world.spawnEntityInWorld(creep); + } + } + + if(entity instanceof EntityTeslaCrab) { + EntityTaintCrab crab = new EntityTaintCrab(world); + crab.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); + + if(!world.isRemote) { + entity.setDead(); + world.spawnEntityInWorld(crab); + } + } } + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { + list.add("DO NOT TOUCH, BREATHE OR STARE AT."); + } } diff --git a/src/main/java/com/hbm/blocks/generic/BlockGenericStairs.java b/src/main/java/com/hbm/blocks/generic/BlockGenericStairs.java index 7bd3ee8f69..61df2ed895 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockGenericStairs.java +++ b/src/main/java/com/hbm/blocks/generic/BlockGenericStairs.java @@ -18,6 +18,6 @@ public BlockGenericStairs(Block block, int meta) { recipeGen.add(new Object[] {block, meta, this}); - this.setBlockTextureName(RefStrings.MODID + ":concrete_smooth"); + this.setBlockTextureName(RefStrings.MODID + ":concrete"); } } diff --git a/src/main/java/com/hbm/blocks/generic/BlockMultiSlab.java b/src/main/java/com/hbm/blocks/generic/BlockMultiSlab.java index bcc38242d2..8374ba803c 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockMultiSlab.java +++ b/src/main/java/com/hbm/blocks/generic/BlockMultiSlab.java @@ -39,7 +39,7 @@ public BlockMultiSlab(Block single, Material mat, Block... slabMaterials) { } } - this.setBlockTextureName(RefStrings.MODID + ":concrete_smooth"); + this.setBlockTextureName(RefStrings.MODID + ":concrete"); } @Override diff --git a/src/main/java/com/hbm/blocks/generic/RedBarrel.java b/src/main/java/com/hbm/blocks/generic/RedBarrel.java index 857cb7b553..753e47b091 100644 --- a/src/main/java/com/hbm/blocks/generic/RedBarrel.java +++ b/src/main/java/com/hbm/blocks/generic/RedBarrel.java @@ -4,11 +4,11 @@ import com.hbm.blocks.ModBlocks; import com.hbm.blocks.bomb.BlockDetonatable; -import com.hbm.blocks.bomb.BlockTaint; import com.hbm.blocks.machine.BlockFluidBarrel; import com.hbm.entity.item.EntityTNTPrimedBase; import com.hbm.explosion.ExplosionThermo; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; @@ -68,7 +68,8 @@ public void explodeEntity(World world, double x, double y, double z, EntityTNTPr int a = rand.nextInt(9) - 4 + ix; int b = rand.nextInt(9) - 4 + iy; int c = rand.nextInt(9) - 4 + iz; - if(world.getBlock(a, b, c).isReplaceable(world, a, b, c) && BlockTaint.hasPosNeightbour(world, a, b, c)) { + Block block = world.getBlock(a, b, c); + if(block.isNormalCube() && !block.isAir(world, a, b, c)) { world.setBlock(a, b, c, ModBlocks.taint, rand.nextInt(3) + 4, 2); } } diff --git a/src/main/java/com/hbm/blocks/network/BlockCablePaintable.java b/src/main/java/com/hbm/blocks/network/BlockCablePaintable.java index 68a0232ee6..3587df3c58 100644 --- a/src/main/java/com/hbm/blocks/network/BlockCablePaintable.java +++ b/src/main/java/com/hbm/blocks/network/BlockCablePaintable.java @@ -2,6 +2,7 @@ import api.hbm.block.IToolable; import com.hbm.blocks.IBlockMultiPass; +import com.hbm.interfaces.ICopiable; import com.hbm.lib.RefStrings; import com.hbm.render.block.RenderBlockMultipass; import com.hbm.tileentity.network.TileEntityCableBaseNT; @@ -124,7 +125,7 @@ public int getRenderType(){ return IBlockMultiPass.getRenderType(); } - public static class TileEntityCablePaintable extends TileEntityCableBaseNT { + public static class TileEntityCablePaintable extends TileEntityCableBaseNT implements ICopiable { private Block block; private int meta; @@ -168,5 +169,23 @@ public void writeToNBT(NBTTagCompound nbt) { if(block != null) nbt.setInteger("block", Block.getIdFromBlock(block)); nbt.setInteger("meta", meta); } + + @Override + public NBTTagCompound getSettings(World world, int x, int y, int z) { + NBTTagCompound nbt = new NBTTagCompound(); + if(block != null) { + nbt.setInteger("paintblock", Block.getIdFromBlock(block)); + nbt.setInteger("paintmeta", meta); + } + return nbt; + } + + @Override + public void pasteSettings(NBTTagCompound nbt, int index, World world, EntityPlayer player, int x, int y, int z) { + if(nbt.hasKey("paintblock")) { + this.block = Block.getBlockById(nbt.getInteger("paintblock")); + this.meta = nbt.getInteger("paintmeta"); + } + } } } diff --git a/src/main/java/com/hbm/blocks/network/DroneDock.java b/src/main/java/com/hbm/blocks/network/DroneDock.java index 226d3c3f00..83bb9d68f5 100644 --- a/src/main/java/com/hbm/blocks/network/DroneDock.java +++ b/src/main/java/com/hbm/blocks/network/DroneDock.java @@ -9,16 +9,21 @@ import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import java.util.List; +import java.util.Random; public class DroneDock extends BlockContainer implements ITooltipProvider { @@ -69,4 +74,53 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { this.addStandardInfo(stack, player, list, ext); } + + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int meta) { + if(this == ModBlocks.drone_dock) this.dropContents(world, x, y, z, block, meta, 0, 9); + if(this == ModBlocks.drone_crate_provider) this.dropContents(world, x, y, z, block, meta, 0, 9); + if(this == ModBlocks.drone_crate_requester) this.dropContents(world, x, y, z, block, meta, 9, 18); + super.breakBlock(world, x, y, z, block, meta); + } + + private final Random rand = new Random(); + public void dropContents(World world, int x, int y, int z, Block block, int meta, int start, int end) { + ISidedInventory sidedInventory = (ISidedInventory) world.getTileEntity(x, y, z); + + if(sidedInventory != null) { + + for(int i1 = start; i1 < end; ++i1) { + ItemStack stack = sidedInventory.getStackInSlot(i1); + + if(stack != null) { + float f = this.rand.nextFloat() * 0.8F + 0.1F; + float f1 = this.rand.nextFloat() * 0.8F + 0.1F; + float f2 = this.rand.nextFloat() * 0.8F + 0.1F; + + while(stack.stackSize > 0) { + int j1 = this.rand.nextInt(21) + 10; + + if(j1 > stack.stackSize) { + j1 = stack.stackSize; + } + + stack.stackSize -= j1; + EntityItem entity = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(stack.getItem(), j1, stack.getItemDamage())); + + if(stack.hasTagCompound()) { + entity.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); + } + + float f3 = 0.05F; + entity.motionX = (float) this.rand.nextGaussian() * f3; + entity.motionY = (float) this.rand.nextGaussian() * f3 + 0.2F; + entity.motionZ = (float) this.rand.nextGaussian() * f3; + world.spawnEntityInWorld(entity); + } + } + } + + world.func_147453_f(x, y, z, block); + } + } } diff --git a/src/main/java/com/hbm/blocks/network/FluidDuctPaintable.java b/src/main/java/com/hbm/blocks/network/FluidDuctPaintable.java index 37599923b7..0bca70d6b5 100644 --- a/src/main/java/com/hbm/blocks/network/FluidDuctPaintable.java +++ b/src/main/java/com/hbm/blocks/network/FluidDuctPaintable.java @@ -3,6 +3,7 @@ import api.hbm.block.IToolable; import com.hbm.blocks.IBlockMultiPass; import com.hbm.blocks.ILookOverlay; +import com.hbm.interfaces.ICopiable; import com.hbm.lib.RefStrings; import com.hbm.render.block.RenderBlockMultipass; import com.hbm.tileentity.network.TileEntityPipeBaseNT; @@ -163,7 +164,7 @@ public void printHook(Pre event, World world, int x, int y, int z) { ILookOverlay.printGeneric(event, I18nUtil.resolveKey(getUnlocalizedName() + ".name"), 0xffff00, 0x404000, text); } - public static class TileEntityPipePaintable extends TileEntityPipeBaseNT { + public static class TileEntityPipePaintable extends TileEntityPipeBaseNT implements ICopiable { private Block block; private int meta; @@ -195,5 +196,23 @@ public void writeToNBT(NBTTagCompound nbt) { if(block != null) nbt.setInteger("block", Block.getIdFromBlock(block)); nbt.setInteger("meta", meta); } + + @Override + public NBTTagCompound getSettings(World world, int x, int y, int z) { + NBTTagCompound nbt = new NBTTagCompound(); + if(block != null) { + nbt.setInteger("paintblock", Block.getIdFromBlock(block)); + nbt.setInteger("paintmeta", meta); + } + return nbt; + } + + @Override + public void pasteSettings(NBTTagCompound nbt, int index, World world, EntityPlayer player, int x, int y, int z) { + if(nbt.hasKey("paintblock")) { + this.block = Block.getBlockById(nbt.getInteger("paintblock")); + this.meta = nbt.getInteger("paintmeta"); + } + } } } diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileCustom.java b/src/main/java/com/hbm/entity/missile/EntityMissileCustom.java index 0b6a51cf83..e929e2fe2a 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileCustom.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileCustom.java @@ -4,7 +4,6 @@ import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.bomb.BlockTaint; import com.hbm.entity.effect.EntityNukeTorex; import com.hbm.entity.logic.EntityBalefire; import com.hbm.entity.logic.EntityNukeExplosionMK5; @@ -22,6 +21,7 @@ import com.hbm.main.MainRegistry; import api.hbm.entity.IRadarDetectableNT; +import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -211,7 +211,8 @@ public void onImpact() { //TODO: demolish this steaming pile of shit int a = rand.nextInt(r) + (int) posX - (r / 2 - 1); int b = rand.nextInt(r) + (int) posY - (r / 2 - 1); int c = rand.nextInt(r) + (int) posZ - (r / 2 - 1); - if(worldObj.getBlock(a, b, c).isReplaceable(worldObj, a, b, c) && BlockTaint.hasPosNeightbour(worldObj, a, b, c)) { + Block block = worldObj.getBlock(a, b, c); + if(block.isNormalCube() && !block.isAir(worldObj, a, b, c)) { worldObj.setBlock(a, b, c, ModBlocks.taint, rand.nextInt(3) + 4, 2); } } diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileTier0.java b/src/main/java/com/hbm/entity/missile/EntityMissileTier0.java index ed2a473090..315f7c30b5 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileTier0.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileTier0.java @@ -4,7 +4,6 @@ import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.bomb.BlockTaint; import com.hbm.config.BombConfig; import com.hbm.entity.effect.EntityBlackHole; import com.hbm.entity.effect.EntityCloudFleija; @@ -128,7 +127,10 @@ public static class EntityMissileTaint extends EntityMissileTier0 { int a = rand.nextInt(11) + (int) this.posX - 5; int b = rand.nextInt(11) + (int) this.posY - 5; int c = rand.nextInt(11) + (int) this.posZ - 5; - if(worldObj.getBlock(a, b, c).isReplaceable(worldObj, a, b, c) && BlockTaint.hasPosNeightbour(worldObj, a, b, c)) worldObj.setBlock(a, b, c, ModBlocks.taint); + Block block = worldObj.getBlock(a, b, c); + if(block.isNormalCube() && !block.isAir(worldObj, a, b, c)) { + worldObj.setBlock(a, b, c, ModBlocks.taint, rand.nextInt(3) + 4, 2); + } } } @Override public ItemStack getDebrisRareDrop() { return new ItemStack(ModItems.powder_spark_mix, 1); } diff --git a/src/main/java/com/hbm/entity/mob/EntityCreeperTainted.java b/src/main/java/com/hbm/entity/mob/EntityCreeperTainted.java index 807e6c5438..1997caa330 100644 --- a/src/main/java/com/hbm/entity/mob/EntityCreeperTainted.java +++ b/src/main/java/com/hbm/entity/mob/EntityCreeperTainted.java @@ -55,8 +55,8 @@ public void func_146077_cc() { int a = rand.nextInt(15) + (int) posX - 7; int b = rand.nextInt(15) + (int) posY - 7; int c = rand.nextInt(15) + (int) posZ - 7; - - if(worldObj.getBlock(a, b, c).isReplaceable(worldObj, a, b, c) && hasPosNeightbour(worldObj, a, b, c)) { + Block block = worldObj.getBlock(a, b, c); + if(block.isNormalCube() && !block.isAir(worldObj, a, b, c)) { if(!GeneralConfig.enableHardcoreTaint) { worldObj.setBlock(a, b, c, ModBlocks.taint, rand.nextInt(3) + 5, 2); } else { @@ -71,8 +71,8 @@ public void func_146077_cc() { int a = rand.nextInt(7) + (int) posX - 3; int b = rand.nextInt(7) + (int) posY - 3; int c = rand.nextInt(7) + (int) posZ - 3; - - if(worldObj.getBlock(a, b, c).isReplaceable(worldObj, a, b, c) && hasPosNeightbour(worldObj, a, b, c)) { + Block block = worldObj.getBlock(a, b, c); + if(block.isNormalCube() && !block.isAir(worldObj, a, b, c)) { if(!GeneralConfig.enableHardcoreTaint) { worldObj.setBlock(a, b, c, ModBlocks.taint, rand.nextInt(6) + 10, 2); } else { diff --git a/src/main/java/com/hbm/handler/nei/SatelliteHandler.java b/src/main/java/com/hbm/handler/nei/SatelliteHandler.java index 77e0c3cb47..7206b10b2f 100644 --- a/src/main/java/com/hbm/handler/nei/SatelliteHandler.java +++ b/src/main/java/com/hbm/handler/nei/SatelliteHandler.java @@ -14,12 +14,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MathHelper; import net.minecraft.util.WeightedRandomChestContent; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; @@ -177,13 +175,4 @@ public List getOtherStacks() { return getCycledIngredients(cycleticks / 20, stacks); } } - - private static HashMap getRecipeMap() { - HashMap recipeMap = new HashMap<>(); - ItemStack minerStack = new ItemStack(ModItems.sat_miner); - ItemStack lunarMinerStack = new ItemStack(ModItems.sat_lunar_miner); - Arrays.stream(ItemPool.getPool(ItemPoolsSatellite.POOL_SAT_MINER)).forEach(poolEntry -> recipeMap.put(minerStack, poolEntry.theItemId)); - Arrays.stream(ItemPool.getPool(ItemPoolsSatellite.POOL_SAT_LUNAR)).forEach(poolEntry -> recipeMap.put(lunarMinerStack, poolEntry.theItemId)); - return recipeMap; - } } diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 3b2feed151..724ddd4059 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -3830,7 +3830,7 @@ public static void initializeItem() gun_b92_ammo = new GunB92Cell().setUnlocalizedName("gun_b92_ammo").setMaxStackSize(1).setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_b92_ammo_alt"); gun_b92 = new GunB92().setUnlocalizedName("gun_b92").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_b92"); gun_cryolator_ammo = new Item().setUnlocalizedName("gun_cryolator_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_cryolator_ammo"); - gun_cryocannon = new ItemCryoCannon(GunEnergyFactory.getCryoCannonConfig()).setUnlocalizedName("gun_cryocannon").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_cryocannon"); + gun_cryocannon = new ItemCryoCannon(GunEnergyFactory.getCryoCannonConfig()).setUnlocalizedName("gun_cryocannon").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_darter"); gun_fireext = new ItemGunBase(GunEnergyFactory.getExtConfig()).setUnlocalizedName("gun_fireext").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_fireext"); ToolMaterial matCrucible = EnumHelper.addToolMaterial("CRUCIBLE", 10, 3, 50.0F, 100.0F, 0); diff --git a/src/main/java/com/hbm/items/block/ItemTaintBlock.java b/src/main/java/com/hbm/items/block/ItemTaintBlock.java deleted file mode 100644 index 2f048d02aa..0000000000 --- a/src/main/java/com/hbm/items/block/ItemTaintBlock.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.hbm.items.block; - -import java.util.List; - -import com.hbm.blocks.bomb.BlockTaint; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -public class ItemTaintBlock extends ItemBlock -{ - public ItemTaintBlock(Block p_i45358_1_) - { - super(p_i45358_1_); - this.setMaxDamage(0); - this.setHasSubtypes(true); - } - - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int p_77617_1_) - { - return this.field_150939_a.func_149735_b(2, BlockTaint.func_150032_b(p_77617_1_)); - } - - public int getMetadata(int p_77647_1_) - { - return p_77647_1_; - } - - @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) - { - list.add("DO NOT TOUCH, BREATHE OR STARE AT."); - } -} diff --git a/src/main/java/com/hbm/items/weapon/ItemAmmoHIMARS.java b/src/main/java/com/hbm/items/weapon/ItemAmmoHIMARS.java index f50d3ba0f1..c372487d21 100644 --- a/src/main/java/com/hbm/items/weapon/ItemAmmoHIMARS.java +++ b/src/main/java/com/hbm/items/weapon/ItemAmmoHIMARS.java @@ -54,7 +54,7 @@ public class ItemAmmoHIMARS extends Item { public ItemAmmoHIMARS() { this.setHasSubtypes(true); this.setCreativeTab(MainRegistry.weaponTab); - this.setTextureName(RefStrings.MODID + ":ammo_rocket"); + this.setTextureName(RefStrings.MODID + ":ammo_standard.rocket_he"); this.setMaxStackSize(1); init(); } diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 1bc9c8d181..3a4db1cddb 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -771,7 +771,6 @@ public void registerEntityRenderer() { @Override public void registerBlockRenderer() { - RenderingRegistry.registerBlockHandler(new RenderTaintBlock()); RenderingRegistry.registerBlockHandler(new RenderScaffoldBlock()); RenderingRegistry.registerBlockHandler(new RenderTapeBlock()); RenderingRegistry.registerBlockHandler(new RenderSteelBeam()); diff --git a/src/main/java/com/hbm/potion/HbmPotion.java b/src/main/java/com/hbm/potion/HbmPotion.java index a7688f2da8..e27806e1a1 100644 --- a/src/main/java/com/hbm/potion/HbmPotion.java +++ b/src/main/java/com/hbm/potion/HbmPotion.java @@ -3,7 +3,6 @@ import java.lang.reflect.Field; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.bomb.BlockTaint; import com.hbm.config.GeneralConfig; import com.hbm.config.PotionConfig; import com.hbm.entity.mob.EntityTaintCrab; @@ -19,6 +18,7 @@ import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityCow; @@ -109,15 +109,13 @@ public void performEffect(EntityLivingBase entity, int level) { if(GeneralConfig.enableHardcoreTaint && !entity.worldObj.isRemote) { - int x = (int)(entity.posX - 1); - int y = (int)entity.posY; - int z = (int)(entity.posZ); + int x = (int) Math.floor(entity.posX); + int y = (int) Math.floor(entity.posY); + int z = (int) Math.floor(entity.posZ); - if(entity.worldObj.getBlock(x, y, z) - .isReplaceable(entity.worldObj, x, y, z) && - BlockTaint.hasPosNeightbour(entity.worldObj, x, y, z)) { - - entity.worldObj.setBlock(x, y, z, ModBlocks.taint, 14, 2); + Block b = entity.worldObj.getBlock(x, y - 1, z); + if(y > 1 && b.isNormalCube() && !b.isAir(entity.worldObj, x, y - 1, z)) { + entity.worldObj.setBlock(x, y - 1, z, ModBlocks.taint, 14, 2); } } } diff --git a/src/main/java/com/hbm/render/block/RenderTaintBlock.java b/src/main/java/com/hbm/render/block/RenderTaintBlock.java deleted file mode 100644 index b7f6bc240e..0000000000 --- a/src/main/java/com/hbm/render/block/RenderTaintBlock.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.hbm.render.block; - -import com.hbm.blocks.bomb.BlockTaint; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; - -public class RenderTaintBlock implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - - Tessellator tessellator = Tessellator.instance; - IIcon iicon = block.getIcon(0, world.getBlockMetadata(x, y, z)); - - if (renderer.hasOverrideBlockTexture()) - { - iicon = renderer.overrideBlockTexture; - } - - boolean ceil = world.getBlock(x, y + 1, z).isNormalCube(); - boolean floor = world.getBlock(x, y - 1, z).isNormalCube(); - boolean side1 = world.getBlock(x, y, z + 1).isNormalCube(); - boolean side2 = world.getBlock(x - 1, y, z).isNormalCube(); - boolean side3 = world.getBlock(x, y, z - 1).isNormalCube(); - boolean side4 = world.getBlock(x + 1, y, z).isNormalCube(); - - tessellator.setBrightness(block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z)); - int l = block.colorMultiplier(renderer.blockAccess, x, y, z); - float f = (float)(l >> 16 & 255) / 255.0F; - float f1 = (float)(l >> 8 & 255) / 255.0F; - float f2 = (float)(l & 255) / 255.0F; - tessellator.setColorOpaque_F(f, f1, f2); - double d3 = (double)iicon.getMinU(); - double d4 = (double)iicon.getMinV(); - double d0 = (double)iicon.getMaxU(); - double d1 = (double)iicon.getMaxV(); - double d2 = 0.05D; - renderer.blockAccess.getBlockMetadata(x, y, z); - - if (side2) - { - tessellator.addVertexWithUV((double)x + d2, (double)(y + 1), (double)(z + 1), d3, d4); - tessellator.addVertexWithUV((double)x + d2, (double)(y + 0), (double)(z + 1), d3, d1); - tessellator.addVertexWithUV((double)x + d2, (double)(y + 0), (double)(z + 0), d0, d1); - tessellator.addVertexWithUV((double)x + d2, (double)(y + 1), (double)(z + 0), d0, d4); - tessellator.addVertexWithUV((double)x + d2, (double)(y + 1), (double)(z + 0), d0, d4); - tessellator.addVertexWithUV((double)x + d2, (double)(y + 0), (double)(z + 0), d0, d1); - tessellator.addVertexWithUV((double)x + d2, (double)(y + 0), (double)(z + 1), d3, d1); - tessellator.addVertexWithUV((double)x + d2, (double)(y + 1), (double)(z + 1), d3, d4); - } - - if (side4) - { - tessellator.addVertexWithUV((double)(x + 1) - d2, (double)(y + 0), (double)(z + 1), d0, d1); - tessellator.addVertexWithUV((double)(x + 1) - d2, (double)(y + 1), (double)(z + 1), d0, d4); - tessellator.addVertexWithUV((double)(x + 1) - d2, (double)(y + 1), (double)(z + 0), d3, d4); - tessellator.addVertexWithUV((double)(x + 1) - d2, (double)(y + 0), (double)(z + 0), d3, d1); - tessellator.addVertexWithUV((double)(x + 1) - d2, (double)(y + 0), (double)(z + 0), d3, d1); - tessellator.addVertexWithUV((double)(x + 1) - d2, (double)(y + 1), (double)(z + 0), d3, d4); - tessellator.addVertexWithUV((double)(x + 1) - d2, (double)(y + 1), (double)(z + 1), d0, d4); - tessellator.addVertexWithUV((double)(x + 1) - d2, (double)(y + 0), (double)(z + 1), d0, d1); - } - - if (side3) - { - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 0), (double)z + d2, d0, d1); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 1), (double)z + d2, d0, d4); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 1), (double)z + d2, d3, d4); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 0), (double)z + d2, d3, d1); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 0), (double)z + d2, d3, d1); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 1), (double)z + d2, d3, d4); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 1), (double)z + d2, d0, d4); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 0), (double)z + d2, d0, d1); - } - - if (side1) - { - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 1), (double)(z + 1) - d2, d3, d4); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 0), (double)(z + 1) - d2, d3, d1); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 0), (double)(z + 1) - d2, d0, d1); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 1), (double)(z + 1) - d2, d0, d4); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 1), (double)(z + 1) - d2, d0, d4); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 0), (double)(z + 1) - d2, d0, d1); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 0), (double)(z + 1) - d2, d3, d1); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 1), (double)(z + 1) - d2, d3, d4); - } - - if (ceil) - { - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 1) - d2, (double)(z + 0), d3, d4); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 1) - d2, (double)(z + 1), d3, d1); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 1) - d2, (double)(z + 1), d0, d1); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 1) - d2, (double)(z + 0), d0, d4); - } - - if (floor) - { - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 0) + d2, (double)(z + 0), d0, d4); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 0) + d2, (double)(z + 1), d0, d1); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 0) + d2, (double)(z + 1), d3, d1); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 0) + d2, (double)(z + 0), d3, d4); - } - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return false; - } - - @Override - public int getRenderId() { - return BlockTaint.renderID; - } - -} diff --git a/src/main/resources/assets/hbm/textures/blocks/ams_base.png b/src/main/resources/assets/hbm/textures/blocks/ams_base.png deleted file mode 100644 index d0d65f51ff..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/ams_base.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/ams_emitter.png b/src/main/resources/assets/hbm/textures/blocks/ams_emitter.png deleted file mode 100644 index 1e8db25665..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/ams_emitter.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/ams_limiter.png b/src/main/resources/assets/hbm/textures/blocks/ams_limiter.png deleted file mode 100644 index e55f3b55c1..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/ams_limiter.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/block_daffergon.png b/src/main/resources/assets/hbm/textures/blocks/block_daffergon.png deleted file mode 100644 index 48c695c081..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/block_daffergon.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/block_reiium.png b/src/main/resources/assets/hbm/textures/blocks/block_reiium.png deleted file mode 100644 index c992af05aa..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/block_reiium.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/block_unobtainium.png b/src/main/resources/assets/hbm/textures/blocks/block_unobtainium.png deleted file mode 100644 index c169d0808d..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/block_unobtainium.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/block_verticium.png b/src/main/resources/assets/hbm/textures/blocks/block_verticium.png deleted file mode 100644 index d494cb2185..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/block_verticium.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/block_weidanium.png b/src/main/resources/assets/hbm/textures/blocks/block_weidanium.png deleted file mode 100644 index c4a52edcbe..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/block_weidanium.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint.png b/src/main/resources/assets/hbm/textures/blocks/taint.png new file mode 100644 index 0000000000..df93b16d06 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/taint.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_0.png b/src/main/resources/assets/hbm/textures/blocks/taint_0.png deleted file mode 100644 index 0bbd126346..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_0.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_1.png b/src/main/resources/assets/hbm/textures/blocks/taint_1.png deleted file mode 100644 index d6dd11a899..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_1.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_10.png b/src/main/resources/assets/hbm/textures/blocks/taint_10.png deleted file mode 100644 index cd84e8bd21..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_10.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_11.png b/src/main/resources/assets/hbm/textures/blocks/taint_11.png deleted file mode 100644 index cf57f7048f..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_11.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_12.png b/src/main/resources/assets/hbm/textures/blocks/taint_12.png deleted file mode 100644 index 7be919a345..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_12.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_13.png b/src/main/resources/assets/hbm/textures/blocks/taint_13.png deleted file mode 100644 index 6e0ba09d39..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_13.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_14.png b/src/main/resources/assets/hbm/textures/blocks/taint_14.png deleted file mode 100644 index fe299aaa02..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_14.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_15.png b/src/main/resources/assets/hbm/textures/blocks/taint_15.png deleted file mode 100644 index 9dd944165a..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_15.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_2.png b/src/main/resources/assets/hbm/textures/blocks/taint_2.png deleted file mode 100644 index cd64d383f4..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_2.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_3.png b/src/main/resources/assets/hbm/textures/blocks/taint_3.png deleted file mode 100644 index b766290170..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_3.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_4.png b/src/main/resources/assets/hbm/textures/blocks/taint_4.png deleted file mode 100644 index dd66e62453..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_4.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_5.png b/src/main/resources/assets/hbm/textures/blocks/taint_5.png deleted file mode 100644 index 90ba3f39cf..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_5.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_6.png b/src/main/resources/assets/hbm/textures/blocks/taint_6.png deleted file mode 100644 index 2146fb19c9..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_6.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_7.png b/src/main/resources/assets/hbm/textures/blocks/taint_7.png deleted file mode 100644 index 614bee225b..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_7.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_8.png b/src/main/resources/assets/hbm/textures/blocks/taint_8.png deleted file mode 100644 index aba944663e..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_8.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_9.png b/src/main/resources/assets/hbm/textures/blocks/taint_9.png deleted file mode 100644 index 5a4ed0e18e..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_9.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_full.png b/src/main/resources/assets/hbm/textures/blocks/taint_full.png deleted file mode 100644 index fce2c72d07..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_full.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_low.png b/src/main/resources/assets/hbm/textures/blocks/taint_low.png deleted file mode 100644 index 48ee862429..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/taint_low.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/test_bb_bork.png b/src/main/resources/assets/hbm/textures/blocks/test_bb_bork.png deleted file mode 100644 index 411d7960f5..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/test_bb_bork.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/test_bb_inf.png b/src/main/resources/assets/hbm/textures/blocks/test_bb_inf.png deleted file mode 100644 index 107de4238b..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/test_bb_inf.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/test_bomb.png b/src/main/resources/assets/hbm/textures/blocks/test_bomb.png deleted file mode 100644 index f9b425a24c..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/test_bomb.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/test_conductor.png b/src/main/resources/assets/hbm/textures/blocks/test_conductor.png deleted file mode 100644 index c1b14c7080..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/test_conductor.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/test_container.png b/src/main/resources/assets/hbm/textures/blocks/test_container.png deleted file mode 100644 index 3d3f7d3299..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/test_container.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/test_nuke.png b/src/main/resources/assets/hbm/textures/blocks/test_nuke.png deleted file mode 100644 index af8e35e498..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/test_nuke.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/test_ticker.png b/src/main/resources/assets/hbm/textures/blocks/test_ticker.png deleted file mode 100644 index 4f3c430f98..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/test_ticker.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/waste_earth_side.png b/src/main/resources/assets/hbm/textures/blocks/waste_earth_side.png deleted file mode 100644 index eabad09e5a..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/waste_earth_side.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/waste_earth_top.png b/src/main/resources/assets/hbm/textures/blocks/waste_earth_top.png deleted file mode 100644 index 625f45be7b..0000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/waste_earth_top.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/entity/creeper_armor_taint.png b/src/main/resources/assets/hbm/textures/entity/creeper_armor_taint.png index fad613e604..b340233373 100644 Binary files a/src/main/resources/assets/hbm/textures/entity/creeper_armor_taint.png and b/src/main/resources/assets/hbm/textures/entity/creeper_armor_taint.png differ diff --git a/src/main/resources/assets/hbm/textures/entity/creeper_tainted.png b/src/main/resources/assets/hbm/textures/entity/creeper_tainted.png index cd41bc1bbf..1daffe305a 100644 Binary files a/src/main/resources/assets/hbm/textures/entity/creeper_tainted.png and b/src/main/resources/assets/hbm/textures/entity/creeper_tainted.png differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_ar15.png b/src/main/resources/assets/hbm/textures/items/gun_ar15.png deleted file mode 100644 index 032404fcc8..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_ar15.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_avenger.png b/src/main/resources/assets/hbm/textures/items/gun_avenger.png deleted file mode 100644 index 004f943edb..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_avenger.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_b93.png b/src/main/resources/assets/hbm/textures/items/gun_b93.png deleted file mode 100644 index 0f6855a444..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_b93.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_bf.png b/src/main/resources/assets/hbm/textures/items/gun_bf.png deleted file mode 100644 index 67bb9a89f4..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_bf.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_bio_revolver.png b/src/main/resources/assets/hbm/textures/items/gun_bio_revolver.png deleted file mode 100644 index ed11e32c0d..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_bio_revolver.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_bolt_action.png b/src/main/resources/assets/hbm/textures/items/gun_bolt_action.png deleted file mode 100644 index a5e4409af9..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_bolt_action.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_bolt_action_green.png b/src/main/resources/assets/hbm/textures/items/gun_bolt_action_green.png deleted file mode 100644 index 652e0dc9a1..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_bolt_action_green.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_bolt_action_saturnite.png b/src/main/resources/assets/hbm/textures/items/gun_bolt_action_saturnite.png deleted file mode 100644 index 6c84794619..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_bolt_action_saturnite.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_calamity.png b/src/main/resources/assets/hbm/textures/items/gun_calamity.png deleted file mode 100644 index a5ec308bcf..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_calamity.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_calamity_dual.png b/src/main/resources/assets/hbm/textures/items/gun_calamity_dual.png deleted file mode 100644 index 3f6d18f420..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_calamity_dual.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_coilgun.png b/src/main/resources/assets/hbm/textures/items/gun_coilgun.png deleted file mode 100644 index 5c130d1096..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_coilgun.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_cryolator.png b/src/main/resources/assets/hbm/textures/items/gun_cryolator.png deleted file mode 100644 index 2bb9562059..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_cryolator.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_deagle.png b/src/main/resources/assets/hbm/textures/items/gun_deagle.png deleted file mode 100644 index 93ea0154a1..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_deagle.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_defabricator.png b/src/main/resources/assets/hbm/textures/items/gun_defabricator.png deleted file mode 100644 index e4b21e0b6d..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_defabricator.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_defabricator_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_defabricator_ammo.png deleted file mode 100644 index 8b4ad03e3f..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_defabricator_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_emp.png b/src/main/resources/assets/hbm/textures/items/gun_emp.png deleted file mode 100644 index b4be7d1f73..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_emp.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_emp_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_emp_ammo.png deleted file mode 100644 index 15ca8e10fb..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_emp_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_euthanasia.png b/src/main/resources/assets/hbm/textures/items/gun_euthanasia.png deleted file mode 100644 index 7d9cc51efc..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_euthanasia.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_euthanasia_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_euthanasia_ammo.png deleted file mode 100644 index 7a26309eb2..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_euthanasia_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_fatman.png b/src/main/resources/assets/hbm/textures/items/gun_fatman.png deleted file mode 100644 index 07bade5d1c..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_fatman.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_flamer.png b/src/main/resources/assets/hbm/textures/items/gun_flamer.png deleted file mode 100644 index 6cf5d9530e..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_flamer.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_folly.png b/src/main/resources/assets/hbm/textures/items/gun_folly.png deleted file mode 100644 index a62c97a96f..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_folly.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_hk69.png b/src/main/resources/assets/hbm/textures/items/gun_hk69.png deleted file mode 100644 index a7dabb154e..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_hk69.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_hp.png b/src/main/resources/assets/hbm/textures/items/gun_hp.png deleted file mode 100644 index 9c65ba2e28..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_hp.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_hp_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_hp_ammo.png deleted file mode 100644 index 4c7f3acf55..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_hp_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_immolator.png b/src/main/resources/assets/hbm/textures/items/gun_immolator.png deleted file mode 100644 index 26e05d4d6e..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_immolator.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_immolator_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_immolator_ammo.png deleted file mode 100644 index 33069873c5..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_immolator_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_jack.png b/src/main/resources/assets/hbm/textures/items/gun_jack.png deleted file mode 100644 index 622c17c48a..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_jack.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_jack_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_jack_ammo.png deleted file mode 100644 index 1a472ef448..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_jack_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_karl.png b/src/main/resources/assets/hbm/textures/items/gun_karl.png deleted file mode 100644 index ff1dba93d4..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_karl.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_lacunae.png b/src/main/resources/assets/hbm/textures/items/gun_lacunae.png deleted file mode 100644 index 56b58d5be7..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_lacunae.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_lever_action.png b/src/main/resources/assets/hbm/textures/items/gun_lever_action.png deleted file mode 100644 index 21ea9298a2..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_lever_action.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_lever_action_dark.png b/src/main/resources/assets/hbm/textures/items/gun_lever_action_dark.png deleted file mode 100644 index d07aca7931..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_lever_action_dark.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_lever_action_sonata.png b/src/main/resources/assets/hbm/textures/items/gun_lever_action_sonata.png deleted file mode 100644 index a6ae3f94b5..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_lever_action_sonata.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_minigun.png b/src/main/resources/assets/hbm/textures/items/gun_minigun.png deleted file mode 100644 index f4db3f2401..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_minigun.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_mirv.png b/src/main/resources/assets/hbm/textures/items/gun_mirv.png deleted file mode 100644 index 7c03eff97b..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_mirv.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_moist_nugget.png b/src/main/resources/assets/hbm/textures/items/gun_moist_nugget.png deleted file mode 100644 index ae84c07f16..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_moist_nugget.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_mp40.png b/src/main/resources/assets/hbm/textures/items/gun_mp40.png deleted file mode 100644 index 779a68502e..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_mp40.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_mymy.png b/src/main/resources/assets/hbm/textures/items/gun_mymy.png deleted file mode 100644 index a255633ba3..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_mymy.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_osipr.png b/src/main/resources/assets/hbm/textures/items/gun_osipr.png deleted file mode 100644 index f45a4069d6..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_osipr.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_osipr_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_osipr_ammo.png deleted file mode 100644 index 24e644f440..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_osipr_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_osipr_ammo2.png b/src/main/resources/assets/hbm/textures/items/gun_osipr_ammo2.png deleted file mode 100644 index 313abf5565..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_osipr_ammo2.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_panzerschreck.png b/src/main/resources/assets/hbm/textures/items/gun_panzerschreck.png deleted file mode 100644 index d9c5fc51d8..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_panzerschreck.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_pm.png b/src/main/resources/assets/hbm/textures/items/gun_pm.png deleted file mode 100644 index a32ee6a14d..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_pm.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_pm_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_pm_ammo.png deleted file mode 100644 index 9309fa68f8..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_pm_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_quadro.png b/src/main/resources/assets/hbm/textures/items/gun_quadro.png deleted file mode 100644 index 1e7f41b68b..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_quadro.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver.png b/src/main/resources/assets/hbm/textures/items/gun_revolver.png deleted file mode 100644 index f7d5507514..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_ammo.png deleted file mode 100644 index 77b64a54ee..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_blackjack.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_blackjack.png deleted file mode 100644 index a3508b1a53..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_blackjack.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_cursed.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_cursed.png deleted file mode 100644 index f6012329b5..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_cursed.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_cursed_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_cursed_ammo.png deleted file mode 100644 index d55664661d..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_cursed_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_gold.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_gold.png deleted file mode 100644 index 0e6008a26c..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_gold.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_gold_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_gold_ammo.png deleted file mode 100644 index fe6b251548..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_gold_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_inverted.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_inverted.png deleted file mode 100644 index 1c99257002..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_inverted.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_iron.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_iron.png deleted file mode 100644 index 82974cc4ce..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_iron.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_iron_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_iron_ammo.png deleted file mode 100644 index bc25af3a44..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_iron_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_lead.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_lead.png deleted file mode 100644 index 4ecd5014bc..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_lead.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_lead_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_lead_ammo.png deleted file mode 100644 index a123c69877..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_lead_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare.png deleted file mode 100644 index 8b7241860d..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare2.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare2.png deleted file mode 100644 index 6f440b5b6f..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare2.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare2_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare2_ammo.png deleted file mode 100644 index eb58a2cd72..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare2_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare_ammo.png deleted file mode 100644 index 75fc19a3bd..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_nopip.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_nopip.png deleted file mode 100644 index f8923e0e19..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_nopip.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_pip.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_pip.png deleted file mode 100644 index f524b1d6b6..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_pip.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_pip_alt.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_pip_alt.png deleted file mode 100644 index dd888d23b2..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_pip_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_red.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_red.png deleted file mode 100644 index ec8267bf9b..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_red.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_saturnite.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_saturnite.png deleted file mode 100644 index 21413411fa..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_saturnite.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_schrabidium.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_schrabidium.png deleted file mode 100644 index a1e4a87ed6..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_schrabidium.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_schrabidium_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_schrabidium_ammo.png deleted file mode 100644 index e3e19703de..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_schrabidium_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_silver.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_silver.png deleted file mode 100644 index b9900ddffc..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_revolver_silver.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_rpg.png b/src/main/resources/assets/hbm/textures/items/gun_rpg.png deleted file mode 100644 index 70907f3599..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_rpg.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_rpg_alt.png b/src/main/resources/assets/hbm/textures/items/gun_rpg_alt.png deleted file mode 100644 index ec52216020..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_rpg_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_rpg_new.png b/src/main/resources/assets/hbm/textures/items/gun_rpg_new.png deleted file mode 100644 index f707e52426..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_rpg_new.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_skystinger.png b/src/main/resources/assets/hbm/textures/items/gun_skystinger.png deleted file mode 100644 index ef3ff8c9d8..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_skystinger.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_spark.png b/src/main/resources/assets/hbm/textures/items/gun_spark.png deleted file mode 100644 index d308afeef5..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_spark.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_spark_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_spark_ammo.png deleted file mode 100644 index 150780fcb1..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_spark_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_spas12.png b/src/main/resources/assets/hbm/textures/items/gun_spas12.png deleted file mode 100644 index b0420f7772..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_spas12.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_stinger.png b/src/main/resources/assets/hbm/textures/items/gun_stinger.png deleted file mode 100644 index 4e89b8215b..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_stinger.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_super_shotgun.png b/src/main/resources/assets/hbm/textures/items/gun_super_shotgun.png deleted file mode 100644 index c8c8f39cb7..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_super_shotgun.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_uboinik.png b/src/main/resources/assets/hbm/textures/items/gun_uboinik.png deleted file mode 100644 index d910cfbad1..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_uboinik.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_uzi.png b/src/main/resources/assets/hbm/textures/items/gun_uzi.png deleted file mode 100644 index b35f0502e1..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_uzi.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_uzi_saturnite.png b/src/main/resources/assets/hbm/textures/items/gun_uzi_saturnite.png deleted file mode 100644 index 7be46c01c6..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_uzi_saturnite.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_uzi_saturnite_silencer.png b/src/main/resources/assets/hbm/textures/items/gun_uzi_saturnite_silencer.png deleted file mode 100644 index 9387b6b686..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_uzi_saturnite_silencer.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_uzi_silencer.png b/src/main/resources/assets/hbm/textures/items/gun_uzi_silencer.png deleted file mode 100644 index 38a60037f9..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_uzi_silencer.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_xvl1456.png b/src/main/resources/assets/hbm/textures/items/gun_xvl1456.png deleted file mode 100644 index 6507efa708..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_xvl1456.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_xvl1456_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_xvl1456_ammo.png deleted file mode 100644 index 77ed27a29e..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_xvl1456_ammo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gun_zomg.png b/src/main/resources/assets/hbm/textures/items/gun_zomg.png deleted file mode 100644 index b0e443d764..0000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gun_zomg.png and /dev/null differ