Renamed glowing_shredded_squid to glow_shredded_squid

XenFork · Mar 16, 2024 · fa20895 · fa20895
1 parent 6723255
commit fa20895
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 34 deletions.
diff --git a/common/src/main/java/io/github/xenfork/squidcraft/SquidCraft.java b/common/src/main/java/io/github/xenfork/squidcraft/SquidCraft.java
@@ -50,7 +50,7 @@ public static void init() {
                 if (EntityType.SQUID.getDefaultLootTable().equals(id)) {
                     addLootItem(context, ModItems.SHREDDED_SQUID.get());
                 } else if (EntityType.GLOW_SQUID.getDefaultLootTable().equals(id)) {
-                    addLootItem(context, ModItems.GLOWING_SHREDDED_SQUID.get());
+                    addLootItem(context, ModItems.GLOW_SHREDDED_SQUID.get());
                 }
             }
         });

diff --git a/common/src/main/java/io/github/xenfork/squidcraft/item/ModItemGroups.java b/common/src/main/java/io/github/xenfork/squidcraft/item/ModItemGroups.java
@@ -41,7 +41,7 @@ public final class ModItemGroups {
                 output.accept(Items.GLOW_SQUID_SPAWN_EGG);
                 output.accept(ModItems.SHREDDED_SQUID.get());
                 output.accept(ModItems.COOKED_SHREDDED_SQUID.get());
-                output.accept(ModItems.GLOWING_SHREDDED_SQUID.get());
+                output.accept(ModItems.GLOW_SHREDDED_SQUID.get());
                 output.accept(ModItems.MAGMA_SHREDDED_SQUID.get());
                 output.accept(ModItems.COOKED_SHREDDED_SQUID_BLOCK.get());
             })

