Update to GT 2.6.1

htmlcsjs · Apr 10, 2023 · 1aa85ad · 1aa85ad
1 parent 0f68c45
commit 1aa85ad
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,7 @@
 import net.minecraftforge.gradle.user.UserBaseExtension
 
+// TODO: rewrite gradle to use fg5
+
 buildscript {
     repositories {
         mavenCentral()
@@ -68,17 +70,22 @@ repositories {
     maven {
         setUrl("https://maven.cleanroommc.com")
     }
+    maven {
+        name = "maverinth"
+        setUrl("https://api.modrinth.com/maven")
+    }
 }
 
 dependencies {
     "deobfCompile"("mezz.jei:jei_1.12.2:+")
-    "deobfCompile"("curse.maven:ceu-557242:4422409")
+    "deobfCompile"("maven.modrinth:gregtech-ce-unofficial:2.6.1") // 2.6.1
     "deobfCompile"("codechicken-lib-1-8:CodeChickenLib-1.12.2:3.2.3.358:universal")
     "deobfCompile"("codechicken:ChickenASM:1.12-1.0.2.9")
     "deobfCompile"("mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.23-16")
     "deobfCompile"("team.chisel.ctm:CTM:MC1.12.2-1.0.2.31")
     "deobfCompile"("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.655")
-    "deobfCompile"("curse.maven:groovyscript-687577:4399621")
+//    "deobfCompile"("curse.maven:groovyscript-687577:4399621")
+    "provided"(files("libs/groovyscript-0.4.0.jar"))
     "deobfCompile"("zone.rong:mixinbooter:4.2") // fuck rong
 }
 

diff --git a/libs/groovyscript-0.4.0.jar b/libs/groovyscript-0.4.0.jar
diff --git a/src/main/java/net/htmlcsjs/htmlTech/api/HTValues.java b/src/main/java/net/htmlcsjs/htmlTech/api/HTValues.java
@@ -1,6 +1,7 @@
 package net.htmlcsjs.htmlTech.api;
 
 import gregtech.api.GTValues;
+import gregtech.common.ConfigHolder;
 
 public class HTValues {
 
@@ -25,5 +26,5 @@ public class HTValues {
     /**
      * Length of MTE arrys depending on if GTValues.HT is set
      */
-    public static final int mteLength = GTValues.HT ? GTValues.V.length - 1 : Math.min(GTValues.V.length - 1, GTValues.UV + 1);
+    public static final int mteLength = ConfigHolder.machines.highTierContent ? GTValues.V.length - 1 : Math.min(GTValues.V.length - 1, GTValues.UV + 1);
 }
diff --git a/src/main/java/net/htmlcsjs/htmlTech/api/capability/LaserContainerHandler.java b/src/main/java/net/htmlcsjs/htmlTech/api/capability/LaserContainerHandler.java
@@ -91,11 +91,6 @@ public String getName() {
         return "LaserContainer";
     }
 
-    @Override
-    public int getNetworkID() {
-        return TraitNetworkIds.TRAIT_ID_ENERGY_CONTAINER;
-    }
-
     @Override
     public NBTTagCompound serializeNBT() {
         NBTTagCompound compound = new NBTTagCompound();

diff --git a/src/main/java/net/htmlcsjs/htmlTech/loaders/recipe/LaserEquipmentLoader.java b/src/main/java/net/htmlcsjs/htmlTech/loaders/recipe/LaserEquipmentLoader.java
@@ -4,6 +4,7 @@
 import gregtech.api.recipes.ingredients.IntCircuitIngredient;
 import gregtech.api.unification.material.MarkerMaterials;
 import gregtech.api.unification.stack.UnificationEntry;
+import gregtech.common.ConfigHolder;
 import gregtech.common.blocks.BlockMetalCasing;
 import gregtech.loaders.recipe.CraftingComponent;
 import net.htmlcsjs.htmlTech.HtmlTech;
@@ -63,7 +64,7 @@ public static void init() {
                 continue;
             }
             try {
-                Object sensor = !HT && i == UHV ? CraftingComponent.SENSOR.getIngredient(i - 1) : CraftingComponent.SENSOR.getIngredient(i);
+                Object sensor = !ConfigHolder.machines.highTierContent && i == UHV ? CraftingComponent.SENSOR.getIngredient(i - 1) : CraftingComponent.SENSOR.getIngredient(i);
                 ASSEMBLY_LINE_RECIPES.recipeBuilder()
                         .input(HULL[i])
                         .input(lens, Glass)

diff --git a/src/main/java/net/htmlcsjs/htmlTech/loaders/recipe/MaterialLoader.java b/src/main/java/net/htmlcsjs/htmlTech/loaders/recipe/MaterialLoader.java
@@ -1,5 +1,7 @@
 package net.htmlcsjs.htmlTech.loaders.recipe;
 
+import gregtech.common.ConfigHolder;
+
 import static gregtech.api.GTValues.*;
 import static gregtech.api.recipes.RecipeMaps.MIXER_RECIPES;
 import static gregtech.api.unification.material.Materials.*;
@@ -9,7 +11,7 @@
 
 public class MaterialLoader {
     public static void init() {
-        MIXER_RECIPES.recipeBuilder().EUt(HT ? VA[MAX] : VA[UV]).duration(200)
+        MIXER_RECIPES.recipeBuilder().EUt(ConfigHolder.machines.highTierContent ? VA[MAX] : VA[UV]).duration(200)
                 .input(dust, Flerovium, 1)
                 .fluidInputs(Oxygen.getFluid(1000))
                 .input(dust, Phosphorus, 1)