Merge branch '1.14' into 'master'

1.14

See merge request dodsorfas/minecraft-datapacks!8

datapacks/1ps-1516729816-1/data/1ps/functions/loop.mcfunction

@@ -1 +0,0 @@
-execute if entity @a[nbt={Sleeping:1b}] run function 1ps:internal_loop

datapacks/1ps-1556049967/data/1ps/functions/internal_loop.mcfunction

@@ -1,3 +1,3 @@
-time add 125
 execute as @a[nbt={SleepTimer:1s}] run tellraw @a [{"selector":"@s","color":"yellow"},{"text":" is now sleeping ","color":"yellow"}]
-execute if entity @a[nbt={SleepTimer:99s}] run weather clear 0
+execute as @a[nbt={SleepTimer:99s}] run function 1ps:skipday
+execute if entity @a[nbt={SleepTimer:100s}] run weather clear 0

datapacks/1ps-1556049967/data/1ps/functions/load.mcfunction

@@ -0,0 +1 @@
+scoreboard objectives add 1ps.dayTimer dummy

datapacks/1ps-1556049967/data/1ps/functions/loop.mcfunction

@@ -0,0 +1 @@
+execute if entity @a[nbt=!{SleepTimer:0s}] run function 1ps:internal_loop

datapacks/1ps-1556049967/data/1ps/functions/skipday.mcfunction

@@ -0,0 +1,34 @@
+execute store result score @s 1ps.dayTimer run time query daytime
+
+scoreboard players remove @s 1ps.dayTimer 24000
+
+execute if entity @s[scores={1ps.dayTimer=..-16384}] run time add 16384
+execute if entity @s[scores={1ps.dayTimer=..-16384}] run scoreboard players add @s 1ps.dayTimer 16384
+execute if entity @s[scores={1ps.dayTimer=..-8192}] run time add 8192
+execute if entity @s[scores={1ps.dayTimer=..-8192}] run scoreboard players add @s 1ps.dayTimer 8192
+execute if entity @s[scores={1ps.dayTimer=..-4096}] run time add 4096
+execute if entity @s[scores={1ps.dayTimer=..-4096}] run scoreboard players add @s 1ps.dayTimer 4096
+execute if entity @s[scores={1ps.dayTimer=..-2048}] run time add 2048
+execute if entity @s[scores={1ps.dayTimer=..-2048}] run scoreboard players add @s 1ps.dayTimer 2048
+execute if entity @s[scores={1ps.dayTimer=..-1024}] run time add 1024
+execute if entity @s[scores={1ps.dayTimer=..-1024}] run scoreboard players add @s 1ps.dayTimer 1024
+execute if entity @s[scores={1ps.dayTimer=..-512}] run time add 512
+execute if entity @s[scores={1ps.dayTimer=..-512}] run scoreboard players add @s 1ps.dayTimer 512
+execute if entity @s[scores={1ps.dayTimer=..-256}] run time add 256
+execute if entity @s[scores={1ps.dayTimer=..-256}] run scoreboard players add @s 1ps.dayTimer 256
+execute if entity @s[scores={1ps.dayTimer=..-128}] run time add 128
+execute if entity @s[scores={1ps.dayTimer=..-128}] run scoreboard players add @s 1ps.dayTimer 128
+execute if entity @s[scores={1ps.dayTimer=..-64}] run time add 64
+execute if entity @s[scores={1ps.dayTimer=..-64}] run scoreboard players add @s 1ps.dayTimer 64
+execute if entity @s[scores={1ps.dayTimer=..-32}] run time add 32
+execute if entity @s[scores={1ps.dayTimer=..-32}] run scoreboard players add @s 1ps.dayTimer 32
+execute if entity @s[scores={1ps.dayTimer=..-16}] run time add 16
+execute if entity @s[scores={1ps.dayTimer=..-16}] run scoreboard players add @s 1ps.dayTimer 16
+execute if entity @s[scores={1ps.dayTimer=..-8}] run time add 8
+execute if entity @s[scores={1ps.dayTimer=..-8}] run scoreboard players add @s 1ps.dayTimer 8
+execute if entity @s[scores={1ps.dayTimer=..-4}] run time add 4
+execute if entity @s[scores={1ps.dayTimer=..-4}] run scoreboard players add @s 1ps.dayTimer 4
+execute if entity @s[scores={1ps.dayTimer=..-2}] run time add 2
+execute if entity @s[scores={1ps.dayTimer=..-2}] run scoreboard players add @s 1ps.dayTimer 2
+execute if entity @s[scores={1ps.dayTimer=..-1}] run time add 1
+execute if entity @s[scores={1ps.dayTimer=..-1}] run scoreboard players add @s 1ps.dayTimer 1

datapacks/1ps-1556049967/data/minecraft/tags/functions/load.json

