diff --git a/changelog b/changelog index e4c661a8c..8c0770c38 100644 --- a/changelog +++ b/changelog @@ -19,8 +19,11 @@ * Badges can be disabled with the `BADGES_HUD` value of `/ntmclient` * The badge only shows up if the "true" configuration is used, 528 requires default settings, expensive requires the precision assembler config to not be modified and rampant needs most of the default settings enabled * If all three modes are enabled, the "328 mode" badge also appears +* Removed toothpicks, as they haven't been used in recipes for well over a year +* Cleaned up a ton of unused assets # Fixed * Fixed proxy tiles that do not use electricity at all visually connecting to cables * Fixed missing texture for canned horse slime -* Fixed incorrect ore dictionary key used by enriched naquadah watz pellet recipe \ No newline at end of file +* Fixed incorrect ore dictionary key used by enriched naquadah watz pellet recipe +* Fixed out of bounds light level for the RTG blast furnace \ 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 cf0f5c50f..251a1dfec 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -345,6 +345,7 @@ public class ModBlocks { public static Block lightstone; public static Block brick_forgotten; + public static Block brick_forgotten_lock; public static Block concrete_slab; public static Block concrete_double_slab; @@ -846,7 +847,6 @@ public class ModBlocks { public static Block barrel_antimatter; public static Block machine_transformer; - public static Block machine_transformer_dnt; public static Block machine_solar_boiler; public static Block solar_mirror; @@ -1533,6 +1533,7 @@ public class ModBlocks { lightstone = new BlockLightstone(Material.rock, LightstoneType.class, true, true).setBlockName("lightstone").setCreativeTab(MainRegistry.blockTab).setHardness(2F).setResistance(15.0F).setBlockTextureName(RefStrings.MODID + ":lightstone"); brick_forgotten = new BlockPillar(Material.rock, RefStrings.MODID + ":brick_forgotten_top").setBlockName("brick_forgotten").setBlockUnbreakable().setResistance(666_666F).setBlockTextureName(RefStrings.MODID + ":brick_forgotten"); + brick_forgotten_lock = new BlockForgottenLock(Material.rock, RefStrings.MODID + ":brick_forgotten_top").setBlockName("brick_forgotten_lock").setBlockUnbreakable().setResistance(666_666F).setBlockTextureName(RefStrings.MODID + ":brick_forgotten_lock"); concrete_slab = new BlockMultiSlab(null, Material.rock, concrete_smooth, concrete, concrete_asbestos, ducrete_smooth, ducrete, asphalt).setBlockName("concrete_slab").setCreativeTab(MainRegistry.blockTab); concrete_double_slab = new BlockMultiSlab(concrete_slab, Material.rock, concrete_smooth, concrete, concrete_asbestos, ducrete_smooth, ducrete, asphalt).setBlockName("concrete_double_slab").setCreativeTab(MainRegistry.blockTab); @@ -1790,7 +1791,7 @@ public class ModBlocks { machine_difurnace_on = new MachineDiFurnace(true).setBlockName("machine_difurnace_on").setHardness(5.0F).setLightLevel(1.0F).setResistance(10.0F); machine_difurnace_extension = new MachineDiFurnaceExtension().setBlockName("machine_difurnace_extension").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); machine_difurnace_rtg_off = new MachineDiFurnaceRTG(false).setBlockName("machine_difurnace_rtg_off").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); - machine_difurnace_rtg_on = new MachineDiFurnaceRTG(true).setBlockName("machine_difurnace_rtg_on").setHardness(5.0F).setResistance(10.0F).setLightLevel(2.0F).setCreativeTab(null); + machine_difurnace_rtg_on = new MachineDiFurnaceRTG(true).setBlockName("machine_difurnace_rtg_on").setHardness(5.0F).setResistance(10.0F).setLightLevel(1.0F).setCreativeTab(null); machine_centrifuge = new MachineCentrifuge(Material.iron).setBlockName("machine_centrifuge").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); machine_gascent = new MachineGasCent(Material.iron).setBlockName("machine_gascent").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); @@ -1969,8 +1970,7 @@ public class ModBlocks { barrel_tcalloy = new BlockFluidBarrel(Material.iron, 24000).setBlockName("barrel_tcalloy").setStepSound(Block.soundTypeMetal).setHardness(2.0F).setResistance(5.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":barrel_tcalloy"); barrel_antimatter = new BlockFluidBarrel(Material.iron, 16000).setBlockName("barrel_antimatter").setStepSound(Block.soundTypeMetal).setHardness(2.0F).setResistance(5.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":barrel_antimatter"); - machine_transformer = new MachineTransformer(Material.iron, 10000L, 1).setBlockName("machine_transformer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_transformer_iron"); - machine_transformer_dnt = new MachineTransformer(Material.iron, 1000000000000000L, 1).setBlockName("machine_transformer_dnt").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_transformer"); + machine_transformer = new MachineTransformer(Material.iron).setBlockName("machine_transformer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_transformer_iron"); machine_satlinker = new MachineSatLinker(Material.iron).setBlockName("machine_satlinker").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":machine_satlinker_side"); machine_keyforge = new MachineKeyForge(Material.iron).setBlockName("machine_keyforge").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.consumableTab).setBlockTextureName(RefStrings.MODID + ":machine_keyforge_side"); @@ -2704,6 +2704,7 @@ public class ModBlocks { register(stones_double_slab, ItemModSlab.class); register(brick_forgotten); + register(brick_forgotten_lock); GameRegistry.registerBlock(concrete_slab, ItemModSlab.class, concrete_slab.getUnlocalizedName()); GameRegistry.registerBlock(concrete_double_slab, ItemModSlab.class, concrete_double_slab.getUnlocalizedName()); @@ -3257,7 +3258,6 @@ public class ModBlocks { register(capacitor_tantalium); register(capacitor_schrabidate); GameRegistry.registerBlock(machine_transformer, machine_transformer.getUnlocalizedName()); - GameRegistry.registerBlock(machine_transformer_dnt, machine_transformer_dnt.getUnlocalizedName()); GameRegistry.registerBlock(machine_converter_he_rf, machine_converter_he_rf.getUnlocalizedName()); GameRegistry.registerBlock(machine_converter_rf_he, machine_converter_rf_he.getUnlocalizedName()); GameRegistry.registerBlock(machine_electric_furnace_off, machine_electric_furnace_off.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/bomb/BlockCrashedBomb.java b/src/main/java/com/hbm/blocks/bomb/BlockCrashedBomb.java index 5a2e037b4..0a3ffebe2 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockCrashedBomb.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockCrashedBomb.java @@ -54,21 +54,24 @@ public class BlockCrashedBomb extends BlockEnumMulti implements ITileEntityProvi EnumDudType type = EnumUtil.grabEnumSafely(EnumDudType.class, world.getBlockMetadata(x, y, z)); - //TODO: make this less scummy if(type == type.BALEFIRE) { - world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.egg_balefire_shard))); + dropItems(world, x, y, z, + new ItemStack(ModItems.egg_balefire_shard)); } if(type == type.CONVENTIONAL) { - world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.ball_tnt, 16))); + dropItems(world, x, y, z, + new ItemStack(ModItems.ball_tnt, 16)); } if(type == type.NUKE) { - world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.ball_tnt, 8))); - world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.billet_plutonium, 4))); + dropItems(world, x, y, z, + new ItemStack(ModItems.ball_tnt, 8), + new ItemStack(ModItems.billet_plutonium, 4)); } if(type == type.SALTED) { - world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.ball_tnt, 8))); - world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.billet_plutonium, 2))); - world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.ingot_cobalt, 12))); + dropItems(world, x, y, z, + new ItemStack(ModItems.ball_tnt, 8), + new ItemStack(ModItems.billet_plutonium, 2), + new ItemStack(ModItems.ingot_cobalt, 12)); } world.func_147480_a(x, y, z, false); @@ -77,6 +80,10 @@ public class BlockCrashedBomb extends BlockEnumMulti implements ITileEntityProvi return false; } + + public static void dropItems(World world, int x, int y, int z, ItemStack... drops) { + for(ItemStack drop : drops) world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, drop)); + } @Override public BombReturnCode explode(World world, int x, int y, int z) { diff --git a/src/main/java/com/hbm/blocks/generic/BlockForgottenLock.java b/src/main/java/com/hbm/blocks/generic/BlockForgottenLock.java new file mode 100644 index 000000000..23051777a --- /dev/null +++ b/src/main/java/com/hbm/blocks/generic/BlockForgottenLock.java @@ -0,0 +1,42 @@ +package com.hbm.blocks.generic; + +import com.hbm.blocks.machine.BlockPillar; +import com.hbm.items.ModItems; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +public class BlockForgottenLock extends BlockPillar { + + public BlockForgottenLock(Material mat, String top) { + super(mat, top); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + + // placeholder + if(player.getHeldItem() != null) { + boolean cracked = player.getHeldItem().getItem() == ModItems.key_red_cracked; + if((player.getHeldItem().getItem() == ModItems.key_red || cracked) && side != 0 && side != 1) { + if(cracked) player.getHeldItem().stackSize--; + if(world.isRemote) return true; + int meta = world.getBlockMetadata(x, y, z); + ForgeDirection dir = ForgeDirection.getOrientation(side); + + generate(world, x, y, z, meta, dir); + + world.playSoundAtEntity(player, "hbm:block.lockOpen", 1.0F, 1.0F); + return true; + } + } + + return false; + } + + public static void generate(World world, int x, int y, int z, int meta, ForgeDirection dir) { + + } +} diff --git a/src/main/java/com/hbm/blocks/machine/MachineTransformer.java b/src/main/java/com/hbm/blocks/machine/MachineTransformer.java index 60751e333..fe9cb6261 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineTransformer.java +++ b/src/main/java/com/hbm/blocks/machine/MachineTransformer.java @@ -14,7 +14,7 @@ public class MachineTransformer extends Block { @SideOnly(Side.CLIENT) private IIcon iconTop; - public MachineTransformer(Material p_i45394_1_, long b, int d) { + public MachineTransformer(Material p_i45394_1_) { super(p_i45394_1_); } @@ -26,10 +26,6 @@ public class MachineTransformer extends Block { this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer_top_iron"); this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer_iron"); } - if(this == ModBlocks.machine_transformer_dnt) { - this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer_top"); - this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer"); - } } @Override diff --git a/src/main/java/com/hbm/config/MobConfig.java b/src/main/java/com/hbm/config/MobConfig.java index 6b6ac3294..43c2d5526 100644 --- a/src/main/java/com/hbm/config/MobConfig.java +++ b/src/main/java/com/hbm/config/MobConfig.java @@ -69,7 +69,7 @@ public class MobConfig { public static double pollutionMult = 3; public static boolean trueRam() { - return rampantMode && rampantNaturalScoutSpawn && rampantScoutSpawnThresh <= 0.1 && rampantExtendedTargetting && rampantDig && rampantGlyphidGuidance; + return rampantMode && rampantNaturalScoutSpawn && scoutThreshold <= 0.1 && rampantExtendedTargetting && rampantDig && rampantGlyphidGuidance; } public static void loadFromConfig(Configuration config) { diff --git a/src/main/java/com/hbm/itempool/ItemPoolsComponent.java b/src/main/java/com/hbm/itempool/ItemPoolsComponent.java index 7ba5e59fc..dd501fee8 100644 --- a/src/main/java/com/hbm/itempool/ItemPoolsComponent.java +++ b/src/main/java/com/hbm/itempool/ItemPoolsComponent.java @@ -122,10 +122,10 @@ public class ItemPoolsComponent { weighted(Items.map, 0, 1, 1, 50), weighted(Items.writable_book, 0, 1, 1, 30), weighted(ModItems.cigarette, 0, 1, 16, 20), - weighted(ModItems.toothpicks, 0, 1, 16, 10), weighted(ModItems.dust, 0, 1, 1, 40), weighted(ModItems.dust_tiny, 0, 1, 3, 75), weighted(ModItems.ink, 0, 1, 1, 1), + weighted(ModItems.screwdriver, 0, 1, 1, 10), weighted(ModItems.blueprint_folder, 0, 1, 1, 5) }; }}; diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index dd23f2930..5a808cc5e 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -610,7 +610,6 @@ public class ModItems { public static Item gear_large; public static Item sawblade; - public static Item toothpicks; public static Item ducttape; public static Item catalyst_clay; @@ -774,12 +773,6 @@ public class ModItems { public static Item ams_catalyst_thorium; public static Item ams_catalyst_tungsten; - public static Item ams_focus_blank; - public static Item ams_focus_limiter; - public static Item ams_focus_booster; - - public static Item ams_muzzle; - public static Item ams_lens; public static Item ams_core_sing; @@ -2697,7 +2690,6 @@ public class ModItems { blade_tungsten = new Item().setUnlocalizedName("blade_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":blade_tungsten"); turbine_tungsten = new Item().setUnlocalizedName("turbine_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":turbine_tungsten"); - toothpicks = new Item().setUnlocalizedName("toothpicks").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":toothpicks"); ducttape = new Item().setUnlocalizedName("ducttape").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ducttape"); catalyst_clay = new Item().setUnlocalizedName("catalyst_clay").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":catalyst_clay"); @@ -2938,7 +2930,7 @@ public class ModItems { radx = new ItemPill(0).setUnlocalizedName("radx").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":radx"); siox = new ItemPill(0).setUnlocalizedName("siox").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":siox"); pill_herbal = new ItemPill(0).setUnlocalizedName("pill_herbal").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pill_herbal"); - xanax = new ItemPill(0).setUnlocalizedName("xanax").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":xanax_2"); + xanax = new ItemPill(0).setUnlocalizedName("xanax").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":xanax"); fmn = new ItemPill(0).setUnlocalizedName("fmn").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":tablet"); five_htp = new ItemPill(0).setUnlocalizedName("five_htp").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":5htp"); pill_iodine = new ItemPill(0).setUnlocalizedName("pill_iodine").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pill_iodine"); @@ -3430,7 +3422,7 @@ public class ModItems { icf_pellet = new ItemICFPellet().setUnlocalizedName("icf_pellet").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":icf_pellet"); icf_pellet_depleted = new Item().setUnlocalizedName("icf_pellet_depleted").setCreativeTab(MainRegistry.controlTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":icf_pellet_depleted"); - trinitite = new ItemNuclearWaste().setUnlocalizedName("trinitite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":trinitite_new"); + trinitite = new ItemNuclearWaste().setUnlocalizedName("trinitite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":trinitite"); nuclear_waste_long = new ItemWasteLong().setUnlocalizedName("nuclear_waste_long").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_long"); nuclear_waste_long_tiny = new ItemWasteLong().setUnlocalizedName("nuclear_waste_long_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_long_tiny"); nuclear_waste_short = new ItemWasteShort().setUnlocalizedName("nuclear_waste_short").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nuclear_waste_short"); @@ -3885,10 +3877,6 @@ public class ModItems { arc_electrode = new ItemArcElectrode().setUnlocalizedName("arc_electrode").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":arc_electrode"); arc_electrode_burnt = new ItemArcElectrodeBurnt().setUnlocalizedName("arc_electrode_burnt").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":arc_electrode_burnt"); - ams_focus_blank = new Item().setUnlocalizedName("ams_focus_blank").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_focus_blank"); - ams_focus_limiter = new ItemCustomLore().setUnlocalizedName("ams_focus_limiter").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_focus_limiter"); - ams_focus_booster = new ItemCustomLore().setUnlocalizedName("ams_focus_booster").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_focus_booster"); - ams_muzzle = new ItemCustomLore().setUnlocalizedName("ams_muzzle").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_muzzle"); ams_lens = new ItemLens(60 * 60 * 60 * 20 * 100).setUnlocalizedName("ams_lens").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_lens"); ams_core_sing = new ItemAMSCore(1000000000L, 200, 10).setUnlocalizedName("ams_core_sing").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_core_sing"); ams_core_wormhole = new ItemAMSCore(1500000000L, 200, 15).setUnlocalizedName("ams_core_wormhole").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":ams_core_wormhole"); @@ -5460,7 +5448,6 @@ public class ModItems { GameRegistry.registerItem(turbine_titanium, turbine_titanium.getUnlocalizedName()); GameRegistry.registerItem(turbine_tungsten, turbine_tungsten.getUnlocalizedName()); GameRegistry.registerItem(flywheel_beryllium, flywheel_beryllium.getUnlocalizedName()); - GameRegistry.registerItem(toothpicks, toothpicks.getUnlocalizedName()); GameRegistry.registerItem(ducttape, ducttape.getUnlocalizedName()); GameRegistry.registerItem(catalyst_clay, catalyst_clay.getUnlocalizedName()); GameRegistry.registerItem(missile_assembly, missile_assembly.getUnlocalizedName()); @@ -5835,10 +5822,6 @@ public class ModItems { GameRegistry.registerItem(catalytic_converter, catalytic_converter.getUnlocalizedName()); //AMS Components - GameRegistry.registerItem(ams_focus_blank, ams_focus_blank.getUnlocalizedName()); - GameRegistry.registerItem(ams_focus_limiter, ams_focus_limiter.getUnlocalizedName()); - GameRegistry.registerItem(ams_focus_booster, ams_focus_booster.getUnlocalizedName()); - GameRegistry.registerItem(ams_muzzle, ams_muzzle.getUnlocalizedName()); GameRegistry.registerItem(ams_lens, ams_lens.getUnlocalizedName()); GameRegistry.registerItem(ams_core_sing, ams_core_sing.getUnlocalizedName()); GameRegistry.registerItem(ams_core_wormhole, ams_core_wormhole.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 48f25d845..d0b012e15 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -220,7 +220,6 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.memespoon, 1), new Object[] { "CGC", "PSP", "IAI", 'C', ModItems.powder_yellowcake, 'G', TH232.block(), 'P', ModItems.photo_panel, 'S', ModItems.steel_shovel, 'I', ModItems.plate_polymer, 'A', "ingotAustralium" }); addShapelessAuto(new ItemStack(ModItems.cbt_device, 1), new Object[] { STEEL.bolt(), ModItems.wrench }); - addShapelessAuto(new ItemStack(ModItems.toothpicks, 3), new Object[] { KEY_STICK, KEY_STICK, KEY_STICK }); addRecipeAuto(new ItemStack(ModItems.ducttape, 4), new Object[] { "F", "P", "S", 'F', Items.string, 'S', KEY_SLIME, 'P', Items.paper }); addRecipeAuto(new ItemStack(ModBlocks.radio_torch_sender, 4), new Object[] { "G", "R", "I", 'G', "dustGlowstone", 'R', Blocks.redstone_torch, 'I', NETHERQUARTZ.gem() }); @@ -619,7 +618,6 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.sat_interface), new Object[] { "ISI", "PCP", "PAP", 'I', STEEL.ingot(), 'S', STAR.ingot(), 'P', ModItems.plate_polymer, 'C', ModItems.sat_chip, 'A', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED) }); addRecipeAuto(new ItemStack(ModItems.sat_coord), new Object[] { "SII", "SCA", "SPP", 'I', STEEL.ingot(), 'S', STAR.ingot(), 'P', ModItems.plate_polymer, 'C', ModItems.sat_chip, 'A', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED) }); addRecipeAuto(new ItemStack(ModBlocks.machine_transformer), new Object[] { "SCS", "MDM", "SCS", 'S', IRON.ingot(), 'D', MINGRADE.ingot(), 'M',ModItems.coil_advanced_alloy, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CAPACITOR) }); - addRecipeAuto(new ItemStack(ModBlocks.machine_transformer_dnt), new Object[] { "SDS", "MCM", "MCM", 'S', STAR.ingot(), 'D', DESH.ingot(), 'M', MAGTUNG.wireDense(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BISMOID) }); addRecipeAuto(new ItemStack(ModBlocks.radiobox), new Object[] { "PLP", "PSP", "PLP", 'P', STEEL.plate(), 'S', ModItems.ring_starmetal, 'C', ModItems.fusion_core, 'L', getReflector() }); addRecipeAuto(new ItemStack(ModBlocks.radiorec), new Object[] { " W", "PCP", "PIP", 'W', CU.wireFine(), 'P', STEEL.plate(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE), 'I', ANY_PLASTIC.ingot() }); addRecipeAuto(new ItemStack(ModItems.jackt), new Object[] { "S S", "LIL", "LIL", 'S', STEEL.plate(), 'L', Items.leather, 'I', ANY_RUBBER.ingot() }); @@ -729,8 +727,8 @@ public class CraftingManager { addShapelessAuto(new ItemStack(ModItems.ams_catalyst_schrabidium, 1), new Object[] { ModItems.ams_catalyst_blank, ModItems.rune_dagaz, ModItems.rune_hagalaz, ModItems.rune_thurisaz, ModItems.rune_thurisaz, SA326.dust(), SA326.dust(), SA326.dust(), SA326.dust() }); addShapelessAuto(new ItemStack(ModItems.ams_catalyst_dineutronium, 1), new Object[] { ModItems.ams_catalyst_blank, ModItems.rune_hagalaz, ModItems.rune_hagalaz, ModItems.rune_thurisaz, ModItems.rune_thurisaz, DNT.dust(), DNT.dust(), DNT.dust(), DNT.dust() }); addRecipeAuto(new ItemStack(ModBlocks.dfc_core, 1), new Object[] { "DLD", "LML", "DLD", 'D', ModItems.ingot_bismuth, 'L', DNT.block(), 'M', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BISMOID) }); - addRecipeAuto(new ItemStack(ModBlocks.dfc_emitter, 1), new Object[] { "SDS", "TXL", "SDS", 'S', OSMIRIDIUM.plateWelded(), 'D', ModItems.plate_desh, 'T', ModBlocks.machine_transformer_dnt, 'X', ModItems.crystal_xen, 'L', ModItems.sat_head_laser }); - addRecipeAuto(new ItemStack(ModBlocks.dfc_receiver, 1), new Object[] { "SDS", "TXL", "SDS", 'S', OSMIRIDIUM.plateWelded(), 'D', ModItems.plate_desh, 'T', ModBlocks.machine_transformer_dnt, 'X', ModBlocks.block_dineutronium, 'L', STEEL.shell() }); + addRecipeAuto(new ItemStack(ModBlocks.dfc_emitter, 1), new Object[] { "SDS", "TXL", "SDS", 'S', OSMIRIDIUM.plateWelded(), 'D', ModItems.plate_desh, 'T', new ItemStack(ModItems.battery_pack, 1, EnumBatteryPack.BATTERY_QUANTUM.ordinal()), 'X', ModItems.crystal_xen, 'L', ModItems.sat_head_laser }); + addRecipeAuto(new ItemStack(ModBlocks.dfc_receiver, 1), new Object[] { "SDS", "TXL", "SDS", 'S', OSMIRIDIUM.plateWelded(), 'D', ModItems.plate_desh, 'T', new ItemStack(ModItems.battery_pack, 1, EnumBatteryPack.BATTERY_QUANTUM.ordinal()), 'X', ModBlocks.block_dineutronium, 'L', STEEL.shell() }); addRecipeAuto(new ItemStack(ModBlocks.dfc_injector, 1), new Object[] { "SDS", "TXL", "SDS", 'S', OSMIRIDIUM.plateWelded(), 'D', CMB.plate(), 'T', ModBlocks.machine_fluidtank, 'X', ModItems.motor, 'L', STEEL.pipe() }); addRecipeAuto(new ItemStack(ModBlocks.dfc_stabilizer, 1), new Object[] { "SDS", "TXL", "SDS", 'S', OSMIRIDIUM.plateWelded(), 'D', ModItems.plate_desh, 'T', ModItems.singularity_spark, 'X', ModBlocks.hadron_coil_alloy, 'L', ModItems.crystal_xen }); addRecipeAuto(new ItemStack(ModBlocks.barrel_plastic, 1), new Object[] { "IPI", "I I", "IPI", 'I', ModItems.plate_polymer, 'P', AL.plate() }); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index a8b602748..845044aeb 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -1479,6 +1479,12 @@ public class MainRegistry { ignoreMappings.add("hbm:tile.sat_resonator"); ignoreMappings.add("hbm:item.sliding_blast_door_skin"); ignoreMappings.add("hbm:tile.dummy_block_vault"); + ignoreMappings.add("hbm:item.toothpicks"); + ignoreMappings.add("hbm:item.ams_focus_blank"); + ignoreMappings.add("hbm:item.ams_focus_limiter"); + ignoreMappings.add("hbm:item.ams_focus_booster"); + ignoreMappings.add("hbm:item.ams_muzzle"); + ignoreMappings.add("hbm:tile.machine_transformer_dnt"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); diff --git a/src/main/java/com/hbm/main/ModEventHandlerRenderer.java b/src/main/java/com/hbm/main/ModEventHandlerRenderer.java index 2ae70f6c5..9d3401fd3 100644 --- a/src/main/java/com/hbm/main/ModEventHandlerRenderer.java +++ b/src/main/java/com/hbm/main/ModEventHandlerRenderer.java @@ -587,7 +587,7 @@ public class ModEventHandlerRenderer { @SubscribeEvent public void onRenderHand(RenderHandEvent event) { - //can't use plaxer.getHeldItem() here because the item rendering persists for a few frames after hitting the switch key + //can't use player.getHeldItem() here because the item rendering persists for a few frames after hitting the switch key ItemStack toRender = Minecraft.getMinecraft().entityRenderer.itemRenderer.itemToRender; if(toRender != null) { diff --git a/src/main/resources/assets/hbm/textures/blocks/battery_lithium_top_alt.png b/src/main/resources/assets/hbm/textures/blocks/battery_lithium_top_alt.png deleted file mode 100644 index 12d7b89d1..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/battery_lithium_top_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/brick_forgotten_hole_empty.png b/src/main/resources/assets/hbm/textures/blocks/brick_forgotten_hole_empty.png new file mode 100644 index 000000000..1b953485d Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/brick_forgotten_hole_empty.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/brick_forgotten_sign.png b/src/main/resources/assets/hbm/textures/blocks/brick_forgotten_sign.png new file mode 100644 index 000000000..f7bd436f6 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/brick_forgotten_sign.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_transformer.png b/src/main/resources/assets/hbm/textures/blocks/machine_transformer.png deleted file mode 100644 index dea44f132..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_transformer.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_transformer_top.png b/src/main/resources/assets/hbm/textures/blocks/machine_transformer_top.png deleted file mode 100644 index 3c7cf211d..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_transformer_top.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/mine_ap_alt.png b/src/main/resources/assets/hbm/textures/blocks/mine_ap_alt.png deleted file mode 100644 index 1d43ad6f0..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/mine_ap_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/toaster.png b/src/main/resources/assets/hbm/textures/blocks/toaster.png deleted file mode 100644 index 03835ffdf..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/toaster.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/UCChip.png b/src/main/resources/assets/hbm/textures/items/UCChip.png deleted file mode 100644 index d168ba07b..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/UCChip.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/armor_battery_base.png b/src/main/resources/assets/hbm/textures/items/armor_battery_base.png deleted file mode 100644 index ad4e8b8af..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/armor_battery_base.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_bf.png b/src/main/resources/assets/hbm/textures/items/clip_bf.png deleted file mode 100644 index 72c893d00..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_bf.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_bolt_action.png b/src/main/resources/assets/hbm/textures/items/clip_bolt_action.png deleted file mode 100644 index 16364887f..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_bolt_action.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_cryolator.png b/src/main/resources/assets/hbm/textures/items/clip_cryolator.png deleted file mode 100644 index fa788a52c..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_cryolator.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_defabricator.png b/src/main/resources/assets/hbm/textures/items/clip_defabricator.png deleted file mode 100644 index 18ed33b08..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_defabricator.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_emp.png b/src/main/resources/assets/hbm/textures/items/clip_emp.png deleted file mode 100644 index 0f2652447..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_emp.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_euthanasia.png b/src/main/resources/assets/hbm/textures/items/clip_euthanasia.png deleted file mode 100644 index ec46c7165..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_euthanasia.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_fatman.png b/src/main/resources/assets/hbm/textures/items/clip_fatman.png deleted file mode 100644 index 84342ddef..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_fatman.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_hp.png b/src/main/resources/assets/hbm/textures/items/clip_hp.png deleted file mode 100644 index 86fed909a..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_hp.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_immolator.png b/src/main/resources/assets/hbm/textures/items/clip_immolator.png deleted file mode 100644 index 286c3a2e3..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_immolator.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_jack.png b/src/main/resources/assets/hbm/textures/items/clip_jack.png deleted file mode 100644 index 18a0c616b..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_jack.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_lever_action.png b/src/main/resources/assets/hbm/textures/items/clip_lever_action.png deleted file mode 100644 index 0a5d93d8e..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_lever_action.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_mirv.png b/src/main/resources/assets/hbm/textures/items/clip_mirv.png deleted file mode 100644 index ecca938f2..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_mirv.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_mp.png b/src/main/resources/assets/hbm/textures/items/clip_mp.png deleted file mode 100644 index 47f5e9ce9..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_mp.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_mp40.png b/src/main/resources/assets/hbm/textures/items/clip_mp40.png deleted file mode 100644 index 21ba8a490..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_mp40.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_osipr.png b/src/main/resources/assets/hbm/textures/items/clip_osipr.png deleted file mode 100644 index 203f928ae..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_osipr.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_revolver.png b/src/main/resources/assets/hbm/textures/items/clip_revolver.png deleted file mode 100644 index f2d1235a2..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_revolver.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_revolver_cursed.png b/src/main/resources/assets/hbm/textures/items/clip_revolver_cursed.png deleted file mode 100644 index 69ab127de..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_revolver_cursed.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_revolver_gold.png b/src/main/resources/assets/hbm/textures/items/clip_revolver_gold.png deleted file mode 100644 index ceb691e34..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_revolver_gold.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_revolver_iron.png b/src/main/resources/assets/hbm/textures/items/clip_revolver_iron.png deleted file mode 100644 index d04f865bd..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_revolver_iron.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_revolver_lead.png b/src/main/resources/assets/hbm/textures/items/clip_revolver_lead.png deleted file mode 100644 index 6a8db96e2..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_revolver_lead.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_revolver_nightmare.png b/src/main/resources/assets/hbm/textures/items/clip_revolver_nightmare.png deleted file mode 100644 index fbe0afb48..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_revolver_nightmare.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_revolver_nightmare2.png b/src/main/resources/assets/hbm/textures/items/clip_revolver_nightmare2.png deleted file mode 100644 index 0652e6067..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_revolver_nightmare2.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_revolver_nopip.png b/src/main/resources/assets/hbm/textures/items/clip_revolver_nopip.png deleted file mode 100644 index 6597e4329..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_revolver_nopip.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_revolver_pip.png b/src/main/resources/assets/hbm/textures/items/clip_revolver_pip.png deleted file mode 100644 index b4e48ca51..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_revolver_pip.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_revolver_schrabidium.png b/src/main/resources/assets/hbm/textures/items/clip_revolver_schrabidium.png deleted file mode 100644 index 6957b328f..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_revolver_schrabidium.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_rpg.png b/src/main/resources/assets/hbm/textures/items/clip_rpg.png deleted file mode 100644 index 804ae9d38..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_rpg.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_rpg_alt.png b/src/main/resources/assets/hbm/textures/items/clip_rpg_alt.png deleted file mode 100644 index 6fe42d25e..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_rpg_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_spark.png b/src/main/resources/assets/hbm/textures/items/clip_spark.png deleted file mode 100644 index 898388628..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_spark.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_stinger.png b/src/main/resources/assets/hbm/textures/items/clip_stinger.png deleted file mode 100644 index 321673eac..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_stinger.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_uboinik.png b/src/main/resources/assets/hbm/textures/items/clip_uboinik.png deleted file mode 100644 index 8a71a2243..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_uboinik.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_uzi.png b/src/main/resources/assets/hbm/textures/items/clip_uzi.png deleted file mode 100644 index e1d869dc7..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_uzi.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/clip_xvl1456.png b/src/main/resources/assets/hbm/textures/items/clip_xvl1456.png deleted file mode 100644 index d705aa680..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/clip_xvl1456.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/coil_copper_alt.png b/src/main/resources/assets/hbm/textures/items/coil_copper_alt.png index 544a44f77..63f8aa742 100644 Binary files a/src/main/resources/assets/hbm/textures/items/coil_copper_alt.png and b/src/main/resources/assets/hbm/textures/items/coil_copper_alt.png differ diff --git a/src/main/resources/assets/hbm/textures/items/letter.png b/src/main/resources/assets/hbm/textures/items/letter.png deleted file mode 100644 index 3111bd743..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/letter.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/levitation_unit.png b/src/main/resources/assets/hbm/textures/items/levitation_unit.png deleted file mode 100644 index 9f49458e0..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/levitation_unit.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/limiter.png b/src/main/resources/assets/hbm/textures/items/limiter.png deleted file mode 100644 index e81eb2b26..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/limiter.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/mechanism_1.png b/src/main/resources/assets/hbm/textures/items/mechanism_1.png deleted file mode 100644 index 06c19bffe..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/mechanism_1.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/mechanism_2.png b/src/main/resources/assets/hbm/textures/items/mechanism_2.png deleted file mode 100644 index dc6ee1d68..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/mechanism_2.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/mechanism_3.png b/src/main/resources/assets/hbm/textures/items/mechanism_3.png deleted file mode 100644 index db85d9f0a..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/mechanism_3.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/mechanism_4.png b/src/main/resources/assets/hbm/textures/items/mechanism_4.png deleted file mode 100644 index b0fcb0738..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/mechanism_4.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/mechanism_5.png b/src/main/resources/assets/hbm/textures/items/mechanism_5.png deleted file mode 100644 index ae6dc2567..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/mechanism_5.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/mechanism_6.png b/src/main/resources/assets/hbm/textures/items/mechanism_6.png deleted file mode 100644 index 6656fe1cd..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/mechanism_6.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/mechanism_7.png b/src/main/resources/assets/hbm/textures/items/mechanism_7.png deleted file mode 100644 index 9166afeb4..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/mechanism_7.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/spill1.png b/src/main/resources/assets/hbm/textures/items/spill1.png deleted file mode 100644 index df02a1978..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/spill1.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/spill2.png b/src/main/resources/assets/hbm/textures/items/spill2.png deleted file mode 100644 index 71543c6a5..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/spill2.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/spill3.png b/src/main/resources/assets/hbm/textures/items/spill3.png deleted file mode 100644 index c3849264e..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/spill3.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/spill4.png b/src/main/resources/assets/hbm/textures/items/spill4.png deleted file mode 100644 index ca7feae44..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/spill4.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/spill5.png b/src/main/resources/assets/hbm/textures/items/spill5.png deleted file mode 100644 index 2229332ed..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/spill5.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/spill6.png b/src/main/resources/assets/hbm/textures/items/spill6.png deleted file mode 100644 index ab1e426a8..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/spill6.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/spill7.png b/src/main/resources/assets/hbm/textures/items/spill7.png deleted file mode 100644 index d2abb95c6..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/spill7.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/spill8.png b/src/main/resources/assets/hbm/textures/items/spill8.png deleted file mode 100644 index 324a56ed9..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/spill8.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/test_wireing.png b/src/main/resources/assets/hbm/textures/items/test_wireing.png deleted file mode 100644 index 606917c73..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/test_wireing.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/thermo_unit_empty.png b/src/main/resources/assets/hbm/textures/items/thermo_unit_empty.png deleted file mode 100644 index 7c2d6c291..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/thermo_unit_empty.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/thermo_unit_endo.png b/src/main/resources/assets/hbm/textures/items/thermo_unit_endo.png deleted file mode 100644 index be887119a..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/thermo_unit_endo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/thermo_unit_exo.png b/src/main/resources/assets/hbm/textures/items/thermo_unit_exo.png deleted file mode 100644 index 585c82e13..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/thermo_unit_exo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/toothpicks.png b/src/main/resources/assets/hbm/textures/items/toothpicks.png deleted file mode 100644 index f3a513abd..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/toothpicks.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/trinitite.png b/src/main/resources/assets/hbm/textures/items/trinitite.png index 08f1df467..1cfce1f23 100644 Binary files a/src/main/resources/assets/hbm/textures/items/trinitite.png and b/src/main/resources/assets/hbm/textures/items/trinitite.png differ diff --git a/src/main/resources/assets/hbm/textures/items/trinitite_new.png b/src/main/resources/assets/hbm/textures/items/trinitite_new.png deleted file mode 100644 index 1cfce1f23..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/trinitite_new.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/xanax_2.png b/src/main/resources/assets/hbm/textures/items/xanax.png similarity index 100% rename from src/main/resources/assets/hbm/textures/items/xanax_2.png rename to src/main/resources/assets/hbm/textures/items/xanax.png