diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/advancedAlloyIngot.png b/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/advancedAlloyIngot.png index 657b8637e..05b7a8035 100644 Binary files a/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/advancedAlloyIngot.png and b/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/advancedAlloyIngot.png differ diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/advancedAlloyIngot_alt.png b/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/advancedAlloyIngot_alt.png deleted file mode 100644 index 05b7a8035..000000000 Binary files a/run/resourcepacks/unity/assets/techreborn/textures/items/ingot/advancedAlloyIngot_alt.png and /dev/null differ diff --git a/run/resourcepacks/unity/assets/techreborn/textures/items/plate/advancedAlloyPlate.png b/run/resourcepacks/unity/assets/techreborn/textures/items/plate/advancedAlloyPlate.png new file mode 100644 index 000000000..657b8637e Binary files /dev/null and b/run/resourcepacks/unity/assets/techreborn/textures/items/plate/advancedAlloyPlate.png differ diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index b8f0995c7..c764cce69 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -50,9 +50,9 @@ public class ConfigTechReborn public static int IronChainsawCharge; public static int DiamondChainsawCharge; public static int AdvancedChainsawCharge; - public static int IronJackhammerCharge; - public static int DiamondJackhammerCharge; public static int SteelJackhammerCharge; + public static int DiamondJackhammerCharge; + public static int AdvancedJackhammerCharge; public static int LapotronPackCharge; public static int LithiumBatpackCharge; public static int LapotronicOrbMaxCharge; @@ -68,9 +68,9 @@ public class ConfigTechReborn public static int IronChainsawTier; public static int DiamondChainsawTier; public static int AdvancedChainsawTier; - public static int IronJackhammerTier; - public static int DiamondJackhammerTier; public static int SteelJackhammerTier; + public static int DiamondJackhammerTier; + public static int AdvancedJackhammerTier; public static int LapotronPackTier; public static int LapotronicOrbTier; public static int LithiumBatpackTier; @@ -259,14 +259,14 @@ public class ConfigTechReborn AdvancedChainsawCharge = config.get(CATEGORY_POWER, "AdvancedChainsaw MaxCharge", 1000000, "Set the max charge for the advanced chainsaw").getInt(); - IronJackhammerCharge = config - .get(CATEGORY_POWER, "IronJackhammer MaxCharge", 10000, "Set the max charge for the iron jackhammer") + AdvancedJackhammerCharge = config + .get(CATEGORY_POWER, "AdvancedJackhammer MaxCharge", 100000, "Set the max charge for the advanced jackhammer") .getInt(); - SteelJackhammerCharge = config.get(CATEGORY_POWER, "AdvancedJackhammer MaxCharge", 20000, - "Set the max charge for the advanced jackhammer").getInt(); + SteelJackhammerCharge = config.get(CATEGORY_POWER, "AdvancedJackhammer MaxCharge", 10000, + "Set the max charge for the steel jackhammer").getInt(); - DiamondJackhammerCharge = config.get(CATEGORY_POWER, "DiamondJackhammer MaxCharge", 100000, + DiamondJackhammerCharge = config.get(CATEGORY_POWER, "DiamondJackhammer MaxCharge", 20000, "Set the max charge for the diamond jackhammer").getInt(); LapotronPackCharge = config @@ -328,7 +328,7 @@ public class ConfigTechReborn AdvancedChainsawTier = config .get(CATEGORY_POWER, "AdvancedChainsaw Tier", 2, "Set the Tier of the advanced chainsaw").getInt(); - IronJackhammerTier = config.get(CATEGORY_POWER, "IronJackhammer Tier", 2, "Set the Tier of the iron jackhammer") + AdvancedJackhammerTier = config.get(CATEGORY_POWER, "AdvancedJackhammer Tier", 2, "Set the Tier of the advanced jackhammer") .getInt(); DiamondJackhammerTier = config diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index a5ad36612..9a76fbf20 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -48,15 +48,19 @@ public class ModItems public static Item reBattery; public static Item treeTap; + public static Item ironDrill; public static Item diamondDrill; public static Item advancedDrill; + public static Item ironChainsaw; public static Item diamondChainsaw; public static Item advancedChainsaw; - public static Item ironJackhammer; + public static Item steelJackhammer; public static Item diamondJackhammer; + public static Item advancedJackhammer; + public static Item nanosaber; public static Item hammer; public static Item wrench; @@ -179,26 +183,26 @@ public class ModItems treeTap = new ItemTreeTap(); registerItem(treeTap, "treetap"); - ironDrill = PoweredItem.createItem(ItemIronDrill.class); + ironDrill = PoweredItem.createItem(ItemSteelDrill.class); registerItem(ironDrill, "irondrill"); diamondDrill = PoweredItem.createItem(ItemDiamondDrill.class); registerItem(diamondDrill, "diamonddrill"); advancedDrill = PoweredItem.createItem(ItemAdvancedDrill.class); registerItem(advancedDrill, "advanceddrill"); - ironChainsaw = PoweredItem.createItem(ItemIronChainsaw.class); + ironChainsaw = PoweredItem.createItem(ItemSteelChainsaw.class); registerItem(ironChainsaw, "ironchainsaw"); diamondChainsaw = PoweredItem.createItem(ItemDiamondChainsaw.class); registerItem(diamondChainsaw, "diamondchainsaw"); advancedChainsaw = PoweredItem.createItem(ItemAdvancedChainsaw.class); registerItem(advancedChainsaw, "advancedchainsaw"); - ironJackhammer = PoweredItem.createItem(ItemIronJackhammer.class); - registerItem(ironJackhammer, "ironjackhammer"); steelJackhammer = PoweredItem.createItem(ItemSteelJackhammer.class); registerItem(steelJackhammer, "steeljackhammer"); diamondJackhammer = PoweredItem.createItem(ItemDiamondJackhammer.class); registerItem(diamondJackhammer, "diamondjackhammer"); + advancedJackhammer = PoweredItem.createItem(ItemAdvancedJackhammer.class); + registerItem(advancedJackhammer, "ironjackhammer"); bronzeSword = new ItemTRSword(Reference.BRONZE); registerItem(bronzeSword, "bronzeSword"); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index b85af51e1..ecd431c7b 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -322,8 +322,8 @@ public class ModRecipes private static void addCompressorRecipes() { - RecipeHandler.addRecipe(new CompressorRecipe(ItemIngots.getIngotByName("mixedmetal"), - ItemIngots.getIngotByName("advancedAlloy"), 400, 20)); + RecipeHandler.addRecipe(new CompressorRecipe(ItemIngots.getIngotByName("advancedAlloy"), + ItemPlates.getPlateByName("advancedAlloy"), 400, 20)); RecipeHandler.addRecipe( new CompressorRecipe(ItemParts.getPartByName("carbonmesh"), ItemPlates.getPlateByName("carbon"), 400, 20)); @@ -972,6 +972,7 @@ public class ModRecipes GameRegistry.addSmelting(BlockOre2.getOreByName("tin"), ItemIngots.getIngotByName("tin"), 1F); GameRegistry.addSmelting(BlockOre.getOreByName("Silver"), ItemIngots.getIngotByName("silver"), 1F); GameRegistry.addSmelting(BlockOre.getOreByName("Lead"), ItemIngots.getIngotByName("lead"), 1F); + GameRegistry.addSmelting(ItemIngots.getIngotByName("mixedMetal"), ItemIngots.getIngotByName("advancedAlloy"), 1F); Core.logHelper.info("Smelting Recipes Added"); } diff --git a/src/main/java/techreborn/items/ItemPlates.java b/src/main/java/techreborn/items/ItemPlates.java index 3581e2d01..498ae0b99 100644 --- a/src/main/java/techreborn/items/ItemPlates.java +++ b/src/main/java/techreborn/items/ItemPlates.java @@ -16,7 +16,7 @@ public class ItemPlates extends ItemTextureBase public static final String[] types = new String[] { "aluminum", "brass", "bronze", "chrome", "copper", "electrum", "invar", "iridium", "iron", "gold", "lead", "nickel", "platinum", "silver", "steel", "tin", "titanium", "tungsten", "tungstensteel", "zinc", "refinedIron", "carbon", "wood", "magnalium", - "silicon", "ruby", "sapphire", "peridot", "redGarnet", "yellowGarnet", "redstone", "diamond", "emerald", "lapis", "coal", "obsidian" }; + "silicon", "ruby", "sapphire", "peridot", "redGarnet", "yellowGarnet", "redstone", "diamond", "emerald", "lapis", "coal", "obsidian", "advancedAlloy" }; public ItemPlates() { diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java b/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java new file mode 100644 index 000000000..4521d37da --- /dev/null +++ b/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java @@ -0,0 +1,26 @@ +package techreborn.items.tools; + +import techreborn.config.ConfigTechReborn; +public class ItemAdvancedJackhammer extends ItemJackhammer +{ + + public ItemAdvancedJackhammer() + { + super(ToolMaterial.IRON, "techreborn.advancedJackhammer", ConfigTechReborn.AdvancedJackhammerCharge, + ConfigTechReborn.AdvancedJackhammerTier); + this.cost = 250; + this.efficiencyOnProperMaterial = 60F; + } + + @Override + public String getTextureName(int damage) + { + return "techreborn:items/tool/advancedJackhammer"; + } + + @Override + public int getMaxMeta() + { + return 1; + } +} diff --git a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java index b019abc8d..595cc718e 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java @@ -1,8 +1,6 @@ package techreborn.items.tools; import techreborn.config.ConfigTechReborn; - -import net.minecraft.item.Item.ToolMaterial; public class ItemDiamondJackhammer extends ItemJackhammer { @@ -10,8 +8,8 @@ public class ItemDiamondJackhammer extends ItemJackhammer { super(ToolMaterial.DIAMOND, "techreborn.diamondJackhammer", ConfigTechReborn.DiamondJackhammerCharge, ConfigTechReborn.DiamondJackhammerTier); - this.cost = 250; - this.efficiencyOnProperMaterial = 60F; + this.cost = 100; + this.efficiencyOnProperMaterial = 16F; } @Override diff --git a/src/main/java/techreborn/items/tools/ItemIronJackhammer.java b/src/main/java/techreborn/items/tools/ItemIronJackhammer.java deleted file mode 100644 index f6226ae0d..000000000 --- a/src/main/java/techreborn/items/tools/ItemIronJackhammer.java +++ /dev/null @@ -1,28 +0,0 @@ -package techreborn.items.tools; - -import techreborn.config.ConfigTechReborn; - -import net.minecraft.item.Item.ToolMaterial; -public class ItemIronJackhammer extends ItemJackhammer -{ - - public ItemIronJackhammer() - { - super(ToolMaterial.IRON, "techreborn.ironJackhammer", ConfigTechReborn.IronJackhammerCharge, - ConfigTechReborn.IronJackhammerTier); - this.cost = 50; - this.efficiencyOnProperMaterial = 12F; - } - - @Override - public String getTextureName(int damage) - { - return "techreborn:items/tool/ironJackhammer"; - } - - @Override - public int getMaxMeta() - { - return 1; - } -} diff --git a/src/main/java/techreborn/items/tools/ItemIronChainsaw.java b/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java similarity index 76% rename from src/main/java/techreborn/items/tools/ItemIronChainsaw.java rename to src/main/java/techreborn/items/tools/ItemSteelChainsaw.java index 5827207db..54c2d1c74 100644 --- a/src/main/java/techreborn/items/tools/ItemIronChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemSteelChainsaw.java @@ -3,12 +3,10 @@ package techreborn.items.tools; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Items; import techreborn.config.ConfigTechReborn; - -import net.minecraft.item.Item.ToolMaterial; -public class ItemIronChainsaw extends ItemChainsaw +public class ItemSteelChainsaw extends ItemChainsaw { - public ItemIronChainsaw() + public ItemSteelChainsaw() { super(ToolMaterial.IRON, "techreborn.ironChainsaw", ConfigTechReborn.IronChainsawCharge, ConfigTechReborn.IronChainsawTier, 2.0F); @@ -24,7 +22,7 @@ public class ItemIronChainsaw extends ItemChainsaw @Override public String getTextureName(int damage) { - return "techreborn:items/tool/ironChainsaw"; + return "techreborn:items/tool/steelChainsaw"; } @Override diff --git a/src/main/java/techreborn/items/tools/ItemIronDrill.java b/src/main/java/techreborn/items/tools/ItemSteelDrill.java similarity index 78% rename from src/main/java/techreborn/items/tools/ItemIronDrill.java rename to src/main/java/techreborn/items/tools/ItemSteelDrill.java index f26cd173d..2565c82f7 100644 --- a/src/main/java/techreborn/items/tools/ItemIronDrill.java +++ b/src/main/java/techreborn/items/tools/ItemSteelDrill.java @@ -3,12 +3,10 @@ package techreborn.items.tools; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Items; import techreborn.config.ConfigTechReborn; - -import net.minecraft.item.Item.ToolMaterial; -public class ItemIronDrill extends ItemDrill +public class ItemSteelDrill extends ItemDrill { - public ItemIronDrill() + public ItemSteelDrill() { super(ToolMaterial.IRON, "techreborn.ironDrill", ConfigTechReborn.IronDrillCharge, ConfigTechReborn.IronDrillTier, 0.5F, 10F); @@ -24,7 +22,7 @@ public class ItemIronDrill extends ItemDrill @Override public String getTextureName(int damage) { - return "techreborn:items/tool/ironDrill"; + return "techreborn:items/tool/steelDrill"; } @Override diff --git a/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java index 19f92b116..6dab25d3c 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java @@ -1,8 +1,6 @@ package techreborn.items.tools; import techreborn.config.ConfigTechReborn; - -import net.minecraft.item.Item.ToolMaterial; public class ItemSteelJackhammer extends ItemJackhammer { @@ -10,8 +8,8 @@ public class ItemSteelJackhammer extends ItemJackhammer { super(ToolMaterial.DIAMOND, "techreborn.steelJackhammer", ConfigTechReborn.SteelJackhammerCharge, ConfigTechReborn.SteelJackhammerTier); - this.cost = 100; - this.efficiencyOnProperMaterial = 16F; + this.cost = 50; + this.efficiencyOnProperMaterial = 12F; } @Override diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index b4a6879ca..30d639f51 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -241,24 +241,15 @@ item.techreborn.dust.indium.name=Indium Dust item.techreborn.dust.invar.name=Invar Dust item.techreborn.dust.iridium.name=Iridium Dust item.techreborn.dust.iron.name=Iron Dust -item.techreborn.dust.kanthal.name=Kanthal Dust -item.techreborn.dust.lapis.name=Lapis Lazuli Dust -item.techreborn.dust.lazurite.name=Lazurite +item.techreborn.dust.lazurite.name=Lazurite Dust item.techreborn.dust.lead.name=Lead Dust -item.techreborn.dust.limestone.name=Limestone Dust -item.techreborn.dust.lodestone.name=Lodestone item.techreborn.dust.magnesium.name=Magnesium Dust -item.techreborn.dust.magnetite.name=Magnetite Dust item.techreborn.dust.manganese.name=Manganese Dust -item.techreborn.dust.manyullyn.name=Manyullyn Dust item.techreborn.dust.marble.name=Marble Dust -item.techreborn.dust.mithril.name=Mithril Dust item.techreborn.dust.netherrack.name=Netherrack Dust -item.techreborn.dust.nichrome.name=Nichrome Dust item.techreborn.dust.nickel.name=Nickel Dust -item.techreborn.dust.obsidian.name=Obsidian Dust item.techreborn.dust.osmium.name=Osmium Dust -item.techreborn.dust.peridot.name=Peridot +item.techreborn.dust.peridot.name=Peridot Dust item.techreborn.dust.phosphorous.name=Phosphorous Dust item.techreborn.dust.platinum.name=Platinum Dust item.techreborn.dust.potassiumFeldspar.name=Potassium Feldspar Dust @@ -573,6 +564,7 @@ item.techreborn.plate.yellowGarnet.name=Yellow Garnet Plate item.techreborn.plate.zinc.name=Zinc Plate item.techreborn.plate.refinedIron.name=Refined Iron Plate item.techreborn.plate.wood.name=Wooden Plate +item.techreborn.plate.advancedAlloy.name=Advanced Alloy #Parts item.techreborn.part.advancedCircuitParts.name=Advanced Circuit Parts @@ -635,18 +627,18 @@ item.techreborn.rockcutter.name=Rockcutter item.techreborn.lithiumbatpack.name=Lithium Batpack item.techreborn.lapotronpack.name=Lapotron Pack item.techreborn.omniTool.name=Omni-Tool -item.techreborn.ironDrill.name=Iron Drill +item.techreborn.ironDrill.name=Steel Drill item.techreborn.diamondDrill.name=Diamond Drill item.techreborn.advancedDrill.name=Advanced Drill -item.techreborn.ironChainsaw.name=Iron Chainsaw +item.techreborn.ironChainsaw.name=Steel Chainsaw item.techreborn.diamondChainsaw.name=Diamond Chainsaw item.techreborn.advancedChainsaw.name=Advanced Chainsaw item.techreborn.lapotronicorb.name=Lapotronic Energy Orb item.techreborn.cloakingdevice.name=Cloaking Device item.techreborn.hammer.name=Iron Hammer -item.techreborn.ironJackhammer.name=Iron Jackhammer item.techreborn.steelJackhammer.name=Steel Jackhammer item.techreborn.diamondJackhammer.name=Diamond Jackhammer +item.techreborn.advancedJackhammer.name=Advanced Jackhammer item.bronzeSword.name=Bronze Sword item.bronzePickaxe.name=Bronze Pickaxe