@@ -0,0 +1,4 @@
+{
+	"replace": false,
+	"values": ["1ps:load"]
+}

datapacks/dodsorfas_old_blocks/data/dodsorfas_old_blocks/recipes/smooth-quartz-to-slabs.json

@@ -1,15 +0,0 @@
-{
-    "type": "crafting_shaped",
-    "pattern": [
-        "###"
-    ],
-    "key": {
-        "#": {
-            "item": "minecraft:smooth_quartz"
-        }
-    },
-    "result": {
-        "item": "minecraft:quartz_slab",
-        "count": 6
-    }
-}

datapacks/dodsorfas_old_blocks/data/dodsorfas_old_blocks/recipes/smooth-quartz.json

@@ -1,5 +0,0 @@
-{
-    "type": "smelting",
-    "ingredient": {"item": "minecraft:quartz_block"},
-    "result": "minecraft:smooth_quartz"
-}

datapacks/dodsorfas_old_blocks/data/dodsorfas_old_blocks/recipes/smooth-red-sandstone-to-slabs.json

@@ -1,15 +0,0 @@
-{
-    "type": "crafting_shaped",
-    "pattern": [
-        "###"
-    ],
-    "key": {
-        "#": {
-            "item": "minecraft:smooth_red_sandstone"
-        }
-    },
-    "result": {
-        "item": "minecraft:red_sandstone_slab",
-        "count": 6
-    }
-}

datapacks/dodsorfas_old_blocks/data/dodsorfas_old_blocks/recipes/smooth-red-sandstone.json

@@ -1,5 +0,0 @@
-{
-    "type": "smelting",
-    "ingredient": {"item": "minecraft:red_sandstone"},
-    "result": "minecraft:smooth_red_sandstone"
-}

datapacks/dodsorfas_old_blocks/data/dodsorfas_old_blocks/recipes/smooth-sandstone-to-slabs.json

@@ -1,15 +0,0 @@
-{
-    "type": "crafting_shaped",
-    "pattern": [
-        "###"
-    ],
-    "key": {
-        "#": {
-            "item": "minecraft:smooth_sandstone"
-        }
-    },
-    "result": {
-        "item": "minecraft:sandstone_slab",
-        "count": 6
-    }
-}

datapacks/dodsorfas_old_blocks/data/dodsorfas_old_blocks/recipes/smooth-sandstone.json

@@ -1,5 +0,0 @@
-{
-    "type": "smelting",
-    "ingredient": {"item": "minecraft:sandstone"},
-    "result": "minecraft:smooth_sandstone"
-}

datapacks/dodsorfas_old_blocks/data/dodsorfas_old_blocks/recipes/smooth-stone-to-slabs.json

@@ -1,15 +0,0 @@
-{
-    "type": "crafting_shaped",
-    "pattern": [
-        "###"
-    ],
-    "key": {
-        "#": {
-            "item": "minecraft:smooth_stone"
-        }
-    },
-    "result": {
-        "item": "minecraft:stone_slab",
-        "count": 6
-    }
-}

datapacks/dodsorfas_old_blocks/data/dodsorfas_old_blocks/recipes/smooth-stone.json

@@ -1,5 +0,0 @@
-{
-    "type": "smelting",
-    "ingredient": {"item": "minecraft:stone"},
-    "result": "minecraft:smooth_stone"
-}

resourcepack/assets/minecraft/blockstates/kelp.json

@@ -0,0 +1,6 @@
+{
+    "variants": {
+        "age=25": { "model": "block/kelp_age_25" },
+        "normal": { "model": "block/kelp" }
+    }
+}

resourcepack/assets/minecraft/models/block/hopper.json

