Downgrade mappings + update all libs

This commit is contained in:
modmuss50 2017-09-28 23:44:16 +01:00
parent 4ce046a2ac
commit f5076ea8af
10 changed files with 29 additions and 27 deletions

View file

@ -87,8 +87,8 @@ if (ENV.BUILD_NUMBER) {
} }
minecraft { minecraft {
version = "1.12.2-14.23.0.2486" version = "1.12.2-14.23.0.2493"
mappings = "snapshot_20170918" mappings = "snapshot_20170624"
replace "@MODVERSION@", project.version replace "@MODVERSION@", project.version
useDepAts = true useDepAts = true
runDir = "run" runDir = "run"
@ -104,22 +104,24 @@ group = 'TechReborn'
dependencies { 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') { deobfCompile('RebornCore:RebornCore-1.12.2:+:universal') {
transitive = false transitive = false
} }
deobfCompile "mezz.jei:jei_1.12:+" deobfCompile "mezz.jei:jei_1.12.2:+"
compile "mcp.mobius.waila:Hwyla:+" compile "mcp.mobius.waila:Hwyla:+"
compile "net.darkhax.tesla:Tesla-1.12:1.0.59:deobf" compile "net.darkhax.tesla:Tesla-1.12:1.0.59:deobf"
//1.11 updates //1.11 updates
//deobfCompile "slimeknights:TConstruct:1.10.2-2.5.3.jenkins384" //deobfCompile "slimeknights:TConstruct:1.10.2-2.5.3.jenkins384"
//deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170" //deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170"
deobfCompile "mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.11-5" deobfCompile "mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.18-10"
compile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.0.0.5" compile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.0.7.273", withoutOldJEI
deobfCompile 'net.industrial-craft:industrialcraft-2:2.8.7-ex112' deobfCompile 'net.industrial-craft:industrialcraft-2:2.8.26-ex112', withoutOldJEI
//compile name: 'buildcraft', version: '7.99.4', ext: 'jar' deobfCompile 'cofh:ThermalDynamics:1.12-2.3.5.12:universal', withoutOldJEI
deobfCompile 'cofh:ThermalDynamics:1.12-2.3.4.11:universal' deobfCompile 'cofh:ThermalExpansion:1.12-5.3.5.19:universal', withoutOldJEI
deobfCompile 'cofh:ThermalExpansion:1.12-5.3.4.16:universal'
} }

View file

@ -38,7 +38,7 @@ public class ItemAdvancedJackhammer extends ItemJackhammer {
public ItemAdvancedJackhammer() { public ItemAdvancedJackhammer() {
super(ToolMaterial.IRON, "techreborn.advancedJackhammer", ConfigTechReborn.AdvancedJackhammerCharge); super(ToolMaterial.IRON, "techreborn.advancedJackhammer", ConfigTechReborn.AdvancedJackhammerCharge);
this.cost = 250; this.cost = 250;
this.efficiency = 60F; this.efficiencyOnProperMaterial = 60F;
} }
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })

View file

