Fixed Heroic, obsidiorite

build.gradle

@@ -63,9 +63,9 @@ task buildInfo {
 version = project.buildInfo.revision
 
 minecraft {
-    version = "1.12.2-14.23.5.2768"
+    version = "1.12.2-14.23.5.2838"
     runDir = "run"
-    mappings = "snapshot_20170801"
+    mappings = "snapshot_20171003"
     replace '@VERSION@', project.version
 }
 
@@ -76,7 +76,7 @@ version = "${mc_version}-${project.buildInfo.revision}"
 dependencies {
     deobfCompile "slimeknights.mantle:Mantle:1.12-1.3.+:deobf"
     deobfCompile "mezz.jei:jei_1.12.2:4.+"
-    deobfCompile "slimeknights:TConstruct:1.12.2-2.10.+:deobf"
+    deobfCompile "slimeknights:TConstruct:1.12.2-2.12.0.135:deobf"
 }
 
 sourceSets {

src/main/java/META-INF/MANIFEST.MF

@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Class-Path: jline-3.5.1.jar log4j-core-2.8.1.jar commons-logging-1.1.3.j
+ ar asm-debug-all-5.2.jar commons-codec-1.10.jar text2speech-1.10.3.jar 
+ config-1.2.1.jar httpcore-4.3.2.jar scala-actors-2.11.0.jar lwjgl-platf
+ orm-2.9.4-nightly-20150209-natives-linux.jar akka-actor_2.11-2.3.3.jar 
+ libraryjavasound-20101123.jar scala-actors-migration_2.11-1.1.0.jar log
+ 4j-api-2.8.1.jar lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar 
+ platform-3.4.0.jar codecwav-20101023.jar jopt-simple-5.0.3.jar commons-
+ compress-1.8.1.jar commons-lang3-3.5.jar lwjgl-platform-2.9.4-nightly-2
+ 0150209-natives-windows.jar jna-4.4.0.jar providedDummy.jar vecmath-1.5
+ .2.jar codecjorbis-20101023.jar commons-io-2.5.jar forgeSrc-1.12.2-14.2
+ 3.5.2768.jar Mantle-1.12-1.3.3.56.jar lwjgl_util-2.9.4-nightly-20150209
+ .jar guava-21.0.jar jutils-1.0.0.jar trove4j-3.0.3.jar scala-reflect-2.
+ 11.1.jar gson-2.8.0.jar scala-compiler-2.11.1.jar jinput-platform-2.0.5
+ -natives-linux.jar patchy-1.1.jar authlib-1.5.25.jar maven-artifact-3.5
+ .3.jar soundsystem-20120107.jar scala-continuations-library_2.11-1.0.2.
+ jar librarylwjglopenal-20100824.jar lzma-0.0.1.jar fastutil-7.1.0.jar j
+ input-platform-2.0.5-natives-osx.jar compileDummy.jar plexus-utils-3.1.
+ 0.jar jei_1.12.2-4.15.0.291.jar oshi-core-1.1.jar java-objc-bridge-1.0.
+ 0.jar realms-1.10.22.jar scala-library-2.11.1.jar scala-swing_2.11-1.0.
+ 1.jar scala-parser-combinators_2.11-1.0.1.jar netty-all-4.1.9.Final.jar
+  jinput-platform-2.0.5-natives-windows.jar scala-continuations-plugin_2
+ .11.1-1.0.2.jar scala-xml_2.11-1.0.2.jar lwjgl-2.9.4-nightly-20150209.j
+ ar httpclient-4.3.3.jar jinput-2.0.5.jar icu4j-core-mojang-51.2.jar lau
+ nchwrapper-1.12.jar jsr305-3.0.1.jar TConstruct-1.12.2-2.10.1.519.jar
+

src/main/java/com/sosnitzka/taiga/Fluids.java

@@ -97,7 +97,7 @@ public class Fluids {
      */
     static void registerfromItem() {
         TinkerRegistry.registerMelting(Blocks.blockMeteoriteCobble, meteoriteFluid, 288);
-        TinkerRegistry.registerMelting(Blocks.blockObsidiorite, meteoriteFluid, 288);
+        TinkerRegistry.registerMelting(Blocks.blockObsidioriteCobble, obsidioriteFluid, 288);
         TinkerRegistry.registerMelting(net.minecraft.init.Blocks.MAGMA, magmaFluid, 288);
         TinkerRegistry.registerMelting(Items.dilithiumCrystal, dilithiumFluid, 72);
         TinkerRegistry.registerMelting(Items.tiberiumCrystal, tiberiumFluid, 72);

src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java

@@ -17,19 +17,19 @@ public class TraitHeroic extends AbstractTrait {
         int durability = ToolHelper.getCurrentDurability(tool);
         int durabilitymax = ToolHelper.getMaxDurability(tool);
 
-        int safeDenominator = durabilitymax - durability - 1;
-        if (safeDenominator <= 0) {
-            safeDenominator = 1;
-        }
+        int safeDenominator = noLessThanOne(durabilitymax - durability - 1);
 
-        float calc;
-        if ((durability * durabilitymax / (durabilitymax - durability - 1 / safeDenominator)) != 0) {
-            calc = newDamage + (newDamage / 2) / (durability * durabilitymax / safeDenominator);
-        } else {
-            calc = newDamage + (newDamage / 2) / ((durability * durabilitymax / safeDenominator) + 1);
-        }
-        if ((float) durability < (float) (0.10 * durabilitymax) || player.getHealth() < player.getMaxHealth() / 8 || (target.getHealth() == target.getMaxHealth() && random.nextFloat() > 0.8)) {
+        float calc = newDamage + (newDamage / 2) / (durability * durabilitymax / safeDenominator);
+
+        if ((float) durability < (float) (0.125 * durabilitymax) || player.getHealth() < player.getMaxHealth() / 8 || (target.getHealth() == target.getMaxHealth() && random.nextFloat() > 0.8)) {
             return super.damage(tool, player, target, damage, calc, isCritical);
         } else return super.damage(tool, player, target, damage, newDamage * 0.9f, isCritical);
     }
+
+    private int noLessThanOne(int input){
+        if(input <= 1)
+            return 1;
+        else
+            return input;
+    }
 }

src/main/resources/assets/taiga/lang/en_US.lang

@@ -80,7 +80,7 @@ tile.obsidiorite_block.name=Obsidiorite Block
 tile.magma_block.name=Magma Block
 tile.nitronite_block.name=Nitronite Block
 tile.meteoritecobble_block.name=Meteorite Cobble Block
-tile.obsidioritecobble_block.name=Meteorite Cobble Block
+tile.obsidioritecobble_block.name=Obsidiorite Cobble Block