From f5076ea8afd301f0487fa26eef01972f9e56a6b1 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 28 Sep 2017 23:44:16 +0100 Subject: [PATCH] Downgrade mappings + update all libs --- build.gradle | 20 ++++++++++--------- .../items/tools/ItemAdvancedJackhammer.java | 2 +- .../techreborn/items/tools/ItemChainsaw.java | 2 +- .../items/tools/ItemDiamondJackhammer.java | 2 +- .../techreborn/items/tools/ItemDrill.java | 12 +++++------ .../items/tools/ItemJackhammer.java | 6 +++--- .../techreborn/items/tools/ItemOmniTool.java | 2 +- .../items/tools/ItemRockCutter.java | 6 +++--- .../items/tools/ItemSteelJackhammer.java | 2 +- .../techreborn/items/tools/ItemTRAxe.java | 2 +- 10 files changed, 29 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index 6cfd57f27..9e6fac46e 100644 --- a/build.gradle +++ b/build.gradle @@ -87,8 +87,8 @@ if (ENV.BUILD_NUMBER) { } minecraft { - version = "1.12.2-14.23.0.2486" - mappings = "snapshot_20170918" + version = "1.12.2-14.23.0.2493" + mappings = "snapshot_20170624" replace "@MODVERSION@", project.version useDepAts = true runDir = "run" @@ -104,22 +104,24 @@ group = 'TechReborn' dependencies { + //Some dep we use wants the older jei, so this ingores it. We grab the latest anyway, so it shoudnt cause any issues. + def withoutOldJEI = { exclude module: 'jei_1.12' } + deobfCompile('RebornCore:RebornCore-1.12.2:+:universal') { transitive = false } - deobfCompile "mezz.jei:jei_1.12:+" + deobfCompile "mezz.jei:jei_1.12.2:+" compile "mcp.mobius.waila:Hwyla:+" compile "net.darkhax.tesla:Tesla-1.12:1.0.59:deobf" //1.11 updates //deobfCompile "slimeknights:TConstruct:1.10.2-2.5.3.jenkins384" //deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170" - deobfCompile "mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.11-5" - compile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.0.0.5" - deobfCompile 'net.industrial-craft:industrialcraft-2:2.8.7-ex112' - //compile name: 'buildcraft', version: '7.99.4', ext: 'jar' - deobfCompile 'cofh:ThermalDynamics:1.12-2.3.4.11:universal' - deobfCompile 'cofh:ThermalExpansion:1.12-5.3.4.16:universal' + deobfCompile "mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.18-10" + compile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.0.7.273", withoutOldJEI + deobfCompile 'net.industrial-craft:industrialcraft-2:2.8.26-ex112', withoutOldJEI + deobfCompile 'cofh:ThermalDynamics:1.12-2.3.5.12:universal', withoutOldJEI + deobfCompile 'cofh:ThermalExpansion:1.12-5.3.5.19:universal', withoutOldJEI } diff --git a/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java b/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java index 86e254481..409dcc95c 100644 --- a/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemAdvancedJackhammer.java @@ -38,7 +38,7 @@ public class ItemAdvancedJackhammer extends ItemJackhammer { public ItemAdvancedJackhammer() { super(ToolMaterial.IRON, "techreborn.advancedJackhammer", ConfigTechReborn.AdvancedJackhammerCharge); this.cost = 250; - this.efficiency = 60F; + this.efficiencyOnProperMaterial = 60F; } @SuppressWarnings({ "rawtypes", "unchecked" }) diff --git a/src/main/java/techreborn/items/tools/ItemChainsaw.java b/src/main/java/techreborn/items/tools/ItemChainsaw.java index 1590cd46a..4ace2b160 100644 --- a/src/main/java/techreborn/items/tools/ItemChainsaw.java +++ b/src/main/java/techreborn/items/tools/ItemChainsaw.java @@ -60,7 +60,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, IEnergyInt public ItemChainsaw(ToolMaterial material, String unlocalizedName, int energyCapacity, float unpoweredSpeed) { super(material); - efficiency = 20F; + efficiencyOnProperMaterial = 20F; setCreativeTab(TechRebornCreativeTab.instance); setMaxStackSize(1); setUnlocalizedName(unlocalizedName); diff --git a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java index 6fbb239a6..cc13c3d7d 100644 --- a/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemDiamondJackhammer.java @@ -38,7 +38,7 @@ public class ItemDiamondJackhammer extends ItemJackhammer { public ItemDiamondJackhammer() { super(ToolMaterial.DIAMOND, "techreborn.diamondJackhammer", ConfigTechReborn.DiamondJackhammerCharge); this.cost = 100; - this.efficiency = 16F; + this.efficiencyOnProperMaterial = 16F; } @SuppressWarnings({ "rawtypes", "unchecked" }) diff --git a/src/main/java/techreborn/items/tools/ItemDrill.java b/src/main/java/techreborn/items/tools/ItemDrill.java index 23a5963c4..490a1ad29 100644 --- a/src/main/java/techreborn/items/tools/ItemDrill.java +++ b/src/main/java/techreborn/items/tools/ItemDrill.java @@ -54,7 +54,7 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, IEnergyIn public ItemDrill(ToolMaterial material, String unlocalizedName, int energyCapacity, float unpoweredSpeed, float efficiencyOnProperMaterial) { super(material); - this.efficiency = efficiencyOnProperMaterial; + this.efficiencyOnProperMaterial = efficiencyOnProperMaterial; setCreativeTab(TechRebornCreativeTab.instance); setMaxStackSize(1); setUnlocalizedName(unlocalizedName); @@ -73,15 +73,15 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, IEnergyIn } @Override - public float getDestroySpeed(ItemStack stack, IBlockState state) { + public float getStrVsBlock(ItemStack stack, IBlockState state) { if (!PoweredItem.canUseEnergy(cost, stack)) { return unpoweredSpeed; } - if (Items.WOODEN_PICKAXE.getDestroySpeed(stack, state) > 1.0F - || Items.WOODEN_SHOVEL.getDestroySpeed(stack, state) > 1.0F) { - return efficiency; + if (Items.WOODEN_PICKAXE.getStrVsBlock(stack, state) > 1.0F + || Items.WOODEN_SHOVEL.getStrVsBlock(stack, state) > 1.0F) { + return efficiencyOnProperMaterial; } else { - return super.getDestroySpeed(stack, state); + return super.getStrVsBlock(stack, state); } } diff --git a/src/main/java/techreborn/items/tools/ItemJackhammer.java b/src/main/java/techreborn/items/tools/ItemJackhammer.java index 0ff0419bf..3e137e2cd 100644 --- a/src/main/java/techreborn/items/tools/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemJackhammer.java @@ -59,7 +59,7 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, IEne public ItemJackhammer(ToolMaterial material, String unlocalizedName, int energyCapacity) { super(material); - efficiency = 20F; + efficiencyOnProperMaterial = 20F; setCreativeTab(TechRebornCreativeTab.instance); setMaxStackSize(1); setMaxDamage(240); @@ -84,9 +84,9 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, IEne } @Override - public float getDestroySpeed(ItemStack stack, IBlockState state) { + public float getStrVsBlock(ItemStack stack, IBlockState state) { if ((OreDictUtils.isOre(state, "stone") || state.getBlock() == Blocks.STONE) && PoweredItem.canUseEnergy(cost, stack)) { - return efficiency; + return efficiencyOnProperMaterial; } else { return 0.5F; } diff --git a/src/main/java/techreborn/items/tools/ItemOmniTool.java b/src/main/java/techreborn/items/tools/ItemOmniTool.java index 5e5986ed2..879c4813d 100644 --- a/src/main/java/techreborn/items/tools/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tools/ItemOmniTool.java @@ -61,7 +61,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, IEnerg public ItemOmniTool() { super(ToolMaterial.DIAMOND); - efficiency = 13F; + efficiencyOnProperMaterial = 13F; setCreativeTab(TechRebornCreativeTab.instance); setMaxStackSize(1); setMaxDamage(200); diff --git a/src/main/java/techreborn/items/tools/ItemRockCutter.java b/src/main/java/techreborn/items/tools/ItemRockCutter.java index ca02579a7..e58cfe648 100644 --- a/src/main/java/techreborn/items/tools/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tools/ItemRockCutter.java @@ -63,7 +63,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, IEne setUnlocalizedName("techreborn.rockcutter"); setCreativeTab(TechRebornCreativeTab.instance); setMaxStackSize(1); - efficiency = 16F; + efficiencyOnProperMaterial = 16F; } @Override @@ -98,11 +98,11 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, IEne } @Override - public float getDestroySpeed(ItemStack stack, IBlockState state) { + public float getStrVsBlock(ItemStack stack, IBlockState state) { if (!PoweredItem.canUseEnergy(cost, stack)) { return 2F; } else { - return Items.DIAMOND_PICKAXE.getDestroySpeed(stack, state); + return Items.DIAMOND_PICKAXE.getStrVsBlock(stack, state); } } diff --git a/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java index d60069580..816720198 100644 --- a/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java +++ b/src/main/java/techreborn/items/tools/ItemSteelJackhammer.java @@ -38,7 +38,7 @@ public class ItemSteelJackhammer extends ItemJackhammer { public ItemSteelJackhammer() { super(ToolMaterial.DIAMOND, "techreborn.steelJackhammer", ConfigTechReborn.SteelJackhammerCharge); this.cost = 50; - this.efficiency = 12F; + this.efficiencyOnProperMaterial = 12F; } @SuppressWarnings({ "rawtypes", "unchecked" }) diff --git a/src/main/java/techreborn/items/tools/ItemTRAxe.java b/src/main/java/techreborn/items/tools/ItemTRAxe.java index 3165054ff..d77dcbf19 100644 --- a/src/main/java/techreborn/items/tools/ItemTRAxe.java +++ b/src/main/java/techreborn/items/tools/ItemTRAxe.java @@ -32,7 +32,7 @@ public class ItemTRAxe extends ItemAxe { private ToolMaterial material = ToolMaterial.WOOD; public ItemTRAxe(ToolMaterial material) { - super(material, material.getAttackDamage() + 5.75F, (material.getAttackDamage() + 6.75F) * -0.344444F); + super(material, material.getDamageVsEntity() + 5.75F, (material.getDamageVsEntity() + 6.75F) * -0.344444F); setUnlocalizedName(material.name().toLowerCase() + "Axe"); setCreativeTab(TechRebornCreativeTabMisc.instance); this.material = material;