Allow tags to be used in datagen

CraftTweaker · Apr 4, 2022 · 10977db · 10977db
1 parent 81797ad
commit 10977db
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/Common/src/main/java/com/blamejared/crafttweaker/api/tag/expand/ExpandItemTag.java b/Common/src/main/java/com/blamejared/crafttweaker/api/tag/expand/ExpandItemTag.java
@@ -9,7 +9,9 @@
 import com.blamejared.crafttweaker.api.ingredient.type.TagIngredient;
 import com.blamejared.crafttweaker.api.item.IItemStack;
 import com.blamejared.crafttweaker.api.tag.type.KnownTag;
+import com.blamejared.crafttweaker.platform.Services;
 import com.blamejared.crafttweaker_annotations.annotations.Document;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import org.openzen.zencode.java.ZenCodeType;
 
@@ -30,7 +32,8 @@ public class ExpandItemTag {
     @ZenCodeType.Caster(implicit = true)
     public static IIngredient asIIngredient(KnownTag<Item> internal) {
 
-        if(!internal.exists()) {
+        TagKey<?> tagKey = internal.getTagKey();
+        if(!internal.exists() && !Services.PLATFORM.isDataGen()) {
             CraftTweakerAPI.LOGGER.warn("Tag '{}' does not exist, replacing with empty IIngredient", internal.getCommandString());
             return IIngredientEmpty.INSTANCE;
         }

diff --git a/Common/src/main/java/com/blamejared/crafttweaker/platform/services/IPlatformHelper.java b/Common/src/main/java/com/blamejared/crafttweaker/platform/services/IPlatformHelper.java
@@ -49,6 +49,8 @@ default String getLogFormat() {
 
     boolean isDevelopmentEnvironment();
 
+    boolean isDataGen();
+
     List<Mod> getMods();
 
     Optional<Mod> getMod(String modid);

diff --git a/Fabric/src/main/java/com/blamejared/crafttweaker/platform/FabricPlatformHelper.java b/Fabric/src/main/java/com/blamejared/crafttweaker/platform/FabricPlatformHelper.java
@@ -98,6 +98,13 @@ public boolean isDevelopmentEnvironment() {
         return FabricLoader.getInstance().isDevelopmentEnvironment();
     }
 
+    @Override
+    public boolean isDataGen() {
+
+        // If / When fabric has a way to detect datagen, update this.
+        return false;
+    }
+
     @Override
     public List<Mod> getMods() {
 

diff --git a/Forge/src/main/java/com/blamejared/crafttweaker/platform/ForgePlatformHelper.java b/Forge/src/main/java/com/blamejared/crafttweaker/platform/ForgePlatformHelper.java
@@ -39,6 +39,7 @@
 import net.minecraftforge.common.loot.IGlobalLootModifier;
 import net.minecraftforge.common.loot.LootModifierManager;
 import net.minecraftforge.common.util.LazyOptional;
+import net.minecraftforge.data.loading.DatagenModLoader;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidHandlerItem;
 import net.minecraftforge.fml.ModList;
@@ -115,6 +116,12 @@ public boolean isDevelopmentEnvironment() {
         return !FMLLoader.isProduction();
     }
 
+    @Override
+    public boolean isDataGen() {
+
+        return DatagenModLoader.isRunningDataGen();
+    }
+
     @Override
     public List<Mod> getMods() {