add registry access to ZGatherHints

VazkiiMods · Sep 7, 2024 · fe6d906 · fe6d906
1 parent a5122c6
commit fe6d906
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/org/violetmoon/zeta/event/load/ZGatherHints.java b/src/main/java/org/violetmoon/zeta/event/load/ZGatherHints.java
@@ -1,5 +1,6 @@
 package org.violetmoon.zeta.event.load;
 
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.level.ItemLike;
 import org.violetmoon.zeta.config.ConfigFlagManager;
@@ -17,4 +18,5 @@ public interface ZGatherHints extends IZetaLoadEvent {
 
     void gatherHintsFromModule(ZetaModule module, ConfigFlagManager cfm);
 
+    RegistryAccess getRegistryAccess();
 }
diff --git a/...n/zeta/integration/InfoRecipeBuilder.java → ...moon/zeta/integration/JeiGatherHints.java b/...n/zeta/integration/InfoRecipeBuilder.java → ...moon/zeta/integration/JeiGatherHints.java
@@ -23,15 +23,15 @@
 import java.util.List;
 import java.util.Map;
 
-class InfoRecipeBuilder implements ZGatherHints {
+class JeiGatherHints implements ZGatherHints {
 
 	private final IRecipeRegistration registration;
 	private final String modId;
 	private final RegistryAccess registryAccess;
 	private final List<Item> blacklist;
 	private final MutableComponent externalPreamble;
 
-	public InfoRecipeBuilder(IRecipeRegistration registration, String modId, RegistryAccess registryAccess, List<Item> blacklist) {
+	public JeiGatherHints(IRecipeRegistration registration, String modId, RegistryAccess registryAccess, List<Item> blacklist) {
 		this.registration = registration;
 		this.modId = modId;
 		this.registryAccess = registryAccess;
@@ -169,4 +169,9 @@ else if (target instanceof Iterable<?> iter)
 			}
 		}
 	}
+
+	@Override
+	public RegistryAccess getRegistryAccess() {
+		return registryAccess;
+	}
 }
diff --git a/src/main/java/org/violetmoon/zeta/integration/ZetaJeiPlugin.java b/src/main/java/org/violetmoon/zeta/integration/ZetaJeiPlugin.java
@@ -110,7 +110,7 @@ public void registerRecipes(@NotNull IRecipeRegistration registration) {
 
         List<Item> blacklist = RegistryUtil.massRegistryGet(ZetaGeneralConfig.suppressedInfo, BuiltInRegistries.ITEM);
         for (Zeta z : ZetaList.INSTANCE.getZetas()) {
-            z.loadBus.fire(new InfoRecipeBuilder(registration, z.modid, registryAccess, blacklist), ZGatherHints.class);
+            z.loadBus.fire(new JeiGatherHints(registration, z.modid, registryAccess, blacklist), ZGatherHints.class);
         }
     }
 

diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZGatherHints.java b/src/main/java/org/violetmoon/zetaimplforge/event/load/ForgeZGatherHints.java
@@ -4,7 +4,6 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.level.ItemLike;
 import net.minecraftforge.eventbus.api.Event;
-import org.violetmoon.zeta.Zeta;
 import org.violetmoon.zeta.config.ConfigFlagManager;
 import org.violetmoon.zeta.event.load.ZGatherHints;
 import org.violetmoon.zeta.module.ZetaModule;
@@ -35,4 +34,9 @@ public void hintItem(ItemLike itemLike, String key, Object... extra) {
     public void gatherHintsFromModule(ZetaModule module, ConfigFlagManager cfm) {
         wrapped.gatherHintsFromModule(module, cfm);
     }
+
+    @Override
+    public RegistryAccess getRegistryAccess() {
+        return wrapped.getRegistryAccess();
+    }
 }