Update fabric mappings and fix class names

ErrorCraft · ErrorCraft · commit 0d226c88d126 · 2022-04-23T18:13:03.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -50,6 +50,10 @@ tasks.withType(JavaCompile).configureEach {
 	it.options.release = 17
 }
 
+loom {
+	accessWidenerPath = file("src/main/resources/entitymodifiers.accesswidener")
+}
+
 java {
 	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
 	// if it is present.
diff --git a/gradle.properties b/gradle.properties
@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
-	minecraft_version=1.18
-	yarn_mappings=1.18+build.1
-	loader_version=0.12.8
+	minecraft_version=1.18.2
+	yarn_mappings=1.18.2+build.3
+	loader_version=0.13.3
 
 # Mod Properties
 	mod_version = 1.1.0
 	maven_group = errorcraft.entitymodifiers
 	archives_base_name = entitymodifiers
 
 # Dependencies
-	fabric_version=0.43.1+1.18
+	fabric_version=0.51.1+1.18.2
diff --git a/src/main/java/errorcraft/entitymodifiers/access/server/DataPackContentsExtenderAccess.java b/src/main/java/errorcraft/entitymodifiers/access/server/DataPackContentsExtenderAccess.java
@@ -1,7 +1,7 @@
-package errorcraft.entitymodifiers.access.resource;
+package errorcraft.entitymodifiers.access.server;
 
 import errorcraft.entitymodifiers.entity.modifier.EntityModifierManager;
 
-public interface ServerResourceManagerExtenderAccess {
+public interface DataPackContentsExtenderAccess {
 	EntityModifierManager getEntityModifierManager();
 }
diff --git a/src/main/java/errorcraft/entitymodifiers/entity/modifier/EntityModifierTypes.java b/src/main/java/errorcraft/entitymodifiers/entity/modifier/EntityModifierTypes.java
@@ -9,7 +9,7 @@
 
 public class EntityModifierTypes {
 	public static final RegistryKey<Registry<EntityModifierType>> ENTITY_MODIFIER_TYPE_KEY = RegistryAccessor.createRegistryKey("entity_modifier_type");
-	public static final Registry<EntityModifierType> ENTITY_MODIFIER_TYPE = RegistryAccessor.create(ENTITY_MODIFIER_TYPE_KEY, () -> EntityModifierTypes.SET_INVULNERABLE);
+	public static final Registry<EntityModifierType> ENTITY_MODIFIER_TYPE = RegistryAccessor.create(ENTITY_MODIFIER_TYPE_KEY, registry -> EntityModifierTypes.SET_INVULNERABLE);
 
 	public static final EntityModifierType SET_INVULNERABLE = register("set_invulnerable", new SetInvulnerableEntityModifier.Serialiser());
 	public static final EntityModifierType SET_HEALTH = register("set_health", new SetHealthEntityModifier.Serialiser());
diff --git a/src/main/java/errorcraft/entitymodifiers/mixin/registry/RegistryAccessor.java b/src/main/java/errorcraft/entitymodifiers/mixin/registry/RegistryAccessor.java
@@ -5,8 +5,6 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
-import java.util.function.Supplier;
-
 @Mixin(Registry.class)
 public interface RegistryAccessor {
 	@Invoker("createRegistryKey")
@@ -15,7 +13,7 @@ static <T> RegistryKey<Registry<T>> createRegistryKey(String registryId) {
 	}
 
 	@Invoker("create")
-	static <T> Registry<T> create(RegistryKey<? extends Registry<T>> key, Supplier<T> defaultEntry) {
+	static <T> Registry<T> create(RegistryKey<? extends Registry<T>> key, Registry.DefaultEntryGetter<T> defaultEntryGetter) {
 		throw new AssertionError();
 	}
 }
diff --git a/src/main/java/errorcraft/entitymodifiers/mixin/resource/ServerResourceManagerAccessor.java b/src/main/java/errorcraft/entitymodifiers/mixin/resource/ServerResourceManagerAccessor.java
diff --git a/src/main/java/errorcraft/entitymodifiers/mixin/resource/ServerResourceManagerExtender.java b/src/main/java/errorcraft/entitymodifiers/mixin/resource/ServerResourceManagerExtender.java
diff --git a/src/main/java/errorcraft/entitymodifiers/mixin/server/DataPackContentsExtender.java b/src/main/java/errorcraft/entitymodifiers/mixin/server/DataPackContentsExtender.java
@@ -0,0 +1,34 @@
+package errorcraft.entitymodifiers.mixin.server;
+
+import errorcraft.entitymodifiers.access.server.DataPackContentsExtenderAccess;
+import errorcraft.entitymodifiers.entity.modifier.EntityModifierManager;
+import net.minecraft.resource.ResourceReloader;
+import net.minecraft.server.DataPackContents;
+import net.minecraft.server.command.CommandManager.RegistrationEnvironment;
+import net.minecraft.util.registry.DynamicRegistryManager;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@Mixin(DataPackContents.class)
+public class DataPackContentsExtender implements DataPackContentsExtenderAccess {
+	private final EntityModifierManager entityModifierManager = new EntityModifierManager();
+
+	@Inject(at = @At("RETURN"), method = "getContents", cancellable = true)
+	private void addEntityModifierManagerToContents(CallbackInfoReturnable<List<ResourceReloader>> info) {
+		List<ResourceReloader> reloaders = new ArrayList<>(info.getReturnValue());
+		reloaders.add(this.entityModifierManager);
+		info.setReturnValue(Collections.unmodifiableList(reloaders));
+	}
+
+	@Override
+	public EntityModifierManager getEntityModifierManager() {
+		return this.entityModifierManager;
+	}
+}
diff --git a/src/main/java/errorcraft/entitymodifiers/mixin/server/MinecraftServerAccessor.java b/src/main/java/errorcraft/entitymodifiers/mixin/server/MinecraftServerAccessor.java
diff --git a/src/main/java/errorcraft/entitymodifiers/mixin/server/MinecraftServerExtender.java b/src/main/java/errorcraft/entitymodifiers/mixin/server/MinecraftServerExtender.java
@@ -1,17 +1,20 @@
 package errorcraft.entitymodifiers.mixin.server;
 
+import errorcraft.entitymodifiers.access.server.DataPackContentsExtenderAccess;
 import errorcraft.entitymodifiers.access.server.MinecraftServerExtenderAccess;
 import errorcraft.entitymodifiers.entity.modifier.EntityModifierManager;
-import errorcraft.entitymodifiers.mixin.resource.ServerResourceManagerAccessor;
 import net.minecraft.server.MinecraftServer;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(MinecraftServer.class)
 public class MinecraftServerExtender implements MinecraftServerExtenderAccess {
+	@Shadow
+	private MinecraftServer.ResourceManagerHolder resourceManagerHolder;
+
 	@Override
 	public EntityModifierManager getEntityModifierManager() {
-		MinecraftServerAccessor thisAccessor = (MinecraftServerAccessor)this;
-		ServerResourceManagerAccessor serverResourceManagerAccessor = (ServerResourceManagerAccessor)(thisAccessor.getServerResourceManager());
-		return serverResourceManagerAccessor.getEntityModifierManager();
+		DataPackContentsExtenderAccess dataPackContentsExtenderAccess = (DataPackContentsExtenderAccess)(this.resourceManagerHolder.dataPackContents());
+		return dataPackContentsExtenderAccess.getEntityModifierManager();
 	}
 }
diff --git a/src/main/java/errorcraft/entitymodifiers/util/CommandUtils.java b/src/main/java/errorcraft/entitymodifiers/util/CommandUtils.java
@@ -4,9 +4,9 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.exceptions.DynamicCommandExceptionType;
 import com.mojang.brigadier.suggestion.SuggestionProvider;
+import errorcraft.entitymodifiers.access.server.MinecraftServerExtenderAccess;
 import errorcraft.entitymodifiers.entity.modifier.EntityModifier;
 import errorcraft.entitymodifiers.entity.modifier.EntityModifierManager;
-import errorcraft.entitymodifiers.mixin.server.MinecraftServerAccessor;
 import net.minecraft.command.CommandSource;
 import net.minecraft.command.argument.IdentifierArgumentType;
 import net.minecraft.server.command.ServerCommandSource;
@@ -16,16 +16,16 @@
 public class CommandUtils {
 	private static final DynamicCommandExceptionType UNKNOWN_ENTITY_MODIFIER = new DynamicCommandExceptionType(object -> new TranslatableText("entity_modifier.unknown", object));
 	public static final SuggestionProvider<ServerCommandSource> ENTITY_MODIFIER_SUGGESTION_PROVIDER = (context, builder) -> {
-		MinecraftServerAccessor serverAccessor = (MinecraftServerAccessor)(context.getSource().getServer());
-		EntityModifierManager entityModifierManager = serverAccessor.getEntityModifierManager();
+		MinecraftServerExtenderAccess serverExtenderAccess = (MinecraftServerExtenderAccess)(context.getSource().getServer());
+		EntityModifierManager entityModifierManager = serverExtenderAccess.getEntityModifierManager();
 		return CommandSource.suggestIdentifiers(entityModifierManager.getKeys(), builder);
 	};
 
 	public static EntityModifier getEntityModifier(CommandContext<ServerCommandSource> context, String argumentName) throws CommandSyntaxException {
 		Identifier resourceLocation = IdentifierArgumentType.getIdentifier(context, argumentName);
 
-		MinecraftServerAccessor serverAccessor = (MinecraftServerAccessor)(context.getSource().getServer());
-		EntityModifierManager entityModifierManager = serverAccessor.getEntityModifierManager();
+		MinecraftServerExtenderAccess serverExtenderAccess = (MinecraftServerExtenderAccess)(context.getSource().getServer());
+		EntityModifierManager entityModifierManager = serverExtenderAccess.getEntityModifierManager();
 		EntityModifier entityModifier = entityModifierManager.get(resourceLocation);
 
 		if (entityModifier == null) {
diff --git a/src/main/resources/entitymodifiers.accesswidener b/src/main/resources/entitymodifiers.accesswidener
@@ -0,0 +1,4 @@
+accessWidener	v1	named
+
+accessible    class    net/minecraft/server/MinecraftServer$ResourceManagerHolder
+accessible    class    net/minecraft/util/registry/Registry$DefaultEntryGetter
diff --git a/src/main/resources/entitymodifiers.mixins.json b/src/main/resources/entitymodifiers.mixins.json
@@ -5,10 +5,8 @@
   "compatibilityLevel": "JAVA_16",
   "mixins": [
     "registry.RegistryAccessor",
-    "resource.ServerResourceManagerAccessor",
-    "resource.ServerResourceManagerExtender",
     "server.command.SummonCommandAccessor",
-    "server.MinecraftServerAccessor",
+    "server.DataPackContentsExtender",
     "server.MinecraftServerExtender"
   ],
   "client": [
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -25,6 +25,7 @@
   "mixins": [
     "entitymodifiers.mixins.json"
   ],
+  "accessWidener": "entitymodifiers.accesswidener",
 
   "depends": {
     "fabricloader": ">=0.12.5",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-package errorcraft.entitymodifiers.access.resource;`
	`1`	`+package errorcraft.entitymodifiers.access.server;`
`2`	`2`
`3`	`3`	`import errorcraft.entitymodifiers.entity.modifier.EntityModifierManager;`
`4`	`4`
`5`		`-public interface ServerResourceManagerExtenderAccess {`
	`5`	`+public interface DataPackContentsExtenderAccess {`
`6`	`6`	`EntityModifierManager getEntityModifierManager();`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`	`import org.spongepowered.asm.mixin.Mixin;`
`6`	`6`	`import org.spongepowered.asm.mixin.gen.Invoker;`
`7`	`7`
`8`		`-import java.util.function.Supplier;`
`9`		`-`
`10`	`8`	`@Mixin(Registry.class)`
`11`	`9`	`public interface RegistryAccessor {`
`12`	`10`	`@Invoker("createRegistryKey")`
`@@ -15,7 +13,7 @@ static <T> RegistryKey<Registry<T>> createRegistryKey(String registryId) {`
`15`	`13`	`}`
`16`	`14`
`17`	`15`	`@Invoker("create")`
`18`		`- static <T> Registry<T> create(RegistryKey<? extends Registry<T>> key, Supplier<T> defaultEntry) {`
	`16`	`+ static <T> Registry<T> create(RegistryKey<? extends Registry<T>> key, Registry.DefaultEntryGetter<T> defaultEntryGetter) {`
`19`	`17`	`throw new AssertionError();`
`20`	`18`	`}`
`21`	`19`	`}`