Minor datagen code cleanup to take advantage of newer Neo helpers

Author: pupnewfster

src/datagen/additions/java/mekanism/additions/common/AdditionsTagProvider.java

@@ -156,8 +156,7 @@ private void addToTags(TagKey<Item> itemTag, TagKey<Block> blockTag, Map<EnumCol
             DyeColor dyeColor = entry.getKey().getDyeColor();
             if (dyeColor != null) {
                 addToTags(Tags.Items.DYED, Tags.Blocks.DYED, entry.getValue());
-                TagKey<Item> dyedColor = ItemTags.create(Tags.Items.DYED.location().withSuffix("/" + dyeColor.getName()));
-                addToTags(dyedColor, BlockTags.create(dyedColor.location()), entry.getValue());
+                addToTags(dyeColor.getDyedTag(), BlockTags.create(dyeColor.getDyedTag().location()), entry.getValue());
             }
         }
     }
@@ -168,7 +167,7 @@ private void addToTag(TagKey<Item> itemTag, Map<EnumColor, ? extends IItemProvid
             DyeColor dyeColor = entry.getKey().getDyeColor();
             if (dyeColor != null) {
                 addToTag(Tags.Items.DYED, entry.getValue());
-                addToTag(ItemTags.create(Tags.Items.DYED.location().withSuffix("/" + dyeColor.getName())), entry.getValue());
+                addToTag(dyeColor.getDyedTag(), entry.getValue());
             }
         }
     }

src/datagen/main/java/mekanism/common/recipe/impl/PigmentExtractingRecipeProvider.java

@@ -10,6 +10,7 @@
 import mekanism.common.recipe.ISubRecipeProvider;
 import mekanism.common.registries.MekanismPigments;
 import mekanism.common.tags.MekanismTags;
+import mekanism.common.util.EnumUtils;
 import net.minecraft.data.recipes.RecipeOutput;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.DyeColor;
@@ -18,7 +19,6 @@
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.level.block.BannerBlock;
 import net.minecraft.world.level.block.Blocks;
-import net.neoforged.neoforge.common.Tags;
 import net.neoforged.neoforge.common.crafting.IntersectionIngredient;
 
 public class PigmentExtractingRecipeProvider implements ISubRecipeProvider {
@@ -37,22 +37,12 @@ public class PigmentExtractingRecipeProvider implements ISubRecipeProvider {
     private static final Map<EnumColor, TagKey<Item>> DYED_TAGS = new EnumMap<>(EnumColor.class);
 
     static {
-        DYED_TAGS.put(EnumColor.WHITE, Tags.Items.DYED_WHITE);
-        DYED_TAGS.put(EnumColor.ORANGE, Tags.Items.DYED_ORANGE);
-        DYED_TAGS.put(EnumColor.PINK, Tags.Items.DYED_MAGENTA);
-        DYED_TAGS.put(EnumColor.INDIGO, Tags.Items.DYED_LIGHT_BLUE);
-        DYED_TAGS.put(EnumColor.YELLOW, Tags.Items.DYED_YELLOW);
-        DYED_TAGS.put(EnumColor.BRIGHT_GREEN, Tags.Items.DYED_LIME);
-        DYED_TAGS.put(EnumColor.BRIGHT_PINK, Tags.Items.DYED_PINK);
-        DYED_TAGS.put(EnumColor.DARK_GRAY, Tags.Items.DYED_GRAY);
-        DYED_TAGS.put(EnumColor.GRAY, Tags.Items.DYED_LIGHT_GRAY);
-        DYED_TAGS.put(EnumColor.DARK_AQUA, Tags.Items.DYED_CYAN);
-        DYED_TAGS.put(EnumColor.PURPLE, Tags.Items.DYED_PURPLE);
-        DYED_TAGS.put(EnumColor.DARK_BLUE, Tags.Items.DYED_BLUE);
-        DYED_TAGS.put(EnumColor.BROWN, Tags.Items.DYED_BROWN);
-        DYED_TAGS.put(EnumColor.DARK_GREEN, Tags.Items.DYED_GREEN);
-        DYED_TAGS.put(EnumColor.RED, Tags.Items.DYED_RED);
-        DYED_TAGS.put(EnumColor.BLACK, Tags.Items.DYED_BLACK);
+        for (EnumColor color : EnumUtils.COLORS) {
+            DyeColor dyeColor = color.getDyeColor();
+            if (dyeColor != null) {
+                DYED_TAGS.put(color, dyeColor.getDyedTag());
+            }
+        }
     }
 
     @Override

src/datagen/main/resources/META-INF/datagen_ats.cfg

@@ -7,9 +7,5 @@ public net.minecraft.data.HashCache cachePaths
 public-f net.minecraft.data.HashCache initialCount
 public net.minecraft.data.HashCache writes
 
-#Armor trim
-public net.minecraft.data.models.ItemModelGenerators GENERATED_TRIM_MODELS
-public net.minecraft.data.models.ItemModelGenerators$TrimModelData
-
 #Misc
 protected net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$Builder <init>(Lnet/minecraft/world/level/storage/loot/providers/nbt/NbtProvider;)V

src/main/resources/META-INF/accesstransformer.cfg

@@ -64,9 +64,6 @@ public net.minecraft.client.model.geom.ModelPart$Cube polygons
 public net.minecraft.client.model.geom.ModelPart$Vertex
 public net.minecraft.client.model.geom.ModelPart$Polygon
 
-protected net.minecraft.client.particle.BubbleParticle <init>(Lnet/minecraft/client/multiplayer/ClientLevel;DDDDDD)V
-protected net.minecraft.client.particle.FlameParticle <init>(Lnet/minecraft/client/multiplayer/ClientLevel;DDDDDD)V
-
 public net.minecraft.client.renderer.entity.LivingEntityRenderer layers
 public net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer innerModel
 public net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer outerModel