Update v1.19.70

ZtechNetwork · Mar 16, 2023 · fbd4a57 · fbd4a57
1 parent c7f486f
commit fbd4a57
Show file tree

Hide file tree

Showing 92 changed files with 5,969 additions and 2,708 deletions.
diff --git a/animations/crossbow.animation.json b/animations/crossbow.animation.json
@@ -9,6 +9,14 @@
           "rotation": [ "c.is_first_person ? -9.0 : 0.0", "c.is_first_person ? 60.0 : -3.0", "c.is_first_person ? -47.0 : 3.25" ]
         }
       }
+    },
+    "animation.crossbow.wield_first_person_pull": {
+      "loop": true,
+      "bones": {
+        "rightitem": {
+          "position": [ 0.0, "0.0 + ( variable.charge_amount  >= 1.0 ? math.sin( (q.life_time) * 1000.0 * 1.3) * 0.1 - math.sin(q.life_time * 45.0) * 0.25 : 0.0)", 0.0 ]
+        }
+      }
     }
   }
-}
+}
diff --git a/animations/ender_crystal.animation.json b/animations/ender_crystal.animation.json
@@ -5,7 +5,7 @@
 			"loop": true,
 			"bones": {
 				"outerglass": {
-					"position": [ 0.0, "24.0 + Math.sin(query.life_time * 230.0 + variable.time_offset) * 8.0", 0.0 ],
+					"position": [ 0.0, "16.0 + Math.sin(query.life_time * 230.0 + variable.time_offset) * 8.0", 0.0 ],
 					"rotation": [ 39.2, "14.5 + (query.life_time * -60.0 + variable.time_offset)", -39.2 ]
 				},
 				"innerglass": {
@@ -19,4 +19,4 @@
 			}
 		}
 	}
-}
+}
diff --git a/attachables/crossbow.entity.json b/attachables/crossbow.entity.json
@@ -25,11 +25,18 @@
         "crossbow_rocket": "geometry.crossbow_rocket"
       },
       "animations": {
-        "wield": "animation.crossbow.wield"
+        "wield": "animation.crossbow.wield",
+        "wield_first_person_pull": "animation.crossbow.wield_first_person_pull"
       },
       "scripts": {
+        "pre_animation": [
+          "variable.charge_amount = math.clamp((query.main_hand_item_max_duration - (query.main_hand_item_use_duration - query.frame_alpha + 1.0)) / 10.0, 0.0, 1.0f);"
+        ],
         "animate": [
-          "wield"
+          "wield",
+          {
+            "wield_first_person_pull": "query.main_hand_item_use_duration > 0.0f && c.is_first_person"
+          }
         ]
       },
       "render_controllers": [ "controller.render.crossbow" ]

diff --git a/blocks.json b/blocks.json
@@ -265,6 +265,10 @@
       "sound" : "stone",
       "textures" : "black_glazed_terracotta"
    },
