26.1 updates (#72)

Co-authored-by: extremeheat <extreme@protonmail.ch>

Author: mc-zuri

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")
 }

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

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)) {

mc/26.1/build.gradle

@@ -4,21 +4,29 @@ 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)) {
         it.loader libs.versions.fabric.loader.get()
     }
 
     runs.config("server") {
-        javaVersion = JavaVersion.VERSION_21
+        javaVersion = JavaVersion.VERSION_25
     }
 
     defaultRemapJar = true

mc/26.1/src/main/java/dev/u9g/minecraftdatagenerator/generators/BlocksDataGenerator.java

@@ -146,7 +146,7 @@ public static JsonObject generateBlock(List<MaterialsDataGenerator.MaterialInfo>
 
         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()));

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());

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<Block, Integer> generateConstantTintColors() {

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

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')
         }
     }
 }