From b26cbc4b6d9e2636412dffde9012bd3b93c1c386 Mon Sep 17 00:00:00 2001 From: Vaern Date: Tue, 27 Dec 2022 10:50:28 -0800 Subject: [PATCH] Removed schrab & cmb stamps / blades, moved desh tier to actually desh --- .../java/com/hbm/crafting/ToolRecipes.java | 6 +++--- .../inventory/gui/GUIScreenTemplateFolder.java | 6 +++--- .../inventory/material/MatDistribution.java | 3 --- .../hbm/inventory/recipes/MachineRecipes.java | 2 -- .../inventory/recipes/anvil/AnvilRecipes.java | 7 ++----- src/main/java/com/hbm/items/ModItems.java | 18 ------------------ .../java/com/hbm/items/machine/ItemMold.java | 7 ++----- .../java/com/hbm/main/CraftingManager.java | 13 ++----------- src/main/java/com/hbm/main/MainRegistry.java | 6 ++++++ .../java/com/hbm/packet/ItemFolderPacket.java | 8 ++++---- src/main/resources/assets/hbm/lang/en_US.lang | 6 ------ 11 files changed, 22 insertions(+), 60 deletions(-) diff --git a/src/main/java/com/hbm/crafting/ToolRecipes.java b/src/main/java/com/hbm/crafting/ToolRecipes.java index 66ad5ec48..01211d486 100644 --- a/src/main/java/com/hbm/crafting/ToolRecipes.java +++ b/src/main/java/com/hbm/crafting/ToolRecipes.java @@ -186,9 +186,9 @@ public class ToolRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModItems.starmetal_shovel, 1), new Object[] { "I", "B", "S", 'I', STAR.ingot(), 'S', CO.ingot(), 'B', ModItems.cobalt_decorated_shovel }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.starmetal_hoe, 1), new Object[] { "II", " B", " S", 'I', STAR.ingot(), 'S', CO.ingot(), 'B', ModItems.cobalt_decorated_hoe }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.schrabidium_sword, 1), new Object[] { "I", "W", "S", 'I', SA326.block(), 'W', ModItems.desh_sword, 'S', POLYMER.ingot() }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.schrabidium_pickaxe, 1), new Object[] { "SWS", " P ", " P ", 'S', ModItems.blades_schrabidium, 'W', ModItems.desh_pickaxe, 'P', POLYMER.ingot() }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.schrabidium_axe, 1), new Object[] { "SW", "SP", " P", 'S', ModItems.blades_schrabidium, 'W', ModItems.desh_axe, 'P', POLYMER.ingot() }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.schrabidium_shovel, 1), new Object[] { "S", "W", "P", 'S', ModItems.blades_schrabidium, 'W', ModItems.desh_shovel, 'P', POLYMER.ingot() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.schrabidium_pickaxe, 1), new Object[] { "BSB", " W ", " P ", 'B', ModItems.blades_desh, 'S', SA326.block(), 'W', ModItems.desh_pickaxe, 'P', POLYMER.ingot() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.schrabidium_axe, 1), new Object[] { "BS", "BW", " P", 'B', ModItems.blades_desh, 'S', SA326.block(), 'W', ModItems.desh_axe, 'P', POLYMER.ingot() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.schrabidium_shovel, 1), new Object[] { "B", "W", "P", 'B', SA326.block(), 'W', ModItems.desh_shovel, 'P', POLYMER.ingot() }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.schrabidium_hoe, 1), new Object[] { "IW", " S", " S", 'I', SA326.ingot(), 'W', ModItems.desh_hoe, 'S', POLYMER.ingot() }); } } diff --git a/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java b/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java index 3ed299faa..6872d9f9a 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java +++ b/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java @@ -60,11 +60,11 @@ public class GUIScreenTemplateFolder extends GuiScreen { // Stamps for(ItemStack i : ItemStamp.stamps.get(StampType.PLATE)) - if(i.getMaxDamage() > 0) allStacks.add(i.copy()); + allStacks.add(i.copy()); for(ItemStack i : ItemStamp.stamps.get(StampType.WIRE)) - if(i.getMaxDamage() > 0) allStacks.add(i.copy()); + allStacks.add(i.copy()); for(ItemStack i : ItemStamp.stamps.get(StampType.CIRCUIT)) - if(i.getMaxDamage() > 0) allStacks.add(i.copy()); + allStacks.add(i.copy()); // Tracks for(int i = 1; i < ItemCassette.TrackType.values().length; i++) { diff --git a/src/main/java/com/hbm/inventory/material/MatDistribution.java b/src/main/java/com/hbm/inventory/material/MatDistribution.java index 2f39e4f2b..e31d32244 100644 --- a/src/main/java/com/hbm/inventory/material/MatDistribution.java +++ b/src/main/java/com/hbm/inventory/material/MatDistribution.java @@ -49,14 +49,11 @@ public class MatDistribution extends SerializableRecipe { registerEntry(ModItems.blades_steel, MAT_STEEL, INGOT.q(4)); registerEntry(ModItems.blades_titanium, MAT_TITANIUM, INGOT.q(4)); registerEntry(ModItems.blades_advanced_alloy, MAT_ALLOY, INGOT.q(4)); - registerEntry(ModItems.blades_combine_steel, MAT_CMB, INGOT.q(4)); - registerEntry(ModItems.blades_schrabidium, MAT_SCHRABIDIUM, INGOT.q(4)); registerEntry(ModItems.stamp_stone_flat, MAT_STONE, INGOT.q(3)); registerEntry(ModItems.stamp_iron_flat, MAT_IRON, INGOT.q(3)); registerEntry(ModItems.stamp_steel_flat, MAT_STEEL, INGOT.q(3)); registerEntry(ModItems.stamp_titanium_flat, MAT_TITANIUM, INGOT.q(3)); registerEntry(ModItems.stamp_obsidian_flat, MAT_OBSIDIAN, INGOT.q(3)); - registerEntry(ModItems.stamp_schrabidium_flat, MAT_SCHRABIDIUM, INGOT.q(3)); registerEntry(ModItems.hull_small_steel, MAT_STEEL, INGOT.q(2)); registerEntry(ModItems.hull_small_aluminium, MAT_ALUMINIUM, INGOT.q(2)); registerEntry(ModItems.hull_big_steel, MAT_STEEL, INGOT.q(6)); diff --git a/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java index 56fb1224e..8b84fc600 100644 --- a/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/MachineRecipes.java @@ -640,12 +640,10 @@ public class MachineRecipes { ArrayList fuels = new ArrayList(); fuels.add(new ItemStack(ModItems.blades_advanced_alloy)); fuels.add(new ItemStack(ModItems.blades_aluminium)); - fuels.add(new ItemStack(ModItems.blades_combine_steel)); fuels.add(new ItemStack(ModItems.blades_gold)); fuels.add(new ItemStack(ModItems.blades_iron)); fuels.add(new ItemStack(ModItems.blades_steel)); fuels.add(new ItemStack(ModItems.blades_titanium)); - fuels.add(new ItemStack(ModItems.blades_schrabidium)); fuels.add(new ItemStack(ModItems.blades_desh)); return fuels; } 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 eae8949c5..caf2cca82 100644 --- a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java @@ -91,17 +91,14 @@ public class AnvilRecipes { new ItemStack(ModItems.blades_iron), new ItemStack(ModItems.blades_steel), new ItemStack(ModItems.blades_titanium), - new ItemStack(ModItems.blades_advanced_alloy), - new ItemStack(ModItems.blades_combine_steel), - new ItemStack(ModItems.blades_schrabidium) + new ItemStack(ModItems.blades_advanced_alloy) })); smithingRecipes.add(new AnvilSmithingMold(7, new ComparableStack(ModItems.stamp_iron_flat), new ItemStack[] { new ItemStack(ModItems.stamp_stone_flat), new ItemStack(ModItems.stamp_iron_flat), new ItemStack(ModItems.stamp_steel_flat), new ItemStack(ModItems.stamp_titanium_flat), - new ItemStack(ModItems.stamp_obsidian_flat), - new ItemStack(ModItems.stamp_schrabidium_flat) + new ItemStack(ModItems.stamp_obsidian_flat) })); smithingRecipes.add(new AnvilSmithingMold(8, new ComparableStack(ModItems.hull_small_steel), new ItemStack[] { new ItemStack(ModItems.hull_small_aluminium), diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index dac46f323..fcbf26389 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -719,10 +719,6 @@ public class ModItems { public static Item stamp_obsidian_plate; public static Item stamp_obsidian_wire; public static Item stamp_obsidian_circuit; - public static Item stamp_schrabidium_flat; - public static Item stamp_schrabidium_plate; - public static Item stamp_schrabidium_wire; - public static Item stamp_schrabidium_circuit; public static Item stamp_desh_flat; public static Item stamp_desh_plate; public static Item stamp_desh_wire; @@ -739,8 +735,6 @@ public class ModItems { public static Item blades_steel; public static Item blades_titanium; public static Item blades_advanced_alloy; - public static Item blades_combine_steel; - public static Item blades_schrabidium; public static Item blades_desh; public static Item mold_base; @@ -3336,10 +3330,6 @@ public class ModItems { stamp_obsidian_plate = new ItemStamp(170, StampType.PLATE).setUnlocalizedName("stamp_obsidian_plate").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_obsidian_plate"); stamp_obsidian_wire = new ItemStamp(170, StampType.WIRE).setUnlocalizedName("stamp_obsidian_wire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_obsidian_wire"); stamp_obsidian_circuit = new ItemStamp(170, StampType.CIRCUIT).setUnlocalizedName("stamp_obsidian_circuit").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_obsidian_circuit"); - stamp_schrabidium_flat = new ItemStamp(3000, StampType.FLAT).setUnlocalizedName("stamp_schrabidium_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_schrabidium_flat"); - stamp_schrabidium_plate = new ItemStamp(3000, StampType.PLATE).setUnlocalizedName("stamp_schrabidium_plate").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_schrabidium_plate"); - stamp_schrabidium_wire = new ItemStamp(3000, StampType.WIRE).setUnlocalizedName("stamp_schrabidium_wire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_schrabidium_wire"); - stamp_schrabidium_circuit = new ItemStamp(3000, StampType.CIRCUIT).setUnlocalizedName("stamp_schrabidium_circuit").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_schrabidium_circuit"); stamp_desh_flat = new ItemStamp(0, StampType.FLAT).setUnlocalizedName("stamp_desh_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_desh_flat"); stamp_desh_plate = new ItemStamp(0, StampType.PLATE).setUnlocalizedName("stamp_desh_plate").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_desh_plate"); stamp_desh_wire = new ItemStamp(0, StampType.WIRE).setUnlocalizedName("stamp_desh_wire").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_desh_wire"); @@ -3355,8 +3345,6 @@ public class ModItems { blades_steel = new ItemBlades(200).setUnlocalizedName("blades_steel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_steel"); blades_titanium = new ItemBlades(350).setUnlocalizedName("blades_titanium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_titanium"); blades_advanced_alloy = new ItemBlades(700).setUnlocalizedName("blades_advanced_alloy").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_advanced_alloy"); - blades_combine_steel = new ItemBlades(1500).setUnlocalizedName("blades_combine_steel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_combine_steel"); - blades_schrabidium = new ItemBlades(2000).setUnlocalizedName("blades_schrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_schrabidium"); blades_desh = new ItemBlades(0).setUnlocalizedName("blades_desh").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_desh"); mold_base = new Item().setUnlocalizedName("mold_base").setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":mold_base"); @@ -6644,10 +6632,6 @@ public class ModItems { GameRegistry.registerItem(stamp_obsidian_plate, stamp_obsidian_plate.getUnlocalizedName()); GameRegistry.registerItem(stamp_obsidian_wire, stamp_obsidian_wire.getUnlocalizedName()); GameRegistry.registerItem(stamp_obsidian_circuit, stamp_obsidian_circuit.getUnlocalizedName()); - GameRegistry.registerItem(stamp_schrabidium_flat, stamp_schrabidium_flat.getUnlocalizedName()); - GameRegistry.registerItem(stamp_schrabidium_plate, stamp_schrabidium_plate.getUnlocalizedName()); - GameRegistry.registerItem(stamp_schrabidium_wire, stamp_schrabidium_wire.getUnlocalizedName()); - GameRegistry.registerItem(stamp_schrabidium_circuit, stamp_schrabidium_circuit.getUnlocalizedName()); GameRegistry.registerItem(stamp_desh_flat, stamp_desh_flat.getUnlocalizedName()); GameRegistry.registerItem(stamp_desh_plate, stamp_desh_plate.getUnlocalizedName()); GameRegistry.registerItem(stamp_desh_wire, stamp_desh_wire.getUnlocalizedName()); @@ -6786,8 +6770,6 @@ public class ModItems { GameRegistry.registerItem(blades_steel, blades_steel.getUnlocalizedName()); GameRegistry.registerItem(blades_titanium, blades_titanium.getUnlocalizedName()); GameRegistry.registerItem(blades_advanced_alloy, blades_advanced_alloy.getUnlocalizedName()); - GameRegistry.registerItem(blades_combine_steel, blades_combine_steel.getUnlocalizedName()); - GameRegistry.registerItem(blades_schrabidium, blades_schrabidium.getUnlocalizedName()); GameRegistry.registerItem(blades_desh, blades_desh.getUnlocalizedName()); //Generator Stuff diff --git a/src/main/java/com/hbm/items/machine/ItemMold.java b/src/main/java/com/hbm/items/machine/ItemMold.java index a18760281..2df4cf052 100644 --- a/src/main/java/com/hbm/items/machine/ItemMold.java +++ b/src/main/java/com/hbm/items/machine/ItemMold.java @@ -57,17 +57,14 @@ public class ItemMold extends Item { Mats.MAT_IRON, new ItemStack(ModItems.blades_iron), Mats.MAT_STEEL, new ItemStack(ModItems.blades_steel), Mats.MAT_TITANIUM, new ItemStack(ModItems.blades_titanium), - Mats.MAT_ALLOY, new ItemStack(ModItems.blades_advanced_alloy), - Mats.MAT_CMB, new ItemStack(ModItems.blades_combine_steel), - Mats.MAT_SCHRABIDIUM, new ItemStack(ModItems.blades_schrabidium))); + Mats.MAT_ALLOY, new ItemStack(ModItems.blades_advanced_alloy))); registerMold(new MoldMulti( 7, S, "stamp", MaterialShapes.INGOT.q(4), Mats.MAT_STONE, new ItemStack(ModItems.stamp_stone_flat), Mats.MAT_IRON, new ItemStack(ModItems.stamp_iron_flat), Mats.MAT_STEEL, new ItemStack(ModItems.stamp_steel_flat), Mats.MAT_TITANIUM, new ItemStack(ModItems.stamp_titanium_flat), - Mats.MAT_OBSIDIAN, new ItemStack(ModItems.stamp_obsidian_flat), - Mats.MAT_SCHRABIDIUM, new ItemStack(ModItems.stamp_schrabidium_flat))); + Mats.MAT_OBSIDIAN, new ItemStack(ModItems.stamp_obsidian_flat))); registerMold(new MoldMulti( 8, S, "hull_small", MaterialShapes.INGOT.q(2), Mats.MAT_STEEL, new ItemStack(ModItems.hull_small_steel), diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index fe6d71646..46fa7c690 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -335,9 +335,7 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.blades_steel, 1), new Object[] { " P ", "PIP", " P ", 'P', STEEL.plate(), 'I', STEEL.ingot() }); addRecipeAuto(new ItemStack(ModItems.blades_titanium, 1), new Object[] { " P ", "PIP", " P ", 'P', TI.plate(), 'I', TI.ingot() }); addRecipeAuto(new ItemStack(ModItems.blades_advanced_alloy, 1), new Object[] { " P ", "PIP", " P ", 'P', ALLOY.plate(), 'I', ALLOY.ingot() }); - addRecipeAuto(new ItemStack(ModItems.blades_combine_steel, 1), new Object[] { " P ", "PIP", " P ", 'P', CMB.plate(), 'I', CMB.ingot() }); - addRecipeAuto(new ItemStack(ModItems.blades_schrabidium, 1), new Object[] { " P ", "PIP", " P ", 'P', SA326.plate(), 'I', SA326.ingot() }); - addRecipeAuto(new ItemStack(ModItems.blades_desh, 1), new Object[] { "NPN", "PBP", "NPN", 'N', SA326.nugget(), 'P', ModItems.plate_desh, 'B', ModItems.blades_combine_steel }); + addRecipeAuto(new ItemStack(ModItems.blades_desh, 1), new Object[] { " S ", "PBP", " S ", 'S', BIGMT.plate(), 'P', ModItems.plate_desh, 'B', ModItems.blades_advanced_alloy }); //4 desh ingots still needed to do anything addRecipeAuto(new ItemStack(ModItems.blades_aluminium, 1), new Object[] { "PIP", 'P', AL.plate(), 'I', new ItemStack(ModItems.blades_aluminium, 1, OreDictionary.WILDCARD_VALUE) }); addRecipeAuto(new ItemStack(ModItems.blades_gold, 1), new Object[] { "PIP", 'P', GOLD.plate(), 'I', new ItemStack(ModItems.blades_gold, 1, OreDictionary.WILDCARD_VALUE) }); @@ -345,8 +343,6 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.blades_steel, 1), new Object[] { "PIP", 'P', STEEL.plate(), 'I', new ItemStack(ModItems.blades_steel, 1, OreDictionary.WILDCARD_VALUE) }); addRecipeAuto(new ItemStack(ModItems.blades_titanium, 1), new Object[] { "PIP", 'P', TI.plate(), 'I', new ItemStack(ModItems.blades_titanium, 1, OreDictionary.WILDCARD_VALUE) }); addRecipeAuto(new ItemStack(ModItems.blades_advanced_alloy, 1), new Object[] { "PIP", 'P', ALLOY.plate(), 'I', new ItemStack(ModItems.blades_advanced_alloy, 1, OreDictionary.WILDCARD_VALUE) }); - addRecipeAuto(new ItemStack(ModItems.blades_combine_steel, 1), new Object[] { "PIP", 'P', CMB.plate(), 'I', new ItemStack(ModItems.blades_combine_steel, 1, OreDictionary.WILDCARD_VALUE) }); - addRecipeAuto(new ItemStack(ModItems.blades_schrabidium, 1), new Object[] { "PIP", 'P', SA326.plate(), 'I', new ItemStack(ModItems.blades_schrabidium, 1, OreDictionary.WILDCARD_VALUE) }); addRecipeAuto(new ItemStack(ModItems.laser_crystal_co2, 1), new Object[] { "QDQ", "NCN", "QDQ", 'Q', ModBlocks.glass_quartz, 'D', DESH.ingot(), 'N', NB.ingot(), 'C', new ItemStack(ModItems.fluid_tank_full, 1, Fluids.CARBONDIOXIDE.getID()) }); addRecipeAuto(new ItemStack(ModItems.laser_crystal_bismuth, 1), new Object[] {"QUQ", "BCB", "QTQ", 'Q', ModBlocks.glass_quartz, 'U', U.ingot(), 'T', TH232.ingot(), 'B', ModItems.nugget_bismuth, 'C', ModItems.crystal_rare }); @@ -362,13 +358,8 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.stamp_steel_flat, 1), new Object[] { "III", "SSS", 'I', brick, 'S', STEEL.ingot() }); addRecipeAuto(new ItemStack(ModItems.stamp_titanium_flat, 1), new Object[] { "III", "SSS", 'I', brick, 'S', TI.ingot() }); addRecipeAuto(new ItemStack(ModItems.stamp_obsidian_flat, 1), new Object[] { "III", "SSS", 'I', brick, 'S', Blocks.obsidian }); - addRecipeAuto(new ItemStack(ModItems.stamp_schrabidium_flat, 1), new Object[] { "III", "SSS", 'I', brick, 'S', SA326.ingot() }); + addRecipeAuto(new ItemStack(ModItems.stamp_desh_flat, 1), new Object[] { "BDB", "DSD", "BDB", 'B', brick, 'D', DESH.ingot(), 'S', BIGMT.ingot() }); } - - addRecipeAuto(new ItemStack(ModItems.stamp_desh_flat), "DSD", "III", "DSD", 'D', DESH.block(), 'I', BIGMT.ingot(), 'S', ModItems.stamp_schrabidium_flat); - addRecipeAuto(new ItemStack(ModItems.stamp_desh_plate), "DSD", "III", "DSD", 'D', DESH.block(), 'I', BIGMT.ingot(), 'S', ModItems.stamp_schrabidium_plate); - addRecipeAuto(new ItemStack(ModItems.stamp_desh_wire), "DSD", "III", "DSD", 'D', DESH.block(), 'I', BIGMT.ingot(), 'S', ModItems.stamp_schrabidium_wire); - addRecipeAuto(new ItemStack(ModItems.stamp_desh_circuit), "DSD", "III", "DSD", 'D', DESH.block(), 'I', BIGMT.ingot(), 'S', ModItems.stamp_schrabidium_circuit); addRecipeAuto(new ItemStack(ModItems.mechanism_revolver_1, 1), new Object[] { "ICI", "CAC", "ICI", 'I', IRON.plate(), 'C', CU.ingot(), 'A', AL.ingot() }); addRecipeAuto(new ItemStack(ModItems.mechanism_revolver_2, 1), new Object[] { "ATA", "TDT", "ATA", 'A', ALLOY.plate(), 'T', W.ingot(), 'D', DURA.ingot() }); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 49c84031f..25a936e8b 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -996,6 +996,12 @@ public class MainRegistry { ignoreMappings.add("hbm:item.pirfenidone"); ignoreMappings.add("hbm:item.coin_siege"); ignoreMappings.add("hbm:item.source"); + ignoreMappings.add("hbm:item.stamp_schrabidium_flat"); + ignoreMappings.add("hbm:item.stamp_schrabidium_plate"); + ignoreMappings.add("hbm:item.stamp_schrabidium_wire"); + ignoreMappings.add("hbm:item.stamp_schrabidium_circuit"); + ignoreMappings.add("hbm:item.blades_combine_steel"); + ignoreMappings.add("hbm:item.blades_schrabidium"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); diff --git a/src/main/java/com/hbm/packet/ItemFolderPacket.java b/src/main/java/com/hbm/packet/ItemFolderPacket.java index d585db46b..7f70ce19a 100644 --- a/src/main/java/com/hbm/packet/ItemFolderPacket.java +++ b/src/main/java/com/hbm/packet/ItemFolderPacket.java @@ -124,10 +124,10 @@ public class ItemFolderPacket implements IMessage { tryConvert(p, ModItems.stamp_obsidian_flat, stack.getItem()); return null; } - if(stack.getItem() == ModItems.stamp_schrabidium_plate || - stack.getItem() == ModItems.stamp_schrabidium_wire || - stack.getItem() == ModItems.stamp_schrabidium_circuit) { - tryConvert(p, ModItems.stamp_schrabidium_flat, stack.getItem()); + if(stack.getItem() == ModItems.stamp_desh_plate || + stack.getItem() == ModItems.stamp_desh_wire || + stack.getItem() == ModItems.stamp_desh_circuit) { + tryConvert(p, ModItems.stamp_desh_flat, stack.getItem()); return null; } //} diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 2b8bd9212..595d52914 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -1498,11 +1498,9 @@ item.blade_titanium.name=Titanium Blade item.blade_tungsten.name=Tungsten Reinforced Blade item.blades_advanced_alloy.name=Advanced Shredder Blades item.blades_aluminium.name=Aluminium Shredder Blades -item.blades_combine_steel.name=CMB Shredder Blades item.blades_desh.name=Desh Shredder Blades item.blades_gold.name=Golden Shredder Blades item.blades_iron.name=Iron Shredder Blades -item.blades_schrabidium.name=Schrabidium Shredder Blades item.blades_steel.name=Steel Shredder Blades item.blades_titanium.name=Titanium Shredder Blades item.blowtorch.name=Blowtorch @@ -3425,10 +3423,6 @@ item.stamp_obsidian_circuit.name=Circuit Stamp (Obsidian) item.stamp_obsidian_flat.name=Flat Stamp (Obsidian) item.stamp_obsidian_plate.name=Plate Stamp (Obsidian) item.stamp_obsidian_wire.name=Wire Stamp (Obsidian) -item.stamp_schrabidium_circuit.name=Circuit Stamp (Schrabidium) -item.stamp_schrabidium_flat.name=Flat Stamp (Schrabidium) -item.stamp_schrabidium_plate.name=Plate Stamp (Schrabidium) -item.stamp_schrabidium_wire.name=Wire Stamp (Schrabidium) item.stamp_steel_circuit.name=Circuit Stamp (Steel) item.stamp_steel_flat.name=Flat Stamp (Steel) item.stamp_steel_plate.name=Plate Stamp (Steel)