Merge branch 'architectury-1.18.2' into architectury-1.19.2

# Conflicts: # forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/PFMMinecraftServerMixin.java
UnlikePaladin · Nov 5, 2023 · 0d30cc3 · 0d30cc3
2 parents ef301c2 + 85a5be8
commit 0d30cc3
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/PFMMinecraftServerMixin.java b/forge/src/main/java/com/unlikepaladin/pfm/mixin/forge/PFMMinecraftServerMixin.java
@@ -9,7 +9,6 @@
 import net.minecraft.resource.ResourcePack;
 import net.minecraft.resource.metadata.PackResourceMetadata;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -21,13 +20,10 @@
 @Mixin(MinecraftServer.class)
 public class PFMMinecraftServerMixin {
 
-    @Inject(method = "lambda$reloadResources$15", at = @At(value = "RETURN"), cancellable = true, remap = false)
+    @Inject(method = "lambda$reloadResources$15", at = @At(value = "RETURN"), remap = false)
     private void createReload(CallbackInfoReturnable<ImmutableList<ResourcePack>> cir) {
-        PFMRuntimeResources.RESOURCE_PACK_LIST = new ArrayList<>(cir.getReturnValue());
         List<ResourcePack> resourcePacks = new ArrayList<>(cir.getReturnValue());
-        PackResourceMetadata packResourceMetadata = new PackResourceMetadata(Text.literal("pfm-runtime-resources"), SharedConstants.getGameVersion().getPackVersion(PackType.RESOURCE));
-        resourcePacks.add(new PathPackRPWrapper(Suppliers.memoize(() -> {
-            PFMRuntimeResources.prepareAndRunResourceGen(false); return PFMRuntimeResources.ASSETS_PACK;}), packResourceMetadata));
-        cir.setReturnValue(ImmutableList.copyOf(resourcePacks));
+        resourcePacks.removeIf(pack -> pack instanceof PathPackRPWrapper);
+        PFMRuntimeResources.RESOURCE_PACK_LIST = resourcePacks;
     }
 }