diff --git a/changelog b/changelog index 7ef622d7f..a17ed658d 100644 --- a/changelog +++ b/changelog @@ -3,7 +3,10 @@ * Stairs, but fast ## Changed +* Wires now use recipe autogen for anvils, meaning that all fine wires are now obtainable via tier 4 anvil ## Fixed * Fixed dupe regarding conveyor grabbers -* Fixed soldering stations not saving progress or their fluid tanks \ No newline at end of file +* Fixed soldering stations not saving progress or their fluid tanks +* Fixed a bug where missile debris would always spawn with a stack size of 1 and a meta of 0 +* Fixed FM radios disassembling into incorrect parts \ No newline at end of file diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileTier0.java b/src/main/java/com/hbm/entity/missile/EntityMissileTier0.java index 17923d69e..811d7944f 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileTier0.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileTier0.java @@ -99,7 +99,7 @@ public abstract class EntityMissileTier0 extends EntityMissileBaseNT { this.worldObj.spawnEntityInWorld(cloud); } } - @Override public ItemStack getDebrisRareDrop() { return new ItemStack(ModItems.powder_schrabidium, 1); } + @Override public ItemStack getDebrisRareDrop() { return null; } @Override public ItemStack getMissileItemForInfo() { return new ItemStack(ModItems.missile_schrabidium); } } diff --git a/src/main/java/com/hbm/explosion/ExplosionLarge.java b/src/main/java/com/hbm/explosion/ExplosionLarge.java index 650f88da8..64adc7913 100644 --- a/src/main/java/com/hbm/explosion/ExplosionLarge.java +++ b/src/main/java/com/hbm/explosion/ExplosionLarge.java @@ -130,7 +130,7 @@ public class ExplosionLarge { if(debris.get(i) != null) { int k = rand.nextInt(debris.get(i).stackSize + 1); for(int j = 0; j < k; j++) { - EntityItem item = new EntityItem(world, x, y, z, new ItemStack(debris.get(i).getItem())); + EntityItem item = new EntityItem(world, x, y, z, debris.get(i).copy()); item.motionX = (motionX + rand.nextGaussian() * deviation) * 0.85; item.motionY = (motionY + rand.nextGaussian() * deviation) * 0.85; item.motionZ = (motionZ + rand.nextGaussian() * deviation) * 0.85; diff --git a/src/main/java/com/hbm/inventory/recipes/SolderingRecipes.java b/src/main/java/com/hbm/inventory/recipes/SolderingRecipes.java index 23c4dbbd3..a9f16babf 100644 --- a/src/main/java/com/hbm/inventory/recipes/SolderingRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/SolderingRecipes.java @@ -30,6 +30,10 @@ public class SolderingRecipes extends SerializableRecipe { @Override public void registerDefaults() { + /* + * CIRCUITS + */ + recipes.add(new SolderingRecipe(new ItemStack(ModItems.circuit, 1, EnumCircuitType.ANALOG.ordinal()), 100, 100, new AStack[] { new ComparableStack(ModItems.circuit, 3, EnumCircuitType.VACUUM_TUBE), @@ -83,6 +87,34 @@ public class SolderingRecipes extends SerializableRecipe { new AStack[] { new OreDictStack(PB.wireFine(), 12)} )); + + /* + * COMPUTERS + */ + + // a very, very vague guess on what the recipes should be. testing still needed, upgrade requirements are likely to change. maybe inclusion of caesium? + recipes.add(new SolderingRecipe(new ItemStack(ModItems.circuit, 1, EnumCircuitType.CONTROLLER.ordinal()), 400, 15_000, + new AStack[] { + new ComparableStack(ModItems.circuit, 32, EnumCircuitType.CHIP), + new ComparableStack(ModItems.circuit, 32, EnumCircuitType.CAPACITOR), + new ComparableStack(ModItems.circuit, 16, EnumCircuitType.CAPACITOR_TANTALIUM)}, + new AStack[] { + new ComparableStack(ModItems.circuit, 12, EnumCircuitType.CONTROLLER_CHASSIS), + new ComparableStack(ModItems.upgrade_speed_1)}, + new AStack[] { + new OreDictStack(PB.wireFine(), 16)} + )); + recipes.add(new SolderingRecipe(new ItemStack(ModItems.circuit, 1, EnumCircuitType.CONTROLLER_ADVANCED.ordinal()), 600, 25_000, + new AStack[] { + new ComparableStack(ModItems.circuit, 16, EnumCircuitType.CHIP_BISMOID), + new ComparableStack(ModItems.circuit, 48, EnumCircuitType.CAPACITOR), + new ComparableStack(ModItems.circuit, 32, EnumCircuitType.CAPACITOR_TANTALIUM)}, + new AStack[] { + new ComparableStack(ModItems.circuit, 12, EnumCircuitType.CONTROLLER_CHASSIS), + new ComparableStack(ModItems.upgrade_speed_3)}, + new AStack[] { + new OreDictStack(PB.wireFine(), 24)} + )); /* * UPGRADES diff --git a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java index 0eaeeb747..075fc77a2 100644 --- a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java @@ -149,14 +149,11 @@ public class AnvilRecipes { constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(CMB.ingot()), new AnvilOutput(new ItemStack(ModItems.plate_combine_steel))).setTier(3)); constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(BIGMT.ingot()), new AnvilOutput(new ItemStack(ModItems.plate_saturnite))).setTier(3)); - constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(AL.ingot()), new AnvilOutput(new ItemStack(ModItems.wire_fine, 8, Mats.MAT_ALUMINIUM.id))).setTier(4)); - constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(CU.ingot()), new AnvilOutput(new ItemStack(ModItems.wire_fine, 8, Mats.MAT_COPPER.id))).setTier(4)); - constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(W.ingot()), new AnvilOutput(new ItemStack(ModItems.wire_fine, 8, Mats.MAT_TUNGSTEN.id))).setTier(4)); - constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(MINGRADE.ingot()), new AnvilOutput(new ItemStack(ModItems.wire_fine, 8, Mats.MAT_MINGRADE.id))).setTier(4)); - constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(ALLOY.ingot()), new AnvilOutput(new ItemStack(ModItems.wire_fine, 8, Mats.MAT_ALLOY.id))).setTier(4)); - constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(GOLD.ingot()), new AnvilOutput(new ItemStack(ModItems.wire_fine, 8, Mats.MAT_GOLD.id))).setTier(4)); - constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(SA326.ingot()), new AnvilOutput(new ItemStack(ModItems.wire_fine, 8, Mats.MAT_SCHRABIDIUM.id))).setTier(4)); - constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(MAGTUNG.ingot()), new AnvilOutput(new ItemStack(ModItems.wire_fine, 8, Mats.MAT_MAGTUNG.id))).setTier(4)); + for(NTMMaterial mat : Mats.orderedList) { + if(mat.shapes.contains(MaterialShapes.WIRE) && mat.shapes.contains(MaterialShapes.INGOT)) { + constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(OreNames.INGOT + mat.names[0]), new AnvilOutput(new ItemStack(ModItems.wire_fine, 8, mat.id))).setTier(4)); + } + } constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(COAL.dust()), new AnvilOutput(new ItemStack(Items.coal))).setTier(3)); constructionRecipes.add(new AnvilConstructionRecipe(new OreDictStack(NETHERQUARTZ.dust()), new AnvilOutput(new ItemStack(Items.quartz))).setTier(3)); @@ -879,7 +876,7 @@ public class AnvilRecipes { new AnvilOutput[] { new AnvilOutput(new ItemStack(ModItems.plate_steel, 4)), new AnvilOutput(new ItemStack(ModItems.wire_fine, 1, Mats.MAT_COPPER.id)), - new AnvilOutput(new ItemStack(ModItems.circuit, 1, EnumCircuitType.BASIC.ordinal()), 0.5F), + new AnvilOutput(new ItemStack(ModItems.circuit, 1, EnumCircuitType.VACUUM_TUBE.ordinal()), 0.5F), new AnvilOutput(new ItemStack(ModItems.ingot_polymer, 1), 0.25F), } ).setTier(2)); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index fa8b6b902..5762a6dd0 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -2590,7 +2590,7 @@ public class ModItems { ingot_semtex = new ItemLemon(4, 5, true).setUnlocalizedName("ingot_semtex").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_semtex"); ingot_c4 = new Item().setUnlocalizedName("ingot_c4").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_c4"); ingot_phosphorus = new Item().setUnlocalizedName("ingot_phosphorus").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_phosphorus"); - wire_advanced_alloy = new Item().setUnlocalizedName("wire_advanced_alloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_advanced_alloy"); + wire_advanced_alloy = new Item().setUnlocalizedName("wire_advanced_alloy").setCreativeTab(null).setTextureName(RefStrings.MODID + ":wire_advanced_alloy"); coil_advanced_alloy = new Item().setUnlocalizedName("coil_advanced_alloy").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_advanced_alloy"); coil_advanced_torus = new Item().setUnlocalizedName("coil_advanced_torus").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_advanced_torus"); ingot_magnetized_tungsten = new Item().setUnlocalizedName("ingot_magnetized_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_magnetized_tungsten"); @@ -2797,8 +2797,8 @@ public class ModItems { nugget_actinium = new Item().setUnlocalizedName("nugget_actinium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_actinium"); plate_titanium = new Item().setUnlocalizedName("plate_titanium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_titanium"); plate_aluminium = new Item().setUnlocalizedName("plate_aluminium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_aluminium"); - wire_red_copper = new Item().setUnlocalizedName("wire_red_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_red_copper"); - wire_tungsten = new ItemCustomLore().setUnlocalizedName("wire_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_tungsten"); + wire_red_copper = new Item().setUnlocalizedName("wire_red_copper").setCreativeTab(null).setTextureName(RefStrings.MODID + ":wire_red_copper"); + wire_tungsten = new ItemCustomLore().setUnlocalizedName("wire_tungsten").setCreativeTab(null).setTextureName(RefStrings.MODID + ":wire_tungsten"); neutron_reflector = new Item().setUnlocalizedName("neutron_reflector").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":neutron_reflector"); nugget_lead = new Item().setUnlocalizedName("nugget_lead").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_lead"); ingot_bismuth = new ItemCustomLore().setUnlocalizedName("ingot_bismuth").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_bismuth"); @@ -2993,24 +2993,18 @@ public class ModItems { motor_desh = new Item().setUnlocalizedName("motor_desh").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":motor_desh"); motor_bismuth = new Item().setUnlocalizedName("motor_bismuth").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":motor_bismuth"); centrifuge_element = new Item().setUnlocalizedName("centrifuge_element").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":centrifuge_element"); - //centrifuge_tower = new Item().setUnlocalizedName("centrifuge_tower").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":centrifuge_tower"); reactor_core = new Item().setUnlocalizedName("reactor_core").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":reactor_core"); rtg_unit = new Item().setUnlocalizedName("rtg_unit").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":rtg_unit"); - //thermo_unit_empty = new Item().setUnlocalizedName("thermo_unit_empty").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":thermo_unit_empty"); - //thermo_unit_endo= new Item().setUnlocalizedName("thermo_unit_endo").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":thermo_unit_endo"); - //thermo_unit_exo = new Item().setUnlocalizedName("thermo_unit_exo").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":thermo_unit_exo"); levitation_unit = new Item().setUnlocalizedName("levitation_unit").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":levitation_unit"); - wire_aluminium = new Item().setUnlocalizedName("wire_aluminium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_aluminium"); - wire_copper = new Item().setUnlocalizedName("wire_copper").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_copper"); - wire_gold = new Item().setUnlocalizedName("wire_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_gold"); - wire_schrabidium = new ItemCustomLore().setRarity(EnumRarity.rare).setUnlocalizedName("wire_schrabidium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_schrabidium"); + wire_aluminium = new Item().setUnlocalizedName("wire_aluminium").setCreativeTab(null).setTextureName(RefStrings.MODID + ":wire_aluminium"); + wire_copper = new Item().setUnlocalizedName("wire_copper").setCreativeTab(null).setTextureName(RefStrings.MODID + ":wire_copper"); + wire_gold = new Item().setUnlocalizedName("wire_gold").setCreativeTab(null).setTextureName(RefStrings.MODID + ":wire_gold"); + wire_schrabidium = new ItemCustomLore().setRarity(EnumRarity.rare).setUnlocalizedName("wire_schrabidium").setCreativeTab(null).setTextureName(RefStrings.MODID + ":wire_schrabidium"); wire_magnetized_tungsten = new Item().setUnlocalizedName("wire_magnetized_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":wire_magnetized_tungsten"); coil_magnetized_tungsten = new Item().setUnlocalizedName("coil_magnetized_tungsten").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_magnetized_tungsten"); coil_gold = new Item().setUnlocalizedName("coil_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_gold"); coil_gold_torus = new Item().setUnlocalizedName("coil_gold_torus").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_gold_torus"); - //magnet_dee = new Item().setUnlocalizedName("magnet_dee").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":magnet_dee"); magnet_circular = new Item().setUnlocalizedName("magnet_circular").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":magnet_circular"); - //cyclotron_tower = new Item().setUnlocalizedName("cyclotron_tower").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":cyclotron_tower"); pellet_coal = new Item().setUnlocalizedName("pellet_coal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellet_coal"); component_limiter = new Item().setUnlocalizedName("component_limiter").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":component_limiter"); component_emitter = new Item().setUnlocalizedName("component_emitter").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":component_emitter"); diff --git a/src/main/java/com/hbm/items/machine/ItemCircuit.java b/src/main/java/com/hbm/items/machine/ItemCircuit.java index 368af5647..845ff4b81 100644 --- a/src/main/java/com/hbm/items/machine/ItemCircuit.java +++ b/src/main/java/com/hbm/items/machine/ItemCircuit.java @@ -4,7 +4,11 @@ import java.util.List; import com.hbm.items.ItemEnumMulti; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class ItemCircuit extends ItemEnumMulti { @@ -13,6 +17,26 @@ public class ItemCircuit extends ItemEnumMulti { super(EnumCircuitType.class, true, true); } + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tab, List list) { + list.add(new ItemStack(item, 1, EnumCircuitType.VACUUM_TUBE.ordinal())); + list.add(new ItemStack(item, 1, EnumCircuitType.CAPACITOR.ordinal())); + list.add(new ItemStack(item, 1, EnumCircuitType.CAPACITOR_TANTALIUM.ordinal())); + list.add(new ItemStack(item, 1, EnumCircuitType.PCB.ordinal())); + list.add(new ItemStack(item, 1, EnumCircuitType.SILICON.ordinal())); + list.add(new ItemStack(item, 1, EnumCircuitType.CHIP.ordinal())); + list.add(new ItemStack(item, 1, EnumCircuitType.CHIP_BISMOID.ordinal())); + list.add(new ItemStack(item, 1, EnumCircuitType.ANALOG.ordinal())); + list.add(new ItemStack(item, 1, EnumCircuitType.BASIC.ordinal())); + list.add(new ItemStack(item, 1, EnumCircuitType.ADVANCED.ordinal())); + list.add(new ItemStack(item, 1, EnumCircuitType.CAPACITOR_BOARD.ordinal())); + list.add(new ItemStack(item, 1, EnumCircuitType.BISMOID.ordinal())); + list.add(new ItemStack(item, 1, EnumCircuitType.CONTROLLER_CHASSIS.ordinal())); + list.add(new ItemStack(item, 1, EnumCircuitType.CONTROLLER.ordinal())); + list.add(new ItemStack(item, 1, EnumCircuitType.CONTROLLER_ADVANCED.ordinal())); + } + public static enum EnumCircuitType { VACUUM_TUBE, CAPACITOR, @@ -26,6 +50,9 @@ public class ItemCircuit extends ItemEnumMulti { ADVANCED, CAPACITOR_BOARD, BISMOID, + CONTROLLER_CHASSIS, + CONTROLLER, + CONTROLLER_ADVANCED, } @Override diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 7758ffcb8..991f7cdc0 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -122,7 +122,8 @@ public class CraftingManager { addRecipeAuto(DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP), new Object[] { "I", "S", "W", 'I', ModItems.plate_polymer, 'S', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.SILICON), 'W', GOLD.wireFine() }); addRecipeAuto(DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP_BISMOID), new Object[] { "III", "SNS", "WWW", 'I', ModItems.plate_polymer, 'S', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.SILICON), 'N', ANY_BISMOID.nugget(), 'W', CU.wireFine() }); addRecipeAuto(DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP_BISMOID), new Object[] { "III", "SNS", "WWW", 'I', ModItems.plate_polymer, 'S', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.SILICON), 'N', ANY_BISMOID.nugget(), 'W', GOLD.wireFine() }); - + addRecipeAuto(DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CONTROLLER_CHASSIS), new Object[] { "PPP", "CBB", "PPP", 'P', ANY_PLASTIC.ingot(), 'C', ModItems.crt_display, 'B', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.PCB) }); + addRecipeAuto(new ItemStack(ModItems.cell_empty, 6), new Object[] { " S ", "G G", " S ", 'S', STEEL.plate(), 'G', KEY_ANYPANE }); addRecipeAuto(new ItemStack(ModItems.cell_deuterium, 8), new Object[] { "DDD", "DTD", "DDD", 'D', ModItems.cell_empty, 'T', ModItems.mike_deut }); addRecipeAuto(new ItemStack(ModItems.particle_empty, 2), new Object[] { "STS", "G G", "STS", 'S', STEEL.plate(), 'T', W.ingot(), 'G', KEY_ANYPANE }); diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java index 72e7d7739..1ceb0ada5 100644 --- a/src/main/java/com/hbm/main/ModEventHandler.java +++ b/src/main/java/com/hbm/main/ModEventHandler.java @@ -878,9 +878,8 @@ public class ModEventHandler { player.fallDistance = 0; } } else if(props.enableBackpack && !player.isSneaking()) { - - if(player.motionY < -0.2) - player.motionY += 0.075D; + if(player.motionY < -0.2) player.motionY += 0.075D; + if(player.fallDistance > 0) player.fallDistance = 0; } } diff --git a/src/main/resources/assets/hbm/textures/items/circuit.controller.png b/src/main/resources/assets/hbm/textures/items/circuit.controller.png new file mode 100644 index 000000000..72c131d96 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/circuit.controller.png differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit.controller_advanced.png b/src/main/resources/assets/hbm/textures/items/circuit.controller_advanced.png new file mode 100644 index 000000000..d939b6b67 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/circuit.controller_advanced.png differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit.controller_chassis.png b/src/main/resources/assets/hbm/textures/items/circuit.controller_chassis.png new file mode 100644 index 000000000..b905d1301 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/circuit.controller_chassis.png differ diff --git a/src/main/resources/assets/hbm/textures/items/circuit.png b/src/main/resources/assets/hbm/textures/items/circuit.png index d735d753d..de95e4f24 100644 Binary files a/src/main/resources/assets/hbm/textures/items/circuit.png and b/src/main/resources/assets/hbm/textures/items/circuit.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_desh_circuit.png b/src/main/resources/assets/hbm/textures/items/stamp_desh_circuit.png index 3e4d62f3f..8cbf55186 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_desh_circuit.png and b/src/main/resources/assets/hbm/textures/items/stamp_desh_circuit.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_dura_flat.png b/src/main/resources/assets/hbm/textures/items/stamp_dura_flat.png deleted file mode 100644 index 9d075e448..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_dura_flat.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_iron_blank.png b/src/main/resources/assets/hbm/textures/items/stamp_iron_blank.png new file mode 100644 index 000000000..d0276592d Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/stamp_iron_blank.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_iron_circuit.png b/src/main/resources/assets/hbm/textures/items/stamp_iron_circuit.png index 71978e8c7..d4211a715 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_iron_circuit.png and b/src/main/resources/assets/hbm/textures/items/stamp_iron_circuit.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_obsidian_circuit.png b/src/main/resources/assets/hbm/textures/items/stamp_obsidian_circuit.png index 861d3ace9..a3a25fc41 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_obsidian_circuit.png and b/src/main/resources/assets/hbm/textures/items/stamp_obsidian_circuit.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_obsidian_flat.png b/src/main/resources/assets/hbm/textures/items/stamp_obsidian_flat.png index bd35e1d27..45ff4b3e3 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_obsidian_flat.png and b/src/main/resources/assets/hbm/textures/items/stamp_obsidian_flat.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_obsidian_plate.png b/src/main/resources/assets/hbm/textures/items/stamp_obsidian_plate.png index 57b37bd52..e38824979 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_obsidian_plate.png and b/src/main/resources/assets/hbm/textures/items/stamp_obsidian_plate.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_obsidian_wire.png b/src/main/resources/assets/hbm/textures/items/stamp_obsidian_wire.png index 144bb8fb9..2c9a6fea3 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_obsidian_wire.png and b/src/main/resources/assets/hbm/textures/items/stamp_obsidian_wire.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_schrabidium_circuit.png b/src/main/resources/assets/hbm/textures/items/stamp_schrabidium_circuit.png deleted file mode 100644 index de537a586..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_schrabidium_circuit.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_schrabidium_flat.png b/src/main/resources/assets/hbm/textures/items/stamp_schrabidium_flat.png deleted file mode 100644 index 7a6e25e76..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_schrabidium_flat.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_schrabidium_plate.png b/src/main/resources/assets/hbm/textures/items/stamp_schrabidium_plate.png deleted file mode 100644 index 847e870ea..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_schrabidium_plate.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_schrabidium_wire.png b/src/main/resources/assets/hbm/textures/items/stamp_schrabidium_wire.png deleted file mode 100644 index e2447983c..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_schrabidium_wire.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_steel_circuit.png b/src/main/resources/assets/hbm/textures/items/stamp_steel_circuit.png index d95fe00df..86dbad620 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_steel_circuit.png and b/src/main/resources/assets/hbm/textures/items/stamp_steel_circuit.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_stone_circuit.png b/src/main/resources/assets/hbm/textures/items/stamp_stone_circuit.png index 4234e4e87..36f883eea 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_stone_circuit.png and b/src/main/resources/assets/hbm/textures/items/stamp_stone_circuit.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_stone_flat.png b/src/main/resources/assets/hbm/textures/items/stamp_stone_flat.png index 72d2f52fe..ea71da78b 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_stone_flat.png and b/src/main/resources/assets/hbm/textures/items/stamp_stone_flat.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_stone_plate.png b/src/main/resources/assets/hbm/textures/items/stamp_stone_plate.png index e70463b46..2421606e5 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_stone_plate.png and b/src/main/resources/assets/hbm/textures/items/stamp_stone_plate.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_stone_wire.png b/src/main/resources/assets/hbm/textures/items/stamp_stone_wire.png index 1a8f4455d..a4dd23aef 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_stone_wire.png and b/src/main/resources/assets/hbm/textures/items/stamp_stone_wire.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_titanium_circuit.png b/src/main/resources/assets/hbm/textures/items/stamp_titanium_circuit.png index 5725e422a..374167fdd 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_titanium_circuit.png and b/src/main/resources/assets/hbm/textures/items/stamp_titanium_circuit.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_titanium_flat.png b/src/main/resources/assets/hbm/textures/items/stamp_titanium_flat.png index 1d7024abc..00417c03b 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_titanium_flat.png and b/src/main/resources/assets/hbm/textures/items/stamp_titanium_flat.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_titanium_plate.png b/src/main/resources/assets/hbm/textures/items/stamp_titanium_plate.png index 96d176208..c7d7c67be 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_titanium_plate.png and b/src/main/resources/assets/hbm/textures/items/stamp_titanium_plate.png differ diff --git a/src/main/resources/assets/hbm/textures/items/stamp_titanium_wire.png b/src/main/resources/assets/hbm/textures/items/stamp_titanium_wire.png index ffdae003c..9fa0bd1dc 100644 Binary files a/src/main/resources/assets/hbm/textures/items/stamp_titanium_wire.png and b/src/main/resources/assets/hbm/textures/items/stamp_titanium_wire.png differ