Merge branch 'architectury-1.17.1' into architectury-1.18.1

UnlikePaladin · Nov 12, 2023 · 65d9d50 · 65d9d50
2 parents aa48162 + 6204118
commit 65d9d50
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/common/src/main/java/com/unlikepaladin/pfm/PaladinFurnitureModUpdateChecker.java b/common/src/main/java/com/unlikepaladin/pfm/PaladinFurnitureModUpdateChecker.java
@@ -187,10 +187,10 @@ public Optional<Text> getUpdateMessageServer() {
             if (textParts.length > 1) {
                 MutableText component1 = new LiteralText(textParts[0]);
                 MutableText component2 = new LiteralText(textParts[1]);
-                MutableText link = new LiteralText(info.modHost).styled(arg -> arg.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, info.modDownload)).withUnderline(true));
+                MutableText link = new LiteralText(info.modHost).styled(arg -> arg.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, info.modDownload)));
                 return Optional.of(component1.append(link).append(component2));
             } else {
-                MutableText link = new LiteralText(info.modHost).styled(arg -> arg.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, info.modDownload)).withUnderline(true));
+                MutableText link = new LiteralText(info.modHost).styled(arg -> arg.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, info.modDownload)));
                 return Optional.of(new LiteralText(textParts[0]).append(link));
             }
         } else {

diff --git a/common/src/main/java/com/unlikepaladin/pfm/client/PathPackRPWrapper.java b/common/src/main/java/com/unlikepaladin/pfm/client/PathPackRPWrapper.java
@@ -1,5 +1,6 @@
 package com.unlikepaladin.pfm.client;
 
+import com.unlikepaladin.pfm.runtime.PFMRuntimeResources;
 import net.minecraft.resource.ResourcePack;
 import net.minecraft.resource.ResourceType;
 import net.minecraft.resource.metadata.PackResourceMetadata;
@@ -26,25 +27,31 @@ public PathPackRPWrapper(Supplier<ResourcePack> delegate, PackResourceMetadata p
     @Nullable
     @Override
     public InputStream openRoot(String fileName) throws IOException {
-        if (fileName.equals("pack.png")) {
+        if (PFMRuntimeResources.ready && fileName.equals("pack.png")) {
             return delegate.get().openRoot(fileName);
         }
         return null;
     }
 
     @Override
     public InputStream open(ResourceType type, Identifier id) throws IOException {
-        return delegate.get().open(type, id);
+        if (PFMRuntimeResources.ready)
+            return delegate.get().open(type, id);
+        return null;
     }
 
     @Override
     public Collection<Identifier> findResources(ResourceType type, String namespace, String prefix, int maxDepth, Predicate<String> pathFilter) {
-        return delegate.get().findResources(type, namespace, prefix, maxDepth, pathFilter);
+        if (PFMRuntimeResources.ready)
+            return delegate.get().findResources(type, namespace, prefix, maxDepth, pathFilter);
+        return null;
     }
 
     @Override
     public boolean contains(ResourceType type, Identifier id) {
-        return delegate.get().contains(type, id);
+        if (PFMRuntimeResources.ready)
+            return delegate.get().contains(type, id);
+        return false;
     }
 
     @Override
@@ -68,6 +75,7 @@ public String getName() {
 
     @Override
     public void close() {
-        delegate.get().close();
+        if (PFMRuntimeResources.ready)
+            delegate.get().close();
     }
 }
diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/fabric/PaladinFurnitureModFabric.java b/fabric/src/main/java/com/unlikepaladin/pfm/fabric/PaladinFurnitureModFabric.java
@@ -92,7 +92,6 @@ public void onInitialize() {
         BlockItemRegistryFabric.registerItems();
         BlockItemRegistryFabric.registerBlocks();
         //PFMRuntimeResources.prepareAsyncResourceGen(); No async gen because Forge won't behave, blame it.
-        PFMRuntimeResources.ready = true;
         StatisticsRegistryFabric.registerStatistics();
         SoundRegistryFabric.registerSounds();
         NetworkRegistryFabric.registerPackets();

diff --git a/...c/main/java/com/unlikepaladin/pfm/mixin/fabric/PFMReloadableResourceManagerImplMixin.java b/...c/main/java/com/unlikepaladin/pfm/mixin/fabric/PFMReloadableResourceManagerImplMixin.java
@@ -19,6 +19,7 @@ private List<ResourcePack> createReload(List<ResourcePack> packs) {
         List<ResourcePack> resourcePacks = new ArrayList<>(packs);
         resourcePacks.removeIf(pack -> pack instanceof PathPackRPWrapper);
         PFMRuntimeResources.RESOURCE_PACK_LIST = resourcePacks;
+        PFMRuntimeResources.ready = true;
         return packs;
     }
 }
diff --git a/...rc/main/java/com/unlikepaladin/pfm/mixin/forge/PFMReloadableResourceManagerImplMixin.java b/...rc/main/java/com/unlikepaladin/pfm/mixin/forge/PFMReloadableResourceManagerImplMixin.java
@@ -19,6 +19,7 @@ private List<ResourcePack> createReload(List<ResourcePack> packs) {
         List<ResourcePack> resourcePacks = new ArrayList<>(packs);
         resourcePacks.removeIf(pack -> pack instanceof PathPackRPWrapper);
         PFMRuntimeResources.RESOURCE_PACK_LIST = resourcePacks;
+        PFMRuntimeResources.ready = true;
         return packs;
     }
 }
diff --git a/forge/src/main/java/com/unlikepaladin/pfm/registry/forge/RecipeRegistryForge.java b/forge/src/main/java/com/unlikepaladin/pfm/registry/forge/RecipeRegistryForge.java
@@ -29,7 +29,6 @@ public static void registerRecipeSerializers(RegistryEvent.Register<RecipeSerial
         );
         //Can't run resource gen until the recipe serializer has been registered or it dies because it needs the ID
         //PFMRuntimeResources.prepareAsyncResourceGen(); Had to disable async gen because Forge dies and I can't be bothered to figure out why, this is cursed enough as it is
-        PFMRuntimeResources.ready = true;
         if (PaladinFurnitureMod.getModList().contains("cookingforblockheads"))
             PFMCookingForBlockHeadsCompat.initBlockConnectors();
     }