Skip to content

Commit f49730d

Browse files
feat: port to 1.20.1 (#20)
* feat: port to 1.20.1 * Update workflows and metadata --------- Co-authored-by: Max <max@someone.ky>
1 parent 4030002 commit f49730d

9 files changed

Lines changed: 33 additions & 26 deletions

File tree

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
name: Java CI (1.19.2)
1+
name: Java CI (1.20.1)
22

33
on:
44
push:
55
branches:
6-
- '1902'
6+
- '2001'
77
workflow_dispatch:
88
branches:
9-
- '1902'
9+
- '2001'
1010
inputs:
1111
release_type:
1212
description: 'Release Type'
@@ -61,4 +61,4 @@ jobs:
6161
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
6262
RELEASE_TYPE: ${{ inputs.release_type }}
6363
with:
64-
arguments: publishUnified --stacktrace --no-daemon
64+
arguments: publishUnified --stacktrace --no-daemon

.kubejs/meta.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"minecraft": 1902,
2+
"minecraft": 2001,
33
"type": "forge",
44
"version": {
55
"file": "gradle.properties",

build.gradle

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "dev.architectury.loom" version "1.3-SNAPSHOT"
2+
id "dev.architectury.loom" version "1.4-SNAPSHOT"
33
id 'maven-publish'
44
id "me.shedaniel.unified-publishing" version "0.1.+"
55
}
@@ -38,13 +38,20 @@ repositories {
3838
}
3939

4040
maven {
41-
url "https://maven.saps.dev/minecraft"
41+
url "https://maven.saps.dev/releases"
4242
content {
4343
includeGroup "dev.latvian.mods"
4444
includeGroup "dev.ftb.mods"
4545
}
4646
}
4747

48+
maven {
49+
url "https://maven.latvian.dev/releases"
50+
content {
51+
includeGroup "dev.latvian.mods"
52+
}
53+
}
54+
4855
maven {
4956
url "https://maven.creeperhost.net/"
5057
content {
@@ -71,7 +78,7 @@ dependencies {
7178
modImplementation("curse.maven:thermal-innovation-291737:${thermal_innovation_file}")
7279
modImplementation("curse.maven:thermal-dynamics-227443:${thermal_dynamics_file}")
7380

74-
modImplementation("com.teamcofh:thermal_core:1.19.2-10.2.+")
81+
modImplementation("com.teamcofh:thermal_core:1.20.1-11.+")
7582
}
7683

7784
processResources {
@@ -165,7 +172,7 @@ unifiedPublishing {
165172
}
166173
depends {
167174
curseforge = modrinth = "thermal-expansion"
168-
}
175+
}
169176
}
170177

171178
if (ENV.CURSEFORGE_KEY) {

gradle.properties

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ loom.platform=forge
44
mod_id=kubejs_thermal
55
mod_name=kubejs-thermal
66
mod_package=dev.latvian.mods
7-
mod_version=1902.1.9
7+
mod_version=2001.1.10
88
mod_author=LatvianModder
9-
minecraft_version=1.19.2
10-
forge_version=43.2.4
9+
minecraft_version=1.20.1
10+
forge_version=47.2.19
1111
curseforge_id=421694
1212
modrinth_id=taN3HInZ
13-
kubejs_version=1902.6.1-build.320
14-
jei_file=4494410
15-
cofh_core_file=4385216
16-
thermal_foundation_file=4382373
17-
thermal_expansion_file=4382371
18-
thermal_cultivation_file=4382369
19-
thermal_locomotion_file=4382376
20-
thermal_innovation_file=4382374
21-
thermal_dynamics_file=4391160
13+
kubejs_version=2001.6.4-build.114
14+
jei_file=4712868
15+
cofh_core_file=4970669
16+
thermal_foundation_file=4979840
17+
thermal_expansion_file=4970700
18+
thermal_cultivation_file=4970697
19+
thermal_locomotion_file=4970706
20+
thermal_innovation_file=4970704
21+
thermal_dynamics_file=4970699

src/main/java/dev/latvian/mods/kubejs/thermal/BasicRecipeSchema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.latvian.mods.kubejs.thermal;
22

33
import cofh.lib.util.recipes.RecipeJsonUtils;
4-
import cofh.thermal.core.init.TCoreRecipeTypes;
4+
import cofh.thermal.core.init.registries.TCoreRecipeTypes;
55
import cofh.thermal.core.util.managers.machine.BottlerRecipeManager;
66
import cofh.thermal.core.util.managers.machine.BrewerRecipeManager;
77
import cofh.thermal.core.util.managers.machine.CentrifugeRecipeManager;

src/main/java/dev/latvian/mods/kubejs/thermal/FuelRecipeSchema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.latvian.mods.kubejs.thermal;
22

33
import cofh.lib.util.recipes.RecipeJsonUtils;
4-
import cofh.thermal.core.init.TCoreRecipeTypes;
4+
import cofh.thermal.core.init.registries.TCoreRecipeTypes;
55
import cofh.thermal.core.util.managers.dynamo.CompressionFuelManager;
66
import cofh.thermal.core.util.managers.dynamo.DisenchantmentFuelManager;
77
import cofh.thermal.core.util.managers.dynamo.GourmandFuelManager;

src/main/java/dev/latvian/mods/kubejs/thermal/KubeJSThermalPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
import cofh.lib.util.constants.ModIds;
5-
import cofh.thermal.core.init.TCoreRecipeTypes;
5+
import cofh.thermal.core.init.registries.TCoreRecipeTypes;
66
import dev.latvian.mods.kubejs.KubeJSPlugin;
77
import dev.latvian.mods.kubejs.recipe.schema.RegisterRecipeSchemasEvent;
88

src/main/java/dev/latvian/mods/kubejs/thermal/ThermalRecipeJS.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.latvian.mods.kubejs.thermal;
22

3-
import cofh.lib.fluid.FluidIngredient;
3+
import cofh.lib.common.fluid.FluidIngredient;
44
import cofh.lib.util.recipes.RecipeJsonUtils;
55
import com.google.gson.JsonElement;
66
import com.google.gson.JsonObject;

src/main/java/dev/latvian/mods/kubejs/thermal/mixin/FluidIngredientMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.latvian.mods.kubejs.thermal.mixin;
22

3-
import cofh.lib.fluid.FluidIngredient;
3+
import cofh.lib.common.fluid.FluidIngredient;
44
import dev.architectury.hooks.fluid.forge.FluidStackHooksForge;
55
import dev.latvian.mods.kubejs.fluid.FluidLike;
66
import dev.latvian.mods.kubejs.fluid.FluidStackJS;

0 commit comments

Comments
 (0)