Add cooked_fishes tag.

Signed-off-by: 秋雨落 <[email protected]>
CuteNekoOwO · Feb 21, 2024 · febcdb3 · febcdb3
1 parent ee68a32
commit febcdb3
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 13 deletions.
diff --git a/catsplus-fabric/src/main/java/cuteneko/catsplus/fabric/data/gen/ModDataGen.java b/catsplus-fabric/src/main/java/cuteneko/catsplus/fabric/data/gen/ModDataGen.java
@@ -15,5 +15,6 @@ public void onInitializeDataGenerator(FabricDataGenerator generator) {
         pack.addProvider(ModItemModelProvider::new);
 
         pack.addProvider(ModRecipeProvider::new);
+        pack.addProvider(ModItemTagProvider::new);
     }
 }
diff --git a/catsplus-fabric/src/main/java/cuteneko/catsplus/fabric/data/gen/ModItemTagProvider.java b/catsplus-fabric/src/main/java/cuteneko/catsplus/fabric/data/gen/ModItemTagProvider.java
@@ -0,0 +1,22 @@
+package cuteneko.catsplus.fabric.data.gen;
+
+import cuteneko.catsplus.tag.ModItemTags;
+import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
+import net.minecraft.item.Items;
+import net.minecraft.registry.RegistryWrapper;
+
+import java.util.concurrent.CompletableFuture;
+
+public class ModItemTagProvider extends FabricTagProvider.ItemTagProvider {
+    public ModItemTagProvider(FabricDataOutput output, CompletableFuture<RegistryWrapper.WrapperLookup> completableFuture) {
+        super(output, completableFuture);
+    }
+
+    @Override
+    protected void configure(RegistryWrapper.WrapperLookup arg) {
+        getOrCreateTagBuilder(ModItemTags.COOKED_FISHES)
+                .add(Items.COOKED_COD)
+                .add(Items.COOKED_SALMON);
+    }
+}
diff --git a/src/main/generated/.cache/15e558425d03769b4c939a16ffd55f843ac56d0f b/src/main/generated/.cache/15e558425d03769b4c939a16ffd55f843ac56d0f
@@ -1,2 +1,2 @@
-// 1.20.4	2024-02-21T21:09:29.4662143	Cats+/Language (en_us)
+// 1.20.4	2024-02-21T21:16:16.496054	Cats+/Language (en_us)
 d6583927b847b4b2a3794090b7ac5fceccb13c82 assets\catsplus\lang\en_us.json
diff --git a/src/main/generated/.cache/49e5c65ca1ab59f598f710846fb0f8d549021d95 b/src/main/generated/.cache/49e5c65ca1ab59f598f710846fb0f8d549021d95
@@ -1,2 +1,2 @@
-// 1.20.4	2024-02-21T21:09:29.4682147	Cats+/Language (zh_cn)
+// 1.20.4	2024-02-21T21:16:16.4970528	Cats+/Language (zh_cn)
 7931bcf23f857507e9bead0a1e1f3d793d6d5915 assets\catsplus\lang\zh_cn.json
diff --git a/src/main/generated/.cache/aaa80d5935224bd236f347a63f6c896153bd61b8 b/src/main/generated/.cache/aaa80d5935224bd236f347a63f6c896153bd61b8
@@ -0,0 +1,2 @@
+// 1.20.4	2024-02-21T21:16:16.4970528	Cats+/Tags for minecraft:item
+491c16568754e85de8983f2660885e26edfb506a data\catsplus\tags\items\cooked_fishes.json
diff --git a/src/main/generated/.cache/d5ee957bafb940ae78b04b56b65ec8b9002aa9dc b/src/main/generated/.cache/d5ee957bafb940ae78b04b56b65ec8b9002aa9dc
@@ -1,4 +1,4 @@
-// 1.20.4	2024-02-21T21:09:29.4682147	Cats+/Recipes
+// 1.20.4	2024-02-21T21:16:16.4970528	Cats+/Recipes
 241ff3a315e1d01731c5b1b8f98108af0ab6656b data\catsplus\advancements\recipes\tools\cat_bag.json
 10847e82ba25bc5c21abff40e303a1c023a77613 data\catsplus\recipes\totemeow.json
 561f81e965a426c518aba9734d7fb823257b8eb5 data\catsplus\recipes\cat_bag.json

