Fuck.

noobanidus · noobanidus · commit 418aea17a93b · 2021-08-12T13:58:33.000+10:00
diff --git a/src/generated/resources/data/util/tags/items/value1.json b/src/generated/resources/data/util/tags/items/value1.json
@@ -2,7 +2,6 @@
   "replace": false,
   "values": [
     "minecraft:coal",
-    "minecraft:iron_nugget",
     "minecraft:quartz"
   ]
 }
diff --git a/src/generated/resources/data/util/tags/items/value10.json b/src/generated/resources/data/util/tags/items/value10.json
@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
+    "minecraft:blaze_rod",
     "minecraft:ender_pearl",
     "minecraft:ghast_tear",
     "minecraft:shulker_shell",
diff --git a/src/generated/resources/data/util/tags/items/value4.json b/src/generated/resources/data/util/tags/items/value4.json
@@ -1,8 +1,6 @@
 {
   "replace": false,
   "values": [
-    "minecraft:gold_nugget",
-    "minecraft:blaze_powder",
     "minecraft:emerald"
   ]
 }
diff --git a/src/generated/resources/data/util/tags/items/value5.json b/src/generated/resources/data/util/tags/items/value5.json
@@ -2,7 +2,6 @@
   "replace": false,
   "values": [
     "minecraft:iron_ingot",
-    "minecraft:honey_bottle",
     "minecraft:prismarine_shard"
   ]
 }
diff --git a/src/generated/resources/data/util/tags/items/value6.json b/src/generated/resources/data/util/tags/items/value6.json
@@ -1,6 +1,6 @@
 {
   "replace": false,
   "values": [
-    "minecraft:dragon_breath"
+    "minecraft:honey_bottle"
   ]
 }
diff --git a/src/generated/resources/data/util/tags/items/value8.json b/src/generated/resources/data/util/tags/items/value8.json
@@ -1,6 +1,6 @@
 {
   "replace": false,
   "values": [
-    "minecraft:gold_ingot"
+    "minecraft:dragon_breath"
   ]
 }
diff --git a/src/generated/resources/data/util/tags/items/value9.json b/src/generated/resources/data/util/tags/items/value9.json
@@ -1,7 +1,7 @@
 {
   "replace": false,
   "values": [
-    "minecraft:blaze_rod",
+    "minecraft:gold_ingot",
     "minecraft:rabbit_foot"
   ]
 }
diff --git a/src/main/java/noobanidus/mods/util/UtilTags.java b/src/main/java/noobanidus/mods/util/UtilTags.java
@@ -1,29 +1,31 @@
 package noobanidus.mods.util;
 
 import net.minecraft.item.Item;
