diff --git a/.github/actions/build_setup/action.yml b/.github/actions/build_setup/action.yml index 1d7089b48e..2bd2d78c85 100644 --- a/.github/actions/build_setup/action.yml +++ b/.github/actions/build_setup/action.yml @@ -5,7 +5,7 @@ inputs: update-cache: description: If cache should be updated required: false - default: 'true' + default: 'false' runs: using: 'composite' diff --git a/settings.gradle b/settings.gradle index eafd471107..c5d371c43e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -18,21 +18,18 @@ dependencyResolutionManagement { versionCatalogs { // Minecraft Version def minecraftVersionVeryOld = "1.20.1" - def minecraftVersionOld = "1.20.4" - def minecraftVersionOldish = "1.20.6" def minecraftVersion = "1.21" // Mod Dependencies Versions // Common - def jeiVersion = "19.0.0.1" - def reiVersion = "16.0.729" + def jeiVersion = "19.5.2.66" + def reiVersion = "16.0.744" def emiVersion = "1.1.10" - def ae2Version = "18.1.3-alpha" - def kjsVersion = "2100.7.0-build.79" - def auVersion = "1.20.1-0.6.0" + def ae2Version = "19.0.4-alpha" + def kjsVersion = "2100.7.0-build.117" // NeoForge - def neoForgeVersion = "21.0.40-beta" + def neoForgeVersion = "21.0.143" def registrateForgeVersion = "MC1.21-1.3.0+16" def createForgeVersion = "0.5.1.d-9" def flywheelForgeVersion = "0.6.9-5" @@ -46,10 +43,10 @@ dependencyResolutionManagement { def spotlessVersion = "6.25.0" def vineFlowerVersion = "1.+" def macheteVersion = "1.+" - def configurationVersion = "5446773" - def ldLibVersion = "1.0.26.a" + def configurationVersion = "5573796" + def ldLibVersion = "1.0.26.b" def shimmerVersion = "0.2.2" - def neogradleVersion = "7.0.145" + def neogradleVersion = "7.0.157" forge { version("forgeShortVersion", neoForgeVersion) @@ -101,17 +98,12 @@ dependencyResolutionManagement { def ae2 = version("ae2", ae2Version) library("ae2", "appeng", "appliedenergistics2-neoforge").versionRef(ae2) - - def au = version("au", auVersion) - library("almostUnified-forge", "com.almostreliable.mods", "almostunified-forge").versionRef(au) } libs { version("parchment", parchmentVersion) version("minecraft", minecraftVersion) - version("minecraftOldish", minecraftVersionOldish) - version("minecraftOld", minecraftVersionOld) version("minecraftVeryOld", minecraftVersionVeryOld) def shadow = version("shadow", shadowVersion) diff --git a/src/main/java/com/gregtechceu/gtceu/common/entity/DynamiteEntity.java b/src/main/java/com/gregtechceu/gtceu/common/entity/DynamiteEntity.java index f7a7c2ba55..72d26190c1 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/entity/DynamiteEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/common/entity/DynamiteEntity.java @@ -32,8 +32,8 @@ public DynamiteEntity(LivingEntity throwerIn, Level worldIn) { } @Override - public void onAddedToWorld() { - super.onAddedToWorld(); + public void onAddedToLevel() { + super.onAddedToLevel(); ticksUntilExplosion = 80 + level().random.nextInt(60); } diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/block/CoilBlockBuilder.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/block/CoilBlockBuilder.java index 67c64e38ab..1df2c2913a 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/block/CoilBlockBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/builders/block/CoilBlockBuilder.java @@ -39,7 +39,7 @@ public CoilBlockBuilder coilMaterial(@NotNull Supplier<@Nullable Material> mater } @Override - public void generateAssetJsons(KubeAssetGenerator generator) {} + public void generateAssets(KubeAssetGenerator generator) {} @Override protected ItemBuilder getOrCreateItemBuilder() { diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java index a831142e46..969b0c34ed 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java @@ -35,6 +35,7 @@ import dev.latvian.mods.kubejs.recipe.component.TimeComponent; import dev.latvian.mods.kubejs.recipe.schema.KubeRecipeFactory; import dev.latvian.mods.kubejs.recipe.schema.RecipeSchema; +import dev.latvian.mods.kubejs.util.KubeResourceLocation; import dev.latvian.mods.kubejs.util.TickDuration; import dev.latvian.mods.rhino.util.HideFromJS; import lombok.Getter; @@ -73,10 +74,11 @@ class GTKubeRecipe extends KubeRecipe { @HideFromJS @Override - public GTKubeRecipe id(ResourceLocation _id) { + public GTKubeRecipe id(KubeResourceLocation _id) { this.idWithoutType = ResourceLocation.fromNamespaceAndPath( - _id.getNamespace().equals("minecraft") ? this.type.id.getNamespace() : _id.getNamespace(), - _id.getPath()); + _id.wrapped().getNamespace().equals("kubejs") ? this.type.id.getNamespace() : + _id.wrapped().getNamespace(), + _id.wrapped().getPath()); this.id = ResourceLocation.fromNamespaceAndPath(idWithoutType.getNamespace(), "%s/%s".formatted(this.type.id.getPath(), idWithoutType.getPath())); return this; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/IDRecipeConstructor.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/IDRecipeConstructor.java index c0df80eb00..c1d31f500f 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/IDRecipeConstructor.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/IDRecipeConstructor.java @@ -5,7 +5,9 @@ import dev.latvian.mods.kubejs.recipe.component.ComponentValueMap; import dev.latvian.mods.kubejs.recipe.schema.RecipeConstructor; import dev.latvian.mods.kubejs.recipe.schema.RecipeSchemaType; +import dev.latvian.mods.kubejs.script.SourceLine; import dev.latvian.mods.kubejs.util.Cast; +import dev.latvian.mods.kubejs.util.KubeResourceLocation; import dev.latvian.mods.rhino.Context; public class IDRecipeConstructor extends RecipeConstructor { @@ -14,9 +16,11 @@ public IDRecipeConstructor() { super(GTRecipeSchema.ID); } - public KubeRecipe create(Context cx, RecipeTypeFunction type, RecipeSchemaType schemaType, ComponentValueMap from) { - var r = super.create(cx, type, schemaType, from); - r.id(from.getValue(cx, r, GTRecipeSchema.ID)); + @Override + public KubeRecipe create(Context cx, SourceLine sourceLine, RecipeTypeFunction type, RecipeSchemaType schemaType, + ComponentValueMap from) { + var r = super.create(cx, sourceLine, type, schemaType, from); + r.id(KubeResourceLocation.wrap(from.getValue(cx, r, GTRecipeSchema.ID))); return r; }