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

7 files changed, 45 insertions, 110 deletions

diff --git a/build.gradle b/build.gradle
index 055dcee435..f82d369676 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1680120787
+//version: 1681680742
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -67,20 +67,21 @@ plugins {
     id 'com.google.devtools.ksp' version '1.8.0-1.0.9' apply false
     id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle
     id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
-    id 'com.palantir.git-version' version '0.13.0' apply false // 0.13.0 is the last jvm8 supporting version
+    id 'com.palantir.git-version' version '3.0.0' apply false
     id 'de.undercouch.download' version '5.3.0'
     id 'com.github.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle
     id 'com.diffplug.spotless' version '6.7.2' apply false
     id 'com.modrinth.minotaur' version '2.+' apply false
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
-    id 'com.gtnewhorizons.retrofuturagradle' version '1.2.4'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.2.5'
 }
 boolean settingsupdated = verifySettingsGradle()
 settingsupdated = verifyGitAttributes() || settingsupdated
 if (settingsupdated)
     throw new GradleException("Settings has been updated, please re-run task.")
 
-if (project.file('.git/HEAD').isFile()) {
+// In submodules, .git is a file pointing to the real git dir
+if (project.file('.git/HEAD').isFile() || project.file('.git').isFile()) {
     apply plugin: 'com.palantir.git-version'
 }
 
@@ -201,6 +202,14 @@ configurations {
         canBeConsumed = false
         canBeResolved = false
     }
+
+    create("devOnlyNonPublishable") {
+        description = "Runtime and compiletime dependencies that are not published alongside the jar (compileOnly + runtimeOnlyNonPublishable)"
+        canBeConsumed = false
+        canBeResolved = false
+    }
+    compileOnly.extendsFrom(devOnlyNonPublishable)
+    runtimeOnlyNonPublishable.extendsFrom(devOnlyNonPublishable)
 }
 
 if (enableModernJavaSyntax.toBoolean()) {
@@ -1388,7 +1397,7 @@ static int replaceParams(File file, Map<String, String> params) {
     return 0
 }
 
-// Dependency Deobfuscation
+// Dependency Deobfuscation (Deprecated, use the new RFG API documented in dependencies.gradle)
 
 def deobf(String sourceURL) {
     try {
@@ -1430,11 +1439,7 @@ def deobfMaven(String repoURL, String mavenDep) {
 }
 
 def deobfCurse(String curseDep) {
-    try {
-        return deobfMaven("https://www.cursemaven.com/", "curse.maven:$curseDep")
-    } catch (Exception ignored) {
-        out.style(Style.Failure).println("Failed to get $curseDep from cursemaven.")
-    }
+    return dependencies.rfg.deobf("curse.maven:$curseDep")
 }
 
 // The method above is to be preferred. Use this method if the filename is not at the end of the URL.
@@ -1442,34 +1447,7 @@ def deobf(String sourceURL, String rawFileName) {
     String bon2Version = "2.5.1"
     String fileName = URLDecoder.decode(rawFileName, "UTF-8")
     String cacheDir = "$project.gradle.gradleUserHomeDir/caches"
-    String bon2Dir = "$cacheDir/forge_gradle/deobf"
-    String bon2File = "$bon2Dir/BON2-${bon2Version}.jar"
     String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar"
-    String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar"
-
-    if (file(deobfFile).exists()) {
-        return files(deobfFile)
-    }
-
-    String mappingsVer
-    String remoteMappings = project.hasProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/'
-    if (remoteMappings) {
-        String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion"
-        String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip"
-
-        zipMappings(mappingsZIP, remoteMappings, bon2Dir)
-
-        mappingsVer = "snapshot_$id"
-    } else {
-        mappingsVer = "${channel}_$mappingsVersion"
-    }
-
-    download.run {
-        src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar"
-        dest bon2File
-        quiet true
-        overwrite false
-    }
 
     download.run {
         src sourceURL
@@ -1477,50 +1455,8 @@ def deobf(String sourceURL, String rawFileName) {
         quiet true
         overwrite false
     }
-
-    exec {
-        commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch'
-        workingDir bon2Dir
-        standardOutput = new FileOutputStream("${deobfFile}.log")
-    }
-
-    return files(deobfFile)
+    return dependencies.rfg.deobf(files(obfFile))
 }
-
-def zipMappings(String zipPath, String url, String bon2Dir) {
-    File zipFile = new File(zipPath)
-    if (zipFile.exists()) {
-        return
-    }
-
-    String fieldsCache = "$bon2Dir/data/fields.csv"
-    String methodsCache = "$bon2Dir/data/methods.csv"
-
-    download.run {
-        src "${url}fields.csv"
-        dest fieldsCache
-        quiet true
-    }
-    download.run {
-        src "${url}methods.csv"
-        dest methodsCache
-        quiet true
-    }
-
-    zipFile.getParentFile().mkdirs()
-    ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile))
-
-    zos.putNextEntry(new ZipEntry("fields.csv"))
-    Files.copy(Paths.get(fieldsCache), zos)
-    zos.closeEntry()
-
-    zos.putNextEntry(new ZipEntry("methods.csv"))
-    Files.copy(Paths.get(methodsCache), zos)
-    zos.closeEntry()
-
-    zos.close()
-}
-
 // Helper methods
 
 def checkPropertyExists(String propertyName) {
diff --git a/dependencies.gradle b/dependencies.gradle
index f85ed87dfb..6882e5eafa 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,38 +1,38 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.42.48:dev")
-    api("com.github.GTNewHorizons:TecTech:5.0.85:dev")
-    implementation("com.github.GTNewHorizons:TinkersConstruct:1.9.23-GTNH:dev")
-    api("com.github.GTNewHorizons:Galacticraft:3.0.64-GTNH:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.42.67-pre:dev")
+    api("com.github.GTNewHorizons:TecTech:5.1.15-pre:dev")
+    implementation("com.github.GTNewHorizons:TinkersConstruct:1.9.26-GTNH:dev")
+    api("com.github.GTNewHorizons:Galacticraft:3.0.67-GTNH:dev")
     api("com.github.GTNewHorizons:GalacticGregGT5:1.0.8:dev") {
         exclude group:"com.github.GTNewHorizons", module:"bartworks"
     }
-    api("com.github.GTNewHorizons:ModularUI:1.0.66:dev")
+    api("com.github.GTNewHorizons:ModularUI:1.1.2:dev")
 
-    api("com.github.GTNewHorizons:Avaritia:1.35:dev")
+    api("com.github.GTNewHorizons:Avaritia:1.37:dev")
 
-    compileOnly("com.github.GTNewHorizons:AppleCore:3.2.8:dev") {
+    compileOnly("com.github.GTNewHorizons:AppleCore:3.2.10:dev") {
         transitive = false
     }
     compileOnly("com.github.GTNewHorizons:TinkersGregworks:master-SNAPSHOT:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:ForestryMC:4.5.6:api") {
+    compileOnly("com.github.GTNewHorizons:ForestryMC:4.6.5:api") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:Railcraft:9.13.16:api") {
+    compileOnly("com.github.GTNewHorizons:Railcraft:9.14.1:api") {
         transitive = false
     }
 
-    compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.54:api") {
+    compileOnly("com.github.GTNewHorizons:EnderIO:2.4.10:api") {
         transitive = false
     }
 
-    compileOnly("com.github.GTNewHorizons:OpenComputers:1.8.0.9-GTNH:api") {
+    compileOnly("com.github.GTNewHorizons:OpenComputers:1.9.1-GTNH:api") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.28:dev") {
+    compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.33:dev") {
         transitive = false
     }
     compileOnly("com.github.GTNewHorizons:ProjectRed:4.7.9-GTNH:dev") {
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