@ -60,7 +60,7 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, IEnergyInt
public ItemChainsaw(ToolMaterial material, String unlocalizedName, int energyCapacity, public ItemChainsaw(ToolMaterial material, String unlocalizedName, int energyCapacity,
float unpoweredSpeed) { float unpoweredSpeed) {
super(material); super(material);
efficiency = 20F; efficiencyOnProperMaterial = 20F;
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setMaxStackSize(1); setMaxStackSize(1);
setUnlocalizedName(unlocalizedName); setUnlocalizedName(unlocalizedName);

View file

@ -38,7 +38,7 @@ public class ItemDiamondJackhammer extends ItemJackhammer {
public ItemDiamondJackhammer() { public ItemDiamondJackhammer() {
super(ToolMaterial.DIAMOND, "techreborn.diamondJackhammer", ConfigTechReborn.DiamondJackhammerCharge); super(ToolMaterial.DIAMOND, "techreborn.diamondJackhammer", ConfigTechReborn.DiamondJackhammerCharge);
this.cost = 100; this.cost = 100;
this.efficiency = 16F; this.efficiencyOnProperMaterial = 16F;
} }
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })

View file

@ -54,7 +54,7 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, IEnergyIn
public ItemDrill(ToolMaterial material, String unlocalizedName, int energyCapacity, float unpoweredSpeed, float efficiencyOnProperMaterial) { public ItemDrill(ToolMaterial material, String unlocalizedName, int energyCapacity, float unpoweredSpeed, float efficiencyOnProperMaterial) {
super(material); super(material);
this.efficiency = efficiencyOnProperMaterial; this.efficiencyOnProperMaterial = efficiencyOnProperMaterial;
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setMaxStackSize(1); setMaxStackSize(1);
setUnlocalizedName(unlocalizedName); setUnlocalizedName(unlocalizedName);
@ -73,15 +73,15 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, IEnergyIn
} }
@Override @Override
public float getDestroySpeed(ItemStack stack, IBlockState state) { public float getStrVsBlock(ItemStack stack, IBlockState state) {
if (!PoweredItem.canUseEnergy(cost, stack)) { if (!PoweredItem.canUseEnergy(cost, stack)) {
return unpoweredSpeed; return unpoweredSpeed;
} }
if (Items.WOODEN_PICKAXE.getDestroySpeed(stack, state) > 1.0F if (Items.WOODEN_PICKAXE.getStrVsBlock(stack, state) > 1.0F
|| Items.WOODEN_SHOVEL.getDestroySpeed(stack, state) > 1.0F) { || Items.WOODEN_SHOVEL.getStrVsBlock(stack, state) > 1.0F) {
return efficiency; return efficiencyOnProperMaterial;
} else { } else {
return super.getDestroySpeed(stack, state); return super.getStrVsBlock(stack, state);
} }
} }

View file

@ -59,7 +59,7 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, IEne
public ItemJackhammer(ToolMaterial material, String unlocalizedName, int energyCapacity) { public ItemJackhammer(ToolMaterial material, String unlocalizedName, int energyCapacity) {
super(material); super(material);
efficiency = 20F; efficiencyOnProperMaterial = 20F;
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setMaxStackSize(1); setMaxStackSize(1);
setMaxDamage(240); setMaxDamage(240);
@ -84,9 +84,9 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, IEne
} }
@Override @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)) { if ((OreDictUtils.isOre(state, "stone") || state.getBlock() == Blocks.STONE) && PoweredItem.canUseEnergy(cost, stack)) {
return efficiency; return efficiencyOnProperMaterial;
} else { } else {
return 0.5F; return 0.5F;
} }

View file

@ -61,7 +61,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, IEnerg
public ItemOmniTool() { public ItemOmniTool() {
super(ToolMaterial.DIAMOND); super(ToolMaterial.DIAMOND);
efficiency = 13F; efficiencyOnProperMaterial = 13F;
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setMaxStackSize(1); setMaxStackSize(1);
setMaxDamage(200); setMaxDamage(200);

View file

@ -63,7 +63,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, IEne
setUnlocalizedName("techreborn.rockcutter"); setUnlocalizedName("techreborn.rockcutter");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setMaxStackSize(1); setMaxStackSize(1);
efficiency = 16F; efficiencyOnProperMaterial = 16F;
} }
@Override @Override
@ -98,11 +98,11 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, IEne
} }
@Override @Override
public float getDestroySpeed(ItemStack stack, IBlockState state) { public float getStrVsBlock(ItemStack stack, IBlockState state) {
if (!PoweredItem.canUseEnergy(cost, stack)) { if (!PoweredItem.canUseEnergy(cost, stack)) {
return 2F; return 2F;
} else { } else {
return Items.DIAMOND_PICKAXE.getDestroySpeed(stack, state); return Items.DIAMOND_PICKAXE.getStrVsBlock(stack, state);
} }
} }

View file

@ -38,7 +38,7 @@ public class ItemSteelJackhammer extends ItemJackhammer {
public ItemSteelJackhammer() { public ItemSteelJackhammer() {
super(ToolMaterial.DIAMOND, "techreborn.steelJackhammer", ConfigTechReborn.SteelJackhammerCharge); super(ToolMaterial.DIAMOND, "techreborn.steelJackhammer", ConfigTechReborn.SteelJackhammerCharge);
this.cost = 50; this.cost = 50;
this.efficiency = 12F; this.efficiencyOnProperMaterial = 12F;
} }
@SuppressWarnings({ "rawtypes", "unchecked" }) @SuppressWarnings({ "rawtypes", "unchecked" })

View file

@ -32,7 +32,7 @@ public class ItemTRAxe extends ItemAxe {
private ToolMaterial material = ToolMaterial.WOOD; private ToolMaterial material = ToolMaterial.WOOD;
public ItemTRAxe(ToolMaterial material) { 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"); setUnlocalizedName(material.name().toLowerCase() + "Axe");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
this.material = material; this.material = material;