diff --git a/common/src/main/java/io/github/xenfork/squidcraft/item/ModItems.java b/common/src/main/java/io/github/xenfork/squidcraft/item/ModItems.java
@@ -38,7 +38,7 @@
 public enum ModItems {
     SHREDDED_SQUID(() -> ofSnack(1, 1f)),
     COOKED_SHREDDED_SQUID(() -> ofSnack(2, 1f)),
-    GLOWING_SHREDDED_SQUID(() -> ofMeat(1, 1f, builder -> builder.effect(new MobEffectInstance(MobEffects.GLOWING, 200, 0), 1f))),
+    GLOW_SHREDDED_SQUID(() -> ofMeat(1, 1f, builder -> builder.effect(new MobEffectInstance(MobEffects.GLOWING, 200, 0), 1f))),
     MAGMA_SHREDDED_SQUID(() -> ofMeat(2, 0.5f, builder -> builder.effect(new MobEffectInstance(MobEffects.FIRE_RESISTANCE, 200, 0), 0.3f))),
     COOKED_SHREDDED_SQUID_BLOCK(() -> new BlockItem(ModBlocks.COOKED_SHREDDED_SQUID_BLOCK.get(), new Item.Properties()));
 

diff --git a/common/src/main/resources/assets/squidcraft/lang/en_us.json b/common/src/main/resources/assets/squidcraft/lang/en_us.json
@@ -3,14 +3,16 @@
   "advancements.squidcraft.root.description": "Get shredded squid",
   "advancements.squidcraft.cooked_shredded_squid.title": "Cooked Shredded Squid",
   "advancements.squidcraft.cooked_shredded_squid.description": "Get cooked shredded squid",
-  "advancements.squidcraft.glowing_shredded_squid.title": "Glowing Shredded Squid",
-  "advancements.squidcraft.glowing_shredded_squid.description": "Get glowing shredded squid",
+  "advancements.squidcraft.glow_shredded_squid.title": "Glow Shredded Squid",
+  "advancements.squidcraft.glow_shredded_squid.description": "Get glow shredded squid",
   "advancements.squidcraft.magma_shredded_squid.title": "Magma Shredded Squid",
   "advancements.squidcraft.magma_shredded_squid.description": "Get magma shredded squid",
+  "advancements.squidcraft.cooked_shredded_squid_block.title": "Block of Cooked Shredded Squid",
+  "advancements.squidcraft.cooked_shredded_squid_block.description": "Get block of cooked shredded squid",
   "block.squidcraft.cooked_shredded_squid_block": "Block of Cooked Shredded Squid",
   "item.squidcraft.shredded_squid": "Shredded Squid",
   "item.squidcraft.cooked_shredded_squid": "Cooked Shredded Squid",
-  "item.squidcraft.glowing_shredded_squid": "Glowing Shredded Squid",
+  "item.squidcraft.glow_shredded_squid": "Glow Shredded Squid",
   "item.squidcraft.magma_shredded_squid": "Magma Shredded Squid",
   "item.squidcraft.cooked_shredded_squid_block": "Block of Cooked Shredded Squid",
   "itemGroup.squidcraft.main": "SquidCraft"

diff --git a/common/src/main/resources/assets/squidcraft/lang/zh_cn.json b/common/src/main/resources/assets/squidcraft/lang/zh_cn.json
@@ -3,14 +3,16 @@
   "advancements.squidcraft.root.description": "获得鱿鱼丝",
   "advancements.squidcraft.cooked_shredded_squid.title": "熟鱿鱼丝",
   "advancements.squidcraft.cooked_shredded_squid.description": "获得熟鱿鱼丝",
-  "advancements.squidcraft.glowing_shredded_squid.title": "荧光鱿鱼丝",
-  "advancements.squidcraft.glowing_shredded_squid.description": "获得荧光鱿鱼丝",
+  "advancements.squidcraft.glow_shredded_squid.title": "荧光鱿鱼丝",
+  "advancements.squidcraft.glow_shredded_squid.description": "获得荧光鱿鱼丝",
   "advancements.squidcraft.magma_shredded_squid.title": "岩浆鱿鱼丝",
   "advancements.squidcraft.magma_shredded_squid.description": "获得岩浆鱿鱼丝",
+  "advancements.squidcraft.cooked_shredded_squid_block.title": "熟鱿鱼丝块",
+  "advancements.squidcraft.cooked_shredded_squid_block.description": "获得熟鱿鱼丝块",
   "block.squidcraft.cooked_shredded_squid_block": "熟鱿鱼丝块",
   "item.squidcraft.shredded_squid": "鱿鱼丝",
   "item.squidcraft.cooked_shredded_squid": "熟鱿鱼丝",
-  "item.squidcraft.glowing_shredded_squid": "荧光鱿鱼丝",
+  "item.squidcraft.glow_shredded_squid": "荧光鱿鱼丝",
   "item.squidcraft.magma_shredded_squid": "岩浆鱿鱼丝",
   "item.squidcraft.cooked_shredded_squid_block": "熟鱿鱼丝块",
   "itemGroup.squidcraft.main": "鱿鱼工艺"

diff --git a/common/src/main/resources/assets/squidcraft/models/item/glow_shredded_squid.json b/common/src/main/resources/assets/squidcraft/models/item/glow_shredded_squid.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "squidcraft:item/glow_shredded_squid"
+  }
+}
diff --git a/common/src/main/resources/assets/squidcraft/models/item/glowing_shredded_squid.json b/common/src/main/resources/assets/squidcraft/models/item/glowing_shredded_squid.json
diff --git a/.../textures/item/glowing_shredded_squid.png → ...aft/textures/item/glow_shredded_squid.png b/.../textures/item/glowing_shredded_squid.png → ...aft/textures/item/glow_shredded_squid.png
diff --git a/common/src/main/resources/data/c/raw_fishes.json b/common/src/main/resources/data/c/raw_fishes.json
@@ -2,6 +2,6 @@
   "replace": false,
   "values": [
     "squidcraft:shredded_squid",
-    "squidcraft:glowing_shredded_squid"
+    "squidcraft:glow_shredded_squid"
   ]
 }
diff --git a/common/src/main/resources/data/forge/raw_fishes.json b/common/src/main/resources/data/forge/raw_fishes.json
@@ -2,6 +2,6 @@
   "replace": false,
   "values": [
     "squidcraft:shredded_squid",
-    "squidcraft:glowing_shredded_squid"
+    "squidcraft:glow_shredded_squid"
   ]
 }
