Merge pull request #111 from RakSrinaNa/110-119-newer-version-of-forg…

…e-breaks-this-mod

Fix breaking changes introduced with Forge 41.0.64 & 41.0.94

fabric/.gitignore

@@ -1,3 +1,4 @@
 # gradle
 .gradle/
 build/
+run/

fabric/build.gradle.kts

@@ -56,14 +56,17 @@ loom {
     }
 
     runs {
-        create("editSignClient") {
+        create("ESFabricClient") {
             client()
+            runDir("run/client")
 
-            property("fabric.log.level", "debug")
+            property("fabric.log.level", "info")
             vmArg("-XX:+ShowCodeDetailsInExceptionMessages")
+            programArgs("--uuid=123", "--username=Dev")
         }
-        create("editSignServer") {
+        create("ESFabricServer") {
             server()
+            runDir("run/server")
 
             property("fabric.log.level", "info")
             vmArg("-XX:+ShowCodeDetailsInExceptionMessages")

forge/.gitignore

@@ -1,3 +1,4 @@
 # gradle
 .gradle/
 build/
+run/

forge/build.gradle

@@ -5,10 +5,11 @@ plugins {
 }
 
 minecraft {
-    mappings channel: "${mappings_channel}", version: "${mappings_version}"
+    mappings channel: "official", version: "${libs.versions.forgeMappingsVersion.get()}"
     runs {
         client {
-            workingDirectory project.file("../run")
+            taskName "runESForgeClient"
+            workingDirectory project.file("./run/client")
             property "forge.logging.markers", "REGISTRIES"
             property "forge.logging.console.level", "debug"
             mods {
@@ -19,7 +20,8 @@ minecraft {
         }
 
         server {
-            workingDirectory project.file("../run")
+            taskName "runESForgeServer"
+            workingDirectory project.file("./run/server")
             property "forge.logging.markers", "REGISTRIES"
             property "forge.logging.console.level", "debug"
             mods {
@@ -30,7 +32,8 @@ minecraft {
         }
 
         gameTestServer {
-            workingDirectory project.file("../run")
+            taskName "runESForgeTestServer"
+            workingDirectory project.file("./run/test")
             property 'forge.logging.markers', 'REGISTRIES'
             property 'forge.logging.console.level', 'debug'
             property 'forge.enabledGameTestNamespaces', 'editsign'
@@ -43,7 +46,8 @@ minecraft {
         }
 
         data {
-            workingDirectory project.file("../run")
+            taskName "runESForgeData"
+            workingDirectory project.file("./run/data")
             property "forge.logging.markers", "REGISTRIES"
             property "forge.logging.console.level", "debug"
             args '--mod', 'editsign', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
@@ -57,11 +61,22 @@ minecraft {
     }
 }
 
+configurations {
+    library
+    implementation.extendsFrom library
+}
+
+minecraft.runs.all {
+    lazyToken('minecraft_classpath') {
+        configurations.library.copyRecursive().resolve().collect { it.absolutePath }.join(File.pathSeparator)
+    }
+}
+
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 dependencies {
     minecraft(libs.forge)
-    implementation project(":common")
+    library(project(":common"))
 
     implementation(fg.deobf("me.shedaniel.cloth:cloth-config-forge:${libs.versions.clothConfigVersion.get()}"))
 }

forge/src/main/java/fr/raksrinana/editsign/forge/EditSignUtils.java

@@ -55,7 +55,7 @@ public static Stream<Item> getItem(String name){
 			}
 			var resourceLocation = new ResourceLocation(name);
 			if(isTag){
-				var tag = TagKey.m_203882_(Registry.ITEM_REGISTRY, resourceLocation);
+				var tag = TagKey.create(Registry.ITEM_REGISTRY, resourceLocation);
 				return getRegistryTagContent(Registry.ITEM, tag);
 			}
 			return Stream.of(ITEMS.getValue(resourceLocation));
@@ -67,7 +67,7 @@ public static Stream<Item> getItem(String name){
 
 	@NotNull
 	private static <T> Stream<T> getRegistryTagContent(@NotNull Registry<T> registry, @NotNull TagKey<T> tag){
-		return registry.m_203431_(tag).stream()
-				.flatMap(a -> a.m_203614_().map(Holder::m_203334_));
+		return registry.getTag(tag).stream()
+				.flatMap(a -> a.stream().map(Holder::value));
 	}
 }

forge/src/main/java/fr/raksrinana/editsign/forge/ForgeEventSubscriber.java

@@ -21,17 +21,17 @@ public final class ForgeEventSubscriber{
 
 	@SubscribeEvent(priority = EventPriority.LOWEST)
 	public static void onRightClickBlock(PlayerInteractEvent.RightClickBlock event){
-		var player = event.getPlayer();
+		var player = event.getEntity();
 		if(canPlayerEdit(player, event.getItemStack())){
-			var blockEntity = event.getWorld().getBlockEntity(event.getPos());
+			var blockEntity = event.getLevel().getBlockEntity(event.getPos());
 			if(blockEntity instanceof SignBlockEntity sign){
 				setSignEditable(sign);
 				if(sign.isEditable()){
 					player.openTextEdit(sign);
 				}
 				else{
 					if(player instanceof ServerPlayer serverPlayer){
-						serverPlayer.m_215098_(MutableComponent.m_237204_(new TranslatableContents(EditSign.MOD_ID + ".action.not_editable")), ChatType.f_130598_); //Send it directly to player?
+						serverPlayer.sendSystemMessage(MutableComponent.create(new TranslatableContents(EditSign.MOD_ID + ".action.not_editable")), ChatType.CHAT);
 					}
 				}
 			}

forge/src/main/java/fr/raksrinana/editsign/forge/config/cloth/ClothConfigHook.java

@@ -12,7 +12,7 @@
 import net.minecraft.network.chat.contents.TranslatableContents;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.ConfigGuiHandler;
+import net.minecraftforge.client.ConfigScreenHandler;
 import net.minecraftforge.fml.ModLoadingContext;
 import org.jetbrains.annotations.NotNull;
 import java.util.LinkedList;
@@ -42,10 +42,10 @@ public static Function<String, Optional<Component>> getMinecraftItemIdCellError(
 	}
 
 	public void load(){
-		ModLoadingContext.get().registerExtensionPoint(ConfigGuiHandler.ConfigGuiFactory.class, () -> new ConfigGuiHandler.ConfigGuiFactory((minecraft, screen) -> {
+		ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((minecraft, screen) -> {
 			ConfigBuilder builder = ConfigBuilder.create()
 					.setParentScreen(screen)
-					.setTitle(MutableComponent.m_237204_(new LiteralContents("EditSign")));
+					.setTitle(MutableComponent.create(new LiteralContents("EditSign")));
 
 			fillConfigScreen(builder);
 
@@ -71,7 +71,7 @@ public void fillConfigScreen(ConfigBuilder builder){
 
 	@NotNull
 	private static Component translatable(@NotNull String key){
-		return MutableComponent.m_237204_(new TranslatableContents(key));
+		return MutableComponent.create(new TranslatableContents(key));
 	}
 
 	private String getFieldName(String fieldName){

forge/src/main/resources/META-INF/mods.toml

@@ -15,7 +15,7 @@ description = '''Allow you to edit signs without breaking them.'''
 [[dependencies.editsign]]
 modId = "forge"
 mandatory = true
-versionRange = "[41,)"
+versionRange = "[41.0.94,)"
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.editsign]]

gradle.properties

@@ -10,9 +10,6 @@ includeForge=true
 # Repository
 repoUser=RakSrinaNa
 repoName=EditSign
-# Forge
-mappings_channel=official
-mappings_version=1.18.1
 # Deploy
 modrinth_project_id=hFMCvH85
 curseforge_project_id=344996

gradle/libs.versions.toml

@@ -4,21 +4,22 @@
 lombok-version = "1.18.24"
 jetbrains-annotations-version = "23.0.0"
 gson-version = "2.9.0"
-log4j2-version = "2.17.2"
+log4j2-version = "2.18.0"
 
 minecraftVersion = "1.19"
-fabric-loader-version = "0.14.6"
-fabric-api-version = "0.55.1+1.19"
-forge-version = "1.19-41.0.5"
+fabric-loader-version = "0.14.8"
+fabric-api-version = "0.56.0+1.19"
+forge-version = "1.19-41.0.96"
+forgeMappingsVersion = "1.19"
 
 # Mod dependencies
-modmenu-version = "4.0.0-beta.4"
-clothConfigVersion = "7.0.69"
+modmenu-version = "4.0.3"
+clothConfigVersion = "7.0.72"
 
-fabric-loom-version = "0.12.47"
-forge-plugin-version = "5.1.27"
+fabric-loom-version = "0.12.54"
+forge-plugin-version = "5.1.50"
 curse-version = "1.4.0"
-modrinth-version = "2.2.0"
+modrinth-version = "2.4.1"
 names-version = "0.42.0"
 
 [libraries]