Add a tag that contains all mekanism units (mekanism/Mekanism-Feature…

…-Requests#689)
mekanism · Aug 20, 2024 · a02920d · a02920d
1 parent 780413a
commit a02920d
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 5 deletions.
diff --git a/src/api/java/mekanism/api/MekanismAPITags.java b/src/api/java/mekanism/api/MekanismAPITags.java
@@ -8,6 +8,7 @@
 import net.minecraft.world.damagesource.DamageType;
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.item.Item;
 
 /**
  * Provides access to pre-existing tag keys for various functionality that we use tags for.
@@ -91,6 +92,24 @@ private static TagKey<Chemical> tag(String name) {
         }
     }
 
+    /**
+     * @since 10.7.0
+     */
+    public static class Items {
+
+        private Items() {
+        }
+
+        /**
+         * Contains all mekanism modules.
+         */
+        public static final TagKey<Item> MEKA_UNITS = tag("unit");
+
+        private static TagKey<Item> tag(String name) {
+            return TagKey.create(Registries.ITEM, rl(name));
+        }
+    }
+
     public static class MobEffects {
 
         private MobEffects() {

diff --git a/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 b/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55
diff --git a/src/datagen/generated/mekanism/.cache/f4271571320fe007f5d8ba9eb4461ed6922f6a93 b/src/datagen/generated/mekanism/.cache/f4271571320fe007f5d8ba9eb4461ed6922f6a93
diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json
diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json
diff --git a/src/datagen/generated/mekanism/data/mekanism/tags/item/unit.json b/src/datagen/generated/mekanism/data/mekanism/tags/item/unit.json
diff --git a/src/datagen/generated/mekanismgenerators/.cache/08f2b53f4cfddb5dc20bb23057cbafdfe1cdd910 b/src/datagen/generated/mekanismgenerators/.cache/08f2b53f4cfddb5dc20bb23057cbafdfe1cdd910
diff --git a/src/datagen/generated/mekanismgenerators/data/mekanism/tags/item/unit.json b/src/datagen/generated/mekanismgenerators/data/mekanism/tags/item/unit.json
diff --git a/src/datagen/generators/java/mekanism/generators/common/GeneratorsTagProvider.java b/src/datagen/generators/java/mekanism/generators/common/GeneratorsTagProvider.java
@@ -2,10 +2,13 @@
 
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
+import mekanism.api.MekanismAPITags;
+import mekanism.common.content.gear.IModuleItem;
 import mekanism.common.tag.BaseTagProvider;
 import mekanism.generators.common.registries.GeneratorsBlocks;
 import mekanism.generators.common.registries.GeneratorsChemicals;
 import mekanism.generators.common.registries.GeneratorsFluids;
+import mekanism.generators.common.registries.GeneratorsItems;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
@@ -60,6 +63,8 @@ protected void registerTags(HolderLookup.Provider registries) {
 
         addToTag(FRAMEABLE, GeneratorsBlocks.REACTOR_GLASS, GeneratorsBlocks.LASER_FOCUS_MATRIX);
         addToTag(FB_BE_WHITELIST, GeneratorsBlocks.REACTOR_GLASS, GeneratorsBlocks.LASER_FOCUS_MATRIX);
+
+        getItemBuilder(MekanismAPITags.Items.MEKA_UNITS).add(GeneratorsItems.ITEMS.getEntries().stream().filter(item -> item.get() instanceof IModuleItem).toList());
     }
 
     private void addBoxBlacklist() {

diff --git a/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java b/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java
@@ -87,6 +87,7 @@ protected void addTranslations() {
     }
 
     private void addTags() {
+        addTag(MekanismAPITags.Items.MEKA_UNITS, "Meka Units");
         addTag(MekanismTags.Items.CONFIGURATORS, "Configurators");
         addTag(MekanismTags.Items.TOOLS_WRENCH, "Wrenches");
         addTag(MekanismTags.Items.PERSONAL_STORAGE, "Personal Storage");

diff --git a/src/datagen/main/java/mekanism/common/tag/MekanismTagProvider.java b/src/datagen/main/java/mekanism/common/tag/MekanismTagProvider.java
@@ -8,6 +8,7 @@
 import mekanism.api.chemical.Chemical;
 import mekanism.api.providers.IItemProvider;
 import mekanism.common.Mekanism;
+import mekanism.common.content.gear.IModuleItem;
 import mekanism.common.registration.impl.BlockRegistryObject;
 import mekanism.common.registration.impl.ItemRegistryObject;
 import mekanism.common.registration.impl.SlurryRegistryObject;
@@ -165,6 +166,8 @@ protected void registerTags(HolderLookup.Provider registries) {
 
         addToTag(FRAMEABLE, MekanismBlocks.STRUCTURAL_GLASS);
         addToTag(FB_BE_WHITELIST, MekanismBlocks.STRUCTURAL_GLASS);
+
+        getItemBuilder(MekanismAPITags.Items.MEKA_UNITS).add(MekanismItems.ITEMS.getEntries().stream().filter(item -> item.get() instanceof IModuleItem).toList());
     }
 
     private void addEntities() {