Fix Materials (#313)

* update dep
update bs

* update rc

* re add jitpack
fix material

* fix materials

* spotless

* more fixes

* spotless

* update dep

Former-commit-id: a3de933f31b9060032519ec922ac03af63d442d0

5 files changed, 17 insertions, 18 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java
index cc072482f4..58b7556850 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ElectricImplosionCompressorRecipes.java
@@ -12,11 +12,7 @@ import static gregtech.api.util.GT_ModHandler.getModItem;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.TierEU;
+import gregtech.api.enums.*;
 import gregtech.api.util.GT_OreDictUnificator;
 
 public class ElectricImplosionCompressorRecipes implements Runnable {
@@ -49,7 +45,7 @@ public class ElectricImplosionCompressorRecipes implements Runnable {
             addElectricImplosionRecipe(
                     // IN.
                     new ItemStack[] { GT_Values.NI },
-                    new FluidStack[] { Materials.SpaceTime.getMolten(72L) },
+                    new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten(72L) },
                     // OUT.
                     new ItemStack[] { getModItem(EternalSingularity.ID, "eternal_singularity", 1L) },
                     new FluidStack[] { GT_Values.NF },
@@ -109,13 +105,13 @@ public class ElectricImplosionCompressorRecipes implements Runnable {
         // Magneto material recipe for base fluid.
         addElectricImplosionRecipe(
                 // IN.
-                new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.nanite, Materials.WhiteDwarfMatter, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.nanite, Materials.Universium, 1L),
-                        GT_OreDictUnificator.get(OrePrefixes.nanite, Materials.BlackDwarfMatter, 1L) },
-                new FluidStack[] { Materials.RawStarMatter.getFluid(64 * 144L) },
+                new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.nanite, MaterialsUEVplus.WhiteDwarfMatter, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.nanite, MaterialsUEVplus.Universium, 1L),
+                        GT_OreDictUnificator.get(OrePrefixes.nanite, MaterialsUEVplus.BlackDwarfMatter, 1L) },
+                new FluidStack[] { MaterialsUEVplus.RawStarMatter.getFluid(64 * 144L) },
                 // OUT.
                 new ItemStack[] { GT_Values.NI },
-                new FluidStack[] { Materials.MagnetohydrodynamicallyConstrainedStarMatter.getMolten(16 * 144L) },
+                new FluidStack[] { MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter.getMolten(16 * 144L) },
                 // Recipe stats.
                 20 * 4,
                 (int) TierEU.RECIPE_UXV);
@@ -156,11 +152,11 @@ public class ElectricImplosionCompressorRecipes implements Runnable {
                     new ItemStack[] { circuit.splitStack(circuitMultiplier),
                             getModItem(SuperSolarPanels.ID, "solarsplitter", 1, 0),
                             getModItem(OpenComputers.ID, "hologram2", circuitMultiplier, 0),
-                            GT_OreDictUnificator.get(part, Materials.Universium, multiplier), },
-                    new FluidStack[] { Materials.MagnetohydrodynamicallyConstrainedStarMatter
+                            GT_OreDictUnificator.get(part, MaterialsUEVplus.Universium, multiplier), },
+                    new FluidStack[] { MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter
                             .getMolten((long) partFraction * multiplier) },
                     new ItemStack[] { GT_OreDictUnificator
-                            .get(part, Materials.MagnetohydrodynamicallyConstrainedStarMatter, multiplier) },
+                            .get(part, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, multiplier) },
                     new FluidStack[] { GT_Values.NF },
                     (int) (multiplier * (20 * partFraction / 144.0)),
                     (int) TierEU.RECIPE_UXV);
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidSolidifier.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidSolidifier.java
index be00d552de..13c431fce8 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidSolidifier.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/FluidSolidifier.java
@@ -9,6 +9,7 @@ import com.github.bartimaeusnek.bartworks.util.BW_Util;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.MaterialsUEVplus;
 
 public class FluidSolidifier implements Runnable {
 
@@ -72,7 +73,7 @@ public class FluidSolidifier implements Runnable {
                 BW_Util.getMachineVoltageFromTier(10));
         GT_Values.RA.addFluidSolidifierRecipe(
                 new ItemStack(ItemRegistry.bw_glasses[0], 1, 0),
-                Materials.TranscendentMetal.getMolten(1152),
+                MaterialsUEVplus.TranscendentMetal.getMolten(1152),
                 new ItemStack(ItemRegistry.bw_glasses[1], 1, 0),
                 800,
                 BW_Util.getMachineVoltageFromTier(11));
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Pulverizer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Pulverizer.java
index 35c99413e4..58c6746a23 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Pulverizer.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Pulverizer.java
@@ -8,6 +8,7 @@ import com.github.bartimaeusnek.bartworks.util.BW_Util;
 
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.MaterialsUEVplus;
 import gregtech.api.enums.OrePrefixes;
 
 public class Pulverizer implements Runnable {
@@ -65,7 +66,8 @@ public class Pulverizer implements Runnable {
                 BW_Util.getMachineVoltageFromTier(11));
         GT_Values.RA.addPulveriserRecipe(
                 new ItemStack(ItemRegistry.bw_glasses[1], 1, 0),
-                new ItemStack[] { Materials.BorosilicateGlass.getDust(9), Materials.TranscendentMetal.getDust(8) },
+                new ItemStack[] { Materials.BorosilicateGlass.getDust(9),
+                        MaterialsUEVplus.TranscendentMetal.getDust(8) },
                 null,
                 800,
                 BW_Util.getMachineVoltageFromTier(12));
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserDynamo.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserDynamo.java
index 1b7b4441ef..8452086fdb 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserDynamo.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserDynamo.java
@@ -34,7 +34,7 @@ public class TT_MetaTileEntity_LowPowerLaserDynamo extends GT_MetaTileEntity_Hat
 
     public TT_MetaTileEntity_LowPowerLaserDynamo(String aName, int aTier, int aAmp, String aDescription,
             ITexture[][][] aTextures) {
-        super(aName, aTier, aAmp, aDescription, aTextures);
+        super(aName, aTier, aAmp, new String[] { aDescription }, aTextures);
     }
 
     @Override
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserHatch.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserHatch.java
index 025e80a9c6..c9854e4cbd 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserHatch.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/tileentites/tiered/TT_MetaTileEntity_LowPowerLaserHatch.java
@@ -34,7 +34,7 @@ public class TT_MetaTileEntity_LowPowerLaserHatch extends GT_MetaTileEntity_Hatc
 
     public TT_MetaTileEntity_LowPowerLaserHatch(String aName, int aTier, int aAmp, String aDescription,
             ITexture[][][] aTextures) {
-        super(aName, aTier, aAmp, aDescription, aTextures);
+        super(aName, aTier, aAmp, new String[] { aDescription }, aTextures);
     }
 
     @Override