Fix errors and run datagen

copycats-plus · Jul 18, 2024 · 8e0f665 · 8e0f665
1 parent 0e0f93c
commit 8e0f665
Show file tree

Hide file tree

Showing 22 changed files with 257 additions and 258 deletions.
diff --git a/common/src/main/java/com/copycatsplus/copycats/network/FillCopycatPacket.java b/common/src/main/java/com/copycatsplus/copycats/network/FillCopycatPacket.java
@@ -17,13 +17,13 @@
  */
 public record FillCopycatPacket(BlockPos pos, BlockState material, String property) implements PacketSystem.C2SPacket {
     public FillCopycatPacket(FriendlyByteBuf buf) {
-        this(buf.readBlockPos(), buf.readById(Block.BLOCK_STATE_REGISTRY), buf.readUtf());
+        this(buf.readBlockPos(), Block.BLOCK_STATE_REGISTRY.byId(buf.readVarInt()), buf.readUtf());
     }
 
     @Override
     public void write(FriendlyByteBuf buffer) {
         buffer.writeBlockPos(pos);
-        buffer.writeId(Block.BLOCK_STATE_REGISTRY, material);
+        buffer.writeVarInt(Block.getId(material));
         buffer.writeUtf(property);
     }
 

diff --git a/fabric/src/generated/resources/assets/copycats/lang/en_ud.json b/fabric/src/generated/resources/assets/copycats/lang/en_ud.json
@@ -41,6 +41,7 @@
   "item.copycats.copycat_catwalk": "\u029E\u05DF\u0250\u028D\u0287\u0250\u0186 \u0287\u0250\u0254\u028Edo\u0186",
   "itemGroup.copycats.functional": "\u05DF\u0250uo\u0131\u0287\u0254un\u2132 | +s\u0287\u0250\u0254\u028Edo\u0186 :\u01DD\u0287\u0250\u01DD\u0279\u0186",
   "itemGroup.copycats.main": "\u01DD\u028C\u0131\u0287\u0250\u0279o\u0254\u01DD\u15E1 | +s\u0287\u0250\u0254\u028Edo\u0186 :\u01DD\u0287\u0250\u01DD\u0279\u0186",
+  "keyinfo.copycats.fill_copycat": "\u05DF\u0250\u0131\u0279\u01DD\u0287\u0250W \u0265\u0287\u0131\u028D \u0287\u0250\u0254\u028Edo\u0186 \u05DF\u05DF\u0131\u2132",
   "tooltip.copycats.characteristics.copy_cat.description": "\u02D9\u203E\u0287\u0250\u0186\u203E \u0250 uo \u029E\u0254\u0131\u05DF\u0254-\u1D1A",
   "tooltip.copycats.characteristics.copy_cat.title": "\u00BF\u00BF\u00BF",
   "tooltip.copycats.characteristics.copycat.description": "\u02D9\u203E\u05DF\u0250\u0131\u0279\u01DD\u0287\u0250\u026F \u01DD\u028Co\u026F\u01DD\u0279\u203E o\u0287 \u0265\u0254u\u01DD\u0279M \u02D9\u203E\u01DD\u0287\u0250\u0287o\u0279\u203E pu\u0250 \u203Eub\u0131ss\u0250\u203E o\u0287 \u05DF\u0250\u0131\u0279\u01DD\u0287\u0250\u026F \u0265\u0287\u0131\u028D \u029E\u0254\u0131\u05DF\u0254-\u1D1A",
@@ -51,7 +52,7 @@
   "tooltip.copycats.characteristics.functional.title": "\u05DF\u0250uo\u0131\u0287\u0254un\u2132",
   "tooltip.copycats.characteristics.ghost.description": "\u02D9s\u01DD\u0131\u0287\u0131\u0287u\u01DD \u0265\u0287\u0131\u028D \u203Euo\u0131s\u0131\u05DF\u05DFo\u0254 oN\u203E",
   "tooltip.copycats.characteristics.ghost.title": "\u0287so\u0265\u2141",
-  "tooltip.copycats.characteristics.multi_state.description": "\u02D9\u01DD\u0254\u0250ds \u029E\u0254o\u05DFq \u01DD\u026F\u0250s \u01DD\u0265\u0287 u\u0131 s\u05DF\u0250\u0131\u0279\u01DD\u0287\u0250\u026F \u0287u\u01DD\u0279\u01DD\u025F\u025F\u0131p \u0265\u0287\u0131\u028D \u203Es\u01DD\u0131do\u0254 \u01DD\u05DFd\u0131\u0287\u05DFn\u026F\u203E \u0287n\u0500",
+  "tooltip.copycats.characteristics.multi_state.description": "\u02D9s\u0287\u0279\u0250d \u05DF\u05DF\u0250 \u05DF\u05DF\u0131\u025F o\u0287 \u203E%s\u203E p\u05DFoH \u02D9\u01DD\u0254\u0250ds \u029E\u0254o\u05DFq \u01DD\u026F\u0250s \u01DD\u0265\u0287 u\u0131 s\u05DF\u0250\u0131\u0279\u01DD\u0287\u0250\u026F \u0287u\u01DD\u0279\u01DD\u025F\u025F\u0131p \u0265\u0287\u0131\u028D \u203Es\u01DD\u0131do\u0254 \u01DD\u05DFd\u0131\u0287\u05DFn\u026F\u203E \u0287n\u0500",
   "tooltip.copycats.characteristics.multi_state.title": "\u01DD\u0287\u0250\u0287s-\u0131\u0287\u05DFnW",
   "tooltip.copycats.characteristics.pre_assembled.description": "\u02D9\u0287u\u01DD\u026F\u01DD\u0254\u0250\u05DFd \u0279\u01DD\u0287\u025F\u0250 \u203Es\u0287\u0279\u0250d \u05DF\u0250np\u0131\u028C\u0131pu\u0131\u203E \u01DD\u05DFq\u026F\u01DDss\u0250s\u0131\u15E1",
   "tooltip.copycats.characteristics.pre_assembled.title": "p\u01DD\u05DFq\u026F\u01DDss\u0250-\u01DD\u0279\u0500",

diff --git a/...resources/data/copycats/advancements/recipes/crafting/copycat_layer_from_half_layers.json b/...resources/data/copycats/advancements/recipes/crafting/copycat_layer_from_half_layers.json
@@ -1,10 +1,23 @@
 {
   "advancements": [
     {
+      "fabric:load_conditions": [
+        {
+          "condition": "copycats:feature_enabled",
+          "feature": "copycats:copycat_half_layer",
+          "invert": false
+        }
+      ],
       "advancement": {
         "parent": "minecraft:recipes/root",
+        "rewards": {
+          "recipes": [
+            "copycats:crafting/copycat_layer_from_half_layers"
+          ]
+        },
         "criteria": {
           "has_item": {
+            "trigger": "minecraft:inventory_changed",
             "conditions": {
               "items": [
                 {
@@ -13,35 +26,22 @@
                   ]
                 }
               ]
-            },
-            "trigger": "minecraft:inventory_changed"
+            }
           },
           "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
             "conditions": {
               "recipe": "copycats:crafting/copycat_layer_from_half_layers"
-            },
-            "trigger": "minecraft:recipe_unlocked"
+            }
           }
         },
         "requirements": [
           [
             "has_item",
             "has_the_recipe"
           ]
-        ],
-        "rewards": {
-          "recipes": [
-            "copycats:crafting/copycat_layer_from_half_layers"
-          ]
-        }
-      },
-      "fabric:load_conditions": [
-        {
-          "condition": "copycats:feature_enabled",
-          "feature": "copycats:copycat_half_layer",
-          "invert": false
-        }
-      ]
+        ]
+      }
     }
   ]
 }