diff --git a/src/main/generated/.cache/dcf38aaf6b2f28016e34adbe561ad13afee480c8 b/src/main/generated/.cache/dcf38aaf6b2f28016e34adbe561ad13afee480c8
@@ -1,2 +1,2 @@
-// 1.20.4	2024-02-21T21:09:29.4682147	Cats+/Model Definitions
+// 1.20.4	2024-02-21T21:16:16.496054	Cats+/Model Definitions
 882a1bd93aa3b1750ec3f9e2176a49e5561f45a9 assets\catsplus\models\item\totemeow.json
diff --git a/src/main/generated/data/catsplus/tags/items/cooked_fishes.json b/src/main/generated/data/catsplus/tags/items/cooked_fishes.json
@@ -0,0 +1,7 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:cooked_cod",
+    "minecraft:cooked_salmon"
+  ]
+}
diff --git a/src/main/java/cuteneko/catsplus/mixins/mixin/PlayerEntityMixin.java b/src/main/java/cuteneko/catsplus/mixins/mixin/PlayerEntityMixin.java
@@ -34,4 +34,6 @@ public void tick(CallbackInfo ci) {
             cat.addVelocity(vel.x * 5, vel.y, vel.z * 5);
         }
     }
+
+    // Todo: qyl27: Right click tamed cat to increase favorability.
 }
diff --git a/src/main/java/cuteneko/catsplus/tag/ModItemTags.java b/src/main/java/cuteneko/catsplus/tag/ModItemTags.java
@@ -0,0 +1,11 @@
+package cuteneko.catsplus.tag;
+
+import cuteneko.catsplus.CatsPlus;
+import net.minecraft.item.Item;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.registry.tag.TagKey;
+import net.minecraft.util.Identifier;
+
+public class ModItemTags {
+    public static final TagKey<Item> COOKED_FISHES = TagKey.of(RegistryKeys.ITEM, new Identifier(CatsPlus.MODID, "cooked_fishes"));
+}
diff --git a/src/main/java/cuteneko/catsplus/utility/GeniusCatHelper.java b/src/main/java/cuteneko/catsplus/utility/GeniusCatHelper.java
@@ -1,19 +1,12 @@
 package cuteneko.catsplus.utility;
 
-import net.minecraft.entity.Entity;
+import cuteneko.catsplus.tag.ModItemTags;
 import net.minecraft.entity.LivingEntity;
-import net.minecraft.item.Items;
 import net.minecraft.particle.ParticleEffect;
 import net.minecraft.recipe.Ingredient;
 
 public class GeniusCatHelper {
-    // Todo: qyl27: Change it to a cooked_fish tag.
-    public static final Ingredient TAMED_CAT_FOODS = Ingredient.ofItems(
-            Items.COD,
-            Items.SALMON,
-            Items.COOKED_COD,
-            Items.COOKED_SALMON,
-            Items.TROPICAL_FISH);
+    public static final Ingredient TAMED_CAT_FOODS = Ingredient.fromTag(ModItemTags.COOKED_FISHES);
 
     public static void produceParticles(LivingEntity entity, ParticleEffect parameters) {
         for (int i = 0; i < 5; ++i) {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// 1.20.4 2024-02-21T21:16:16.4970528 Cats+/Tags for minecraft:item
		491c16568754e85de8983f2660885e26edfb506a data\catsplus\tags\items\cooked_fishes.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,4 +34,6 @@ public void tick(CallbackInfo ci) { @@
                 cat.addVelocity(vel.x * 5, vel.y, vel.z * 5);
             }
         }
+        // Todo: qyl27: Right click tamed cat to increase favorability.
     }