1.12.2

TechReborn · Sep 18, 2017 · e74067d · e74067d
1 parent e9dd765
commit e74067d
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 25 deletions.
diff --git a/build.conf b/build.conf
@@ -1,5 +1,5 @@
-minecraftVersion="1.12.1"
-name="TechReborn-1.12.1"
+minecraftVersion="1.12.2"
+name="TechReborn-1.12.2"
 curseID="233564"
 child-project="reborncore"
 child-type="requiredLibrary"
diff --git a/build.gradle b/build.gradle
@@ -87,8 +87,8 @@ if (ENV.BUILD_NUMBER) {
 }
 
 minecraft {
-	version = "1.12.1-14.22.0.2456"
-	mappings = "snapshot_20170624"
+	version = "1.12.2-14.23.0.2486"
+	mappings = "snapshot_20170918"
 	replace "@MODVERSION@", project.version
 	useDepAts = true
 	runDir = "run"
@@ -104,7 +104,7 @@ group = 'TechReborn'
 
 
 dependencies {
-	deobfCompile('RebornCore:RebornCore-1.12.1:+:universal') {
+	deobfCompile('RebornCore:RebornCore-1.12.2:+:universal') {
 		transitive = false
 	}
 	deobfCompile "mezz.jei:jei_1.12:+"

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-rootProject.name = "TechReborn-1.12.1"
+rootProject.name = "TechReborn-1.12.2"
diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java
@@ -66,7 +66,7 @@
 
 import java.io.File;
 
-@Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCIES, acceptedMinecraftVersions = "[1.12]", certificateFingerprint = "8727a3141c8ec7f173b87aa78b9b9807867c4e6b")
+@Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCIES, acceptedMinecraftVersions = "[1.12,1.12.2]", certificateFingerprint = "8727a3141c8ec7f173b87aa78b9b9807867c4e6b")
 public class Core {
 
 	@SidedProxy(clientSide = ModInfo.CLIENT_PROXY_CLASS, serverSide = ModInfo.SERVER_PROXY_CLASS)

diff --git 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.efficiencyOnProperMaterial = 60F;
+		this.efficiency = 60F;
 	}
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })

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

diff --git 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.efficiencyOnProperMaterial = efficiencyOnProperMaterial;
+		this.efficiency = efficiencyOnProperMaterial;
 		setCreativeTab(TechRebornCreativeTab.instance);
 		setMaxStackSize(1);
 		setUnlocalizedName(unlocalizedName);
@@ -73,15 +73,15 @@ public boolean onBlockDestroyed(ItemStack stack, World worldIn, IBlockState bloc
 	}
 
 	@Override
-	public float getStrVsBlock(ItemStack stack, IBlockState state) {
+	public float getDestroySpeed(ItemStack stack, IBlockState state) {
 		if (!PoweredItem.canUseEnergy(cost, stack)) {
 			return unpoweredSpeed;
 		}
-		if (Items.WOODEN_PICKAXE.getStrVsBlock(stack, state) > 1.0F
-			|| Items.WOODEN_SHOVEL.getStrVsBlock(stack, state) > 1.0F) {
-			return efficiencyOnProperMaterial;
+		if (Items.WOODEN_PICKAXE.getDestroySpeed(stack, state) > 1.0F
+			|| Items.WOODEN_SHOVEL.getDestroySpeed(stack, state) > 1.0F) {
+			return efficiency;
 		} else {
-			return super.getStrVsBlock(stack, state);
+			return super.getDestroySpeed(stack, state);
 		}
 	}
 

diff --git 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);
-		efficiencyOnProperMaterial = 20F;
+		efficiency = 20F;
 		setCreativeTab(TechRebornCreativeTab.instance);
 		setMaxStackSize(1);
 		setMaxDamage(240);
@@ -84,9 +84,9 @@ public boolean canHarvestBlock(final IBlockState state, final ItemStack stack) {
 	}
 
 	@Override
-	public float getStrVsBlock(ItemStack stack, IBlockState state) {
+	public float getDestroySpeed(ItemStack stack, IBlockState state) {
 		if ((OreDictUtils.isOre(state, "stone") || state.getBlock() == Blocks.STONE) && PoweredItem.canUseEnergy(cost, stack)) {
-			return efficiencyOnProperMaterial;
+			return efficiency;
 		} else {
 			return 0.5F;
 		}

diff --git 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);
-		efficiencyOnProperMaterial = 13F;
+		efficiency = 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
@@ -63,7 +63,7 @@ public ItemRockCutter() {
 		setUnlocalizedName("techreborn.rockcutter");
 		setCreativeTab(TechRebornCreativeTab.instance);
 		setMaxStackSize(1);
-		efficiencyOnProperMaterial = 16F;
+		efficiency = 16F;
 	}
 
 	@Override
@@ -98,11 +98,11 @@ public int getHarvestLevel(ItemStack stack,
 	}
 
 	@Override
-	public float getStrVsBlock(ItemStack stack, IBlockState state) {
+	public float getDestroySpeed(ItemStack stack, IBlockState state) {
 		if (!PoweredItem.canUseEnergy(cost, stack)) {
 			return 2F;
 		} else {
-			return Items.DIAMOND_PICKAXE.getStrVsBlock(stack, state);
+			return Items.DIAMOND_PICKAXE.getDestroySpeed(stack, state);
 		}
 	}
 

diff --git 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.efficiencyOnProperMaterial = 12F;
+		this.efficiency = 12F;
 	}
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })

diff --git 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.getDamageVsEntity() + 5.75F, (material.getDamageVsEntity() + 6.75F) * -0.344444F);
+		super(material, material.getAttackDamage() + 5.75F, (material.getAttackDamage() + 6.75F) * -0.344444F);
 		setUnlocalizedName(material.name().toLowerCase() + "Axe");
 		setCreativeTab(TechRebornCreativeTabMisc.instance);
 		this.material = material;