diff --git a/.../resources/data/copycats/advancements/recipes/crafting/copycat_slope_from_conversion.json b/.../resources/data/copycats/advancements/recipes/crafting/copycat_slope_from_conversion.json
@@ -1,10 +1,28 @@
 {
   "advancements": [
     {
+      "fabric:load_conditions": [
+        {
+          "condition": "copycats:feature_enabled",
+          "feature": "copycats:copycat_vertical_slope",
+          "invert": false
+        },
+        {
+          "condition": "copycats:feature_enabled",
+          "feature": "copycats:copycat_slope",
+          "invert": false
+        }
+      ],
       "advancement": {
         "parent": "minecraft:recipes/root",
+        "rewards": {
+          "recipes": [
+            "copycats:crafting/copycat_slope_from_conversion"
+          ]
+        },
         "criteria": {
           "has_item": {
+            "trigger": "minecraft:inventory_changed",
             "conditions": {
               "items": [
                 {
@@ -13,40 +31,22 @@
                   ]
                 }
               ]
-            },
-            "trigger": "minecraft:inventory_changed"
+            }
           },
           "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
             "conditions": {
               "recipe": "copycats:crafting/copycat_slope_from_conversion"
-            },
-            "trigger": "minecraft:recipe_unlocked"
+            }
           }
         },
         "requirements": [
           [
             "has_item",
             "has_the_recipe"
           ]
-        ],
-        "rewards": {
-          "recipes": [
-            "copycats:crafting/copycat_slope_from_conversion"
-          ]
-        }
-      },
-      "fabric:load_conditions": [
-        {
-          "condition": "copycats:feature_enabled",
-          "feature": "copycats:copycat_vertical_slope",
-          "invert": false
-        },
-        {
-          "condition": "copycats:feature_enabled",
-          "feature": "copycats:copycat_slope",
-          "invert": false
-        }
-      ]
+        ]
+      }
     }
   ]
 }