@@ -1,9 +1,9 @@
 {
     "ambientocclusion": false,
     "textures": {
-        "particle": "block/hopper_outside",
+        "particle": "block/hopper_back",
         "top": "block/hopper_top",
-        "side": "block/hopper_outside",
+        "side": "block/hopper_back",
         "inside": "block/hopper_inside"
     },
     "elements": [

resourcepack/assets/minecraft/models/block/hopper_side.json

@@ -1,234 +1,93 @@
 {
 	"ambientocclusion": false,
 	"textures": {
-        "particle": "block/hopper_outside",
+		"4": "block/hopper_outside_flipped",
 		"top": "block/hopper_top",
 		"side": "block/hopper_outside",
-        "inside": "block/hopper_inside_side"
+		"particle": "block/hopper_outside",
+		"inside": "block/hopper_inside_side",
+		"back": "block/hopper_back"
 	},
 	"elements": [
 		{
-            "from": [
+			"name": "Element",
-                0,
+			"from": [0, 10, 0],
-                10,
+			"to": [16, 11, 16],
-                0
-            ],
-            "to": [
-                16,
-                11,
-                16
-            ],
 			"faces": {
-                "down": {
+				"north": {"uv": [0, 5, 16, 6], "texture": "#side", "cullface": "north"},
-                    "texture": "#side"
+				"east": {"uv": [0, 5, 16, 6], "texture": "#side", "cullface": "east"},
-                },
+				"south": {"uv": [0, 5, 16, 6], "texture": "#side", "cullface": "south"},
-                "up": {
+				"west": {"uv": [0, 5, 16, 6], "texture": "#side", "cullface": "west"},
-                    "texture": "#inside"
+				"up": {"uv": [0, 0, 16, 16], "texture": "#inside", "cullface": "up"},
-                },
+				"down": {"uv": [0, 0, 16, 16], "texture": "#back"}
-                "north": {
-                    "texture": "#side"
-                },
-                "south": {
-                    "texture": "#side"
-                },
-                "west": {
-                    "texture": "#side"
-                },
-                "east": {
-                    "texture": "#side"
-                }
 			}
 		},
 		{
-            "from": [
+			"name": "Element",
-                0,
+			"from": [0, 11, 0],
-                11,
+			"to": [2, 16, 16],
-                0
-            ],
-            "to": [
-                2,
-                16,
-                16
-            ],
 			"faces": {
-                "down": {
+				"north": {"uv": [14, 0, 16, 5], "texture": "#side", "cullface": "north"},
-                    "texture": "#side"
+				"east": {"uv": [0, 0, 16, 5], "texture": "#back", "cullface": "up"},
-                },
+				"south": {"uv": [0, 0, 2, 5], "texture": "#side", "cullface": "south"},
-                "up": {
+				"west": {"uv": [0, 0, 16, 5], "texture": "#4", "cullface": "west"},
-                    "texture": "#top"
+				"up": {"uv": [0, 0, 2, 16], "texture": "#top", "cullface": "up"}
-                },
-                "north": {
-                    "texture": "#side"
-                },
-                "south": {
-                    "texture": "#side"
-                },
-                "west": {
-                    "texture": "#side"
-                },
-                "east": {
-                    "texture": "#side"
-                }
 			}
 		},
 		{
-            "from": [
+			"name": "Element",
-                14,
+			"from": [14, 11, 0],
-                11,
+			"to": [16, 16, 16],
-                0
-            ],
-            "to": [
-                16,
-                16,
-                16
-            ],
 			"faces": {
-                "down": {
+				"north": {"uv": [0, 0, 2, 5], "texture": "#side", "cullface": "north"},
-                    "texture": "#side"
+				"east": {"uv": [0, 0, 16, 5], "texture": "#side", "cullface": "east"},
-                },
+				"south": {"uv": [14, 0, 16, 5], "texture": "#side", "cullface": "south"},
-                "up": {
+				"west": {"uv": [0, 0, 16, 5], "texture": "#back", "cullface": "up"},
-                    "texture": "#top"
+				"up": {"uv": [14, 0, 16, 16], "texture": "#top", "cullface": "up"}
-                },
-                "north": {
-                    "texture": "#side"
-                },
-                "south": {
-                    "texture": "#side"
-                },
-                "west": {
-                    "texture": "#side"
-                },
-                "east": {
-                    "texture": "#side"
-                }
 			}
 		},
 		{
-            "from": [
+			"name": "Element",
-                2,
+			"from": [2, 11, 0],
-                11,
+			"to": [14, 16, 2],
-                0
-            ],
-            "to": [
-                14,
-                16,
-                2
-            ],
 			"faces": {
-                "down": {
+				"north": {"uv": [2, 0, 14, 5], "texture": "#back", "cullface": "north"},
-                    "texture": "#side"
+				"south": {"uv": [2, 0, 14, 5], "texture": "#back", "cullface": "up"},
-                },
+				"up": {"uv": [2, 0, 14, 2], "texture": "#top", "cullface": "up"}
-                "up": {
-                    "texture": "#top"
-                },
-                "north": {
-                    "texture": "#side"
-                },
-                "south": {
-                    "texture": "#side"
-                },
-                "west": {
-                    "texture": "#side"
-                },
-                "east": {
-                    "texture": "#side"
-                }
 			}
 		},
 		{
-            "from": [
+			"name": "Element",
-                2,
+			"from": [2, 11, 14],
-                11,
+			"to": [14, 16, 16],
-                14
-            ],
-            "to": [
-                14,
-                16,
-                16
-            ],
 			"faces": {
-                "down": {
+				"north": {"uv": [2, 0, 14, 5], "texture": "#back", "cullface": "up"},
-                    "texture": "#side"
+				"south": {"uv": [2, 0, 14, 5], "texture": "#back", "cullface": "south"},
-                },
+				"up": {"uv": [2, 14, 14, 16], "texture": "#top", "cullface": "up"}
-                "up": {
-                    "texture": "#top"
-                },
-                "north": {
-                    "texture": "#side"
-                },
-                "south": {
-                    "texture": "#side"
-                },
-                "west": {
-                    "texture": "#side"
-                },
-                "east": {
-                    "texture": "#side"
-                }
 			}
 		},
 		{
-            "from": [
+			"name": "Element",
-                4,
+			"from": [4, 4, 4],
-                4,
+			"to": [12, 10, 12],
-                4
-            ],
-            "to": [
-                12,
-                10,
-                12
-            ],
 			"faces": {
-                "down": {
+				"north": {"uv": [4, 6, 12, 12], "texture": "#side"},
-                    "texture": "#side"
+				"east": {"uv": [4, 6, 12, 12], "texture": "#side"},
-                },
+				"south": {"uv": [4, 6, 12, 12], "texture": "#side"},
-                "up": {
+				"west": {"uv": [4, 6, 12, 12], "texture": "#side"},
-                    "texture": "#side"
+				"down": {"uv": [4, 4, 12, 12], "texture": "#back"}
-                },
-                "north": {
-                    "texture": "#side"
-                },
-                "south": {
-                    "texture": "#side"
-                },
-                "west": {
-                    "texture": "#side"
-                },
-                "east": {
-                    "texture": "#side"
-                }
 			}
 		},
 		{
-            "from": [
+			"name": "Element",
-                6,
+			"from": [6, 4, 0],
-                4,
+			"to": [10, 8, 4],
-                0
-            ],
-            "to": [
-                10,
-                8,
-                4
-            ],
 			"faces": {
-                "down": {
+				"north": {"uv": [6, 8, 10, 12], "texture": "#side", "cullface": "north"},
-                    "texture": "#side"
+				"east": {"uv": [12, 8, 16, 12], "texture": "#side"},
-                },
+				"west": {"uv": [0, 8, 4, 12], "texture": "#side"},
-                "up": {
+				"up": {"uv": [6, 0, 10, 4], "texture": "#side"},
-                    "texture": "#side"
+				"down": {"uv": [6, 12, 10, 16], "texture": "#back"}
-                },
-                "north": {
-                    "texture": "#side"
-                },
-                "south": {
-                    "texture": "#side"
-                },
-                "west": {
-                    "texture": "#side"
-                },
-                "east": {
-                    "texture": "#side"
-                }
 			}
 		}
 	]

resourcepack/assets/minecraft/models/block/kelp_age_25.json

@@ -0,0 +1,7 @@
+{
+    "parent": "block/tinted_cross",
+    "textures": {
+        "particle": "block/kelp_age_25",
+        "cross": "block/kelp_age_25"
+    }
+}

resourcepack/assets/minecraft/models/block/observer_powered.json

@@ -1,85 +0,0 @@
-{
-    "parent": "block/observer",
-    "textures": {
-        "bottom": "block/observer_back_on",
-        "front": "block/observer_front_powered",
-        "side": "block/observer_side_powered",
-        "top": "block/observer_top_powered"
-    },
-    "elements": [
-        {
-            "from": [
-                0,
-                0,
-                0
-            ],
-            "to": [
-                16,
-                16,
-                16
-            ],
-            "faces": {
-                "down": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        16
-                    ],
-                    "texture": "#top",
-                    "cullface": "down"
-                },
-                "up": {
-                    "uv": [
-                        0,
-                        16,
-                        16,
-                        0
-                    ],
-                    "texture": "#top",
-                    "cullface": "up"
-                },
-                "north": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        16
-                    ],
-                    "texture": "#front",
-                    "cullface": "north"
-                },
-                "south": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        16
-                    ],
-                    "texture": "#bottom",
-                    "cullface": "south"
-                },
-                "west": {
-                    "uv": [
-                        16,
-                        16,
-                        0,
-                        0
-                    ],
-                    "texture": "#side",
-                    "cullface": "west"
-                },
-                "east": {
-                    "uv": [
-                        0,
-                        16,
-                        16,
-                        0
-                    ],
-                    "texture": "#side",
-                    "cullface": "east"
-                }
-            }
-        }
-    ]
-}

