From b844adff443dcc1b20ce5abf27297c9c408b8c0f Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 19 Mar 2023 16:51:09 +0100 Subject: [PATCH] fixes, some recipes --- gradle.properties | 6 +- .../blocks/generic/BlockGenericStairs.java | 4 + .../hbm/blocks/generic/BlockMultiSlab.java | 4 + .../machine/MachineCatalyticReformer.java | 16 +- .../java/com/hbm/config/GeneralConfig.java | 2 + .../java/com/hbm/crafting/PowderRecipes.java | 1 + .../inventory/recipes/AssemblerRecipes.java | 2 +- .../recipes/BlastFurnaceRecipes.java | 2 +- .../inventory/recipes/ReformingRecipes.java | 10 + .../inventory/recipes/ShredderRecipes.java | 4 +- .../recipes/loader/SerializableRecipe.java | 7 +- src/main/java/com/hbm/items/ModItems.java | 276 +++++++++--------- .../java/com/hbm/items/armor/ArmorAJR.java | 4 +- .../java/com/hbm/items/armor/ArmorAJRO.java | 4 +- .../com/hbm/items/armor/ArmorAsbestos.java | 4 +- .../com/hbm/items/armor/ArmorAshGlasses.java | 4 +- .../com/hbm/items/armor/ArmorAustralium.java | 4 +- .../java/com/hbm/items/armor/ArmorBJ.java | 4 +- .../com/hbm/items/armor/ArmorBJJetpack.java | 4 +- .../com/hbm/items/armor/ArmorBismuth.java | 4 +- .../java/com/hbm/items/armor/ArmorDNT.java | 4 +- .../java/com/hbm/items/armor/ArmorDesh.java | 4 +- .../java/com/hbm/items/armor/ArmorDiesel.java | 4 +- .../com/hbm/items/armor/ArmorDigamma.java | 4 +- .../com/hbm/items/armor/ArmorEuphemium.java | 4 +- .../java/com/hbm/items/armor/ArmorFSB.java | 4 +- .../com/hbm/items/armor/ArmorFSBFueled.java | 4 +- .../com/hbm/items/armor/ArmorFSBPowered.java | 4 +- .../com/hbm/items/armor/ArmorGasMask.java | 2 +- .../java/com/hbm/items/armor/ArmorHEV.java | 4 +- .../java/com/hbm/items/armor/ArmorHat.java | 4 +- .../java/com/hbm/items/armor/ArmorHazmat.java | 4 +- .../com/hbm/items/armor/ArmorHazmatMask.java | 4 +- .../com/hbm/items/armor/ArmorLiquidator.java | 4 +- .../hbm/items/armor/ArmorLiquidatorMask.java | 4 +- .../java/com/hbm/items/armor/ArmorModel.java | 4 +- .../java/com/hbm/items/armor/ArmorRPA.java | 4 +- .../com/hbm/items/armor/ArmorSchrabidium.java | 104 ------- .../java/com/hbm/items/armor/ArmorT45.java | 4 +- .../java/com/hbm/items/armor/ArmorTest.java | 4 +- .../com/hbm/items/armor/MaskOfInfamy.java | 4 +- .../java/com/hbm/items/armor/ModArmor.java | 4 +- .../java/com/hbm/items/armor/WingsMurk.java | 2 +- src/main/java/com/hbm/lib/HbmWorldGen.java | 99 ++++--- src/main/java/com/hbm/lib/RefStrings.java | 2 +- src/main/java/com/hbm/main/ClientProxy.java | 6 - .../java/com/hbm/main/CraftingManager.java | 3 +- .../TileEntityMachineCatalyticReformer.java | 8 +- src/main/resources/assets/hbm/lang/de_DE.lang | 1 + src/main/resources/assets/hbm/lang/en_US.lang | 1 + .../models/machines/catalytic_reformer.png | Bin 7520 -> 7551 bytes 51 files changed, 306 insertions(+), 368 deletions(-) delete mode 100644 src/main/java/com/hbm/items/armor/ArmorSchrabidium.java diff --git a/gradle.properties b/gradle.properties index 2ed57bf47..57f27b5c2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_version=1.0.27 # Empty build number makes a release type -mod_build_number=4525 +mod_build_number=4543 credits=HbMinecraft, rodolphito (explosion algorithms), grangerave (explosion algorithms),\ \ Hoboy (textures, models), Doctor17 (russian localization), Drillgon200 (effects, models, porting),\ @@ -10,5 +10,5 @@ credits=HbMinecraft, rodolphito (explosion algorithms), grangerave (explosion al \ Pashtet (russian localization), MartinTheDragon (calculator, chunk-based fallout), haru315 (spiral point algorithm),\ \ Sten89 (models), Pixelguru26 (textures), TheBlueHat (textures), Alcater (GUI textures, porting), impbk2002 (project settings),\ \ OvermindDL1 (project settings), TehTemmie (reacher radiation function), Toshayo (satellite loot system, project settings), Silly541 (config for safe ME drives),\ - \ Voxelstice (OpenComputers integration, turbine spinup), martemen (project settings), Pvndols (thorium fuel recipe, gas turbine), JamesH2 (blood mechanics, nitric acid),\ - \ sdddddf80 (recipe configs), SuperCraftAlex (tooltips) \ No newline at end of file + \ Voxelstice (OpenComputers integration, turbine spinup), BallOfEnergy1 (OpenComputers integration), martemen (project settings),\ + \ Pvndols (thorium fuel recipe, gas turbine), JamesH2 (blood mechanics, nitric acid), sdddddf80 (recipe configs), SuperCraftAlex (tooltips) \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/generic/BlockGenericStairs.java b/src/main/java/com/hbm/blocks/generic/BlockGenericStairs.java index 4910221d7..7bd3ee8f6 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockGenericStairs.java +++ b/src/main/java/com/hbm/blocks/generic/BlockGenericStairs.java @@ -3,6 +3,8 @@ package com.hbm.blocks.generic; import java.util.ArrayList; import java.util.List; +import com.hbm.lib.RefStrings; + import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; @@ -15,5 +17,7 @@ public class BlockGenericStairs extends BlockStairs { this.useNeighborBrightness = true; recipeGen.add(new Object[] {block, meta, this}); + + this.setBlockTextureName(RefStrings.MODID + ":concrete_smooth"); } } diff --git a/src/main/java/com/hbm/blocks/generic/BlockMultiSlab.java b/src/main/java/com/hbm/blocks/generic/BlockMultiSlab.java index 231bb58cb..0772eb07c 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockMultiSlab.java +++ b/src/main/java/com/hbm/blocks/generic/BlockMultiSlab.java @@ -4,6 +4,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import com.hbm.lib.RefStrings; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; @@ -34,6 +36,8 @@ public class BlockMultiSlab extends BlockSlab { recipeGen.add(new Object[] {slabMaterials[i], this, i}); } } + + this.setBlockTextureName(RefStrings.MODID + ":concrete_smooth"); } @Override diff --git a/src/main/java/com/hbm/blocks/machine/MachineCatalyticReformer.java b/src/main/java/com/hbm/blocks/machine/MachineCatalyticReformer.java index ecfcd9be1..9d40aefe7 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineCatalyticReformer.java +++ b/src/main/java/com/hbm/blocks/machine/MachineCatalyticReformer.java @@ -1,6 +1,7 @@ package com.hbm.blocks.machine; import com.hbm.blocks.BlockDummyable; +import com.hbm.handler.MultiblockHandlerXR; import com.hbm.tileentity.TileEntityProxyCombo; import com.hbm.tileentity.machine.oil.TileEntityMachineCatalyticReformer; @@ -28,19 +29,32 @@ public class MachineCatalyticReformer extends BlockDummyable { return standardOpenBehavior(world, x, y, z, player, side); } + @Override + protected boolean checkRequirement(World world, int x, int y, int z, ForgeDirection dir, int o) { + return super.checkRequirement(world, x, y, z, dir, o) && + MultiblockHandlerXR.checkSpace(world, x + dir.offsetX * o, y + dir.offsetY * o, z + dir.offsetZ * o, new int[]{3, -3, 1, 0, -1, 2}, x, y, z, dir) && + MultiblockHandlerXR.checkSpace(world, x + dir.offsetX * o, y + dir.offsetY * o, z + dir.offsetZ * o, new int[]{6, -3, 1, 1, 2, 0}, x, y, z, dir); + } + @Override protected void fillSpace(World world, int x, int y, int z, ForgeDirection dir, int o) { super.fillSpace(world, x, y, z, dir, o); + MultiblockHandlerXR.fillSpace(world, x + dir.offsetX * o, y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {3, -3, 1, 0, -1, 2}, this, dir); + MultiblockHandlerXR.fillSpace(world, x + dir.offsetX * o, y + dir.offsetY * o, z + dir.offsetZ * o, new int[] {6, -3, 1, 1, 2, 0}, this, dir); + + ForgeDirection rot = dir.getRotation(ForgeDirection.UP); this.makeExtra(world, x - dir.offsetX + 1, y, z - dir.offsetZ + 1); this.makeExtra(world, x - dir.offsetX + 1, y, z - dir.offsetZ - 1); this.makeExtra(world, x - dir.offsetX - 1, y, z - dir.offsetZ + 1); this.makeExtra(world, x - dir.offsetX - 1, y, z - dir.offsetZ - 1); + this.makeExtra(world, x - dir.offsetX + rot.offsetX * 2, y, z - dir.offsetZ + rot.offsetZ * 2); + this.makeExtra(world, x - dir.offsetX - rot.offsetX * 2, y, z - dir.offsetZ - rot.offsetZ * 2); } @Override public int[] getDimensions() { - return new int[] {6, 0, 1, 1, 2, 2}; + return new int[] {2, 0, 1, 1, 2, 2}; } @Override diff --git a/src/main/java/com/hbm/config/GeneralConfig.java b/src/main/java/com/hbm/config/GeneralConfig.java index 839a7269f..c8a7788f2 100644 --- a/src/main/java/com/hbm/config/GeneralConfig.java +++ b/src/main/java/com/hbm/config/GeneralConfig.java @@ -38,6 +38,7 @@ public class GeneralConfig { public static boolean enable528ColtanSpawn = false; public static boolean enable528BedrockDeposit = true; public static boolean enable528BedrockSpawn = false; + public static boolean enable528BosniaSimulator = true; public static int coltanRate = 2; public static int bedrockRate = 50; @@ -100,6 +101,7 @@ public class GeneralConfig { enable528ColtanSpawn = CommonConfig.createConfigBool(config, CATEGORY_528, "X528_enableColtanSpawning", "Enables coltan ore as a random spawn in the world. Unlike the deposit option, coltan will not just spawn in one central location.", false); enable528BedrockDeposit = CommonConfig.createConfigBool(config, CATEGORY_528, "X528_enableBedrockDepsoit", "Enables bedrock coltan ores in the coltan deposit. These ores can be drilled to extract infinite coltan, albeit slowly.", true); enable528BedrockSpawn = CommonConfig.createConfigBool(config, CATEGORY_528, "X528_enableBedrockSpawning", "Enables the bedrock coltan ores as a rare spawn. These will be rarely found anywhere in the world.", false); + enable528BosniaSimulator = CommonConfig.createConfigBool(config, CATEGORY_528, "X528_enableBosniaSimulator", "Enables anti tank mines spawning all over the world.", true); coltanRate = CommonConfig.createConfigInt(config, CATEGORY_528, "X528_oreColtanFrequency", "Determines how many coltan ore veins are to be expected in a chunk. These values do not affect the frequency in deposits, and only apply if random coltan spanwing is enabled.", 2); bedrockRate = CommonConfig.createConfigInt(config, CATEGORY_528, "X528_bedrockColtanFrequency", "Determines how often (1 in X) bedrock coltan ores spawn. Applies for both the bedrock ores in the coltan deposit (if applicable) and the random bedrock ores (if applicable)", 50); diff --git a/src/main/java/com/hbm/crafting/PowderRecipes.java b/src/main/java/com/hbm/crafting/PowderRecipes.java index f928c7e72..6c6845ed9 100644 --- a/src/main/java/com/hbm/crafting/PowderRecipes.java +++ b/src/main/java/com/hbm/crafting/PowderRecipes.java @@ -76,6 +76,7 @@ public class PowderRecipes { CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_dura_steel, 2), new Object[] { STEEL.dust(), CO.dust() }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_dura_steel, 4), new Object[] { IRON.dust(), COAL.dust(), W.dust(), W.dust() }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.powder_dura_steel, 4), new Object[] { IRON.dust(), COAL.dust(), CO.dust(), CO.dust() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.ingot_firebrick, 4), new Object[] { "BN", "NB", 'B', Items.brick, 'N', Items.netherbrick }); } //Unleash the colores diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java index f1697f9b9..b7efe7853 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java @@ -301,7 +301,7 @@ public class AssemblerRecipes { makeRecipe(new ComparableStack(ModBlocks.machine_schrabidium_transmutator, 1), new AStack[] {new OreDictStack(MAGTUNG.ingot(), 1), new OreDictStack(TI.ingot(), 24), new OreDictStack(ALLOY.plate(), 18), new OreDictStack(STEEL.plate(), 12), new ComparableStack(ModItems.plate_desh, 6), new OreDictStack(RUBBER.ingot(), 8), new ComparableStack(ModBlocks.machine_battery, 5), new ComparableStack(ModItems.circuit_gold, 5), },500); makeRecipe(new ComparableStack(ModBlocks.machine_combine_factory, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 8), new OreDictStack(ANY_PLASTIC.ingot(), 6), new OreDictStack(TI.plate(), 4), new OreDictStack(CU.plate(), 6), new ComparableStack(ModItems.circuit_gold, 6), new ComparableStack(ModItems.coil_advanced_alloy, 8), new ComparableStack(ModItems.coil_tungsten, 4), new OreDictStack(MAGTUNG.ingot(), 12), },150); makeRecipe(new ComparableStack(ModBlocks.fusion_conductor, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 2), new ComparableStack(ModItems.coil_advanced_alloy, 5), },150); - makeRecipe(new ComparableStack(ModBlocks.fusion_center, 1), new AStack[] {new OreDictStack(W.ingot(), 4), new OreDictStack(STEEL.plate528(), 6), new ComparableStack(ModItems.wire_advanced_alloy, 24), },200); + makeRecipe(new ComparableStack(ModBlocks.fusion_center, 1), new AStack[] {new OreDictStack(ANY_HARDPLASTIC.ingot(), 4), new OreDictStack(STEEL.plate528(), 6), new ComparableStack(ModItems.wire_advanced_alloy, 24), },200); makeRecipe(new ComparableStack(ModBlocks.fusion_motor, 1), new AStack[] {new OreDictStack(TI.ingot(), 4), new OreDictStack(STEEL.ingot(), 2), new ComparableStack(ModItems.motor, 4), },250); makeRecipe(new ComparableStack(ModBlocks.fusion_heater, 1), new AStack[] {new OreDictStack(W.ingot(), 4), new OreDictStack(STEEL.plate528(), 2), new OreDictStack(OreDictManager.getReflector(), 2), new OreDictStack(CU.plate(), 4), new ComparableStack(ModItems.magnetron, 1), new ComparableStack(ModItems.wire_advanced_alloy, 4), },150); makeRecipe(new ComparableStack(ModBlocks.watz_element, 1), new AStack[] {new OreDictStack(W.ingot(), 4), new OreDictStack(ALLOY.plate(), 4), new ComparableStack(ModItems.rod_empty, 2), new ComparableStack(ModItems.wire_magnetized_tungsten, 2), new ComparableStack(ModItems.wire_advanced_alloy, 4), },200); diff --git a/src/main/java/com/hbm/inventory/recipes/BlastFurnaceRecipes.java b/src/main/java/com/hbm/inventory/recipes/BlastFurnaceRecipes.java index ee424c811..3dd2f4914 100644 --- a/src/main/java/com/hbm/inventory/recipes/BlastFurnaceRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/BlastFurnaceRecipes.java @@ -118,7 +118,7 @@ public class BlastFurnaceRecipes extends SerializableRecipe { if(in instanceof DictFrame) { DictFrame recipeItem = (DictFrame) in; - recipeItem1 = new AStack[] { new OreDictStack(recipeItem.ingot()), new OreDictStack(recipeItem.dust()), new OreDictStack(recipeItem.plate()), new OreDictStack(recipeItem.gem()) }; + recipeItem1 = new AStack[] { new OreDictStack(recipeItem.ingot()), new OreDictStack(recipeItem.plate()), new OreDictStack(recipeItem.gem()), new OreDictStack(recipeItem.dust()) }; } else if(in instanceof AStack) { recipeItem1 = new AStack[] { (AStack) in }; diff --git a/src/main/java/com/hbm/inventory/recipes/ReformingRecipes.java b/src/main/java/com/hbm/inventory/recipes/ReformingRecipes.java index 7dad1d4a1..5d0b047aa 100644 --- a/src/main/java/com/hbm/inventory/recipes/ReformingRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ReformingRecipes.java @@ -32,6 +32,16 @@ public class ReformingRecipes extends SerializableRecipe { new FluidStack(Fluids.AROMATICS, 10), new FluidStack(Fluids.HYDROGEN, 5) )); + recipes.put(Fluids.PETROLEUM, new Triplet( + new FluidStack(Fluids.UNSATURATEDS, 85), + new FluidStack(Fluids.REFORMGAS, 10), + new FluidStack(Fluids.HYDROGEN, 5) + )); + recipes.put(Fluids.SOURGAS, new Triplet( + new FluidStack(Fluids.SULFURIC_ACID, 75), + new FluidStack(Fluids.PETROLEUM, 10), + new FluidStack(Fluids.HYDROGEN, 15) + )); } public static Triplet getOutput(FluidType type) { diff --git a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java index 61e7905d7..d7fed253b 100644 --- a/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/ShredderRecipes.java @@ -461,9 +461,9 @@ public class ShredderRecipes extends SerializableRecipe { @Override public void readRecipe(JsonElement recipe) { JsonObject obj = (JsonObject) recipe; - ComparableStack comp = new ComparableStack(this.readItemStack(obj.get("input").getAsJsonArray())).makeSingular(); + ItemStack stack = this.readItemStack(obj.get("input").getAsJsonArray()); + ComparableStack comp = new ComparableStack(stack).makeSingular(); ItemStack out = this.readItemStack(obj.get("output").getAsJsonArray()); - this.shredderRecipes.put(comp, out); } diff --git a/src/main/java/com/hbm/inventory/recipes/loader/SerializableRecipe.java b/src/main/java/com/hbm/inventory/recipes/loader/SerializableRecipe.java index 55f963a36..dd64e10ca 100644 --- a/src/main/java/com/hbm/inventory/recipes/loader/SerializableRecipe.java +++ b/src/main/java/com/hbm/inventory/recipes/loader/SerializableRecipe.java @@ -1,6 +1,7 @@ package com.hbm.inventory.recipes.loader; import java.io.File; +import java.io.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; @@ -174,7 +175,7 @@ public abstract class SerializableRecipe { for(JsonElement recipe : recipes) { this.readRecipe(recipe); } - } catch(Exception ex) { } + } catch(FileNotFoundException ex) { } } /* @@ -234,9 +235,9 @@ public abstract class SerializableRecipe { Item item = (Item) Item.itemRegistry.getObject(array.get(0).getAsString()); int stacksize = array.size() > 1 ? array.get(1).getAsInt() : 1; int meta = array.size() > 2 ? array.get(2).getAsInt() : 0; - return new ItemStack(item, stacksize, meta); + if(item != null) return new ItemStack(item, stacksize, meta); } catch(Exception ex) { } - MainRegistry.logger.error("Error reading stack array " + array.toString()); + MainRegistry.logger.error("Error reading stack array " + array.toString() + " - defaulting to NOTHING item!"); return new ItemStack(ModItems.nothing); } diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index bdbde155e..293fd49c4 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -2624,10 +2624,10 @@ public class ModItems { redstone_sword = new RedstoneSword(ToolMaterial.STONE).setUnlocalizedName("redstone_sword").setCreativeTab(CreativeTabs.tabCombat).setTextureName(RefStrings.MODID + ":redstone_sword"); big_sword = new BigSword(ToolMaterial.EMERALD).setUnlocalizedName("big_sword").setCreativeTab(CreativeTabs.tabCombat).setTextureName(RefStrings.MODID + ":big_sword"); - test_helmet = new ArmorTest(MainRegistry.enumArmorMaterialEmerald, 5, 0).setUnlocalizedName("test_helmet").setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_helmet"); - test_chestplate = new ArmorTest(MainRegistry.enumArmorMaterialEmerald, 5, 1).setUnlocalizedName("test_chestplate").setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_chestplate"); - test_leggings = new ArmorTest(MainRegistry.enumArmorMaterialEmerald, 5, 2).setUnlocalizedName("test_leggings").setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_leggings"); - test_boots = new ArmorTest(MainRegistry.enumArmorMaterialEmerald, 5, 3).setUnlocalizedName("test_boots").setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_boots"); + test_helmet = new ArmorTest(MainRegistry.enumArmorMaterialEmerald, 0).setUnlocalizedName("test_helmet").setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_helmet"); + test_chestplate = new ArmorTest(MainRegistry.enumArmorMaterialEmerald, 1).setUnlocalizedName("test_chestplate").setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_chestplate"); + test_leggings = new ArmorTest(MainRegistry.enumArmorMaterialEmerald, 2).setUnlocalizedName("test_leggings").setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_leggings"); + test_boots = new ArmorTest(MainRegistry.enumArmorMaterialEmerald, 3).setUnlocalizedName("test_boots").setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_boots"); test_nuke_igniter = new Item().setUnlocalizedName("test_nuke_igniter").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_nuke_igniter"); test_nuke_propellant = new Item().setUnlocalizedName("test_nuke_propellant").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":test_nuke_propellant"); @@ -4378,7 +4378,7 @@ public class ModItems { gun_darter = new ItemGunDart(GunDartFactory.getDarterConfig()).setFull3D().setUnlocalizedName("gun_darter").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_darter"); gun_detonator = new ItemGunDetonator(GunDetonatorFactory.getDetonatorConfig()).setFull3D().setUnlocalizedName("gun_detonator").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_darter"); gun_glass_cannon = new ItemEnergyGunBase(GunPoweredFactory.getGlassCannonConfig()).setFull3D().setUnlocalizedName("gun_glass_cannon").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_darter"); - gun_m2 = new ItemGunBase(Gun50BMGFactory.getM2Config()).setFull3D().setUnlocalizedName("gun_m2").setCreativeTab(MainRegistry.weaponTab); + gun_m2 = new ItemGunBase(Gun50BMGFactory.getM2Config()).setFull3D().setUnlocalizedName("gun_m2").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_darter"); ToolMaterial matCrucible = EnumHelper.addToolMaterial("CRUCIBLE", 10, 3, 50.0F, 100.0F, 0); crucible = new ItemCrucible(5000, 1F, matCrucible).setUnlocalizedName("crucible").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":crucible"); @@ -4781,36 +4781,36 @@ public class ModItems { bobmazon_tools = new ItemCatalog().setUnlocalizedName("bobmazon_tools").setMaxStackSize(1).setCreativeTab(MainRegistry.templateTab).setTextureName(RefStrings.MODID + ":bobmazon_tools"); bobmazon_hidden = new ItemCatalog().setUnlocalizedName("bobmazon_hidden").setMaxStackSize(1).setCreativeTab(null).setTextureName(RefStrings.MODID + ":bobmazon_special"); - euphemium_helmet = new ArmorEuphemium(MainRegistry.aMatEuph, 6, 0).setUnlocalizedName("euphemium_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_helmet"); - euphemium_plate = new ArmorEuphemium(MainRegistry.aMatEuph, 6, 1).setUnlocalizedName("euphemium_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_plate"); - euphemium_legs = new ArmorEuphemium(MainRegistry.aMatEuph, 6, 2).setUnlocalizedName("euphemium_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_legs"); - euphemium_boots = new ArmorEuphemium(MainRegistry.aMatEuph, 6, 3).setUnlocalizedName("euphemium_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_boots"); + euphemium_helmet = new ArmorEuphemium(MainRegistry.aMatEuph, 0).setUnlocalizedName("euphemium_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_helmet"); + euphemium_plate = new ArmorEuphemium(MainRegistry.aMatEuph, 1).setUnlocalizedName("euphemium_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_plate"); + euphemium_legs = new ArmorEuphemium(MainRegistry.aMatEuph, 2).setUnlocalizedName("euphemium_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_legs"); + euphemium_boots = new ArmorEuphemium(MainRegistry.aMatEuph, 3).setUnlocalizedName("euphemium_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":euphemium_boots"); ArmorMaterial aMatRags = EnumHelper.addArmorMaterial("HBM_RAGS", 150, new int[] { 1, 1, 1, 1 }, 0); aMatRags.customCraftingMaterial = ModItems.rag; - goggles = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("goggles").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":goggles"); - ashglasses = new ArmorAshGlasses(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("ashglasses").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ashglasses"); + goggles = new ArmorModel(ArmorMaterial.IRON, 0).setUnlocalizedName("goggles").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":goggles"); + ashglasses = new ArmorAshGlasses(ArmorMaterial.IRON, 0).setUnlocalizedName("ashglasses").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":ashglasses"); gas_mask = new ArmorGasMask().setUnlocalizedName("gas_mask").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":gas_mask"); gas_mask_m65 = new ArmorGasMask().setUnlocalizedName("gas_mask_m65").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":gas_mask_m65"); gas_mask_mono = new ArmorGasMask().setUnlocalizedName("gas_mask_mono").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":gas_mask_mono"); gas_mask_olde = new ArmorGasMask().setUnlocalizedName("gas_mask_olde").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":gas_mask_olde"); - mask_rag = new ModArmor(aMatRags, 7, 0).setUnlocalizedName("mask_rag").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mask_rag"); - mask_piss = new ModArmor(aMatRags, 7, 0).setUnlocalizedName("mask_piss").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mask_piss"); - hat = new ArmorHat(MainRegistry.aMatAlloy, 7, 0).setUnlocalizedName("nossy_hat").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hat"); + mask_rag = new ModArmor(aMatRags, 0).setUnlocalizedName("mask_rag").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mask_rag"); + mask_piss = new ModArmor(aMatRags, 0).setUnlocalizedName("mask_piss").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mask_piss"); + hat = new ArmorHat(MainRegistry.aMatAlloy, 0).setUnlocalizedName("nossy_hat").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":hat"); beta = new ItemDrop().setUnlocalizedName("beta").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":beta"); //oxy_mask = new ArmorModel(ArmorMaterial.IRON, 7, 0).setUnlocalizedName("oxy_mask").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":oxy_mask"); - schrabidium_helmet = new ArmorFSB(MainRegistry.aMatSchrab, 7, 0, RefStrings.MODID + ":textures/armor/schrabidium_1.png").setCap(4F).setMod(0.1F) + schrabidium_helmet = new ArmorFSB(MainRegistry.aMatSchrab, 0, RefStrings.MODID + ":textures/armor/schrabidium_1.png").setCap(4F).setMod(0.1F) .addEffect(new PotionEffect(Potion.digSpeed.id, 20, 2)) .addEffect(new PotionEffect(Potion.damageBoost.id, 20, 2)) .addEffect(new PotionEffect(Potion.jump.id, 20, 1)) .addEffect(new PotionEffect(Potion.moveSpeed.id, 20, 2)) .setFireproof(true).setUnlocalizedName("schrabidium_helmet").setTextureName(RefStrings.MODID + ":schrabidium_helmet"); - schrabidium_plate = new ArmorFSB(MainRegistry.aMatSchrab, 7, 1, RefStrings.MODID + ":textures/armor/schrabidium_1.png").cloneStats((ArmorFSB) schrabidium_helmet).setUnlocalizedName("schrabidium_plate").setTextureName(RefStrings.MODID + ":schrabidium_plate"); - schrabidium_legs = new ArmorFSB(MainRegistry.aMatSchrab, 7, 2, RefStrings.MODID + ":textures/armor/schrabidium_2.png").cloneStats((ArmorFSB) schrabidium_helmet).setCap(4F).setMod(0.1F).setUnlocalizedName("schrabidium_legs").setTextureName(RefStrings.MODID + ":schrabidium_legs"); - schrabidium_boots = new ArmorFSB(MainRegistry.aMatSchrab, 7, 3, RefStrings.MODID + ":textures/armor/schrabidium_1.png").cloneStats((ArmorFSB) schrabidium_helmet).setCap(4F).setMod(0.1F).setUnlocalizedName("schrabidium_boots").setTextureName(RefStrings.MODID + ":schrabidium_boots"); - bismuth_helmet = new ArmorBismuth(MainRegistry.aMatBismuth, 7, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png").setCap(8F).setMod(0.3F) + schrabidium_plate = new ArmorFSB(MainRegistry.aMatSchrab, 1, RefStrings.MODID + ":textures/armor/schrabidium_1.png").cloneStats((ArmorFSB) schrabidium_helmet).setUnlocalizedName("schrabidium_plate").setTextureName(RefStrings.MODID + ":schrabidium_plate"); + schrabidium_legs = new ArmorFSB(MainRegistry.aMatSchrab, 2, RefStrings.MODID + ":textures/armor/schrabidium_2.png").cloneStats((ArmorFSB) schrabidium_helmet).setCap(4F).setMod(0.1F).setUnlocalizedName("schrabidium_legs").setTextureName(RefStrings.MODID + ":schrabidium_legs"); + schrabidium_boots = new ArmorFSB(MainRegistry.aMatSchrab, 3, RefStrings.MODID + ":textures/armor/schrabidium_1.png").cloneStats((ArmorFSB) schrabidium_helmet).setCap(4F).setMod(0.1F).setUnlocalizedName("schrabidium_boots").setTextureName(RefStrings.MODID + ":schrabidium_boots"); + bismuth_helmet = new ArmorBismuth(MainRegistry.aMatBismuth, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png").setCap(8F).setMod(0.3F) .addResistance("fall", 0) .addEffect(new PotionEffect(Potion.jump.id, 20, 6)) .addEffect(new PotionEffect(Potion.moveSpeed.id, 20, 6)) @@ -4818,55 +4818,55 @@ public class ModItems { .addEffect(new PotionEffect(Potion.nightVision.id, 15 * 20, 0)) .setDashCount(3) .setUnlocalizedName("bismuth_helmet").setTextureName(RefStrings.MODID + ":bismuth_helmet"); - bismuth_plate = new ArmorBismuth(MainRegistry.aMatBismuth, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_2.png").cloneStats((ArmorFSB) bismuth_helmet).setCap(8F).setMod(0.3F).setUnlocalizedName("bismuth_plate").setTextureName(RefStrings.MODID + ":bismuth_plate"); - bismuth_legs = new ArmorBismuth(MainRegistry.aMatBismuth, 7, 2, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) bismuth_helmet).setCap(8F).setMod(0.3F).setUnlocalizedName("bismuth_legs").setTextureName(RefStrings.MODID + ":bismuth_legs"); - bismuth_boots = new ArmorBismuth(MainRegistry.aMatBismuth, 7, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) bismuth_helmet).setCap(8F).setMod(0.3F).setUnlocalizedName("bismuth_boots").setTextureName(RefStrings.MODID + ":bismuth_boots"); - titanium_helmet = new ArmorFSB(MainRegistry.aMatTitan, 7, 0, RefStrings.MODID + ":textures/armor/titanium_1.png").setMod(0.85F).setUnlocalizedName("titanium_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_helmet"); - titanium_plate = new ArmorFSB(MainRegistry.aMatTitan, 7, 1, RefStrings.MODID + ":textures/armor/titanium_1.png").cloneStats((ArmorFSB) titanium_helmet).setUnlocalizedName("titanium_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_plate"); - titanium_legs = new ArmorFSB(MainRegistry.aMatTitan, 7, 2, RefStrings.MODID + ":textures/armor/titanium_2.png").cloneStats((ArmorFSB) titanium_helmet).setUnlocalizedName("titanium_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_legs"); - titanium_boots = new ArmorFSB(MainRegistry.aMatTitan, 7, 3, RefStrings.MODID + ":textures/armor/titanium_1.png").cloneStats((ArmorFSB) titanium_helmet).setUnlocalizedName("titanium_boots").setTextureName(RefStrings.MODID + ":titanium_boots"); - steel_helmet = new ArmorFSB(MainRegistry.aMatSteel, 7, 0, RefStrings.MODID + ":textures/armor/steel_1.png").setMod(0.9F).setUnlocalizedName("steel_helmet").setTextureName(RefStrings.MODID + ":steel_helmet"); - steel_plate = new ArmorFSB(MainRegistry.aMatSteel, 7, 1, RefStrings.MODID + ":textures/armor/steel_1.png").cloneStats((ArmorFSB) steel_helmet).setUnlocalizedName("steel_plate").setTextureName(RefStrings.MODID + ":steel_plate"); - steel_legs = new ArmorFSB(MainRegistry.aMatSteel, 7, 2, RefStrings.MODID + ":textures/armor/steel_2.png").cloneStats((ArmorFSB) steel_helmet).setUnlocalizedName("steel_legs").setTextureName(RefStrings.MODID + ":steel_legs"); - steel_boots = new ArmorFSB(MainRegistry.aMatSteel, 7, 3, RefStrings.MODID + ":textures/armor/steel_1.png").cloneStats((ArmorFSB) steel_helmet).setUnlocalizedName("steel_boots").setTextureName(RefStrings.MODID + ":steel_boots"); - alloy_helmet = new ArmorFSB(MainRegistry.aMatAlloy, 7, 0, RefStrings.MODID + ":textures/armor/alloy_1.png").setMod(0.75F).setUnlocalizedName("alloy_helmet").setTextureName(RefStrings.MODID + ":alloy_helmet"); - alloy_plate = new ArmorFSB(MainRegistry.aMatAlloy, 7, 1, RefStrings.MODID + ":textures/armor/alloy_1.png").cloneStats((ArmorFSB) alloy_helmet).setUnlocalizedName("alloy_plate").setTextureName(RefStrings.MODID + ":alloy_plate"); - alloy_legs = new ArmorFSB(MainRegistry.aMatAlloy, 7, 2, RefStrings.MODID + ":textures/armor/alloy_2.png").cloneStats((ArmorFSB) alloy_helmet).setUnlocalizedName("alloy_legs").setTextureName(RefStrings.MODID + ":alloy_legs"); - alloy_boots = new ArmorFSB(MainRegistry.aMatAlloy, 7, 3, RefStrings.MODID + ":textures/armor/alloy_1.png").cloneStats((ArmorFSB) alloy_helmet).setUnlocalizedName("alloy_boots").setTextureName(RefStrings.MODID + ":alloy_boots"); - cmb_helmet = new ArmorFSB(MainRegistry.aMatCMB, 7, 0, RefStrings.MODID + ":textures/armor/cmb_1.png").setCap(2F).setThreshold(2F).setMod(0.05F) + bismuth_plate = new ArmorBismuth(MainRegistry.aMatBismuth, 1, RefStrings.MODID + ":textures/armor/starmetal_2.png").cloneStats((ArmorFSB) bismuth_helmet).setCap(8F).setMod(0.3F).setUnlocalizedName("bismuth_plate").setTextureName(RefStrings.MODID + ":bismuth_plate"); + bismuth_legs = new ArmorBismuth(MainRegistry.aMatBismuth, 2, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) bismuth_helmet).setCap(8F).setMod(0.3F).setUnlocalizedName("bismuth_legs").setTextureName(RefStrings.MODID + ":bismuth_legs"); + bismuth_boots = new ArmorBismuth(MainRegistry.aMatBismuth, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) bismuth_helmet).setCap(8F).setMod(0.3F).setUnlocalizedName("bismuth_boots").setTextureName(RefStrings.MODID + ":bismuth_boots"); + titanium_helmet = new ArmorFSB(MainRegistry.aMatTitan, 0, RefStrings.MODID + ":textures/armor/titanium_1.png").setMod(0.85F).setUnlocalizedName("titanium_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_helmet"); + titanium_plate = new ArmorFSB(MainRegistry.aMatTitan, 1, RefStrings.MODID + ":textures/armor/titanium_1.png").cloneStats((ArmorFSB) titanium_helmet).setUnlocalizedName("titanium_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_plate"); + titanium_legs = new ArmorFSB(MainRegistry.aMatTitan, 2, RefStrings.MODID + ":textures/armor/titanium_2.png").cloneStats((ArmorFSB) titanium_helmet).setUnlocalizedName("titanium_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":titanium_legs"); + titanium_boots = new ArmorFSB(MainRegistry.aMatTitan, 3, RefStrings.MODID + ":textures/armor/titanium_1.png").cloneStats((ArmorFSB) titanium_helmet).setUnlocalizedName("titanium_boots").setTextureName(RefStrings.MODID + ":titanium_boots"); + steel_helmet = new ArmorFSB(MainRegistry.aMatSteel, 0, RefStrings.MODID + ":textures/armor/steel_1.png").setMod(0.9F).setUnlocalizedName("steel_helmet").setTextureName(RefStrings.MODID + ":steel_helmet"); + steel_plate = new ArmorFSB(MainRegistry.aMatSteel, 1, RefStrings.MODID + ":textures/armor/steel_1.png").cloneStats((ArmorFSB) steel_helmet).setUnlocalizedName("steel_plate").setTextureName(RefStrings.MODID + ":steel_plate"); + steel_legs = new ArmorFSB(MainRegistry.aMatSteel, 2, RefStrings.MODID + ":textures/armor/steel_2.png").cloneStats((ArmorFSB) steel_helmet).setUnlocalizedName("steel_legs").setTextureName(RefStrings.MODID + ":steel_legs"); + steel_boots = new ArmorFSB(MainRegistry.aMatSteel, 3, RefStrings.MODID + ":textures/armor/steel_1.png").cloneStats((ArmorFSB) steel_helmet).setUnlocalizedName("steel_boots").setTextureName(RefStrings.MODID + ":steel_boots"); + alloy_helmet = new ArmorFSB(MainRegistry.aMatAlloy, 0, RefStrings.MODID + ":textures/armor/alloy_1.png").setMod(0.75F).setUnlocalizedName("alloy_helmet").setTextureName(RefStrings.MODID + ":alloy_helmet"); + alloy_plate = new ArmorFSB(MainRegistry.aMatAlloy, 1, RefStrings.MODID + ":textures/armor/alloy_1.png").cloneStats((ArmorFSB) alloy_helmet).setUnlocalizedName("alloy_plate").setTextureName(RefStrings.MODID + ":alloy_plate"); + alloy_legs = new ArmorFSB(MainRegistry.aMatAlloy, 2, RefStrings.MODID + ":textures/armor/alloy_2.png").cloneStats((ArmorFSB) alloy_helmet).setUnlocalizedName("alloy_legs").setTextureName(RefStrings.MODID + ":alloy_legs"); + alloy_boots = new ArmorFSB(MainRegistry.aMatAlloy, 3, RefStrings.MODID + ":textures/armor/alloy_1.png").cloneStats((ArmorFSB) alloy_helmet).setUnlocalizedName("alloy_boots").setTextureName(RefStrings.MODID + ":alloy_boots"); + cmb_helmet = new ArmorFSB(MainRegistry.aMatCMB, 0, RefStrings.MODID + ":textures/armor/cmb_1.png").setCap(2F).setThreshold(2F).setMod(0.05F) .addEffect(new PotionEffect(Potion.moveSpeed.id, 20, 2)) .addEffect(new PotionEffect(Potion.digSpeed.id, 20, 2)) .addEffect(new PotionEffect(Potion.damageBoost.id, 20, 4)) .setFireproof(true).setUnlocalizedName("cmb_helmet").setTextureName(RefStrings.MODID + ":cmb_helmet"); - cmb_plate = new ArmorFSB(MainRegistry.aMatCMB, 7, 1, RefStrings.MODID + ":textures/armor/cmb_1.png").cloneStats((ArmorFSB) cmb_helmet).setUnlocalizedName("cmb_plate").setTextureName(RefStrings.MODID + ":cmb_plate"); - cmb_legs = new ArmorFSB(MainRegistry.aMatCMB, 7, 2, RefStrings.MODID + ":textures/armor/cmb_2.png").cloneStats((ArmorFSB) cmb_helmet).setUnlocalizedName("cmb_legs").setTextureName(RefStrings.MODID + ":cmb_legs"); - cmb_boots = new ArmorFSB(MainRegistry.aMatCMB, 7, 3, RefStrings.MODID + ":textures/armor/cmb_1.png").cloneStats((ArmorFSB) cmb_helmet).setUnlocalizedName("cmb_boots").setTextureName(RefStrings.MODID + ":cmb_boots"); - paa_plate = new ArmorFSB(MainRegistry.aMatPaa, 7, 1, RefStrings.MODID + ":textures/armor/paa_1.png").setCap(6F).setMod(0.3F).setNoHelmet(true) + cmb_plate = new ArmorFSB(MainRegistry.aMatCMB, 1, RefStrings.MODID + ":textures/armor/cmb_1.png").cloneStats((ArmorFSB) cmb_helmet).setUnlocalizedName("cmb_plate").setTextureName(RefStrings.MODID + ":cmb_plate"); + cmb_legs = new ArmorFSB(MainRegistry.aMatCMB, 2, RefStrings.MODID + ":textures/armor/cmb_2.png").cloneStats((ArmorFSB) cmb_helmet).setUnlocalizedName("cmb_legs").setTextureName(RefStrings.MODID + ":cmb_legs"); + cmb_boots = new ArmorFSB(MainRegistry.aMatCMB, 3, RefStrings.MODID + ":textures/armor/cmb_1.png").cloneStats((ArmorFSB) cmb_helmet).setUnlocalizedName("cmb_boots").setTextureName(RefStrings.MODID + ":cmb_boots"); + paa_plate = new ArmorFSB(MainRegistry.aMatPaa, 1, RefStrings.MODID + ":textures/armor/paa_1.png").setCap(6F).setMod(0.3F).setNoHelmet(true) .addEffect(new PotionEffect(Potion.digSpeed.id, 20, 0)).setUnlocalizedName("paa_plate").setTextureName(RefStrings.MODID + ":paa_plate"); - paa_legs = new ArmorFSB(MainRegistry.aMatPaa, 7, 2, RefStrings.MODID + ":textures/armor/paa_2.png").cloneStats((ArmorFSB) paa_plate).setUnlocalizedName("paa_legs").setTextureName(RefStrings.MODID + ":paa_legs"); - paa_boots = new ArmorFSB(MainRegistry.aMatPaa, 7, 3, RefStrings.MODID + ":textures/armor/paa_1.png").cloneStats((ArmorFSB) paa_plate).setUnlocalizedName("paa_boots").setTextureName(RefStrings.MODID + ":paa_boots"); - asbestos_helmet = new ArmorFSB(MainRegistry.aMatAsbestos, 7, 0, RefStrings.MODID + ":textures/armor/asbestos_1.png").setFireproof(true).setOverlay(RefStrings.MODID + ":textures/misc/overlay_asbestos.png").setUnlocalizedName("asbestos_helmet").setTextureName(RefStrings.MODID + ":asbestos_helmet"); - asbestos_plate = new ArmorFSB(MainRegistry.aMatAsbestos, 7, 1, RefStrings.MODID + ":textures/armor/asbestos_1.png").setFireproof(true).setUnlocalizedName("asbestos_plate").setTextureName(RefStrings.MODID + ":asbestos_plate"); - asbestos_legs = new ArmorFSB(MainRegistry.aMatAsbestos, 7, 2, RefStrings.MODID + ":textures/armor/asbestos_2.png").setFireproof(true).setUnlocalizedName("asbestos_legs").setTextureName(RefStrings.MODID + ":asbestos_legs"); - asbestos_boots = new ArmorFSB(MainRegistry.aMatAsbestos, 7, 3, RefStrings.MODID + ":textures/armor/asbestos_1.png").setFireproof(true).setUnlocalizedName("asbestos_boots").setTextureName(RefStrings.MODID + ":asbestos_boots"); - security_helmet = new ArmorFSB(MainRegistry.aMatSecurity, 7, 0, RefStrings.MODID + ":textures/armor/security_1.png").setMod(0.75F).setProjectileProtection(0.5F).setUnlocalizedName("security_helmet").setTextureName(RefStrings.MODID + ":security_helmet"); - security_plate = new ArmorFSB(MainRegistry.aMatSecurity, 7, 1, RefStrings.MODID + ":textures/armor/security_1.png").cloneStats((ArmorFSB) security_helmet).setUnlocalizedName("security_plate").setTextureName(RefStrings.MODID + ":security_plate"); - security_legs = new ArmorFSB(MainRegistry.aMatSecurity, 7, 2, RefStrings.MODID + ":textures/armor/security_2.png").cloneStats((ArmorFSB) security_helmet).setUnlocalizedName("security_legs").setTextureName(RefStrings.MODID + ":security_legs"); - security_boots = new ArmorFSB(MainRegistry.aMatSecurity, 7, 3, RefStrings.MODID + ":textures/armor/security_1.png").cloneStats((ArmorFSB) security_helmet).setUnlocalizedName("security_boots").setTextureName(RefStrings.MODID + ":security_boots"); - cobalt_helmet = new ArmorFSB(MainRegistry.aMatCobalt, 7, 0, RefStrings.MODID + ":textures/armor/cobalt_1.png").setMod(0.75F).setUnlocalizedName("cobalt_helmet").setTextureName(RefStrings.MODID + ":cobalt_helmet"); - cobalt_plate = new ArmorFSB(MainRegistry.aMatCobalt, 7, 1, RefStrings.MODID + ":textures/armor/cobalt_1.png").cloneStats((ArmorFSB) cobalt_helmet).setUnlocalizedName("cobalt_plate").setTextureName(RefStrings.MODID + ":cobalt_plate"); - cobalt_legs = new ArmorFSB(MainRegistry.aMatCobalt, 7, 2, RefStrings.MODID + ":textures/armor/cobalt_2.png").cloneStats((ArmorFSB) cobalt_helmet).setUnlocalizedName("cobalt_legs").setTextureName(RefStrings.MODID + ":cobalt_legs"); - cobalt_boots = new ArmorFSB(MainRegistry.aMatCobalt, 7, 3, RefStrings.MODID + ":textures/armor/cobalt_1.png").cloneStats((ArmorFSB) cobalt_helmet).setUnlocalizedName("cobalt_boots").setTextureName(RefStrings.MODID + ":cobalt_boots"); - starmetal_helmet = new ArmorFSB(MainRegistry.aMatStarmetal, 7, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png").setMod(0.5F).setCap(15F) + paa_legs = new ArmorFSB(MainRegistry.aMatPaa, 2, RefStrings.MODID + ":textures/armor/paa_2.png").cloneStats((ArmorFSB) paa_plate).setUnlocalizedName("paa_legs").setTextureName(RefStrings.MODID + ":paa_legs"); + paa_boots = new ArmorFSB(MainRegistry.aMatPaa, 3, RefStrings.MODID + ":textures/armor/paa_1.png").cloneStats((ArmorFSB) paa_plate).setUnlocalizedName("paa_boots").setTextureName(RefStrings.MODID + ":paa_boots"); + asbestos_helmet = new ArmorFSB(MainRegistry.aMatAsbestos, 0, RefStrings.MODID + ":textures/armor/asbestos_1.png").setFireproof(true).setOverlay(RefStrings.MODID + ":textures/misc/overlay_asbestos.png").setUnlocalizedName("asbestos_helmet").setTextureName(RefStrings.MODID + ":asbestos_helmet"); + asbestos_plate = new ArmorFSB(MainRegistry.aMatAsbestos, 1, RefStrings.MODID + ":textures/armor/asbestos_1.png").setFireproof(true).setUnlocalizedName("asbestos_plate").setTextureName(RefStrings.MODID + ":asbestos_plate"); + asbestos_legs = new ArmorFSB(MainRegistry.aMatAsbestos, 2, RefStrings.MODID + ":textures/armor/asbestos_2.png").setFireproof(true).setUnlocalizedName("asbestos_legs").setTextureName(RefStrings.MODID + ":asbestos_legs"); + asbestos_boots = new ArmorFSB(MainRegistry.aMatAsbestos, 3, RefStrings.MODID + ":textures/armor/asbestos_1.png").setFireproof(true).setUnlocalizedName("asbestos_boots").setTextureName(RefStrings.MODID + ":asbestos_boots"); + security_helmet = new ArmorFSB(MainRegistry.aMatSecurity, 0, RefStrings.MODID + ":textures/armor/security_1.png").setMod(0.75F).setProjectileProtection(0.5F).setUnlocalizedName("security_helmet").setTextureName(RefStrings.MODID + ":security_helmet"); + security_plate = new ArmorFSB(MainRegistry.aMatSecurity, 1, RefStrings.MODID + ":textures/armor/security_1.png").cloneStats((ArmorFSB) security_helmet).setUnlocalizedName("security_plate").setTextureName(RefStrings.MODID + ":security_plate"); + security_legs = new ArmorFSB(MainRegistry.aMatSecurity, 2, RefStrings.MODID + ":textures/armor/security_2.png").cloneStats((ArmorFSB) security_helmet).setUnlocalizedName("security_legs").setTextureName(RefStrings.MODID + ":security_legs"); + security_boots = new ArmorFSB(MainRegistry.aMatSecurity, 3, RefStrings.MODID + ":textures/armor/security_1.png").cloneStats((ArmorFSB) security_helmet).setUnlocalizedName("security_boots").setTextureName(RefStrings.MODID + ":security_boots"); + cobalt_helmet = new ArmorFSB(MainRegistry.aMatCobalt, 0, RefStrings.MODID + ":textures/armor/cobalt_1.png").setMod(0.75F).setUnlocalizedName("cobalt_helmet").setTextureName(RefStrings.MODID + ":cobalt_helmet"); + cobalt_plate = new ArmorFSB(MainRegistry.aMatCobalt, 1, RefStrings.MODID + ":textures/armor/cobalt_1.png").cloneStats((ArmorFSB) cobalt_helmet).setUnlocalizedName("cobalt_plate").setTextureName(RefStrings.MODID + ":cobalt_plate"); + cobalt_legs = new ArmorFSB(MainRegistry.aMatCobalt, 2, RefStrings.MODID + ":textures/armor/cobalt_2.png").cloneStats((ArmorFSB) cobalt_helmet).setUnlocalizedName("cobalt_legs").setTextureName(RefStrings.MODID + ":cobalt_legs"); + cobalt_boots = new ArmorFSB(MainRegistry.aMatCobalt, 3, RefStrings.MODID + ":textures/armor/cobalt_1.png").cloneStats((ArmorFSB) cobalt_helmet).setUnlocalizedName("cobalt_boots").setTextureName(RefStrings.MODID + ":cobalt_boots"); + starmetal_helmet = new ArmorFSB(MainRegistry.aMatStarmetal, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png").setMod(0.5F).setCap(15F) .setFireproof(true).setUnlocalizedName("starmetal_helmet").setTextureName(RefStrings.MODID + ":starmetal_helmet"); - starmetal_plate = new ArmorFSB(MainRegistry.aMatStarmetal, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) starmetal_helmet).setUnlocalizedName("starmetal_plate").setTextureName(RefStrings.MODID + ":starmetal_plate"); - starmetal_legs = new ArmorFSB(MainRegistry.aMatStarmetal, 7, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png").cloneStats((ArmorFSB) starmetal_helmet).setUnlocalizedName("starmetal_legs").setTextureName(RefStrings.MODID + ":starmetal_legs"); - starmetal_boots = new ArmorFSB(MainRegistry.aMatStarmetal, 7, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) starmetal_helmet).setUnlocalizedName("starmetal_boots").setTextureName(RefStrings.MODID + ":starmetal_boots"); + starmetal_plate = new ArmorFSB(MainRegistry.aMatStarmetal, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) starmetal_helmet).setUnlocalizedName("starmetal_plate").setTextureName(RefStrings.MODID + ":starmetal_plate"); + starmetal_legs = new ArmorFSB(MainRegistry.aMatStarmetal, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png").cloneStats((ArmorFSB) starmetal_helmet).setUnlocalizedName("starmetal_legs").setTextureName(RefStrings.MODID + ":starmetal_legs"); + starmetal_boots = new ArmorFSB(MainRegistry.aMatStarmetal, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png").cloneStats((ArmorFSB) starmetal_helmet).setUnlocalizedName("starmetal_boots").setTextureName(RefStrings.MODID + ":starmetal_boots"); - robes_helmet = new ArmorFSB(ArmorMaterial.CHAIN, 7, 0, RefStrings.MODID + ":textures/armor/robes_1.png").setThreshold(1.0F).setUnlocalizedName("robes_helmet").setTextureName(RefStrings.MODID + ":robes_helmet"); - robes_plate = new ArmorFSB(ArmorMaterial.CHAIN, 7, 1, RefStrings.MODID + ":textures/armor/robes_1.png").cloneStats((ArmorFSB) robes_helmet).setUnlocalizedName("robes_plate").setTextureName(RefStrings.MODID + ":robes_plate"); - robes_legs = new ArmorFSB(ArmorMaterial.CHAIN, 7, 2, RefStrings.MODID + ":textures/armor/robes_2.png").cloneStats((ArmorFSB) robes_helmet).setUnlocalizedName("robes_legs").setTextureName(RefStrings.MODID + ":robes_legs"); - robes_boots = new ArmorFSB(ArmorMaterial.CHAIN, 7, 3, RefStrings.MODID + ":textures/armor/robes_1.png").cloneStats((ArmorFSB) robes_helmet).setUnlocalizedName("robes_boots").setTextureName(RefStrings.MODID + ":robes_boots"); + robes_helmet = new ArmorFSB(ArmorMaterial.CHAIN, 0, RefStrings.MODID + ":textures/armor/robes_1.png").setThreshold(1.0F).setUnlocalizedName("robes_helmet").setTextureName(RefStrings.MODID + ":robes_helmet"); + robes_plate = new ArmorFSB(ArmorMaterial.CHAIN, 1, RefStrings.MODID + ":textures/armor/robes_1.png").cloneStats((ArmorFSB) robes_helmet).setUnlocalizedName("robes_plate").setTextureName(RefStrings.MODID + ":robes_plate"); + robes_legs = new ArmorFSB(ArmorMaterial.CHAIN, 2, RefStrings.MODID + ":textures/armor/robes_2.png").cloneStats((ArmorFSB) robes_helmet).setUnlocalizedName("robes_legs").setTextureName(RefStrings.MODID + ":robes_legs"); + robes_boots = new ArmorFSB(ArmorMaterial.CHAIN, 3, RefStrings.MODID + ":textures/armor/robes_1.png").cloneStats((ArmorFSB) robes_helmet).setUnlocalizedName("robes_boots").setTextureName(RefStrings.MODID + ":robes_boots"); initializeItem2(); } @@ -4875,19 +4875,19 @@ public class ModItems { ArmorMaterial aMatZirconium = EnumHelper.addArmorMaterial("HBM_ZIRCONIUM", 1000, new int[] { 2, 5, 3, 1 }, 100); aMatZirconium.customCraftingMaterial = ModItems.ingot_zirconium; - zirconium_legs = new ArmorFSB(aMatZirconium, 7, 2, RefStrings.MODID + ":textures/armor/zirconium_2.png").setMod(0.0F).setUnlocalizedName("zirconium_legs").setTextureName(RefStrings.MODID + ":zirconium_legs"); + zirconium_legs = new ArmorFSB(aMatZirconium, 2, RefStrings.MODID + ":textures/armor/zirconium_2.png").setMod(0.0F).setUnlocalizedName("zirconium_legs").setTextureName(RefStrings.MODID + ":zirconium_legs"); ArmorMaterial aMatDNT = EnumHelper.addArmorMaterial("HBM_DNT_LOLOLOL", 3, new int[] { 1, 1, 1, 1 }, 0); aMatDNT.customCraftingMaterial = ModItems.ingot_dineutronium; - dnt_helmet = new ArmorFSB(aMatDNT, 7, 0, RefStrings.MODID + ":textures/armor/dnt_1.png") + dnt_helmet = new ArmorFSB(aMatDNT, 0, RefStrings.MODID + ":textures/armor/dnt_1.png") .setMod(5F).setUnlocalizedName("dnt_helmet").setTextureName(RefStrings.MODID + ":dnt_helmet"); - dnt_plate = new ArmorFSB(aMatDNT, 7, 1, RefStrings.MODID + ":textures/armor/dnt_1.png").cloneStats((ArmorFSB) dnt_helmet).setUnlocalizedName("dnt_plate").setTextureName(RefStrings.MODID + ":dnt_plate"); - dnt_legs = new ArmorFSB(aMatDNT, 7, 2, RefStrings.MODID + ":textures/armor/dnt_2.png").cloneStats((ArmorFSB) dnt_helmet).setUnlocalizedName("dnt_legs").setTextureName(RefStrings.MODID + ":dnt_legs"); - dnt_boots = new ArmorFSB(aMatDNT, 7, 3, RefStrings.MODID + ":textures/armor/dnt_1.png").cloneStats((ArmorFSB) dnt_helmet).setUnlocalizedName("dnt_boots").setTextureName(RefStrings.MODID + ":dnt_boots"); + dnt_plate = new ArmorFSB(aMatDNT, 1, RefStrings.MODID + ":textures/armor/dnt_1.png").cloneStats((ArmorFSB) dnt_helmet).setUnlocalizedName("dnt_plate").setTextureName(RefStrings.MODID + ":dnt_plate"); + dnt_legs = new ArmorFSB(aMatDNT, 2, RefStrings.MODID + ":textures/armor/dnt_2.png").cloneStats((ArmorFSB) dnt_helmet).setUnlocalizedName("dnt_legs").setTextureName(RefStrings.MODID + ":dnt_legs"); + dnt_boots = new ArmorFSB(aMatDNT, 3, RefStrings.MODID + ":textures/armor/dnt_1.png").cloneStats((ArmorFSB) dnt_helmet).setUnlocalizedName("dnt_boots").setTextureName(RefStrings.MODID + ":dnt_boots"); ArmorMaterial aMatT45 = EnumHelper.addArmorMaterial("HBM_T45", 150, new int[] { 3, 8, 6, 3 }, 0); aMatT45.customCraftingMaterial = ModItems.plate_armor_titanium; - t45_helmet = new ArmorT45(aMatT45, 2, 0, 1000000, 10000, 1000, 5).setCap(10F).setMod(0.5F) + t45_helmet = new ArmorT45(aMatT45, 0, 1000000, 10000, 1000, 5).setCap(10F).setMod(0.5F) .setFireproof(true) .enableVATS(true) .setHasGeigerSound(true) @@ -4898,13 +4898,13 @@ public class ModItems { .addResistance("fall", 0) .hides(EnumPlayerPart.HAT) .setUnlocalizedName("t45_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_helmet"); - t45_plate = new ArmorT45(aMatT45, 2, 1, 1000000, 10000, 1000, 5).cloneStats((ArmorFSB) t45_helmet).setUnlocalizedName("t45_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_plate"); - t45_legs = new ArmorT45(aMatT45, 2, 2, 1000000, 10000, 1000, 5).cloneStats((ArmorFSB) t45_helmet).setUnlocalizedName("t45_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_legs"); - t45_boots = new ArmorT45(aMatT45, 2, 3, 1000000, 10000, 1000, 5).cloneStats((ArmorFSB) t45_helmet).setUnlocalizedName("t45_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_boots"); + t45_plate = new ArmorT45(aMatT45, 1, 1000000, 10000, 1000, 5).cloneStats((ArmorFSB) t45_helmet).setUnlocalizedName("t45_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_plate"); + t45_legs = new ArmorT45(aMatT45, 2, 1000000, 10000, 1000, 5).cloneStats((ArmorFSB) t45_helmet).setUnlocalizedName("t45_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_legs"); + t45_boots = new ArmorT45(aMatT45, 3, 1000000, 10000, 1000, 5).cloneStats((ArmorFSB) t45_helmet).setUnlocalizedName("t45_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":t45_boots"); ArmorMaterial aMatDesh = EnumHelper.addArmorMaterial("HBM_DESH", 150, new int[] { 3, 8, 6, 3 }, 0); aMatDesh.customCraftingMaterial = ModItems.ingot_desh; - steamsuit_helmet = new ArmorDesh(aMatDesh, 2, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", Fluids.STEAM, 64_000, 500, 50, 1).setThreshold(5F).setMod(0.8F) + steamsuit_helmet = new ArmorDesh(aMatDesh, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", Fluids.STEAM, 64_000, 500, 50, 1).setThreshold(5F).setMod(0.8F) .setFireproof(true) .setHasHardLanding(true) .addEffect(new PotionEffect(Potion.digSpeed.id, 20, 4)) @@ -4913,26 +4913,26 @@ public class ModItems { .addResistance("fall", 0) .hides(EnumPlayerPart.HAT) .setUnlocalizedName("steamsuit_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":steamsuit_helmet"); - steamsuit_plate = new ArmorDesh(aMatDesh, 2, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", Fluids.STEAM, 64_000, 500, 50, 1).cloneStats((ArmorFSB) steamsuit_helmet).setUnlocalizedName("steamsuit_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":steamsuit_plate"); - steamsuit_legs = new ArmorDesh(aMatDesh, 2, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", Fluids.STEAM, 64_000, 500, 50, 1).cloneStats((ArmorFSB) steamsuit_helmet).setUnlocalizedName("steamsuit_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":steamsuit_legs"); - steamsuit_boots = new ArmorDesh(aMatDesh, 2, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", Fluids.STEAM, 64_000, 500, 50, 1).cloneStats((ArmorFSB) steamsuit_helmet).setUnlocalizedName("steamsuit_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":steamsuit_boots"); + steamsuit_plate = new ArmorDesh(aMatDesh, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", Fluids.STEAM, 64_000, 500, 50, 1).cloneStats((ArmorFSB) steamsuit_helmet).setUnlocalizedName("steamsuit_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":steamsuit_plate"); + steamsuit_legs = new ArmorDesh(aMatDesh, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", Fluids.STEAM, 64_000, 500, 50, 1).cloneStats((ArmorFSB) steamsuit_helmet).setUnlocalizedName("steamsuit_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":steamsuit_legs"); + steamsuit_boots = new ArmorDesh(aMatDesh, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", Fluids.STEAM, 64_000, 500, 50, 1).cloneStats((ArmorFSB) steamsuit_helmet).setUnlocalizedName("steamsuit_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":steamsuit_boots"); ArmorMaterial aMatDiesel = EnumHelper.addArmorMaterial("HBM_BNUUY", 150, new int[] { 3, 8, 6, 3 }, 0); aMatDiesel.customCraftingMaterial = ModItems.plate_copper; - dieselsuit_helmet = new ArmorDiesel(aMatDiesel, 2, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", Fluids.DIESEL, 64_000, 500, 50, 1).setThreshold(2F).setMod(0.7F) + dieselsuit_helmet = new ArmorDiesel(aMatDiesel, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", Fluids.DIESEL, 64_000, 500, 50, 1).setThreshold(2F).setMod(0.7F) .addEffect(new PotionEffect(Potion.moveSpeed.id, 20, 2)) .addEffect(new PotionEffect(Potion.jump.id, 20, 2)) .enableThermalSight(true) .enableVATS(true) .addResistance("fall", 0) .setUnlocalizedName("dieselsuit_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":dieselsuit_helmet"); - dieselsuit_plate = new ArmorDiesel(aMatDiesel, 2, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", Fluids.DIESEL, 64_000, 500, 50, 1).cloneStats((ArmorFSB) dieselsuit_helmet).setUnlocalizedName("dieselsuit_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":dieselsuit_plate"); - dieselsuit_legs = new ArmorDiesel(aMatDiesel, 2, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", Fluids.DIESEL, 64_000, 500, 50, 1).cloneStats((ArmorFSB) dieselsuit_helmet).setUnlocalizedName("dieselsuit_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":dieselsuit_legs"); - dieselsuit_boots = new ArmorDiesel(aMatDiesel, 2, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", Fluids.DIESEL, 64_000, 500, 50, 1).cloneStats((ArmorFSB) dieselsuit_helmet).setUnlocalizedName("dieselsuit_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":dieselsuit_boots"); + dieselsuit_plate = new ArmorDiesel(aMatDiesel, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", Fluids.DIESEL, 64_000, 500, 50, 1).cloneStats((ArmorFSB) dieselsuit_helmet).setUnlocalizedName("dieselsuit_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":dieselsuit_plate"); + dieselsuit_legs = new ArmorDiesel(aMatDiesel, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", Fluids.DIESEL, 64_000, 500, 50, 1).cloneStats((ArmorFSB) dieselsuit_helmet).setUnlocalizedName("dieselsuit_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":dieselsuit_legs"); + dieselsuit_boots = new ArmorDiesel(aMatDiesel, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", Fluids.DIESEL, 64_000, 500, 50, 1).cloneStats((ArmorFSB) dieselsuit_helmet).setUnlocalizedName("dieselsuit_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":dieselsuit_boots"); ArmorMaterial aMatAJR = EnumHelper.addArmorMaterial("HBM_T45AJR", 150, new int[] { 3, 8, 6, 3 }, 100); aMatAJR.customCraftingMaterial = ModItems.plate_armor_ajr; - ajr_helmet = new ArmorAJR(aMatAJR, 7, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).setMod(0.25F).setCap(6.0F).setThreshold(4F) + ajr_helmet = new ArmorAJR(aMatAJR, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).setMod(0.25F).setCap(6.0F).setThreshold(4F) .setFireproof(true) .enableVATS(true) .setHasGeigerSound(true) @@ -4947,11 +4947,11 @@ public class ModItems { .addResistance("fall", 0) .hides(EnumPlayerPart.HAT) .setUnlocalizedName("ajr_helmet").setTextureName(RefStrings.MODID + ":ajr_helmet"); - ajr_plate = new ArmorAJR(aMatAJR, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajr_helmet).setUnlocalizedName("ajr_plate").setTextureName(RefStrings.MODID + ":ajr_plate"); - ajr_legs = new ArmorAJR(aMatAJR, 7, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajr_helmet).setUnlocalizedName("ajr_legs").setTextureName(RefStrings.MODID + ":ajr_legs"); - ajr_boots = new ArmorAJR(aMatAJR, 7, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajr_helmet).setUnlocalizedName("ajr_boots").setTextureName(RefStrings.MODID + ":ajr_boots"); + ajr_plate = new ArmorAJR(aMatAJR, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajr_helmet).setUnlocalizedName("ajr_plate").setTextureName(RefStrings.MODID + ":ajr_plate"); + ajr_legs = new ArmorAJR(aMatAJR, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajr_helmet).setUnlocalizedName("ajr_legs").setTextureName(RefStrings.MODID + ":ajr_legs"); + ajr_boots = new ArmorAJR(aMatAJR, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajr_helmet).setUnlocalizedName("ajr_boots").setTextureName(RefStrings.MODID + ":ajr_boots"); - ajro_helmet = new ArmorAJRO(aMatAJR, 7, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).setMod(0.25F).setCap(6.0F).setThreshold(4F) + ajro_helmet = new ArmorAJRO(aMatAJR, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).setMod(0.25F).setCap(6.0F).setThreshold(4F) .setFireproof(true) .enableVATS(true) .setHasGeigerSound(true) @@ -4966,11 +4966,11 @@ public class ModItems { .addResistance("fall", 0) .hides(EnumPlayerPart.HAT) .setUnlocalizedName("ajro_helmet").setTextureName(RefStrings.MODID + ":ajro_helmet"); - ajro_plate = new ArmorAJRO(aMatAJR, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajro_helmet).setUnlocalizedName("ajro_plate").setTextureName(RefStrings.MODID + ":ajro_plate"); - ajro_legs = new ArmorAJRO(aMatAJR, 7, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajro_helmet).setUnlocalizedName("ajro_legs").setTextureName(RefStrings.MODID + ":ajro_legs"); - ajro_boots = new ArmorAJRO(aMatAJR, 7, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajro_helmet).setUnlocalizedName("ajro_boots").setTextureName(RefStrings.MODID + ":ajro_boots"); + ajro_plate = new ArmorAJRO(aMatAJR, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajro_helmet).setUnlocalizedName("ajro_plate").setTextureName(RefStrings.MODID + ":ajro_plate"); + ajro_legs = new ArmorAJRO(aMatAJR, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajro_helmet).setUnlocalizedName("ajro_legs").setTextureName(RefStrings.MODID + ":ajro_legs"); + ajro_boots = new ArmorAJRO(aMatAJR, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) ajro_helmet).setUnlocalizedName("ajro_boots").setTextureName(RefStrings.MODID + ":ajro_boots"); - rpa_helmet = new ArmorRPA(aMatAJR, 7, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).setMod(0.1F).setCap(6.0F).setThreshold(20F) + rpa_helmet = new ArmorRPA(aMatAJR, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).setMod(0.1F).setCap(6.0F).setThreshold(20F) .setFireproof(true) .enableVATS(true) .setHasGeigerSound(true) @@ -4985,13 +4985,13 @@ public class ModItems { .addResistance("fall", 0) .hides(EnumPlayerPart.HAT) .setUnlocalizedName("rpa_helmet").setTextureName(RefStrings.MODID + ":rpa_helmet"); - rpa_plate = new ArmorRPA(aMatAJR, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) rpa_helmet).setUnlocalizedName("rpa_plate").setTextureName(RefStrings.MODID + ":rpa_plate"); - rpa_legs = new ArmorRPA(aMatAJR, 7, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) rpa_helmet).setUnlocalizedName("rpa_legs").setTextureName(RefStrings.MODID + ":rpa_legs"); - rpa_boots = new ArmorRPA(aMatAJR, 7, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) rpa_helmet).setUnlocalizedName("rpa_boots").setTextureName(RefStrings.MODID + ":rpa_boots"); + rpa_plate = new ArmorRPA(aMatAJR, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) rpa_helmet).setUnlocalizedName("rpa_plate").setTextureName(RefStrings.MODID + ":rpa_plate"); + rpa_legs = new ArmorRPA(aMatAJR, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) rpa_helmet).setUnlocalizedName("rpa_legs").setTextureName(RefStrings.MODID + ":rpa_legs"); + rpa_boots = new ArmorRPA(aMatAJR, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 2500000, 10000, 2000, 25).cloneStats((ArmorFSB) rpa_helmet).setUnlocalizedName("rpa_boots").setTextureName(RefStrings.MODID + ":rpa_boots"); ArmorMaterial aMatBJ = EnumHelper.addArmorMaterial("HBM_BLACKJACK", 150, new int[] { 3, 8, 6, 3 }, 100); aMatBJ.customCraftingMaterial = ModItems.plate_armor_lunar; - bj_helmet = new ArmorBJ(aMatBJ, 7, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 1000, 100).setMod(0.25F).setCap(4.0F).setThreshold(4F) + bj_helmet = new ArmorBJ(aMatBJ, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 1000, 100).setMod(0.25F).setCap(4.0F).setThreshold(4F) .setFireproof(true) .enableVATS(true) .enableThermalSight(true) @@ -5007,14 +5007,14 @@ public class ModItems { .setJump("hbm:step.iron_jump") .setFall("hbm:step.iron_land") .addResistance("fall", 0).setUnlocalizedName("bj_helmet").setTextureName(RefStrings.MODID + ":bj_helmet"); - bj_plate = new ArmorBJ(aMatBJ, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 1000, 100).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_plate").setTextureName(RefStrings.MODID + ":bj_plate"); - bj_plate_jetpack = new ArmorBJJetpack(aMatBJ, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 1000, 100).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_plate_jetpack").setTextureName(RefStrings.MODID + ":bj_plate_jetpack"); - bj_legs = new ArmorBJ(aMatBJ, 7, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 10000000, 10000, 1000, 100).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_legs").setTextureName(RefStrings.MODID + ":bj_legs"); - bj_boots = new ArmorBJ(aMatBJ, 7, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 1000, 100).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_boots").setTextureName(RefStrings.MODID + ":bj_boots"); + bj_plate = new ArmorBJ(aMatBJ, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 1000, 100).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_plate").setTextureName(RefStrings.MODID + ":bj_plate"); + bj_plate_jetpack = new ArmorBJJetpack(aMatBJ, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 1000, 100).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_plate_jetpack").setTextureName(RefStrings.MODID + ":bj_plate_jetpack"); + bj_legs = new ArmorBJ(aMatBJ, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 10000000, 10000, 1000, 100).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_legs").setTextureName(RefStrings.MODID + ":bj_legs"); + bj_boots = new ArmorBJ(aMatBJ, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 1000, 100).cloneStats((ArmorFSB) bj_helmet).setUnlocalizedName("bj_boots").setTextureName(RefStrings.MODID + ":bj_boots"); ArmorMaterial aMatHEV = EnumHelper.addArmorMaterial("HBM_HEV", 150, new int[] { 3, 8, 6, 3 }, 100); aMatHEV.customCraftingMaterial = ModItems.plate_armor_hev; - hev_helmet = new ArmorHEV(aMatHEV, 7, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 1000000, 10000, 2500, 0).setMod(0.25F).setCap(4.0F).setThreshold(2.0F) + hev_helmet = new ArmorHEV(aMatHEV, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 1000000, 10000, 2500, 0).setMod(0.25F).setCap(4.0F).setThreshold(2.0F) .addEffect(new PotionEffect(Potion.moveSpeed.id, 20, 1)) .addEffect(new PotionEffect(Potion.jump.id, 20, 0)) .setBlastProtection(0.25F) @@ -5026,16 +5026,16 @@ public class ModItems { .addResistance("onFire", 0F) .hides(EnumPlayerPart.HAT) .setUnlocalizedName("hev_helmet").setTextureName(RefStrings.MODID + ":hev_helmet"); - hev_plate = new ArmorHEV(aMatHEV, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 1000000, 10000, 2500, 0).cloneStats((ArmorFSB) hev_helmet).setUnlocalizedName("hev_plate").setTextureName(RefStrings.MODID + ":hev_plate"); - hev_legs = new ArmorHEV(aMatHEV, 7, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 1000000, 10000, 2500, 0).cloneStats((ArmorFSB) hev_helmet).setUnlocalizedName("hev_legs").setTextureName(RefStrings.MODID + ":hev_legs"); - hev_boots = new ArmorHEV(aMatHEV, 7, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 1000000, 10000, 2500, 0).cloneStats((ArmorFSB) hev_helmet).setUnlocalizedName("hev_boots").setTextureName(RefStrings.MODID + ":hev_boots"); + hev_plate = new ArmorHEV(aMatHEV, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 1000000, 10000, 2500, 0).cloneStats((ArmorFSB) hev_helmet).setUnlocalizedName("hev_plate").setTextureName(RefStrings.MODID + ":hev_plate"); + hev_legs = new ArmorHEV(aMatHEV, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 1000000, 10000, 2500, 0).cloneStats((ArmorFSB) hev_helmet).setUnlocalizedName("hev_legs").setTextureName(RefStrings.MODID + ":hev_legs"); + hev_boots = new ArmorHEV(aMatHEV, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 1000000, 10000, 2500, 0).cloneStats((ArmorFSB) hev_helmet).setUnlocalizedName("hev_boots").setTextureName(RefStrings.MODID + ":hev_boots"); - jackt = new ModArmor(MainRegistry.aMatSteel, 7, 1).setUnlocalizedName("jackt").setTextureName(RefStrings.MODID + ":jackt"); - jackt2 = new ModArmor(MainRegistry.aMatSteel, 7, 1).setUnlocalizedName("jackt2").setTextureName(RefStrings.MODID + ":jackt2"); + jackt = new ModArmor(MainRegistry.aMatSteel, 1).setUnlocalizedName("jackt").setTextureName(RefStrings.MODID + ":jackt"); + jackt2 = new ModArmor(MainRegistry.aMatSteel, 1).setUnlocalizedName("jackt2").setTextureName(RefStrings.MODID + ":jackt2"); ArmorMaterial aMatFau = EnumHelper.addArmorMaterial("HBM_DIGAMMA", 150, new int[] { 3, 8, 6, 3 }, 100); aMatFau.customCraftingMaterial = ModItems.plate_armor_fau; - fau_helmet = new ArmorDigamma(aMatFau, 7, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 2500, 0).setMod(0.25F).setCap(4.0F).setThreshold(2.0F) + fau_helmet = new ArmorDigamma(aMatFau, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 2500, 0).setMod(0.25F).setCap(4.0F).setThreshold(2.0F) .addEffect(new PotionEffect(Potion.jump.id, 20, 1)) .setBlastProtection(0.05F) .setMod(0.05F) @@ -5051,13 +5051,13 @@ public class ModItems { .setFireproof(true) .hides(EnumPlayerPart.HAT) .setUnlocalizedName("fau_helmet").setTextureName(RefStrings.MODID + ":fau_helmet"); - fau_plate = new ArmorDigamma(aMatFau, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 2500, 0).cloneStats((ArmorFSB) fau_helmet).setFullSetForHide().setUnlocalizedName("fau_plate").setTextureName(RefStrings.MODID + ":fau_plate"); - fau_legs = new ArmorDigamma(aMatFau, 7, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 10000000, 10000, 2500, 0).cloneStats((ArmorFSB) fau_helmet).hides(EnumPlayerPart.LEFT_LEG, EnumPlayerPart.RIGHT_LEG).setFullSetForHide().setUnlocalizedName("fau_legs").setTextureName(RefStrings.MODID + ":fau_legs"); - fau_boots = new ArmorDigamma(aMatFau, 7, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 2500, 0).cloneStats((ArmorFSB) fau_helmet).setUnlocalizedName("fau_boots").setTextureName(RefStrings.MODID + ":fau_boots"); + fau_plate = new ArmorDigamma(aMatFau, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 2500, 0).cloneStats((ArmorFSB) fau_helmet).setFullSetForHide().setUnlocalizedName("fau_plate").setTextureName(RefStrings.MODID + ":fau_plate"); + fau_legs = new ArmorDigamma(aMatFau, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 10000000, 10000, 2500, 0).cloneStats((ArmorFSB) fau_helmet).hides(EnumPlayerPart.LEFT_LEG, EnumPlayerPart.RIGHT_LEG).setFullSetForHide().setUnlocalizedName("fau_legs").setTextureName(RefStrings.MODID + ":fau_legs"); + fau_boots = new ArmorDigamma(aMatFau, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 10000000, 10000, 2500, 0).cloneStats((ArmorFSB) fau_helmet).setUnlocalizedName("fau_boots").setTextureName(RefStrings.MODID + ":fau_boots"); ArmorMaterial aMatDNS = EnumHelper.addArmorMaterial("HBM_DNT_NANO", 150, new int[] { 3, 8, 6, 3 }, 100); aMatDNS.customCraftingMaterial = ModItems.plate_armor_dnt; - dns_helmet = new ArmorDNT(aMatDNS, 7, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 1000000000, 1000000, 100000, 115) + dns_helmet = new ArmorDNT(aMatDNS, 0, RefStrings.MODID + ":textures/armor/starmetal_1.png", 1000000000, 1000000, 100000, 115) .addEffect(new PotionEffect(Potion.damageBoost.id, 20, 9)) .addEffect(new PotionEffect(Potion.digSpeed.id, 20, 7)) .addEffect(new PotionEffect(Potion.jump.id, 20, 2)) @@ -5071,12 +5071,12 @@ public class ModItems { .setFireproof(true) .hides(EnumPlayerPart.HAT) .setUnlocalizedName("dns_helmet").setTextureName(RefStrings.MODID + ":dns_helmet"); - dns_plate = new ArmorDNT(aMatDNS, 7, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 1000000000, 1000000, 100000, 115).cloneStats((ArmorFSB) dns_helmet).setUnlocalizedName("dns_plate").setTextureName(RefStrings.MODID + ":dns_plate"); - dns_legs = new ArmorDNT(aMatDNS, 7, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 1000000000, 1000000, 100000, 115).cloneStats((ArmorFSB) dns_helmet).setUnlocalizedName("dns_legs").setTextureName(RefStrings.MODID + ":dns_legs"); - dns_boots = new ArmorDNT(aMatDNS, 7, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 1000000000, 1000000, 100000, 115).cloneStats((ArmorFSB) dns_helmet).setUnlocalizedName("dns_boots").setTextureName(RefStrings.MODID + ":dns_boots"); + dns_plate = new ArmorDNT(aMatDNS, 1, RefStrings.MODID + ":textures/armor/starmetal_1.png", 1000000000, 1000000, 100000, 115).cloneStats((ArmorFSB) dns_helmet).setUnlocalizedName("dns_plate").setTextureName(RefStrings.MODID + ":dns_plate"); + dns_legs = new ArmorDNT(aMatDNS, 2, RefStrings.MODID + ":textures/armor/starmetal_2.png", 1000000000, 1000000, 100000, 115).cloneStats((ArmorFSB) dns_helmet).setUnlocalizedName("dns_legs").setTextureName(RefStrings.MODID + ":dns_legs"); + dns_boots = new ArmorDNT(aMatDNS, 3, RefStrings.MODID + ":textures/armor/starmetal_1.png", 1000000000, 1000000, 100000, 115).cloneStats((ArmorFSB) dns_helmet).setUnlocalizedName("dns_boots").setTextureName(RefStrings.MODID + ":dns_boots"); - jackt = new ModArmor(MainRegistry.aMatSteel, 7, 1).setUnlocalizedName("jackt").setTextureName(RefStrings.MODID + ":jackt"); - jackt2 = new ModArmor(MainRegistry.aMatSteel, 7, 1).setUnlocalizedName("jackt2").setTextureName(RefStrings.MODID + ":jackt2"); + jackt = new ModArmor(MainRegistry.aMatSteel, 1).setUnlocalizedName("jackt").setTextureName(RefStrings.MODID + ":jackt"); + jackt2 = new ModArmor(MainRegistry.aMatSteel, 1).setUnlocalizedName("jackt2").setTextureName(RefStrings.MODID + ":jackt2"); chainsaw = new ItemChainsaw(25, -0.05, MainRegistry.tMatChainsaw, EnumToolType.AXE, 5000, 1, 250, Fluids.DIESEL, Fluids.DIESEL_CRACK, Fluids.KEROSENE, Fluids.BIOFUEL, Fluids.GASOLINE, Fluids.GASOLINE_LEADED, Fluids.PETROIL, Fluids.PETROIL_LEADED, Fluids.COALGAS, Fluids.COALGAS_LEADED) @@ -5387,41 +5387,41 @@ public class ModItems { meteorite_sword_fused = new ItemSwordMeteorite(250F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_fused").setTextureName(RefStrings.MODID + ":meteorite_sword"); meteorite_sword_baleful = new ItemSwordMeteorite(500F, 0, matMeteorite).setUnlocalizedName("meteorite_sword_baleful").setTextureName(RefStrings.MODID + ":meteorite_sword"); - mask_of_infamy = new MaskOfInfamy(ArmorMaterial.IRON, 8, 0).setUnlocalizedName("mask_of_infamy").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mask_of_infamy"); + mask_of_infamy = new MaskOfInfamy(ArmorMaterial.IRON, 0).setUnlocalizedName("mask_of_infamy").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":mask_of_infamy"); - hazmat_helmet = new ArmorHazmatMask(MainRegistry.aMatHaz, 9, 0, RefStrings.MODID + ":textures/armor/hazmat_1.png").setUnlocalizedName("hazmat_helmet").setTextureName(RefStrings.MODID + ":hazmat_helmet"); - hazmat_plate = new ArmorHazmat(MainRegistry.aMatHaz, 9, 1, RefStrings.MODID + ":textures/armor/hazmat_1.png").setUnlocalizedName("hazmat_plate").setTextureName(RefStrings.MODID + ":hazmat_plate"); - hazmat_legs = new ArmorHazmat(MainRegistry.aMatHaz, 9, 2, RefStrings.MODID + ":textures/armor/hazmat_2.png").setUnlocalizedName("hazmat_legs").setTextureName(RefStrings.MODID + ":hazmat_legs"); - hazmat_boots = new ArmorHazmat(MainRegistry.aMatHaz, 9, 3, RefStrings.MODID + ":textures/armor/hazmat_1.png").setUnlocalizedName("hazmat_boots").setTextureName(RefStrings.MODID + ":hazmat_boots"); - hazmat_helmet_red = new ArmorHazmatMask(MainRegistry.aMatHaz2, 9, 0, "hbm:textures/models/ModelHazRed.png").setUnlocalizedName("hazmat_helmet_red").setTextureName(RefStrings.MODID + ":hazmat_helmet_red"); - hazmat_plate_red = new ArmorHazmat(MainRegistry.aMatHaz2, 9, 1, RefStrings.MODID + ":textures/armor/hazmat_1_red.png").setUnlocalizedName("hazmat_plate_red").setTextureName(RefStrings.MODID + ":hazmat_plate_red"); - hazmat_legs_red = new ArmorHazmat(MainRegistry.aMatHaz2, 9, 2, RefStrings.MODID + ":textures/armor/hazmat_2_red.png").setUnlocalizedName("hazmat_legs_red").setTextureName(RefStrings.MODID + ":hazmat_legs_red"); - hazmat_boots_red = new ArmorHazmat(MainRegistry.aMatHaz2, 9, 3, RefStrings.MODID + ":textures/armor/hazmat_1_red.png").setUnlocalizedName("hazmat_boots_red").setTextureName(RefStrings.MODID + ":hazmat_boots_red"); - hazmat_helmet_grey = new ArmorHazmatMask(MainRegistry.aMatHaz3, 9, 0, "hbm:textures/models/ModelHazGrey.png") + hazmat_helmet = new ArmorHazmatMask(MainRegistry.aMatHaz, 0, RefStrings.MODID + ":textures/armor/hazmat_1.png").setUnlocalizedName("hazmat_helmet").setTextureName(RefStrings.MODID + ":hazmat_helmet"); + hazmat_plate = new ArmorHazmat(MainRegistry.aMatHaz, 1, RefStrings.MODID + ":textures/armor/hazmat_1.png").setUnlocalizedName("hazmat_plate").setTextureName(RefStrings.MODID + ":hazmat_plate"); + hazmat_legs = new ArmorHazmat(MainRegistry.aMatHaz, 2, RefStrings.MODID + ":textures/armor/hazmat_2.png").setUnlocalizedName("hazmat_legs").setTextureName(RefStrings.MODID + ":hazmat_legs"); + hazmat_boots = new ArmorHazmat(MainRegistry.aMatHaz, 3, RefStrings.MODID + ":textures/armor/hazmat_1.png").setUnlocalizedName("hazmat_boots").setTextureName(RefStrings.MODID + ":hazmat_boots"); + hazmat_helmet_red = new ArmorHazmatMask(MainRegistry.aMatHaz2, 0, "hbm:textures/models/ModelHazRed.png").setUnlocalizedName("hazmat_helmet_red").setTextureName(RefStrings.MODID + ":hazmat_helmet_red"); + hazmat_plate_red = new ArmorHazmat(MainRegistry.aMatHaz2, 1, RefStrings.MODID + ":textures/armor/hazmat_1_red.png").setUnlocalizedName("hazmat_plate_red").setTextureName(RefStrings.MODID + ":hazmat_plate_red"); + hazmat_legs_red = new ArmorHazmat(MainRegistry.aMatHaz2, 2, RefStrings.MODID + ":textures/armor/hazmat_2_red.png").setUnlocalizedName("hazmat_legs_red").setTextureName(RefStrings.MODID + ":hazmat_legs_red"); + hazmat_boots_red = new ArmorHazmat(MainRegistry.aMatHaz2, 3, RefStrings.MODID + ":textures/armor/hazmat_1_red.png").setUnlocalizedName("hazmat_boots_red").setTextureName(RefStrings.MODID + ":hazmat_boots_red"); + hazmat_helmet_grey = new ArmorHazmatMask(MainRegistry.aMatHaz3, 0, "hbm:textures/models/ModelHazGrey.png") .setFireproof(true).setUnlocalizedName("hazmat_helmet_grey").setTextureName(RefStrings.MODID + ":hazmat_helmet_grey"); - hazmat_plate_grey = new ArmorHazmat(MainRegistry.aMatHaz3, 9, 1, RefStrings.MODID + ":textures/armor/hazmat_1_grey.png").cloneStats((ArmorFSB) hazmat_helmet_grey).setUnlocalizedName("hazmat_plate_grey").setTextureName(RefStrings.MODID + ":hazmat_plate_grey"); - hazmat_legs_grey = new ArmorHazmat(MainRegistry.aMatHaz3, 9, 2, RefStrings.MODID + ":textures/armor/hazmat_2_grey.png").cloneStats((ArmorFSB) hazmat_helmet_grey).setUnlocalizedName("hazmat_legs_grey").setTextureName(RefStrings.MODID + ":hazmat_legs_grey"); - hazmat_boots_grey = new ArmorHazmat(MainRegistry.aMatHaz3, 9, 3, RefStrings.MODID + ":textures/armor/hazmat_1_grey.png").cloneStats((ArmorFSB) hazmat_helmet_grey).setUnlocalizedName("hazmat_boots_grey").setTextureName(RefStrings.MODID + ":hazmat_boots_grey"); - hazmat_paa_helmet = new ArmorHazmatMask(MainRegistry.aMatPaa, 9, 0, RefStrings.MODID + ":textures/armor/hazmat_paa_1.png") + hazmat_plate_grey = new ArmorHazmat(MainRegistry.aMatHaz3, 1, RefStrings.MODID + ":textures/armor/hazmat_1_grey.png").cloneStats((ArmorFSB) hazmat_helmet_grey).setUnlocalizedName("hazmat_plate_grey").setTextureName(RefStrings.MODID + ":hazmat_plate_grey"); + hazmat_legs_grey = new ArmorHazmat(MainRegistry.aMatHaz3, 2, RefStrings.MODID + ":textures/armor/hazmat_2_grey.png").cloneStats((ArmorFSB) hazmat_helmet_grey).setUnlocalizedName("hazmat_legs_grey").setTextureName(RefStrings.MODID + ":hazmat_legs_grey"); + hazmat_boots_grey = new ArmorHazmat(MainRegistry.aMatHaz3, 3, RefStrings.MODID + ":textures/armor/hazmat_1_grey.png").cloneStats((ArmorFSB) hazmat_helmet_grey).setUnlocalizedName("hazmat_boots_grey").setTextureName(RefStrings.MODID + ":hazmat_boots_grey"); + hazmat_paa_helmet = new ArmorHazmatMask(MainRegistry.aMatPaa, 0, RefStrings.MODID + ":textures/armor/hazmat_paa_1.png") .setFireproof(true).setUnlocalizedName("hazmat_paa_helmet").setTextureName(RefStrings.MODID + ":hazmat_paa_helmet"); - hazmat_paa_plate = new ArmorHazmat(MainRegistry.aMatPaa, 9, 1, RefStrings.MODID + ":textures/armor/hazmat_paa_1.png").cloneStats((ArmorFSB) hazmat_paa_helmet).setUnlocalizedName("hazmat_paa_plate").setTextureName(RefStrings.MODID + ":hazmat_paa_plate"); - hazmat_paa_legs = new ArmorHazmat(MainRegistry.aMatPaa, 9, 2, RefStrings.MODID + ":textures/armor/hazmat_paa_2.png").cloneStats((ArmorFSB) hazmat_paa_helmet).setUnlocalizedName("hazmat_paa_legs").setTextureName(RefStrings.MODID + ":hazmat_paa_legs"); - hazmat_paa_boots = new ArmorHazmat(MainRegistry.aMatPaa, 9, 3, RefStrings.MODID + ":textures/armor/hazmat_paa_1.png").cloneStats((ArmorFSB) hazmat_paa_helmet).setUnlocalizedName("hazmat_paa_boots").setTextureName(RefStrings.MODID + ":hazmat_paa_boots"); + hazmat_paa_plate = new ArmorHazmat(MainRegistry.aMatPaa, 1, RefStrings.MODID + ":textures/armor/hazmat_paa_1.png").cloneStats((ArmorFSB) hazmat_paa_helmet).setUnlocalizedName("hazmat_paa_plate").setTextureName(RefStrings.MODID + ":hazmat_paa_plate"); + hazmat_paa_legs = new ArmorHazmat(MainRegistry.aMatPaa, 2, RefStrings.MODID + ":textures/armor/hazmat_paa_2.png").cloneStats((ArmorFSB) hazmat_paa_helmet).setUnlocalizedName("hazmat_paa_legs").setTextureName(RefStrings.MODID + ":hazmat_paa_legs"); + hazmat_paa_boots = new ArmorHazmat(MainRegistry.aMatPaa, 3, RefStrings.MODID + ":textures/armor/hazmat_paa_1.png").cloneStats((ArmorFSB) hazmat_paa_helmet).setUnlocalizedName("hazmat_paa_boots").setTextureName(RefStrings.MODID + ":hazmat_paa_boots"); ArmorMaterial aMatLiquidator = EnumHelper.addArmorMaterial("HBM_LIQUIDATOR", 750, new int[] { 3, 8, 6, 3 }, 10); aMatLiquidator.customCraftingMaterial = ModItems.plate_lead; - liquidator_helmet = new ArmorLiquidatorMask(aMatLiquidator, 9, 0, RefStrings.MODID + ":textures/armor/liquidator_helmet.png") + liquidator_helmet = new ArmorLiquidatorMask(aMatLiquidator, 0, RefStrings.MODID + ":textures/armor/liquidator_helmet.png") .setThreshold(1.0F) .setBlastProtection(0.25F) .setFireproof(true) .setStep("hbm:step.metal") .setJump("hbm:step.iron_jump") .setFall("hbm:step.iron_land").setUnlocalizedName("liquidator_helmet").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":liquidator_helmet"); - liquidator_plate = new ArmorLiquidator(aMatLiquidator, 9, 1, RefStrings.MODID + ":textures/armor/liquidator_1.png").cloneStats((ArmorFSB) liquidator_helmet).setUnlocalizedName("liquidator_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":liquidator_plate"); - liquidator_legs = new ArmorLiquidator(aMatLiquidator, 9, 2, RefStrings.MODID + ":textures/armor/liquidator_2.png").cloneStats((ArmorFSB) liquidator_helmet).setUnlocalizedName("liquidator_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":liquidator_legs"); - liquidator_boots = new ArmorLiquidator(aMatLiquidator, 9, 3, RefStrings.MODID + ":textures/armor/liquidator_1.png").cloneStats((ArmorFSB) liquidator_helmet).setUnlocalizedName("liquidator_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":liquidator_boots"); + liquidator_plate = new ArmorLiquidator(aMatLiquidator, 1, RefStrings.MODID + ":textures/armor/liquidator_1.png").cloneStats((ArmorFSB) liquidator_helmet).setUnlocalizedName("liquidator_plate").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":liquidator_plate"); + liquidator_legs = new ArmorLiquidator(aMatLiquidator, 2, RefStrings.MODID + ":textures/armor/liquidator_2.png").cloneStats((ArmorFSB) liquidator_helmet).setUnlocalizedName("liquidator_legs").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":liquidator_legs"); + liquidator_boots = new ArmorLiquidator(aMatLiquidator, 3, RefStrings.MODID + ":textures/armor/liquidator_1.png").cloneStats((ArmorFSB) liquidator_helmet).setUnlocalizedName("liquidator_boots").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":liquidator_boots"); - australium_iii = new ArmorAustralium(MainRegistry.aMatAus3, 9, 1).setUnlocalizedName("australium_iii").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_iii"); + australium_iii = new ArmorAustralium(MainRegistry.aMatAus3, 1).setUnlocalizedName("australium_iii").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_iii"); jetpack_boost = new JetpackBooster(Fluids.BALEFIRE, 32000).setUnlocalizedName("jetpack_boost").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_boost"); jetpack_break = new JetpackBreak(Fluids.KEROSENE, 12000).setUnlocalizedName("jetpack_break").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_break"); @@ -5430,11 +5430,11 @@ public class ModItems { wings_murk = new WingsMurk(MainRegistry.aMatCobalt).setUnlocalizedName("wings_murk").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wings_murk"); wings_limp = new WingsMurk(MainRegistry.aMatCobalt).setUnlocalizedName("wings_limp").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wings_limp"); - cape_test = new ArmorModel(MainRegistry.enumArmorMaterialEmerald, 9, 1).setUnlocalizedName("cape_test").setCreativeTab(null).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_test"); - cape_radiation = new ArmorModel(ArmorMaterial.CHAIN, 9, 1).setUnlocalizedName("cape_radiation").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_radiation"); - cape_gasmask = new ArmorModel(ArmorMaterial.CHAIN, 9, 1).setUnlocalizedName("cape_gasmask").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_gasmask"); - cape_schrabidium = new ArmorModel(MainRegistry.aMatSchrab, 9, 1).setUnlocalizedName("cape_schrabidium").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_schrabidium"); - cape_hidden = new ArmorModel(ArmorMaterial.CHAIN, 9, 1).setUnlocalizedName("cape_hidden").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_unknown"); + cape_test = new ArmorModel(MainRegistry.enumArmorMaterialEmerald, 1).setUnlocalizedName("cape_test").setCreativeTab(null).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_test"); + cape_radiation = new ArmorModel(ArmorMaterial.CHAIN, 1).setUnlocalizedName("cape_radiation").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_radiation"); + cape_gasmask = new ArmorModel(ArmorMaterial.CHAIN, 1).setUnlocalizedName("cape_gasmask").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_gasmask"); + cape_schrabidium = new ArmorModel(MainRegistry.aMatSchrab, 1).setUnlocalizedName("cape_schrabidium").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_schrabidium"); + cape_hidden = new ArmorModel(ArmorMaterial.CHAIN, 1).setUnlocalizedName("cape_hidden").setCreativeTab(MainRegistry.consumableTab).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":cape_unknown"); schrabidium_hammer = new WeaponSpecial(MainRegistry.tMatHammmer).setUnlocalizedName("schrabidium_hammer").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":schrabidium_hammer"); shimmer_sledge = new WeaponSpecial(MainRegistry.enumToolMaterialSledge).setUnlocalizedName("shimmer_sledge").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":shimmer_sledge_original"); diff --git a/src/main/java/com/hbm/items/armor/ArmorAJR.java b/src/main/java/com/hbm/items/armor/ArmorAJR.java index d037e9da2..ae4af265a 100644 --- a/src/main/java/com/hbm/items/armor/ArmorAJR.java +++ b/src/main/java/com/hbm/items/armor/ArmorAJR.java @@ -10,8 +10,8 @@ import net.minecraft.item.ItemStack; public class ArmorAJR extends ArmorFSBPowered { - public ArmorAJR(ArmorMaterial material, int layer, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { - super(material, layer, slot, texture, maxPower, chargeRate, consumption, drain); + public ArmorAJR(ArmorMaterial material, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { + super(material, slot, texture, maxPower, chargeRate, consumption, drain); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/items/armor/ArmorAJRO.java b/src/main/java/com/hbm/items/armor/ArmorAJRO.java index e44aeef0f..a3425fdc3 100644 --- a/src/main/java/com/hbm/items/armor/ArmorAJRO.java +++ b/src/main/java/com/hbm/items/armor/ArmorAJRO.java @@ -10,8 +10,8 @@ import net.minecraft.item.ItemStack; public class ArmorAJRO extends ArmorFSBPowered { - public ArmorAJRO(ArmorMaterial material, int layer, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { - super(material, layer, slot, texture, maxPower, chargeRate, consumption, drain); + public ArmorAJRO(ArmorMaterial material, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { + super(material, slot, texture, maxPower, chargeRate, consumption, drain); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/items/armor/ArmorAsbestos.java b/src/main/java/com/hbm/items/armor/ArmorAsbestos.java index f2b750cec..e0d916bb0 100644 --- a/src/main/java/com/hbm/items/armor/ArmorAsbestos.java +++ b/src/main/java/com/hbm/items/armor/ArmorAsbestos.java @@ -27,8 +27,8 @@ public class ArmorAsbestos extends ItemArmor implements ISpecialArmor { private ResourceLocation asbestosBlur = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_asbestos.png"); - public ArmorAsbestos(ArmorMaterial armorMaterial, int renderIndex, int armorType) { - super(armorMaterial, renderIndex, armorType); + public ArmorAsbestos(ArmorMaterial armorMaterial, int armorType) { + super(armorMaterial, 0, armorType); } @Override diff --git a/src/main/java/com/hbm/items/armor/ArmorAshGlasses.java b/src/main/java/com/hbm/items/armor/ArmorAshGlasses.java index 6cbd7e639..9a1fc9e78 100644 --- a/src/main/java/com/hbm/items/armor/ArmorAshGlasses.java +++ b/src/main/java/com/hbm/items/armor/ArmorAshGlasses.java @@ -14,8 +14,8 @@ public class ArmorAshGlasses extends ItemArmor { @SideOnly(Side.CLIENT) private ModelGlasses modelGoggles; - public ArmorAshGlasses(ArmorMaterial armorMaterial, int renderIndex, int armorType) { - super(armorMaterial, renderIndex, armorType); + public ArmorAshGlasses(ArmorMaterial armorMaterial, int armorType) { + super(armorMaterial, 0, armorType); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/items/armor/ArmorAustralium.java b/src/main/java/com/hbm/items/armor/ArmorAustralium.java index d80382cee..b5a681561 100644 --- a/src/main/java/com/hbm/items/armor/ArmorAustralium.java +++ b/src/main/java/com/hbm/items/armor/ArmorAustralium.java @@ -18,8 +18,8 @@ public class ArmorAustralium extends ItemArmor { Random rand = new Random(); - public ArmorAustralium(ArmorMaterial armorMaterial, int renderIndex, int armorType) { - super(armorMaterial, renderIndex, armorType); + public ArmorAustralium(ArmorMaterial armorMaterial, int armorType) { + super(armorMaterial, 0, armorType); } @Override diff --git a/src/main/java/com/hbm/items/armor/ArmorBJ.java b/src/main/java/com/hbm/items/armor/ArmorBJ.java index e9c8c29fd..5c2cc6353 100644 --- a/src/main/java/com/hbm/items/armor/ArmorBJ.java +++ b/src/main/java/com/hbm/items/armor/ArmorBJ.java @@ -14,8 +14,8 @@ import net.minecraft.world.World; public class ArmorBJ extends ArmorFSBPowered { - public ArmorBJ(ArmorMaterial material, int layer, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { - super(material, layer, slot, texture, maxPower, chargeRate, consumption, drain); + public ArmorBJ(ArmorMaterial material, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { + super(material, slot, texture, maxPower, chargeRate, consumption, drain); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/items/armor/ArmorBJJetpack.java b/src/main/java/com/hbm/items/armor/ArmorBJJetpack.java index 24f5850f3..93f8d34a3 100644 --- a/src/main/java/com/hbm/items/armor/ArmorBJJetpack.java +++ b/src/main/java/com/hbm/items/armor/ArmorBJJetpack.java @@ -23,8 +23,8 @@ import net.minecraft.world.World; public class ArmorBJJetpack extends ArmorBJ { - public ArmorBJJetpack(ArmorMaterial material, int layer, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { - super(material, layer, slot, texture, maxPower, chargeRate, consumption, drain); + public ArmorBJJetpack(ArmorMaterial material, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { + super(material, slot, texture, maxPower, chargeRate, consumption, drain); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/items/armor/ArmorBismuth.java b/src/main/java/com/hbm/items/armor/ArmorBismuth.java index 418d657fa..6906ab0a9 100644 --- a/src/main/java/com/hbm/items/armor/ArmorBismuth.java +++ b/src/main/java/com/hbm/items/armor/ArmorBismuth.java @@ -9,8 +9,8 @@ import net.minecraft.item.ItemStack; public class ArmorBismuth extends ArmorFSB { - public ArmorBismuth(ArmorMaterial material, int layer, int slot, String texture) { - super(material, layer, slot, texture); + public ArmorBismuth(ArmorMaterial material, int slot, String texture) { + super(material, slot, texture); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/items/armor/ArmorDNT.java b/src/main/java/com/hbm/items/armor/ArmorDNT.java index d22034e78..068ae49f1 100644 --- a/src/main/java/com/hbm/items/armor/ArmorDNT.java +++ b/src/main/java/com/hbm/items/armor/ArmorDNT.java @@ -33,8 +33,8 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent; public class ArmorDNT extends ArmorFSBPowered { - public ArmorDNT(ArmorMaterial material, int layer, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { - super(material, layer, slot, texture, maxPower, chargeRate, consumption, drain); + public ArmorDNT(ArmorMaterial material, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { + super(material, slot, texture, maxPower, chargeRate, consumption, drain); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/items/armor/ArmorDesh.java b/src/main/java/com/hbm/items/armor/ArmorDesh.java index 955997115..c7ec38d1f 100644 --- a/src/main/java/com/hbm/items/armor/ArmorDesh.java +++ b/src/main/java/com/hbm/items/armor/ArmorDesh.java @@ -16,8 +16,8 @@ import net.minecraft.item.ItemStack; public class ArmorDesh extends ArmorFSBFueled { - public ArmorDesh(ArmorMaterial material, int layer, int slot, String texture, FluidType fuelType, int maxFuel, int fillRate, int consumption, int drain) { - super(material, layer, slot, texture, fuelType, maxFuel, fillRate, consumption, drain); + public ArmorDesh(ArmorMaterial material, int slot, String texture, FluidType fuelType, int maxFuel, int fillRate, int consumption, int drain) { + super(material, slot, texture, fuelType, maxFuel, fillRate, consumption, drain); } @Override diff --git a/src/main/java/com/hbm/items/armor/ArmorDiesel.java b/src/main/java/com/hbm/items/armor/ArmorDiesel.java index fa133eaf6..e42510fc3 100644 --- a/src/main/java/com/hbm/items/armor/ArmorDiesel.java +++ b/src/main/java/com/hbm/items/armor/ArmorDiesel.java @@ -24,8 +24,8 @@ import net.minecraft.world.World; public class ArmorDiesel extends ArmorFSBFueled { - public ArmorDiesel(ArmorMaterial material, int layer, int slot, String texture, FluidType fuelType, int maxFuel, int fillRate, int consumption, int drain) { - super(material, layer, slot, texture, fuelType, maxFuel, fillRate, consumption, drain); + public ArmorDiesel(ArmorMaterial material, int slot, String texture, FluidType fuelType, int maxFuel, int fillRate, int consumption, int drain) { + super(material, slot, texture, fuelType, maxFuel, fillRate, consumption, drain); } @Override diff --git a/src/main/java/com/hbm/items/armor/ArmorDigamma.java b/src/main/java/com/hbm/items/armor/ArmorDigamma.java index f5c322235..89ad09e1d 100644 --- a/src/main/java/com/hbm/items/armor/ArmorDigamma.java +++ b/src/main/java/com/hbm/items/armor/ArmorDigamma.java @@ -10,8 +10,8 @@ import net.minecraft.item.ItemStack; public class ArmorDigamma extends ArmorFSBPowered { - public ArmorDigamma(ArmorMaterial material, int layer, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { - super(material, layer, slot, texture, maxPower, chargeRate, consumption, drain); + public ArmorDigamma(ArmorMaterial material, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { + super(material, slot, texture, maxPower, chargeRate, consumption, drain); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/items/armor/ArmorEuphemium.java b/src/main/java/com/hbm/items/armor/ArmorEuphemium.java index 76b9f5daa..54ebcb13a 100644 --- a/src/main/java/com/hbm/items/armor/ArmorEuphemium.java +++ b/src/main/java/com/hbm/items/armor/ArmorEuphemium.java @@ -15,8 +15,8 @@ import com.hbm.util.ArmorUtil; public class ArmorEuphemium extends ItemArmor { - public ArmorEuphemium(ArmorMaterial armorMaterial, int renderIndex, int armorType) { - super(armorMaterial, renderIndex, armorType); + public ArmorEuphemium(ArmorMaterial armorMaterial, int armorType) { + super(armorMaterial, 0, armorType); this.setCreativeTab(null); } diff --git a/src/main/java/com/hbm/items/armor/ArmorFSB.java b/src/main/java/com/hbm/items/armor/ArmorFSB.java index 73f20974c..4e2e60571 100644 --- a/src/main/java/com/hbm/items/armor/ArmorFSB.java +++ b/src/main/java/com/hbm/items/armor/ArmorFSB.java @@ -69,8 +69,8 @@ public class ArmorFSB extends ItemArmor implements IArmorDisableModel { public String jump; public String fall; - public ArmorFSB(ArmorMaterial material, int layer, int slot, String texture) { - super(material, layer, slot); + public ArmorFSB(ArmorMaterial material, int slot, String texture) { + super(material, 0, slot); this.texture = texture; } diff --git a/src/main/java/com/hbm/items/armor/ArmorFSBFueled.java b/src/main/java/com/hbm/items/armor/ArmorFSBFueled.java index 5f444165e..4988f6234 100644 --- a/src/main/java/com/hbm/items/armor/ArmorFSBFueled.java +++ b/src/main/java/com/hbm/items/armor/ArmorFSBFueled.java @@ -22,8 +22,8 @@ public class ArmorFSBFueled extends ArmorFSB implements IFillableItem { public int consumption; public int drain; - public ArmorFSBFueled(ArmorMaterial material, int layer, int slot, String texture, FluidType fuelType, int maxFuel, int fillRate, int consumption, int drain) { - super(material, layer, slot, texture); + public ArmorFSBFueled(ArmorMaterial material, int slot, String texture, FluidType fuelType, int maxFuel, int fillRate, int consumption, int drain) { + super(material, slot, texture); this.fuelType = fuelType; this.fillRate = fillRate; this.consumption = consumption; diff --git a/src/main/java/com/hbm/items/armor/ArmorFSBPowered.java b/src/main/java/com/hbm/items/armor/ArmorFSBPowered.java index e85d2959f..139df77fe 100644 --- a/src/main/java/com/hbm/items/armor/ArmorFSBPowered.java +++ b/src/main/java/com/hbm/items/armor/ArmorFSBPowered.java @@ -19,8 +19,8 @@ public class ArmorFSBPowered extends ArmorFSB implements IBatteryItem { public long consumption; public long drain; - public ArmorFSBPowered(ArmorMaterial material, int layer, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { - super(material, layer, slot, texture); + public ArmorFSBPowered(ArmorMaterial material, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { + super(material, slot, texture); this.maxPower = maxPower; this.chargeRate = chargeRate; this.consumption = consumption; diff --git a/src/main/java/com/hbm/items/armor/ArmorGasMask.java b/src/main/java/com/hbm/items/armor/ArmorGasMask.java index c332a565a..5cb086925 100644 --- a/src/main/java/com/hbm/items/armor/ArmorGasMask.java +++ b/src/main/java/com/hbm/items/armor/ArmorGasMask.java @@ -57,7 +57,7 @@ public class ArmorGasMask extends ItemArmor implements IGasMask { }; public ArmorGasMask() { - super(ArmorMaterial.IRON, 7, 0); + super(ArmorMaterial.IRON, 0, 0); } @Override diff --git a/src/main/java/com/hbm/items/armor/ArmorHEV.java b/src/main/java/com/hbm/items/armor/ArmorHEV.java index f0c3dfddf..b1fd292db 100644 --- a/src/main/java/com/hbm/items/armor/ArmorHEV.java +++ b/src/main/java/com/hbm/items/armor/ArmorHEV.java @@ -20,8 +20,8 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; public class ArmorHEV extends ArmorFSBPowered { - public ArmorHEV(ArmorMaterial material, int layer, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { - super(material, layer, slot, texture, maxPower, chargeRate, consumption, drain); + public ArmorHEV(ArmorMaterial material, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { + super(material, slot, texture, maxPower, chargeRate, consumption, drain); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/items/armor/ArmorHat.java b/src/main/java/com/hbm/items/armor/ArmorHat.java index b76fbe16b..65cd6c87e 100644 --- a/src/main/java/com/hbm/items/armor/ArmorHat.java +++ b/src/main/java/com/hbm/items/armor/ArmorHat.java @@ -11,8 +11,8 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent; public class ArmorHat extends ArmorModel implements IAttackHandler, IDamageHandler { - public ArmorHat(ArmorMaterial armorMaterial, int renderIndex, int armorType) { - super(armorMaterial, renderIndex, armorType); + public ArmorHat(ArmorMaterial armorMaterial, int armorType) { + super(armorMaterial, armorType); } @Override diff --git a/src/main/java/com/hbm/items/armor/ArmorHazmat.java b/src/main/java/com/hbm/items/armor/ArmorHazmat.java index 5ef7f722f..b432cd3ce 100644 --- a/src/main/java/com/hbm/items/armor/ArmorHazmat.java +++ b/src/main/java/com/hbm/items/armor/ArmorHazmat.java @@ -19,8 +19,8 @@ public class ArmorHazmat extends ArmorFSB { private ResourceLocation hazmatBlur = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_hazmat.png"); - public ArmorHazmat(ArmorMaterial material, int layer, int slot, String texture) { - super(material, layer, slot, texture); + public ArmorHazmat(ArmorMaterial material, int slot, String texture) { + super(material, slot, texture); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/items/armor/ArmorHazmatMask.java b/src/main/java/com/hbm/items/armor/ArmorHazmatMask.java index 388f90d1c..e443885aa 100644 --- a/src/main/java/com/hbm/items/armor/ArmorHazmatMask.java +++ b/src/main/java/com/hbm/items/armor/ArmorHazmatMask.java @@ -22,8 +22,8 @@ public class ArmorHazmatMask extends ArmorHazmat implements IGasMask { @SideOnly(Side.CLIENT) private ModelM65 modelM65; - public ArmorHazmatMask(ArmorMaterial material, int layer, int slot, String texture) { - super(material, layer, slot, texture); + public ArmorHazmatMask(ArmorMaterial material, int slot, String texture) { + super(material, slot, texture); } @Override diff --git a/src/main/java/com/hbm/items/armor/ArmorLiquidator.java b/src/main/java/com/hbm/items/armor/ArmorLiquidator.java index 6fa2b3ffe..dfd106480 100644 --- a/src/main/java/com/hbm/items/armor/ArmorLiquidator.java +++ b/src/main/java/com/hbm/items/armor/ArmorLiquidator.java @@ -28,8 +28,8 @@ public class ArmorLiquidator extends ArmorFSB { private ModelM65 model; private ResourceLocation hazmatBlur = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_dark.png"); - public ArmorLiquidator(ArmorMaterial material, int layer, int slot, String texture) { - super(material, layer, slot, texture); + public ArmorLiquidator(ArmorMaterial material, int slot, String texture) { + super(material, slot, texture); } @Override diff --git a/src/main/java/com/hbm/items/armor/ArmorLiquidatorMask.java b/src/main/java/com/hbm/items/armor/ArmorLiquidatorMask.java index bf5367111..b68135c9b 100644 --- a/src/main/java/com/hbm/items/armor/ArmorLiquidatorMask.java +++ b/src/main/java/com/hbm/items/armor/ArmorLiquidatorMask.java @@ -16,8 +16,8 @@ import net.minecraft.world.World; public class ArmorLiquidatorMask extends ArmorLiquidator implements IGasMask { - public ArmorLiquidatorMask(ArmorMaterial material, int layer, int slot, String texture) { - super(material, layer, slot, texture); + public ArmorLiquidatorMask(ArmorMaterial material, int slot, String texture) { + super(material, slot, texture); } @Override diff --git a/src/main/java/com/hbm/items/armor/ArmorModel.java b/src/main/java/com/hbm/items/armor/ArmorModel.java index 64625fc77..04cb9a48b 100644 --- a/src/main/java/com/hbm/items/armor/ArmorModel.java +++ b/src/main/java/com/hbm/items/armor/ArmorModel.java @@ -50,8 +50,8 @@ public class ArmorModel extends ItemArmor { private ResourceLocation goggleBlur4 = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_goggles_4.png"); private ResourceLocation goggleBlur5 = new ResourceLocation(RefStrings.MODID + ":textures/misc/overlay_goggles_5.png"); - public ArmorModel(ArmorMaterial armorMaterial, int renderIndex, int armorType) { - super(armorMaterial, renderIndex, armorType); + public ArmorModel(ArmorMaterial armorMaterial, int armorType) { + super(armorMaterial, 0, armorType); } @Override diff --git a/src/main/java/com/hbm/items/armor/ArmorRPA.java b/src/main/java/com/hbm/items/armor/ArmorRPA.java index cf90e92d1..dd7791918 100644 --- a/src/main/java/com/hbm/items/armor/ArmorRPA.java +++ b/src/main/java/com/hbm/items/armor/ArmorRPA.java @@ -10,8 +10,8 @@ import net.minecraft.item.ItemStack; public class ArmorRPA extends ArmorFSBPowered { - public ArmorRPA(ArmorMaterial material, int layer, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { - super(material, layer, slot, texture, maxPower, chargeRate, consumption, drain); + public ArmorRPA(ArmorMaterial material, int slot, String texture, long maxPower, long chargeRate, long consumption, long drain) { + super(material, slot, texture, maxPower, chargeRate, consumption, drain); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/items/armor/ArmorSchrabidium.java b/src/main/java/com/hbm/items/armor/ArmorSchrabidium.java deleted file mode 100644 index 427e44b3e..000000000 --- a/src/main/java/com/hbm/items/armor/ArmorSchrabidium.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.hbm.items.armor; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.DamageSource; -import net.minecraft.world.World; -import net.minecraftforge.common.ISpecialArmor; - -import com.hbm.items.ModItems; -import com.hbm.lib.RefStrings; - -public class ArmorSchrabidium extends ItemArmor implements ISpecialArmor { - - public ArmorSchrabidium(ArmorMaterial armorMaterial, int renderIndex, int armorType) { - super(armorMaterial, renderIndex, armorType); - } - - @Override - public String getArmorTexture(ItemStack stack, Entity entity, int slot, String layer) { - if(stack.getItem().equals(ModItems.schrabidium_helmet) || stack.getItem().equals(ModItems.schrabidium_plate) || stack.getItem().equals(ModItems.schrabidium_boots)) { - return (RefStrings.MODID + ":textures/armor/schrabidium_1.png"); - } - if(stack.getItem().equals(ModItems.schrabidium_legs)) { - return (RefStrings.MODID + ":textures/armor/schrabidium_2.png"); - } - - else return null; - } - - @Override - public EnumRarity getRarity(ItemStack p_77613_1_) { - - return EnumRarity.rare; - } - - @Override - public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { - if(damage >= 5) - { - player.setHealth(player.getHealth() - 1F); - return new ArmorProperties(1, 1, 2000); - } - return new ArmorProperties(1, 1, 2000); - } - - @Override - public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { - if(slot == 0) - { - return 3; - } - if(slot == 1) - { - return 8; - } - if(slot == 2) - { - return 6; - } - if(slot == 3) - { - return 3; - } - return 0; - } - - @Override - public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { - stack.damageItem(damage * 1, entity); - - } - - @Override - public void onArmorTick(World world, EntityPlayer player, ItemStack armor) { - - if(armor.getItem() == ModItems.schrabidium_helmet) - { - player.addPotionEffect(new PotionEffect(Potion.nightVision.id, 5, 0, true)); - player.addPotionEffect(new PotionEffect(Potion.waterBreathing.id, 5, 9, true)); - } - - if(armor.getItem() == ModItems.schrabidium_plate) - { - player.addPotionEffect(new PotionEffect(Potion.fireResistance.id, 5, 0, true)); - } - - if(armor.getItem() == ModItems.schrabidium_legs) - { - player.addPotionEffect(new PotionEffect(Potion.jump.id, 5, 2, true)); - } - - if(armor.getItem() == ModItems.schrabidium_boots) - { - player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 5, 2, true)); - } - } - -} diff --git a/src/main/java/com/hbm/items/armor/ArmorT45.java b/src/main/java/com/hbm/items/armor/ArmorT45.java index 7325a5ff8..addb410f1 100644 --- a/src/main/java/com/hbm/items/armor/ArmorT45.java +++ b/src/main/java/com/hbm/items/armor/ArmorT45.java @@ -24,8 +24,8 @@ public class ArmorT45 extends ArmorFSBPowered { @SideOnly(Side.CLIENT) private ModelT45Boots boots; - public ArmorT45(ArmorMaterial material, int layer, int slot, long maxPower, long chargeRate, long consumption, long drain) { - super(material, layer, slot, "", maxPower, chargeRate, consumption, drain); + public ArmorT45(ArmorMaterial material, int slot, long maxPower, long chargeRate, long consumption, long drain) { + super(material, slot, "", maxPower, chargeRate, consumption, drain); } @Override diff --git a/src/main/java/com/hbm/items/armor/ArmorTest.java b/src/main/java/com/hbm/items/armor/ArmorTest.java index 249e6abe4..f1549464f 100644 --- a/src/main/java/com/hbm/items/armor/ArmorTest.java +++ b/src/main/java/com/hbm/items/armor/ArmorTest.java @@ -9,8 +9,8 @@ import net.minecraft.item.ItemStack; public class ArmorTest extends ItemArmor { - public ArmorTest(ArmorMaterial armorMaterial, int renderIndex, int armorType) { - super(armorMaterial, renderIndex, armorType); + public ArmorTest(ArmorMaterial armorMaterial, int armorType) { + super(armorMaterial, 0, armorType); } @Override diff --git a/src/main/java/com/hbm/items/armor/MaskOfInfamy.java b/src/main/java/com/hbm/items/armor/MaskOfInfamy.java index a08884f3c..c06bd4a4f 100644 --- a/src/main/java/com/hbm/items/armor/MaskOfInfamy.java +++ b/src/main/java/com/hbm/items/armor/MaskOfInfamy.java @@ -8,8 +8,8 @@ import net.minecraft.item.ItemStack; public class MaskOfInfamy extends ItemArmor { - public MaskOfInfamy(ArmorMaterial p_i45325_1_, int p_i45325_2_, int p_i45325_3_) { - super(p_i45325_1_, p_i45325_2_, p_i45325_3_); + public MaskOfInfamy(ArmorMaterial mat, int slot) { + super(mat, 0, slot); } @Override diff --git a/src/main/java/com/hbm/items/armor/ModArmor.java b/src/main/java/com/hbm/items/armor/ModArmor.java index 56c42ef64..798db59b3 100644 --- a/src/main/java/com/hbm/items/armor/ModArmor.java +++ b/src/main/java/com/hbm/items/armor/ModArmor.java @@ -9,8 +9,8 @@ import net.minecraft.item.ItemStack; public class ModArmor extends ItemArmor { - public ModArmor(ArmorMaterial p_i45325_1_, int p_i45325_2_, int p_i45325_3_) { - super(p_i45325_1_, p_i45325_2_, p_i45325_3_); + public ModArmor(ArmorMaterial material, int slot) { + super(material, 0, slot); } @Override diff --git a/src/main/java/com/hbm/items/armor/WingsMurk.java b/src/main/java/com/hbm/items/armor/WingsMurk.java index d47736a76..d74840b42 100644 --- a/src/main/java/com/hbm/items/armor/WingsMurk.java +++ b/src/main/java/com/hbm/items/armor/WingsMurk.java @@ -18,7 +18,7 @@ import net.minecraft.world.World; public class WingsMurk extends ItemArmor { public WingsMurk(ArmorMaterial material) { - super(material, 7, 1); + super(material, 0, 1); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/hbm/lib/HbmWorldGen.java b/src/main/java/com/hbm/lib/HbmWorldGen.java index 6fc6e3d3f..083a409b1 100644 --- a/src/main/java/com/hbm/lib/HbmWorldGen.java +++ b/src/main/java/com/hbm/lib/HbmWorldGen.java @@ -192,37 +192,37 @@ public class HbmWorldGen implements IWorldGenerator { } if(GeneralConfig.enable528ColtanDeposit) { - for (int k = 0; k < 2; k++) { - + for(int k = 0; k < 2; k++) { + for(int r = 1; r <= 5; r++) { int randPosX = i + rand.nextInt(16); int randPosY = rand.nextInt(25) + 15; int randPosZ = j + rand.nextInt(16); - + int range = colRange / r; - + if(randPosX <= colX + range && randPosX >= colX - range && randPosZ <= colZ + range && randPosZ >= colZ - range) { (new WorldGenMinable(ModBlocks.ore_coltan, 4)).generate(world, rand, randPosX, randPosY, randPosZ); } } } } - - for (int k = 0; k < rand.nextInt(4); k++) { + + for(int k = 0; k < rand.nextInt(4); k++) { int randPosX = i + rand.nextInt(16); int randPosY = rand.nextInt(15) + 15; int randPosZ = j + rand.nextInt(16); - + if(randPosX <= -350 && randPosX >= -450 && randPosZ <= -350 && randPosZ >= -450) (new WorldGenMinable(ModBlocks.ore_australium, 50)).generate(world, rand, randPosX, randPosY, randPosZ); } } - if (GeneralConfig.enableDungeons && world.provider.isSurfaceWorld()) { + if(GeneralConfig.enableDungeons && world.provider.isSurfaceWorld()) { - if (biome == BiomeGenBase.plains || biome == BiomeGenBase.desert) { - if (WorldConfig.radioStructure > 0 && rand.nextInt(WorldConfig.radioStructure) == 0) { - for (int a = 0; a < 1; a++) { + if(biome == BiomeGenBase.plains || biome == BiomeGenBase.desert) { + if(WorldConfig.radioStructure > 0 && rand.nextInt(WorldConfig.radioStructure) == 0) { + for(int a = 0; a < 1; a++) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); @@ -232,9 +232,9 @@ public class HbmWorldGen implements IWorldGenerator { } } - if (biome.temperature >= 0.4F && biome.rainfall <= 0.6F) { - if (WorldConfig.antennaStructure > 0 && rand.nextInt(WorldConfig.antennaStructure) == 0) { - for (int a = 0; a < 1; a++) { + if(biome.temperature >= 0.4F && biome.rainfall <= 0.6F) { + if(WorldConfig.antennaStructure > 0 && rand.nextInt(WorldConfig.antennaStructure) == 0) { + for(int a = 0; a < 1; a++) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); @@ -245,8 +245,8 @@ public class HbmWorldGen implements IWorldGenerator { } if(!biome.canSpawnLightningBolt() && biome.temperature >= 1.5F) { - if (WorldConfig.atomStructure > 0 && rand.nextInt(WorldConfig.atomStructure) == 0) { - for (int a = 0; a < 1; a++) { + if(WorldConfig.atomStructure > 0 && rand.nextInt(WorldConfig.atomStructure) == 0) { + for(int a = 0; a < 1; a++) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); @@ -256,14 +256,14 @@ public class HbmWorldGen implements IWorldGenerator { } } - if (!biome.canSpawnLightningBolt() && biome.temperature >= 2F) { - if (WorldConfig.vertibirdStructure > 0 && rand.nextInt(WorldConfig.vertibirdStructure) == 0) { - for (int a = 0; a < 1; a++) { + if(!biome.canSpawnLightningBolt() && biome.temperature >= 2F) { + if(WorldConfig.vertibirdStructure > 0 && rand.nextInt(WorldConfig.vertibirdStructure) == 0) { + for(int a = 0; a < 1; a++) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); - if (rand.nextInt(2) == 0) { + if(rand.nextInt(2) == 0) { new Vertibird().generate(world, rand, x, y, z); } else { new CrashedVertibird().generate(world, rand, x, y, z); @@ -273,16 +273,16 @@ public class HbmWorldGen implements IWorldGenerator { } } - if (WorldConfig.dungeonStructure > 0 && rand.nextInt(WorldConfig.dungeonStructure) == 0) { + if(WorldConfig.dungeonStructure > 0 && rand.nextInt(WorldConfig.dungeonStructure) == 0) { int x = i + rand.nextInt(16); int y = rand.nextInt(256); int z = j + rand.nextInt(16); new LibraryDungeon().generate(world, rand, x, y, z); } - if (biome.temperature == 0.5F || biome.temperature == 2.0F) { - if (WorldConfig.relayStructure > 0 && rand.nextInt(WorldConfig.relayStructure) == 0) { - for (int a = 0; a < 1; a++) { + if(biome.temperature == 0.5F || biome.temperature == 2.0F) { + if(WorldConfig.relayStructure > 0 && rand.nextInt(WorldConfig.relayStructure) == 0) { + for(int a = 0; a < 1; a++) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); @@ -291,10 +291,10 @@ public class HbmWorldGen implements IWorldGenerator { } } } - - if (biome.temperature == 0.5F || biome.temperature == 2.0F) { - if (WorldConfig.satelliteStructure > 0 && rand.nextInt(WorldConfig.satelliteStructure) == 0) { - for (int a = 0; a < 1; a++) { + + if(biome.temperature == 0.5F || biome.temperature == 2.0F) { + if(WorldConfig.satelliteStructure > 0 && rand.nextInt(WorldConfig.satelliteStructure) == 0) { + for(int a = 0; a < 1; a++) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); @@ -303,10 +303,10 @@ public class HbmWorldGen implements IWorldGenerator { } } } - - if (!biome.canSpawnLightningBolt() && biome.temperature >= 1.5F) { - if (rand.nextInt(200) == 0) { - for (int a = 0; a < 1; a++) { + + if(!biome.canSpawnLightningBolt() && biome.temperature >= 1.5F) { + if(rand.nextInt(200) == 0) { + for(int a = 0; a < 1; a++) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); @@ -316,7 +316,7 @@ public class HbmWorldGen implements IWorldGenerator { } } - if (WorldConfig.bunkerStructure > 0 && rand.nextInt(WorldConfig.bunkerStructure) == 0) { + if(WorldConfig.bunkerStructure > 0 && rand.nextInt(WorldConfig.bunkerStructure) == 0) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); @@ -324,7 +324,7 @@ public class HbmWorldGen implements IWorldGenerator { new Bunker().generate(world, rand, x, y, z); } - if (WorldConfig.siloStructure > 0 && rand.nextInt(WorldConfig.siloStructure) == 0) { + if(WorldConfig.siloStructure > 0 && rand.nextInt(WorldConfig.siloStructure) == 0) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); @@ -332,7 +332,7 @@ public class HbmWorldGen implements IWorldGenerator { new Silo().generate(world, rand, x, y, z); } - if (WorldConfig.factoryStructure > 0 && rand.nextInt(WorldConfig.factoryStructure) == 0) { + if(WorldConfig.factoryStructure > 0 && rand.nextInt(WorldConfig.factoryStructure) == 0) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); @@ -340,7 +340,7 @@ public class HbmWorldGen implements IWorldGenerator { new Factory().generate(world, rand, x, y, z); } - if (WorldConfig.dudStructure > 0 && rand.nextInt(WorldConfig.dudStructure) == 0) { + if(WorldConfig.dudStructure > 0 && rand.nextInt(WorldConfig.dudStructure) == 0) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); @@ -348,15 +348,15 @@ public class HbmWorldGen implements IWorldGenerator { new Dud().generate(world, rand, x, y, z); } - if (WorldConfig.spaceshipStructure > 0 && rand.nextInt(WorldConfig.spaceshipStructure) == 0) { + if(WorldConfig.spaceshipStructure > 0 && rand.nextInt(WorldConfig.spaceshipStructure) == 0) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); new Spaceship().generate(world, rand, x, y, z); } - - if (WorldConfig.barrelStructure > 0 && biome.temperature >= 1.5F && !biome.canSpawnLightningBolt() && rand.nextInt(WorldConfig.barrelStructure) == 0) { + + if(WorldConfig.barrelStructure > 0 && biome.temperature >= 1.5F && !biome.canSpawnLightningBolt() && rand.nextInt(WorldConfig.barrelStructure) == 0) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); @@ -364,7 +364,7 @@ public class HbmWorldGen implements IWorldGenerator { new Barrel().generate(world, rand, x, y, z); } - if (WorldConfig.broadcaster > 0 && rand.nextInt(WorldConfig.broadcaster) == 0) { + if(WorldConfig.broadcaster > 0 && rand.nextInt(WorldConfig.broadcaster) == 0) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); @@ -377,20 +377,29 @@ public class HbmWorldGen implements IWorldGenerator { } } - if (WorldConfig.minefreq > 0 && GeneralConfig.enableMines && rand.nextInt(WorldConfig.minefreq) == 0) { + if(WorldConfig.minefreq > 0 && GeneralConfig.enableMines && rand.nextInt(WorldConfig.minefreq) == 0) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); if(world.getBlock(x, y - 1, z).canPlaceTorchOnTop(world, x, y - 1, z)) { world.setBlock(x, y, z, ModBlocks.mine_ap); - + if(GeneralConfig.enableDebugMode) - MainRegistry.logger.info("[Debug] Successfully spawned landmine at " + x + " " + (y) +" " + z); + MainRegistry.logger.info("[Debug] Successfully spawned landmine at " + x + " " + (y) + " " + z); } } - - if (WorldConfig.radfreq > 0 && GeneralConfig.enableRad && rand.nextInt(WorldConfig.radfreq) == 0 && biome == BiomeGenBase.desert) { + + if(GeneralConfig.enable528 && GeneralConfig.enable528BosniaSimulator && rand.nextInt(16) == 0) { + int x = i + rand.nextInt(16); + int z = j + rand.nextInt(16); + int y = world.getHeightValue(x, z); + if(world.getBlock(x, y - 1, z).canPlaceTorchOnTop(world, x, y - 1, z)) { + world.setBlock(x, y, z, ModBlocks.mine_he); + } + } + + if(WorldConfig.radfreq > 0 && GeneralConfig.enableRad && rand.nextInt(WorldConfig.radfreq) == 0 && biome == BiomeGenBase.desert) { for (int a = 0; a < 1; a++) { int x = i + rand.nextInt(16); diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 6789ebf84..58b15e72d 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (4525)"; + public static final String VERSION = "1.0.27 BETA (4543)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 7fe86befa..f6b93dde4 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -126,12 +126,6 @@ public class ClientProxy extends ServerProxy { Jars.initJars(); - RenderingRegistry.addNewArmourRendererPrefix("5"); - RenderingRegistry.addNewArmourRendererPrefix("6"); - RenderingRegistry.addNewArmourRendererPrefix("7"); - RenderingRegistry.addNewArmourRendererPrefix("8"); - RenderingRegistry.addNewArmourRendererPrefix("9"); - //SoundUtil.addSoundCategory("ntmMachines"); } diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 538edff75..6a4e4c018 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -66,7 +66,6 @@ public class CraftingManager { GameRegistry.addRecipe(new CargoShellCraftingHandler()); GameRegistry.addRecipe(new ScrapsCraftingHandler()); - //TODO: find out what this actually did RecipeSorter.register("hbm:rbmk", RBMKFuelCraftingHandler.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless"); RecipeSorter.register("hbm:toolbox", ToolboxCraftingHandler.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless"); RecipeSorter.register("hbm:cargo", CargoShellCraftingHandler.class, RecipeSorter.Category.SHAPELESS, "after:minecraft:shapeless"); @@ -799,7 +798,7 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModBlocks.hadron_coil_starmetal, 1), new Object[] { "SNS", "SCS", "SNS", 'S', STAR.ingot(), 'N', ModBlocks.hadron_coil_neodymium, 'C', ModBlocks.hadron_coil_schrabidate }); addRecipeAuto(new ItemStack(ModBlocks.hadron_coil_chlorophyte, 1), new Object[] { "TCT", "TST", "TCT", 'T', ModItems.coil_tungsten, 'C', ModItems.powder_chlorophyte, 'S', ModBlocks.hadron_coil_starmetal }); addRecipeAuto(new ItemStack(ModBlocks.hadron_diode, 1), new Object[] { "CIC", "ISI", "CIC", 'C', ModBlocks.hadron_coil_alloy, 'I', STEEL.ingot(), 'S', ModItems.circuit_gold }); - addRecipeAuto(new ItemStack(ModBlocks.hadron_plating, 8), new Object[] { "IPI", "P P", "IPI", 'I', STEEL.ingot(), 'P', STEEL.plate() }); + addRecipeAuto(new ItemStack(ModBlocks.hadron_plating, 16), new Object[] { "CC", "CC", 'C', STEEL.plateCast()}); addShapelessAuto(new ItemStack(ModBlocks.hadron_plating_blue, 1), new Object[] { ModBlocks.hadron_plating, KEY_BLUE }); addShapelessAuto(new ItemStack(ModBlocks.hadron_plating_black, 1), new Object[] { ModBlocks.hadron_plating, KEY_BLACK }); addShapelessAuto(new ItemStack(ModBlocks.hadron_plating_yellow, 1), new Object[] { ModBlocks.hadron_plating, KEY_YELLOW }); diff --git a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticReformer.java b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticReformer.java index d8f19c079..f35883f09 100644 --- a/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticReformer.java +++ b/src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticReformer.java @@ -132,7 +132,9 @@ public class TileEntityMachineCatalyticReformer extends TileEntityMachineBase im new DirPos(xCoord + dir.offsetX * 2 + rot.offsetX, yCoord, zCoord + dir.offsetZ * 2 + rot.offsetZ, dir), new DirPos(xCoord + dir.offsetX * 2 - rot.offsetX, yCoord, zCoord + dir.offsetZ * 2 - rot.offsetZ, dir), new DirPos(xCoord - dir.offsetX * 2 + rot.offsetX, yCoord, zCoord - dir.offsetZ * 2 + rot.offsetZ, dir.getOpposite()), - new DirPos(xCoord - dir.offsetX * 2 - rot.offsetX, yCoord, zCoord - dir.offsetZ * 2 - rot.offsetZ, dir.getOpposite()) + new DirPos(xCoord - dir.offsetX * 2 - rot.offsetX, yCoord, zCoord - dir.offsetZ * 2 - rot.offsetZ, dir.getOpposite()), + new DirPos(xCoord + rot.offsetX * 3, yCoord, zCoord + rot.offsetZ * 3, dir), + new DirPos(xCoord - rot.offsetX * 3, yCoord, zCoord - rot.offsetZ * 3, dir) }; } @@ -205,7 +207,7 @@ public class TileEntityMachineCatalyticReformer extends TileEntityMachineBase im @Override public FluidTank[] getSendingTanks() { - return new FluidTank[] {tanks[1], tanks[2], tanks[3], tanks[4]}; + return new FluidTank[] {tanks[1], tanks[2], tanks[3]}; } @Override @@ -225,7 +227,7 @@ public class TileEntityMachineCatalyticReformer extends TileEntityMachineBase im @Override public void writeNBT(NBTTagCompound nbt) { - if(tanks[0].getFill() == 0 && tanks[1].getFill() == 0 && tanks[2].getFill() == 0 && tanks[3].getFill() == 0 && tanks[4].getFill() == 0) return; + if(tanks[0].getFill() == 0 && tanks[1].getFill() == 0 && tanks[2].getFill() == 0 && tanks[3].getFill() == 0) return; NBTTagCompound data = new NBTTagCompound(); for(int i = 0; i < 4; i++) this.tanks[i].writeToNBT(data, "" + i); nbt.setTag(NBT_PERSISTENT_KEY, data); diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index c74073eb2..f90dddc83 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -701,6 +701,7 @@ hbmmat.beryllium=Beryllium hbmmat.bismuth=Bismut hbmmat.borax=Borax hbmmat.boron=Bor +hbmmat.cadmium=Cadmium hbmmat.carbon=Kohlenstoff hbmmat.cdalloy=Cadmiumstahl hbmmat.cinnabar=Zinnober diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index b3be054d8..986d3d8c9 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -1278,6 +1278,7 @@ hbmmat.beryllium=Beryllium hbmmat.bismuth=Bismuth hbmmat.borax=Borax hbmmat.boron=Boron +hbmmat.cadmium=Cadmium hbmmat.carbon=Carbon hbmmat.cdalloy=Cadmium Steel hbmmat.cinnabar=Cinnabar diff --git a/src/main/resources/assets/hbm/textures/models/machines/catalytic_reformer.png b/src/main/resources/assets/hbm/textures/models/machines/catalytic_reformer.png index 2f84833c621219f2be27bf0957982d164168330c..47566392f3f87113fcf0b513faef32e0fdd9a878 100644 GIT binary patch delta 6837 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 bV{v;@eKcMupXda!A2U-clUk!gZgKwu;=;ZB