diff --git a/...resources/data/copycats/advancements/recipes/crafting/copycat_stairs_from_conversion.json b/...resources/data/copycats/advancements/recipes/crafting/copycat_stairs_from_conversion.json
@@ -1,10 +1,28 @@
 {
   "advancements": [
     {
+      "fabric:load_conditions": [
+        {
+          "condition": "copycats:feature_enabled",
+          "feature": "copycats:copycat_stairs",
+          "invert": false
+        },
+        {
+          "condition": "copycats:feature_enabled",
+          "feature": "copycats:copycat_vertical_stairs",
+          "invert": false
+        }
+      ],
       "advancement": {
         "parent": "minecraft:recipes/root",
+        "rewards": {
+          "recipes": [
+            "copycats:crafting/copycat_stairs_from_conversion"
+          ]
+        },
         "criteria": {
           "has_item": {
+            "trigger": "minecraft:inventory_changed",
             "conditions": {
               "items": [
                 {
@@ -13,40 +31,22 @@
                   ]
                 }
               ]
-            },
-            "trigger": "minecraft:inventory_changed"
+            }
           },
           "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
             "conditions": {
               "recipe": "copycats:crafting/copycat_stairs_from_conversion"
-            },
-            "trigger": "minecraft:recipe_unlocked"
+            }
           }
         },
         "requirements": [
           [
             "has_item",
             "has_the_recipe"
           ]
-        ],
-        "rewards": {
-          "recipes": [
-            "copycats:crafting/copycat_stairs_from_conversion"
-          ]
-        }
-      },
-      "fabric:load_conditions": [
-        {
-          "condition": "copycats:feature_enabled",
-          "feature": "copycats:copycat_stairs",
-          "invert": false
-        },
-        {
-          "condition": "copycats:feature_enabled",
-          "feature": "copycats:copycat_vertical_stairs",
-          "invert": false
-        }
-      ]
+        ]
+      }
     }
   ]
 }
diff --git a/...s/data/copycats/advancements/recipes/crafting/copycat_vertical_slope_from_conversion.json b/...s/data/copycats/advancements/recipes/crafting/copycat_vertical_slope_from_conversion.json
@@ -1,10 +1,28 @@
 {
   "advancements": [
     {
+      "fabric:load_conditions": [
+        {
+          "condition": "copycats:feature_enabled",
+          "feature": "copycats:copycat_slope",
+          "invert": false
+        },
+        {
+          "condition": "copycats:feature_enabled",
+          "feature": "copycats:copycat_vertical_slope",
+          "invert": false
+        }
+      ],
       "advancement": {
         "parent": "minecraft:recipes/root",
+        "rewards": {
+          "recipes": [
+            "copycats:crafting/copycat_vertical_slope_from_conversion"
+          ]
+        },
         "criteria": {
           "has_item": {
+            "trigger": "minecraft:inventory_changed",
             "conditions": {
               "items": [
                 {
@@ -13,40 +31,22 @@
                   ]
                 }
               ]
-            },
-            "trigger": "minecraft:inventory_changed"
+            }
           },
           "has_the_recipe": {
+            "trigger": "minecraft:recipe_unlocked",
             "conditions": {
               "recipe": "copycats:crafting/copycat_vertical_slope_from_conversion"
-            },
-            "trigger": "minecraft:recipe_unlocked"
+            }
           }
         },
         "requirements": [
           [
             "has_item",
             "has_the_recipe"
           ]
-        ],
-        "rewards": {
-          "recipes": [
-            "copycats:crafting/copycat_vertical_slope_from_conversion"
-          ]
-        }
-      },
-      "fabric:load_conditions": [
-        {
-          "condition": "copycats:feature_enabled",
-          "feature": "copycats:copycat_slope",
-          "invert": false
-        },
-        {
-          "condition": "copycats:feature_enabled",
-          "feature": "copycats:copycat_vertical_slope",
-          "invert": false
-        }
-      ]
+        ]
+      }
     }
   ]
 }