xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #857 from Vaern/master

Browse Source 
Removed schrab & cmb stamps / blades, moved desh tier to actually desh
This commit is contained in:
HbmMods 2023-02-06 08:02:42 +01:00 committed by GitHub
commit 2b00ab2c72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 35 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/hbm/crafting/ArmorRecipes.java
View File

@ -119,7 +119,7 @@ public class ArmorRecipes {
CraftingManager.addRecipeAuto(new ItemStack(ModItems.euphemium_boots, 1), new Object[] { "E E", "E E", 'E', ModItems.plate_euphemium });
//Jetpacks
CraftingManager.addRecipeAuto(new ItemStack(ModItems.jetpack_fly, 1), new Object[] { "ACA", "TLT", "D D", 'A', ModItems.cap_aluminium, 'C', ModItems.circuit_targeting_tier1, 'T', ModItems.tank_steel, 'L', Items.leather, 'D', ModItems.thruster_small });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.jetpack_fly, 1), new Object[] { "ACA", "TLT", "D D", 'A', ModItems.plate_aluminium, 'C', ModItems.circuit_targeting_tier1, 'T', ModItems.tank_steel, 'L', Items.leather, 'D', ModItems.thruster_small });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.jetpack_break, 1), new Object[] { "ICI", "TJT", "I I", 'C', ModItems.circuit_targeting_tier2, 'T', ModItems.ingot_dura_steel, 'J', ModItems.jetpack_fly, 'I', ModItems.plate_polymer });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.jetpack_vector, 1), new Object[] { "TCT", "MJM", "B B", 'C', ModItems.circuit_targeting_tier3, 'T', ModItems.tank_steel, 'J', ModItems.jetpack_break, 'M', ModItems.motor, 'B', ModItems.bolt_dura_steel });
CraftingManager.addRecipeAuto(new ItemStack(ModItems.jetpack_boost, 1), new Object[] { "PCP", "DJD", "PAP", 'C', ModItems.circuit_targeting_tier4, 'P', BIGMT.plate(), 'D', DESH.ingot(), 'J', ModItems.jetpack_vector, 'A', ModItems.board_copper });

6
src/main/java/com/hbm/crafting/ToolRecipes.java
View File

@ -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() });
}
}

8
src/main/java/com/hbm/crafting/WeaponRecipes.java
View File

@ -302,10 +302,10 @@ public class WeaponRecipes {
CraftingManager.addShapelessAuto(ModItems.ammo_nuke.stackFromEnum(6, AmmoFatman.SAFE), new Object[] { ModItems.ammo_nuke.stackFromEnum(AmmoFatman.MIRV_SAFE) });
//MIRV
CraftingManager.addRecipeAuto(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.MIRV), new Object[] { "NNN", "CDS", "NNN", 'N', ModItems.ammo_nuke, 'C', ModItems.cap_aluminium, 'D', ModBlocks.det_cord, 'S', ModItems.hull_small_steel });
CraftingManager.addRecipeAuto(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.MIRV_LOW), new Object[] { "NNN", "CDS", "NNN", 'N', ModItems.ammo_nuke.stackFromEnum(AmmoFatman.LOW), 'C', ModItems.cap_aluminium, 'D', ModBlocks.det_cord, 'S', ModItems.hull_small_steel });
CraftingManager.addRecipeAuto(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.MIRV_HIGH), new Object[] { "NNN", "CDS", "NNN", 'N', ModItems.ammo_nuke.stackFromEnum(AmmoFatman.HIGH), 'C', ModItems.cap_aluminium, 'D', ModBlocks.det_cord, 'S', ModItems.hull_small_steel });
CraftingManager.addRecipeAuto(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.MIRV_SAFE), new Object[] { "NNN", "CDS", "NNN", 'N', ModItems.ammo_nuke.stackFromEnum(AmmoFatman.SAFE), 'C', ModItems.cap_aluminium, 'D', ModBlocks.det_cord, 'S', ModItems.hull_small_steel });
CraftingManager.addRecipeAuto(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.MIRV), new Object[] { "NNN", "CDS", "NNN", 'N', ModItems.ammo_nuke, 'C', AL.plate(), 'D', ModBlocks.det_cord, 'S', ModItems.hull_small_steel });
CraftingManager.addRecipeAuto(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.MIRV_LOW), new Object[] { "NNN", "CDS", "NNN", 'N', ModItems.ammo_nuke.stackFromEnum(AmmoFatman.LOW), 'C', AL.plate(), 'D', ModBlocks.det_cord, 'S', ModItems.hull_small_steel });
CraftingManager.addRecipeAuto(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.MIRV_HIGH), new Object[] { "NNN", "CDS", "NNN", 'N', ModItems.ammo_nuke.stackFromEnum(AmmoFatman.HIGH), 'C', AL.plate(), 'D', ModBlocks.det_cord, 'S', ModItems.hull_small_steel });
CraftingManager.addRecipeAuto(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.MIRV_SAFE), new Object[] { "NNN", "CDS", "NNN", 'N', ModItems.ammo_nuke.stackFromEnum(AmmoFatman.SAFE), 'C', AL.plate(), 'D', ModBlocks.det_cord, 'S', ModItems.hull_small_steel });
//since the milk part of the recipe isn't really present in the MIRV's effect, it might as well be replaced with something more sensible, i.e. duct tape
CraftingManager.addRecipeAuto(ModItems.ammo_nuke.stackFromEnum(AmmoFatman.MIRV_SPECIAL), new Object[] { "CBC", "MCM", "CBC", 'C', ModItems.canned_jizz, 'B', ModItems.ammo_nuke.stackFromEnum(AmmoFatman.BALEFIRE), 'M', ModItems.ammo_nuke.stackFromEnum(AmmoFatman.MIRV) });

