From 5ea3b400d64e684d28c6cfbad9ed579369ff01d0 Mon Sep 17 00:00:00 2001 From: mc-zuri <174940476+mc-zuri@users.noreply.github.com> Date: Thu, 18 Jun 2026 22:29:51 +0300 Subject: [PATCH] build fix --- buildSrc/build.gradle.kts | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- mc/1.21.11/build.gradle | 5 +++-- mc/26.1/build.gradle | 16 ++++++++++++---- .../generators/BlocksDataGenerator.java | 2 +- .../generators/RecipeDataGenerator.java | 12 ++++++------ .../generators/TintsDataGenerator.java | 2 +- .../util/EmptyRenderBlockView.java | 7 ++++--- settings.gradle | 4 ++-- 9 files changed, 32 insertions(+), 22 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index d67b7ef1..eb488ced 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -14,7 +14,7 @@ repositories { } dependencies { - implementation("xyz.wagyourtail.unimined:xyz.wagyourtail.unimined.gradle.plugin:1.2.15-SNAPSHOT") - implementation("io.freefair.gradle:lombok-plugin:8.10.2") + implementation("xyz.wagyourtail.unimined:xyz.wagyourtail.unimined.gradle.plugin:1.3.16-SNAPSHOT") + implementation("io.freefair.gradle:lombok-plugin:8.14.4") implementation("com.diffplug.spotless:spotless-plugin-gradle:6.25.0") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23a..dbc3ce4a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/mc/1.21.11/build.gradle b/mc/1.21.11/build.gradle index 81db180f..5ea4ec87 100644 --- a/mc/1.21.11/build.gradle +++ b/mc/1.21.11/build.gradle @@ -9,8 +9,9 @@ unimined.minecraft { mappings { mojmap() - - devFallbackNamespace "mojmap" + + devNamespace "mojmap" + devFallbackNamespace "intermediary" } customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { diff --git a/mc/26.1/build.gradle b/mc/26.1/build.gradle index 31d0e847..5323dfd0 100644 --- a/mc/26.1/build.gradle +++ b/mc/26.1/build.gradle @@ -4,13 +4,21 @@ plugins { id 'dg-mc-conventions' } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(25)) + } +} + +lombok { + version = "1.18.42" +} + unimined.minecraft { version "26.1" mappings { - mojmap() - - devFallbackNamespace "mojmap" + devFallbackNamespace "official" } customPatcher(new CustomOfficialFabricMinecraftTransformer(project, delegate as MinecraftProvider)) { @@ -18,7 +26,7 @@ unimined.minecraft { } runs.config("server") { - javaVersion = JavaVersion.VERSION_21 + javaVersion = JavaVersion.VERSION_25 } defaultRemapJar = true diff --git a/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java b/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java index cc8b947b..4bcef972 100644 --- a/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java +++ b/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java @@ -146,7 +146,7 @@ public static JsonObject generateBlock(List blockDesc.addProperty("transparent", !defaultState.canOcclude()); blockDesc.addProperty("emitLight", defaultState.getLightEmission()); - blockDesc.addProperty("filterLight", defaultState.getLightBlock()); + blockDesc.addProperty("filterLight", defaultState.getLightDampening()); blockDesc.addProperty("defaultState", Block.getId(defaultState)); blockDesc.addProperty("minStateId", Block.getId(blockStates.getFirst())); diff --git a/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java b/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java index 88d27933..2bf19a70 100644 --- a/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java +++ b/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/generators/RecipeDataGenerator.java @@ -56,10 +56,10 @@ public JsonElement generateDataJson() { var rootRecipeObject = new JsonObject(); rootRecipeObject.add("ingredients", ingredients); var resultObject = new JsonObject(); - resultObject.addProperty("id", getRawIdFor(sl.assemble(CraftingInput.EMPTY, registryManager).getItem())); - resultObject.addProperty("count", sl.assemble(CraftingInput.EMPTY, registryManager).getCount()); + resultObject.addProperty("id", getRawIdFor(sl.assemble(CraftingInput.EMPTY).getItem())); + resultObject.addProperty("count", sl.assemble(CraftingInput.EMPTY).getCount()); rootRecipeObject.add("result", resultObject); - recipes.put(getRawIdFor(sl.assemble(CraftingInput.EMPTY, registryManager).getItem()), rootRecipeObject); + recipes.put(getRawIdFor(sl.assemble(CraftingInput.EMPTY).getItem()), rootRecipeObject); } } recipes.forEach((a, b) -> { @@ -118,11 +118,11 @@ private void generateShapedRecipe(RegistryAccess registryManager, JsonObject fin finalRecipe.add("inShape", inShape); var resultObject = new JsonObject(); - resultObject.addProperty("id", getRawIdFor(sr.assemble(CraftingInput.EMPTY, registryManager).getItem())); - resultObject.addProperty("count", sr.assemble(CraftingInput.EMPTY, registryManager).getCount()); + resultObject.addProperty("id", getRawIdFor(sr.assemble(CraftingInput.EMPTY).getItem())); + resultObject.addProperty("count", sr.assemble(CraftingInput.EMPTY).getCount()); finalRecipe.add("result", resultObject); - String id = ((Integer) getRawIdFor(sr.assemble(CraftingInput.EMPTY, registryManager).getItem())).toString(); + String id = ((Integer) getRawIdFor(sr.assemble(CraftingInput.EMPTY).getItem())).toString(); if (!finalObj.has(id)) { finalObj.add(id, new JsonArray()); diff --git a/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java b/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java index 1c1c0ae2..070ecd2f 100644 --- a/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java +++ b/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/generators/TintsDataGenerator.java @@ -53,7 +53,7 @@ private static int removeAlphaChannel(int color) { } private static int getBlockColor(Block block) { - return BlockColors.createDefault().getColor(block.defaultBlockState(), EmptyRenderBlockView.INSTANCE, BlockPos.ZERO, 0xFFFFFF); + return BlockColors.createDefault().getTintSource(block.defaultBlockState(), 0).colorInWorld(block.defaultBlockState(), EmptyRenderBlockView.INSTANCE, BlockPos.ZERO); } public static Map generateConstantTintColors() { diff --git a/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyRenderBlockView.java b/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyRenderBlockView.java index 1a43e7bf..5b489c6e 100644 --- a/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyRenderBlockView.java +++ b/mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/util/EmptyRenderBlockView.java @@ -5,7 +5,8 @@ import net.minecraft.core.Direction; import net.minecraft.core.Registry; import net.minecraft.core.registries.Registries; -import net.minecraft.world.level.BlockAndTintGetter; +import net.minecraft.client.renderer.block.BlockAndTintGetter; +import net.minecraft.world.level.CardinalLighting; import net.minecraft.world.level.LightLayer; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.BiomeSpecialEffects.GrassColorModifier; @@ -44,8 +45,8 @@ public int getHeight() { } @Override - public float getShade(Direction direction, boolean shaded) { - return 0.0f; + public CardinalLighting cardinalLighting() { + return CardinalLighting.DEFAULT; } @Override diff --git a/settings.gradle b/settings.gradle index 40640d5d..742fc7f8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,11 +1,11 @@ plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' } dependencyResolutionManagement { versionCatalogs { libs { - version('fabric-loader', '0.16.13') + version('fabric-loader', '0.18.4') } } }