Loom 1.10, Remove Consumer use in Forge Client

JT122406 · JT122406 · commit 5669f6bcc0c6 · 2025-04-04T19:34:52.000-04:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,9 +2,9 @@ import net.fabricmc.loom.api.LoomGradleExtensionAPI
 
 plugins {
     id("architectury-plugin") version "3.4-SNAPSHOT"
-    id("dev.architectury.loom") version "1.9-SNAPSHOT" apply false
-    id("com.gradleup.shadow") version "8.3.5" apply false
-    kotlin("jvm") version ("2.0.10")
+    id("dev.architectury.loom") version "1.10-SNAPSHOT" apply false
+    id("com.gradleup.shadow") version "8.3.6" apply false
+    kotlin("jvm") version ("2.1.20")
     java
     idea
     `maven-publish`
@@ -64,7 +64,7 @@ subprojects {
             parchment("org.parchmentmc.data:parchment-$minecraftVersion:${project.properties["parchment"]}@zip")
         })
 
-        compileOnly("org.jetbrains:annotations:26.0.1")
+        compileOnly("org.jetbrains:annotations:26.0.2")
     }
 
     java {
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/client/GenerationsCoreClient.java b/common/src/main/java/generations/gg/generations/core/generationscore/common/client/GenerationsCoreClient.java
@@ -12,7 +12,6 @@
 import com.cobblemon.mod.common.platform.events.ClientPlayerEvent;
 import com.cobblemon.mod.common.platform.events.PlatformEvents;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.BufferUploader;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import dev.architectury.registry.item.ItemPropertiesRegistry;
@@ -33,8 +32,6 @@
 import generations.gg.generations.core.generationscore.common.world.entity.GenerationsBoatEntity;
 import generations.gg.generations.core.generationscore.common.world.entity.GenerationsEntities;
 import generations.gg.generations.core.generationscore.common.world.item.*;
-import generations.gg.generations.core.generationscore.common.world.item.curry.CurryData;
-import generations.gg.generations.core.generationscore.common.world.item.curry.CurryType;
 import generations.gg.generations.core.generationscore.common.world.item.curry.ItemCurry;
 import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsBlocks;
 import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsShrines;
@@ -72,10 +69,8 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.FishingRodItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -72,7 +72,7 @@ dependencies {
 
     //Cobblemon
     modApi("com.cobblemon:fabric:${project.properties["cobblemon_version"]}")
-    modApi("net.fabricmc:fabric-language-kotlin:1.12.0+kotlin.2.0.10")
+    modApi("net.fabricmc:fabric-language-kotlin:1.13.2+kotlin.2.1.20")
     modRuntimeOnly("com.jozufozu.flywheel:flywheel-fabric-$minecraftVersion:${project.properties["flywheel_fabric_version"]}")
 }
 
diff --git a/fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/client/GenerationsCoreClientFabric.java b/fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/client/GenerationsCoreClientFabric.java
@@ -1,6 +1,5 @@
 package generations.gg.generations.core.generationscore.fabric.client;
 
-import com.mojang.authlib.minecraft.client.MinecraftClient;
 import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient;
 import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsBlocks;
 import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsMushroomBlock;
diff --git a/forge/src/main/java/generations/gg/generations/core/generationscore/forge/client/GenerationsCoreClientForge.java b/forge/src/main/java/generations/gg/generations/core/generationscore/forge/client/GenerationsCoreClientForge.java
@@ -1,13 +1,9 @@
 package generations.gg.generations.core.generationscore.forge.client;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import generations.gg.generations.core.generationscore.common.GenerationsCore;
 import generations.gg.generations.core.generationscore.common.client.GenerationsCoreClient;
 import generations.gg.generations.core.generationscore.common.client.screen.Overlays;
-import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsBlocks;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.client.event.EntityRenderersEvent;
 import net.minecraftforge.client.event.RegisterGuiOverlaysEvent;
 import net.minecraftforge.client.event.RenderLevelStageEvent;
@@ -16,8 +12,6 @@
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 
-import java.util.function.Consumer;
-
 /**
  * This class is used to initialize the Forge client side of the mod.
  * @see FMLClientSetupEvent
@@ -31,11 +25,11 @@ public class GenerationsCoreClientForge {
      * @param eventBus The event bus to register the client side of the mod to.
      */
     public static void init(IEventBus eventBus) {
-        eventBus.addListener((Consumer<EntityRenderersEvent.RegisterRenderers>) event -> {
+        eventBus.addListener((EntityRenderersEvent.RegisterRenderers event) -> {
             GenerationsCoreClient.registerBlockEntityRenderers(event::registerBlockEntityRenderer);
             GenerationsCoreClient.registerEntityRenderers(event::registerEntityRenderer);
         });
-        eventBus.addListener((Consumer<EntityRenderersEvent.RegisterLayerDefinitions>) event -> GenerationsCoreClient.registerLayerDefinitions(event::registerLayerDefinition));
+        eventBus.addListener((EntityRenderersEvent.RegisterLayerDefinitions event) -> GenerationsCoreClient.registerLayerDefinitions(event::registerLayerDefinition));
         eventBus.addListener(GenerationsCoreClientForge::forgeClientSetup);
         eventBus.addListener(GenerationsCoreClientForge::registerGUILayers);
         MinecraftForge.EVENT_BUS.addListener(GenerationsCoreClientForge::renderHighlightedPath);
@@ -52,8 +46,6 @@ private static void renderHighlightedPath(RenderLevelStageEvent event) {
 
     private static void forgeClientSetup(final FMLClientSetupEvent event) {
         GenerationsCoreClient.onInitialize(Minecraft.getInstance());
-//        ForgeConfig.CLIENT.alwaysSetupTerrainOffThread.set(true); // Performance improvement
-//        ForgeConfig.CLIENT.experimentalForgeLightPipelineEnabled.set(true); // Use Experimental Forge Light Pipeline
     }
 
     private static void registerGUILayers(final RegisterGuiOverlaysEvent event) {
diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ botarium_version=2.3.4
 devauth_version=1.2.1
 cobblemon_version=1.5.2+1.20.1
 
-fabric_loader_version=0.16.9
+fabric_loader_version=0.16.12
 fabric_api_version=0.92.2
 
 forge_version=47.3.11
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,7 +8,7 @@ pluginManagement.repositories {
 }
 
 plugins {
-    id("com.gradle.develocity") version("3.18.2")
+    id("com.gradle.develocity") version("3.19.2")
 }
 
 develocity.buildScan {

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ dependencies {`
`72`	`72`
`73`	`73`	`//Cobblemon`
`74`	`74`	`modApi("com.cobblemon:fabric:${project.properties["cobblemon_version"]}")`
`75`		`- modApi("net.fabricmc:fabric-language-kotlin:1.12.0+kotlin.2.0.10")`
	`75`	`+ modApi("net.fabricmc:fabric-language-kotlin:1.13.2+kotlin.2.1.20")`
`76`	`76`	`modRuntimeOnly("com.jozufozu.flywheel:flywheel-fabric-$minecraftVersion:${project.properties["flywheel_fabric_version"]}")`
`77`	`77`	`}`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ pluginManagement.repositories {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`plugins {`
`11`		`- id("com.gradle.develocity") version("3.18.2")`
	`11`	`+ id("com.gradle.develocity") version("3.19.2")`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`develocity.buildScan {`