Smaller fixes

+ added a recipe for Th232
+ enforced Zr unification
+ added a quality override for ToolQuality
+ used getters for speed, dur, and quality

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>

Former-commit-id: bca918b0f7e147511705d8c2051e18072250cf5e

3 files changed, 25 insertions, 13 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java
index 6427023dba..83dbfd0fcd 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_THTR.java
@@ -324,6 +324,13 @@ public class GT_TileEntity_THTR extends GT_MetaTileEntity_MultiBlockBase {
         }
 
         public static void registerTHR_Recipes(){
+            GT_Values.RA.addCentrifugeRecipe(
+                    Materials.Thorium.getDust(1),GT_Values.NI,GT_Values.NF,GT_Values.NF,
+                    Materials.Thorium.getDustSmall(2),Materials.Thorium.getDustSmall(1),
+                    WerkstoffLoader.Thorium232.get(OrePrefixes.dustTiny,1),WerkstoffLoader.Thorium232.get(OrePrefixes.dustTiny,1),
+                    WerkstoffLoader.Thorium232.get(OrePrefixes.dustTiny,1),Materials.Lutetium.getDustTiny(1),
+                    new int[]{1600,1500,200,200,50,50},
+                    10000, BW_Util.getMachineVoltageFromTier(4));
             GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
                     GT_OreDictUnificator.get(OrePrefixes.plateDense,Materials.Lead,6),
                     GT_OreDictUnificator.get(OrePrefixes.frameGt,Materials.TungstenSteel,1)
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
index b71cb43c24..dd13e5c734 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java
@@ -38,6 +38,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.nio.ByteBuffer;
 import java.util.*;
 
+@SuppressWarnings("ALL")
 public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
 
     public static final LinkedHashSet<Werkstoff> werkstoffHashSet = new LinkedHashSet<>();
@@ -382,17 +383,17 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
     }
 
     public byte getToolQuality() {
-        return (byte) ( (15f * (((float)this.getStats().getProtons() / 188f) + (float) this.getStats().getMeltingPoint() / 10801f)) / (float) this.getContents().getKey() );
+        return this.stats.getQualityOverride() > 0 ? this.stats.getQualityOverride() : (byte) ( (15f * (((float)this.getStats().getProtons() / 188f) + (float) this.getStats().getMeltingPoint() / 10801f)) / (float) this.getContents().getKey() );
     }
 
     public float getToolSpeed() {
-        return this.stats.speedOverride > 0f ? this.stats.speedOverride : Math.max(1f,
+        return this.stats.getSpeedOverride() > 0f ? this.stats.getSpeedOverride() : Math.max(1f,
                 2f*((float) -this.getStats().getMass() + 0.1f * (float) this.getStats().getMeltingPoint() + (float) this.getStats().getProtons()) * 0.1f / (float) this.getContents().getKey() * 0.1f * (float) this.getToolQuality()
         );
     }
 
     public int getDurability() {
-        return this.stats.durOverride > 0 ? this.stats.durOverride : (int) (this.stats.durMod * ((0.01f * (float) this.getStats().getMeltingPoint() * (float) this.getStats().getMass()) / (float) this.getContents().getKey()));
+        return this.stats.getDurOverride() > 0 ? this.stats.getDurOverride() : (int) (this.stats.durMod * ((0.01f * (float) this.getStats().getMeltingPoint() * (float) this.getStats().getMass()) / (float) this.getContents().getKey()));
     }
 
     public enum Types {
@@ -669,22 +670,25 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
             this.speedOverride = speedOverride;
         }
 
-        public float getTierOverride() {
-            return tierOverride;
+        public byte getQualityOverride() {
+            return qualityOverride;
         }
 
-        public void setTierOverride(float tierOverride) {
-            this.tierOverride = tierOverride;
+        public void setQualityOverride(byte qualityOverride) {
+            this.qualityOverride = qualityOverride;
         }
 
+        byte qualityOverride;
+        int durOverride;
+        float speedOverride;
+
         int meltingPoint;
+
         long protons;
         long neutrons;
         long electrons;
         long mass;
-        int durOverride;
-        float speedOverride;
-        float tierOverride;
+
         float durMod = 1f;
 
         public float getDurMod() {
@@ -775,8 +779,9 @@ public class Werkstoff implements IColorModulationContainer, ISubTagContainer {
             return enchantmentlvl;
         }
 
-        public void setEnchantmentlvl(byte enchantmentlvl) {
+        public Werkstoff.Stats setEnchantmentlvl(byte enchantmentlvl) {
             this.enchantmentlvl = enchantmentlvl;
+            return this;
         }
 
         public boolean isRadioactive() {
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
index 4c92f195f1..76749db065 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
@@ -162,7 +162,7 @@ public class WerkstoffLoader implements Runnable {
             "Zr",
             new Werkstoff.Stats().setProtons(40).setMeltingPoint(2130),
             Werkstoff.Types.ELEMENT,
-            new Werkstoff.GenerationFeatures().onlyDust(),
+            new Werkstoff.GenerationFeatures().onlyDust().enforceUnification(),
             3,
             TextureSet.SET_METALLIC
             //No Byproducts
@@ -1659,7 +1659,7 @@ public class WerkstoffLoader implements Runnable {
                     } catch (NoSuchFieldException | IllegalAccessException ignored){}
                     werkstoffBridgeMaterial.mChemicalFormula = werkstoff.getToolTip();
                     if (Loader.isModLoaded("Thaumcraft"))
-                        werkstoffBridgeMaterial.mAspects=werkstoff.getGTWrappedTCAspects();
+                        werkstoffBridgeMaterial.mAspects = werkstoff.getGTWrappedTCAspects();
                     werkstoffBridgeMaterial.mMaterialInto = werkstoffBridgeMaterial;
                     werkstoffBridgeMaterial.mHandleMaterial = werkstoff.contains(SubTag.BURNING) ? Materials.Blaze : werkstoff.contains(SubTag.MAGICAL) ? Materials.Thaumium : werkstoffBridgeMaterial.mDurability > 5120 ? Materials.TungstenSteel : werkstoffBridgeMaterial.mDurability > 1280 ? Materials.Steel : Materials.Wood;
                     //toRem.add(werkstoffBridgeMaterial);