+   "black_wool" : {
+      "sound" : "cloth",
+      "textures" : "wool_colored_black"
+   },
    "blackstone" : {
       "sound" : "stone",
       "textures" : {
@@ -324,6 +328,10 @@
       "sound" : "glass",
       "textures" : "blue_ice"
    },
+   "blue_wool" : {
+      "sound" : "cloth",
+      "textures" : "wool_colored_blue"
+   },
    "bone_block" : {
       "sound" : "bone_block",
       "textures" : {
@@ -393,6 +401,10 @@
          "west" : "mushroom_brown_west"
       }
    },
+   "brown_wool" : {
+      "sound" : "cloth",
+      "textures" : "wool_colored_brown"
+   },
    "bubble_column" : {
       "isotropic" : false,
       "textures" : {
@@ -899,6 +911,10 @@
       "sound" : "stone",
       "textures" : "cyan_glazed_terracotta"
    },
+   "cyan_wool" : {
+      "sound" : "cloth",
+      "textures" : "wool_colored_cyan"
+   },
    "dark_oak_button" : {
       "sound" : "wood",
       "textures" : "dark_oak_planks"
@@ -1492,6 +1508,10 @@
       "sound" : "stone",
       "textures" : "gray_glazed_terracotta"
    },
+   "gray_wool" : {
+      "sound" : "cloth",
+      "textures" : "wool_colored_gray"
+   },
    "green_candle" : {
       "carried_textures" : "green_candle_carried",
       "sound" : "candle",
@@ -1512,6 +1532,10 @@
       "sound" : "stone",
       "textures" : "green_glazed_terracotta"
    },
+   "green_wool" : {
+      "sound" : "cloth",
+      "textures" : "wool_colored_green"
+   },
    "grindstone" : {
       "sound" : "stone",
       "textures" : {
@@ -1797,6 +1821,10 @@
       "sound" : "stone",
       "textures" : "light_blue_glazed_terracotta"
    },
+   "light_blue_wool" : {
+      "sound" : "cloth",
+      "textures" : "wool_colored_light_blue"
+   },
    "light_gray_candle" : {
       "carried_textures" : "light_gray_candle_carried",
       "sound" : "candle",
@@ -1813,6 +1841,10 @@
          "west" : "cake_west"
       }
    },
+   "light_gray_wool" : {
+      "sound" : "cloth",
+      "textures" : "wool_colored_silver"
+   },
    "light_weighted_pressure_plate" : {
       "sound" : "metal",
       "textures" : "gold_block"
@@ -1842,6 +1874,10 @@
       "sound" : "stone",
       "textures" : "lime_glazed_terracotta"
    },
+   "lime_wool" : {
+      "sound" : "cloth",
+      "textures" : "wool_colored_lime"
+   },
    "lit_blast_furnace" : {
       "sound" : "stone",
       "textures" : {
@@ -1957,6 +1993,10 @@
       "sound" : "stone",
       "textures" : "magenta_glazed_terracotta"
    },
+   "magenta_wool" : {
+      "sound" : "cloth",
+      "textures" : "wool_colored_magenta"
+   },
    "magma" : {
       "isotropic" : true,
       "sound" : "stone",
@@ -2244,6 +2284,10 @@
       "sound" : "stone",
       "textures" : "orange_glazed_terracotta"
    },
+   "orange_wool" : {
+      "sound" : "cloth",
+      "textures" : "wool_colored_orange"
+   },
    "oxidized_copper" : {
       "isotropic" : false,
       "sound" : "copper",
@@ -2305,6 +2349,10 @@
       "sound" : "stone",
       "textures" : "pink_glazed_terracotta"
    },
+   "pink_wool" : {
+      "sound" : "cloth",
+      "textures" : "wool_colored_pink"
+   },
    "piston" : {
       "carried_textures" : {
          "down" : "piston_bottom",
@@ -2517,6 +2565,10 @@
       "sound" : "stone",
       "textures" : "purple_glazed_terracotta"
    },
+   "purple_wool" : {
+      "sound" : "cloth",
+      "textures" : "wool_colored_purple"
+   },
    "purpur_block" : {
       "sound" : "stone",
       "textures" : {
@@ -2647,6 +2699,10 @@
          "up" : "redsandstone_top"
       }
    },
+   "red_wool" : {
+      "sound" : "cloth",
+      "textures" : "wool_colored_red"
+   },
    "redstone_block" : {
       "sound" : "stone",
       "textures" : "redstone_block"
@@ -3630,6 +3686,10 @@
       "sound" : "stone",
       "textures" : "white_glazed_terracotta"
    },
+   "white_wool" : {
+      "sound" : "cloth",
+      "textures" : "wool_colored_white"
+   },
    "wither_rose" : {
       "sound" : "grass",
       "textures" : "wither_rose"
@@ -3685,5 +3745,9 @@
    "yellow_glazed_terracotta" : {
       "sound" : "stone",
       "textures" : "yellow_glazed_terracotta"
+   },
+   "yellow_wool" : {
+      "sound" : "cloth",
+      "textures" : "wool_colored_yellow"
    }
 }
diff --git a/entity/snow_golem.entity.json b/entity/snow_golem.entity.json
@@ -10,4 +10,4 @@
       }
     }
   }
-}
+}
diff --git a/entity/snow_golem.v1.0.entity.json b/entity/snow_golem.v1.0.entity.json
@@ -3,25 +3,10 @@
   "minecraft:client_entity": {
     "description": {
       "identifier": "minecraft:snow_golem",
-      "materials": {
-        "default": "snow_golem",
-        "head": "snow_golem_pumpkin"
-      },
-      "textures": {
-        "default": "textures/entity/snow_golem"
-      },
-      "geometry": {
-        "default": "geometry.snowgolem"
-      },
-      "animations": {
-        "move": "animation.snowgolem.move",
-        "arms": "animation.snowgolem.arms",
-        "look_at_target": "animation.common.look_at_target"
-      },
-      "animation_controllers": [
-        { "move": "controller.animation.snowgolem.move" }
-      ],
-      "render_controllers": [ "controller.render.snowgolem" ]
+      "spawn_egg": {
+        "base_color": "#d9f2f2",
+        "overlay_color": "#81a4a4"
+      }
     }
   }