resourcepack/assets/minecraft/models/block/piston_head_different_arm_tex.json

@@ -1,135 +0,0 @@
-{
-    "textures": {
-        "particle": "#platform"
-    },
-    "elements": [
-        {
-            "from": [
-                0,
-                0,
-                0
-            ],
-            "to": [
-                16,
-                16,
-                4
-            ],
-            "faces": {
-                "down": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        4
-                    ],
-                    "texture": "#side",
-                    "cullface": "down",
-                    "rotation": 180
-                },
-                "up": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        4
-                    ],
-                    "texture": "#side",
-                    "cullface": "up"
-                },
-                "north": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        16
-                    ],
-                    "texture": "#platform",
-                    "cullface": "north"
-                },
-                "south": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        16
-                    ],
-                    "texture": "#unsticky"
-                },
-                "west": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        4
-                    ],
-                    "texture": "#side",
-                    "rotation": 270,
-                    "cullface": "west"
-                },
-                "east": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        4
-                    ],
-                    "texture": "#side",
-                    "rotation": 90,
-                    "cullface": "east"
-                }
-            }
-        },
-        {
-            "from": [
-                6,
-                6,
-                4
-            ],
-            "to": [
-                10,
-                10,
-                20
-            ],
-            "faces": {
-                "down": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        4
-                    ],
-                    "texture": "#arm",
-                    "rotation": 90
-                },
-                "up": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        4
-                    ],
-                    "texture": "#arm",
-                    "rotation": 270
-                },
-                "west": {
-                    "uv": [
-                        16,
-                        4,
-                        0,
-                        0
-                    ],
-                    "texture": "#arm"
-                },
-                "east": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        4
-                    ],
-                    "texture": "#arm"
-                }
-            }
-        }
-    ]
-}

