feat: port to 1.20.1 (#20)

* feat: port to 1.20.1 * Update workflows and metadata --------- Co-authored-by: Max <[email protected]>
KubeJS-Mods · Jan 2, 2024 · f49730d · f49730d
1 parent 4030002
commit f49730d
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 26 deletions.
diff --git a/.github/workflows/build_1902.yml → .github/workflows/build_2001.yml b/.github/workflows/build_1902.yml → .github/workflows/build_2001.yml
@@ -1,12 +1,12 @@
-name: Java CI (1.19.2)
+name: Java CI (1.20.1)
 
 on:
   push:
     branches:
-      - '1902'
+      - '2001'
   workflow_dispatch:
     branches:
-      - '1902'
+      - '2001'
     inputs:
       release_type:
         description: 'Release Type'
@@ -61,4 +61,4 @@ jobs:
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
           RELEASE_TYPE: ${{ inputs.release_type }}
         with:
-          arguments: publishUnified --stacktrace --no-daemon
+          arguments: publishUnified --stacktrace --no-daemon
diff --git a/.kubejs/meta.json b/.kubejs/meta.json
@@ -1,5 +1,5 @@
 {
-	"minecraft": 1902,
+	"minecraft": 2001,
 	"type": "forge",
 	"version": {
 		"file": "gradle.properties",

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id "dev.architectury.loom" version "1.3-SNAPSHOT"
+	id "dev.architectury.loom" version "1.4-SNAPSHOT"
 	id 'maven-publish'
 	id "me.shedaniel.unified-publishing" version "0.1.+"
 }
@@ -38,13 +38,20 @@ repositories {
 	}
 
 	maven {
-		url "https://maven.saps.dev/minecraft"
+		url "https://maven.saps.dev/releases"
 		content {
 			includeGroup "dev.latvian.mods"
 			includeGroup "dev.ftb.mods"
 		}
 	}
 
+	maven {
+		url "https://maven.latvian.dev/releases"
+		content {
+			includeGroup "dev.latvian.mods"
+		}
+	}
+
 	maven {
 		url "https://maven.creeperhost.net/"
 		content {
@@ -71,7 +78,7 @@ dependencies {
 	modImplementation("curse.maven:thermal-innovation-291737:${thermal_innovation_file}")
 	modImplementation("curse.maven:thermal-dynamics-227443:${thermal_dynamics_file}")
 
-	modImplementation("com.teamcofh:thermal_core:1.19.2-10.2.+")
+	modImplementation("com.teamcofh:thermal_core:1.20.1-11.+")
 }
 
 processResources {
@@ -165,7 +172,7 @@ unifiedPublishing {
             }
             depends {
                 curseforge = modrinth = "thermal-expansion"
-            }                
+            }
 		}
 
 		if (ENV.CURSEFORGE_KEY) {

diff --git a/gradle.properties b/gradle.properties
@@ -4,18 +4,18 @@ loom.platform=forge
 mod_id=kubejs_thermal
 mod_name=kubejs-thermal
 mod_package=dev.latvian.mods
-mod_version=1902.1.9
+mod_version=2001.1.10
 mod_author=LatvianModder
-minecraft_version=1.19.2
-forge_version=43.2.4
+minecraft_version=1.20.1
+forge_version=47.2.19
 curseforge_id=421694
 modrinth_id=taN3HInZ
-kubejs_version=1902.6.1-build.320
-jei_file=4494410
-cofh_core_file=4385216
-thermal_foundation_file=4382373
-thermal_expansion_file=4382371
-thermal_cultivation_file=4382369
-thermal_locomotion_file=4382376
-thermal_innovation_file=4382374
-thermal_dynamics_file=4391160
+kubejs_version=2001.6.4-build.114
+jei_file=4712868
+cofh_core_file=4970669
+thermal_foundation_file=4979840
+thermal_expansion_file=4970700
+thermal_cultivation_file=4970697
+thermal_locomotion_file=4970706
+thermal_innovation_file=4970704
+thermal_dynamics_file=4970699
diff --git a/src/main/java/dev/latvian/mods/kubejs/thermal/BasicRecipeSchema.java b/src/main/java/dev/latvian/mods/kubejs/thermal/BasicRecipeSchema.java
@@ -1,7 +1,7 @@
 package dev.latvian.mods.kubejs.thermal;
 
 import cofh.lib.util.recipes.RecipeJsonUtils;
-import cofh.thermal.core.init.TCoreRecipeTypes;
+import cofh.thermal.core.init.registries.TCoreRecipeTypes;
 import cofh.thermal.core.util.managers.machine.BottlerRecipeManager;
 import cofh.thermal.core.util.managers.machine.BrewerRecipeManager;
 import cofh.thermal.core.util.managers.machine.CentrifugeRecipeManager;

diff --git a/src/main/java/dev/latvian/mods/kubejs/thermal/FuelRecipeSchema.java b/src/main/java/dev/latvian/mods/kubejs/thermal/FuelRecipeSchema.java
@@ -1,7 +1,7 @@
 package dev.latvian.mods.kubejs.thermal;
 
 import cofh.lib.util.recipes.RecipeJsonUtils;
-import cofh.thermal.core.init.TCoreRecipeTypes;
+import cofh.thermal.core.init.registries.TCoreRecipeTypes;
 import cofh.thermal.core.util.managers.dynamo.CompressionFuelManager;
 import cofh.thermal.core.util.managers.dynamo.DisenchantmentFuelManager;
 import cofh.thermal.core.util.managers.dynamo.GourmandFuelManager;

diff --git a/src/main/java/dev/latvian/mods/kubejs/thermal/KubeJSThermalPlugin.java b/src/main/java/dev/latvian/mods/kubejs/thermal/KubeJSThermalPlugin.java
@@ -2,7 +2,7 @@
 
 
 import cofh.lib.util.constants.ModIds;
-import cofh.thermal.core.init.TCoreRecipeTypes;
+import cofh.thermal.core.init.registries.TCoreRecipeTypes;
 import dev.latvian.mods.kubejs.KubeJSPlugin;
 import dev.latvian.mods.kubejs.recipe.schema.RegisterRecipeSchemasEvent;
 

diff --git a/src/main/java/dev/latvian/mods/kubejs/thermal/ThermalRecipeJS.java b/src/main/java/dev/latvian/mods/kubejs/thermal/ThermalRecipeJS.java
@@ -1,6 +1,6 @@
 package dev.latvian.mods.kubejs.thermal;
 
-import cofh.lib.fluid.FluidIngredient;
+import cofh.lib.common.fluid.FluidIngredient;
 import cofh.lib.util.recipes.RecipeJsonUtils;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;

diff --git a/src/main/java/dev/latvian/mods/kubejs/thermal/mixin/FluidIngredientMixin.java b/src/main/java/dev/latvian/mods/kubejs/thermal/mixin/FluidIngredientMixin.java
@@ -1,6 +1,6 @@
 package dev.latvian.mods.kubejs.thermal.mixin;
 
-import cofh.lib.fluid.FluidIngredient;
+import cofh.lib.common.fluid.FluidIngredient;
 import dev.architectury.hooks.fluid.forge.FluidStackHooksForge;
 import dev.latvian.mods.kubejs.fluid.FluidLike;
 import dev.latvian.mods.kubejs.fluid.FluidStackJS;