-}
+}
diff --git a/entity/trader_llama.entity.json b/entity/trader_llama.entity.json
@@ -3,7 +3,6 @@
   "minecraft:client_entity": {
     "description": {
       "identifier": "minecraft:trader_llama",
-      "min_engine_version": "1.8.0",
       "materials": { "default": "llama" },
       "textures": {
         "creamy": "textures/entity/llama/llama_creamy",

diff --git a/entity/wither.entity.json b/entity/wither.entity.json
@@ -10,4 +10,4 @@
       }
     }
   }
-}
+}
diff --git a/entity/wither.v1.0.entity.json b/entity/wither.v1.0.entity.json
@@ -3,46 +3,10 @@
   "minecraft:client_entity": {
     "description": {
       "identifier": "minecraft:wither",
-      "materials": {
-        "default": "wither_boss",
-        "armor": "wither_boss_armor"
-      },
-      "textures": {
-        "default": "textures/entity/wither_boss/wither",
-        "armor_white": "textures/entity/wither_boss/wither_armor_white",
-        "armor_blue": "textures/entity/wither_boss/wither_armor_blue",
-        "invulnerable": "textures/entity/wither_boss/wither_invulnerable"
-      },
-      "geometry": {
-        "default": "geometry.witherBoss",
-        "armor": "geometry.witherBoss.armor"
-      },
-      "scripts": {
-        "pre_animation": [
-          "variable.base_scale = 2;",
-          "variable.swell_clamped = Math.clamp(query.swell_amount, 0.0, 1.0);",
-          "variable.wobble = 1.0 + Math.sin(query.swell_amount * 5730) * query.swell_amount * 0.01;",
-          "variable.swell_adjustment = Math.pow(variable.swell_clamped, 4);",
-          "variable.scale_xz = (1.0 + variable.swell_adjustment * 0.4) * variable.wobble;",
-          "variable.scale_y = (1.0 + variable.swell_adjustment * 0.1) / variable.wobble;",
-          "variable.body_base_rotation = Math.cos(query.life_time * 114.6);",
-          "variable.upper_body_rotation = (0.065 + 0.05 * variable.body_base_rotation) * 180 + query.target_x_rotation;",
-          "variable.is_invulnerable = query.invulnerable_ticks > 0.0;",
-          "variable.display_normal_skin = (query.invulnerable_ticks <= 0) || ((query.invulnerable_ticks <= 80) && (Math.mod(query.invulnerable_ticks / 5, 2) == 1));"
-        ],
-        "scalex": "variable.scale_xz * variable.base_scale",
-        "scaley": "variable.scale_y * variable.base_scale",
-        "scalez": "variable.scale_xz * variable.base_scale"
-      },
-      "animations": {
-        "scale": "animation.wither_boss.scale",
-        "move": "animation.wither_boss.move",
-        "look_at_target": "animation.wither_boss.look_at_target"
-      },
-      "animation_controllers": [
-        { "move": "controller.animation.wither_boss.move" }
-      ],
-      "render_controllers": [ "controller.render.wither_boss", "controller.render.wither_boss_armor_white", "controller.render.wither_boss_armor_blue" ]
+      "spawn_egg": {
+        "base_color": "#141414",
+        "overlay_color": "#4d72a0"
+      }
     }
   }
-}
+}
diff --git a/font/emoticons.json b/font/emoticons.json
@@ -99,6 +99,26 @@
         "name": "tip_virtual_button_action_build_or_use",
         "code": "0xE018"
     },
+    {
+        "name": "tip_virtual_button_sneak",
+        "code": "0xE019"
+    },
+    {
+        "name": "tip_virtual_button_sprint",
+        "code": "0xE01A"
+    },
+    {
+        "name": "tip_virtual_button_fly_up",
+        "code": "0xE01B"
+    },
+    {
+        "name": "tip_virtual_button_fly_down",
+        "code": "0xE01C"
+    },
+    {
+        "name": "tip_virtual_button_dismount",
+        "code": "0xE01D"
+    },
     {
         "name": "ps4_face_button_down",
         "code": "0xE020"
@@ -343,6 +363,10 @@
         "name": "touch_fly_down",
         "code": "0xE087"
     },
+    {
+        "name": "touch_stop_flying",
+        "code": "0xE088"
+    },
     {
         "name": "craftable_toggle_on",
         "code": "0xE0A0"

diff --git a/font/glyph_E0.png b/font/glyph_E0.png
diff --git a/manifest.json b/manifest.json
@@ -5,7 +5,7 @@
         "name": "Vanilla Resource Pack",
         "uuid": "66c6e9a8-3093-462a-9c36-dbb052165822",
         "version": [0, 0, 1],
-        "min_engine_version": [ 1, 19, 60 ]
+        "min_engine_version": [ 1, 19, 70 ]
     },
     "modules": [
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,4 @@ @@
           }
         }
       }
-    }
+    }