resourcepack/assets/minecraft/models/block/piston_head_short_different_arm_tex.json

@@ -1,135 +0,0 @@
-{
-    "textures": {
-        "particle": "#platform"
-    },
-    "elements": [
-        {
-            "from": [
-                0,
-                0,
-                0
-            ],
-            "to": [
-                16,
-                16,
-                4
-            ],
-            "faces": {
-                "down": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        4
-                    ],
-                    "texture": "#side",
-                    "cullface": "down",
-                    "rotation": 180
-                },
-                "up": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        4
-                    ],
-                    "texture": "#side",
-                    "cullface": "up"
-                },
-                "north": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        16
-                    ],
-                    "texture": "#platform",
-                    "cullface": "north"
-                },
-                "south": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        16
-                    ],
-                    "texture": "#unsticky"
-                },
-                "west": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        4
-                    ],
-                    "texture": "#side",
-                    "rotation": 270,
-                    "cullface": "west"
-                },
-                "east": {
-                    "uv": [
-                        0,
-                        0,
-                        16,
-                        4
-                    ],
-                    "texture": "#side",
-                    "rotation": 90,
-                    "cullface": "east"
-                }
-            }
-        },
-        {
-            "from": [
-                6,
-                6,
-                4
-            ],
-            "to": [
-                10,
-                10,
-                16
-            ],
-            "faces": {
-                "down": {
-                    "uv": [
-                        4,
-                        0,
-                        16,
-                        4
-                    ],
-                    "texture": "#arm",
-                    "rotation": 90
-                },
-                "up": {
-                    "uv": [
-                        4,
-                        0,
-                        16,
-                        4
-                    ],
-                    "texture": "#arm",
-                    "rotation": 270
-                },
-                "west": {
-                    "uv": [
-                        16,
-                        4,
-                        4,
-                        0
-                    ],
-                    "texture": "#arm"
-                },
-                "east": {
-                    "uv": [
-                        4,
-                        0,
-                        16,
-                        4
-                    ],
-                    "texture": "#arm"
-                }
-            }
-        }
-    ]
-}

resourcepack/assets/minecraft/models/block/piston_head_short_sticky.json

@@ -1,9 +1,9 @@
 {
-    "parent": "block/piston_head_short",
+    "parent": "block/template_piston_head_short_sticky",
     "textures": {
-        "unsticky": "block/piston_top_sticky",
+        "unsticky": "block/piston_top",
         "side": "block/piston_side_sticky",
-        "platform": "block/piston_top_sticky",
+        "unsticky_side": "block/piston_side",
-        "arm": "block/piston_side"
+        "platform": "block/piston_top_sticky"
     }
 }

resourcepack/assets/minecraft/models/block/piston_head_sticky.json

@@ -1,9 +1,9 @@
 {
-    "parent": "block/piston_head_different_arm_tex",
+    "parent": "block/template_piston_head_sticky",
     "textures": {
         "unsticky": "block/piston_top_sticky",
         "side": "block/piston_side_sticky",
-        "platform": "block/piston_top_sticky",
+        "unsticky_side": "block/piston_side",
-        "arm": "block/piston_side"
+        "platform": "block/piston_top_sticky"
     }
 }

resourcepack/assets/minecraft/models/block/stem_fruit.json

