diff --git a/assets/minecraft/models/block/acacia_door_bottom.json b/assets/minecraft/models/block/acacia_door_bottom.json index 23e80de..4e94110 100644 --- a/assets/minecraft/models/block/acacia_door_bottom.json +++ b/assets/minecraft/models/block/acacia_door_bottom.json @@ -1,4 +1,5 @@ { + "ambientocclusion":false, "textures": { "particle": "block/acacia_door_bottom", "bottom": "block/acacia_door_bottom", diff --git a/assets/minecraft/models/block/acacia_door_bottom_hinge.json b/assets/minecraft/models/block/acacia_door_bottom_hinge.json index 93887a4..3eef0b4 100644 --- a/assets/minecraft/models/block/acacia_door_bottom_hinge.json +++ b/assets/minecraft/models/block/acacia_door_bottom_hinge.json @@ -1,4 +1,5 @@ { + "ambientocclusion":false, "textures": { "bottom": "block/acacia_door_bottom2", "side": "block/acacia_door_sides", diff --git a/assets/minecraft/models/block/acacia_door_top.json b/assets/minecraft/models/block/acacia_door_top.json index 7223eae..7687f4a 100644 --- a/assets/minecraft/models/block/acacia_door_top.json +++ b/assets/minecraft/models/block/acacia_door_top.json @@ -1,4 +1,5 @@ { + "ambientocclusion":false, "textures": { "particle": "block/acacia_door_top", "top": "block/acacia_door_top", diff --git a/assets/minecraft/models/block/acacia_door_top_hinge.json b/assets/minecraft/models/block/acacia_door_top_hinge.json index 9b63342..5ea2149 100644 --- a/assets/minecraft/models/block/acacia_door_top_hinge.json +++ b/assets/minecraft/models/block/acacia_door_top_hinge.json @@ -1,4 +1,5 @@ { + "ambientocclusion":false, "textures": { "top": "block/acacia_door_top2", "side": "block/acacia_door_sides", diff --git a/assets/minecraft/models/block/acacia_trapdoor_bottom.json b/assets/minecraft/models/block/acacia_trapdoor_bottom.json index c99cf77..a077e56 100644 --- a/assets/minecraft/models/block/acacia_trapdoor_bottom.json +++ b/assets/minecraft/models/block/acacia_trapdoor_bottom.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench - Made/edited by RyanGar46", "parent": "block/template_orientable_trapdoor_open", "textures": { "texture": "block/acacia_trapdoor" @@ -78,28 +77,6 @@ "up": {"uv": [9, 3, 12, 13], "rotation": 180, "texture": "#texture"}, "down": {"uv": [4, 3, 7, 13], "texture": "#texture", "cullface": "down"} } - }, - { - "from": [5, 3, 0], - "to": [11, 3.25, 2], - "faces": { - "north": {"uv": [5, 15, 11, 16], "texture": "#texture", "cullface": "north"}, - "east": {"uv": [5, 14, 6, 16], "rotation": 90, "texture": "#texture"}, - "south": {"uv": [5, 14, 11, 15], "texture": "#texture"}, - "west": {"uv": [5, 14, 6, 16], "rotation": 270, "texture": "#texture"}, - "up": {"uv": [5, 14, 11, 16], "texture": "#texture"} - } - }, - { - "from": [5, -0.25, 0], - "to": [11, 0, 2], - "faces": { - "north": {"uv": [5, 15, 11, 16], "texture": "#texture", "cullface": "down"}, - "east": {"uv": [5, 14, 6, 16], "rotation": 90, "texture": "#texture", "cullface": "down"}, - "south": {"uv": [5, 14, 11, 15], "texture": "#texture", "cullface": "down"}, - "west": {"uv": [5, 14, 6, 16], "rotation": 270, "texture": "#texture", "cullface": "down"}, - "down": {"uv": [5, 14, 11, 16], "rotation": 180, "texture": "#texture", "cullface": "down"} - } } ], "display": { @@ -145,12 +122,17 @@ { "name": "birch_trapdoor_open", "origin": [8, 8, 8], + "color": 0, "children": [ { "name": "oak_trapdoor_open", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3] } ] - }, 4, 5, 6, 7] + }, + 4, + 5 + ] } \ No newline at end of file diff --git a/assets/minecraft/models/block/acacia_trapdoor_open.json b/assets/minecraft/models/block/acacia_trapdoor_open.json index 5b9e1f6..745103f 100644 --- a/assets/minecraft/models/block/acacia_trapdoor_open.json +++ b/assets/minecraft/models/block/acacia_trapdoor_open.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench - Made/edited by RyanGar46", "parent": "block/template_orientable_trapdoor_open", "textures": { "texture": "block/acacia_trapdoor" @@ -72,28 +71,6 @@ "south": {"uv": [9, 3, 12, 13], "rotation": 180, "texture": "#texture", "cullface": "south"}, "west": {"uv": [9, 3, 12, 13], "rotation": 180, "texture": "#texture"} } - }, - { - "from": [5, 14, 16], - "to": [11, 16, 16.25], - "faces": { - "east": {"uv": [5, 14, 6, 16], "texture": "#texture", "cullface": "south"}, - "south": {"uv": [5, 14, 11, 16], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [5, 14, 6, 16], "texture": "#texture", "cullface": "south"}, - "up": {"uv": [5, 15, 11, 16], "rotation": 180, "texture": "#texture", "cullface": "up"}, - "down": {"uv": [5, 14, 11, 15], "texture": "#texture", "cullface": "south"} - } - }, - { - "from": [5, 14, 12.75], - "to": [11, 16, 13], - "faces": { - "north": {"uv": [5, 14, 11, 16], "texture": "#texture"}, - "east": {"uv": [5, 14, 6, 16], "texture": "#texture"}, - "west": {"uv": [5, 14, 6, 16], "texture": "#texture"}, - "up": {"uv": [5, 15, 11, 16], "rotation": 180, "texture": "#texture", "cullface": "up"}, - "down": {"uv": [5, 14, 11, 15], "texture": "#texture"} - } } ], "display": { @@ -139,12 +116,17 @@ { "name": "birch_trapdoor_open", "origin": [8, 8, 8], + "color": 0, "children": [ { "name": "oak_trapdoor_open", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3] } ] - }, 4, 5, 6, 7] + }, + 4, + 5 + ] } \ No newline at end of file diff --git a/assets/minecraft/models/block/acacia_trapdoor_top.json b/assets/minecraft/models/block/acacia_trapdoor_top.json index 3aee920..d25fa16 100644 --- a/assets/minecraft/models/block/acacia_trapdoor_top.json +++ b/assets/minecraft/models/block/acacia_trapdoor_top.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench - Made/edited by RyanGar46", "parent": "block/template_orientable_trapdoor_open", "textures": { "texture": "block/acacia_trapdoor" @@ -72,30 +71,6 @@ "up": {"uv": [9, 3, 12, 13], "rotation": 180, "texture": "#texture", "cullface": "up"}, "down": {"uv": [4, 3, 7, 13], "texture": "#texture"} } - }, - { - "from": [5, 16, 0], - "to": [11, 16.25, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, - "faces": { - "north": {"uv": [5, 15, 11, 16], "texture": "#texture", "cullface": "north"}, - "east": {"uv": [5, 14, 6, 16], "rotation": 90, "texture": "#texture", "cullface": "up"}, - "south": {"uv": [5, 14, 11, 15], "texture": "#texture", "cullface": "up"}, - "west": {"uv": [5, 14, 6, 16], "rotation": 270, "texture": "#texture", "cullface": "up"}, - "up": {"uv": [5, 14, 11, 16], "texture": "#texture", "cullface": "up"} - } - }, - { - "from": [5, 12.75, 0], - "to": [11, 13, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, - "faces": { - "north": {"uv": [5, 15, 11, 16], "texture": "#texture", "cullface": "north"}, - "east": {"uv": [5, 14, 6, 16], "rotation": 90, "texture": "#texture"}, - "south": {"uv": [5, 14, 11, 15], "texture": "#texture"}, - "west": {"uv": [5, 14, 6, 16], "rotation": 270, "texture": "#texture"}, - "down": {"uv": [5, 14, 11, 16], "rotation": 180, "texture": "#texture"} - } } ], "display": { @@ -141,12 +116,17 @@ { "name": "birch_trapdoor_open", "origin": [8, 8, 8], + "color": 0, "children": [ { "name": "oak_trapdoor_open", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3] } ] - }, 4, 5, 6, 7] + }, + 4, + 5 + ] } \ No newline at end of file diff --git a/assets/minecraft/models/block/activator_rail_on.json b/assets/minecraft/models/block/activator_rail_on.json index dec35cc..4e65f52 100644 --- a/assets/minecraft/models/block/activator_rail_on.json +++ b/assets/minecraft/models/block/activator_rail_on.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "parent": "block/activator_rail", "textures": { diff --git a/assets/minecraft/models/block/activator_rail_on_raised_ne.json b/assets/minecraft/models/block/activator_rail_on_raised_ne.json index 0b31146..74bfd09 100644 --- a/assets/minecraft/models/block/activator_rail_on_raised_ne.json +++ b/assets/minecraft/models/block/activator_rail_on_raised_ne.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "parent": "block/activator_rail_raised_ne", "textures": { diff --git a/assets/minecraft/models/block/activator_rail_on_raised_sw.json b/assets/minecraft/models/block/activator_rail_on_raised_sw.json index 94ed0c2..4c7591d 100644 --- a/assets/minecraft/models/block/activator_rail_on_raised_sw.json +++ b/assets/minecraft/models/block/activator_rail_on_raised_sw.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "parent": "block/activator_rail_raised_sw", "textures": { diff --git a/assets/minecraft/models/block/activator_rail_raised_ne.json b/assets/minecraft/models/block/activator_rail_raised_ne.json index ecf1425..fffc457 100644 --- a/assets/minecraft/models/block/activator_rail_raised_ne.json +++ b/assets/minecraft/models/block/activator_rail_raised_ne.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "textures": { "particle": "block/activator_rail", diff --git a/assets/minecraft/models/block/activator_rail_raised_sw.json b/assets/minecraft/models/block/activator_rail_raised_sw.json index 60331bc..90e2d3c 100644 --- a/assets/minecraft/models/block/activator_rail_raised_sw.json +++ b/assets/minecraft/models/block/activator_rail_raised_sw.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "textures": { "particle": "block/activator_rail", diff --git a/assets/minecraft/models/block/birch_door_bottom.json b/assets/minecraft/models/block/birch_door_bottom.json index 9ad2c50..7c79ac1 100644 --- a/assets/minecraft/models/block/birch_door_bottom.json +++ b/assets/minecraft/models/block/birch_door_bottom.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "textures": { "3": "block/birch_door_sides", diff --git a/assets/minecraft/models/block/birch_door_bottom_hinge.json b/assets/minecraft/models/block/birch_door_bottom_hinge.json index 96f1ff7..8a8c438 100644 --- a/assets/minecraft/models/block/birch_door_bottom_hinge.json +++ b/assets/minecraft/models/block/birch_door_bottom_hinge.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "textures": { "3": "block/birch_door_bottom2", diff --git a/assets/minecraft/models/block/birch_door_top.json b/assets/minecraft/models/block/birch_door_top.json index 9ee49dc..30e7064 100644 --- a/assets/minecraft/models/block/birch_door_top.json +++ b/assets/minecraft/models/block/birch_door_top.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "textures": { "3": "block/birch_door_top", diff --git a/assets/minecraft/models/block/birch_door_top_hinge.json b/assets/minecraft/models/block/birch_door_top_hinge.json index dddcfc3..9e23ca0 100644 --- a/assets/minecraft/models/block/birch_door_top_hinge.json +++ b/assets/minecraft/models/block/birch_door_top_hinge.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "textures": { "3": "block/birch_door_top2", diff --git a/assets/minecraft/models/block/birch_trapdoor_bottom.json b/assets/minecraft/models/block/birch_trapdoor_bottom.json index 1b04eba..7bf83f7 100644 --- a/assets/minecraft/models/block/birch_trapdoor_bottom.json +++ b/assets/minecraft/models/block/birch_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "credit": "Made with Blockbench - Made/edited by RyanGar46", "parent": "block/template_orientable_trapdoor_open", + "ambientocclusion": false, "textures": { "texture": "block/birch_trapdoor" }, @@ -12,11 +12,11 @@ "rotation": {"angle": 0, "axis": "x", "origin": [8, -5, 8]}, "faces": { "north": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [13, 0, 16, 3], "rotation": 270, "texture": "#texture", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 3], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#texture", "cullface": "west"}, + "east": {"uv": [13, 0, 16, 3], "rotation": 270, "texture": "#texture"}, + "south": {"uv": [0, 0, 16, 3], "texture": "#texture"}, + "west": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#texture"}, "up": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [0, 0, 16, 3], "texture": "#texture", "cullface": "down"} + "down": {"uv": [0, 0, 16, 3], "texture": "#texture"} } }, { @@ -25,12 +25,12 @@ "to": [16, 3, 3], "rotation": {"angle": 0, "axis": "x", "origin": [8, -5, 8]}, "faces": { - "north": {"uv": [0, 0, 16, 3], "texture": "#texture", "cullface": "north"}, - "east": {"uv": [13, 13, 16, 16], "rotation": 270, "texture": "#texture", "cullface": "east"}, + "north": {"uv": [0, 0, 16, 3], "texture": "#texture"}, + "east": {"uv": [13, 13, 16, 16], "rotation": 270, "texture": "#texture"}, "south": {"uv": [0, 13, 16, 16], "texture": "#texture"}, - "west": {"uv": [16, 0, 13, 3], "texture": "#texture", "cullface": "west"}, + "west": {"uv": [16, 0, 13, 3], "texture": "#texture"}, "up": {"uv": [0, 13, 16, 16], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [16, 13, 0, 16], "texture": "#texture", "cullface": "down"} + "down": {"uv": [16, 13, 0, 16], "texture": "#texture"} } }, { @@ -39,10 +39,10 @@ "to": [16, 3, 13], "rotation": {"angle": 0, "axis": "x", "origin": [8, -5, 8]}, "faces": { - "east": {"uv": [13, 3, 16, 13], "rotation": 270, "texture": "#texture", "cullface": "east"}, + "east": {"uv": [13, 3, 16, 13], "rotation": 270, "texture": "#texture"}, "west": {"uv": [0, 13, 3, 3], "rotation": 270, "texture": "#texture"}, "up": {"uv": [0, 3, 3, 13], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [13, 3, 16, 13], "texture": "#texture", "cullface": "down"} + "down": {"uv": [13, 3, 16, 13], "texture": "#texture"} } }, { @@ -52,9 +52,9 @@ "rotation": {"angle": 0, "axis": "x", "origin": [8, -5, 8]}, "faces": { "east": {"uv": [13, 3, 16, 13], "rotation": 90, "texture": "#texture"}, - "west": {"uv": [3, 0, 13, 3], "texture": "#texture", "cullface": "west"}, + "west": {"uv": [3, 0, 13, 3], "texture": "#texture"}, "up": {"uv": [13, 3, 16, 13], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [0, 3, 3, 13], "texture": "#texture", "cullface": "down"} + "down": {"uv": [0, 3, 3, 13], "texture": "#texture"} } }, { @@ -63,7 +63,7 @@ "rotation": {"angle": 0, "axis": "x", "origin": [8, -5, 8]}, "faces": { "up": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [3, 3, 13, 13], "texture": "#texture", "cullface": "down"} + "down": {"uv": [3, 3, 13, 13], "texture": "#texture"} } }, { @@ -82,32 +82,10 @@ "to": [11, 1, 4], "rotation": {"angle": 0, "axis": "x", "origin": [8, -5, 8]}, "faces": { - "east": {"uv": [10, 12, 11, 13], "rotation": 270, "texture": "#texture", "cullface": "down"}, - "south": {"uv": [5, 12, 11, 13], "texture": "#texture", "cullface": "down"}, - "west": {"uv": [5, 12, 6, 13], "rotation": 90, "texture": "#texture", "cullface": "down"}, - "down": {"uv": [5, 12, 11, 13], "texture": "#texture", "cullface": "down"} - } - }, - { - "from": [6, 3, 1], - "to": [10, 3.25, 2], - "faces": { - "north": {"uv": [6, 14, 10, 15], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [6, 14, 7, 14.25], "texture": "#texture"}, - "south": {"uv": [6, 14, 10, 15], "texture": "#texture"}, - "west": {"uv": [6, 14, 7, 14.25], "texture": "#texture"}, - "up": {"uv": [6, 14, 10, 15], "texture": "#texture"} - } - }, - { - "from": [6, -0.25, 1], - "to": [10, 0, 2], - "faces": { - "north": {"uv": [10, 15, 6, 14], "rotation": 180, "texture": "#texture", "cullface": "down"}, - "east": {"uv": [7, 14.25, 6, 14], "texture": "#texture", "cullface": "down"}, - "south": {"uv": [10, 15, 6, 14], "texture": "#texture", "cullface": "down"}, - "west": {"uv": [7, 14.25, 6, 14], "texture": "#texture", "cullface": "down"}, - "down": {"uv": [10, 15, 6, 14], "texture": "#texture", "cullface": "down"} + "east": {"uv": [10, 12, 11, 13], "rotation": 270, "texture": "#texture"}, + "south": {"uv": [5, 12, 11, 13], "texture": "#texture"}, + "west": {"uv": [5, 12, 6, 13], "rotation": 90, "texture": "#texture"}, + "down": {"uv": [5, 12, 11, 13], "texture": "#texture"} } } ], @@ -154,6 +132,8 @@ { "name": "oak_trapdoor_open", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3, 4, 5, 6] - }, 7, 8] + } + ] } \ No newline at end of file diff --git a/assets/minecraft/models/block/birch_trapdoor_open.json b/assets/minecraft/models/block/birch_trapdoor_open.json index 2df4bd8..aa86e56 100644 --- a/assets/minecraft/models/block/birch_trapdoor_open.json +++ b/assets/minecraft/models/block/birch_trapdoor_open.json @@ -1,5 +1,6 @@ { "parent": "block/template_orientable_trapdoor_open", + "ambientocclusion": false, "textures": { "texture": "block/birch_trapdoor" }, @@ -11,11 +12,11 @@ "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 21]}, "faces": { "north": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [13, 0, 16, 3], "rotation": 180, "texture": "#texture", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#texture", "cullface": "south"}, - "west": {"uv": [0, 0, 3, 3], "rotation": 180, "texture": "#texture", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 3], "texture": "#texture", "cullface": "south"}, - "down": {"uv": [0, 0, 16, 3], "texture": "#texture", "cullface": "down"} + "east": {"uv": [13, 0, 16, 3], "rotation": 180, "texture": "#texture"}, + "south": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#texture"}, + "west": {"uv": [0, 0, 3, 3], "rotation": 180, "texture": "#texture"}, + "up": {"uv": [0, 0, 16, 3], "texture": "#texture"}, + "down": {"uv": [0, 0, 16, 3], "texture": "#texture"} } }, { @@ -25,11 +26,11 @@ "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 21]}, "faces": { "north": {"uv": [16, 13, 0, 16], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [13, 13, 16, 16], "rotation": 180, "texture": "#texture", "cullface": "east"}, - "south": {"uv": [0, 13, 16, 16], "rotation": 180, "texture": "#texture", "cullface": "south"}, - "west": {"uv": [16, 0, 13, 3], "rotation": 90, "texture": "#texture", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#texture", "cullface": "up"}, - "down": {"uv": [0, 13, 16, 16], "texture": "#texture", "cullface": "up"} + "east": {"uv": [13, 13, 16, 16], "rotation": 180, "texture": "#texture"}, + "south": {"uv": [0, 13, 16, 16], "rotation": 180, "texture": "#texture"}, + "west": {"uv": [16, 0, 13, 3], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [0, 13, 16, 16], "texture": "#texture"} } }, { @@ -39,8 +40,8 @@ "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 21]}, "faces": { "north": {"uv": [13, 3, 16, 13], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [13, 3, 16, 13], "rotation": 180, "texture": "#texture", "cullface": "east"}, - "south": {"uv": [0, 3, 3, 13], "rotation": 180, "texture": "#texture", "cullface": "south"}, + "east": {"uv": [13, 3, 16, 13], "rotation": 180, "texture": "#texture"}, + "south": {"uv": [0, 3, 3, 13], "rotation": 180, "texture": "#texture"}, "west": {"uv": [0, 13, 3, 3], "texture": "#texture"} } }, @@ -52,8 +53,8 @@ "faces": { "north": {"uv": [0, 3, 3, 13], "rotation": 180, "texture": "#texture"}, "east": {"uv": [13, 3, 16, 13], "texture": "#texture"}, - "south": {"uv": [13, 3, 16, 13], "rotation": 180, "texture": "#texture", "cullface": "south"}, - "west": {"uv": [3, 0, 13, 3], "rotation": 90, "texture": "#texture", "cullface": "west"} + "south": {"uv": [13, 3, 16, 13], "rotation": 180, "texture": "#texture"}, + "west": {"uv": [3, 0, 13, 3], "rotation": 90, "texture": "#texture"} } }, { @@ -62,7 +63,7 @@ "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 21]}, "faces": { "north": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#texture"}, - "south": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#texture", "cullface": "south"} + "south": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#texture"} } }, { @@ -70,10 +71,10 @@ "to": [11, 13, 16], "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 21]}, "faces": { - "east": {"uv": [5, 12, 6, 13], "rotation": 180, "texture": "#texture", "cullface": "south"}, - "south": {"uv": [5, 12, 11, 13], "rotation": 180, "texture": "#texture", "cullface": "south"}, - "west": {"uv": [10, 12, 11, 13], "rotation": 180, "texture": "#texture", "cullface": "south"}, - "down": {"uv": [5, 12, 11, 13], "rotation": 180, "texture": "#texture", "cullface": "south"} + "east": {"uv": [5, 12, 6, 13], "rotation": 180, "texture": "#texture"}, + "south": {"uv": [5, 12, 11, 13], "rotation": 180, "texture": "#texture"}, + "west": {"uv": [10, 12, 11, 13], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [5, 12, 11, 13], "rotation": 180, "texture": "#texture"} } }, { @@ -86,30 +87,6 @@ "west": {"uv": [5, 12, 6, 13], "rotation": 180, "texture": "#texture"}, "down": {"uv": [5, 12, 11, 13], "texture": "#texture"} } - }, - { - "from": [6, 14, 16], - "to": [10, 15, 16.25], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 21]}, - "faces": { - "east": {"uv": [6, 14, 7, 14.25], "rotation": 270, "texture": "#texture", "cullface": "south"}, - "south": {"uv": [6, 14, 10, 15], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [6, 14, 7, 14.25], "rotation": 90, "texture": "#texture", "cullface": "south"}, - "up": {"uv": [6, 14, 10, 15], "texture": "#texture", "cullface": "south"}, - "down": {"uv": [6, 14, 10, 15], "texture": "#texture", "cullface": "south"} - } - }, - { - "from": [6, 14, 12.75], - "to": [10, 15, 13], - "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 21]}, - "faces": { - "north": {"uv": [10, 15, 6, 14], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [7, 14.25, 6, 14], "rotation": 270, "texture": "#texture"}, - "west": {"uv": [7, 14.25, 6, 14], "rotation": 90, "texture": "#texture"}, - "up": {"uv": [10, 15, 6, 14], "texture": "#texture"}, - "down": {"uv": [10, 15, 6, 14], "texture": "#texture"} - } } ], "display": { @@ -157,8 +134,6 @@ "origin": [8, 8, 8], "color": 0, "children": [0, 1, 2, 3, 4, 5, 6] - }, - 7, - 8 + } ] } \ No newline at end of file diff --git a/assets/minecraft/models/block/birch_trapdoor_top.json b/assets/minecraft/models/block/birch_trapdoor_top.json index 2b8ca75..7a60b2d 100644 --- a/assets/minecraft/models/block/birch_trapdoor_top.json +++ b/assets/minecraft/models/block/birch_trapdoor_top.json @@ -1,6 +1,6 @@ { - "credit": "Made with Blockbench - Made/edited by RyanGar46", "parent": "block/template_orientable_trapdoor_open", + "ambientocclusion": false, "textures": { "texture": "block/birch_trapdoor" }, @@ -11,10 +11,10 @@ "to": [16, 16, 16], "faces": { "north": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [13, 0, 16, 3], "rotation": 270, "texture": "#texture", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 3], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#texture", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#texture", "cullface": "up"}, + "east": {"uv": [13, 0, 16, 3], "rotation": 270, "texture": "#texture"}, + "south": {"uv": [0, 0, 16, 3], "texture": "#texture"}, + "west": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#texture"}, "down": {"uv": [0, 0, 16, 3], "texture": "#texture"} } }, @@ -23,11 +23,11 @@ "from": [0, 13, 0], "to": [16, 16, 3], "faces": { - "north": {"uv": [0, 0, 16, 3], "texture": "#texture", "cullface": "north"}, - "east": {"uv": [13, 13, 16, 16], "rotation": 270, "texture": "#texture", "cullface": "east"}, + "north": {"uv": [0, 0, 16, 3], "texture": "#texture"}, + "east": {"uv": [13, 13, 16, 16], "rotation": 270, "texture": "#texture"}, "south": {"uv": [0, 13, 16, 16], "texture": "#texture"}, - "west": {"uv": [16, 0, 13, 3], "texture": "#texture", "cullface": "west"}, - "up": {"uv": [0, 13, 16, 16], "rotation": 180, "texture": "#texture", "cullface": "up"}, + "west": {"uv": [16, 0, 13, 3], "texture": "#texture"}, + "up": {"uv": [0, 13, 16, 16], "rotation": 180, "texture": "#texture"}, "down": {"uv": [16, 13, 0, 16], "texture": "#texture"} } }, @@ -36,9 +36,9 @@ "from": [13, 13, 3], "to": [16, 16, 13], "faces": { - "east": {"uv": [13, 3, 16, 13], "rotation": 270, "texture": "#texture", "cullface": "east"}, + "east": {"uv": [13, 3, 16, 13], "rotation": 270, "texture": "#texture"}, "west": {"uv": [0, 13, 3, 3], "rotation": 270, "texture": "#texture"}, - "up": {"uv": [0, 3, 3, 13], "rotation": 180, "texture": "#texture", "cullface": "up"}, + "up": {"uv": [0, 3, 3, 13], "rotation": 180, "texture": "#texture"}, "down": {"uv": [13, 3, 16, 13], "texture": "#texture"} } }, @@ -48,8 +48,8 @@ "to": [3, 16, 13], "faces": { "east": {"uv": [13, 3, 16, 13], "rotation": 90, "texture": "#texture"}, - "west": {"uv": [3, 0, 13, 3], "texture": "#texture", "cullface": "west"}, - "up": {"uv": [13, 3, 16, 13], "rotation": 180, "texture": "#texture", "cullface": "up"}, + "west": {"uv": [3, 0, 13, 3], "texture": "#texture"}, + "up": {"uv": [13, 3, 16, 13], "rotation": 180, "texture": "#texture"}, "down": {"uv": [0, 3, 3, 13], "texture": "#texture"} } }, @@ -57,7 +57,7 @@ "from": [3, 14, 3], "to": [13, 15, 13], "faces": { - "up": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#texture", "cullface": "up"}, + "up": {"uv": [3, 3, 13, 13], "rotation": 180, "texture": "#texture"}, "down": {"uv": [3, 3, 13, 13], "texture": "#texture"} } }, @@ -65,10 +65,10 @@ "from": [5, 15, 3], "to": [11, 16, 4], "faces": { - "east": {"uv": [5, 12, 6, 13], "rotation": 270, "texture": "#texture", "cullface": "up"}, - "south": {"uv": [5, 12, 11, 13], "rotation": 180, "texture": "#texture", "cullface": "up"}, - "west": {"uv": [10, 12, 11, 13], "rotation": 90, "texture": "#texture", "cullface": "up"}, - "up": {"uv": [5, 12, 11, 13], "rotation": 180, "texture": "#texture", "cullface": "up"} + "east": {"uv": [5, 12, 6, 13], "rotation": 270, "texture": "#texture"}, + "south": {"uv": [5, 12, 11, 13], "rotation": 180, "texture": "#texture"}, + "west": {"uv": [10, 12, 11, 13], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [5, 12, 11, 13], "rotation": 180, "texture": "#texture"} } }, { @@ -80,30 +80,6 @@ "west": {"uv": [5, 12, 6, 13], "rotation": 90, "texture": "#texture"}, "down": {"uv": [5, 12, 11, 13], "texture": "#texture"} } - }, - { - "from": [6, 16, 1], - "to": [10, 16.25, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, - "faces": { - "north": {"uv": [6, 14, 10, 15], "rotation": 180, "texture": "#texture", "cullface": "up"}, - "east": {"uv": [6, 14, 7, 14.25], "texture": "#texture", "cullface": "up"}, - "south": {"uv": [6, 14, 10, 15], "texture": "#texture", "cullface": "up"}, - "west": {"uv": [6, 14, 7, 14.25], "texture": "#texture", "cullface": "up"}, - "up": {"uv": [6, 14, 10, 15], "texture": "#texture", "cullface": "up"} - } - }, - { - "from": [6, 12.75, 1], - "to": [10, 13, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, - "faces": { - "north": {"uv": [10, 15, 6, 14], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [7, 14.25, 6, 14], "texture": "#texture"}, - "south": {"uv": [10, 15, 6, 14], "texture": "#texture"}, - "west": {"uv": [7, 14.25, 6, 14], "texture": "#texture"}, - "down": {"uv": [10, 15, 6, 14], "texture": "#texture"} - } } ], "display": { @@ -149,6 +125,8 @@ { "name": "oak_trapdoor_open", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3, 4, 5, 6] - }, 7, 8] + } + ] } \ No newline at end of file diff --git a/assets/minecraft/models/block/crimson_door_bottom.json b/assets/minecraft/models/block/crimson_door_bottom.json index 705f2e6..9aa1ac7 100644 --- a/assets/minecraft/models/block/crimson_door_bottom.json +++ b/assets/minecraft/models/block/crimson_door_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/template_door_bottom", "textures": { "bottomright": "minecraft:block/crimson_door_bottom2", "bottom": "minecraft:block/crimson_door_bottom", diff --git a/assets/minecraft/models/block/crimson_door_bottom_hinge.json b/assets/minecraft/models/block/crimson_door_bottom_hinge.json index 6b23c4b..084ad20 100644 --- a/assets/minecraft/models/block/crimson_door_bottom_hinge.json +++ b/assets/minecraft/models/block/crimson_door_bottom_hinge.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/template_door_bottom_rh", "textures": { "bottomright": "minecraft:block/crimson_door_bottom", "bottom": "minecraft:block/crimson_door_bottom2", diff --git a/assets/minecraft/models/block/crimson_door_top.json b/assets/minecraft/models/block/crimson_door_top.json index d83589c..48b05a5 100644 --- a/assets/minecraft/models/block/crimson_door_top.json +++ b/assets/minecraft/models/block/crimson_door_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/template_door_top", "textures": { "top": "minecraft:block/crimson_door_top", "topright": "minecraft:block/crimson_door_top2", diff --git a/assets/minecraft/models/block/crimson_door_top_hinge.json b/assets/minecraft/models/block/crimson_door_top_hinge.json index 855a7ee..b1a8870 100644 --- a/assets/minecraft/models/block/crimson_door_top_hinge.json +++ b/assets/minecraft/models/block/crimson_door_top_hinge.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/template_door_top_rh", "textures": { "top": "minecraft:block/crimson_door_top2", "topright": "minecraft:block/crimson_door_top", diff --git a/assets/minecraft/models/block/crimson_trapdoor_bottom.json b/assets/minecraft/models/block/crimson_trapdoor_bottom.json index c09f7c6..be9cb56 100644 --- a/assets/minecraft/models/block/crimson_trapdoor_bottom.json +++ b/assets/minecraft/models/block/crimson_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench - Made/edited by RyanGar46", + "ambientocclusion":false, "parent": "block/template_orientable_trapdoor_bottom", "textures": { "particle": "block/crimson_trapdoor", diff --git a/assets/minecraft/models/block/crimson_trapdoor_open.json b/assets/minecraft/models/block/crimson_trapdoor_open.json index ec15516..23228c6 100644 --- a/assets/minecraft/models/block/crimson_trapdoor_open.json +++ b/assets/minecraft/models/block/crimson_trapdoor_open.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench - Made/edited by RyanGar46", + "ambientocclusion":false, "parent": "block/template_orientable_trapdoor_bottom", "textures": { "particle": "block/crimson_trapdoor", diff --git a/assets/minecraft/models/block/crimson_trapdoor_top.json b/assets/minecraft/models/block/crimson_trapdoor_top.json index 923f831..2360abf 100644 --- a/assets/minecraft/models/block/crimson_trapdoor_top.json +++ b/assets/minecraft/models/block/crimson_trapdoor_top.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench - Made/edited by RyanGar46", + "ambientocclusion":false, "parent": "block/template_orientable_trapdoor_bottom", "textures": { "particle": "block/crimson_trapdoor", diff --git a/assets/minecraft/models/block/dark_oak_door_bottom.json b/assets/minecraft/models/block/dark_oak_door_bottom.json index fad6a13..ae14e80 100644 --- a/assets/minecraft/models/block/dark_oak_door_bottom.json +++ b/assets/minecraft/models/block/dark_oak_door_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/template_door_bottom", "textures": { "bottomright": "minecraft:block/dark_oak_door_bottom2", "bottom": "minecraft:block/dark_oak_door_bottom", diff --git a/assets/minecraft/models/block/dark_oak_door_bottom_hinge.json b/assets/minecraft/models/block/dark_oak_door_bottom_hinge.json index 84a2d63..eeefb49 100644 --- a/assets/minecraft/models/block/dark_oak_door_bottom_hinge.json +++ b/assets/minecraft/models/block/dark_oak_door_bottom_hinge.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/template_door_bottom_rh", "textures": { "bottomright": "minecraft:block/dark_oak_door_bottom", "bottom": "minecraft:block/dark_oak_door_bottom2", diff --git a/assets/minecraft/models/block/dark_oak_door_top.json b/assets/minecraft/models/block/dark_oak_door_top.json index 616e08e..9beb328 100644 --- a/assets/minecraft/models/block/dark_oak_door_top.json +++ b/assets/minecraft/models/block/dark_oak_door_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/template_door_top", "textures": { "top": "minecraft:block/dark_oak_door_top", "topright": "minecraft:block/dark_oak_door_top2", diff --git a/assets/minecraft/models/block/dark_oak_door_top_hinge.json b/assets/minecraft/models/block/dark_oak_door_top_hinge.json index d241175..e71016e 100644 --- a/assets/minecraft/models/block/dark_oak_door_top_hinge.json +++ b/assets/minecraft/models/block/dark_oak_door_top_hinge.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/template_door_top_rh", "textures": { "top": "minecraft:block/dark_oak_door_top2", "topright": "minecraft:block/dark_oak_door_top", diff --git a/assets/minecraft/models/block/dark_oak_trapdoor_bottom.json b/assets/minecraft/models/block/dark_oak_trapdoor_bottom.json deleted file mode 100644 index aa76112..0000000 --- a/assets/minecraft/models/block/dark_oak_trapdoor_bottom.json +++ /dev/null @@ -1,127 +0,0 @@ -{ - "credit": "Made with Blockbench - Made/edited by RyanGar46", - "parent": "block/thin_block", - "textures": { - "1": "block/dark_oak_trapdoor", - "particle": "block/dark_oak_trapdoor" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 3, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -5, 8]}, - "faces": { - "north": {"uv": [0, 16, 16, 13], "texture": "#1", "cullface": "north"}, - "east": {"uv": [15, 13, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 13, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 13, 1, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#1"}, - "down": {"uv": [0, 15, 16, 16], "texture": "#1", "cullface": "down"} - } - }, - { - "from": [0, 0, 15], - "to": [16, 3, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -5, 8]}, - "faces": { - "north": {"uv": [0, 13, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 13, 1, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 16, 16, 13], "texture": "#1", "cullface": "south"}, - "west": {"uv": [15, 13, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 15, 16, 16], "texture": "#1"}, - "down": {"uv": [0, 0, 16, 1], "texture": "#1", "cullface": "down"} - } - }, - { - "from": [0, 0, 1], - "to": [1, 3, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -5, 8]}, - "faces": { - "east": {"uv": [1, 13, 15, 16], "texture": "#1"}, - "west": {"uv": [1, 16, 15, 13], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 1, 1, 15], "texture": "#1"}, - "down": {"uv": [0, 1, 1, 15], "texture": "#1", "cullface": "down"} - } - }, - { - "from": [15, 0, 1], - "to": [16, 3, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -5, 8]}, - "faces": { - "east": {"uv": [1, 16, 15, 13], "texture": "#1", "cullface": "east"}, - "west": {"uv": [1, 13, 15, 16], "texture": "#1"}, - "up": {"uv": [15, 1, 16, 15], "texture": "#1"}, - "down": {"uv": [15, 1, 16, 15], "texture": "#1", "cullface": "down"} - } - }, - { - "from": [7, 0, 1], - "to": [9, 3, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -5, 8]}, - "faces": { - "east": {"uv": [1, 13, 15, 16], "texture": "#1"}, - "west": {"uv": [1, 13, 15, 16], "texture": "#1"}, - "up": {"uv": [7, 1, 9, 15], "texture": "#1"}, - "down": {"uv": [7, 1, 9, 15], "texture": "#1", "cullface": "down"} - } - }, - { - "from": [1, 0, 7], - "to": [7, 3, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -5, 8]}, - "faces": { - "north": {"uv": [2, 13, 8, 16], "texture": "#1"}, - "south": {"uv": [2, 13, 8, 16], "texture": "#1"}, - "up": {"uv": [1, 7, 7, 9], "texture": "#1"}, - "down": {"uv": [1, 7, 7, 9], "texture": "#1", "cullface": "down"} - } - }, - { - "from": [9, 0, 7], - "to": [15, 3, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -5, 8]}, - "faces": { - "north": {"uv": [10, 13, 16, 16], "texture": "#1"}, - "south": {"uv": [10, 13, 16, 16], "texture": "#1"}, - "up": {"uv": [9, 7, 15, 9], "texture": "#1"}, - "down": {"uv": [9, 7, 15, 9], "texture": "#1", "cullface": "down"} - } - }, - { - "from": [9, 0.5, 1], - "to": [15, 2.5, 7], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -5, 8]}, - "faces": { - "up": {"uv": [9, 1, 15, 7], "texture": "#1"}, - "down": {"uv": [9, 9, 15, 15], "texture": "#1", "cullface": "down"} - } - }, - { - "from": [1, 0.5, 1], - "to": [7, 2.5, 7], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -5, 8]}, - "faces": { - "up": {"uv": [1, 1, 7, 7], "texture": "#1"}, - "down": {"uv": [1, 9, 7, 15], "texture": "#1", "cullface": "down"} - } - }, - { - "from": [1, 0.5, 9], - "to": [7, 2.5, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -5, 8]}, - "faces": { - "up": {"uv": [1, 9, 7, 15], "texture": "#1"}, - "down": {"uv": [1, 1, 7, 7], "texture": "#1", "cullface": "down"} - } - }, - { - "from": [9, 0.5, 9], - "to": [15, 2.5, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -5, 8]}, - "faces": { - "up": {"uv": [9, 9, 15, 15], "texture": "#1"}, - "down": {"uv": [9, 1, 15, 7], "texture": "#1", "cullface": "down"} - } - } - ] -} \ No newline at end of file diff --git a/assets/minecraft/models/block/dark_oak_trapdoor_open.json b/assets/minecraft/models/block/dark_oak_trapdoor_open.json deleted file mode 100644 index aa3895f..0000000 --- a/assets/minecraft/models/block/dark_oak_trapdoor_open.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "credit": "Made with Blockbench - Made/edited by RyanGar46", - "parent": "block/thin_block", - "textures": { - "1": "block/dark_oak_trapdoor", - "particle": "block/dark_oak_trapdoor" - }, - "elements": [ - { - "from": [0, 15, 13], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 15, 16, 16], "rotation": 180, "texture": "#1"}, - "east": {"uv": [15, 13, 16, 16], "rotation": 270, "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 1], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 13, 1, 16], "rotation": 90, "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 16, 16, 13], "rotation": 180, "texture": "#1", "cullface": "up"}, - "down": {"uv": [0, 13, 16, 16], "texture": "#1"} - } - }, - { - "from": [0, 0, 13], - "to": [16, 1, 16], - "faces": { - "north": {"uv": [0, 0, 16, 1], "rotation": 180, "texture": "#1"}, - "east": {"uv": [0, 13, 1, 16], "rotation": 270, "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 15, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [15, 13, 16, 16], "rotation": 90, "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 13, 16, 16], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 16, 16, 13], "texture": "#1", "cullface": "down"} - } - }, - { - "from": [0, 1, 13], - "to": [1, 15, 16], - "faces": { - "north": {"uv": [0, 1, 1, 15], "rotation": 180, "texture": "#1"}, - "east": {"uv": [1, 13, 15, 16], "rotation": 270, "texture": "#1"}, - "south": {"uv": [0, 1, 1, 15], "texture": "#1", "cullface": "south"}, - "west": {"uv": [1, 16, 15, 13], "rotation": 90, "texture": "#1", "cullface": "west"} - } - }, - { - "from": [15, 1, 13], - "to": [16, 15, 16], - "faces": { - "north": {"uv": [15, 1, 16, 15], "rotation": 180, "texture": "#1"}, - "east": {"uv": [1, 16, 15, 13], "rotation": 270, "texture": "#1", "cullface": "east"}, - "south": {"uv": [15, 1, 16, 15], "texture": "#1", "cullface": "south"}, - "west": {"uv": [1, 13, 15, 16], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [7, 1, 13], - "to": [9, 15, 16], - "faces": { - "north": {"uv": [7, 1, 9, 15], "rotation": 180, "texture": "#1"}, - "east": {"uv": [1, 13, 15, 16], "rotation": 270, "texture": "#1"}, - "south": {"uv": [7, 1, 9, 15], "texture": "#1", "cullface": "south"}, - "west": {"uv": [1, 13, 15, 16], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [1, 7, 13], - "to": [7, 9, 16], - "faces": { - "north": {"uv": [1, 7, 7, 9], "rotation": 180, "texture": "#1"}, - "south": {"uv": [1, 7, 7, 9], "texture": "#1", "cullface": "south"}, - "up": {"uv": [2, 13, 8, 16], "rotation": 180, "texture": "#1"}, - "down": {"uv": [2, 13, 8, 16], "texture": "#1"} - } - }, - { - "from": [9, 7, 13], - "to": [15, 9, 16], - "faces": { - "north": {"uv": [9, 7, 15, 9], "rotation": 180, "texture": "#1"}, - "south": {"uv": [9, 7, 15, 9], "texture": "#1", "cullface": "south"}, - "up": {"uv": [10, 13, 16, 16], "rotation": 180, "texture": "#1"}, - "down": {"uv": [10, 13, 16, 16], "texture": "#1"} - } - }, - { - "from": [9, 9, 13.5], - "to": [15, 15, 15.5], - "faces": { - "north": {"uv": [9, 9, 15, 15], "rotation": 180, "texture": "#1"}, - "south": {"uv": [9, 1, 15, 7], "texture": "#1", "cullface": "south"} - } - }, - { - "from": [1, 9, 13.5], - "to": [7, 15, 15.5], - "faces": { - "north": {"uv": [1, 9, 7, 15], "rotation": 180, "texture": "#1"}, - "south": {"uv": [1, 1, 7, 7], "texture": "#1", "cullface": "south"} - } - }, - { - "from": [1, 1, 13.5], - "to": [7, 7, 15.5], - "faces": { - "north": {"uv": [1, 1, 7, 7], "rotation": 180, "texture": "#1"}, - "south": {"uv": [1, 9, 7, 15], "texture": "#1", "cullface": "south"} - } - }, - { - "from": [9, 1, 13.5], - "to": [15, 7, 15.5], - "faces": { - "north": {"uv": [9, 1, 15, 7], "rotation": 180, "texture": "#1"}, - "south": {"uv": [9, 9, 15, 15], "texture": "#1", "cullface": "south"} - } - } - ] -} \ No newline at end of file diff --git a/assets/minecraft/models/block/dark_oak_trapdoor_top.json b/assets/minecraft/models/block/dark_oak_trapdoor_top.json deleted file mode 100644 index f603865..0000000 --- a/assets/minecraft/models/block/dark_oak_trapdoor_top.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "credit": "Made with Blockbench - Made/edited by RyanGar46", - "parent": "block/thin_block", - "textures": { - "1": "block/dark_oak_trapdoor", - "particle": "block/dark_oak_trapdoor" - }, - "elements": [ - { - "from": [0, 13, 0], - "to": [16, 16, 1], - "faces": { - "north": {"uv": [0, 16, 16, 13], "texture": "#1", "cullface": "north"}, - "east": {"uv": [15, 13, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 13, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 13, 1, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 1], "texture": "#1", "cullface": "up"}, - "down": {"uv": [0, 15, 16, 16], "texture": "#1"} - } - }, - { - "from": [0, 13, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 13, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 13, 1, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 16, 16, 13], "texture": "#1", "cullface": "south"}, - "west": {"uv": [15, 13, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 15, 16, 16], "texture": "#1", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 1], "texture": "#1"} - } - }, - { - "from": [0, 13, 1], - "to": [1, 16, 15], - "faces": { - "east": {"uv": [1, 13, 15, 16], "texture": "#1"}, - "west": {"uv": [1, 16, 15, 13], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 1, 1, 15], "texture": "#1", "cullface": "up"}, - "down": {"uv": [0, 1, 1, 15], "texture": "#1"} - } - }, - { - "from": [15, 13, 1], - "to": [16, 16, 15], - "faces": { - "east": {"uv": [1, 16, 15, 13], "texture": "#1", "cullface": "east"}, - "west": {"uv": [1, 13, 15, 16], "texture": "#1"}, - "up": {"uv": [15, 1, 16, 15], "texture": "#1", "cullface": "up"}, - "down": {"uv": [15, 1, 16, 15], "texture": "#1"} - } - }, - { - "from": [7, 13, 1], - "to": [9, 16, 15], - "faces": { - "east": {"uv": [1, 13, 15, 16], "texture": "#1"}, - "west": {"uv": [1, 13, 15, 16], "texture": "#1"}, - "up": {"uv": [7, 1, 9, 15], "texture": "#1", "cullface": "up"}, - "down": {"uv": [7, 1, 9, 15], "texture": "#1"} - } - }, - { - "from": [1, 13, 7], - "to": [7, 16, 9], - "faces": { - "north": {"uv": [2, 13, 8, 16], "texture": "#1"}, - "south": {"uv": [2, 13, 8, 16], "texture": "#1"}, - "up": {"uv": [1, 7, 7, 9], "texture": "#1", "cullface": "up"}, - "down": {"uv": [1, 7, 7, 9], "texture": "#1"} - } - }, - { - "from": [9, 13, 7], - "to": [15, 16, 9], - "faces": { - "north": {"uv": [10, 13, 16, 16], "texture": "#1"}, - "south": {"uv": [10, 13, 16, 16], "texture": "#1"}, - "up": {"uv": [9, 7, 15, 9], "texture": "#1", "cullface": "up"}, - "down": {"uv": [9, 7, 15, 9], "texture": "#1"} - } - }, - { - "from": [9, 13.5, 1], - "to": [15, 15.5, 7], - "faces": { - "up": {"uv": [9, 1, 15, 7], "texture": "#1", "cullface": "up"}, - "down": {"uv": [9, 9, 15, 15], "texture": "#1"} - } - }, - { - "from": [1, 13.5, 1], - "to": [7, 15.5, 7], - "faces": { - "up": {"uv": [1, 1, 7, 7], "texture": "#1", "cullface": "up"}, - "down": {"uv": [1, 9, 7, 15], "texture": "#1"} - } - }, - { - "from": [1, 13.5, 9], - "to": [7, 15.5, 15], - "faces": { - "up": {"uv": [1, 9, 7, 15], "texture": "#1", "cullface": "up"}, - "down": {"uv": [1, 1, 7, 7], "texture": "#1"} - } - }, - { - "from": [9, 13.5, 9], - "to": [15, 15.5, 15], - "faces": { - "up": {"uv": [9, 9, 15, 15], "texture": "#1", "cullface": "up"}, - "down": {"uv": [9, 1, 15, 7], "texture": "#1"} - } - } - ] -} \ No newline at end of file diff --git a/assets/minecraft/models/block/detector_rail.json b/assets/minecraft/models/block/detector_rail.json index 4421cc7..8182139 100644 --- a/assets/minecraft/models/block/detector_rail.json +++ b/assets/minecraft/models/block/detector_rail.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "textures": { "rail_3d": "3d/rails/rail", diff --git a/assets/minecraft/models/block/detector_rail_on.json b/assets/minecraft/models/block/detector_rail_on.json index 1cdf2ae..fd3fac4 100644 --- a/assets/minecraft/models/block/detector_rail_on.json +++ b/assets/minecraft/models/block/detector_rail_on.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "parent": "block/detector_rail", "textures": { diff --git a/assets/minecraft/models/block/detector_rail_on_raised_ne.json b/assets/minecraft/models/block/detector_rail_on_raised_ne.json index 622762f..b88dc89 100644 --- a/assets/minecraft/models/block/detector_rail_on_raised_ne.json +++ b/assets/minecraft/models/block/detector_rail_on_raised_ne.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "parent": "block/detector_rail_raised_ne", "textures": { diff --git a/assets/minecraft/models/block/detector_rail_on_raised_sw.json b/assets/minecraft/models/block/detector_rail_on_raised_sw.json index 81ae5af..92b6838 100644 --- a/assets/minecraft/models/block/detector_rail_on_raised_sw.json +++ b/assets/minecraft/models/block/detector_rail_on_raised_sw.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "parent": "block/detector_rail_raised_sw", "textures": { diff --git a/assets/minecraft/models/block/detector_rail_raised_ne.json b/assets/minecraft/models/block/detector_rail_raised_ne.json index 5896d24..8ea3925 100644 --- a/assets/minecraft/models/block/detector_rail_raised_ne.json +++ b/assets/minecraft/models/block/detector_rail_raised_ne.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "textures": { "rail_3d": "3d/rails/rail", diff --git a/assets/minecraft/models/block/detector_rail_raised_sw.json b/assets/minecraft/models/block/detector_rail_raised_sw.json index df1eec1..24bd306 100644 --- a/assets/minecraft/models/block/detector_rail_raised_sw.json +++ b/assets/minecraft/models/block/detector_rail_raised_sw.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "textures": { "rail_3d": "3d/rails/rail", diff --git a/assets/minecraft/models/block/iron_door_bottom.json b/assets/minecraft/models/block/iron_door_bottom.json index 3500dab..a655aae 100644 --- a/assets/minecraft/models/block/iron_door_bottom.json +++ b/assets/minecraft/models/block/iron_door_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/template_door_bottom", "textures": { "bottomright": "minecraft:block/iron_door_bottom2", "bottom": "minecraft:block/iron_door_bottom", diff --git a/assets/minecraft/models/block/iron_door_bottom_hinge.json b/assets/minecraft/models/block/iron_door_bottom_hinge.json index 08afa90..d305d29 100644 --- a/assets/minecraft/models/block/iron_door_bottom_hinge.json +++ b/assets/minecraft/models/block/iron_door_bottom_hinge.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/template_door_bottom_rh", "textures": { "bottomright": "minecraft:block/iron_door_bottom", "bottom": "minecraft:block/iron_door_bottom2", diff --git a/assets/minecraft/models/block/iron_door_top.json b/assets/minecraft/models/block/iron_door_top.json index e35f05a..8b4e6c1 100644 --- a/assets/minecraft/models/block/iron_door_top.json +++ b/assets/minecraft/models/block/iron_door_top.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "textures": { "6": "block/iron_door_top", diff --git a/assets/minecraft/models/block/iron_door_top_hinge.json b/assets/minecraft/models/block/iron_door_top_hinge.json index 608ed6f..3a480e1 100644 --- a/assets/minecraft/models/block/iron_door_top_hinge.json +++ b/assets/minecraft/models/block/iron_door_top_hinge.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "textures": { "6": "block/iron_door_top2", diff --git a/assets/minecraft/models/block/jungle_door_bottom.json b/assets/minecraft/models/block/jungle_door_bottom.json index 588482b..29ae37e 100644 --- a/assets/minecraft/models/block/jungle_door_bottom.json +++ b/assets/minecraft/models/block/jungle_door_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/template_door_bottom", "textures": { "bottomright": "minecraft:block/jungle_door_bottom2", "bottom": "minecraft:block/jungle_door_bottom", diff --git a/assets/minecraft/models/block/jungle_door_bottom_hinge.json b/assets/minecraft/models/block/jungle_door_bottom_hinge.json index 21baee6..2271887 100644 --- a/assets/minecraft/models/block/jungle_door_bottom_hinge.json +++ b/assets/minecraft/models/block/jungle_door_bottom_hinge.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/template_door_bottom_rh", "textures": { "bottomright": "minecraft:block/jungle_door_bottom", "bottom": "minecraft:block/jungle_door_bottom2", diff --git a/assets/minecraft/models/block/jungle_door_top.json b/assets/minecraft/models/block/jungle_door_top.json index a1b39f2..ea9796a 100644 --- a/assets/minecraft/models/block/jungle_door_top.json +++ b/assets/minecraft/models/block/jungle_door_top.json @@ -1,4 +1,5 @@ { + "ambientocclusion":false, "textures": { "4": "block/jungle_door_top2", "particle": "block/jungle_door_top2", diff --git a/assets/minecraft/models/block/jungle_door_top_hinge.json b/assets/minecraft/models/block/jungle_door_top_hinge.json index 20ca189..fd3b4d9 100644 --- a/assets/minecraft/models/block/jungle_door_top_hinge.json +++ b/assets/minecraft/models/block/jungle_door_top_hinge.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench", + "ambientocclusion":false, "textures": { "0": "block/jungle_door_top2", "1": "block/jungle_door_sides", diff --git a/assets/minecraft/models/block/jungle_trapdoor_bottom.json b/assets/minecraft/models/block/jungle_trapdoor_bottom.json index e4a4bde..2e71568 100644 --- a/assets/minecraft/models/block/jungle_trapdoor_bottom.json +++ b/assets/minecraft/models/block/jungle_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "credit": "Made with Blockbench - Made/edited by RyanGar46", "parent": "block/template_orientable_trapdoor_open", + "ambientocclusion": false, "textures": { "texture": "block/jungle_trapdoor" }, @@ -206,28 +206,6 @@ "up": {"uv": [9, 9, 10, 12], "rotation": 180, "texture": "#texture"}, "down": {"uv": [6, 9, 7, 12], "texture": "#texture", "cullface": "down"} } - }, - { - "from": [5, 3, 1], - "to": [11, 3.25, 2], - "faces": { - "north": {"uv": [5, 14, 11, 15], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [5, 14, 6, 14.25], "texture": "#texture"}, - "south": {"uv": [5, 14, 11, 15], "texture": "#texture"}, - "west": {"uv": [5, 14, 6, 14.25], "texture": "#texture"}, - "up": {"uv": [5, 14, 11, 15], "texture": "#texture"} - } - }, - { - "from": [5, -0.25, 1], - "to": [11, 0, 2], - "faces": { - "north": {"uv": [11, 15, 5, 14], "rotation": 180, "texture": "#texture", "cullface": "down"}, - "east": {"uv": [6, 14.25, 5, 14], "texture": "#texture", "cullface": "down"}, - "south": {"uv": [11, 15, 5, 14], "texture": "#texture", "cullface": "down"}, - "west": {"uv": [6, 14.25, 5, 14], "texture": "#texture", "cullface": "down"}, - "down": {"uv": [11, 15, 5, 14], "texture": "#texture", "cullface": "down"} - } } ], "display": { @@ -273,12 +251,15 @@ { "name": "birch_trapdoor_open", "origin": [8, 8, 8], + "color": 0, "children": [ { "name": "oak_trapdoor_open", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17] } ] - }, 18, 19] + } + ] } \ No newline at end of file diff --git a/assets/minecraft/models/block/jungle_trapdoor_open.json b/assets/minecraft/models/block/jungle_trapdoor_open.json index 6e0629d..4a52d95 100644 --- a/assets/minecraft/models/block/jungle_trapdoor_open.json +++ b/assets/minecraft/models/block/jungle_trapdoor_open.json @@ -1,6 +1,6 @@ { - "credit": "Made with Blockbench - Made/edited by RyanGar46", "parent": "block/template_orientable_trapdoor_open", + "ambientocclusion": false, "textures": { "texture": "block/jungle_trapdoor" }, @@ -188,28 +188,6 @@ "south": {"uv": [9, 9, 10, 12], "rotation": 180, "texture": "#texture", "cullface": "south"}, "west": {"uv": [12, 11, 15, 14], "rotation": 180, "texture": "#texture"} } - }, - { - "from": [5, 14, 16], - "to": [11, 15, 16.25], - "faces": { - "east": {"uv": [5, 14, 6, 14.25], "rotation": 270, "texture": "#texture", "cullface": "south"}, - "south": {"uv": [5, 14, 11, 15], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [5, 14, 6, 14.25], "rotation": 90, "texture": "#texture", "cullface": "south"}, - "up": {"uv": [5, 14, 11, 15], "texture": "#texture", "cullface": "south"}, - "down": {"uv": [5, 14, 11, 15], "texture": "#texture", "cullface": "south"} - } - }, - { - "from": [5, 14, 12.75], - "to": [11, 15, 13], - "faces": { - "north": {"uv": [11, 15, 5, 14], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [6, 14.25, 5, 14], "rotation": 270, "texture": "#texture"}, - "west": {"uv": [6, 14.25, 5, 14], "rotation": 90, "texture": "#texture"}, - "up": {"uv": [11, 15, 5, 14], "texture": "#texture"}, - "down": {"uv": [11, 15, 5, 14], "texture": "#texture"} - } } ], "display": { @@ -255,12 +233,15 @@ { "name": "birch_trapdoor_open", "origin": [8, 8, 8], + "color": 0, "children": [ { "name": "oak_trapdoor_open", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17] } ] - }, 18, 19] + } + ] } \ No newline at end of file diff --git a/assets/minecraft/models/block/jungle_trapdoor_top.json b/assets/minecraft/models/block/jungle_trapdoor_top.json index e6ba586..cf2299f 100644 --- a/assets/minecraft/models/block/jungle_trapdoor_top.json +++ b/assets/minecraft/models/block/jungle_trapdoor_top.json @@ -1,6 +1,6 @@ { - "credit": "Made with Blockbench - Made/edited by RyanGar46", "parent": "block/template_orientable_trapdoor_open", + "ambientocclusion": false, "textures": { "texture": "block/jungle_trapdoor" }, @@ -188,30 +188,6 @@ "up": {"uv": [9, 9, 10, 12], "rotation": 180, "texture": "#texture", "cullface": "up"}, "down": {"uv": [6, 9, 7, 12], "texture": "#texture"} } - }, - { - "from": [5, 16, 1], - "to": [11, 16.25, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, - "faces": { - "north": {"uv": [5, 14, 11, 15], "rotation": 180, "texture": "#texture", "cullface": "up"}, - "east": {"uv": [5, 14, 6, 14.25], "texture": "#texture", "cullface": "up"}, - "south": {"uv": [5, 14, 11, 15], "texture": "#texture", "cullface": "up"}, - "west": {"uv": [5, 14, 6, 14.25], "texture": "#texture", "cullface": "up"}, - "up": {"uv": [5, 14, 11, 15], "texture": "#texture", "cullface": "up"} - } - }, - { - "from": [5, 12.75, 1], - "to": [11, 13, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, - "faces": { - "north": {"uv": [11, 15, 5, 14], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [6, 14.25, 5, 14], "texture": "#texture"}, - "south": {"uv": [11, 15, 5, 14], "texture": "#texture"}, - "west": {"uv": [6, 14.25, 5, 14], "texture": "#texture"}, - "down": {"uv": [11, 15, 5, 14], "texture": "#texture"} - } } ], "display": { @@ -257,12 +233,15 @@ { "name": "birch_trapdoor_open", "origin": [8, 8, 8], + "color": 0, "children": [ { "name": "oak_trapdoor_open", "origin": [8, 8, 8], + "color": 0, "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17] } ] - }, 18, 19] + } + ] } \ No newline at end of file diff --git a/assets/minecraft/models/block/oak_door_bottom.json b/assets/minecraft/models/block/oak_door_bottom.json index 7482fdb..670ddb1 100644 --- a/assets/minecraft/models/block/oak_door_bottom.json +++ b/assets/minecraft/models/block/oak_door_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/template_door_bottom", "textures": { "bottomright": "minecraft:block/oak_door_bottom2", "bottom": "minecraft:block/oak_door_bottom", diff --git a/assets/minecraft/models/block/oak_door_bottom_hinge.json b/assets/minecraft/models/block/oak_door_bottom_hinge.json index 43a6363..daedf74 100644 --- a/assets/minecraft/models/block/oak_door_bottom_hinge.json +++ b/assets/minecraft/models/block/oak_door_bottom_hinge.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/template_door_bottom_rh", "textures": { "bottomright": "minecraft:block/oak_door_bottom", "bottom": "minecraft:block/oak_door_bottom2", diff --git a/assets/minecraft/models/block/oak_door_top.json b/assets/minecraft/models/block/oak_door_top.json index 5d15017..a3e3448 100644 --- a/assets/minecraft/models/block/oak_door_top.json +++ b/assets/minecraft/models/block/oak_door_top.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "textures": { "3": "block/oak_door_top2", diff --git a/assets/minecraft/models/block/oak_door_top_hinge.json b/assets/minecraft/models/block/oak_door_top_hinge.json index cbc9340..f8b4b86 100644 --- a/assets/minecraft/models/block/oak_door_top_hinge.json +++ b/assets/minecraft/models/block/oak_door_top_hinge.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "textures": { "3": "block/oak_door_top2", diff --git a/assets/minecraft/models/block/oak_trapdoor_bottom.json b/assets/minecraft/models/block/oak_trapdoor_bottom.json index 4fb78ac..52c1d0d 100644 --- a/assets/minecraft/models/block/oak_trapdoor_bottom.json +++ b/assets/minecraft/models/block/oak_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench - Made/edited by RyanGar46", + "ambientocclusion":false, "parent": "block/thin_block", "textures": { "particle": "block/oak_trapdoor" diff --git a/assets/minecraft/models/block/oak_trapdoor_open.json b/assets/minecraft/models/block/oak_trapdoor_open.json index abb4ed5..9dcc861 100644 --- a/assets/minecraft/models/block/oak_trapdoor_open.json +++ b/assets/minecraft/models/block/oak_trapdoor_open.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench - Made/edited by RyanGar46", + "ambientocclusion":false, "parent": "block/thin_block", "textures": { "particle": "block/oak_trapdoor" diff --git a/assets/minecraft/models/block/oak_trapdoor_top.json b/assets/minecraft/models/block/oak_trapdoor_top.json index b749a8c..352c263 100644 --- a/assets/minecraft/models/block/oak_trapdoor_top.json +++ b/assets/minecraft/models/block/oak_trapdoor_top.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench - Made/edited by RyanGar46", + "ambientocclusion":false, "parent": "block/thin_block", "textures": { "particle": "block/oak_trapdoor" diff --git a/assets/minecraft/models/block/piston_head.json b/assets/minecraft/models/block/piston_head.json index 0dc612b..6068811 100644 --- a/assets/minecraft/models/block/piston_head.json +++ b/assets/minecraft/models/block/piston_head.json @@ -1,4 +1,5 @@ { + "ambientocclusion":false, "textures": { "3": "block/piston_side", "4": "block/piston_top", diff --git a/assets/minecraft/models/block/piston_head_short.json b/assets/minecraft/models/block/piston_head_short.json new file mode 100644 index 0000000..490b1c5 --- /dev/null +++ b/assets/minecraft/models/block/piston_head_short.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/template_piston_head_short", + "textures": { + "platform": "minecraft:block/piston_top", + "side": "minecraft:block/piston_side", + "unsticky": "minecraft:block/piston_top" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/block/piston_head_short_sticky.json b/assets/minecraft/models/block/piston_head_short_sticky.json new file mode 100644 index 0000000..d4aa569 --- /dev/null +++ b/assets/minecraft/models/block/piston_head_short_sticky.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/template_piston_head_short", + "textures": { + "platform": "minecraft:block/piston_top_sticky", + "side": "minecraft:block/piston_side_sticky", + "unsticky": "minecraft:block/piston_top_sticky" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/block/piston_head_sticky.json b/assets/minecraft/models/block/piston_head_sticky.json index 91f12f4..ca4bda2 100644 --- a/assets/minecraft/models/block/piston_head_sticky.json +++ b/assets/minecraft/models/block/piston_head_sticky.json @@ -1,4 +1,5 @@ { + "ambientocclusion":false, "textures": { "3": "block/piston_side_sticky", "4": "block/piston_bottom_sticky", diff --git a/assets/minecraft/models/block/powered_rail.json b/assets/minecraft/models/block/powered_rail.json index 6e62b7a..6722c4c 100644 --- a/assets/minecraft/models/block/powered_rail.json +++ b/assets/minecraft/models/block/powered_rail.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "textures": { "particle": "block/powered_rail", diff --git a/assets/minecraft/models/block/powered_rail_on.json b/assets/minecraft/models/block/powered_rail_on.json index 865193e..a318898 100644 --- a/assets/minecraft/models/block/powered_rail_on.json +++ b/assets/minecraft/models/block/powered_rail_on.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "parent": "block/powered_rail", "textures": { diff --git a/assets/minecraft/models/block/powered_rail_on_raised_ne.json b/assets/minecraft/models/block/powered_rail_on_raised_ne.json index f908af6..8fced69 100644 --- a/assets/minecraft/models/block/powered_rail_on_raised_ne.json +++ b/assets/minecraft/models/block/powered_rail_on_raised_ne.json @@ -1,8 +1,7 @@ { "parent": "block/powered_rail_raised_ne", "ambientocclusion": false, - "credit": "Made with Blockbench", - "textures": { + "textures": { "particle": "block/powered_rail_on", "powered_rail": "block/powered_rail_on", "rail_3d": "3d/rails/rail", diff --git a/assets/minecraft/models/block/powered_rail_on_raised_sw.json b/assets/minecraft/models/block/powered_rail_on_raised_sw.json index 345b43e..e18df95 100644 --- a/assets/minecraft/models/block/powered_rail_on_raised_sw.json +++ b/assets/minecraft/models/block/powered_rail_on_raised_sw.json @@ -1,8 +1,7 @@ { "parent": "block/powered_rail_raised_sw", "ambientocclusion": false, - "credit": "Made with Blockbench", - "textures": { + "textures": { "particle": "block/powered_rail_on", "powered_rail": "block/powered_rail_on", "rail_3d": "3d/rails/rail", diff --git a/assets/minecraft/models/block/rail.json b/assets/minecraft/models/block/rail.json index 1e4662c..0e95ab9 100644 --- a/assets/minecraft/models/block/rail.json +++ b/assets/minecraft/models/block/rail.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "parent": "block/rail_flat", "textures": { diff --git a/assets/minecraft/models/block/rail_flat.json b/assets/minecraft/models/block/rail_flat.json index 2c6cd77..5b90f61 100644 --- a/assets/minecraft/models/block/rail_flat.json +++ b/assets/minecraft/models/block/rail_flat.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "ambientocclusion": false, "textures": { "particle": "3d/rails/rail", diff --git a/assets/minecraft/models/block/spruce_door_bottom.json b/assets/minecraft/models/block/spruce_door_bottom.json index c1cf92e..6b73924 100644 --- a/assets/minecraft/models/block/spruce_door_bottom.json +++ b/assets/minecraft/models/block/spruce_door_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/template_door_bottom", "textures": { "bottom": "minecraft:block/spruce_door_bottom", "side": "minecraft:block/spruce_door_sides", diff --git a/assets/minecraft/models/block/spruce_door_bottom_hinge.json b/assets/minecraft/models/block/spruce_door_bottom_hinge.json index 3cb59ac..d8da6c9 100644 --- a/assets/minecraft/models/block/spruce_door_bottom_hinge.json +++ b/assets/minecraft/models/block/spruce_door_bottom_hinge.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/template_door_bottom_rh", "textures": { "bottom": "minecraft:block/spruce_door_bottom2", "side": "minecraft:block/spruce_door_sides", diff --git a/assets/minecraft/models/block/spruce_door_top.json b/assets/minecraft/models/block/spruce_door_top.json index da3a709..49a29e5 100644 --- a/assets/minecraft/models/block/spruce_door_top.json +++ b/assets/minecraft/models/block/spruce_door_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/template_door_top", "textures": { "top": "minecraft:block/spruce_door_top", "side": "minecraft:block/spruce_door_sides", diff --git a/assets/minecraft/models/block/spruce_door_top_hinge.json b/assets/minecraft/models/block/spruce_door_top_hinge.json index ee55226..2e8dbad 100644 --- a/assets/minecraft/models/block/spruce_door_top_hinge.json +++ b/assets/minecraft/models/block/spruce_door_top_hinge.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/template_door_top_rh", "textures": { "top": "minecraft:block/spruce_door_top2", "side": "minecraft:block/spruce_door_sides", diff --git a/assets/minecraft/models/block/spruce_trapdoor_bottom.json b/assets/minecraft/models/block/spruce_trapdoor_bottom.json deleted file mode 100644 index 7d466af..0000000 --- a/assets/minecraft/models/block/spruce_trapdoor_bottom.json +++ /dev/null @@ -1,274 +0,0 @@ -{ - "credit": "Made with Blockbench - Made by Ryan Garrett - Models are for Classic 3D Only", - "parent": "block/thin_block", - "textures": { - "particle": "block/spruce_trapdoor", - "texture": "block/spruce_trapdoor" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 3, 16], - "faces": { - "north": {"uv": [0, 0, 16, 3], "texture": "#texture", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 3], "texture": "#texture", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 3], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 3], "texture": "#texture", "cullface": "west"}, - "up": {"uv": [0, 16, 16, 0], "texture": "#texture"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#texture", "cullface": "down"} - } - }, - { - "from": [0.01, 3, 3], - "to": [3.01, 3.25, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 10.25, 11]}, - "faces": { - "north": {"uv": [3, 12, 0, 13], "texture": "#texture"}, - "east": {"uv": [2, 12, 3, 13], "texture": "#texture"}, - "south": {"uv": [0, 12, 3, 13], "texture": "#texture"}, - "west": {"uv": [0, 12, 1, 13], "texture": "#texture"}, - "up": {"uv": [0, 12, 3, 13], "texture": "#texture"} - } - }, - { - "from": [0.01, 3, 12], - "to": [3.01, 3.25, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 10.25, 20]}, - "faces": { - "north": {"uv": [3, 3, 0, 4], "texture": "#texture"}, - "east": {"uv": [2, 3, 3, 4], "texture": "#texture"}, - "south": {"uv": [0, 3, 3, 4], "texture": "#texture"}, - "west": {"uv": [0, 3, 1, 4], "texture": "#texture"}, - "up": {"uv": [0, 3, 3, 4], "texture": "#texture"} - } - }, - { - "from": [12.99, 3, 12], - "to": [15.99, 3.25, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 10.25, 20]}, - "faces": { - "north": {"uv": [16, 3, 13, 4], "texture": "#texture"}, - "east": {"uv": [15, 3, 16, 4], "texture": "#texture"}, - "south": {"uv": [13, 3, 16, 4], "texture": "#texture"}, - "west": {"uv": [13, 3, 14, 4], "texture": "#texture"}, - "up": {"uv": [13, 3, 16, 4], "texture": "#texture"} - } - }, - { - "from": [12.99, 3, 3], - "to": [15.99, 3.25, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 10.25, 11]}, - "faces": { - "north": {"uv": [16, 12, 13, 13], "texture": "#texture"}, - "east": {"uv": [15, 12, 16, 13], "texture": "#texture"}, - "south": {"uv": [13, 12, 16, 13], "texture": "#texture"}, - "west": {"uv": [13, 12, 14, 13], "texture": "#texture"}, - "up": {"uv": [13, 12, 16, 13], "texture": "#texture"} - } - }, - { - "from": [4, 3, 3], - "to": [6, 3.25, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 10.25, 11]}, - "faces": { - "north": {"uv": [6, 12, 4, 13], "texture": "#texture"}, - "east": {"uv": [5, 12, 6, 13], "texture": "#texture"}, - "south": {"uv": [4, 12, 6, 13], "texture": "#texture"}, - "west": {"uv": [4, 12, 5, 13], "texture": "#texture"}, - "up": {"uv": [4, 12, 6, 13], "texture": "#texture"} - } - }, - { - "from": [7, 3, 3], - "to": [9, 3.25, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 10.25, 11]}, - "faces": { - "north": {"uv": [6, 12, 4, 13], "texture": "#texture"}, - "east": {"uv": [5, 12, 6, 13], "texture": "#texture"}, - "south": {"uv": [4, 12, 6, 13], "texture": "#texture"}, - "west": {"uv": [4, 12, 5, 13], "texture": "#texture"}, - "up": {"uv": [4, 12, 6, 13], "texture": "#texture"} - } - }, - { - "from": [10, 3, 3], - "to": [12, 3.25, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [17, 10.25, 11]}, - "faces": { - "north": {"uv": [6, 12, 4, 13], "texture": "#texture"}, - "east": {"uv": [5, 12, 6, 13], "texture": "#texture"}, - "south": {"uv": [4, 12, 6, 13], "texture": "#texture"}, - "west": {"uv": [4, 12, 5, 13], "texture": "#texture"}, - "up": {"uv": [4, 12, 6, 13], "texture": "#texture"} - } - }, - { - "from": [4, 3, 12], - "to": [6, 3.25, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 10.25, 20]}, - "faces": { - "north": {"uv": [6, 3, 4, 4], "texture": "#texture"}, - "east": {"uv": [5, 3, 6, 4], "texture": "#texture"}, - "south": {"uv": [4, 3, 6, 4], "texture": "#texture"}, - "west": {"uv": [4, 3, 5, 4], "texture": "#texture"}, - "up": {"uv": [4, 3, 6, 4], "texture": "#texture"} - } - }, - { - "from": [7, 3, 12], - "to": [9, 3.25, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 10.25, 20]}, - "faces": { - "north": {"uv": [6, 3, 4, 4], "texture": "#texture"}, - "east": {"uv": [5, 3, 6, 4], "texture": "#texture"}, - "south": {"uv": [4, 3, 6, 4], "texture": "#texture"}, - "west": {"uv": [4, 3, 5, 4], "texture": "#texture"}, - "up": {"uv": [4, 3, 6, 4], "texture": "#texture"} - } - }, - { - "from": [10, 3, 12], - "to": [12, 3.25, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [17, 10.25, 20]}, - "faces": { - "north": {"uv": [6, 3, 4, 4], "texture": "#texture"}, - "east": {"uv": [5, 3, 6, 4], "texture": "#texture"}, - "south": {"uv": [4, 3, 6, 4], "texture": "#texture"}, - "west": {"uv": [4, 3, 5, 4], "texture": "#texture"}, - "up": {"uv": [4, 3, 6, 4], "texture": "#texture"} - } - }, - { - "from": [0.01, -0.25, 3], - "to": [3.01, 0, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -7.25, 11]}, - "faces": { - "north": {"uv": [3, 13, 0, 12], "texture": "#texture", "cullface": "down"}, - "east": {"uv": [2, 13, 3, 12], "texture": "#texture", "cullface": "down"}, - "south": {"uv": [0, 13, 3, 12], "texture": "#texture", "cullface": "down"}, - "west": {"uv": [0, 13, 1, 12], "texture": "#texture", "cullface": "down"}, - "down": {"uv": [0, 13, 3, 12], "texture": "#texture", "cullface": "down"} - } - }, - { - "from": [0.01, -0.25, 12], - "to": [3.01, 0, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, -7.25, 20]}, - "faces": { - "north": {"uv": [3, 4, 0, 3], "texture": "#texture", "cullface": "down"}, - "east": {"uv": [2, 4, 3, 3], "texture": "#texture", "cullface": "down"}, - "south": {"uv": [0, 4, 3, 3], "texture": "#texture", "cullface": "down"}, - "west": {"uv": [0, 4, 1, 3], "texture": "#texture", "cullface": "down"}, - "down": {"uv": [0, 4, 3, 3], "texture": "#texture", "cullface": "down"} - } - }, - { - "from": [12.99, -0.25, 12], - "to": [15.99, 0, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [21, -7.25, 20]}, - "faces": { - "north": {"uv": [16, 4, 13, 3], "texture": "#texture", "cullface": "down"}, - "east": {"uv": [15, 4, 16, 3], "texture": "#texture", "cullface": "down"}, - "south": {"uv": [13, 4, 16, 3], "texture": "#texture", "cullface": "down"}, - "west": {"uv": [13, 4, 14, 3], "texture": "#texture", "cullface": "down"}, - "down": {"uv": [13, 4, 16, 3], "texture": "#texture", "cullface": "down"} - } - }, - { - "from": [12.99, -0.25, 3], - "to": [15.99, 0, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [21, -7.25, 11]}, - "faces": { - "north": {"uv": [16, 13, 13, 12], "texture": "#texture", "cullface": "down"}, - "east": {"uv": [15, 13, 16, 12], "texture": "#texture", "cullface": "down"}, - "south": {"uv": [13, 13, 16, 12], "texture": "#texture", "cullface": "down"}, - "west": {"uv": [13, 13, 14, 12], "texture": "#texture", "cullface": "down"}, - "down": {"uv": [13, 13, 16, 12], "texture": "#texture", "cullface": "down"} - } - }, - { - "from": [4, -0.25, 3], - "to": [6, 0, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [11, -7.25, 11]}, - "faces": { - "north": {"uv": [6, 13, 4, 12], "texture": "#texture", "cullface": "down"}, - "east": {"uv": [5, 13, 6, 12], "texture": "#texture", "cullface": "down"}, - "south": {"uv": [4, 13, 6, 12], "texture": "#texture", "cullface": "down"}, - "west": {"uv": [4, 13, 5, 12], "texture": "#texture", "cullface": "down"}, - "down": {"uv": [4, 13, 6, 12], "texture": "#texture", "cullface": "down"} - } - }, - { - "from": [7, -0.25, 3], - "to": [9, 0, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [14, -7.25, 11]}, - "faces": { - "north": {"uv": [6, 13, 4, 12], "texture": "#texture", "cullface": "down"}, - "east": {"uv": [5, 13, 6, 12], "texture": "#texture", "cullface": "down"}, - "south": {"uv": [4, 13, 6, 12], "texture": "#texture", "cullface": "down"}, - "west": {"uv": [4, 13, 5, 12], "texture": "#texture", "cullface": "down"}, - "down": {"uv": [4, 13, 6, 12], "texture": "#texture", "cullface": "down"} - } - }, - { - "from": [10, -0.25, 3], - "to": [12, 0, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [17, -7.25, 11]}, - "faces": { - "north": {"uv": [6, 13, 4, 12], "texture": "#texture", "cullface": "down"}, - "east": {"uv": [5, 13, 6, 12], "texture": "#texture", "cullface": "down"}, - "south": {"uv": [4, 13, 6, 12], "texture": "#texture", "cullface": "down"}, - "west": {"uv": [4, 13, 5, 12], "texture": "#texture", "cullface": "down"}, - "down": {"uv": [4, 13, 6, 12], "texture": "#texture", "cullface": "down"} - } - }, - { - "from": [4, -0.25, 12], - "to": [6, 0, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [11, -7.25, 20]}, - "faces": { - "north": {"uv": [6, 4, 4, 3], "texture": "#texture", "cullface": "down"}, - "east": {"uv": [5, 4, 6, 3], "texture": "#texture", "cullface": "down"}, - "south": {"uv": [4, 4, 6, 3], "texture": "#texture", "cullface": "down"}, - "west": {"uv": [4, 4, 5, 3], "texture": "#texture", "cullface": "down"}, - "down": {"uv": [4, 4, 6, 3], "texture": "#texture", "cullface": "down"} - } - }, - { - "from": [7, -0.25, 12], - "to": [9, 0, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [14, -7.25, 20]}, - "faces": { - "north": {"uv": [6, 4, 4, 3], "texture": "#texture", "cullface": "down"}, - "east": {"uv": [5, 4, 6, 3], "texture": "#texture", "cullface": "down"}, - "south": {"uv": [4, 4, 6, 3], "texture": "#texture", "cullface": "down"}, - "west": {"uv": [4, 4, 5, 3], "texture": "#texture", "cullface": "down"}, - "down": {"uv": [4, 4, 6, 3], "texture": "#texture", "cullface": "down"} - } - }, - { - "from": [10, -0.25, 12], - "to": [12, 0, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [17, -7.25, 20]}, - "faces": { - "north": {"uv": [6, 4, 4, 3], "texture": "#texture", "cullface": "down"}, - "east": {"uv": [5, 4, 6, 3], "texture": "#texture", "cullface": "down"}, - "south": {"uv": [4, 4, 6, 3], "texture": "#texture", "cullface": "down"}, - "west": {"uv": [4, 4, 5, 3], "texture": "#texture", "cullface": "down"}, - "down": {"uv": [4, 4, 6, 3], "texture": "#texture", "cullface": "down"} - } - } - ], - "groups": [0, - { - "name": "top", - "origin": [8, 8, 8], - "children": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] - }, - { - "name": "down", - "origin": [8, 8, 8], - "children": [11, 12, 13, 14, 15, 16, 17, 18, 19, 20] - } - ] -} \ No newline at end of file diff --git a/assets/minecraft/models/block/spruce_trapdoor_open.json b/assets/minecraft/models/block/spruce_trapdoor_open.json deleted file mode 100644 index 3316e2a..0000000 --- a/assets/minecraft/models/block/spruce_trapdoor_open.json +++ /dev/null @@ -1,275 +0,0 @@ -{ - "credit": "Made with Blockbench - Made by Ryan Garrett - Models are for Classic 3D Only", - "parent": "block/thin_block", - "textures": { - "particle": "block/spruce_trapdoor", - "texture": "block/spruce_trapdoor" - }, - "elements": [ - { - "from": [0, 0, 13], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [0, 0, 16, 3], "rotation": 270, "texture": "#texture", "cullface": "east"}, - "south": {"uv": [0, 16, 16, 0], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 3], "rotation": 90, "texture": "#texture", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 3], "rotation": 180, "texture": "#texture", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 3], "texture": "#texture", "cullface": "down"} - } - }, - { - "from": [0.01, 12, 16], - "to": [3.01, 13, 16.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "east": {"uv": [2, 12, 3, 13], "rotation": 270, "texture": "#texture", "cullface": "south"}, - "south": {"uv": [0, 12, 3, 13], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [0, 12, 1, 13], "rotation": 90, "texture": "#texture", "cullface": "south"}, - "up": {"uv": [3, 12, 0, 13], "rotation": 180, "texture": "#texture", "cullface": "south"}, - "down": {"uv": [0, 12, 3, 13], "texture": "#texture", "cullface": "south"} - } - }, - { - "from": [0.01, 3, 16], - "to": [3.01, 4, 16.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "east": {"uv": [2, 3, 3, 4], "rotation": 270, "texture": "#texture", "cullface": "south"}, - "south": {"uv": [0, 3, 3, 4], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [0, 3, 1, 4], "rotation": 90, "texture": "#texture", "cullface": "south"}, - "up": {"uv": [3, 3, 0, 4], "rotation": 180, "texture": "#texture", "cullface": "south"}, - "down": {"uv": [0, 3, 3, 4], "texture": "#texture", "cullface": "south"} - } - }, - { - "from": [12.99, 3, 16], - "to": [15.99, 4, 16.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "east": {"uv": [15, 3, 16, 4], "rotation": 270, "texture": "#texture", "cullface": "south"}, - "south": {"uv": [13, 3, 16, 4], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [13, 3, 14, 4], "rotation": 90, "texture": "#texture", "cullface": "south"}, - "up": {"uv": [16, 3, 13, 4], "rotation": 180, "texture": "#texture", "cullface": "south"}, - "down": {"uv": [13, 3, 16, 4], "texture": "#texture", "cullface": "south"} - } - }, - { - "from": [12.99, 12, 16], - "to": [15.99, 13, 16.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "east": {"uv": [15, 12, 16, 13], "rotation": 270, "texture": "#texture", "cullface": "south"}, - "south": {"uv": [13, 12, 16, 13], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [13, 12, 14, 13], "rotation": 90, "texture": "#texture", "cullface": "south"}, - "up": {"uv": [16, 12, 13, 13], "rotation": 180, "texture": "#texture", "cullface": "south"}, - "down": {"uv": [13, 12, 16, 13], "texture": "#texture", "cullface": "south"} - } - }, - { - "from": [4, 12, 16], - "to": [6, 13, 16.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "east": {"uv": [5, 12, 6, 13], "rotation": 270, "texture": "#texture", "cullface": "south"}, - "south": {"uv": [4, 12, 6, 13], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [4, 12, 5, 13], "rotation": 90, "texture": "#texture", "cullface": "south"}, - "up": {"uv": [6, 12, 4, 13], "rotation": 180, "texture": "#texture", "cullface": "south"}, - "down": {"uv": [4, 12, 6, 13], "texture": "#texture", "cullface": "south"} - } - }, - { - "from": [7, 12, 16], - "to": [9, 13, 16.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "east": {"uv": [5, 12, 6, 13], "rotation": 270, "texture": "#texture", "cullface": "south"}, - "south": {"uv": [4, 12, 6, 13], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [4, 12, 5, 13], "rotation": 90, "texture": "#texture", "cullface": "south"}, - "up": {"uv": [6, 12, 4, 13], "rotation": 180, "texture": "#texture", "cullface": "south"}, - "down": {"uv": [4, 12, 6, 13], "texture": "#texture", "cullface": "south"} - } - }, - { - "from": [10, 12, 16], - "to": [12, 13, 16.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "east": {"uv": [5, 12, 6, 13], "rotation": 270, "texture": "#texture", "cullface": "south"}, - "south": {"uv": [4, 12, 6, 13], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [4, 12, 5, 13], "rotation": 90, "texture": "#texture", "cullface": "south"}, - "up": {"uv": [6, 12, 4, 13], "rotation": 180, "texture": "#texture", "cullface": "south"}, - "down": {"uv": [4, 12, 6, 13], "texture": "#texture", "cullface": "south"} - } - }, - { - "from": [4, 3, 16], - "to": [6, 4, 16.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "east": {"uv": [5, 3, 6, 4], "rotation": 270, "texture": "#texture", "cullface": "south"}, - "south": {"uv": [4, 3, 6, 4], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [4, 3, 5, 4], "rotation": 90, "texture": "#texture", "cullface": "south"}, - "up": {"uv": [6, 3, 4, 4], "rotation": 180, "texture": "#texture", "cullface": "south"}, - "down": {"uv": [4, 3, 6, 4], "texture": "#texture", "cullface": "south"} - } - }, - { - "from": [7, 3, 16], - "to": [9, 4, 16.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "east": {"uv": [5, 3, 6, 4], "rotation": 270, "texture": "#texture", "cullface": "south"}, - "south": {"uv": [4, 3, 6, 4], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [4, 3, 5, 4], "rotation": 90, "texture": "#texture", "cullface": "south"}, - "up": {"uv": [6, 3, 4, 4], "rotation": 180, "texture": "#texture", "cullface": "south"}, - "down": {"uv": [4, 3, 6, 4], "texture": "#texture", "cullface": "south"} - } - }, - { - "from": [10, 3, 16], - "to": [12, 4, 16.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "east": {"uv": [5, 3, 6, 4], "rotation": 270, "texture": "#texture", "cullface": "south"}, - "south": {"uv": [4, 3, 6, 4], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [4, 3, 5, 4], "rotation": 90, "texture": "#texture", "cullface": "south"}, - "up": {"uv": [6, 3, 4, 4], "rotation": 180, "texture": "#texture", "cullface": "south"}, - "down": {"uv": [4, 3, 6, 4], "texture": "#texture", "cullface": "south"} - } - }, - { - "from": [0.01, 12, 12.75], - "to": [3.01, 13, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 13, 3, 12], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [2, 13, 3, 12], "rotation": 270, "texture": "#texture"}, - "west": {"uv": [0, 13, 1, 12], "rotation": 90, "texture": "#texture"}, - "up": {"uv": [3, 13, 0, 12], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [0, 13, 3, 12], "texture": "#texture"} - } - }, - { - "from": [0.01, 3, 12.75], - "to": [3.01, 4, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [0, 4, 3, 3], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [2, 4, 3, 3], "rotation": 270, "texture": "#texture"}, - "west": {"uv": [0, 4, 1, 3], "rotation": 90, "texture": "#texture"}, - "up": {"uv": [3, 4, 0, 3], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [0, 4, 3, 3], "texture": "#texture"} - } - }, - { - "from": [12.99, 3, 12.75], - "to": [15.99, 4, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [13, 4, 16, 3], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [15, 4, 16, 3], "rotation": 270, "texture": "#texture"}, - "west": {"uv": [13, 4, 14, 3], "rotation": 90, "texture": "#texture"}, - "up": {"uv": [16, 4, 13, 3], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [13, 4, 16, 3], "texture": "#texture"} - } - }, - { - "from": [12.99, 12, 12.75], - "to": [15.99, 13, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [13, 13, 16, 12], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [15, 13, 16, 12], "rotation": 270, "texture": "#texture"}, - "west": {"uv": [13, 13, 14, 12], "rotation": 90, "texture": "#texture"}, - "up": {"uv": [16, 13, 13, 12], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [13, 13, 16, 12], "texture": "#texture"} - } - }, - { - "from": [4, 12, 12.75], - "to": [6, 13, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [4, 13, 6, 12], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [5, 13, 6, 12], "rotation": 270, "texture": "#texture"}, - "west": {"uv": [4, 13, 5, 12], "rotation": 90, "texture": "#texture"}, - "up": {"uv": [6, 13, 4, 12], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [4, 13, 6, 12], "texture": "#texture"} - } - }, - { - "from": [7, 12, 12.75], - "to": [9, 13, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [4, 13, 6, 12], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [5, 13, 6, 12], "rotation": 270, "texture": "#texture"}, - "west": {"uv": [4, 13, 5, 12], "rotation": 90, "texture": "#texture"}, - "up": {"uv": [6, 13, 4, 12], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [4, 13, 6, 12], "texture": "#texture"} - } - }, - { - "from": [10, 12, 12.75], - "to": [12, 13, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [4, 13, 6, 12], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [5, 13, 6, 12], "rotation": 270, "texture": "#texture"}, - "west": {"uv": [4, 13, 5, 12], "rotation": 90, "texture": "#texture"}, - "up": {"uv": [6, 13, 4, 12], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [4, 13, 6, 12], "texture": "#texture"} - } - }, - { - "from": [4, 3, 12.75], - "to": [6, 4, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [4, 4, 6, 3], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [5, 4, 6, 3], "rotation": 270, "texture": "#texture"}, - "west": {"uv": [4, 4, 5, 3], "rotation": 90, "texture": "#texture"}, - "up": {"uv": [6, 4, 4, 3], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [4, 4, 6, 3], "texture": "#texture"} - } - }, - { - "from": [7, 3, 12.75], - "to": [9, 4, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [4, 4, 6, 3], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [5, 4, 6, 3], "rotation": 270, "texture": "#texture"}, - "west": {"uv": [4, 4, 5, 3], "rotation": 90, "texture": "#texture"}, - "up": {"uv": [6, 4, 4, 3], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [4, 4, 6, 3], "texture": "#texture"} - } - }, - { - "from": [10, 3, 12.75], - "to": [12, 4, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7]}, - "faces": { - "north": {"uv": [4, 4, 6, 3], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [5, 4, 6, 3], "rotation": 270, "texture": "#texture"}, - "west": {"uv": [4, 4, 5, 3], "rotation": 90, "texture": "#texture"}, - "up": {"uv": [6, 4, 4, 3], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [4, 4, 6, 3], "texture": "#texture"} - } - } - ], - "groups": [0, - { - "name": "south", - "origin": [8, 8, 8], - "children": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] - }, - { - "name": "north", - "origin": [8, 8, 8], - "children": [11, 12, 13, 14, 15, 16, 17, 18, 19, 20] - } - ] -} \ No newline at end of file diff --git a/assets/minecraft/models/block/spruce_trapdoor_top.json b/assets/minecraft/models/block/spruce_trapdoor_top.json deleted file mode 100644 index c32068f..0000000 --- a/assets/minecraft/models/block/spruce_trapdoor_top.json +++ /dev/null @@ -1,275 +0,0 @@ -{ - "credit": "Made with Blockbench - Made by Ryan Garrett - Models are for Classic 3D Only", - "parent": "block/thin_block", - "textures": { - "particle": "block/spruce_trapdoor", - "texture": "block/spruce_trapdoor" - }, - "elements": [ - { - "from": [0, 13, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 21, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 3], "texture": "#texture", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 3], "texture": "#texture", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 3], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 3], "texture": "#texture", "cullface": "west"}, - "up": {"uv": [0, 16, 16, 0], "texture": "#texture", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#texture"} - } - }, - { - "from": [0.01, 16, 3], - "to": [3.01, 16.25, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 23.25, 11]}, - "faces": { - "north": {"uv": [3, 12, 0, 13], "texture": "#texture", "cullface": "up"}, - "east": {"uv": [2, 12, 3, 13], "texture": "#texture", "cullface": "up"}, - "south": {"uv": [0, 12, 3, 13], "texture": "#texture", "cullface": "up"}, - "west": {"uv": [0, 12, 1, 13], "texture": "#texture", "cullface": "up"}, - "up": {"uv": [0, 12, 3, 13], "texture": "#texture", "cullface": "up"} - } - }, - { - "from": [0.01, 16, 12], - "to": [3.01, 16.25, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 23.25, 20]}, - "faces": { - "north": {"uv": [3, 3, 0, 4], "texture": "#texture", "cullface": "up"}, - "east": {"uv": [2, 3, 3, 4], "texture": "#texture", "cullface": "up"}, - "south": {"uv": [0, 3, 3, 4], "texture": "#texture", "cullface": "up"}, - "west": {"uv": [0, 3, 1, 4], "texture": "#texture", "cullface": "up"}, - "up": {"uv": [0, 3, 3, 4], "texture": "#texture", "cullface": "up"} - } - }, - { - "from": [12.99, 16, 12], - "to": [15.99, 16.25, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 23.25, 20]}, - "faces": { - "north": {"uv": [16, 3, 13, 4], "texture": "#texture", "cullface": "up"}, - "east": {"uv": [15, 3, 16, 4], "texture": "#texture", "cullface": "up"}, - "south": {"uv": [13, 3, 16, 4], "texture": "#texture", "cullface": "up"}, - "west": {"uv": [13, 3, 14, 4], "texture": "#texture", "cullface": "up"}, - "up": {"uv": [13, 3, 16, 4], "texture": "#texture", "cullface": "up"} - } - }, - { - "from": [12.99, 16, 3], - "to": [15.99, 16.25, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 23.25, 11]}, - "faces": { - "north": {"uv": [16, 12, 13, 13], "texture": "#texture", "cullface": "up"}, - "east": {"uv": [15, 12, 16, 13], "texture": "#texture", "cullface": "up"}, - "south": {"uv": [13, 12, 16, 13], "texture": "#texture", "cullface": "up"}, - "west": {"uv": [13, 12, 14, 13], "texture": "#texture", "cullface": "up"}, - "up": {"uv": [13, 12, 16, 13], "texture": "#texture", "cullface": "up"} - } - }, - { - "from": [4, 16, 3], - "to": [6, 16.25, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 23.25, 11]}, - "faces": { - "north": {"uv": [6, 12, 4, 13], "texture": "#texture", "cullface": "up"}, - "east": {"uv": [5, 12, 6, 13], "texture": "#texture", "cullface": "up"}, - "south": {"uv": [4, 12, 6, 13], "texture": "#texture", "cullface": "up"}, - "west": {"uv": [4, 12, 5, 13], "texture": "#texture", "cullface": "up"}, - "up": {"uv": [4, 12, 6, 13], "texture": "#texture", "cullface": "up"} - } - }, - { - "from": [7, 16, 3], - "to": [9, 16.25, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 23.25, 11]}, - "faces": { - "north": {"uv": [6, 12, 4, 13], "texture": "#texture", "cullface": "up"}, - "east": {"uv": [5, 12, 6, 13], "texture": "#texture", "cullface": "up"}, - "south": {"uv": [4, 12, 6, 13], "texture": "#texture", "cullface": "up"}, - "west": {"uv": [4, 12, 5, 13], "texture": "#texture", "cullface": "up"}, - "up": {"uv": [4, 12, 6, 13], "texture": "#texture", "cullface": "up"} - } - }, - { - "from": [10, 16, 3], - "to": [12, 16.25, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [17, 23.25, 11]}, - "faces": { - "north": {"uv": [6, 12, 4, 13], "texture": "#texture", "cullface": "up"}, - "east": {"uv": [5, 12, 6, 13], "texture": "#texture", "cullface": "up"}, - "south": {"uv": [4, 12, 6, 13], "texture": "#texture", "cullface": "up"}, - "west": {"uv": [4, 12, 5, 13], "texture": "#texture", "cullface": "up"}, - "up": {"uv": [4, 12, 6, 13], "texture": "#texture", "cullface": "up"} - } - }, - { - "from": [4, 16, 12], - "to": [6, 16.25, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 23.25, 20]}, - "faces": { - "north": {"uv": [6, 3, 4, 4], "texture": "#texture", "cullface": "up"}, - "east": {"uv": [5, 3, 6, 4], "texture": "#texture", "cullface": "up"}, - "south": {"uv": [4, 3, 6, 4], "texture": "#texture", "cullface": "up"}, - "west": {"uv": [4, 3, 5, 4], "texture": "#texture", "cullface": "up"}, - "up": {"uv": [4, 3, 6, 4], "texture": "#texture", "cullface": "up"} - } - }, - { - "from": [7, 16, 12], - "to": [9, 16.25, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 23.25, 20]}, - "faces": { - "north": {"uv": [6, 3, 4, 4], "texture": "#texture", "cullface": "up"}, - "east": {"uv": [5, 3, 6, 4], "texture": "#texture", "cullface": "up"}, - "south": {"uv": [4, 3, 6, 4], "texture": "#texture", "cullface": "up"}, - "west": {"uv": [4, 3, 5, 4], "texture": "#texture", "cullface": "up"}, - "up": {"uv": [4, 3, 6, 4], "texture": "#texture", "cullface": "up"} - } - }, - { - "from": [10, 16, 12], - "to": [12, 16.25, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [17, 23.25, 20]}, - "faces": { - "north": {"uv": [6, 3, 4, 4], "texture": "#texture", "cullface": "up"}, - "east": {"uv": [5, 3, 6, 4], "texture": "#texture", "cullface": "up"}, - "south": {"uv": [4, 3, 6, 4], "texture": "#texture", "cullface": "up"}, - "west": {"uv": [4, 3, 5, 4], "texture": "#texture", "cullface": "up"}, - "up": {"uv": [4, 3, 6, 4], "texture": "#texture", "cullface": "up"} - } - }, - { - "from": [0.01, 12.75, 3], - "to": [3.01, 13, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.75, 11]}, - "faces": { - "north": {"uv": [3, 13, 0, 12], "texture": "#texture"}, - "east": {"uv": [2, 13, 3, 12], "texture": "#texture"}, - "south": {"uv": [0, 13, 3, 12], "texture": "#texture"}, - "west": {"uv": [0, 13, 1, 12], "texture": "#texture"}, - "down": {"uv": [0, 13, 3, 12], "texture": "#texture"} - } - }, - { - "from": [0.01, 12.75, 12], - "to": [3.01, 13, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.75, 20]}, - "faces": { - "north": {"uv": [3, 4, 0, 3], "texture": "#texture"}, - "east": {"uv": [2, 4, 3, 3], "texture": "#texture"}, - "south": {"uv": [0, 4, 3, 3], "texture": "#texture"}, - "west": {"uv": [0, 4, 1, 3], "texture": "#texture"}, - "down": {"uv": [0, 4, 3, 3], "texture": "#texture"} - } - }, - { - "from": [12.99, 12.75, 12], - "to": [15.99, 13, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 5.75, 20]}, - "faces": { - "north": {"uv": [16, 4, 13, 3], "texture": "#texture"}, - "east": {"uv": [15, 4, 16, 3], "texture": "#texture"}, - "south": {"uv": [13, 4, 16, 3], "texture": "#texture"}, - "west": {"uv": [13, 4, 14, 3], "texture": "#texture"}, - "down": {"uv": [13, 4, 16, 3], "texture": "#texture"} - } - }, - { - "from": [12.99, 12.75, 3], - "to": [15.99, 13, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [21, 5.75, 11]}, - "faces": { - "north": {"uv": [16, 13, 13, 12], "texture": "#texture"}, - "east": {"uv": [15, 13, 16, 12], "texture": "#texture"}, - "south": {"uv": [13, 13, 16, 12], "texture": "#texture"}, - "west": {"uv": [13, 13, 14, 12], "texture": "#texture"}, - "down": {"uv": [13, 13, 16, 12], "texture": "#texture"} - } - }, - { - "from": [4, 12.75, 3], - "to": [6, 13, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 5.75, 11]}, - "faces": { - "north": {"uv": [6, 13, 4, 12], "texture": "#texture"}, - "east": {"uv": [5, 13, 6, 12], "texture": "#texture"}, - "south": {"uv": [4, 13, 6, 12], "texture": "#texture"}, - "west": {"uv": [4, 13, 5, 12], "texture": "#texture"}, - "down": {"uv": [4, 13, 6, 12], "texture": "#texture"} - } - }, - { - "from": [7, 12.75, 3], - "to": [9, 13, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 5.75, 11]}, - "faces": { - "north": {"uv": [6, 13, 4, 12], "texture": "#texture"}, - "east": {"uv": [5, 13, 6, 12], "texture": "#texture"}, - "south": {"uv": [4, 13, 6, 12], "texture": "#texture"}, - "west": {"uv": [4, 13, 5, 12], "texture": "#texture"}, - "down": {"uv": [4, 13, 6, 12], "texture": "#texture"} - } - }, - { - "from": [10, 12.75, 3], - "to": [12, 13, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [17, 5.75, 11]}, - "faces": { - "north": {"uv": [6, 13, 4, 12], "texture": "#texture"}, - "east": {"uv": [5, 13, 6, 12], "texture": "#texture"}, - "south": {"uv": [4, 13, 6, 12], "texture": "#texture"}, - "west": {"uv": [4, 13, 5, 12], "texture": "#texture"}, - "down": {"uv": [4, 13, 6, 12], "texture": "#texture"} - } - }, - { - "from": [4, 12.75, 12], - "to": [6, 13, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 5.75, 20]}, - "faces": { - "north": {"uv": [6, 4, 4, 3], "texture": "#texture"}, - "east": {"uv": [5, 4, 6, 3], "texture": "#texture"}, - "south": {"uv": [4, 4, 6, 3], "texture": "#texture"}, - "west": {"uv": [4, 4, 5, 3], "texture": "#texture"}, - "down": {"uv": [4, 4, 6, 3], "texture": "#texture"} - } - }, - { - "from": [7, 12.75, 12], - "to": [9, 13, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [14, 5.75, 20]}, - "faces": { - "north": {"uv": [6, 4, 4, 3], "texture": "#texture"}, - "east": {"uv": [5, 4, 6, 3], "texture": "#texture"}, - "south": {"uv": [4, 4, 6, 3], "texture": "#texture"}, - "west": {"uv": [4, 4, 5, 3], "texture": "#texture"}, - "down": {"uv": [4, 4, 6, 3], "texture": "#texture"} - } - }, - { - "from": [10, 12.75, 12], - "to": [12, 13, 13], - "rotation": {"angle": 0, "axis": "y", "origin": [17, 5.75, 20]}, - "faces": { - "north": {"uv": [6, 4, 4, 3], "texture": "#texture"}, - "east": {"uv": [5, 4, 6, 3], "texture": "#texture"}, - "south": {"uv": [4, 4, 6, 3], "texture": "#texture"}, - "west": {"uv": [4, 4, 5, 3], "texture": "#texture"}, - "down": {"uv": [4, 4, 6, 3], "texture": "#texture"} - } - } - ], - "groups": [0, - { - "name": "top", - "origin": [8, 8, 8], - "children": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] - }, - { - "name": "down", - "origin": [8, 8, 8], - "children": [11, 12, 13, 14, 15, 16, 17, 18, 19, 20] - } - ] -} \ No newline at end of file diff --git a/assets/minecraft/models/block/sticky_piston.json b/assets/minecraft/models/block/sticky_piston.json new file mode 100644 index 0000000..a46764e --- /dev/null +++ b/assets/minecraft/models/block/sticky_piston.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/template_piston", + "textures": { + "platform": "minecraft:block/piston_top_sticky", + "bottom": "minecraft:block/piston_bottom", + "side": "minecraft:block/piston_side_sticky" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/block/sticky_piston_inventory.json b/assets/minecraft/models/block/sticky_piston_inventory.json new file mode 100644 index 0000000..5914286 --- /dev/null +++ b/assets/minecraft/models/block/sticky_piston_inventory.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "minecraft:block/piston_top_sticky", + "bottom": "minecraft:block/piston_bottom", + "side": "minecraft:block/piston_side_sticky" + } +} \ No newline at end of file diff --git a/assets/minecraft/models/block/door_bottom.json b/assets/minecraft/models/block/template_door_bottom.json similarity index 100% rename from assets/minecraft/models/block/door_bottom.json rename to assets/minecraft/models/block/template_door_bottom.json diff --git a/assets/minecraft/models/block/door_bottom_rh.json b/assets/minecraft/models/block/template_door_bottom_rh.json similarity index 100% rename from assets/minecraft/models/block/door_bottom_rh.json rename to assets/minecraft/models/block/template_door_bottom_rh.json diff --git a/assets/minecraft/models/block/door_top.json b/assets/minecraft/models/block/template_door_top.json similarity index 100% rename from assets/minecraft/models/block/door_top.json rename to assets/minecraft/models/block/template_door_top.json diff --git a/assets/minecraft/models/block/door_top_rh.json b/assets/minecraft/models/block/template_door_top_rh.json similarity index 100% rename from assets/minecraft/models/block/door_top_rh.json rename to assets/minecraft/models/block/template_door_top_rh.json diff --git a/assets/minecraft/models/block/warped_door_bottom.json b/assets/minecraft/models/block/warped_door_bottom.json index 5aa3d5f..b9fcc8c 100644 --- a/assets/minecraft/models/block/warped_door_bottom.json +++ b/assets/minecraft/models/block/warped_door_bottom.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom", + "parent": "minecraft:block/template_door_bottom", "textures": { "bottomright": "minecraft:block/warped_door_bottom2", "bottom": "minecraft:block/warped_door_bottom", diff --git a/assets/minecraft/models/block/warped_door_bottom_hinge.json b/assets/minecraft/models/block/warped_door_bottom_hinge.json index fe6daeb..a3fd887 100644 --- a/assets/minecraft/models/block/warped_door_bottom_hinge.json +++ b/assets/minecraft/models/block/warped_door_bottom_hinge.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_bottom_rh", + "parent": "minecraft:block/template_door_bottom_rh", "textures": { "bottomright": "minecraft:block/warped_door_bottom", "bottom": "minecraft:block/warped_door_bottom2", diff --git a/assets/minecraft/models/block/warped_door_top.json b/assets/minecraft/models/block/warped_door_top.json index ed4a22d..9fc0b7c 100644 --- a/assets/minecraft/models/block/warped_door_top.json +++ b/assets/minecraft/models/block/warped_door_top.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top", + "parent": "minecraft:block/template_door_top", "textures": { "top": "minecraft:block/warped_door_top", "topright": "minecraft:block/warped_door_top2", diff --git a/assets/minecraft/models/block/warped_door_top_hinge.json b/assets/minecraft/models/block/warped_door_top_hinge.json index 0edaef6..62fd980 100644 --- a/assets/minecraft/models/block/warped_door_top_hinge.json +++ b/assets/minecraft/models/block/warped_door_top_hinge.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/door_top_rh", + "parent": "minecraft:block/template_door_top_rh", "textures": { "top": "minecraft:block/warped_door_top2", "topright": "minecraft:block/warped_door_top", diff --git a/assets/minecraft/models/block/warped_trapdoor_bottom.json b/assets/minecraft/models/block/warped_trapdoor_bottom.json index 455d31f..d9a7108 100644 --- a/assets/minecraft/models/block/warped_trapdoor_bottom.json +++ b/assets/minecraft/models/block/warped_trapdoor_bottom.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench - Made/edited by RyanGar46", + "ambientocclusion":false, "parent": "block/thin_block", "textures": { "particle": "block/warped_trapdoor", diff --git a/assets/minecraft/models/block/warped_trapdoor_open.json b/assets/minecraft/models/block/warped_trapdoor_open.json index c8ab2e9..0489378 100644 --- a/assets/minecraft/models/block/warped_trapdoor_open.json +++ b/assets/minecraft/models/block/warped_trapdoor_open.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench - Made/edited by RyanGar46", + "ambientocclusion":false, "parent": "block/thin_block", "textures": { "particle": "block/warped_trapdoor", diff --git a/assets/minecraft/models/block/warped_trapdoor_top.json b/assets/minecraft/models/block/warped_trapdoor_top.json index b42a012..c8ce5c9 100644 --- a/assets/minecraft/models/block/warped_trapdoor_top.json +++ b/assets/minecraft/models/block/warped_trapdoor_top.json @@ -1,5 +1,5 @@ { - "credit": "Made with Blockbench - Made/edited by RyanGar46", + "ambientocclusion":false, "parent": "block/thin_block", "textures": { "particle": "block/warped_trapdoor", diff --git a/assets/minecraft/models/item/enchanting_table_inventory.json b/assets/minecraft/models/item/enchanting_table_inventory.json index 6755a24..e649a66 100644 --- a/assets/minecraft/models/item/enchanting_table_inventory.json +++ b/assets/minecraft/models/item/enchanting_table_inventory.json @@ -1,6 +1,5 @@ { - "credit": "Made with Blockbench", - "parent": "block/block", + "parent": "block/block", "textures": { "3": "entity/enchanting_table_book", "particle": "block/enchanting_table_bottom", diff --git a/assets/minecraft/models/item/moss_block.json b/assets/minecraft/models/item/moss_block.json index 7a81b60..1d24661 100644 --- a/assets/minecraft/models/item/moss_block.json +++ b/assets/minecraft/models/item/moss_block.json @@ -1,6 +1,5 @@ { - "credit": "Made with Blockbench", - "parent": "minecraft:block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "block/moss_block" }, diff --git a/assets/minecraft/models/item/moss_carpet.json b/assets/minecraft/models/item/moss_carpet.json index 5d7dea8..401ff42 100644 --- a/assets/minecraft/models/item/moss_carpet.json +++ b/assets/minecraft/models/item/moss_carpet.json @@ -1,6 +1,5 @@ { - "credit": "Made with Blockbench", - "parent": "minecraft:block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "block/moss_block" }, diff --git a/assets/minecraft/shaders/core/rendertype_cutout.fsh b/assets/minecraft/shaders/core/common/block.fsh similarity index 100% rename from assets/minecraft/shaders/core/rendertype_cutout.fsh rename to assets/minecraft/shaders/core/common/block.fsh diff --git a/assets/minecraft/shaders/core/common/block.vsh b/assets/minecraft/shaders/core/common/block.vsh new file mode 100644 index 0000000..30853c9 --- /dev/null +++ b/assets/minecraft/shaders/core/common/block.vsh @@ -0,0 +1,129 @@ +#version 150 + +#moj_import +#moj_import + +in vec3 Position; +in vec4 Color; +in vec2 UV0; +in ivec2 UV2; +in vec3 Normal; + +uniform sampler2D Sampler2; +uniform sampler2D Sampler0; +uniform float GameTime; + +uniform mat4 ModelViewMat; +uniform mat4 ProjMat; +uniform vec3 ChunkOffset; + +out float vertexDistance; +out vec4 vertexColor; +out vec4 lightColor; +out vec2 texCoord0; +out vec4 normal; +out vec4 glpos; + +#define pi 3.1415926535897932 +#define phi 1.61803398875 + +vec4 quaternionMultiply(vec4 a, vec4 b) { + return vec4( + a.x * b.w + a.y * b.z - a.z * b.y + a.w * b.x, + -a.x * b.z + a.y * b.w + a.z * b.x + a.w * b.y, + a.x * b.y - a.y * b.x + a.z * b.w + a.w * b.z, + -a.x * b.x - a.y * b.y - a.z * b.z + a.w * b.w + ); +} +vec3 quaternionRotate(vec3 pos, vec4 q) { + vec4 qInv = vec4(-q.xyz, q.w); + return quaternionMultiply(quaternionMultiply(q, vec4(pos, 0)), qInv).xyz; +} + +void main() { + vec3 position = Position / 2 * pi; + float animation = GameTime * 2048.; + float anim = GameTime * pi; + float time = GameTime * 2048; + float xx = Position.x / 2 * pi; + float yy = Position.y / 2 * pi; + float zz = Position.z / 2 * pi; + float dropoff = max((position.x*position.x) + (position.z*position.z) - 64., 512.) / 512.; + float far = ProjMat[3][2] * 0.05 / (ProjMat[3][2] + 2.0 * 0.05) / 3.0 * sqrt(3); + + vec3 offset = vec3(0.0,0.0,0.0); + int alpha = int(texture(Sampler0, UV0).a * 255.5); + + //waving foliage + if (alpha == 1 || alpha == 253 ) { // Most plants like grass and flowers use this + offset.x = sin(position.x + animation) * -1.0 / 32.; + offset.z = cos(position.z + position.y + animation) * -1.0 / 32.; + } else if (alpha == 2) { // Used for the edges of multi-blocks, like the top block of tall grass or the bottom block of twisting vines + offset.x = sin(position.x + position.y + animation) * -2.0 / 32.; + offset.z = cos(position.z + position.y + animation) * -2.0 / 32.; + } else if (alpha == 3) { + offset.x = sin(position.x + position.y + animation) * -1.0 / 32.; + offset.y = sin(position.y + (animation / 1.5)) / 9.0; + offset.z = cos(position.z + position.y + animation) * -1.0 / 32.; + } else if (alpha == 4 || alpha == 2) { + offset.x = sin(position.x + position.y + animation) / 32.; + offset.z = cos(position.z + position.y + animation) / 32.; + } else if (alpha == 5 || alpha == 254) { //leaves + offset.x = ((sin(time * 0.9 + yy) + cos(time * 0.9 + zz)) * 0.02); + offset.y = ((cos(time / 3.0 + xx) + sin(time / 3.0 + zz)) * 0.01); + offset.z = ((sin(time + 256 + yy) + cos(time + 256 + xx)) * 0.02); + } + //waving liquid + else if (alpha == 131) { //water + time = GameTime * 512; + if ((mod(Position.y, 1.0) > 0.1) || (mod(Position.y, 1.0) < 0.01)) { + offset.y = ((sin(time + xx) + cos(time + zz)) * 0.02) - 0.02; + offset.y += ((sin(time*7 + xx*4.) + cos(time*7 + zz*4.)) * 0.01) - 0.01; + offset.y += 0.01 * sin((Position.z * pi / 4.0 + anim * 700)) * 1.0 * (1.0 - smoothstep(0.0, 1.0, vertexDistance / far)); + offset.y += 0.01 * cos((Position.z * pi / 8.0 + Position.x * pi / 4.0 + anim * 400) + pi / 13.0) * 1.2 * (1.0 - smoothstep(0.1, 1.0, vertexDistance / far)); + offset.y += 0.01 * sin((Position.z * pi / 8.0 - Position.x * pi / 2.0 - anim * 900) - pi / 7.0) * 0.75 * (1.0 - smoothstep(0.0, 0.3, vertexDistance / far)); + offset.y += 0.01 * cos((Position.z * pi * 7.0 + Position.x * pi / 2.0 - anim * 870) + pi / 5.0) * 0.75 * (1.0 - smoothstep(0.0, 0.9, vertexDistance / far)); + offset.y /= dropoff; + } + } else if (alpha == 165) { //lava + time = GameTime * 128; + if ((mod(Position.y, 1.0) > 0.1) || (mod(Position.y, 1.0) < 0.01)) { + offset.y = ((sin(time + xx) + cos(time + zz)) * 0.02) - 0.01; + offset.y /= dropoff; + offset.y += 0.03 * sin((Position.z * pi / 4.0 + anim * 700)) * 1.0 * (1.0 - smoothstep(0.0, 1.0, vertexDistance / far)); + offset.y += 0.03 * cos((Position.z * pi / 8.0 + Position.x * pi / 4.0 + anim * 400) + pi / 13.0) * 1.2 * (1.0 - smoothstep(0.1, 1.0, vertexDistance / far)); + offset.y += 0.03 * sin((Position.z * pi / 8.0 - Position.x * pi / 2.0 - anim * 900) - pi / 7.0) * 0.75 * (1.0 - smoothstep(0.0, 0.3, vertexDistance / far)); + offset.y += 0.03 * cos((Position.z * pi * 7.0 + Position.x * pi / 2.0 - anim * 870) + pi / 5.0) * 0.75 * (1.0 - smoothstep(0.0, 0.9, vertexDistance / far)); + } + } + + gl_Position = ProjMat * ModelViewMat * (vec4(Position + ChunkOffset + offset, 1.0)); + + //hanging lanterns + if (alpha == 250) { + vec3 relativePos = fract(Position); + if (relativePos.y > 0.001) { + time = GameTime * 1000.0 + dot(floor(Position), vec3(1.0)) * 1234.0; + vec3 newDown = normalize(vec3( + sin(time * phi) * 0.015, + -1.0, + sin(time) * 0.015 + )); + + relativePos -= vec3(0.5, 1.0, 0.5); + vec3 axis = normalize(cross(vec3(0, 1, 0), newDown)); + float cosAngle = newDown.y; + vec4 quat = vec4(sqrt(1 - cosAngle * cosAngle) * axis, cosAngle); + relativePos = quaternionRotate(relativePos, quat); + offset = relativePos + vec3(0.5, 1.0, 0.5); + gl_Position = ProjMat * ModelViewMat * vec4(floor(Position) + offset + ChunkOffset, 1.0); + } + } + + vertexDistance = length((ModelViewMat * vec4(Position + ChunkOffset, 1.0)).xyz); + lightColor = minecraft_sample_lightmap(Sampler2, UV2); + vertexColor = Color; + texCoord0 = UV0; + normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); + glpos = gl_Position; +} diff --git a/assets/minecraft/shaders/core/rendertype_entity_solid.fsh b/assets/minecraft/shaders/core/common/entity.fsh similarity index 94% rename from assets/minecraft/shaders/core/rendertype_entity_solid.fsh rename to assets/minecraft/shaders/core/common/entity.fsh index fe7a9f7..77964f4 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_solid.fsh +++ b/assets/minecraft/shaders/core/common/entity.fsh @@ -13,10 +13,10 @@ uniform float FogEnd; uniform vec4 FogColor; in float vertexDistance; +in vec2 texCoord0; in vec4 vertexColor; in vec4 lightColor; in vec4 overlayColor; -in vec2 texCoord0; in vec4 normal; in vec4 glpos; @@ -30,5 +30,8 @@ void main() { float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0; color = make_emissive(color, lightColor, vertexDistance, alpha); } + if (color.a < 0.1) { + discard; + } fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); } diff --git a/assets/minecraft/shaders/core/rendertype_entity_cutout.vsh b/assets/minecraft/shaders/core/common/entity.vsh similarity index 98% rename from assets/minecraft/shaders/core/rendertype_entity_cutout.vsh rename to assets/minecraft/shaders/core/common/entity.vsh index 8a9e200..19a778c 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_cutout.vsh +++ b/assets/minecraft/shaders/core/common/entity.vsh @@ -13,17 +13,17 @@ in vec3 Normal; uniform sampler2D Sampler1; uniform sampler2D Sampler2; -uniform mat4 ModelViewMat; +uniform float GameTime; uniform mat4 ProjMat; +uniform mat4 ModelViewMat; -uniform float GameTime; uniform vec3 Light0_Direction; uniform vec3 Light1_Direction; out float vertexDistance; out vec4 vertexColor; -out vec4 lightColor; out vec4 overlayColor; +out vec4 lightColor; out vec2 texCoord0; out vec4 normal; out vec4 glpos; @@ -33,6 +33,7 @@ void main() { normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, Color); + //rotating items float dist = -(ModelViewMat * vec4(1.0)).z; if (dist == 1602.) { mat4 rot = Rotate(GameTime * ROTSPEED, Y) * Scale(1.1, 1.1, 1.1); @@ -46,4 +47,4 @@ void main() { overlayColor = texelFetch(Sampler1, UV1, 0); texCoord0 = UV0; glpos = gl_Position; -} +} \ No newline at end of file diff --git a/assets/minecraft/shaders/core/rendertype_energy_swirl.fsh b/assets/minecraft/shaders/core/common/entity_colored.fsh similarity index 93% rename from assets/minecraft/shaders/core/rendertype_energy_swirl.fsh rename to assets/minecraft/shaders/core/common/entity_colored.fsh index 4e5641b..1c0f2ed 100644 --- a/assets/minecraft/shaders/core/rendertype_energy_swirl.fsh +++ b/assets/minecraft/shaders/core/common/entity_colored.fsh @@ -3,7 +3,6 @@ #moj_import uniform sampler2D Sampler0; -uniform sampler2D Sampler1; uniform sampler2D Sampler2; uniform vec4 ColorModulator; diff --git a/assets/minecraft/shaders/core/rendertype_eyes.vsh b/assets/minecraft/shaders/core/common/entity_colored.vsh similarity index 84% rename from assets/minecraft/shaders/core/rendertype_eyes.vsh rename to assets/minecraft/shaders/core/common/entity_colored.vsh index ee83b5a..e87c1f5 100644 --- a/assets/minecraft/shaders/core/rendertype_eyes.vsh +++ b/assets/minecraft/shaders/core/common/entity_colored.vsh @@ -10,6 +10,7 @@ in vec3 Normal; uniform mat4 ModelViewMat; uniform mat4 ProjMat; +out float vertexDistance; out vec4 vertexColor; out vec2 texCoord0; out vec2 texCoord1; @@ -19,11 +20,11 @@ out vec4 glpos; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexColor = Color; texCoord0 = UV0; texCoord1 = UV1; texCoord2 = UV2; normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); + vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz); glpos = gl_Position; } diff --git a/assets/minecraft/shaders/core/rendertype_armor_glint.fsh b/assets/minecraft/shaders/core/common/entity_glint.fsh similarity index 99% rename from assets/minecraft/shaders/core/rendertype_armor_glint.fsh rename to assets/minecraft/shaders/core/common/entity_glint.fsh index 3910b48..3507e4b 100644 --- a/assets/minecraft/shaders/core/rendertype_armor_glint.fsh +++ b/assets/minecraft/shaders/core/common/entity_glint.fsh @@ -23,4 +23,4 @@ void main() { } float fade = linear_fog_fade(vertexDistance, FogStart, FogEnd); fragColor = vec4(color.rgb * fade, color.a); -} +} \ No newline at end of file diff --git a/assets/minecraft/shaders/core/rendertype_armor_glint.vsh b/assets/minecraft/shaders/core/common/entity_glint.vsh similarity index 99% rename from assets/minecraft/shaders/core/rendertype_armor_glint.vsh rename to assets/minecraft/shaders/core/common/entity_glint.vsh index 515e4fa..c421cf0 100644 --- a/assets/minecraft/shaders/core/rendertype_armor_glint.vsh +++ b/assets/minecraft/shaders/core/common/entity_glint.vsh @@ -13,7 +13,6 @@ out vec4 glpos; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz); texCoord0 = (TextureMat * vec4(UV0, 0.0, 1.0)).xy; glpos = gl_Position; diff --git a/assets/minecraft/shaders/core/rendertype_glint_translucent.vsh b/assets/minecraft/shaders/core/common/entity_glint_rotate.vsh similarity index 93% rename from assets/minecraft/shaders/core/rendertype_glint_translucent.vsh rename to assets/minecraft/shaders/core/common/entity_glint_rotate.vsh index ebba70c..97ac89e 100644 --- a/assets/minecraft/shaders/core/rendertype_glint_translucent.vsh +++ b/assets/minecraft/shaders/core/common/entity_glint_rotate.vsh @@ -2,8 +2,6 @@ #moj_import -#define NONORMALS - in vec3 Position; in vec2 UV0; @@ -12,7 +10,6 @@ uniform mat4 ProjMat; uniform mat4 TextureMat; uniform float GameTime; -uniform vec2 ScreenSize; out float vertexDistance; out vec2 texCoord0; diff --git a/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.fsh b/assets/minecraft/shaders/core/common/entity_lightmap_colored.fsh similarity index 95% rename from assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.fsh rename to assets/minecraft/shaders/core/common/entity_lightmap_colored.fsh index 870d2de..636960c 100644 --- a/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.fsh +++ b/assets/minecraft/shaders/core/common/entity_lightmap_colored.fsh @@ -13,10 +13,11 @@ uniform float FogEnd; uniform vec4 FogColor; in float vertexDistance; +in vec2 texCoord0; +in vec2 texCoord1; +in ivec2 texCoord2; in vec4 vertexColor; in vec4 lightColor; -in vec2 texCoord0; -in vec4 normal; in vec4 glpos; out vec4 fragColor; @@ -24,12 +25,12 @@ out vec4 fragColor; void main() { if (!isGUI(ProjMat)) discardControlGLPos(gl_FragCoord.xy, glpos); vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator; - if (color.a < 0.1) { - discard; - } if (!isGUI(ProjMat)) { float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0; color = make_emissive(color, lightColor, vertexDistance, alpha); } + if (color.a < 0.1) { + discard; + } fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); -} \ No newline at end of file +} diff --git a/assets/minecraft/shaders/core/rendertype_entity_solid.vsh b/assets/minecraft/shaders/core/common/entity_lightmap_colored.vsh similarity index 88% rename from assets/minecraft/shaders/core/rendertype_entity_solid.vsh rename to assets/minecraft/shaders/core/common/entity_lightmap_colored.vsh index b1f85eb..bfb1efd 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_solid.vsh +++ b/assets/minecraft/shaders/core/common/entity_lightmap_colored.vsh @@ -6,7 +6,7 @@ in vec3 Position; in vec4 Color; in vec2 UV0; -in ivec2 UV1; +in vec2 UV1; in ivec2 UV2; in vec3 Normal; @@ -22,17 +22,20 @@ uniform vec3 Light1_Direction; out float vertexDistance; out vec4 vertexColor; -out vec4 lightColor; out vec4 overlayColor; +out vec4 lightColor; out vec2 texCoord0; +out vec2 texCoord1; +out ivec2 texCoord2; out vec4 normal; out vec4 glpos; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, Color); normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); + vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, Color); + //rotating items float dist = -(ModelViewMat * vec4(1.0)).z; if (dist == 1602.) { mat4 rot = Rotate(GameTime * ROTSPEED, Y) * Scale(1.1, 1.1, 1.1); @@ -43,7 +46,9 @@ void main() { vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz); lightColor = minecraft_sample_lightmap(Sampler2, UV2); - overlayColor = texelFetch(Sampler1, UV1, 0); + overlayColor = texelFetch(Sampler1, ivec2(UV1), 0); texCoord0 = UV0; + texCoord1 = UV1; + texCoord2 = UV2; glpos = gl_Position; } diff --git a/assets/minecraft/shaders/core/particle.json b/assets/minecraft/shaders/core/particle.json new file mode 100644 index 0000000..3abc641 --- /dev/null +++ b/assets/minecraft/shaders/core/particle.json @@ -0,0 +1,27 @@ +{ + "blend": { + "func": "add", + "srcrgb": "srcalpha", + "dstrgb": "1-srcalpha" + }, + "vertex": "special/simple", + "fragment": "special/particle", + "attributes": [ + "Position", + "UV0", + "Color", + "UV2" + ], + "samplers": [ + { "name": "Sampler0" }, + { "name": "Sampler2" } + ], + "uniforms": [ + { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, + { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, + { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] }, + { "name": "FogStart", "type": "float", "count": 1, "values": [ 0.0 ] }, + { "name": "FogEnd", "type": "float", "count": 1, "values": [ 1.0 ] }, + { "name": "FogColor", "type": "float", "count": 4, "values": [ 0.0, 0.0, 0.0, 0.0 ] } + ] +} diff --git a/assets/minecraft/shaders/core/rendertype_armor_cutout_no_cull.fsh b/assets/minecraft/shaders/core/rendertype_armor_cutout_no_cull.fsh deleted file mode 100644 index cc51aa3..0000000 --- a/assets/minecraft/shaders/core/rendertype_armor_cutout_no_cull.fsh +++ /dev/null @@ -1,34 +0,0 @@ -#version 150 - -#moj_import -#moj_import -#moj_import - -uniform sampler2D Sampler0; - -uniform mat4 ProjMat; -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; -in vec2 texCoord0; -in vec4 vertexColor; -in vec4 lightColor; -in vec4 glpos; - -out vec4 fragColor; - -void main() { - discardControlGLPos(gl_FragCoord.xy, glpos); - vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator; - if (!isGUI(ProjMat)) { - float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0; - color = make_emissive(color, lightColor, vertexDistance, alpha); - } - if (color.a < 0.1) { - discard; - } - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); -} diff --git a/assets/minecraft/shaders/core/rendertype_armor_cutout_no_cull.json b/assets/minecraft/shaders/core/rendertype_armor_cutout_no_cull.json index f32047a..9c14da3 100644 --- a/assets/minecraft/shaders/core/rendertype_armor_cutout_no_cull.json +++ b/assets/minecraft/shaders/core/rendertype_armor_cutout_no_cull.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_armor_cutout_no_cull", - "fragment": "rendertype_armor_cutout_no_cull", + "vertex": "common/entity_lightmap_colored", + "fragment": "common/entity_lightmap_colored", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_armor_cutout_no_cull.vsh b/assets/minecraft/shaders/core/rendertype_armor_cutout_no_cull.vsh deleted file mode 100644 index 37b4c2f..0000000 --- a/assets/minecraft/shaders/core/rendertype_armor_cutout_no_cull.vsh +++ /dev/null @@ -1,38 +0,0 @@ -#version 150 - -#moj_import - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in vec2 UV1; -in ivec2 UV2; -in vec3 Normal; - -uniform sampler2D Sampler2; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - -uniform vec3 Light0_Direction; -uniform vec3 Light1_Direction; - -out float vertexDistance; -out vec4 vertexColor; -out vec4 lightColor; -out vec2 texCoord0; -out vec2 texCoord1; -out vec4 normal; -out vec4 glpos; - -void main() { - gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - - vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz); - vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, Color); - lightColor = minecraft_sample_lightmap(Sampler2, UV2); - texCoord0 = UV0; - texCoord1 = UV1; - normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); - glpos = gl_Position; -} diff --git a/assets/minecraft/shaders/core/rendertype_armor_entity_glint.json b/assets/minecraft/shaders/core/rendertype_armor_entity_glint.json new file mode 100644 index 0000000..8892760 --- /dev/null +++ b/assets/minecraft/shaders/core/rendertype_armor_entity_glint.json @@ -0,0 +1,24 @@ +{ + "blend": { + "func": "add", + "srcrgb": "srcalpha", + "dstrgb": "1-srcalpha" + }, + "vertex": "common/entity_glint", + "fragment": "common/entity_glint", + "attributes": [ + "Position", + "UV0" + ], + "samplers": [ + { "name": "Sampler0" } + ], + "uniforms": [ + { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, + { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, + { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] }, + { "name": "FogStart", "type": "float", "count": 1, "values": [ 0.0 ] }, + { "name": "FogEnd", "type": "float", "count": 1, "values": [ 1.0 ] }, + { "name": "TextureMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] } + ] +} diff --git a/assets/minecraft/shaders/core/rendertype_armor_glint.json b/assets/minecraft/shaders/core/rendertype_armor_glint.json index 925cf49..8892760 100644 --- a/assets/minecraft/shaders/core/rendertype_armor_glint.json +++ b/assets/minecraft/shaders/core/rendertype_armor_glint.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_armor_glint", - "fragment": "rendertype_armor_glint", + "vertex": "common/entity_glint", + "fragment": "common/entity_glint", "attributes": [ "Position", "UV0" diff --git a/assets/minecraft/shaders/core/rendertype_beacon_beam.fsh b/assets/minecraft/shaders/core/rendertype_beacon_beam.fsh deleted file mode 100644 index c538954..0000000 --- a/assets/minecraft/shaders/core/rendertype_beacon_beam.fsh +++ /dev/null @@ -1,21 +0,0 @@ -#version 150 - -#moj_import - -uniform sampler2D Sampler0; -uniform sampler2D Sampler2; - -uniform vec4 ColorModulator; - -in vec4 vertexColor; -in vec2 texCoord0; -in vec4 normal; -in vec4 glpos; - -out vec4 fragColor; - -void main() { - discardControlGLPos(gl_FragCoord.xy, glpos); - vec4 color = texture(Sampler0, texCoord0) * vertexColor; - fragColor = color * ColorModulator; -} diff --git a/assets/minecraft/shaders/core/rendertype_beacon_beam.json b/assets/minecraft/shaders/core/rendertype_beacon_beam.json index c259cf8..1e70e15 100644 --- a/assets/minecraft/shaders/core/rendertype_beacon_beam.json +++ b/assets/minecraft/shaders/core/rendertype_beacon_beam.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_beacon_beam", - "fragment": "rendertype_beacon_beam", + "vertex": "common/entity_colored", + "fragment": "common/entity_colored", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_beacon_beam.vsh b/assets/minecraft/shaders/core/rendertype_beacon_beam.vsh deleted file mode 100644 index 56f1a0c..0000000 --- a/assets/minecraft/shaders/core/rendertype_beacon_beam.vsh +++ /dev/null @@ -1,25 +0,0 @@ -#version 150 - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in vec2 UV2; -in vec3 Normal; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - -out vec4 vertexColor; -out vec2 texCoord0; -out vec2 texCoord2; -out vec4 normal; -out vec4 glpos; - -void main() { - gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - - vertexColor = Color; - texCoord0 = UV0; - normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); - glpos = gl_Position; -} diff --git a/assets/minecraft/shaders/core/rendertype_crumbling.fsh b/assets/minecraft/shaders/core/rendertype_crumbling.fsh deleted file mode 100644 index 8a74f57..0000000 --- a/assets/minecraft/shaders/core/rendertype_crumbling.fsh +++ /dev/null @@ -1,28 +0,0 @@ -#version 150 - -#moj_import - -uniform sampler2D Sampler0; - -uniform vec4 ColorModulator; - -in vec4 vertexColor; -in vec2 texCoord0; -in vec2 texCoord2; -in vec3 normal; -in vec4 glpos; - -out vec4 fragColor; - -void main() { - discardControlGLPos(gl_FragCoord.xy, glpos); - vec4 color = texture(Sampler0, texCoord0) * vertexColor; - if (color.a < 0.1) { - discard; - } - fragColor = color * ColorModulator; - - // not exactly the default crumble shading but alpha passthrough - fragColor.a = (1.0 - fragColor.r) * 0.7; - fragColor.rgb = vec3(0.0); -} diff --git a/assets/minecraft/shaders/core/rendertype_crumbling.json b/assets/minecraft/shaders/core/rendertype_crumbling.json index a811302..a4c5b9b 100644 --- a/assets/minecraft/shaders/core/rendertype_crumbling.json +++ b/assets/minecraft/shaders/core/rendertype_crumbling.json @@ -6,8 +6,8 @@ "srcalpha" : "0", "dstalpha" : "1" }, - "vertex": "rendertype_crumbling", - "fragment": "rendertype_crumbling", + "vertex": "common/entity_colored", + "fragment": "common/entity_colored", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_crumbling.vsh b/assets/minecraft/shaders/core/rendertype_crumbling.vsh deleted file mode 100644 index 3547c54..0000000 --- a/assets/minecraft/shaders/core/rendertype_crumbling.vsh +++ /dev/null @@ -1,26 +0,0 @@ -#version 150 - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in vec2 UV2; -in vec3 Normal; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - -out vec4 vertexColor; -out vec2 texCoord0; -out vec2 texCoord2; -out vec3 normal; -out vec4 glpos; - -void main() { - gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - - vertexColor = Color; - texCoord0 = UV0; - texCoord2 = UV2 / 255.0; - normal = Normal; - glpos = gl_Position; -} diff --git a/assets/minecraft/shaders/core/rendertype_cutout.json b/assets/minecraft/shaders/core/rendertype_cutout.json index 3e73ca4..4d79ff1 100644 --- a/assets/minecraft/shaders/core/rendertype_cutout.json +++ b/assets/minecraft/shaders/core/rendertype_cutout.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_cutout", - "fragment": "rendertype_cutout", + "vertex": "common/block", + "fragment": "common/block", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_cutout.vsh b/assets/minecraft/shaders/core/rendertype_cutout.vsh deleted file mode 100644 index f50448c..0000000 --- a/assets/minecraft/shaders/core/rendertype_cutout.vsh +++ /dev/null @@ -1,98 +0,0 @@ -#version 150 - -#moj_import -#moj_import - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in ivec2 UV2; -in vec3 Normal; - -uniform sampler2D Sampler0; -uniform sampler2D Sampler2; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform vec3 ChunkOffset; -uniform float GameTime; - -out float vertexDistance; -out vec4 vertexColor; -out vec4 lightColor; -out vec2 texCoord0; -out vec4 normal; -out vec4 glpos; - -#define pi 3.1415926535897932 -#define phi 1.61803398875 - -vec4 quaternionMultiply(vec4 a, vec4 b) { - return vec4( - a.x * b.w + a.y * b.z - a.z * b.y + a.w * b.x, - -a.x * b.z + a.y * b.w + a.z * b.x + a.w * b.y, - a.x * b.y - a.y * b.x + a.z * b.w + a.w * b.z, - -a.x * b.x - a.y * b.y - a.z * b.z + a.w * b.w - ); -} -vec3 quaternionRotate(vec3 pos, vec4 q) { - vec4 qInv = vec4(-q.xyz, q.w); - return quaternionMultiply(quaternionMultiply(q, vec4(pos, 0)), qInv).xyz; -} - -void main() { - vec3 position = Position / 2 * pi; - float animation = GameTime * 2048.; - - //waving foliage - vec3 offset = vec3(0.0,0.0,0.0); - float alpha = texture(Sampler0, UV0).a * 255; - if (alpha == 1.0 || alpha == 253.0 ) { // Most plants like grass and flowers use this - offset.x = sin(position.x + animation) * -1.0 / 32.; - offset.z = cos(position.z + position.y + animation) * -1.0 / 32.; - - } else if (alpha == 2.0) { // Used for the edges of multi-blocks, like the top block of tall grass or the bottom block of twisting vines - offset.x = sin(position.x + position.y + animation) * -2.0 / 32.; - offset.z = cos(position.z + position.y + animation) * -2.0 / 32.; - - } else if (alpha == 3.0) { - offset.x = sin(position.x + position.y + animation) * -1.0 / 32.; - offset.y = sin(position.y + (animation / 1.5)) / 9.0; - offset.z = cos(position.z + position.y + animation) * -1.0 / 32.; - - } else if (alpha == 4.0 || alpha == 2.0) { - offset.x = sin(position.x + position.y + animation) / 32.; - offset.z = cos(position.z + position.y + animation) / 32.; - - } - - gl_Position = ProjMat * ModelViewMat * (vec4(Position + ChunkOffset + offset, 1.0)); - - //hanging lanterns - if (alpha == 250.) { - vec3 relativePos = fract(Position); - if (relativePos.y > 0.001) { - float time = GameTime * 1000.0 + dot(floor(Position), vec3(1.0)) * 1234.0; - vec3 newDown = normalize(vec3( - sin(time * phi) * 0.015, - -1.0, - sin(time) * 0.015 - )); - - relativePos -= vec3(0.5, 1.0, 0.5); - vec3 axis = normalize(cross(vec3(0, 1, 0), newDown)); - float cosAngle = newDown.y; - vec4 quat = vec4(sqrt(1 - cosAngle * cosAngle) * axis, cosAngle); - relativePos = quaternionRotate(relativePos, quat); - offset = relativePos + vec3(0.5, 1.0, 0.5); - gl_Position = ProjMat * ModelViewMat * vec4(floor(Position) + offset + ChunkOffset, 1.0); - } - } - - vertexDistance = length((ModelViewMat * vec4(Position + ChunkOffset, 1.0)).xyz); - lightColor = minecraft_sample_lightmap(Sampler2, UV2); - vertexColor = Color; - texCoord0 = UV0; - normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); - glpos = gl_Position; -} diff --git a/assets/minecraft/shaders/core/rendertype_cutout_mipped.fsh b/assets/minecraft/shaders/core/rendertype_cutout_mipped.fsh deleted file mode 100644 index fb4bf31..0000000 --- a/assets/minecraft/shaders/core/rendertype_cutout_mipped.fsh +++ /dev/null @@ -1,32 +0,0 @@ -#version 150 - -#moj_import -#moj_import -#moj_import - -uniform sampler2D Sampler0; - -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; -in vec4 vertexColor; -in vec4 lightColor; -in vec2 texCoord0; -in vec4 normal; -in vec4 glpos; - -out vec4 fragColor; - -void main() { - discardControlGLPos(gl_FragCoord.xy, glpos); - vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator; - float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0; - color = make_emissive(color, lightColor, vertexDistance, alpha); - if (color.a < 0.5) { - discard; - } - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); -} diff --git a/assets/minecraft/shaders/core/rendertype_cutout_mipped.json b/assets/minecraft/shaders/core/rendertype_cutout_mipped.json index 8d5086e..4d79ff1 100644 --- a/assets/minecraft/shaders/core/rendertype_cutout_mipped.json +++ b/assets/minecraft/shaders/core/rendertype_cutout_mipped.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_cutout_mipped", - "fragment": "rendertype_cutout_mipped", + "vertex": "common/block", + "fragment": "common/block", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_cutout_mipped.vsh b/assets/minecraft/shaders/core/rendertype_cutout_mipped.vsh deleted file mode 100644 index 0b32ccb..0000000 --- a/assets/minecraft/shaders/core/rendertype_cutout_mipped.vsh +++ /dev/null @@ -1,50 +0,0 @@ -#version 150 - -#moj_import - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in ivec2 UV2; -in vec3 Normal; - -uniform sampler2D Sampler2; -uniform sampler2D Sampler0; -uniform float GameTime; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform vec3 ChunkOffset; - -out float vertexDistance; -out vec4 vertexColor; -out vec4 lightColor; -out vec2 texCoord0; -out vec4 normal; -out vec4 glpos; - -#define pi 3.1415926535897932 - -void main() { - float time = GameTime * 2048; - float xx = Position.x / 2 * pi; - float yy = Position.y / 2 * pi; - float zz = Position.z / 2 * pi; - - vec3 offset = vec3(0.0,0.0,0.0); - float alpha = texture(Sampler0, UV0).a * 255; - if (alpha == 1.0 || alpha == 253.0) { //leaves - offset.x = ((sin(time * 0.9 + yy) + cos(time * 0.9 + zz)) * 0.02); - offset.y = ((cos(time / 3.0 + xx) + sin(time / 3.0 + zz)) * 0.01); - offset.z = ((sin(time + 256 + yy) + cos(time + 256 + xx)) * 0.02); - } - - gl_Position = ProjMat * ModelViewMat * (vec4(Position + ChunkOffset + offset, 1.0)); - - vertexDistance = length((ModelViewMat * vec4(Position + ChunkOffset, 1.0)).xyz); - lightColor = minecraft_sample_lightmap(Sampler2, UV2); - vertexColor = Color; - texCoord0 = UV0; - normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); - glpos = gl_Position; -} diff --git a/assets/minecraft/shaders/core/rendertype_end_gateway.json b/assets/minecraft/shaders/core/rendertype_end_gateway.json index f0c491f..8067806 100644 --- a/assets/minecraft/shaders/core/rendertype_end_gateway.json +++ b/assets/minecraft/shaders/core/rendertype_end_gateway.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_end_portal", - "fragment": "rendertype_end_portal", + "vertex": "special/end_portal", + "fragment": "special/end_portal", "attributes": [], "samplers": [ { "name": "Sampler0" }, diff --git a/assets/minecraft/shaders/core/rendertype_end_portal.json b/assets/minecraft/shaders/core/rendertype_end_portal.json index 605e1f7..5e3ae28 100644 --- a/assets/minecraft/shaders/core/rendertype_end_portal.json +++ b/assets/minecraft/shaders/core/rendertype_end_portal.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_end_portal", - "fragment": "rendertype_end_portal", + "vertex": "special/end_portal", + "fragment": "special/end_portal", "attributes": [], "samplers": [ { "name": "Sampler0" }, diff --git a/assets/minecraft/shaders/core/rendertype_energy_swirl.json b/assets/minecraft/shaders/core/rendertype_energy_swirl.json index 54af8f3..db12fc5 100644 --- a/assets/minecraft/shaders/core/rendertype_energy_swirl.json +++ b/assets/minecraft/shaders/core/rendertype_energy_swirl.json @@ -4,15 +4,12 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_energy_swirl", - "fragment": "rendertype_energy_swirl", + "vertex": "common/entity_glint", + "fragment": "common/entity_glint", "attributes": [ "Position", "Color", - "UV0", - "UV1", - "UV2", - "Normal" + "UV0" ], "samplers": [ { "name": "Sampler0" } diff --git a/assets/minecraft/shaders/core/rendertype_energy_swirl.vsh b/assets/minecraft/shaders/core/rendertype_energy_swirl.vsh deleted file mode 100644 index 3386612..0000000 --- a/assets/minecraft/shaders/core/rendertype_energy_swirl.vsh +++ /dev/null @@ -1,26 +0,0 @@ -#version 150 - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in vec2 UV1; -in vec2 UV2; -in vec3 Normal; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform mat4 TextureMat; - -out vec4 vertexColor; -out vec2 texCoord0; -out vec4 normal; -out vec4 glpos; - -void main() { - gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - - vertexColor = Color; - texCoord0 = (TextureMat * vec4(UV0, 0.0, 1.0)).xy; - normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); - glpos = gl_Position; -} diff --git a/assets/minecraft/shaders/core/rendertype_entity_cutout.fsh b/assets/minecraft/shaders/core/rendertype_entity_cutout.fsh deleted file mode 100644 index b77a5d8..0000000 --- a/assets/minecraft/shaders/core/rendertype_entity_cutout.fsh +++ /dev/null @@ -1,39 +0,0 @@ -#version 150 - -#moj_import -#moj_import -#moj_import - -uniform mat4 ProjMat; -uniform sampler2D Sampler0; - -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; -in vec4 vertexColor; -in vec4 lightColor; -in vec4 lightMapColor; -in vec4 overlayColor; -in vec2 texCoord0; -in vec4 normal; -in vec4 glpos; - -out vec4 fragColor; - -void main() { - if (!isGUI(ProjMat)) discardControlGLPos(gl_FragCoord.xy, glpos); - vec4 color = texture(Sampler0, texCoord0); - color *= vertexColor * ColorModulator; - color.rgb = mix(overlayColor.rgb, color.rgb, overlayColor.a); - if (color.a < 0.1) { - discard; - } - if (!isGUI(ProjMat)) { - float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0; - color = make_emissive(color, lightColor, vertexDistance, alpha); - } - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); -} diff --git a/assets/minecraft/shaders/core/rendertype_entity_cutout.json b/assets/minecraft/shaders/core/rendertype_entity_cutout.json index 53bd2c4..61534c4 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_cutout.json +++ b/assets/minecraft/shaders/core/rendertype_entity_cutout.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_entity_cutout", - "fragment": "rendertype_entity_cutout", + "vertex": "common/entity", + "fragment": "common/entity", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull.fsh b/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull.fsh deleted file mode 100644 index 511d9cc..0000000 --- a/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull.fsh +++ /dev/null @@ -1,38 +0,0 @@ -#version 150 - -#moj_import -#moj_import -#moj_import - -uniform mat4 ProjMat; -uniform sampler2D Sampler0; - -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; -in vec4 vertexColor; -in vec4 lightColor; -in vec4 overlayColor; -in vec2 texCoord0; -in vec4 normal; -in vec4 glpos; - -out vec4 fragColor; - -void main() { - if (!isGUI(ProjMat)) discardControlGLPos(gl_FragCoord.xy, glpos); - vec4 color = texture(Sampler0, texCoord0); - color *= vertexColor * ColorModulator; - color.rgb = mix(overlayColor.rgb, color.rgb, overlayColor.a); - if (color.a < 0.1) { - discard; - } - if (!isGUI(ProjMat)) { - float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0; - color = make_emissive(color, lightColor, vertexDistance, alpha); - } - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); -} diff --git a/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull.json b/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull.json index 5536995..206da1c 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull.json +++ b/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_entity_cutout_no_cull_z_offset", - "fragment": "rendertype_entity_cutout_no_cull_z_offset", + "vertex": "common/entity_lightmap_colored", + "fragment": "common/entity_lightmap_colored", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull.vsh b/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull.vsh deleted file mode 100644 index f38ce54..0000000 --- a/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull.vsh +++ /dev/null @@ -1,48 +0,0 @@ -#version 150 - -#moj_import -#moj_import - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in ivec2 UV1; -in ivec2 UV2; -in vec3 Normal; - -uniform sampler2D Sampler1; -uniform sampler2D Sampler2; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - -uniform float GameTime; -uniform vec3 Light0_Direction; -uniform vec3 Light1_Direction; - -out float vertexDistance; -out vec4 vertexColor; -out vec4 lightColor; -out vec4 overlayColor; -out vec2 texCoord0; -out vec4 normal; -out vec4 glpos; - -void main() { - gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); - vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, Color); - - float dist = -(ModelViewMat * vec4(1.0)).z; - if (dist == 1602.) { - mat4 rot = Rotate(GameTime * ROTSPEED, Y) * Scale(1.1, 1.1, 1.1); - gl_Position = ProjMat * ModelViewMat * vec4((vec4(Position, 0) * rot).xyz, 1.0); - normal = vec4((vec4(Normal, 0) * rot).xyz, 1.0); - vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, normal.xyz, Color); - } - vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz); - lightColor = minecraft_sample_lightmap(Sampler2, UV2); - overlayColor = texelFetch(Sampler1, UV1, 0); - texCoord0 = UV0; - glpos = gl_Position; -} diff --git a/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull_z_offset.fsh b/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull_z_offset.fsh deleted file mode 100644 index 511d9cc..0000000 --- a/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull_z_offset.fsh +++ /dev/null @@ -1,38 +0,0 @@ -#version 150 - -#moj_import -#moj_import -#moj_import - -uniform mat4 ProjMat; -uniform sampler2D Sampler0; - -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; -in vec4 vertexColor; -in vec4 lightColor; -in vec4 overlayColor; -in vec2 texCoord0; -in vec4 normal; -in vec4 glpos; - -out vec4 fragColor; - -void main() { - if (!isGUI(ProjMat)) discardControlGLPos(gl_FragCoord.xy, glpos); - vec4 color = texture(Sampler0, texCoord0); - color *= vertexColor * ColorModulator; - color.rgb = mix(overlayColor.rgb, color.rgb, overlayColor.a); - if (color.a < 0.1) { - discard; - } - if (!isGUI(ProjMat)) { - float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0; - color = make_emissive(color, lightColor, vertexDistance, alpha); - } - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); -} diff --git a/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull_z_offset.json b/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull_z_offset.json index 26815f6..7fcfc94 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull_z_offset.json +++ b/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull_z_offset.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_entity_cutout_no_cull_z_offset", - "fragment": "rendertype_entity_cutout_no_cull_z_offset", + "vertex": "common/entity_lightmap_colored", + "fragment": "common/entity_lightmap_colored", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull_z_offset.vsh b/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull_z_offset.vsh deleted file mode 100644 index f2cb6f8..0000000 --- a/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull_z_offset.vsh +++ /dev/null @@ -1,48 +0,0 @@ -#version 150 - -#moj_import -#moj_import - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in ivec2 UV1; -in ivec2 UV2; -in vec3 Normal; - -uniform sampler2D Sampler1; -uniform sampler2D Sampler2; - -uniform float GameTime; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - -uniform vec3 Light0_Direction; -uniform vec3 Light1_Direction; - -out float vertexDistance; -out vec4 vertexColor; -out vec4 overlayColor; -out vec4 lightColor; -out vec2 texCoord0; -out vec4 normal; -out vec4 glpos; - -void main() { - gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); - vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, Color); - //rotating items - float dist = -(ModelViewMat * vec4(1.0)).z; - if (abs(dist - 1602.) < 5.) { - mat4 rot = Rotate(GameTime * ROTSPEED, Y) * Scale(1.1, 1.1, 1.1); - gl_Position = ProjMat * ModelViewMat * vec4((vec4(Position, 0) * rot).xyz, 1.0); - normal = vec4((vec4(Normal, 0) * rot).xyz, 1.0); - vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, normal.xyz, Color); - } - vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz); - lightColor = minecraft_sample_lightmap(Sampler2, UV2); - overlayColor = texelFetch(Sampler1, UV1, 0); - texCoord0 = UV0; - glpos = gl_Position; -} diff --git a/assets/minecraft/shaders/core/rendertype_entity_no_outline.fsh b/assets/minecraft/shaders/core/rendertype_entity_no_outline.fsh deleted file mode 100644 index 0a9ab8c..0000000 --- a/assets/minecraft/shaders/core/rendertype_entity_no_outline.fsh +++ /dev/null @@ -1,34 +0,0 @@ -#version 150 - -#moj_import -#moj_import -#moj_import - -uniform mat4 ProjMat; -uniform sampler2D Sampler0; - -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; -in vec4 vertexColor; -in vec4 lightColor; -in vec4 lightMapColor; -in vec2 texCoord0; -in vec4 normal; -in vec4 glpos; - -out vec4 fragColor; - -void main() { - if (!isGUI(ProjMat)) discardControlGLPos(gl_FragCoord.xy, glpos); - vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator; - if (!isGUI(ProjMat)) { - float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0; - color = make_emissive(color, lightColor, vertexDistance, alpha); - color = apply_lightmap(color, lightMapColor, vertexDistance, alpha); - } - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); -} diff --git a/assets/minecraft/shaders/core/rendertype_entity_no_outline.json b/assets/minecraft/shaders/core/rendertype_entity_no_outline.json index 81c0df1..7d11d8d 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_no_outline.json +++ b/assets/minecraft/shaders/core/rendertype_entity_no_outline.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_entity_no_outline", - "fragment": "rendertype_entity_no_outline", + "vertex": "common/entity_lightmap_colored", + "fragment": "common/entity_lightmap_colored", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_entity_no_outline.vsh b/assets/minecraft/shaders/core/rendertype_entity_no_outline.vsh deleted file mode 100644 index 21a7271..0000000 --- a/assets/minecraft/shaders/core/rendertype_entity_no_outline.vsh +++ /dev/null @@ -1,47 +0,0 @@ -#version 150 - -#moj_import -#moj_import - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in ivec2 UV2; -in vec3 Normal; - -uniform sampler2D Sampler2; - -uniform float GameTime; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - -uniform vec3 Light0_Direction; -uniform vec3 Light1_Direction; - -out float vertexDistance; -out vec4 vertexColor; -out vec4 lightColor; -out vec4 lightMapColor; -out vec2 texCoord0; -out vec4 normal; -out vec4 glpos; - -void main() { - gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, Color); - normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); - - float dist = -(ModelViewMat * vec4(1.0)).z; - if (dist == 1602.) { - mat4 rot = Rotate(GameTime * ROTSPEED, Y) * Scale(1.1, 1.1, 1.1); - gl_Position = ProjMat * ModelViewMat * vec4((vec4(Position, 0) * rot).xyz, 1.0); - normal = vec4((vec4(Normal, 0) * rot).xyz, 1.0); - vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, normal.xyz, Color); - } - - vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz); - lightColor = minecraft_sample_lightmap(Sampler2, UV2); - lightMapColor = texelFetch(Sampler2, UV2 / 16, 0); - texCoord0 = UV0; - glpos = gl_Position; -} diff --git a/assets/minecraft/shaders/core/rendertype_entity_shadow.fsh b/assets/minecraft/shaders/core/rendertype_entity_shadow.fsh deleted file mode 100644 index 349de7a..0000000 --- a/assets/minecraft/shaders/core/rendertype_entity_shadow.fsh +++ /dev/null @@ -1,25 +0,0 @@ -#version 150 - -#moj_import -#moj_import - -uniform sampler2D Sampler0; - -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; -in vec4 vertexColor; -in vec2 texCoord0; -in vec4 glpos; - -out vec4 fragColor; - -void main() { - discardControlGLPos(gl_FragCoord.xy, glpos); - vec4 color = texture(Sampler0, clamp(texCoord0, 0.0, 1.0)); - color *= vertexColor * ColorModulator; - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); -} diff --git a/assets/minecraft/shaders/core/rendertype_entity_shadow.json b/assets/minecraft/shaders/core/rendertype_entity_shadow.json index cbd2353..9598b54 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_shadow.json +++ b/assets/minecraft/shaders/core/rendertype_entity_shadow.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_entity_shadow", - "fragment": "rendertype_entity_shadow", + "vertex": "common/entity_colored", + "fragment": "common/entity_colored", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_entity_shadow.vsh b/assets/minecraft/shaders/core/rendertype_entity_shadow.vsh deleted file mode 100644 index c13eabd..0000000 --- a/assets/minecraft/shaders/core/rendertype_entity_shadow.vsh +++ /dev/null @@ -1,22 +0,0 @@ -#version 150 - -in vec3 Position; -in vec4 Color; -in vec2 UV0; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - -out float vertexDistance; -out vec4 vertexColor; -out vec2 texCoord0; -out vec4 glpos; - -void main() { - gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - - vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz); - vertexColor = Color; - texCoord0 = UV0; - glpos = gl_Position; -} diff --git a/assets/minecraft/shaders/core/rendertype_entity_smooth_cutout.fsh b/assets/minecraft/shaders/core/rendertype_entity_smooth_cutout.fsh deleted file mode 100644 index f2b0e67..0000000 --- a/assets/minecraft/shaders/core/rendertype_entity_smooth_cutout.fsh +++ /dev/null @@ -1,36 +0,0 @@ -#version 150 - -#moj_import -#moj_import -#moj_import - -uniform mat4 ProjMat; -uniform sampler2D Sampler0; - -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; -in vec4 vertexColor; -in vec4 lightMapColor; -in vec4 overlayColor; -in vec2 texCoord0; -in vec4 normal; -in vec4 glpos; - -out vec4 fragColor; - -void main() { - discardControlGLPos(gl_FragCoord.xy, glpos); - vec4 color = texture(Sampler0, texCoord0); - if (color.a < 0.1) { - discard; - } - color *= vertexColor * ColorModulator; - color.rgb = mix(overlayColor.rgb, color.rgb, overlayColor.a); - float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0; - color = apply_lightmap(color, lightMapColor, vertexDistance, alpha); - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); -} diff --git a/assets/minecraft/shaders/core/rendertype_entity_smooth_cutout.json b/assets/minecraft/shaders/core/rendertype_entity_smooth_cutout.json index bca94a0..fee41e1 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_smooth_cutout.json +++ b/assets/minecraft/shaders/core/rendertype_entity_smooth_cutout.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_entity_smooth_cutout", - "fragment": "rendertype_entity_smooth_cutout", + "vertex": "common/entity", + "fragment": "common/entity", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_entity_smooth_cutout.vsh b/assets/minecraft/shaders/core/rendertype_entity_smooth_cutout.vsh deleted file mode 100644 index 03c296d..0000000 --- a/assets/minecraft/shaders/core/rendertype_entity_smooth_cutout.vsh +++ /dev/null @@ -1,39 +0,0 @@ -#version 150 - -#moj_import - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in ivec2 UV1; -in ivec2 UV2; -in vec3 Normal; - -uniform sampler2D Sampler1; -uniform sampler2D Sampler2; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - -uniform vec3 Light0_Direction; -uniform vec3 Light1_Direction; - -out float vertexDistance; -out vec4 vertexColor; -out vec4 lightMapColor; -out vec4 overlayColor; -out vec2 texCoord0; -out vec4 normal; -out vec4 glpos; - -void main() { - gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - - vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz); - vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, Color); - lightMapColor = texelFetch(Sampler2, UV2 / 16, 0); - overlayColor = texelFetch(Sampler1, UV1, 0); - texCoord0 = UV0; - normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); - glpos = gl_Position; -} diff --git a/assets/minecraft/shaders/core/rendertype_entity_solid.json b/assets/minecraft/shaders/core/rendertype_entity_solid.json index c46ef30..61534c4 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_solid.json +++ b/assets/minecraft/shaders/core/rendertype_entity_solid.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_entity_solid", - "fragment": "rendertype_entity_solid", + "vertex": "common/entity", + "fragment": "common/entity", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_entity_translucent.json b/assets/minecraft/shaders/core/rendertype_entity_translucent.json index ef20c39..b03f85a 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_translucent.json +++ b/assets/minecraft/shaders/core/rendertype_entity_translucent.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_entity_translucent", - "fragment": "rendertype_entity_translucent", + "vertex": "special/entity_translucent", + "fragment": "special/entity_translucent", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_entity_translucent_cull.fsh b/assets/minecraft/shaders/core/rendertype_entity_translucent_cull.fsh deleted file mode 100644 index 870d2de..0000000 --- a/assets/minecraft/shaders/core/rendertype_entity_translucent_cull.fsh +++ /dev/null @@ -1,35 +0,0 @@ -#version 150 - -#moj_import -#moj_import -#moj_import - -uniform mat4 ProjMat; -uniform sampler2D Sampler0; - -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; -in vec4 vertexColor; -in vec4 lightColor; -in vec2 texCoord0; -in vec4 normal; -in vec4 glpos; - -out vec4 fragColor; - -void main() { - if (!isGUI(ProjMat)) discardControlGLPos(gl_FragCoord.xy, glpos); - vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator; - if (color.a < 0.1) { - discard; - } - if (!isGUI(ProjMat)) { - float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0; - color = make_emissive(color, lightColor, vertexDistance, alpha); - } - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); -} \ No newline at end of file diff --git a/assets/minecraft/shaders/core/rendertype_entity_translucent_cull.json b/assets/minecraft/shaders/core/rendertype_entity_translucent_cull.json index 7ad9838..ca37e90 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_translucent_cull.json +++ b/assets/minecraft/shaders/core/rendertype_entity_translucent_cull.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_entity_translucent_cull", - "fragment": "rendertype_entity_translucent_cull", + "vertex": "common/entity_lightmap_colored", + "fragment": "common/entity_lightmap_colored", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_entity_translucent_cull.vsh b/assets/minecraft/shaders/core/rendertype_entity_translucent_cull.vsh deleted file mode 100644 index e5e6dda..0000000 --- a/assets/minecraft/shaders/core/rendertype_entity_translucent_cull.vsh +++ /dev/null @@ -1,49 +0,0 @@ -#version 150 - -#moj_import -#moj_import - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in vec2 UV1; -in ivec2 UV2; -in vec3 Normal; - -uniform sampler2D Sampler2; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - -uniform float GameTime; -uniform vec3 Light0_Direction; -uniform vec3 Light1_Direction; - -out float vertexDistance; -out vec4 vertexColor; -out vec4 lightColor; -out vec2 texCoord0; -out vec2 texCoord2; -out vec4 normal; -out vec4 glpos; - -void main() { - gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); - vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, Color); - - float dist = -(ModelViewMat * vec4(1.0)).z; - if (dist == 1602.) { - mat4 rot = Rotate(GameTime * ROTSPEED, Y) * Scale(1.1, 1.1, 1.1); - gl_Position = ProjMat * ModelViewMat * vec4((vec4(Position, 0) * rot).xyz, 1.0); - normal = vec4((vec4(Normal, 0) * rot).xyz, 1.0); - vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, normal.xyz, Color); - } - - vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz); - lightColor = minecraft_sample_lightmap(Sampler2, UV2); - texCoord0 = UV0; - texCoord2 = UV2; - normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); - glpos = gl_Position; -} \ No newline at end of file diff --git a/assets/minecraft/shaders/core/rendertype_eyes.json b/assets/minecraft/shaders/core/rendertype_eyes.json index 536edef..5444ec4 100644 --- a/assets/minecraft/shaders/core/rendertype_eyes.json +++ b/assets/minecraft/shaders/core/rendertype_eyes.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_eyes", - "fragment": "rendertype_eyes", + "vertex": "common/entity_colored", + "fragment": "common/entity_colored", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_glint.json b/assets/minecraft/shaders/core/rendertype_glint.json new file mode 100644 index 0000000..74666bb --- /dev/null +++ b/assets/minecraft/shaders/core/rendertype_glint.json @@ -0,0 +1,25 @@ +{ + "blend": { + "func": "add", + "srcrgb": "srcalpha", + "dstrgb": "1-srcalpha" + }, + "vertex": "common/entity_glint_rotate", + "fragment": "common/entity_glint", + "attributes": [ + "Position", + "UV0" + ], + "samplers": [ + { "name": "Sampler0" } + ], + "uniforms": [ + { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, + { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, + { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] }, + { "name": "FogStart", "type": "float", "count": 1, "values": [ 0.0 ] }, + { "name": "FogEnd", "type": "float", "count": 1, "values": [ 1.0 ] }, + { "name": "FogColor", "type": "float", "count": 4, "values": [ 0.0, 0.0, 0.0, 0.0 ] }, + { "name": "TextureMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] } + ] +} diff --git a/assets/minecraft/shaders/core/rendertype_glint_direct.json b/assets/minecraft/shaders/core/rendertype_glint_direct.json index fe0535e..249574f 100644 --- a/assets/minecraft/shaders/core/rendertype_glint_direct.json +++ b/assets/minecraft/shaders/core/rendertype_glint_direct.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_glint_direct", - "fragment": "rendertype_glint_direct", + "vertex": "common/entity_glint_rotate", + "fragment": "common/entity_glint", "attributes": [ "Position", "UV0" diff --git a/assets/minecraft/shaders/core/rendertype_glint_direct.vsh b/assets/minecraft/shaders/core/rendertype_glint_direct.vsh deleted file mode 100644 index ebba70c..0000000 --- a/assets/minecraft/shaders/core/rendertype_glint_direct.vsh +++ /dev/null @@ -1,30 +0,0 @@ -#version 150 - -#moj_import - -#define NONORMALS - -in vec3 Position; -in vec2 UV0; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform mat4 TextureMat; - -uniform float GameTime; -uniform vec2 ScreenSize; - -out float vertexDistance; -out vec2 texCoord0; - -void main() { - gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz); - texCoord0 = (TextureMat * vec4(UV0, 0.0, 1.0)).xy; - - float dist = -(ModelViewMat * vec4(1.0)).z; - if (dist == 1602.) { - mat4 rot = Rotate(GameTime * ROTSPEED, Y) * Scale(1.1, 1.1, 1.1); - gl_Position = ProjMat * ModelViewMat * vec4((vec4(Position, 0) * rot).xyz, 1.0); - } -} \ No newline at end of file diff --git a/assets/minecraft/shaders/core/rendertype_glint_translucent.json b/assets/minecraft/shaders/core/rendertype_glint_translucent.json index 7763c6f..249574f 100644 --- a/assets/minecraft/shaders/core/rendertype_glint_translucent.json +++ b/assets/minecraft/shaders/core/rendertype_glint_translucent.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_glint_translucent", - "fragment": "rendertype_glint_translucent", + "vertex": "common/entity_glint_rotate", + "fragment": "common/entity_glint", "attributes": [ "Position", "UV0" diff --git a/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.json b/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.json index e560404..3257fcd 100644 --- a/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.json +++ b/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_entity_translucent_cull", - "fragment": "rendertype_entity_translucent_cull", + "vertex": "common/entity_lightmap_colored", + "fragment": "common/entity_lightmap_colored", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.vsh b/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.vsh deleted file mode 100644 index f3012f0..0000000 --- a/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.vsh +++ /dev/null @@ -1,46 +0,0 @@ -#version 150 - -#moj_import -#moj_import - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in vec2 UV1; -in ivec2 UV2; -in vec3 Normal; - -uniform sampler2D Sampler2; - -uniform float GameTime; -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - -uniform vec3 Light0_Direction; -uniform vec3 Light1_Direction; - -out float vertexDistance; -out vec4 vertexColor; -out vec4 lightColor; -out vec2 texCoord0; -out vec4 normal; -out vec4 glpos; - -void main() { - gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, Color); - normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); - - float dist = -(ModelViewMat * vec4(1.0)).z; - if (dist == 1602.) { - mat4 rot = Rotate(GameTime * ROTSPEED, Y) * Scale(1.1, 1.1, 1.1); - gl_Position = ProjMat * ModelViewMat * vec4((vec4(Position, 0) * rot).xyz, 1.0); - normal = vec4((vec4(Normal, 0) * rot).xyz, 1.0); - vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, normal.xyz, Color); - } - - vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz); - lightColor = minecraft_sample_lightmap(Sampler2, UV2); - texCoord0 = UV0; - glpos = gl_Position; -} diff --git a/assets/minecraft/shaders/core/rendertype_leash.json b/assets/minecraft/shaders/core/rendertype_leash.json index d2077cf..fedc41e 100644 --- a/assets/minecraft/shaders/core/rendertype_leash.json +++ b/assets/minecraft/shaders/core/rendertype_leash.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_leash", - "fragment": "rendertype_leash", + "vertex": "special/leash", + "fragment": "special/leash", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_lines.json b/assets/minecraft/shaders/core/rendertype_lines.json new file mode 100644 index 0000000..38a4829 --- /dev/null +++ b/assets/minecraft/shaders/core/rendertype_lines.json @@ -0,0 +1,27 @@ +{ + "blend": { + "func": "add", + "srcrgb": "srcalpha", + "dstrgb": "1-srcalpha" + }, + "vertex": "special/lines", + "fragment": "special/lines", + "attributes": [ + "Position", + "Color", + "Normal" + ], + "samplers": [ + ], + "uniforms": [ + { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, + { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, + { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] }, + { "name": "LineWidth", "type": "float", "count": 1, "values": [ 1.0 ] }, + { "name": "ScreenSize", "type": "float", "count": 2, "values": [ 1.0, 1.0 ] }, + { "name": "FogStart", "type": "float", "count": 1, "values": [ 0.0 ] }, + { "name": "FogEnd", "type": "float", "count": 1, "values": [ 1.0 ] }, + { "name": "FogColor", "type": "float", "count": 4, "values": [ 0.0, 0.0, 0.0, 0.0 ] }, + { "name": "GameTime", "type": "float", "count": 1, "values": [ 1.0 ] } + ] +} diff --git a/assets/minecraft/shaders/core/rendertype_outline.json b/assets/minecraft/shaders/core/rendertype_outline.json new file mode 100644 index 0000000..4f39789 --- /dev/null +++ b/assets/minecraft/shaders/core/rendertype_outline.json @@ -0,0 +1,22 @@ +{ + "blend": { + "func": "add", + "srcrgb": "srcalpha", + "dstrgb": "1-srcalpha" + }, + "vertex": "common/entity_colored", + "fragment": "common/entity_colored", + "attributes": [ + "Position", + "Color", + "UV0" + ], + "samplers": [ + { "name": "Sampler0" } + ], + "uniforms": [ + { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, + { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, + { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] } + ] +} diff --git a/assets/minecraft/shaders/core/rendertype_solid.fsh b/assets/minecraft/shaders/core/rendertype_solid.fsh deleted file mode 100644 index 991466a..0000000 --- a/assets/minecraft/shaders/core/rendertype_solid.fsh +++ /dev/null @@ -1,30 +0,0 @@ -#version 150 - -#moj_import -#moj_import -#moj_import - -uniform sampler2D Sampler0; - -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; -in vec4 vertexColor; -in vec4 lightColor; -in vec2 texCoord0; -in vec2 texCoord2; -in vec3 normal; -in vec4 glpos; - -out vec4 fragColor; - -void main() { - discardControlGLPos(gl_FragCoord.xy, glpos); - vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator; - float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0; - color = make_emissive(color, lightColor, vertexDistance, alpha); - fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); -} diff --git a/assets/minecraft/shaders/core/rendertype_solid.json b/assets/minecraft/shaders/core/rendertype_solid.json index fc3cde6..3c45016 100644 --- a/assets/minecraft/shaders/core/rendertype_solid.json +++ b/assets/minecraft/shaders/core/rendertype_solid.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_solid", - "fragment": "rendertype_solid", + "vertex": "common/block", + "fragment": "common/block", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_solid.vsh b/assets/minecraft/shaders/core/rendertype_solid.vsh deleted file mode 100644 index 9a6f55a..0000000 --- a/assets/minecraft/shaders/core/rendertype_solid.vsh +++ /dev/null @@ -1,57 +0,0 @@ -#version 150 - -#moj_import -#moj_import - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in ivec2 UV2; -in vec3 Normal; - -uniform sampler2D Sampler0; -uniform sampler2D Sampler2; -uniform float GameTime; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform vec3 ChunkOffset; - -out float vertexDistance; -out vec4 vertexColor; -out vec4 lightColor; -out vec2 texCoord0; -out vec3 normal; -out vec4 glpos; - -#define pi 3.1415926535897932 - -void main() { - vec3 position = Position + ChunkOffset; - float time = GameTime * 128; - float anim = GameTime * pi; - float xx = Position.x/16. * 2 * pi; - float zz = Position.z/16. * 2 * pi; - float dropoff = max((position.x*position.x) + (position.z*position.z) - 64., 512.) / 512.; - float far = ProjMat[3][2] * 0.05 / (ProjMat[3][2] + 2.0 * 0.05) / 3.0 * sqrt(3); - - float offset = 0.0; - if (rougheq(texture(Sampler0, UV0).a*255., 165.)) { //lava - if ((mod(Position.y, 1.0) > 0.1) || (mod(Position.y, 1.0) < 0.01)) { - offset = ((sin(time + xx) + cos(time + zz)) * 0.02) - 0.01; - offset /= dropoff; - offset += 0.03 * sin((Position.z * pi / 4.0 + anim * 700)) * 1.0 * (1.0 - smoothstep(0.0, 1.0, vertexDistance / far)); - offset += 0.03 * cos((Position.z * pi / 8.0 + Position.x * pi / 4.0 + anim * 400) + pi / 13.0) * 1.2 * (1.0 - smoothstep(0.1, 1.0, vertexDistance / far)); - offset += 0.03 * sin((Position.z * pi / 8.0 - Position.x * pi / 2.0 - anim * 900) - pi / 7.0) * 0.75 * (1.0 - smoothstep(0.0, 0.3, vertexDistance / far)); - offset += 0.03 * cos((Position.z * pi * 7.0 + Position.x * pi / 2.0 - anim * 870) + pi / 5.0) * 0.75 * (1.0 - smoothstep(0.0, 0.9, vertexDistance / far)); - } - } - - gl_Position = ProjMat * ModelViewMat * vec4(position + vec3(0., offset, 0.), 1.); - vertexDistance = length((ModelViewMat * vec4(position, 1.0)).xyz); - lightColor = minecraft_sample_lightmap(Sampler2, UV2); - vertexColor = Color; - texCoord0 = UV0; - normal = Normal; - glpos = gl_Position; -} diff --git a/assets/minecraft/shaders/core/rendertype_text.json b/assets/minecraft/shaders/core/rendertype_text.json index fc7b300..690bba6 100644 --- a/assets/minecraft/shaders/core/rendertype_text.json +++ b/assets/minecraft/shaders/core/rendertype_text.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_text", - "fragment": "rendertype_text", + "vertex": "special/simple", + "fragment": "special/text", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_text.vsh b/assets/minecraft/shaders/core/rendertype_text.vsh deleted file mode 100644 index 7fddd15..0000000 --- a/assets/minecraft/shaders/core/rendertype_text.vsh +++ /dev/null @@ -1,29 +0,0 @@ -#version 150 - -#moj_import - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in ivec2 UV2; - -uniform sampler2D Sampler2; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; - -out float vertexDistance; -out vec4 vertexColor; -out vec4 lightColor; -out vec2 texCoord0; -out vec4 glpos; - -void main() { - gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - - vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz); - vertexColor = Color; - lightColor = minecraft_sample_lightmap(Sampler2, UV2); - texCoord0 = UV0; - glpos = gl_Position; -} diff --git a/assets/minecraft/shaders/core/rendertype_translucent.fsh b/assets/minecraft/shaders/core/rendertype_translucent.fsh deleted file mode 100644 index 89e76c4..0000000 --- a/assets/minecraft/shaders/core/rendertype_translucent.fsh +++ /dev/null @@ -1,26 +0,0 @@ -#version 150 - -#moj_import -#moj_import - -uniform sampler2D Sampler0; - -uniform vec4 ColorModulator; -uniform float FogStart; -uniform float FogEnd; -uniform vec4 FogColor; - -in float vertexDistance; -in vec4 vertexColor; -in vec4 lightColor; -in vec2 texCoord0; -in vec4 normal; - -out vec4 fragColor; - -void main() { - vec4 color = texture(Sampler0, texCoord0) * vertexColor * ColorModulator; - float alpha = textureLod(Sampler0, texCoord0, 0.0).a * 255.0; - color = make_emissive(color, lightColor, vertexDistance, alpha); - fragColor = linear_fog_translucent(color, vertexDistance, FogStart, FogEnd, FogColor); -} diff --git a/assets/minecraft/shaders/core/rendertype_translucent.json b/assets/minecraft/shaders/core/rendertype_translucent.json index 7004a2b..3c45016 100644 --- a/assets/minecraft/shaders/core/rendertype_translucent.json +++ b/assets/minecraft/shaders/core/rendertype_translucent.json @@ -4,8 +4,8 @@ "srcrgb": "srcalpha", "dstrgb": "1-srcalpha" }, - "vertex": "rendertype_translucent", - "fragment": "rendertype_translucent", + "vertex": "common/block", + "fragment": "common/block", "attributes": [ "Position", "Color", diff --git a/assets/minecraft/shaders/core/rendertype_translucent.vsh b/assets/minecraft/shaders/core/rendertype_translucent.vsh deleted file mode 100644 index 3f61f1a..0000000 --- a/assets/minecraft/shaders/core/rendertype_translucent.vsh +++ /dev/null @@ -1,58 +0,0 @@ -#version 150 - -#moj_import -#moj_import - -in vec3 Position; -in vec4 Color; -in vec2 UV0; -in ivec2 UV2; -in vec3 Normal; - -uniform sampler2D Sampler0; -uniform sampler2D Sampler2; -uniform float GameTime; - -uniform mat4 ModelViewMat; -uniform mat4 ProjMat; -uniform vec3 ChunkOffset; - -out float vertexDistance; -out vec4 vertexColor; -out vec4 lightColor; -out vec2 texCoord0; -out vec4 normal; - -#define pi 3.1415926535897932 - -void main() { - vec3 position = Position + ChunkOffset; - float time = GameTime * 512; - float anim = GameTime * pi; - float xx = Position.x/16. * 2 * pi; - float zz = Position.z/16. * 2 * pi; - float dropoff = max((position.x*position.x) + (position.z*position.z) - 128., 512.) / 512.; - float far = ProjMat[3][2] * 0.05 / (ProjMat[3][2] + 2.0 * 0.05) / 3.0 * sqrt(3); - - float offset = 0.0; - if (rougheq(texture(Sampler0, UV0).a*255., 131.)) { //water - - if ((mod(Position.y, 1.0) > 0.1) || (mod(Position.y, 1.0) < 0.01)) { - offset = ((sin(time + xx) + cos(time + zz)) * 0.02) - 0.02; - offset += ((sin(time*7 + xx*4.) + cos(time*7 + zz*4.)) * 0.01) - 0.01; - offset += 0.01 * sin((Position.z * pi / 4.0 + anim * 700)) * 1.0 * (1.0 - smoothstep(0.0, 1.0, vertexDistance / far)); - offset += 0.01 * cos((Position.z * pi / 8.0 + Position.x * pi / 4.0 + anim * 400) + pi / 13.0) * 1.2 * (1.0 - smoothstep(0.1, 1.0, vertexDistance / far)); - offset += 0.01 * sin((Position.z * pi / 8.0 - Position.x * pi / 2.0 - anim * 900) - pi / 7.0) * 0.75 * (1.0 - smoothstep(0.0, 0.3, vertexDistance / far)); - offset += 0.01 * cos((Position.z * pi * 7.0 + Position.x * pi / 2.0 - anim * 870) + pi / 5.0) * 0.75 * (1.0 - smoothstep(0.0, 0.9, vertexDistance / far)); - offset /= dropoff; - } - } - - gl_Position = ProjMat * ModelViewMat * vec4(position + vec3(0., offset, 0.), 1.); - - vertexDistance = length((ModelViewMat * vec4(position, 1.0)).xyz); - lightColor = minecraft_sample_lightmap(Sampler2, UV2); - vertexColor = Color; - texCoord0 = UV0; - normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); -} diff --git a/assets/minecraft/shaders/core/rendertype_translucent_moving_block.json b/assets/minecraft/shaders/core/rendertype_translucent_moving_block.json new file mode 100644 index 0000000..84134ff --- /dev/null +++ b/assets/minecraft/shaders/core/rendertype_translucent_moving_block.json @@ -0,0 +1,25 @@ +{ + "blend": { + "func": "add", + "srcrgb": "srcalpha", + "dstrgb": "1-srcalpha" + }, + "vertex": "special/simple", + "fragment": "rendertype_translucent_moving_block", + "attributes": [ + "Position", + "Color", + "UV0", + "UV2", + "Normal" + ], + "samplers": [ + { "name": "Sampler0" }, + { "name": "Sampler2" } + ], + "uniforms": [ + { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, + { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, + { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] } + ] +} diff --git a/assets/minecraft/shaders/core/rendertype_end_portal.fsh b/assets/minecraft/shaders/core/special/end_portal.fsh similarity index 100% rename from assets/minecraft/shaders/core/rendertype_end_portal.fsh rename to assets/minecraft/shaders/core/special/end_portal.fsh diff --git a/assets/minecraft/shaders/core/rendertype_end_portal.vsh b/assets/minecraft/shaders/core/special/end_portal.vsh similarity index 100% rename from assets/minecraft/shaders/core/rendertype_end_portal.vsh rename to assets/minecraft/shaders/core/special/end_portal.vsh diff --git a/assets/minecraft/shaders/core/rendertype_entity_translucent.fsh b/assets/minecraft/shaders/core/special/entity_translucent.fsh similarity index 98% rename from assets/minecraft/shaders/core/rendertype_entity_translucent.fsh rename to assets/minecraft/shaders/core/special/entity_translucent.fsh index 97d0b00..a26dbae 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_translucent.fsh +++ b/assets/minecraft/shaders/core/special/entity_translucent.fsh @@ -30,7 +30,8 @@ out vec4 fragColor; void main() { if (!isGUI(ProjMat)) discardControlGLPos(gl_FragCoord.xy, glpos); vec4 color = texture(Sampler0, texCoord0); - //blink effect + + //animated skin vec2 texSize = textureSize(Sampler0, 0); if(skinEffects == 1 && (texCoord0.y > 0.125 && texCoord0.y < 0.25) && ((texCoord0.x > 0.125 && texCoord0.x < 0.25) || (texCoord0.x > 0.625 && texCoord0.x < 0.75))) { //grab second frame with offset @@ -46,6 +47,7 @@ void main() { color = (time < duration.y)? color2 : color; } } + if (color.a < 0.001) { discard; } diff --git a/assets/minecraft/shaders/core/rendertype_entity_translucent.vsh b/assets/minecraft/shaders/core/special/entity_translucent.vsh similarity index 89% rename from assets/minecraft/shaders/core/rendertype_entity_translucent.vsh rename to assets/minecraft/shaders/core/special/entity_translucent.vsh index b515981..cabd5a5 100644 --- a/assets/minecraft/shaders/core/rendertype_entity_translucent.vsh +++ b/assets/minecraft/shaders/core/special/entity_translucent.vsh @@ -37,6 +37,7 @@ void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); normal = ProjMat * ModelViewMat * vec4(Normal, 0.0); vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, Color); + //rotating items float dist = -(ModelViewMat * vec4(1.0)).z; if (dist == 1602.) { @@ -45,19 +46,20 @@ void main() { normal = vec4((vec4(Normal, 0) * rot).xyz, 1.0); vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, normal.xyz, Color); } - //skin effects + + //animated skin skinEffects = 0; isFace = 0; vec4 skindata = texture(Sampler0, vec2(0.5, 0.0)); - //face vertices - if(((gl_VertexID >= 16 && gl_VertexID < 20) || (gl_VertexID >= 160 && gl_VertexID < 164))) { - isFace = 1; - } - //enable blink if (abs(skindata.a - 0.918) < 0.001) { skinEffects = 1; Times = skindata.rgb; + //mark face vertices + if(((gl_VertexID >= 16 && gl_VertexID < 20) || (gl_VertexID >= 160 && gl_VertexID < 164))) { + isFace = 1; + } } + vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz); lightColor = minecraft_sample_lightmap(Sampler2, UV2); overlayColor = texelFetch(Sampler1, UV1, 0); diff --git a/assets/minecraft/shaders/core/rendertype_leash.fsh b/assets/minecraft/shaders/core/special/leash.fsh similarity index 100% rename from assets/minecraft/shaders/core/rendertype_leash.fsh rename to assets/minecraft/shaders/core/special/leash.fsh diff --git a/assets/minecraft/shaders/core/rendertype_leash.vsh b/assets/minecraft/shaders/core/special/leash.vsh similarity index 100% rename from assets/minecraft/shaders/core/rendertype_leash.vsh rename to assets/minecraft/shaders/core/special/leash.vsh diff --git a/assets/minecraft/shaders/core/special/lines.fsh b/assets/minecraft/shaders/core/special/lines.fsh new file mode 100644 index 0000000..455f58e --- /dev/null +++ b/assets/minecraft/shaders/core/special/lines.fsh @@ -0,0 +1,26 @@ +#version 150 + +#moj_import + +uniform vec4 ColorModulator; +uniform float FogStart; +uniform float FogEnd; +uniform vec4 FogColor; +uniform float GameTime; + +in float vertexDistance; +in vec4 vertexColor; + +out vec4 fragColor; + +void main() { + vec4 color = vertexColor * ColorModulator; + + if(color.a < 0.02) { + float cycle = sin(GameTime * 3000) * sin(GameTime * 3000); + //color = (int(color.r * 8.0 + GameTime * 200) % 2 == 0 ? vec4(1, 1, 0, 0.9) : vec4(0, 0, 0, 0.9)); + color = vec4(0.0, 0.0, 0.0, (cycle + 1) / 4); + } + + fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor); +} diff --git a/assets/minecraft/shaders/core/special/lines.vsh b/assets/minecraft/shaders/core/special/lines.vsh new file mode 100644 index 0000000..d0e8607 --- /dev/null +++ b/assets/minecraft/shaders/core/special/lines.vsh @@ -0,0 +1,53 @@ +#version 150 + +in vec3 Position; +in vec4 Color; +in vec3 Normal; + +uniform mat4 ModelViewMat; +uniform mat4 ProjMat; +uniform float LineWidth; +uniform vec2 ScreenSize; + +out float vertexDistance; +out vec4 vertexColor; + +const float VIEW_SHRINK = 1.0 - (1.0 / 256.0); +const mat4 VIEW_SCALE = mat4( + VIEW_SHRINK, 0.0, 0.0, 0.0, + 0.0, VIEW_SHRINK, 0.0, 0.0, + 0.0, 0.0, VIEW_SHRINK, 0.0, + 0.0, 0.0, 0.0, 1.0 +); + +void main() { + vec4 linePosStart = ProjMat * VIEW_SCALE * ModelViewMat * vec4(Position, 1.0); + vec4 linePosEnd = ProjMat * VIEW_SCALE * ModelViewMat * vec4(Position + Normal, 1.0); + + vec4 col = Color; + float width = LineWidth; + if (col.a < 0.5) { + float n = float(gl_VertexID % 4 <= 1); + col = vec4(n, n, n, 0.01); + width *= 1.5; + } + + vec3 ndc1 = linePosStart.xyz / linePosStart.w; + vec3 ndc2 = linePosEnd.xyz / linePosEnd.w; + + vec2 lineScreenDirection = normalize((ndc2.xy - ndc1.xy) * ScreenSize); + vec2 lineOffset = vec2(-lineScreenDirection.y, lineScreenDirection.x) * width / ScreenSize; + + if (lineOffset.x < 0.0) { + lineOffset *= -1.0; + } + + if (gl_VertexID % 2 == 0) { + gl_Position = vec4((ndc1 + vec3(lineOffset, 0.0)) * linePosStart.w, linePosStart.w); + } else { + gl_Position = vec4((ndc1 - vec3(lineOffset, 0.0)) * linePosStart.w, linePosStart.w); + } + + vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz); + vertexColor = col; +} diff --git a/assets/minecraft/shaders/core/particle.fsh b/assets/minecraft/shaders/core/special/particle.fsh similarity index 100% rename from assets/minecraft/shaders/core/particle.fsh rename to assets/minecraft/shaders/core/special/particle.fsh diff --git a/assets/minecraft/shaders/core/rendertype_eyes.fsh b/assets/minecraft/shaders/core/special/simple.fsh similarity index 68% rename from assets/minecraft/shaders/core/rendertype_eyes.fsh rename to assets/minecraft/shaders/core/special/simple.fsh index cef63df..7e9bec7 100644 --- a/assets/minecraft/shaders/core/rendertype_eyes.fsh +++ b/assets/minecraft/shaders/core/special/simple.fsh @@ -1,24 +1,26 @@ #version 150 +#moj_import #moj_import uniform sampler2D Sampler0; -uniform sampler2D Sampler1; uniform sampler2D Sampler2; uniform vec4 ColorModulator; in vec4 vertexColor; +in vec4 lightColor; in vec2 texCoord0; -in vec2 texCoord1; -in vec2 texCoord2; in vec4 normal; -in vec4 glpos; out vec4 fragColor; void main() { discardControlGLPos(gl_FragCoord.xy, glpos); vec4 color = texture(Sampler0, texCoord0) * vertexColor; + color = make_emissive(color, lightColor, vertexDistance, alpha); + if (color.a < 0.1) { + discard; + } fragColor = color * ColorModulator; -} +} \ No newline at end of file diff --git a/assets/minecraft/shaders/core/particle.vsh b/assets/minecraft/shaders/core/special/simple.vsh similarity index 99% rename from assets/minecraft/shaders/core/particle.vsh rename to assets/minecraft/shaders/core/special/simple.vsh index 1d8f50e..c9c9a12 100644 --- a/assets/minecraft/shaders/core/particle.vsh +++ b/assets/minecraft/shaders/core/special/simple.vsh @@ -3,8 +3,8 @@ #moj_import in vec3 Position; -in vec2 UV0; in vec4 Color; +in vec2 UV0; in ivec2 UV2; uniform sampler2D Sampler2; @@ -13,17 +13,16 @@ uniform mat4 ModelViewMat; uniform mat4 ProjMat; out float vertexDistance; -out vec2 texCoord0; out vec4 vertexColor; out vec4 lightColor; +out vec2 texCoord0; out vec4 glpos; void main() { gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0); - vertexDistance = length((ModelViewMat * vec4(Position, 1.0)).xyz); - texCoord0 = UV0; vertexColor = Color; lightColor = minecraft_sample_lightmap(Sampler2, UV2); + texCoord0 = UV0; glpos = gl_Position; -} +} \ No newline at end of file diff --git a/assets/minecraft/shaders/core/rendertype_text.fsh b/assets/minecraft/shaders/core/special/text.fsh similarity index 100% rename from assets/minecraft/shaders/core/rendertype_text.fsh rename to assets/minecraft/shaders/core/special/text.fsh diff --git a/assets/minecraft/textures/block/acacia_leaves.png b/assets/minecraft/textures/block/acacia_leaves.png index f5aa690..a332da4 100644 Binary files a/assets/minecraft/textures/block/acacia_leaves.png and b/assets/minecraft/textures/block/acacia_leaves.png differ diff --git a/assets/minecraft/textures/block/azalea_leaves.png b/assets/minecraft/textures/block/azalea_leaves.png index 6f4f1d7..bed9d7a 100644 Binary files a/assets/minecraft/textures/block/azalea_leaves.png and b/assets/minecraft/textures/block/azalea_leaves.png differ diff --git a/assets/minecraft/textures/block/birch_leaves.png b/assets/minecraft/textures/block/birch_leaves.png index a5db41b..c1278de 100644 Binary files a/assets/minecraft/textures/block/birch_leaves.png and b/assets/minecraft/textures/block/birch_leaves.png differ diff --git a/assets/minecraft/textures/block/dark_oak_leaves.png b/assets/minecraft/textures/block/dark_oak_leaves.png index edbb99b..89d3e53 100644 Binary files a/assets/minecraft/textures/block/dark_oak_leaves.png and b/assets/minecraft/textures/block/dark_oak_leaves.png differ diff --git a/assets/minecraft/textures/block/flowering_azalea_leaves.png b/assets/minecraft/textures/block/flowering_azalea_leaves.png index e63d521..72d8f8c 100644 Binary files a/assets/minecraft/textures/block/flowering_azalea_leaves.png and b/assets/minecraft/textures/block/flowering_azalea_leaves.png differ diff --git a/assets/minecraft/textures/block/jungle_leaves.png b/assets/minecraft/textures/block/jungle_leaves.png index 18badd4..9d339b5 100644 Binary files a/assets/minecraft/textures/block/jungle_leaves.png and b/assets/minecraft/textures/block/jungle_leaves.png differ diff --git a/assets/minecraft/textures/block/lantern.png.mcmeta b/assets/minecraft/textures/block/lantern.png.mcmeta index 5169aab..20fe8bf 100644 --- a/assets/minecraft/textures/block/lantern.png.mcmeta +++ b/assets/minecraft/textures/block/lantern.png.mcmeta @@ -1,5 +1,6 @@ { "animation": { - "frametime": 8 + "frametime": 8, + "interpolate":true } } \ No newline at end of file diff --git a/assets/minecraft/textures/block/lantern_hanging.png.mcmeta b/assets/minecraft/textures/block/lantern_hanging.png.mcmeta index 5169aab..20fe8bf 100644 --- a/assets/minecraft/textures/block/lantern_hanging.png.mcmeta +++ b/assets/minecraft/textures/block/lantern_hanging.png.mcmeta @@ -1,5 +1,6 @@ { "animation": { - "frametime": 8 + "frametime": 8, + "interpolate":true } } \ No newline at end of file diff --git a/assets/minecraft/textures/block/oak_leaves.png b/assets/minecraft/textures/block/oak_leaves.png index fd03fac..1610595 100644 Binary files a/assets/minecraft/textures/block/oak_leaves.png and b/assets/minecraft/textures/block/oak_leaves.png differ diff --git a/assets/minecraft/textures/block/soul_lantern.png.mcmeta b/assets/minecraft/textures/block/soul_lantern.png.mcmeta index 5169aab..20fe8bf 100644 --- a/assets/minecraft/textures/block/soul_lantern.png.mcmeta +++ b/assets/minecraft/textures/block/soul_lantern.png.mcmeta @@ -1,5 +1,6 @@ { "animation": { - "frametime": 8 + "frametime": 8, + "interpolate":true } } \ No newline at end of file diff --git a/assets/minecraft/textures/block/soul_lantern_hanging.png.mcmeta b/assets/minecraft/textures/block/soul_lantern_hanging.png.mcmeta index 5169aab..20fe8bf 100644 --- a/assets/minecraft/textures/block/soul_lantern_hanging.png.mcmeta +++ b/assets/minecraft/textures/block/soul_lantern_hanging.png.mcmeta @@ -1,5 +1,6 @@ { "animation": { - "frametime": 8 + "frametime": 8, + "interpolate":true } } \ No newline at end of file diff --git a/assets/minecraft/textures/block/spruce_leaves.png b/assets/minecraft/textures/block/spruce_leaves.png index 87a17c3..0b68b93 100644 Binary files a/assets/minecraft/textures/block/spruce_leaves.png and b/assets/minecraft/textures/block/spruce_leaves.png differ diff --git a/changelog.txt b/changelog.txt index 3ff9c15..ecdd62f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,18 @@ v++ +2.4 + +Blocks: ++Doors no longer override default model ++Lantern and Soul Lantern textures are interpolated ++Sticky Piston Head is still sticky when extending/retracting ++Birch Trapdoor has proper cullfaces + +Shaders: ++Massively simplified core shader structure ++Block Selection Outline pulses slightly + + + 2.3 +Updated fog shader to no longer crash in 1.18.1 diff --git a/v++.zip b/v++.zip index 6255d4f..09b8441 100644 Binary files a/v++.zip and b/v++.zip differ