diff --git a/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java b/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java index 3dbb764d3..3a5332be5 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java +++ b/src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java @@ -55,25 +55,32 @@ public class GUIScreenTemplateFolder extends GuiScreen { // Stamps for(ItemStack i : ItemStamp.stamps.get(StampType.PLATE)) - allStacks.add(i.copy()); + if(i.getMaxDamage() > 0) allStacks.add(i.copy()); for(ItemStack i : ItemStamp.stamps.get(StampType.WIRE)) - allStacks.add(i.copy()); + if(i.getMaxDamage() > 0) allStacks.add(i.copy()); for(ItemStack i : ItemStamp.stamps.get(StampType.CIRCUIT)) - allStacks.add(i.copy()); + if(i.getMaxDamage() > 0) allStacks.add(i.copy()); + // Tracks - for(int i = 1; i < ItemCassette.TrackType.values().length; i++) + for(int i = 1; i < ItemCassette.TrackType.values().length; i++) { allStacks.add(new ItemStack(ModItems.siren_track, 1, i)); + } // Fluid IDs - for(int i = 1; i < FluidType.values().length; i++) - if(!FluidType.values()[i].hasNoID()) + for(int i = 1; i < FluidType.values().length; i++) { + if(!FluidType.values()[i].hasNoID()) { allStacks.add(new ItemStack(ModItems.fluid_identifier, 1, i)); + } + } // Assembly Templates - for(int i = 0; i < AssemblerRecipes.recipeList.size(); i++) - if(AssemblerRecipes.hidden.get(AssemblerRecipes.recipeList.get(i)) == null) + for(int i = 0; i < AssemblerRecipes.recipeList.size(); i++) { + if(AssemblerRecipes.hidden.get(AssemblerRecipes.recipeList.get(i)) == null) { allStacks.add(new ItemStack(ModItems.assembly_template, 1, i)); + } + } // Chemistry Templates - for(int i = 0; i < ItemChemistryTemplate.EnumChemistryTemplate.values().length; i++) + for(int i = 0; i < ItemChemistryTemplate.EnumChemistryTemplate.values().length; i++) { allStacks.add(new ItemStack(ModItems.chemistry_template, 1, i)); + } } else { for(int i = 0; i < AssemblerRecipes.recipeList.size(); i++) { diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index 74e04934d..692ea59fa 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -136,14 +136,14 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModItems.plate_aluminium, 2), new AStack[] {new OreDictStack(AL.ingot(), 3), },30); makeRecipe(new ComparableStack(ModItems.plate_steel, 2), new AStack[] {new OreDictStack(STEEL.ingot(), 3), },30); makeRecipe(new ComparableStack(ModItems.plate_lead, 2), new AStack[] {new OreDictStack(PB.ingot(), 3), },30); - makeRecipe(new ComparableStack(ModItems.plate_copper, 2), new AStack[] {new OreDictStack(CU.dust(), 3), },30); + makeRecipe(new ComparableStack(ModItems.plate_copper, 2), new AStack[] {new OreDictStack(CU.ingot(), 3), },30); makeRecipe(new ComparableStack(ModItems.plate_advanced_alloy, 2), new AStack[] {new OreDictStack(ALLOY.ingot(), 3), },30); makeRecipe(new ComparableStack(ModItems.plate_schrabidium, 2), new AStack[] {new OreDictStack(SA326.ingot(), 3), },30); makeRecipe(new ComparableStack(ModItems.plate_combine_steel, 2), new AStack[] {new OreDictStack(CMB.ingot(), 3), },30); makeRecipe(new ComparableStack(ModItems.plate_saturnite, 2), new AStack[] {new OreDictStack(BIGMT.ingot(), 3), },30); makeRecipe(new ComparableStack(ModItems.plate_mixed, 4), new AStack[] {new OreDictStack(ALLOY.plate(), 2), new OreDictStack(OreDictManager.getReflector(), 1), new OreDictStack(BIGMT.plate(), 1) },50); makeRecipe(new ComparableStack(ModItems.wire_aluminium, 6), new AStack[] {new OreDictStack(AL.ingot(), 1), },20); - makeRecipe(new ComparableStack(ModItems.wire_copper, 6), new AStack[] {new OreDictStack(CU.dust(), 1), },20); + makeRecipe(new ComparableStack(ModItems.wire_copper, 6), new AStack[] {new OreDictStack(CU.ingot(), 1), },20); makeRecipe(new ComparableStack(ModItems.wire_tungsten, 6), new AStack[] {new OreDictStack(W.ingot(), 1), },20); makeRecipe(new ComparableStack(ModItems.wire_red_copper, 6), new AStack[] {new OreDictStack(MINGRADE.ingot(), 1), },20); makeRecipe(new ComparableStack(ModItems.wire_advanced_alloy, 6), new AStack[] {new OreDictStack(ALLOY.ingot(), 1), },20); @@ -653,7 +653,7 @@ public class AssemblerRecipes { new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.circuit_targeting_tier4, 1), new ComparableStack(ModItems.motor_desh, 1), - new OreDictStack(CU.dust(), 32), + new OreDictStack(CU.ingot(), 32), new ComparableStack(ModItems.mechanism_special, 1), new ComparableStack(ModItems.battery_lithium, 1) }, 200); @@ -715,7 +715,7 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModBlocks.rbmk_blank, 1), new AStack[] { new ComparableStack(ModBlocks.concrete_asbestos, 4), new OreDictStack(STEEL.plate(), 4), - new OreDictStack(CU.dust(), 4), + new OreDictStack(CU.ingot(), 4), new ComparableStack(ModItems.plate_polymer, 4) }, 100); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index fabbd3faa..314e4ce70 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -316,6 +316,11 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.stamp_obsidian_flat, 1), new Object[] { " R ", "III", "SSS", 'R', REDSTONE.dust(), 'I', brick, 'S', Blocks.obsidian }); addRecipeAuto(new ItemStack(ModItems.stamp_schrabidium_flat, 1), new Object[] { " R ", "III", "SSS", 'R', REDSTONE.dust(), 'I', brick, 'S', SA326.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[] { " II", "ICA", "IKW", 'I', IRON.plate(), 'C', CU.ingot(), 'A', AL.ingot(), 'K', ModItems.wire_copper, 'W', ModItems.wire_aluminium }); addRecipeAuto(new ItemStack(ModItems.mechanism_revolver_2, 1), new Object[] { " II", "ICA", "IKW", 'I', ALLOY.plate(), 'C', DURA.ingot(), 'A', W.ingot(), 'K', ModItems.bolt_dura_steel, 'W', ModItems.bolt_tungsten });