Merge pull request #3 from glektarssza/fix-goggle-tags

[bugfix] Fixed Engineer's Goggles from Create not getting the Curios head slot tag

Author: glektarssza

.gitignore

@@ -26,7 +26,7 @@ Sessionx.vim
 *~
 
 ### Auto-generated Tag Files ###
-tags
+/tags
 
 ### Undo Persistence ###
 [._]*.un~

forge-update.json

@@ -0,0 +1,11 @@
+{
+    "homepage": "https://github.com/glektarssza/minecraft-create-goggles-curio",
+    "1.16.5": {
+        "0.0.1": "Initial release.",
+        "0.0.2": "Added a datapack to add the Engineer's Goggles from Create into the Curios head slot tag group."
+    },
+    "promos": {
+        "1.16.5-latest": "0.0.2",
+        "1.16.5-recommended": "0.0.2"
+    }
+}

gradle.properties

@@ -1,6 +1,6 @@
 # Project #
 mod_name=Create Goggles Curio
-mod_version=0.0.1
+mod_version=0.0.2
 mod_group=com.glektarssza
 mod_id=creategogglescurio
 mod_author=G'lek Tarssza

src/main/java/com/glektarssza/creategogglescurio/CreateGogglesCurio.java

@@ -2,7 +2,15 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.fml.loading.FMLEnvironment;
+import net.minecraftforge.registries.ForgeRegistries;
 
 import java.util.function.Supplier;
 
@@ -33,15 +41,46 @@ public class CreateGogglesCurio {
      * Create a new instance.
      */
     public CreateGogglesCurio() {
-        GoggleOverlayRenderer.registerCustomGoggleCondition(new Supplier<Boolean>() {
-            @Override
-            public Boolean get() {
-                return GogglesInCurioSlot();
-            }
-        });
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::Init);
     }
 
-    public boolean GogglesInCurioSlot() {
+    /**
+     * Initialize the mod.
+     *
+     * @param event The event to handle.
+     */
+    public void Init(FMLCommonSetupEvent event) {
+        LOGGER.info("Initializing CreateGogglesCurio...");
+        if (FMLEnvironment.dist.isDedicatedServer()) {
+            LOGGER.warn("CreateGogglesCurio only provides a datapack for servers!");
+            LOGGER.warn("Skipping initialization!");
+            return;
+        }
+        if (!ForgeRegistries.ITEMS.containsKey(new ResourceLocation("create", "goggles"))) {
+            LOGGER.error("Could not find Create Engineer's Goggles, is Create is installed?");
+            LOGGER.error("Disabling CreateGogglesCurio!");
+            return;
+        }
+        DistExecutor.safeRunWhenOn(Dist.CLIENT, () -> this::RegisterGoggleOverlayPredicate);
+        LOGGER.info("Finished initializing CreateGogglesCurio!");
+    }
+
+    /**
+     * Register the predicate for the goggles overlay.
+     */
+    public void RegisterGoggleOverlayPredicate() {
+        GoggleOverlayRenderer.registerCustomGoggleCondition(this::AreGogglesInCurioSlot);
+    }
+
+    /**
+     * Check if the player has the Engineer's Goggles from Create in the "head"
+     * curio slot.
+     *
+     * @return `true` if the player has the Engineer's Goggles from Create in
+     *         the "head" curio slot; `false` otherwise.
+     */
+    @OnlyIn(Dist.CLIENT)
+    public boolean AreGogglesInCurioSlot() {
         Minecraft mc = Minecraft.getInstance();
         LivingEntity player = mc.player;
         ICuriosHelper helper = CuriosApi.getCuriosHelper();

src/main/resources/META-INF/mods.toml

@@ -5,6 +5,7 @@ license = "All rights reserved."
 modId = "creategogglescurio"
 version = "${file.jarVersion}"
 displayName = "Create Goggles Curio"
+updateJSONURL = "https://raw.githubusercontent.com/glektarssza/minecraft-create-goggles-curio/master/forge-update.json"
 displayURL = "https://github.com/glektarssza/minecraft-create-goggles-curio"
 logoFile = "creategogglescurio_logo.png"
 credits = ""
@@ -17,10 +18,10 @@ modId = "create"
 mandatory = true
 versionRange = "[v0.3.2g,)"
 ordering = "NONE"
-side = "CLIENT"
+side = "BOTH"
 [[dependencies.creategogglescurio]]
 modId = "curios"
 mandatory = true
 versionRange = "[1.16.5-4.1.0.0,)"
 ordering = "NONE"
-side = "CLIENT"
+side = "BOTH"

src/main/resources/data/curios/tags/items/head.json

@@ -0,0 +1,6 @@
+{
+    "replace": "false",
+    "values": [
+        "create:goggles"
+    ]
+}