@@ -0,0 +1,31 @@
+{
+    "ambientocclusion": false,
+    "textures": {
+        "particle": "#stem"
+    },
+    "elements": [
+        {   "from": [ 0, -1, 8 ],
+            "to": [ 16, 7, 8 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "north": { "uv": [  0, 0, 16, 8 ], "texture": "#stem" },
+                "south": { "uv": [ 16, 0,  0, 8 ], "texture": "#stem" }
+            }
+        },
+        {   "from": [ 8, -1, 0 ],
+            "to": [ 8, 7, 16 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "west": { "uv": [  0, 0, 16, 8 ], "texture": "#stem" },
+                "east": { "uv": [ 16, 0,  0, 8 ], "texture": "#stem" }
+            }
+        },
+        {   "from": [ 0, 0, 8 ],
+            "to": [ 9, 16, 8 ],
+            "faces": {
+                "north": { "uv": [ 9, 0, 0, 16 ], "texture": "#upperstem" },
+                "south": { "uv": [ 0, 0, 9, 16 ], "texture": "#upperstem" }
+            }
+        }
+    ]
+}

resourcepack/assets/minecraft/models/block/stem_growth0.json

@@ -0,0 +1,24 @@
+{
+    "ambientocclusion": false,
+    "textures": {
+        "particle": "#stem"
+    },
+    "elements": [
+        {   "from": [ 0, -1, 8 ],
+            "to": [ 16, 1, 8 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "north": { "uv": [ 0, 0, 16, 2 ], "texture": "#stem" },
+                "south": { "uv": [ 16, 0, 0, 2 ], "texture": "#stem" }
+            }
+        },
+        {   "from": [ 8, -1, 0 ],
+            "to": [ 8, 1, 16 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "west": { "uv": [ 0, 0, 16, 2 ], "texture": "#stem" },
+                "east": { "uv": [ 16, 0, 0, 2 ], "texture": "#stem" }
+            }
+        }
+    ]
+}

resourcepack/assets/minecraft/models/block/stem_growth1.json

@@ -0,0 +1,24 @@
+{
+    "ambientocclusion": false,
+    "textures": {
+        "particle": "#stem"
+    },
+    "elements": [
+        {   "from": [ 0, -1, 8 ],
+            "to": [ 16, 3, 8 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "north": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" },
+                "south": { "uv": [ 16, 0, 0, 4 ], "texture": "#stem" }
+            }
+        },
+        {   "from": [ 8, -1, 0 ],
+            "to": [ 8, 3, 16 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "west": { "uv": [ 0, 0, 16, 4 ], "texture": "#stem" },
+                "east": { "uv": [ 16, 0, 0, 4 ], "texture": "#stem" }
+            }
+        }
+    ]
+}

resourcepack/assets/minecraft/models/block/stem_growth2.json

@@ -0,0 +1,24 @@
+{
+    "ambientocclusion": false,
+    "textures": {
+        "particle": "#stem"
+    },
+    "elements": [
+        {   "from": [ 0, -1, 8 ],
+            "to": [ 16, 5, 8 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "north": { "uv": [ 0, 0, 16, 6 ], "texture": "#stem" },
+                "south": { "uv": [ 16, 0, 0, 6 ], "texture": "#stem" }
+            }
+        },
+        {   "from": [ 8, -1, 0 ],
+            "to": [ 8, 5, 16 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "west": { "uv": [ 0, 0, 16, 6 ], "texture": "#stem" },
+                "east": { "uv": [ 16, 0, 0, 6 ], "texture": "#stem" }
+            }
+        }
+    ]
+}

resourcepack/assets/minecraft/models/block/stem_growth3.json

@@ -0,0 +1,24 @@
+{
+    "ambientocclusion": false,
+    "textures": {
+        "particle": "#stem"
+    },
+    "elements": [
+        {   "from": [ 0, -1, 8 ],
+            "to": [ 16, 7, 8 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "north": { "uv": [ 0, 0, 16, 8 ], "texture": "#stem" },
+                "south": { "uv": [ 16, 0, 0, 8 ], "texture": "#stem" }
+            }
+        },
+        {   "from": [ 8, -1, 0 ],
+            "to": [ 8, 7, 16 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#stem" },
+                "east": { "uv": [ 16, 0, 0, 8 ], "texture": "#stem" }
+            }
+        }
+    ]
+}

resourcepack/assets/minecraft/models/block/stem_growth4.json

@@ -0,0 +1,24 @@
+{
+    "ambientocclusion": false,
+    "textures": {
+        "particle": "#stem"
+    },
+    "elements": [
+        {   "from": [ 0, -1, 8 ],
+            "to": [ 16, 9, 8 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "north": { "uv": [ 0, 0, 16, 10 ], "texture": "#stem" },
+                "south": { "uv": [ 16, 0, 0, 10 ], "texture": "#stem" }
+            }
+        },
+        {   "from": [ 8, -1, 0 ],
+            "to": [ 8, 9, 16 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "west": { "uv": [ 0, 0, 16, 10 ], "texture": "#stem" },
+                "east": { "uv": [ 16, 0, 0, 10 ], "texture": "#stem" }
+            }
+        }
+    ]
+}