diff --git a/.../advancements/glowing_shredded_squid.json → ...aft/advancements/glow_shredded_squid.json b/.../advancements/glowing_shredded_squid.json → ...aft/advancements/glow_shredded_squid.json
@@ -1,12 +1,12 @@
 {
   "parent": "squidcraft:root",
   "criteria": {
-    "glowing_shredded_squid": {
+    "glow_shredded_squid": {
       "conditions": {
         "items": [
           {
             "items": [
-              "squidcraft:glowing_shredded_squid"
+              "squidcraft:glow_shredded_squid"
             ]
           }
         ]
@@ -17,13 +17,13 @@
   "display": {
     "announce_to_chat": false,
     "description": {
-      "translate": "advancements.squidcraft.glowing_shredded_squid.description"
+      "translate": "advancements.squidcraft.glow_shredded_squid.description"
     },
     "title": {
-      "translate": "advancements.squidcraft.glowing_shredded_squid.title"
+      "translate": "advancements.squidcraft.glow_shredded_squid.title"
     },
     "icon": {
-      "item": "squidcraft:glowing_shredded_squid"
+      "item": "squidcraft:glow_shredded_squid"
     }
   }
 }
diff --git a/common/src/main/resources/data/squidcraft/advancements/recipes/cooked_shredded_squid.json b/common/src/main/resources/data/squidcraft/advancements/recipes/cooked_shredded_squid.json
@@ -13,12 +13,12 @@
       },
       "trigger": "minecraft:inventory_changed"
     },
-    "has_glowing_shredded_squid": {
+    "has_glow_shredded_squid": {
       "conditions": {
         "items": [
           {
             "items": [
-              "squidcraft:glowing_shredded_squid"
+              "squidcraft:glow_shredded_squid"
             ]
           }
         ]
@@ -47,7 +47,7 @@
   "requirements": [
     [
       "has_shredded_squid",
-      "has_glowing_shredded_squid",
+      "has_glow_shredded_squid",
       "has_cooked_shredded_squid",
       "has_the_recipe"
     ]

diff --git a/...ces/data/squidcraft/advancements/recipes/cooked_shredded_squid_from_campfire_cooking.json b/...ces/data/squidcraft/advancements/recipes/cooked_shredded_squid_from_campfire_cooking.json
@@ -13,12 +13,12 @@
       },
       "trigger": "minecraft:inventory_changed"
     },
-    "has_glowing_shredded_squid": {
+    "has_glow_shredded_squid": {
       "conditions": {
         "items": [
           {
             "items": [
-              "squidcraft:glowing_shredded_squid"
+              "squidcraft:glow_shredded_squid"
             ]
           }
         ]
@@ -47,7 +47,7 @@
   "requirements": [
     [
       "has_shredded_squid",
-      "has_glowing_shredded_squid",
+      "has_glow_shredded_squid",
       "has_cooked_shredded_squid",
       "has_the_recipe"
     ]

diff --git a/...in/resources/data/squidcraft/advancements/recipes/cooked_shredded_squid_from_smoking.json b/...in/resources/data/squidcraft/advancements/recipes/cooked_shredded_squid_from_smoking.json
@@ -13,12 +13,12 @@
       },
       "trigger": "minecraft:inventory_changed"
     },
-    "has_glowing_shredded_squid": {
+    "has_glow_shredded_squid": {
       "conditions": {
         "items": [
           {
             "items": [
-              "squidcraft:glowing_shredded_squid"
+              "squidcraft:glow_shredded_squid"
             ]
           }
         ]
@@ -47,7 +47,7 @@
   "requirements": [
     [
       "has_shredded_squid",
-      "has_glowing_shredded_squid",
+      "has_glow_shredded_squid",
       "has_cooked_shredded_squid",
       "has_the_recipe"
     ]

diff --git a/common/src/main/resources/data/squidcraft/recipes/cooked_shredded_squid.json b/common/src/main/resources/data/squidcraft/recipes/cooked_shredded_squid.json
@@ -5,7 +5,7 @@
       "item": "squidcraft:shredded_squid"
     },
     {
-      "item": "squidcraft:glowing_shredded_squid"
+      "item": "squidcraft:glow_shredded_squid"
     }
   ],
   "result": "squidcraft:cooked_shredded_squid",

diff --git a/...c/main/resources/data/squidcraft/recipes/cooked_shredded_squid_from_campfire_cooking.json b/...c/main/resources/data/squidcraft/recipes/cooked_shredded_squid_from_campfire_cooking.json
@@ -5,7 +5,7 @@
       "item": "squidcraft:shredded_squid"
     },
     {
-      "item": "squidcraft:glowing_shredded_squid"
+      "item": "squidcraft:glow_shredded_squid"
     }
   ],
   "result": "squidcraft:cooked_shredded_squid",

diff --git a/common/src/main/resources/data/squidcraft/recipes/cooked_shredded_squid_from_smoking.json b/common/src/main/resources/data/squidcraft/recipes/cooked_shredded_squid_from_smoking.json
@@ -5,7 +5,7 @@
       "item": "squidcraft:shredded_squid"
     },
     {
-      "item": "squidcraft:glowing_shredded_squid"
+      "item": "squidcraft:glow_shredded_squid"
     }
   ],
   "result": "squidcraft:cooked_shredded_squid",