Port to 25w07a

FrozenBlock · Feb 16, 2025 · 8ffed1f · 8ffed1f
1 parent 58a3573
commit 8ffed1f
Show file tree

Hide file tree

Showing 61 changed files with 245 additions and 260 deletions.
diff --git a/src/main/generated/assets/wilderwild/blockstates/baobab_trapdoor.json b/src/main/generated/assets/wilderwild/blockstates/baobab_trapdoor.json
@@ -45,8 +45,7 @@
     },
     "facing=south,half=top,open=true": {
       "model": "wilderwild:block/baobab_trapdoor_open",
-      "x": 180,
-      "y": 0
+      "x": 180
     },
     "facing=west,half=bottom,open=false": {
       "model": "wilderwild:block/baobab_trapdoor_bottom",

diff --git a/src/main/generated/assets/wilderwild/blockstates/cypress_trapdoor.json b/src/main/generated/assets/wilderwild/blockstates/cypress_trapdoor.json
@@ -45,8 +45,7 @@
     },
     "facing=south,half=top,open=true": {
       "model": "wilderwild:block/cypress_trapdoor_open",
-      "x": 180,
-      "y": 0
+      "x": 180
     },
     "facing=west,half=bottom,open=false": {
       "model": "wilderwild:block/cypress_trapdoor_bottom",

diff --git a/src/main/generated/assets/wilderwild/blockstates/lantanas.json b/src/main/generated/assets/wilderwild/blockstates/lantanas.json
@@ -5,8 +5,7 @@
         "model": "wilderwild:block/lantanas_1"
       },
       "when": {
-        "facing": "north",
-        "flower_amount": "1|2|3|4"
+        "facing": "north"
       }
     },
     {
@@ -15,8 +14,7 @@
         "y": 90
       },
       "when": {
-        "facing": "east",
-        "flower_amount": "1|2|3|4"
+        "facing": "east"
       }
     },
     {
@@ -25,8 +23,7 @@
         "y": 180
       },
       "when": {
-        "facing": "south",
-        "flower_amount": "1|2|3|4"
+        "facing": "south"
       }
     },
     {
@@ -35,8 +32,7 @@
         "y": 270
       },
       "when": {
-        "facing": "west",
-        "flower_amount": "1|2|3|4"
+        "facing": "west"
       }
     },
     {

diff --git a/src/main/generated/assets/wilderwild/blockstates/orange_maple_leaf_litter.json b/src/main/generated/assets/wilderwild/blockstates/orange_maple_leaf_litter.json
@@ -5,8 +5,7 @@
         "model": "wilderwild:block/orange_maple_leaf_litter_1"
       },
       "when": {
-        "facing": "north",
-        "segment_amount": "1|2|3|4"
+        "facing": "north"
       }
     },
     {
@@ -15,8 +14,7 @@
         "y": 90
       },
       "when": {
-        "facing": "east",
-        "segment_amount": "1|2|3|4"
+        "facing": "east"
       }
     },
     {
@@ -25,8 +23,7 @@
         "y": 180
       },
       "when": {
-        "facing": "south",
-        "segment_amount": "1|2|3|4"
+        "facing": "south"
       }
     },
     {
@@ -35,8 +32,7 @@
         "y": 270
       },
       "when": {
-        "facing": "west",
-        "segment_amount": "1|2|3|4"
+        "facing": "west"
       }
     },
     {

diff --git a/src/main/generated/assets/wilderwild/blockstates/pale_mushroom_block.json b/src/main/generated/assets/wilderwild/blockstates/pale_mushroom_block.json
@@ -69,7 +69,6 @@
     {
       "apply": {
         "model": "wilderwild:block/pale_mushroom_block_inside",
-        "uvlock": false,
         "y": 90
       },
       "when": {
@@ -79,7 +78,6 @@
     {
       "apply": {
         "model": "wilderwild:block/pale_mushroom_block_inside",
-        "uvlock": false,
         "y": 180
       },
       "when": {
@@ -89,7 +87,6 @@
     {
       "apply": {
         "model": "wilderwild:block/pale_mushroom_block_inside",
-        "uvlock": false,
         "y": 270
       },
       "when": {
@@ -99,7 +96,6 @@
     {
       "apply": {
         "model": "wilderwild:block/pale_mushroom_block_inside",
-        "uvlock": false,
         "x": 270
       },
       "when": {
@@ -109,7 +105,6 @@
     {
       "apply": {
         "model": "wilderwild:block/pale_mushroom_block_inside",
-        "uvlock": false,
         "x": 90
       },
       "when": {

diff --git a/src/main/generated/assets/wilderwild/blockstates/phlox.json b/src/main/generated/assets/wilderwild/blockstates/phlox.json
@@ -5,8 +5,7 @@
         "model": "wilderwild:block/phlox_1"
       },
       "when": {
-        "facing": "north",
-        "flower_amount": "1|2|3|4"
+        "facing": "north"
       }
     },
     {
@@ -15,8 +14,7 @@
         "y": 90
       },
       "when": {
-        "facing": "east",
-        "flower_amount": "1|2|3|4"
+        "facing": "east"
       }
     },
     {
@@ -25,8 +23,7 @@
         "y": 180
       },
       "when": {
-        "facing": "south",
-        "flower_amount": "1|2|3|4"
+        "facing": "south"
       }
     },
     {
@@ -35,8 +32,7 @@
         "y": 270
       },
       "when": {
-        "facing": "west",
-        "flower_amount": "1|2|3|4"
+        "facing": "west"
       }
     },
     {

diff --git a/src/main/generated/assets/wilderwild/blockstates/red_maple_leaf_litter.json b/src/main/generated/assets/wilderwild/blockstates/red_maple_leaf_litter.json
@@ -5,8 +5,7 @@
         "model": "wilderwild:block/red_maple_leaf_litter_1"
       },
       "when": {
-        "facing": "north",
-        "segment_amount": "1|2|3|4"
+        "facing": "north"
       }
     },
     {
@@ -15,8 +14,7 @@
         "y": 90
       },
       "when": {
-        "facing": "east",
-        "segment_amount": "1|2|3|4"
+        "facing": "east"
       }
     },
     {
@@ -25,8 +23,7 @@
         "y": 180
       },
       "when": {
-        "facing": "south",
-        "segment_amount": "1|2|3|4"
+        "facing": "south"
       }
     },
     {
@@ -35,8 +32,7 @@
         "y": 270
       },
       "when": {
-        "facing": "west",
-        "segment_amount": "1|2|3|4"
+        "facing": "west"
       }
     },
     {

diff --git a/src/main/generated/assets/wilderwild/blockstates/willow_trapdoor.json b/src/main/generated/assets/wilderwild/blockstates/willow_trapdoor.json
@@ -45,8 +45,7 @@
     },
     "facing=south,half=top,open=true": {
       "model": "wilderwild:block/willow_trapdoor_open",
-      "x": 180,
-      "y": 0
+      "x": 180
     },
     "facing=west,half=bottom,open=false": {
       "model": "wilderwild:block/willow_trapdoor_bottom",

diff --git a/src/main/generated/assets/wilderwild/blockstates/yellow_maple_leaf_litter.json b/src/main/generated/assets/wilderwild/blockstates/yellow_maple_leaf_litter.json
@@ -5,8 +5,7 @@
         "model": "wilderwild:block/yellow_maple_leaf_litter_1"
       },
       "when": {
-        "facing": "north",
-        "segment_amount": "1|2|3|4"
+        "facing": "north"
       }
     },
     {
@@ -15,8 +14,7 @@
         "y": 90
       },
       "when": {
-        "facing": "east",
-        "segment_amount": "1|2|3|4"
+        "facing": "east"
       }
     },
     {
@@ -25,8 +23,7 @@
         "y": 180
       },
       "when": {
-        "facing": "south",
-        "segment_amount": "1|2|3|4"
+        "facing": "south"
       }
     },
     {
@@ -35,8 +32,7 @@
         "y": 270
       },
       "when": {
-        "facing": "west",
-        "segment_amount": "1|2|3|4"
+        "facing": "west"
       }
     },
     {

diff --git a/src/main/generated/assets/wilderwild/models/item/hollowed_acacia_log.json b/src/main/generated/assets/wilderwild/models/item/hollowed_acacia_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/hollowed_baobab_log.json b/src/main/generated/assets/wilderwild/models/item/hollowed_baobab_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/hollowed_birch_log.json b/src/main/generated/assets/wilderwild/models/item/hollowed_birch_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/hollowed_cherry_log.json b/src/main/generated/assets/wilderwild/models/item/hollowed_cherry_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/hollowed_crimson_stem.json b/src/main/generated/assets/wilderwild/models/item/hollowed_crimson_stem.json
diff --git a/src/main/generated/assets/wilderwild/models/item/hollowed_cypress_log.json b/src/main/generated/assets/wilderwild/models/item/hollowed_cypress_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/hollowed_dark_oak_log.json b/src/main/generated/assets/wilderwild/models/item/hollowed_dark_oak_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/hollowed_jungle_log.json b/src/main/generated/assets/wilderwild/models/item/hollowed_jungle_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/hollowed_mangrove_log.json b/src/main/generated/assets/wilderwild/models/item/hollowed_mangrove_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/hollowed_maple_log.json b/src/main/generated/assets/wilderwild/models/item/hollowed_maple_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/hollowed_oak_log.json b/src/main/generated/assets/wilderwild/models/item/hollowed_oak_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/hollowed_pale_oak_log.json b/src/main/generated/assets/wilderwild/models/item/hollowed_pale_oak_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/hollowed_palm_log.json b/src/main/generated/assets/wilderwild/models/item/hollowed_palm_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/hollowed_spruce_log.json b/src/main/generated/assets/wilderwild/models/item/hollowed_spruce_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/hollowed_warped_stem.json b/src/main/generated/assets/wilderwild/models/item/hollowed_warped_stem.json
diff --git a/src/main/generated/assets/wilderwild/models/item/hollowed_willow_log.json b/src/main/generated/assets/wilderwild/models/item/hollowed_willow_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_acacia_log.json b/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_acacia_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_baobab_log.json b/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_baobab_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_birch_log.json b/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_birch_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_cherry_log.json b/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_cherry_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_crimson_stem.json b/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_crimson_stem.json
diff --git a/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_cypress_log.json b/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_cypress_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_dark_oak_log.json b/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_dark_oak_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_jungle_log.json b/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_jungle_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_mangrove_log.json b/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_mangrove_log.json
diff --git a/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_maple_log.json b/src/main/generated/assets/wilderwild/models/item/stripped_hollowed_maple_log.json