diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_door_bottom.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_door_bottom.json index 9f605d574..4759e060f 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_door_bottom.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_door_bottom.json @@ -1,7 +1,7 @@ { - "parent": "block/door_bottom", + "parent": "minecraft:block/door_bottom", "textures": { - "bottom": "block/acacia_door_bottom", - "top": "block/acacia_door_top" + "bottom": "minecraft:block/acacia_door_bottom", + "top": "minecraft:block/acacia_door_top" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_door_bottom_hinge.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_door_bottom_hinge.json index 82df44a19..d248e08b0 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_door_bottom_hinge.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_door_bottom_hinge.json @@ -1,7 +1,7 @@ { - "parent": "block/door_bottom_rh", + "parent": "minecraft:block/door_bottom_rh", "textures": { - "bottom": "block/acacia_door_bottom", - "top": "block/acacia_door_top" + "bottom": "minecraft:block/acacia_door_bottom", + "top": "minecraft:block/acacia_door_top" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_door_top.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_door_top.json index 4acc6bb1a..e921147ca 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_door_top.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_door_top.json @@ -1,7 +1,7 @@ { - "parent": "block/door_top", + "parent": "minecraft:block/door_top", "textures": { - "bottom": "block/acacia_door_bottom", - "top": "block/acacia_door_top" + "bottom": "minecraft:block/acacia_door_bottom", + "top": "minecraft:block/acacia_door_top" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_door_top_hinge.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_door_top_hinge.json index c07f4ec6a..37647bbca 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_door_top_hinge.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_door_top_hinge.json @@ -1,7 +1,7 @@ { - "parent": "block/door_top_rh", + "parent": "minecraft:block/door_top_rh", "textures": { - "bottom": "block/acacia_door_bottom", - "top": "block/acacia_door_top" + "bottom": "minecraft:block/acacia_door_bottom", + "top": "minecraft:block/acacia_door_top" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_gate.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_gate.json index cec4f1f74..f121a1830 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_gate.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_gate.json @@ -1,6 +1,6 @@ { - "parent": "block/template_fence_gate", + "parent": "minecraft:block/template_fence_gate", "textures": { - "texture": "block/acacia_planks" + "texture": "minecraft:block/acacia_planks" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_gate_open.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_gate_open.json index a0a850678..28fe835ed 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_gate_open.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_gate_open.json @@ -1,6 +1,6 @@ { - "parent": "block/template_fence_gate_open", + "parent": "minecraft:block/template_fence_gate_open", "textures": { - "texture": "block/acacia_planks" + "texture": "minecraft:block/acacia_planks" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_gate_wall.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_gate_wall.json index eebfb4dd1..0ac31d077 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_gate_wall.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_gate_wall.json @@ -1,6 +1,6 @@ { - "parent": "block/template_fence_gate_wall", + "parent": "minecraft:block/template_fence_gate_wall", "textures": { - "texture": "block/acacia_planks" + "texture": "minecraft:block/acacia_planks" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_gate_wall_open.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_gate_wall_open.json index d4c00c0aa..2ea84d226 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_gate_wall_open.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_gate_wall_open.json @@ -1,6 +1,6 @@ { - "parent": "block/template_fence_gate_wall_open", + "parent": "minecraft:block/template_fence_gate_wall_open", "textures": { - "texture": "block/acacia_planks" + "texture": "minecraft:block/acacia_planks" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_post.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_post.json index d14fec081..96e4d4449 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_post.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_post.json @@ -1,6 +1,6 @@ { - "parent": "block/fence_post", + "parent": "minecraft:block/fence_post", "textures": { - "texture": "block/acacia_planks" + "texture": "minecraft:block/acacia_planks" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_side.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_side.json index 8acc49bc3..9d7c83ea4 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_side.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_fence_side.json @@ -1,6 +1,6 @@ { - "parent": "block/fence_side", + "parent": "minecraft:block/fence_side", "textures": { - "texture": "block/acacia_planks" + "texture": "minecraft:block/acacia_planks" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_log.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_log.json index 30ecc29c7..7e3ac44b6 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_log.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_log.json @@ -1,7 +1,7 @@ { - "parent": "block/cube_column", + "parent": "minecraft:block/cube_column", "textures": { - "side": "block/acacia_log", - "end": "block/acacia_log_top" + "side": "minecraft:block/acacia_log", + "end": "minecraft:block/acacia_log_top" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_log_horizontal.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_log_horizontal.json new file mode 100644 index 000000000..6ff6b467a --- /dev/null +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_log_horizontal.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "side": "minecraft:block/acacia_log", + "end": "minecraft:block/acacia_log_top" + } +} \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_slab.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_slab.json index 5541feb7f..1657fd3a5 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_slab.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_slab.json @@ -1,8 +1,8 @@ { - "parent": "block/slab", + "parent": "minecraft:block/slab", "textures": { - "side": "block/acacia_planks", - "bottom": "block/acacia_planks", - "top": "block/acacia_planks" + "side": "minecraft:block/acacia_planks", + "bottom": "minecraft:block/acacia_planks", + "top": "minecraft:block/acacia_planks" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_slab_top.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_slab_top.json index 7281e9250..f8f498978 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_slab_top.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_slab_top.json @@ -1,8 +1,8 @@ { - "parent": "block/slab_top", + "parent": "minecraft:block/slab_top", "textures": { - "side": "block/acacia_planks", - "bottom": "block/acacia_planks", - "top": "block/acacia_planks" + "side": "minecraft:block/acacia_planks", + "bottom": "minecraft:block/acacia_planks", + "top": "minecraft:block/acacia_planks" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_stairs.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_stairs.json index fd0afbdc1..b655fcfda 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_stairs.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_stairs.json @@ -1,8 +1,8 @@ { - "parent": "block/stairs", + "parent": "minecraft:block/stairs", "textures": { - "side": "block/acacia_planks", - "bottom": "block/acacia_planks", - "top": "block/acacia_planks" + "side": "minecraft:block/acacia_planks", + "bottom": "minecraft:block/acacia_planks", + "top": "minecraft:block/acacia_planks" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_stairs_inner.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_stairs_inner.json index 8fdeaf14a..e1bb83262 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_stairs_inner.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_stairs_inner.json @@ -1,8 +1,8 @@ { - "parent": "block/inner_stairs", + "parent": "minecraft:block/inner_stairs", "textures": { - "side": "block/acacia_planks", - "bottom": "block/acacia_planks", - "top": "block/acacia_planks" + "side": "minecraft:block/acacia_planks", + "bottom": "minecraft:block/acacia_planks", + "top": "minecraft:block/acacia_planks" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_stairs_outer.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_stairs_outer.json index de26ea593..c6fed2be6 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_stairs_outer.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_stairs_outer.json @@ -1,8 +1,8 @@ { - "parent": "block/outer_stairs", + "parent": "minecraft:block/outer_stairs", "textures": { - "side": "block/acacia_planks", - "bottom": "block/acacia_planks", - "top": "block/acacia_planks" + "side": "minecraft:block/acacia_planks", + "bottom": "minecraft:block/acacia_planks", + "top": "minecraft:block/acacia_planks" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_trapdoor_bottom.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_trapdoor_bottom.json index 24b50301a..38bd46e27 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_trapdoor_bottom.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/template_orientable_trapdoor_bottom", + "parent": "minecraft:block/template_orientable_trapdoor_bottom", "textures": { - "texture": "block/acacia_trapdoor" + "texture": "minecraft:block/acacia_trapdoor" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_trapdoor_open.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_trapdoor_open.json index 5bf0f4922..de4be4d52 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_trapdoor_open.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/template_orientable_trapdoor_open", + "parent": "minecraft:block/template_orientable_trapdoor_open", "textures": { - "texture": "block/acacia_trapdoor" + "texture": "minecraft:block/acacia_trapdoor" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_trapdoor_top.json b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_trapdoor_top.json index 7eb25f700..4f5124098 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/acacia_trapdoor_top.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/acacia_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/template_orientable_trapdoor_top", + "parent": "minecraft:block/template_orientable_trapdoor_top", "textures": { - "texture": "block/acacia_trapdoor" + "texture": "minecraft:block/acacia_trapdoor" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/barrel.json b/src/generated_test/resources/assets/data_gen_test/models/block/barrel.json index c36cc35c2..850063187 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/barrel.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/barrel.json @@ -1,8 +1,8 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { - "side": "block/barrel_side", - "bottom": "block/barrel_bottom", - "top": "block/barrel_top" + "side": "minecraft:block/barrel_side", + "bottom": "minecraft:block/barrel_bottom", + "top": "minecraft:block/barrel_top" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/barrel_open.json b/src/generated_test/resources/assets/data_gen_test/models/block/barrel_open.json index 0ee476b52..560545cb6 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/barrel_open.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/barrel_open.json @@ -1,8 +1,8 @@ { - "parent": "block/cube_bottom_top", + "parent": "minecraft:block/cube_bottom_top", "textures": { - "side": "block/barrel_side", - "bottom": "block/barrel_bottom", - "top": "block/barrel_top_open" + "side": "minecraft:block/barrel_side", + "bottom": "minecraft:block/barrel_bottom", + "top": "minecraft:block/barrel_top_open" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/birch_fence_gate.json b/src/generated_test/resources/assets/data_gen_test/models/block/birch_fence_gate.json index d1581f83a..2e0e15669 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/birch_fence_gate.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/birch_fence_gate.json @@ -1,6 +1,6 @@ { - "parent": "block/template_fence_gate", + "parent": "minecraft:block/template_fence_gate", "textures": { - "texture": "block/birch_planks" + "texture": "minecraft:block/birch_planks" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/birch_fence_gate_open.json b/src/generated_test/resources/assets/data_gen_test/models/block/birch_fence_gate_open.json index d2a06fbe1..db6f4a89f 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/birch_fence_gate_open.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/birch_fence_gate_open.json @@ -1,6 +1,6 @@ { - "parent": "block/template_fence_gate_open", + "parent": "minecraft:block/template_fence_gate_open", "textures": { - "texture": "block/birch_planks" + "texture": "minecraft:block/birch_planks" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/birch_fence_gate_wall.json b/src/generated_test/resources/assets/data_gen_test/models/block/birch_fence_gate_wall.json index 0fa8d0443..5402b037b 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/birch_fence_gate_wall.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/birch_fence_gate_wall.json @@ -1,6 +1,6 @@ { - "parent": "block/template_fence_gate_wall", + "parent": "minecraft:block/template_fence_gate_wall", "textures": { - "texture": "block/birch_planks" + "texture": "minecraft:block/birch_planks" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/birch_fence_gate_wall_open.json b/src/generated_test/resources/assets/data_gen_test/models/block/birch_fence_gate_wall_open.json index 61d8c6732..442138c09 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/birch_fence_gate_wall_open.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/birch_fence_gate_wall_open.json @@ -1,6 +1,6 @@ { - "parent": "block/template_fence_gate_wall_open", + "parent": "minecraft:block/template_fence_gate_wall_open", "textures": { - "texture": "block/birch_planks" + "texture": "minecraft:block/birch_planks" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/cobblestone_wall_post.json b/src/generated_test/resources/assets/data_gen_test/models/block/cobblestone_wall_post.json index 6913a1239..7f47c03ff 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/cobblestone_wall_post.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/cobblestone_wall_post.json @@ -1,6 +1,6 @@ { - "parent": "block/template_wall_post", + "parent": "minecraft:block/template_wall_post", "textures": { - "wall": "block/cobblestone" + "wall": "minecraft:block/cobblestone" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/cobblestone_wall_side.json b/src/generated_test/resources/assets/data_gen_test/models/block/cobblestone_wall_side.json index 14681a16b..f0eabd2b3 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/cobblestone_wall_side.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/cobblestone_wall_side.json @@ -1,6 +1,6 @@ { - "parent": "block/template_wall_side", + "parent": "minecraft:block/template_wall_side", "textures": { - "wall": "block/cobblestone" + "wall": "minecraft:block/cobblestone" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/cobblestone_wall_side_tall.json b/src/generated_test/resources/assets/data_gen_test/models/block/cobblestone_wall_side_tall.json new file mode 100644 index 000000000..d6f662562 --- /dev/null +++ b/src/generated_test/resources/assets/data_gen_test/models/block/cobblestone_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "minecraft:block/cobblestone" + } +} \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/furnace.json b/src/generated_test/resources/assets/data_gen_test/models/block/furnace.json index 7935d9f83..602d252ea 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/furnace.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/furnace.json @@ -1,8 +1,8 @@ { - "parent": "block/orientable", + "parent": "minecraft:block/orientable", "textures": { - "side": "block/furnace_side", - "front": "block/furnace_front", - "top": "block/furnace_top" + "side": "minecraft:block/furnace_side", + "front": "minecraft:block/furnace_front", + "top": "minecraft:block/furnace_top" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/furnace_on.json b/src/generated_test/resources/assets/data_gen_test/models/block/furnace_on.json index 5fc3aeffa..b8ef10cfc 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/furnace_on.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/furnace_on.json @@ -1,8 +1,8 @@ { - "parent": "block/orientable", + "parent": "minecraft:block/orientable", "textures": { - "side": "block/furnace_side", - "front": "block/furnace_front_on", - "top": "block/furnace_top" + "side": "minecraft:block/furnace_side", + "front": "minecraft:block/furnace_front_on", + "top": "minecraft:block/furnace_top" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_noside.json b/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_noside.json index f83a00bb1..dc01ef004 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_noside.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_noside.json @@ -1,6 +1,6 @@ { - "parent": "block/template_glass_pane_noside", + "parent": "minecraft:block/template_glass_pane_noside", "textures": { - "pane": "block/glass" + "pane": "minecraft:block/glass" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_noside_alt.json b/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_noside_alt.json index 63abc8d88..f0151c1ba 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_noside_alt.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_noside_alt.json @@ -1,6 +1,6 @@ { - "parent": "block/template_glass_pane_noside_alt", + "parent": "minecraft:block/template_glass_pane_noside_alt", "textures": { - "pane": "block/glass" + "pane": "minecraft:block/glass" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_post.json b/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_post.json index 0c53deb7c..a88c26d2a 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_post.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_post.json @@ -1,7 +1,7 @@ { - "parent": "block/template_glass_pane_post", + "parent": "minecraft:block/template_glass_pane_post", "textures": { - "pane": "block/glass", - "edge": "block/glass_pane_top" + "pane": "minecraft:block/glass", + "edge": "minecraft:block/glass_pane_top" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_side.json b/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_side.json index 3fbec203d..78597546c 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_side.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_side.json @@ -1,7 +1,7 @@ { - "parent": "block/template_glass_pane_side", + "parent": "minecraft:block/template_glass_pane_side", "textures": { - "pane": "block/glass", - "edge": "block/glass_pane_top" + "pane": "minecraft:block/glass", + "edge": "minecraft:block/glass_pane_top" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_side_alt.json b/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_side_alt.json index eadcfe1e4..0830c5e51 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_side_alt.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/glass_pane_side_alt.json @@ -1,7 +1,7 @@ { - "parent": "block/template_glass_pane_side_alt", + "parent": "minecraft:block/template_glass_pane_side_alt", "textures": { - "pane": "block/glass", - "edge": "block/glass_pane_top" + "pane": "minecraft:block/glass", + "edge": "minecraft:block/glass_pane_top" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/oak_trapdoor_bottom.json b/src/generated_test/resources/assets/data_gen_test/models/block/oak_trapdoor_bottom.json index 5fe3bc491..a4dcb639f 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/oak_trapdoor_bottom.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/oak_trapdoor_bottom.json @@ -1,6 +1,6 @@ { - "parent": "block/template_trapdoor_bottom", + "parent": "minecraft:block/template_trapdoor_bottom", "textures": { - "texture": "block/oak_trapdoor" + "texture": "minecraft:block/oak_trapdoor" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/oak_trapdoor_open.json b/src/generated_test/resources/assets/data_gen_test/models/block/oak_trapdoor_open.json index 3a282b078..e8b0bb3b2 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/oak_trapdoor_open.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/oak_trapdoor_open.json @@ -1,6 +1,6 @@ { - "parent": "block/template_trapdoor_open", + "parent": "minecraft:block/template_trapdoor_open", "textures": { - "texture": "block/oak_trapdoor" + "texture": "minecraft:block/oak_trapdoor" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/oak_trapdoor_top.json b/src/generated_test/resources/assets/data_gen_test/models/block/oak_trapdoor_top.json index cce7c6409..34322d68e 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/oak_trapdoor_top.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/oak_trapdoor_top.json @@ -1,6 +1,6 @@ { - "parent": "block/template_trapdoor_top", + "parent": "minecraft:block/template_trapdoor_top", "textures": { - "texture": "block/oak_trapdoor" + "texture": "minecraft:block/oak_trapdoor" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/stone.json b/src/generated_test/resources/assets/data_gen_test/models/block/stone.json index a165a4948..1a2f6a79a 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/stone.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/stone.json @@ -1,6 +1,6 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { - "all": "block/stone" + "all": "minecraft:block/stone" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/torch.json b/src/generated_test/resources/assets/data_gen_test/models/block/torch.json index 0b731a767..7c6241d04 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/torch.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/torch.json @@ -1,6 +1,6 @@ { - "parent": "block/template_torch", + "parent": "minecraft:block/template_torch", "textures": { - "torch": "block/torch" + "torch": "minecraft:block/torch" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/block/wall_torch.json b/src/generated_test/resources/assets/data_gen_test/models/block/wall_torch.json index de8fb2415..e30eec7f2 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/block/wall_torch.json +++ b/src/generated_test/resources/assets/data_gen_test/models/block/wall_torch.json @@ -1,6 +1,6 @@ { - "parent": "block/torch_wall", + "parent": "minecraft:block/template_torch_wall", "textures": { - "torch": "block/torch" + "torch": "minecraft:block/torch" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/item/fishing_rod.json b/src/generated_test/resources/assets/data_gen_test/models/item/fishing_rod.json index c8d5fb65b..c5a2e7f1d 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/item/fishing_rod.json +++ b/src/generated_test/resources/assets/data_gen_test/models/item/fishing_rod.json @@ -1,14 +1,14 @@ { - "parent": "item/handheld_rod", + "parent": "minecraft:item/handheld_rod", "textures": { - "layer0": "item/fishing_rod" + "layer0": "minecraft:item/fishing_rod" }, "overrides": [ { "predicate": { - "cast": 1.0 + "minecraft:cast": 1.0 }, - "model": "item/fishing_rod_cast" + "model": "minecraft:item/fishing_rod_cast" } ] } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/item/fishing_rod_cast.json b/src/generated_test/resources/assets/data_gen_test/models/item/fishing_rod_cast.json index b541b7f3a..6a0acdc98 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/item/fishing_rod_cast.json +++ b/src/generated_test/resources/assets/data_gen_test/models/item/fishing_rod_cast.json @@ -1,6 +1,6 @@ { "parent": "data_gen_test:item/fishing_rod", "textures": { - "layer0": "item/fishing_rod_cast" + "layer0": "minecraft:item/fishing_rod_cast" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/data_gen_test/models/item/test_block_model.json b/src/generated_test/resources/assets/data_gen_test/models/item/test_block_model.json index db3290bff..0cee77b34 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/item/test_block_model.json +++ b/src/generated_test/resources/assets/data_gen_test/models/item/test_block_model.json @@ -1,8 +1,8 @@ { - "parent": "block/block", + "parent": "minecraft:block/block", "textures": { - "all": "block/dirt", - "top": "block/stone" + "all": "minecraft:block/dirt", + "top": "minecraft:block/stone" }, "elements": [ { diff --git a/src/generated_test/resources/assets/data_gen_test/models/item/test_generated_model.json b/src/generated_test/resources/assets/data_gen_test/models/item/test_generated_model.json index d2e4716f2..2a7ff752b 100644 --- a/src/generated_test/resources/assets/data_gen_test/models/item/test_generated_model.json +++ b/src/generated_test/resources/assets/data_gen_test/models/item/test_generated_model.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { - "layer0": "block/stone" + "layer0": "minecraft:block/stone" } } \ No newline at end of file diff --git a/src/generated_test/resources/assets/minecraft/blockstates/acacia_log.json b/src/generated_test/resources/assets/minecraft/blockstates/acacia_log.json index 1c2762bef..67b0c23d2 100644 --- a/src/generated_test/resources/assets/minecraft/blockstates/acacia_log.json +++ b/src/generated_test/resources/assets/minecraft/blockstates/acacia_log.json @@ -1,7 +1,7 @@ { "variants": { "axis=x": { - "model": "data_gen_test:block/acacia_log", + "model": "data_gen_test:block/acacia_log_horizontal", "x": 90, "y": 90 }, @@ -9,7 +9,7 @@ "model": "data_gen_test:block/acacia_log" }, "axis=z": { - "model": "data_gen_test:block/acacia_log", + "model": "data_gen_test:block/acacia_log_horizontal", "x": 90 } } diff --git a/src/generated_test/resources/assets/minecraft/blockstates/cobblestone_wall.json b/src/generated_test/resources/assets/minecraft/blockstates/cobblestone_wall.json index f8bda25db..a44cb81b6 100644 --- a/src/generated_test/resources/assets/minecraft/blockstates/cobblestone_wall.json +++ b/src/generated_test/resources/assets/minecraft/blockstates/cobblestone_wall.json @@ -8,6 +8,26 @@ "model": "data_gen_test:block/cobblestone_wall_post" } }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "data_gen_test:block/cobblestone_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "data_gen_test:block/cobblestone_wall_side_tall", + "y": 90, + "uvlock": true + } + }, { "when": { "north": "low" @@ -17,6 +37,15 @@ "uvlock": true } }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "data_gen_test:block/cobblestone_wall_side_tall", + "uvlock": true + } + }, { "when": { "south": "low" @@ -27,6 +56,16 @@ "uvlock": true } }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "data_gen_test:block/cobblestone_wall_side_tall", + "y": 180, + "uvlock": true + } + }, { "when": { "west": "low" @@ -39,11 +78,11 @@ }, { "when": { - "east": "low" + "west": "tall" }, "apply": { - "model": "data_gen_test:block/cobblestone_wall_side", - "y": 90, + "model": "data_gen_test:block/cobblestone_wall_side_tall", + "y": 270, "uvlock": true } } diff --git a/src/generated_test/resources/assets/piston_event_test/models/block/shiftonmove.json b/src/generated_test/resources/assets/piston_event_test/models/block/shiftonmove.json index 7b6dc871b..d1e8b7135 100644 --- a/src/generated_test/resources/assets/piston_event_test/models/block/shiftonmove.json +++ b/src/generated_test/resources/assets/piston_event_test/models/block/shiftonmove.json @@ -1,6 +1,6 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { - "all": "block/furnace_top" + "all": "minecraft:block/furnace_top" } } \ No newline at end of file diff --git a/src/main/java/net/minecraftforge/client/model/generators/BlockStateProvider.java b/src/main/java/net/minecraftforge/client/model/generators/BlockStateProvider.java index 2796b0264..6ec3ac868 100644 --- a/src/main/java/net/minecraftforge/client/model/generators/BlockStateProvider.java +++ b/src/main/java/net/minecraftforge/client/model/generators/BlockStateProvider.java @@ -35,6 +35,7 @@ import org.apache.logging.log4j.Logger; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; @@ -54,9 +55,11 @@ import net.minecraft.block.SlabBlock; import net.minecraft.block.StairsBlock; import net.minecraft.block.TrapDoorBlock; import net.minecraft.block.WallBlock; +import net.minecraft.block.WallHeight; import net.minecraft.data.DataGenerator; import net.minecraft.data.DirectoryCache; import net.minecraft.data.IDataProvider; +import net.minecraft.state.Property; import net.minecraft.state.properties.AttachFace; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.state.properties.DoorHingeSide; @@ -202,17 +205,17 @@ public abstract class BlockStateProvider implements IDataProvider { } public void axisBlock(RotatedPillarBlock block, ResourceLocation side, ResourceLocation end) { - axisBlock(block, models().cubeColumn(name(block), side, end)); + axisBlock(block, models().cubeColumn(name(block), side, end), models().cubeColumnHorizontal(name(block) + "_horizontal", side, end)); } - public void axisBlock(RotatedPillarBlock block, ModelFile model) { + public void axisBlock(RotatedPillarBlock block, ModelFile vertical, ModelFile horizontal) { getVariantBuilder(block) .partialState().with(RotatedPillarBlock.AXIS, Axis.Y) - .modelForState().modelFile(model).addModel() + .modelForState().modelFile(vertical).addModel() .partialState().with(RotatedPillarBlock.AXIS, Axis.Z) - .modelForState().modelFile(model).rotationX(90).addModel() + .modelForState().modelFile(horizontal).rotationX(90).addModel() .partialState().with(RotatedPillarBlock.AXIS, Axis.X) - .modelForState().modelFile(model).rotationX(90).rotationY(90).addModel(); + .modelForState().modelFile(horizontal).rotationX(90).rotationY(90).addModel(); } private static final int DEFAULT_ANGLE_OFFSET = 180; @@ -417,14 +420,35 @@ public abstract class BlockStateProvider implements IDataProvider { } private void wallBlockInternal(WallBlock block, String baseName, ResourceLocation texture) { - wallBlock(block, models().wallPost(baseName + "_post", texture), models().wallSide(baseName + "_side", texture)); + wallBlock(block, models().wallPost(baseName + "_post", texture), models().wallSide(baseName + "_side", texture), models().wallSideTall(baseName + "_side_tall", texture)); } + + public static final ImmutableMap> WALL_PROPS = ImmutableMap.>builder() + .put(Direction.EAST, BlockStateProperties.field_235908_S_) + .put(Direction.NORTH, BlockStateProperties.field_235909_T_) + .put(Direction.SOUTH, BlockStateProperties.field_235910_U_) + .put(Direction.WEST, BlockStateProperties.field_235911_V_) + .build(); - public void wallBlock(WallBlock block, ModelFile post, ModelFile side) { + public void wallBlock(WallBlock block, ModelFile post, ModelFile side, ModelFile sideTall) { MultiPartBlockStateBuilder builder = getMultipartBuilder(block) .part().modelFile(post).addModel() .condition(WallBlock.UP, true).end(); - fourWayMultipart(builder, side); + WALL_PROPS.entrySet().stream() + .filter(e -> e.getKey().getAxis().isHorizontal()) + .forEach(e -> { + wallSidePart(builder, side, e, WallHeight.LOW); + wallSidePart(builder, sideTall, e, WallHeight.TALL); + }); + } + + private void wallSidePart(MultiPartBlockStateBuilder builder, ModelFile model, Map.Entry> entry, WallHeight height) { + builder.part() + .modelFile(model) + .rotationY((((int) entry.getKey().getHorizontalAngle()) + 180) % 360) + .uvLock(true) + .addModel() + .condition(entry.getValue(), height); } public void paneBlock(PaneBlock block, ResourceLocation pane, ResourceLocation edge) { diff --git a/src/main/java/net/minecraftforge/client/model/generators/ItemModelBuilder.java b/src/main/java/net/minecraftforge/client/model/generators/ItemModelBuilder.java index e9f978aa6..ece466bb7 100644 --- a/src/main/java/net/minecraftforge/client/model/generators/ItemModelBuilder.java +++ b/src/main/java/net/minecraftforge/client/model/generators/ItemModelBuilder.java @@ -92,9 +92,9 @@ public class ItemModelBuilder extends ModelBuilder { JsonObject toJson() { JsonObject ret = new JsonObject(); JsonObject predicatesJson = new JsonObject(); - predicates.forEach((key, val) -> predicatesJson.addProperty(serializeLoc(key), val)); + predicates.forEach((key, val) -> predicatesJson.addProperty(key.toString(), val)); ret.add("predicate", predicatesJson); - ret.addProperty("model", serializeLoc(model.getLocation())); + ret.addProperty("model", model.getLocation().toString()); return ret; } } diff --git a/src/main/java/net/minecraftforge/client/model/generators/ModelBuilder.java b/src/main/java/net/minecraftforge/client/model/generators/ModelBuilder.java index 90382a4e6..a44470425 100644 --- a/src/main/java/net/minecraftforge/client/model/generators/ModelBuilder.java +++ b/src/main/java/net/minecraftforge/client/model/generators/ModelBuilder.java @@ -198,7 +198,7 @@ public class ModelBuilder> extends ModelFile { public JsonObject toJson() { JsonObject root = new JsonObject(); if (this.parent != null) { - root.addProperty("parent", serializeLoc(this.parent.getLocation())); + root.addProperty("parent", this.parent.getLocation().toString()); } if (!this.ambientOcclusion) { @@ -296,14 +296,7 @@ public class ModelBuilder> extends ModelFile { if (tex.charAt(0) == '#') { return tex; } - return serializeLoc(new ResourceLocation(tex)); - } - - String serializeLoc(ResourceLocation loc) { - if (loc.getNamespace().equals("minecraft")) { - return loc.getPath(); - } - return loc.toString(); + return new ResourceLocation(tex).toString(); } private JsonArray serializeVector3f(Vector3f vec) { diff --git a/src/main/java/net/minecraftforge/client/model/generators/ModelProvider.java b/src/main/java/net/minecraftforge/client/model/generators/ModelProvider.java index b0f4137e2..232e3d06e 100644 --- a/src/main/java/net/minecraftforge/client/model/generators/ModelProvider.java +++ b/src/main/java/net/minecraftforge/client/model/generators/ModelProvider.java @@ -173,6 +173,12 @@ public abstract class ModelProvider> implements IDataP .texture("end", end); } + public T cubeColumnHorizontal(String name, ResourceLocation side, ResourceLocation end) { + return withExistingParent(name, BLOCK_FOLDER + "/cube_column_horizontal") + .texture("side", side) + .texture("end", end); + } + public T orientableVertical(String name, ResourceLocation side, ResourceLocation front) { return withExistingParent(name, BLOCK_FOLDER + "/orientable_vertical") .texture("side", side) @@ -257,6 +263,10 @@ public abstract class ModelProvider> implements IDataP public T wallSide(String name, ResourceLocation wall) { return singleTexture(name, BLOCK_FOLDER + "/template_wall_side", "wall", wall); } + + public T wallSideTall(String name, ResourceLocation wall) { + return singleTexture(name, BLOCK_FOLDER + "/template_wall_side_tall", "wall", wall); + } public T wallInventory(String name, ResourceLocation wall) { return singleTexture(name, BLOCK_FOLDER + "/wall_inventory", "wall", wall); @@ -339,7 +349,7 @@ public abstract class ModelProvider> implements IDataP } public T torchWall(String name, ResourceLocation torch) { - return singleTexture(name, BLOCK_FOLDER + "/torch_wall", "torch", torch); + return singleTexture(name, BLOCK_FOLDER + "/template_torch_wall", "torch", torch); } public T carpet(String name, ResourceLocation wool) { diff --git a/src/test/java/net/minecraftforge/debug/DataGeneratorTest.java b/src/test/java/net/minecraftforge/debug/DataGeneratorTest.java index 12a80fbee..c2f5f6d55 100644 --- a/src/test/java/net/minecraftforge/debug/DataGeneratorTest.java +++ b/src/test/java/net/minecraftforge/debug/DataGeneratorTest.java @@ -272,7 +272,9 @@ public class DataGeneratorTest .texture("layer0", mcLoc("item/fishing_rod_cast")); } - private static final Set IGNORED_MODELS = ImmutableSet.of("test_generated_model", "test_block_model"); + private static final Set IGNORED_MODELS = ImmutableSet.of("test_generated_model", "test_block_model", + "fishing_rod", "fishing_rod_cast" // Vanilla doesn't generate these yet, so they don't match due to having the minecraft domain + ); @Override public void act(DirectoryCache cache) throws IOException @@ -436,7 +438,9 @@ public class DataGeneratorTest // Testing the outputs private static final Set IGNORED_BLOCKS = ImmutableSet.of(Blocks.BIRCH_FENCE_GATE, Blocks.STONE); - private static final Set IGNORED_MODELS = ImmutableSet.of(); + // Vanilla doesn't generate these models yet, so they have minor discrepancies that are hard to test + // This list should probably be cleared and investigated after each major version update + private static final Set IGNORED_MODELS = ImmutableSet.of(new ResourceLocation(MODID, "block/cube")); private List errors = new ArrayList<>(); @@ -648,6 +652,24 @@ public class DataGeneratorTest } } } + + JsonElement generatedTextures = generated.remove("textures"); + JsonElement vanillaTextures = existing.remove("textures"); + if (generatedTextures == null && vanillaTextures != null) { + ret.add("Model " + loc + " is missing textures"); + } else if (generatedTextures != null && vanillaTextures == null) { + ret.add("Model " + loc + " has textures when vanilla equivalent does not"); + } else if (generatedTextures != null) { // Both must be non-null + for (Map.Entry e : generatedTextures.getAsJsonObject().entrySet()) { + String vanillaTexture = vanillaTextures.getAsJsonObject().get(e.getKey()).getAsString(); + if (!e.getValue().getAsString().equals(vanillaTexture)) { + ret.add("Texture for variable '" + e.getKey() + "' for model " + loc + " does not match vanilla equivalent"); + } + } + if (generatedTextures.getAsJsonObject().size() != vanillaTextures.getAsJsonObject().size()) { + ret.add("Model " + loc + " is missing textures from vanilla equivalent"); + } + } if (!existing.equals(generated)) { ret.add("Model " + loc + " does not match vanilla equivalent"); @@ -662,6 +684,6 @@ public class DataGeneratorTest private static String toVanillaModel(String model) { // We generate our own model jsons to test model building, but otherwise our blockstates should be identical // So remove modid to match - return model.replaceAll("^\\w+:", ""); + return model.replaceAll("^\\w+:", "minecraft:"); } }