diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
3 files changed, 75 insertions, 40 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index dd913afd6d..251ec6f451 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -231,33 +231,60 @@ public final class ModItems { - MP_Wood = new MultiPickaxeBase("Wooden Multipick", ToolMaterial.WOOD, ToolMaterial.WOOD.getMaxUses(), Utils.rgbtoHexValue(139,90,43)); - MP_Stone = new MultiPickaxeBase("Cobblestone Multipick", ToolMaterial.STONE, ToolMaterial.STONE.getMaxUses(), Utils.rgbtoHexValue(161,161,161)); - MP_Iron = new MultiPickaxeBase("Iron Multipick", ToolMaterial.IRON, ToolMaterial.IRON.getMaxUses(), Utils.rgbtoHexValue(110,123,139)); - MP_Gold = new MultiPickaxeBase("Gold Multipick", ToolMaterial.GOLD, ToolMaterial.GOLD.getMaxUses(), Utils.rgbtoHexValue(238,221,130)); - MP_Diamond = new MultiPickaxeBase("Diamond Multipick", ToolMaterial.EMERALD, ToolMaterial.EMERALD.getMaxUses(), Utils.rgbtoHexValue(191,239,255)); + //MP_Wood = new MultiPickaxeBase("Wooden Multipick", ToolMaterial.WOOD, ToolMaterial.WOOD.getMaxUses(), Utils.rgbtoHexValue(139,90,43)); + //MP_Stone = new MultiPickaxeBase("Cobblestone Multipick", ToolMaterial.STONE, ToolMaterial.STONE.getMaxUses(), Utils.rgbtoHexValue(161,161,161)); + //MP_Iron = new MultiPickaxeBase("Iron Multipick", ToolMaterial.IRON, ToolMaterial.IRON.getMaxUses(), Utils.rgbtoHexValue(110,123,139)); + //MP_Gold = new MultiPickaxeBase("Gold Multipick", ToolMaterial.GOLD, ToolMaterial.GOLD.getMaxUses(), Utils.rgbtoHexValue(238,221,130)); + //MP_Diamond = new MultiPickaxeBase("Diamond Multipick", ToolMaterial.EMERALD, ToolMaterial.EMERALD.getMaxUses(), Utils.rgbtoHexValue(191,239,255)); - - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Tin); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Copper); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Bronze); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Steel); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Lead); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Silver); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Titanium); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Tungsten); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Platinum); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Chrome); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.TungstenSteel); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Aluminium); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Thaumium); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Cobalt); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Iridium); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Ultimet); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Osmiridium); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.NetherStar); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Europium); - MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Neutronium); + boolean gtStyleTools = true; + + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Wood); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Cobblestone); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Iron); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.WroughtIron); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.DarkIron); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Gold); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Silver); + + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Diamond); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Emerald); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Ruby); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Sapphire); + + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Cupronickel); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Brass); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Bronze); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Steel); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Lead); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Titanium); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Tungsten); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Platinum); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Chrome); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.TungstenSteel); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Aluminium); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Thaumium); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Cobalt); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Iridium); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Ultimet); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Osmiridium); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.NetherStar); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Naquadah); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.NaquadahAlloy); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.NaquadahEnriched); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Neutronium); + + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Thorium); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.DamascusSteel); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Magnalium); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.BlackSteel); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Invar); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.MeteoricSteel); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.StainlessSteel); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.BlueSteel); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Neodymium); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.Desh); + MP_GTMATERIAL = UtilsItems.generateMultiPick(gtStyleTools, Materials.ElectrumFlux); //EnderIO Resources if (LoadedMods.EnderIO || LOAD_ALL_CONTENT){ diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java index ea59ed2b7e..1b7bf7c6c0 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java @@ -107,10 +107,10 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ Block removalist = world.getBlock(X, Y, Z); //Utils.LOG_WARNING(removalist.toString()); - bHardness = removalist.getBlockHardness(world, X, Y, Z); + bHardness = removalist.getBlockHardness(world, X, Y, Z)*100; Utils.LOG_WARNING("Hardness: "+bHardness); - bDurabilityLoss = (bDurabilityLoss + bHardness); + bDurabilityLoss = bHardness; //Utils.LOG_WARNING("Durability Loss: "+bDurabilityLoss); correctTool = canPickaxeBlock(removalist, world); @@ -127,11 +127,6 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ return bDurabilityLoss; } - @Override - public int doDurabilityDamage(int x){ - return x; - } - //Should clear up blocks quicker if I chain it. @Override public void removeBlockAndDropAsItem(World world, int X, int Y, int Z, ItemStack heldItem){ @@ -153,6 +148,9 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ world.setBlockToAir(X, Y, Z); } + else { + return; + } } } @@ -164,6 +162,13 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ } } + + + @Override + public void damageItem(ItemStack item, int damage, EntityPlayer localPlayer){ + item.damageItem(damage*100, localPlayer); + } + @Override @SideOnly(Side.CLIENT) diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java index a21ee7e6ad..d20ad259e7 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java @@ -126,7 +126,7 @@ public class StaballoyPickaxe extends ItemPickaxe{ for(int i = -1; i < 2; i++) { for(int j = -1; j < 2; j++) { float dur = calculateDurabilityLoss(world, X + i, Y, Z + j); - DURABILITY_LOSS = (DURABILITY_LOSS + calculateDurabilityLoss(world, X + i, Y, Z + j)); + DURABILITY_LOSS = (DURABILITY_LOSS + dur); Utils.LOG_WARNING("Added Loss: "+dur); removeBlockAndDropAsItem(world, X + i, Y, Z + j, heldItem); } @@ -138,7 +138,7 @@ public class StaballoyPickaxe extends ItemPickaxe{ for(int i = -1; i < 2; i++) { for(int j = -1; j < 2; j++) { float dur = calculateDurabilityLoss(world, X, Y + i, Z + j); - DURABILITY_LOSS = (DURABILITY_LOSS + calculateDurabilityLoss(world, X, Y + i, Z + j)); + DURABILITY_LOSS = (DURABILITY_LOSS + dur); Utils.LOG_WARNING("Added Loss: "+dur); removeBlockAndDropAsItem(world, X , Y + i, Z + j, heldItem); } @@ -162,17 +162,20 @@ public class StaballoyPickaxe extends ItemPickaxe{ //heldItem.setDamage(heldStack, DURABILITY_LOSS); //Utils.LOG_WARNING("|GID|Durability: "+heldItem.getItemDamage()); //Utils.LOG_WARNING("Durability: "+heldStack.getDamage(heldStack)); - if (heldItem.getItemDamage() < (heldItem.getMaxDamage()-DURABILITY_LOSS)){ - heldItem.damageItem((int) DURABILITY_LOSS, localPlayer); + if (heldItem.getItemDamage() <= (heldItem.getMaxDamage()-DURABILITY_LOSS)){ + damageItem(heldItem, (int) DURABILITY_LOSS, localPlayer); + } + else { + damageItem(heldItem, heldItem.getMaxDamage()-heldItem.getItemDamage(), localPlayer); } //Utils.LOG_WARNING("|GID|Durability: "+heldItem.getItemDamage()); DURABILITY_LOSS = 0; } } - - public int doDurabilityDamage(int x){ - return x; + + public void damageItem(ItemStack item, int damage, EntityPlayer localPlayer){ + item.damageItem(damage, localPlayer); } //Should clear up blocks quicker if I chain it. |