Fix tool tiers

This commit is contained in:
Prospector 2016-05-23 00:13:11 -07:00
parent 850e39d674
commit 188e2ef0c5
14 changed files with 65 additions and 78 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 573 B

After

Width:  |  Height:  |  Size: 663 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 663 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 573 B

View file

@ -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

View file

@ -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");

View file

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

View file

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

View file

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

View file

@ -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

View file

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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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