resourcepack/assets/minecraft/models/block/stem_growth5.json

@@ -0,0 +1,24 @@
+{
+    "ambientocclusion": false,
+    "textures": {
+        "particle": "#stem"
+    },
+    "elements": [
+        {   "from": [ 0, -1, 8 ],
+            "to": [ 16, 11, 8 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "north": { "uv": [ 0, 0, 16, 12 ], "texture": "#stem" },
+                "south": { "uv": [ 16, 0, 0, 12 ], "texture": "#stem" }
+            }
+        },
+        {   "from": [ 8, -1, 0 ],
+            "to": [ 8, 11, 16 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "west": { "uv": [ 0, 0, 16, 12 ], "texture": "#stem" },
+                "east": { "uv": [ 16, 0, 0, 12 ], "texture": "#stem" }
+            }
+        }
+    ]
+}

resourcepack/assets/minecraft/models/block/stem_growth6.json

@@ -0,0 +1,24 @@
+{
+    "ambientocclusion": false,
+    "textures": {
+        "particle": "#stem"
+    },
+    "elements": [
+        {   "from": [ 0, -1, 8 ],
+            "to": [ 16, 13, 8 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "north": { "uv": [ 0, 0, 16, 14 ], "texture": "#stem" },
+                "south": { "uv": [ 16, 0, 0, 14 ], "texture": "#stem" }
+            }
+        },
+        {   "from": [ 8, -1, 0 ],
+            "to": [ 8, 13, 16 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "west": { "uv": [ 0, 0, 16, 14 ], "texture": "#stem" },
+                "east": { "uv": [ 16, 0, 0, 14 ], "texture": "#stem" }
+            }
+        }
+    ]
+}

resourcepack/assets/minecraft/models/block/stem_growth7.json

@@ -0,0 +1,24 @@
+{
+    "ambientocclusion": false,
+    "textures": {
+        "particle": "#stem"
+    },
+    "elements": [
+        {   "from": [ 0, -1, 8 ],
+            "to": [ 16, 15, 8 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" },
+                "south": { "uv": [ 16, 0, 0, 16 ], "texture": "#stem" }
+            }
+        },
+        {   "from": [ 8, -1, 0 ],
+            "to": [ 8, 15, 16 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "faces": {
+                "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#stem" },
+                "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#stem" }
+            }
+        }
+    ]
+}

resourcepack/assets/minecraft/models/block/sticky_piston.json