6
src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java
View File

@ -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++) {

6
src/main/java/com/hbm/inventory/material/MatDistribution.java
View File

@ -43,20 +43,14 @@ public class MatDistribution extends SerializableRecipe {
//castables
registerEntry(ModItems.blade_titanium, MAT_TITANIUM, INGOT.q(2));
registerEntry(ModItems.blade_tungsten, MAT_TUNGSTEN, INGOT.q(2));
registerEntry(ModItems.blades_gold, MAT_GOLD, INGOT.q(4));
registerEntry(ModItems.blades_aluminium, MAT_ALUMINIUM, INGOT.q(4));
registerEntry(ModItems.blades_iron, MAT_IRON, INGOT.q(4));
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));

2
src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java
View File

@ -317,7 +317,7 @@ public class AssemblerRecipes {
makeRecipe(new ComparableStack(ModBlocks.nuke_gadget, 1), new AStack[] {new ComparableStack(ModItems.sphere_steel, 1), new ComparableStack(ModItems.fins_flat, 2), new ComparableStack(ModItems.pedestal_steel, 1), new ComparableStack(ModItems.circuit_targeting_tier3, 1), new ComparableStack(ModItems.wire_gold, 6), new OreDictStack("dyeGray", 6), },300);
makeRecipe(new ComparableStack(ModBlocks.nuke_boy, 1), new AStack[] {new ComparableStack(ModItems.hull_small_steel, 2), new ComparableStack(ModItems.fins_small_steel, 1), new ComparableStack(ModItems.circuit_targeting_tier2, 1), new ComparableStack(ModItems.wire_aluminium, 6), new OreDictStack("dyeBlue", 4), },300);
makeRecipe(new ComparableStack(ModBlocks.nuke_man, 1), new AStack[] {new ComparableStack(ModItems.sphere_steel, 1), new ComparableStack(ModItems.hull_big_steel, 2), new ComparableStack(ModItems.fins_big_steel, 1), new ComparableStack(ModItems.circuit_targeting_tier2, 2), new ComparableStack(ModItems.wire_copper, 6), new OreDictStack("dyeYellow", 6), },300);
makeRecipe(new ComparableStack(ModBlocks.nuke_mike, 1), new AStack[] {new ComparableStack(ModItems.sphere_steel, 1), new ComparableStack(ModItems.hull_big_aluminium, 4), new ComparableStack(ModItems.cap_aluminium, 1), new ComparableStack(ModItems.circuit_targeting_tier4, 3), new ComparableStack(ModItems.wire_gold, 18), new OreDictStack("dyeLightGray", 12), },300);
makeRecipe(new ComparableStack(ModBlocks.nuke_mike, 1), new AStack[] {new ComparableStack(ModItems.sphere_steel, 1), new ComparableStack(ModItems.hull_big_aluminium, 4), new ComparableStack(ModItems.plate_aluminium, 3), new ComparableStack(ModItems.circuit_targeting_tier4, 3), new ComparableStack(ModItems.wire_gold, 18), new OreDictStack("dyeLightGray", 12), },300);
makeRecipe(new ComparableStack(ModBlocks.nuke_tsar, 1), new AStack[] {new ComparableStack(ModItems.sphere_steel, 1), new ComparableStack(ModItems.hull_big_titanium, 6), new ComparableStack(ModItems.hull_small_steel, 2), new ComparableStack(ModItems.fins_tri_steel, 1), new ComparableStack(ModItems.circuit_targeting_tier4, 5), new ComparableStack(ModItems.wire_gold, 24), new ComparableStack(ModItems.wire_tungsten, 12), new OreDictStack("dyeBlack", 6), },600);
makeRecipe(new ComparableStack(ModBlocks.nuke_prototype, 1), new AStack[] {new ComparableStack(ModItems.dysfunctional_reactor, 1), new ComparableStack(ModItems.hull_small_steel, 2), new ComparableStack(ModItems.ingot_euphemium, 3), new ComparableStack(ModItems.circuit_targeting_tier5, 1), new ComparableStack(ModItems.wire_gold, 16), },500);
makeRecipe(new ComparableStack(ModBlocks.nuke_fleija, 1), new AStack[] {new ComparableStack(ModItems.hull_small_aluminium, 1), new ComparableStack(ModItems.fins_quad_titanium, 1), new ComparableStack(ModItems.circuit_targeting_tier4, 2), new ComparableStack(ModItems.wire_gold, 8), new OreDictStack("dyeWhite", 4), },400);

5
src/main/java/com/hbm/inventory/recipes/MachineRecipes.java
View File

@ -639,13 +639,8 @@ public class MachineRecipes {
public ArrayList<ItemStack> getBlades() {
ArrayList<ItemStack> fuels = new ArrayList<ItemStack>();
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;
}

12
src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java
View File

@ -86,23 +86,17 @@ public class AnvilRecipes {
new ItemStack(ModItems.blade_titanium),
new ItemStack(ModItems.blade_tungsten)
}));
smithingRecipes.add(new AnvilSmithingMold(6, new ComparableStack(ModItems.blades_iron), new ItemStack[] {
new ItemStack(ModItems.blades_gold),
new ItemStack(ModItems.blades_aluminium),
new ItemStack(ModItems.blades_iron),
smithingRecipes.add(new AnvilSmithingMold(6, new ComparableStack(ModItems.blades_steel), new ItemStack[] {
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),

32
src/main/java/com/hbm/items/ModItems.java
View File

@ -626,7 +626,6 @@ public class ModItems {
public static Item wiring_red_copper;
public static Item cap_aluminium;
public static Item hull_small_steel;
public static Item hull_small_aluminium;
public static Item hull_big_steel;
@ -730,10 +729,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;
@ -743,15 +738,10 @@ public class ModItems {
public static Item stamp_44;
public static Item stamp_9;
public static Item stamp_50;
public static Item blades_gold;
public static Item blades_aluminium;
public static Item blades_iron;
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;
@ -3140,7 +3130,6 @@ public class ModItems {
gear_large = new ItemGear().setUnlocalizedName("gear_large").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":gear_large");
sawblade = new Item().setUnlocalizedName("sawblade").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":sawblade");
cap_aluminium = new Item().setUnlocalizedName("cap_aluminium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":cap_aluminium");
hull_small_steel = new Item().setUnlocalizedName("hull_small_steel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":hull_small_steel");
hull_small_aluminium = new ItemCustomLore().setUnlocalizedName("hull_small_aluminium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":hull_small_aluminium");
hull_big_steel = new Item().setUnlocalizedName("hull_big_steel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":hull_big_steel");
@ -3391,10 +3380,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");
@ -3404,14 +3389,9 @@ public class ModItems {
stamp_9 = new ItemStamp(1000, StampType.C9).setUnlocalizedName("stamp_9").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_9");
stamp_50 = new ItemStamp(1000, StampType.C50).setUnlocalizedName("stamp_50").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":stamp_50");
blades_aluminium = new ItemBlades(20).setUnlocalizedName("blades_aluminium").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_aluminium");
blades_gold = new ItemBlades(30).setUnlocalizedName("blades_gold").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_gold");
blades_iron = new ItemBlades(100).setUnlocalizedName("blades_iron").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":blades_iron");
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");
@ -6370,7 +6350,6 @@ public class ModItems {
GameRegistry.registerItem(component_emitter, component_emitter.getUnlocalizedName());
//Bomb Parts
GameRegistry.registerItem(cap_aluminium, cap_aluminium.getUnlocalizedName());
GameRegistry.registerItem(hull_small_steel, hull_small_steel.getUnlocalizedName());
GameRegistry.registerItem(hull_small_aluminium, hull_small_aluminium.getUnlocalizedName());
GameRegistry.registerItem(hull_big_steel, hull_big_steel.getUnlocalizedName());
@ -6741,10 +6720,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());
@ -6877,14 +6852,9 @@ public class ModItems {
GameRegistry.registerItem(ams_catalyst_tungsten, ams_catalyst_tungsten.getUnlocalizedName());
//Shredder Blades
GameRegistry.registerItem(blades_aluminium, blades_aluminium.getUnlocalizedName());
GameRegistry.registerItem(blades_gold, blades_gold.getUnlocalizedName());
GameRegistry.registerItem(blades_iron, blades_iron.getUnlocalizedName());
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

10
src/main/java/com/hbm/items/machine/ItemMold.java
View File

@ -52,22 +52,16 @@ public class ItemMold extends Item {
Mats.MAT_TUNGSTEN, new ItemStack(ModItems.blade_tungsten)));
registerMold(new MoldMulti( 6, S, "blades", MaterialShapes.INGOT.q(4),
Mats.MAT_GOLD, new ItemStack(ModItems.blades_gold),
Mats.MAT_ALUMINIUM, new ItemStack(ModItems.blades_aluminium),
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),

22
src/main/java/com/hbm/main/CraftingManager.java
View File

@ -193,7 +193,6 @@ public class CraftingManager {
//addRecipeAuto(new ItemStack(ModItems.levitation_unit, 1), new Object[] { "CSC", "TAT", "PSP", 'C', ModItems.coil_copper, 'S', ModItems.nugget_schrabidium, 'T', ModItems.coil_tungsten, 'P', TI.plate(), 'A', STEEL.ingot() });
addRecipeAuto(new ItemStack(ModItems.deuterium_filter, 1), new Object[] { "TST", "SCS", "TST", 'T', TCALLOY.ingot(), 'S', S.dust(), 'C', ModItems.catalyst_clay });
addRecipeAuto(new ItemStack(ModItems.cap_aluminium, 1), new Object[] { "PIP", 'P', AL.plate(), 'I', AL.ingot() });
addRecipeAuto(new ItemStack(ModItems.hull_small_steel, 3), new Object[] { "PPP", " ", "PPP", 'P', STEEL.plate(), 'I', STEEL.ingot() });
addRecipeAuto(new ItemStack(ModItems.hull_small_aluminium, 3), new Object[] { "PPP", " ", "PPP", 'P', AL.plate(), 'I', AL.ingot() });
addRecipeAuto(new ItemStack(ModItems.hull_big_steel, 1), new Object[] { "III", " ", "III", 'P', STEEL.plate(), 'I', STEEL.ingot() });
@ -331,25 +330,15 @@ public class CraftingManager {
addShapelessAuto(new ItemStack(ModItems.overfuse, 1), new Object[] { ModItems.bolt_tungsten, NP237.dust(), I.dust(), TH232.dust(), AT.dust(), ND.dust(), ModItems.board_copper, ModItems.black_hole, CS.dust() });
addShapelessAuto(new ItemStack(ModItems.overfuse, 1), new Object[] { ModItems.bolt_tungsten, ST.dust(), BR.dust(), CO.dust(), TS.dust(), NB.dust(), ModItems.board_copper, ModItems.black_hole, CE.dust() });
addRecipeAuto(new ItemStack(ModItems.blades_aluminium, 1), new Object[] { " P ", "PIP", " P ", 'P', AL.plate(), 'I', AL.ingot() });
addRecipeAuto(new ItemStack(ModItems.blades_gold, 1), new Object[] { " P ", "PIP", " P ", 'P', GOLD.plate(), 'I', GOLD.ingot() });
addRecipeAuto(new ItemStack(ModItems.blades_iron, 1), new Object[] { " P ", "PIP", " P ", 'P', IRON.plate(), 'I', IRON.ingot() });
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) });
addRecipeAuto(new ItemStack(ModItems.blades_iron, 1), new Object[] { "PIP", 'P', IRON.plate(), 'I', new ItemStack(ModItems.blades_iron, 1, OreDictionary.WILDCARD_VALUE) });
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 });
@ -365,13 +354,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() });

10
src/main/java/com/hbm/main/MainRegistry.java
View File

@ -999,6 +999,16 @@ public class MainRegistry {
ignoreMappings.add("hbm:item.coin_siege");
ignoreMappings.add("hbm:item.source");
ignoreMappings.add("hbm:item.gun_brimstone");
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");
ignoreMappings.add("hbm:item.blades_aluminium");
ignoreMappings.add("hbm:item.blades_gold");
ignoreMappings.add("hbm:item.blades_iron");
ignoreMappings.add("hbm:item.cap_aluminium");
/// REMAP ///
remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses);

8
src/main/java/com/hbm/packet/ItemFolderPacket.java
View File

@ -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;
}
//}

10
src/main/resources/assets/hbm/lang/en_US.lang
View File

@ -1759,12 +1759,7 @@ item.blade_meteorite.name=Meteorite Blade
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
@ -1875,7 +1870,6 @@ item.canned_yogurt.name=Canned Yogurt
item.canteen_13.name=Vault 13 Canteen
item.canteen_fab.name=Fabulous Vodka
item.canteen_vodka.name=Stylish Flask
item.cap_aluminium.name=Aluminium Cap
item.cap_fritz.name=Fritz Cola Bottle Cap
item.cap_korl.name=Korl Bottle Cap
item.cap_nuka.name=Nuka Cola Bottle Cap
@ -3709,10 +3703,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)