From 5bc4a35f41f40b0db267738cb774505a443279ce Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 8 Sep 2024 18:32:56 +0900 Subject: [PATCH 1/2] Fix JEI plugin failure when no potions are registered to the zeta registry --- src/main/java/org/violetmoon/zeta/registry/ZetaRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/violetmoon/zeta/registry/ZetaRegistry.java b/src/main/java/org/violetmoon/zeta/registry/ZetaRegistry.java index 2106b37..a67b0e7 100644 --- a/src/main/java/org/violetmoon/zeta/registry/ZetaRegistry.java +++ b/src/main/java/org/violetmoon/zeta/registry/ZetaRegistry.java @@ -285,6 +285,6 @@ protected void trackRegisteredObject(ResourceKey> keyGeneric, Ho * Gets all the registered objects from this Zeta */ public Collection> getRegisteredObjects(ResourceKey> registry) { - return (Collection>) (Collection) myRegisteredObjects.get((ResourceKey) registry); + return (Collection>) (Collection) myRegisteredObjects.getOrDefault((ResourceKey) registry, List.of()); } } From 2dc4f5a9d9e6decbe44fa88da1d5729f1044a13a Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 10 Sep 2024 10:02:27 +0900 Subject: [PATCH 2/2] fix crash when using the new ForgeZGatherHints --- .../violetmoon/zetaimplforge/event/load/ForgeZGatherHints.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZGatherHints.java b/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZGatherHints.java index ae6c311..73487ca 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZGatherHints.java +++ b/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZGatherHints.java @@ -4,11 +4,12 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.level.ItemLike; import net.minecraftforge.eventbus.api.Event; +import net.minecraftforge.fml.event.IModBusEvent; import org.violetmoon.zeta.config.ConfigFlagManager; import org.violetmoon.zeta.event.load.ZGatherHints; import org.violetmoon.zeta.module.ZetaModule; -public class ForgeZGatherHints extends Event implements ZGatherHints { +public class ForgeZGatherHints extends Event implements ZGatherHints, IModBusEvent { private final ZGatherHints wrapped; public ForgeZGatherHints(ZGatherHints e) {