@@ -1,5 +1,5 @@
 {
-    "parent": "block/piston",
+    "parent": "block/template_piston",
     "textures": {
         "bottom": "block/piston_bottom",
         "side": "block/piston_side_sticky",

resourcepack/assets/minecraft/models/block/template_piston_head_short_sticky.json

@@ -0,0 +1,27 @@
+{
+    "textures": {
+        "particle": "#platform"
+    },
+    "elements": [
+        {   "from": [ 0, 0, 0 ],
+            "to": [ 16, 16, 4 ],
+            "faces": {
+                "down":  { "uv": [ 0, 0, 16,  4 ], "texture": "#side", "cullface": "down", "rotation": 180 },
+                "up":    { "uv": [ 0, 0, 16,  4 ], "texture": "#side", "cullface": "up" },
+                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#platform", "cullface": "north" },
+                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#unsticky" },
+                "west":  { "uv": [ 0, 0, 16,  4 ], "texture": "#side", "rotation": 270, "cullface": "west" },
+                "east":  { "uv": [ 0, 0, 16,  4 ], "texture": "#side", "rotation": 90, "cullface": "east" }
+            }
+        },
+        {   "from": [ 6, 6, 4 ],
+            "to": [ 10, 10, 16 ],
+            "faces": {
+                "down": { "uv": [  4, 0, 16, 4 ], "texture": "#unsticky_side", "rotation": 90 },
+                "up":   { "uv": [  4, 0, 16, 4 ], "texture": "#unsticky_side", "rotation": 270 },
+                "west": { "uv": [ 16, 4,  4, 0 ], "texture": "#unsticky_side" },
+                "east": { "uv": [  4, 0, 16, 4 ], "texture": "#unsticky_side" }
+            }
+        }
+    ]
+}

resourcepack/assets/minecraft/models/block/template_piston_head_sticky.json

@@ -0,0 +1,27 @@
+{
+    "textures": {
+        "particle": "#platform"
+    },
+    "elements": [
+        {   "from": [ 0, 0, 0 ],
+            "to": [ 16, 16, 4 ],
+            "faces": {
+                "down":  { "uv": [ 0, 0, 16,  4 ], "texture": "#side", "cullface": "down", "rotation": 180 },
+                "up":    { "uv": [ 0, 0, 16,  4 ], "texture": "#side", "cullface": "up" },
+                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#platform", "cullface": "north" },
+                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#unsticky" },
+                "west":  { "uv": [ 0, 0, 16,  4 ], "texture": "#side", "rotation": 270, "cullface": "west" },
+                "east":  { "uv": [ 0, 0, 16,  4 ], "texture": "#side", "rotation": 90, "cullface": "east" }
+            }
+        },
+        {   "from": [ 6, 6, 4 ],
+            "to": [ 10, 10, 20 ],
+            "faces": {
+                "down": { "uv": [  0, 0, 16, 4 ], "texture": "#unsticky_side", "rotation": 90 },
+                "up":   { "uv": [  0, 0, 16, 4 ], "texture": "#unsticky_side", "rotation": 270 },
+                "west": { "uv": [ 16, 4,  0, 0 ], "texture": "#unsticky_side" },
+                "east": { "uv": [  0, 0, 16, 4 ], "texture": "#unsticky_side" }
+            }
+        }
+    ]
+}

resourcepack/assets/minecraft/models/item/shield.json

@@ -0,0 +1,132 @@
+{
+    "parent": "builtin/entity",
+    "display": {
+        "thirdperson_righthand": {
+            "rotation": [
+                0,
+                90,
+                0
+            ],
+            "translation": [
+                10.51,
+                6,
+                -4
+            ],
+            "scale": [
+                1,
+                1,
+                1
+            ]
+        },
+        "thirdperson_lefthand": {
+            "rotation": [
+                0,
+                90,
+                0
+            ],
+            "translation": [
+                10.51,
+                6,
+                12
+            ],
+            "scale": [
+                1,
+                1,
+                1
+            ]
+        },
+        "firstperson_righthand": {
+            "rotation": [
+                0,
+                180,
+                5
+            ],
+            "translation": [
+                -10,
+                -1,
+                -10
+            ],
+            "scale": [
+                1.25,
+                1.25,
+                1.25
+            ]
+        },
+        "firstperson_lefthand": {
+            "rotation": [
+                0,
+                180,
+                5
+            ],
+            "translation": [
+                10,
+                -3,
+                -10
+            ],
+            "scale": [
+                1.25,
+                1.25,
+                1.25
+            ]
+        },
+        "gui": {
+            "rotation": [
+                15,
+                -25,
+                -5
+            ],
+            "translation": [
+                2,
+                3,
+                0
+            ],
+            "scale": [
+                0.65,
+                0.65,
+                0.65
+            ]
+        },
+        "fixed": {
+            "rotation": [
+                0,
+                180,
+                0
+            ],
+            "translation": [
+                -2,
+                4,
+                -5
+            ],
+            "scale": [
+                0.5,
+                0.5,
+                0.5
+            ]
+        },
+        "ground": {
+            "rotation": [
+                0,
+                0,
+                0
+            ],
+            "translation": [
+                4,
+                4,
+                2
+            ],
+            "scale": [
+                0.25,
+                0.25,
+                0.25
+            ]
+        }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "blocking": 1
+            },
+            "model": "item/shield_blocking"
+        }
+    ]
+}

resourcepack/assets/minecraft/models/item/shield_blocking.json

@@ -0,0 +1,78 @@
+{
+    "parent": "builtin/entity",
+    "display": {
+        "thirdperson_righthand": {
+            "rotation": [
+                0,
+                90,
+                0
+            ],
+            "translation": [
+                10.51,
+                6,
+                -4
+            ],
+            "scale": [
+                1,
+                1,
+                1
+            ]
+        },
+        "thirdperson_lefthand": {
+            "rotation": [
+                0,
+                90,
+                0
+            ],
+            "translation": [
+                10.51,
+                6,
+                12
+            ],
+            "scale": [
+                1,
+                1,
+                1
+            ]
+        },
+        "firstperson_righthand": {
+            "rotation": [ 0, 180, -5 ],
+            "translation": [ -15, 2.25, -11 ],
+            "scale": [ 1.25, 1.25, 1.25 ]
+        },
+        "firstperson_lefthand": {
+            "rotation": [
+                0,
+                180,
+                -5
+            ],
+            "translation": [
+                5,
+                4,
+                -11
+            ],
+            "scale": [
+                1.25,
+                1.25,
+                1.25
+            ]
+        },
+        "gui": {
+            "rotation": [
+                15,
+                -25,
+                -5
+            ],
+            "translation": [
+                2,
+                3,
+                0
+            ],
+            "scale": [
+                0.65,
+                0.65,
+                0.65
+            ]
+        }
+    }
+}

resourcepack/assets/minecraft/models/item/sticky_piston.json

@@ -0,0 +1,3 @@
+{
+    "parent": "block/sticky_piston_inventory"
+}