Updated premade classes to use TagKey

OroArmor · Mar 3, 2022 · 1eb881b · 1eb881b
1 parent 3abd83c
commit 1eb881b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ yarn_mappings=1.18.2+build.1
 loader_version=0.13.3
 
 # Mod Properties
-mod_version=1.5.1-1.18
+mod_version=1.5.2-1.18
 maven_group=com.github.crimsondawn45
 archives_base_name=FabricShieldLib
 

diff --git a/...main/java/com/github/crimsondawn45/fabricshieldlib/lib/object/FabricBannerShieldItem.java b/...main/java/com/github/crimsondawn45/fabricshieldlib/lib/object/FabricBannerShieldItem.java
@@ -17,7 +17,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ToolMaterial;
 import net.minecraft.recipe.Ingredient;
-import net.minecraft.tag.Tag;
+import net.minecraft.tag.TagKey;
 import net.minecraft.text.Text;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Hand;
@@ -36,9 +36,9 @@ public class FabricBannerShieldItem extends Item implements FabricShield {
 
     //Repair stuff
     private Item[] repairItems;
-    private Tag<Item> repairTag;
+    private TagKey<Item> repairTag;
     private Ingredient repairIngredients;
-    private Collection<Tag<Item>> repairTags;
+    private Collection<TagKey<Item>> repairTags;
 
     private RepairItemType repairType;
 
@@ -97,7 +97,7 @@ public FabricBannerShieldItem(Settings settings, int cooldownTicks, ToolMaterial
      * @param enchantability enchantability of shield. Vanilla: 9
      * @param repairItemTag item tag for repairing shield.
      */
-    public FabricBannerShieldItem(Settings settings, int cooldownTicks, int enchantability, Tag<Item> repairItemTag) {
+    public FabricBannerShieldItem(Settings settings, int cooldownTicks, int enchantability, TagKey<Item> repairItemTag) {
         super(settings);
 
         //Register dispenser equip behavior
@@ -122,7 +122,7 @@ public FabricBannerShieldItem(Settings settings, int cooldownTicks, int enchanta
      * @param enchantability enchantability of shield. Vanilla: 9
      * @param repairItemTag list of item tags for repairing shield.
      */
-    public FabricBannerShieldItem(Settings settings, int cooldownTicks, int enchantability, Collection<Tag<Item>> repairItemTags) {
+    public FabricBannerShieldItem(Settings settings, int cooldownTicks, int enchantability, Collection<TagKey<Item>> repairItemTags) {
         super(settings);
 
         //Register dispenser equip behavior
@@ -193,11 +193,11 @@ public boolean canRepair(ItemStack stack, ItemStack ingredient) {
                     }
                 }
                 return false;
-            case TAG:           return this.repairTag.values().contains(ingredient.getItem());
+            case TAG:           return ingredient.isIn(this.repairTag);
             case INGREDIENT:    return this.repairIngredients.test(ingredient);
             case TAG_ARRAY:
-                for(Tag<Item> tag : this.repairTags) {
-                    if(tag.values().contains(ingredient.getItem())) {
+                for(TagKey<Item> tag : this.repairTags) {
+                    if(ingredient.isIn(tag)) {
                         return true;
                     }
                 }

diff --git a/src/main/java/com/github/crimsondawn45/fabricshieldlib/lib/object/FabricShieldItem.java b/src/main/java/com/github/crimsondawn45/fabricshieldlib/lib/object/FabricShieldItem.java
@@ -14,7 +14,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ToolMaterial;
 import net.minecraft.recipe.Ingredient;
-import net.minecraft.tag.Tag;
+import net.minecraft.tag.TagKey;
 import net.minecraft.text.Text;
 import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
@@ -32,9 +32,9 @@ public class FabricShieldItem extends Item implements FabricShield {
 
     //Repair stuff
     private Item[] repairItems;
-    private Tag<Item> repairTag;
+    private TagKey<Item> repairTag;
     private Ingredient repairIngredients;
-    private Collection<Tag<Item>> repairTags;
+    private Collection<TagKey<Item>> repairTags;
 
     private RepairItemType repairType;
 
@@ -93,7 +93,7 @@ public FabricShieldItem(Settings settings, int cooldownTicks, ToolMaterial mater
      * @param enchantability enchantability of shield. Vanilla: 14
      * @param repairItemTag item tag for repairing shield
      */
-    public FabricShieldItem(Settings settings, int cooldownTicks, int enchantability, Tag<Item> repairItemTag) {
+    public FabricShieldItem(Settings settings, int cooldownTicks, int enchantability, TagKey<Item> repairItemTag) {
         super(settings); //Make durability match material
 
         //Register dispenser equip behavior
@@ -118,7 +118,7 @@ public FabricShieldItem(Settings settings, int cooldownTicks, int enchantability
      * @param enchantability enchantability of shield. Vanilla: 9
      * @param repairItemTag list of item tags for repairing shield.
      */
-    public FabricShieldItem(Settings settings, int cooldownTicks, int enchantability, Collection<Tag<Item>> repairItemTags) {
+    public FabricShieldItem(Settings settings, int cooldownTicks, int enchantability, Collection<TagKey<Item>> repairItemTags) {
         super(settings);
 
         //Register dispenser equip behavior
@@ -172,11 +172,11 @@ public boolean canRepair(ItemStack stack, ItemStack ingredient) {
                     }
                 }
                 return false;
-            case TAG:           return this.repairTag.values().contains(ingredient.getItem());
+            case TAG:           return ingredient.isIn(this.repairTag);
             case INGREDIENT:    return this.repairIngredients.test(ingredient);
             case TAG_ARRAY:
-                for(Tag<Item> tag : this.repairTags) {
-                    if(tag.values().contains(ingredient.getItem())) {
+                for(TagKey<Item> tag : this.repairTags) {
+                    if(ingredient.isIn(tag)) {
                         return true;
                     }
                 }