-import net.minecraft.tags.ItemTags;
+import net.minecraft.tags.ITag;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.common.Tags;
+import net.minecraftforge.common.ForgeTagHandler;
+import net.minecraftforge.registries.ForgeRegistries;
 
 public class UtilTags {
-  public static final Tags.IOptionalNamedTag<Item> VALUE1 = tag("value1");
-  public static final Tags.IOptionalNamedTag<Item> VALUE2 = tag("value2");
-  public static final Tags.IOptionalNamedTag<Item> VALUE3 = tag("value3");
-  public static final Tags.IOptionalNamedTag<Item> VALUE4 = tag("value4");
-  public static final Tags.IOptionalNamedTag<Item> VALUE5 = tag("value5");
-  public static final Tags.IOptionalNamedTag<Item> VALUE6 = tag("value6");
-  public static final Tags.IOptionalNamedTag<Item> VALUE7 = tag("value7");
-  public static final Tags.IOptionalNamedTag<Item> VALUE8 = tag("value8");
-  public static final Tags.IOptionalNamedTag<Item> VALUE9 = tag("value9");
-  public static final Tags.IOptionalNamedTag<Item> VALUE10 = tag("value10");
-  public static final Tags.IOptionalNamedTag<Item> VALUE15 = tag("value15");
-  public static final Tags.IOptionalNamedTag<Item> VALUE20 = tag("value20");
-  public static final Tags.IOptionalNamedTag<Item> VALUE25 = tag("value25");
-  public static final Tags.IOptionalNamedTag<Item> VALUE50 = tag("value50");
-  public static final Tags.IOptionalNamedTag<Item> VALUE75 = tag("value75");
-  public static final Tags.IOptionalNamedTag<Item> VALUE100 = tag("value100");
+  public static final ITag.INamedTag<Item> VALUE1 = tag("value1");
+  public static final ITag.INamedTag<Item> VALUE2 = tag("value2");
+  public static final ITag.INamedTag<Item> VALUE3 = tag("value3");
+  public static final ITag.INamedTag<Item> VALUE4 = tag("value4");
+  public static final ITag.INamedTag<Item> VALUE5 = tag("value5");
+  public static final ITag.INamedTag<Item> VALUE6 = tag("value6");
+  public static final ITag.INamedTag<Item> VALUE7 = tag("value7");
+  public static final ITag.INamedTag<Item> VALUE8 = tag("value8");
+  public static final ITag.INamedTag<Item> VALUE9 = tag("value9");
+  public static final ITag.INamedTag<Item> VALUE10 = tag("value10");
+  public static final ITag.INamedTag<Item> VALUE15 = tag("value15");
+  public static final ITag.INamedTag<Item> VALUE20 = tag("value20");
+  public static final ITag.INamedTag<Item> VALUE25 = tag("value25");
+  public static final ITag.INamedTag<Item> VALUE50 = tag("value50");
+  public static final ITag.INamedTag<Item> VALUE75 = tag("value75");
+  public static final ITag.INamedTag<Item> VALUE100 = tag("value100");
 
-  public static Tags.IOptionalNamedTag<Item> tag(String name) {
-    return ItemTags.createOptional(new ResourceLocation(Util.MODID, name));
+  public static ITag.INamedTag<Item> tag(String name) {
+    return ForgeTagHandler.makeWrapperTag(ForgeRegistries.ITEMS, new ResourceLocation(Util.MODID, name));
+    //return ItemTags.createOptional(new ResourceLocation(Util.MODID, name));
   }
 }
diff --git a/src/main/java/noobanidus/mods/util/commands/CommandToolLevel.java b/src/main/java/noobanidus/mods/util/commands/CommandToolLevel.java
@@ -4,13 +4,16 @@
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import net.minecraft.command.CommandSource;
 import net.minecraft.command.Commands;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.tags.ITag;
 import net.minecraft.util.text.*;
 import net.minecraft.world.World;
 import noobanidus.mods.util.aeq.AeqPlugin;
 import noobanidus.mods.util.aeq.ConversionCache;
+import noobanidus.mods.util.init.ModAeq;
 
 public class CommandToolLevel {
   public static void register (CommandDispatcher<CommandSource> dispatcher) {
@@ -22,7 +25,12 @@ public static LiteralArgumentBuilder<CommandSource> builder(LiteralArgumentBuild
       MinecraftServer server = c.getSource().getServer();
       World world = server.getWorld(World.OVERWORLD);
       ConversionCache cache = AeqPlugin.get(world);
-      c.getSource().sendFeedback(new StringTextComponent("Value of blaze powder: " + cache.getAmount(new ItemStack(Items.BLAZE_POWDER, 4), true)), true);
+      for (ITag.INamedTag<Item> tag : ModAeq.MAP.keySet()) {
+        for (Item i : tag.getAllElements()) {
+          double amount = cache.getAmount(new ItemStack(i, 1), true);
+          c.getSource().sendFeedback(new TranslationTextComponent("util.blah", new TranslationTextComponent(i.getTranslationKey()), new StringTextComponent("" + amount)), true);
+        }
+      }
       return 1;
     });
     return builder;
diff --git a/src/main/java/noobanidus/mods/util/data/AeqData.java b/src/main/java/noobanidus/mods/util/data/AeqData.java
@@ -21,8 +21,9 @@ public AeqData(DataGenerator dataGenerator) {
 
   @Override
   public void calculateDataToSave() {
-    for (Map.Entry<ITag.INamedTag<Item>, RegistryEntry<ICompoundType>> val : ModAeq.MAP.entrySet()) {
-      save(specFor(val.getKey()).withCompounds(new CompoundInstance(val.getValue().get(), 1)));
-    }
+/*    for (Map.Entry<ITag.INamedTag<Item>, RegistryEntry<ICompoundType>> val : ModAeq.MAP.entrySet()) {
+      int amount = Integer.parseInt(val.getKey().getName().getPath().split("value")[1]);
+      save(specFor(val.getKey()).withCompounds(new CompoundInstance(val.getValue().get(), amount)));
+    }*/
   }
 }
diff --git a/src/main/java/noobanidus/mods/util/data/AeqTagsProvider.java b/src/main/java/noobanidus/mods/util/data/AeqTagsProvider.java
@@ -13,16 +13,16 @@
 public class AeqTagsProvider extends ItemTagsProvider {
   @Override
   protected void registerTags() {
-    getOrCreateBuilder(UtilTags.VALUE1).add(Items.COAL, Items.IRON_NUGGET, Items.QUARTZ);    // Coal, Iron Nugget, Quartz
+    getOrCreateBuilder(UtilTags.VALUE1).add(Items.COAL, Items.QUARTZ);    // Coal, Iron Nugget, Quartz
     getOrCreateBuilder(UtilTags.VALUE2).add(Items.SLIME_BALL, Items.NETHER_WART);    // Slime Ball, Nether Wart
     getOrCreateBuilder(UtilTags.VALUE3).add(Items.GUNPOWDER, Items.REDSTONE, Items.GLOWSTONE, Items.LAPIS_LAZULI, Items.EXPERIENCE_BOTTLE, Items.PRISMARINE_CRYSTALS);    // Gunpowder, Redstone, Glowstone, Lapis Lazuli, Experience Bottle
-    getOrCreateBuilder(UtilTags.VALUE4).add(Items.GOLD_NUGGET, Items.BLAZE_POWDER, Items.EMERALD);    // Gold Nugget, Blaze Powder, Emerald
-    getOrCreateBuilder(UtilTags.VALUE5).add(Items.IRON_INGOT, Items.HONEY_BOTTLE, Items.PRISMARINE_SHARD);    // Iron Ingot, Prismarine?, Honey Bottle
-    getOrCreateBuilder(UtilTags.VALUE6).add(Items.DRAGON_BREATH);    // Dragon Breath
+    getOrCreateBuilder(UtilTags.VALUE4).add(Items.EMERALD);    // Gold Nugget, Blaze Powder, Emerald
+    getOrCreateBuilder(UtilTags.VALUE5).add(Items.IRON_INGOT, Items.PRISMARINE_SHARD);    // Iron Ingot, Prismarine?, Honey Bottle
+    getOrCreateBuilder(UtilTags.VALUE6).add(Items.HONEY_BOTTLE);    // Dragon Breath
     getOrCreateBuilder(UtilTags.VALUE7).add(Items.SCUTE, Items.PHANTOM_MEMBRANE);    // Scute, Phantom Memberane
-    getOrCreateBuilder(UtilTags.VALUE8).add(Items.GOLD_INGOT);    // Gold Ingot
-    getOrCreateBuilder(UtilTags.VALUE9).add(Items.BLAZE_ROD, Items.RABBIT_FOOT);    // Blaze Rod, Rabbit Foot
-    getOrCreateBuilder(UtilTags.VALUE10).add(Items.ENDER_PEARL, Items.GHAST_TEAR, Items.SHULKER_SHELL, Items.ENCHANTED_BOOK); // Ender Pearl, Ghast Tear, Shulker Shell, Enchanted Book
+    getOrCreateBuilder(UtilTags.VALUE8).add(Items.DRAGON_BREATH);    // Gold Ingot
+    getOrCreateBuilder(UtilTags.VALUE9).add(Items.GOLD_INGOT, Items.RABBIT_FOOT);    // Blaze Rod, Rabbit Foot
+    getOrCreateBuilder(UtilTags.VALUE10).add(Items.BLAZE_ROD, Items.ENDER_PEARL, Items.GHAST_TEAR, Items.SHULKER_SHELL, Items.ENCHANTED_BOOK); // Ender Pearl, Ghast Tear, Shulker Shell, Enchanted Book
     getOrCreateBuilder(UtilTags.VALUE15).add(Items.DIAMOND, Items.HEART_OF_THE_SEA, Items.NAUTILUS_SHELL, Items.CRYING_OBSIDIAN);   // Diamond, Nautilus Shell, Crying Obsidan
     getOrCreateBuilder(UtilTags.VALUE20).add(Items.NETHERITE_SCRAP);   // Netherite Scrap
     getOrCreateBuilder(UtilTags.VALUE25).add(Items.ANCIENT_DEBRIS);   // Ancient Debris
diff --git a/src/main/resources/assets/util/lang/en_us.json b/src/main/resources/assets/util/lang/en_us.json
@@ -0,0 +1,3 @@
+{
+  "util.blah": "Value of: %s is %s."
+}

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`"replace": false,`
`3`	`3`	`"values": [`
`4`	`4`	`"minecraft:coal",`
`5`		`- "minecraft:iron_nugget",`
`6`	`5`	`"minecraft:quartz"`
`7`	`6`	`]`
`8`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"replace": false,`
`3`	`3`	`"values": [`
	`4`	`+ "minecraft:blaze_rod",`
`4`	`5`	`"minecraft:ender_pearl",`
`5`	`6`	`"minecraft:ghast_tear",`
`6`	`7`	`"minecraft:shulker_shell",`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"replace": false,`
`3`	`3`	`"values": [`
`4`		`- "minecraft:gold_nugget",`
`5`		`- "minecraft:blaze_powder",`
`6`	`4`	`"minecraft:emerald"`
`7`	`5`	`]`
`8`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"replace": false,`
`3`	`3`	`"values": [`
`4`		`- "minecraft:dragon_breath"`
	`4`	`+ "minecraft:honey_bottle"`
`5`	`5`	`]`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"replace": false,`
`3`	`3`	`"values": [`
`4`		`- "minecraft:blaze_rod",`
	`4`	`+ "minecraft:gold_ingot",`
`5`	`5`	`"minecraft:rabbit_foot"`
`6`	`6`	`]`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,9 @@ public AeqData(DataGenerator dataGenerator) {`
`21`	`21`
`22`	`22`	`@Override`
`23`	`23`	`public void calculateDataToSave() {`
`24`		`- for (Map.Entry<ITag.INamedTag<Item>, RegistryEntry<ICompoundType>> val : ModAeq.MAP.entrySet()) {`
`25`		`- save(specFor(val.getKey()).withCompounds(new CompoundInstance(val.getValue().get(), 1)));`
`26`		`- }`
	`24`	`+/* for (Map.Entry<ITag.INamedTag<Item>, RegistryEntry<ICompoundType>> val : ModAeq.MAP.entrySet()) {`
	`25`	`+ int amount = Integer.parseInt(val.getKey().getName().getPath().split("value")[1]);`
	`26`	`+ save(specFor(val.getKey()).withCompounds(new CompoundInstance(val.getValue().get(), amount)));`
	`27`	`+ }*/`
`27`	`28`	`}`
`28`	`29`	`}`