diff --git a/src/main/resources/assets/botania/models/block/avatar.json b/src/main/resources/assets/botania/models/block/avatar.json index 01ab54ee0..5cdff46ca 100644 --- a/src/main/resources/assets/botania/models/block/avatar.json +++ b/src/main/resources/assets/botania/models/block/avatar.json @@ -1,5 +1,5 @@ { "textures": { - "particle": "botania:block/livingwood0" + "particle": "botania:block/livingwood" } } diff --git a/src/main/resources/assets/botania/models/block/bellows.json b/src/main/resources/assets/botania/models/block/bellows.json index 01ab54ee0..5cdff46ca 100644 --- a/src/main/resources/assets/botania/models/block/bellows.json +++ b/src/main/resources/assets/botania/models/block/bellows.json @@ -1,5 +1,5 @@ { "textures": { - "particle": "botania:block/livingwood0" + "particle": "botania:block/livingwood" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood.json b/src/main/resources/assets/botania/models/block/dreamwood.json index d4a0eaf03..78b620e20 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood.json +++ b/src/main/resources/assets/botania/models/block/dreamwood.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:block/dreamwood0" + "all": "botania:block/dreamwood" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_fence_gate.json b/src/main/resources/assets/botania/models/block/dreamwood_fence_gate.json index d58dc4fec..f4e2df89d 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_fence_gate.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_fence_gate.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate", "textures": { - "texture": "botania:block/dreamwood1" + "texture": "botania:block/dreamwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_open.json b/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_open.json index 5ed911556..c56cc8f35 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_open.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_open", "textures": { - "texture": "botania:block/dreamwood1" + "texture": "botania:block/dreamwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall.json b/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall.json index 6665477f9..1fa08a228 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_wall", "textures": { - "texture": "botania:block/dreamwood1" + "texture": "botania:block/dreamwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall_open.json b/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall_open.json index b719289bf..146ebc1aa 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall_open.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_fence_gate_wall_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_wall_open", "textures": { - "texture": "botania:block/dreamwood1" + "texture": "botania:block/dreamwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_fence_post.json b/src/main/resources/assets/botania/models/block/dreamwood_fence_post.json index 3b454b0c5..b485f127e 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_fence_post.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_fence_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "botania:block/dreamwood1" + "texture": "botania:block/dreamwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_fence_side.json b/src/main/resources/assets/botania/models/block/dreamwood_fence_side.json index 1583f9142..28d20a447 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_fence_side.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_fence_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "botania:block/dreamwood1" + "texture": "botania:block/dreamwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_planks.json b/src/main/resources/assets/botania/models/block/dreamwood_planks.json index 086db394f..78e03cb66 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_planks.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_planks.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:block/dreamwood1" + "all": "botania:block/dreamwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_planks_slab.json b/src/main/resources/assets/botania/models/block/dreamwood_planks_slab.json index e6fc79415..9e905feea 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_planks_slab.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_planks_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "top": "botania:block/dreamwood1", - "bottom": "botania:block/dreamwood1", - "side": "botania:block/dreamwood1" + "top": "botania:block/dreamwood_planks", + "bottom": "botania:block/dreamwood_planks", + "side": "botania:block/dreamwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_planks_stairs.json b/src/main/resources/assets/botania/models/block/dreamwood_planks_stairs.json index ebe8fdd69..cc1580137 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_planks_stairs.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_planks_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/stairs", "textures": { - "bottom": "botania:block/dreamwood1", - "top": "botania:block/dreamwood1", - "side": "botania:block/dreamwood1" + "bottom": "botania:block/dreamwood_planks", + "top": "botania:block/dreamwood_planks", + "side": "botania:block/dreamwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_planks_stairs_inner.json b/src/main/resources/assets/botania/models/block/dreamwood_planks_stairs_inner.json index 4f7e83acd..95279373b 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_planks_stairs_inner.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_planks_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "block/inner_stairs", "textures": { - "bottom": "botania:block/dreamwood1", - "top": "botania:block/dreamwood1", - "side": "botania:block/dreamwood1" + "bottom": "botania:block/dreamwood_planks", + "top": "botania:block/dreamwood_planks", + "side": "botania:block/dreamwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_planks_stairs_outer.json b/src/main/resources/assets/botania/models/block/dreamwood_planks_stairs_outer.json index 2b29d6bb0..5fadfbf33 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_planks_stairs_outer.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_planks_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "block/outer_stairs", "textures": { - "bottom": "botania:block/dreamwood1", - "top": "botania:block/dreamwood1", - "side": "botania:block/dreamwood1" + "bottom": "botania:block/dreamwood_planks", + "top": "botania:block/dreamwood_planks", + "side": "botania:block/dreamwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_slab.json b/src/main/resources/assets/botania/models/block/dreamwood_slab.json index 547819129..1de138e94 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_slab.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "top": "botania:block/dreamwood0", - "bottom": "botania:block/dreamwood0", - "side": "botania:block/dreamwood0" + "top": "botania:block/dreamwood", + "bottom": "botania:block/dreamwood", + "side": "botania:block/dreamwood" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_stairs.json b/src/main/resources/assets/botania/models/block/dreamwood_stairs.json index add8c190f..aa32aed01 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_stairs.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/stairs", "textures": { - "bottom": "botania:block/dreamwood0", - "top": "botania:block/dreamwood0", - "side": "botania:block/dreamwood0" + "bottom": "botania:block/dreamwood", + "top": "botania:block/dreamwood", + "side": "botania:block/dreamwood" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_stairs_inner.json b/src/main/resources/assets/botania/models/block/dreamwood_stairs_inner.json index e0c400e5d..225812744 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_stairs_inner.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "block/inner_stairs", "textures": { - "bottom": "botania:block/dreamwood0", - "top": "botania:block/dreamwood0", - "side": "botania:block/dreamwood0" + "bottom": "botania:block/dreamwood", + "top": "botania:block/dreamwood", + "side": "botania:block/dreamwood" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_stairs_outer.json b/src/main/resources/assets/botania/models/block/dreamwood_stairs_outer.json index c4f214fe6..4593a833a 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_stairs_outer.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "block/outer_stairs", "textures": { - "bottom": "botania:block/dreamwood0", - "top": "botania:block/dreamwood0", - "side": "botania:block/dreamwood0" + "bottom": "botania:block/dreamwood", + "top": "botania:block/dreamwood", + "side": "botania:block/dreamwood" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_wall_post.json b/src/main/resources/assets/botania/models/block/dreamwood_wall_post.json index 620178f2d..0997e32b6 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_wall_post.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_post", "textures": { - "wall": "botania:block/dreamwood0" + "wall": "botania:block/dreamwood" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_wall_side.json b/src/main/resources/assets/botania/models/block/dreamwood_wall_side.json index 7d5a757ad..9745d6db3 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_wall_side.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side", "textures": { - "wall": "botania:block/dreamwood0" + "wall": "botania:block/dreamwood" } } diff --git a/src/main/resources/assets/botania/models/block/dreamwood_wall_side_tall.json b/src/main/resources/assets/botania/models/block/dreamwood_wall_side_tall.json index 0873d7a51..01d0602c6 100644 --- a/src/main/resources/assets/botania/models/block/dreamwood_wall_side_tall.json +++ b/src/main/resources/assets/botania/models/block/dreamwood_wall_side_tall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side_tall", "textures": { - "wall": "botania:block/dreamwood0" + "wall": "botania:block/dreamwood" } } diff --git a/src/main/resources/assets/botania/models/block/elven_spreader.json b/src/main/resources/assets/botania/models/block/elven_spreader.json index 8abdada23..63c4c796d 100644 --- a/src/main/resources/assets/botania/models/block/elven_spreader.json +++ b/src/main/resources/assets/botania/models/block/elven_spreader.json @@ -2,6 +2,6 @@ "parent": "botania:block/shapes/spreader", "textures": { "side": "botania:block/elven_spreader_side", - "material": "botania:block/dreamwood0" + "material": "botania:block/dreamwood" } } diff --git a/src/main/resources/assets/botania/models/block/framed_dreamwood.json b/src/main/resources/assets/botania/models/block/framed_dreamwood.json index d794e8ab4..73b94a395 100644 --- a/src/main/resources/assets/botania/models/block/framed_dreamwood.json +++ b/src/main/resources/assets/botania/models/block/framed_dreamwood.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:block/dreamwood3" + "all": "botania:block/framed_dreamwood" } } diff --git a/src/main/resources/assets/botania/models/block/framed_livingwood.json b/src/main/resources/assets/botania/models/block/framed_livingwood.json index 24f721595..0d1e4bca4 100644 --- a/src/main/resources/assets/botania/models/block/framed_livingwood.json +++ b/src/main/resources/assets/botania/models/block/framed_livingwood.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:block/livingwood3" + "all": "botania:block/framed_livingwood" } } diff --git a/src/main/resources/assets/botania/models/block/glimmering_dreamwood.json b/src/main/resources/assets/botania/models/block/glimmering_dreamwood.json index 9b3c1efa7..163967ce2 100644 --- a/src/main/resources/assets/botania/models/block/glimmering_dreamwood.json +++ b/src/main/resources/assets/botania/models/block/glimmering_dreamwood.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:block/dreamwood5" + "all": "botania:block/glimmering_dreamwood" } } diff --git a/src/main/resources/assets/botania/models/block/glimmering_livingwood.json b/src/main/resources/assets/botania/models/block/glimmering_livingwood.json index 1ce2124af..a93b5c11f 100644 --- a/src/main/resources/assets/botania/models/block/glimmering_livingwood.json +++ b/src/main/resources/assets/botania/models/block/glimmering_livingwood.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:block/livingwood5" + "all": "botania:block/glimmering_livingwood" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood.json b/src/main/resources/assets/botania/models/block/livingwood.json index 17229f9e4..26ff054ce 100644 --- a/src/main/resources/assets/botania/models/block/livingwood.json +++ b/src/main/resources/assets/botania/models/block/livingwood.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:block/livingwood0" + "all": "botania:block/livingwood" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_fence_gate.json b/src/main/resources/assets/botania/models/block/livingwood_fence_gate.json index ba14f3a6f..82a5db44e 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_fence_gate.json +++ b/src/main/resources/assets/botania/models/block/livingwood_fence_gate.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate", "textures": { - "texture": "botania:block/livingwood1" + "texture": "botania:block/livingwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_fence_gate_open.json b/src/main/resources/assets/botania/models/block/livingwood_fence_gate_open.json index abdfbafa6..c4de1ef36 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_fence_gate_open.json +++ b/src/main/resources/assets/botania/models/block/livingwood_fence_gate_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_open", "textures": { - "texture": "botania:block/livingwood1" + "texture": "botania:block/livingwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall.json b/src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall.json index b310828f7..1e6d04297 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall.json +++ b/src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_wall", "textures": { - "texture": "botania:block/livingwood1" + "texture": "botania:block/livingwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall_open.json b/src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall_open.json index 7842f70a6..fe61aa4a4 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall_open.json +++ b/src/main/resources/assets/botania/models/block/livingwood_fence_gate_wall_open.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_fence_gate_wall_open", "textures": { - "texture": "botania:block/livingwood1" + "texture": "botania:block/livingwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_fence_post.json b/src/main/resources/assets/botania/models/block/livingwood_fence_post.json index addd23d36..1cf975c1b 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_fence_post.json +++ b/src/main/resources/assets/botania/models/block/livingwood_fence_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/fence_post", "textures": { - "texture": "botania:block/livingwood1" + "texture": "botania:block/livingwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_fence_side.json b/src/main/resources/assets/botania/models/block/livingwood_fence_side.json index ad6d95155..92d3a52d8 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_fence_side.json +++ b/src/main/resources/assets/botania/models/block/livingwood_fence_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/fence_side", "textures": { - "texture": "botania:block/livingwood1" + "texture": "botania:block/livingwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks.json b/src/main/resources/assets/botania/models/block/livingwood_planks.json index bd0dfbf42..f9bbc8623 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_planks.json +++ b/src/main/resources/assets/botania/models/block/livingwood_planks.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:block/livingwood1" + "all": "botania:block/livingwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks_slab.json b/src/main/resources/assets/botania/models/block/livingwood_planks_slab.json index 2e3795a5c..55e0671f7 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_planks_slab.json +++ b/src/main/resources/assets/botania/models/block/livingwood_planks_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "bottom": "botania:block/livingwood1", - "top": "botania:block/livingwood1", - "side": "botania:block/livingwood1" + "bottom": "botania:block/livingwood_planks", + "top": "botania:block/livingwood_planks", + "side": "botania:block/livingwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_planks_stairs.json index 24bf373ee..137b4f1be 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_planks_stairs.json +++ b/src/main/resources/assets/botania/models/block/livingwood_planks_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/stairs", "textures": { - "bottom": "botania:block/livingwood1", - "top": "botania:block/livingwood1", - "side": "botania:block/livingwood1" + "bottom": "botania:block/livingwood_planks", + "top": "botania:block/livingwood_planks", + "side": "botania:block/livingwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks_stairs_inner.json b/src/main/resources/assets/botania/models/block/livingwood_planks_stairs_inner.json index 29d4964f0..1496f6057 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_planks_stairs_inner.json +++ b/src/main/resources/assets/botania/models/block/livingwood_planks_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "block/inner_stairs", "textures": { - "bottom": "botania:block/livingwood1", - "top": "botania:block/livingwood1", - "side": "botania:block/livingwood1" + "bottom": "botania:block/livingwood_planks", + "top": "botania:block/livingwood_planks", + "side": "botania:block/livingwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_planks_stairs_outer.json b/src/main/resources/assets/botania/models/block/livingwood_planks_stairs_outer.json index a91c5b26a..280b27b9f 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_planks_stairs_outer.json +++ b/src/main/resources/assets/botania/models/block/livingwood_planks_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "block/outer_stairs", "textures": { - "bottom": "botania:block/livingwood1", - "top": "botania:block/livingwood1", - "side": "botania:block/livingwood1" + "bottom": "botania:block/livingwood_planks", + "top": "botania:block/livingwood_planks", + "side": "botania:block/livingwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_slab.json b/src/main/resources/assets/botania/models/block/livingwood_slab.json index 92050ad54..db0a308e1 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_slab.json +++ b/src/main/resources/assets/botania/models/block/livingwood_slab.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/slab", "textures": { - "bottom": "botania:block/livingwood0", - "top": "botania:block/livingwood0", - "side": "botania:block/livingwood0" + "bottom": "botania:block/livingwood", + "top": "botania:block/livingwood", + "side": "botania:block/livingwood" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_stairs.json b/src/main/resources/assets/botania/models/block/livingwood_stairs.json index 830c2fe1d..7a4ceaddc 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_stairs.json +++ b/src/main/resources/assets/botania/models/block/livingwood_stairs.json @@ -1,8 +1,8 @@ { "parent": "block/stairs", "textures": { - "bottom": "botania:block/livingwood0", - "top": "botania:block/livingwood0", - "side": "botania:block/livingwood0" + "bottom": "botania:block/livingwood", + "top": "botania:block/livingwood", + "side": "botania:block/livingwood" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_stairs_inner.json b/src/main/resources/assets/botania/models/block/livingwood_stairs_inner.json index c7d2d5c53..2c61a0d58 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_stairs_inner.json +++ b/src/main/resources/assets/botania/models/block/livingwood_stairs_inner.json @@ -1,8 +1,8 @@ { "parent": "block/inner_stairs", "textures": { - "bottom": "botania:block/livingwood0", - "top": "botania:block/livingwood0", - "side": "botania:block/livingwood0" + "bottom": "botania:block/livingwood", + "top": "botania:block/livingwood", + "side": "botania:block/livingwood" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_stairs_outer.json b/src/main/resources/assets/botania/models/block/livingwood_stairs_outer.json index 16b755fb3..d3b94969f 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_stairs_outer.json +++ b/src/main/resources/assets/botania/models/block/livingwood_stairs_outer.json @@ -1,8 +1,8 @@ { "parent": "block/outer_stairs", "textures": { - "bottom": "botania:block/livingwood0", - "top": "botania:block/livingwood0", - "side": "botania:block/livingwood0" + "bottom": "botania:block/livingwood", + "top": "botania:block/livingwood", + "side": "botania:block/livingwood" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_wall_post.json b/src/main/resources/assets/botania/models/block/livingwood_wall_post.json index 32b070aeb..86082ecf6 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_wall_post.json +++ b/src/main/resources/assets/botania/models/block/livingwood_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_post", "textures": { - "wall": "botania:block/livingwood0" + "wall": "botania:block/livingwood" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_wall_side.json b/src/main/resources/assets/botania/models/block/livingwood_wall_side.json index a2b281d76..51cad11d6 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_wall_side.json +++ b/src/main/resources/assets/botania/models/block/livingwood_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side", "textures": { - "wall": "botania:block/livingwood0" + "wall": "botania:block/livingwood" } } diff --git a/src/main/resources/assets/botania/models/block/livingwood_wall_side_tall.json b/src/main/resources/assets/botania/models/block/livingwood_wall_side_tall.json index fb1f9ece6..2c340811d 100644 --- a/src/main/resources/assets/botania/models/block/livingwood_wall_side_tall.json +++ b/src/main/resources/assets/botania/models/block/livingwood_wall_side_tall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side_tall", "textures": { - "wall": "botania:block/livingwood0" + "wall": "botania:block/livingwood" } } diff --git a/src/main/resources/assets/botania/models/block/mana_spreader.json b/src/main/resources/assets/botania/models/block/mana_spreader.json index 37b9f7658..39770db9e 100644 --- a/src/main/resources/assets/botania/models/block/mana_spreader.json +++ b/src/main/resources/assets/botania/models/block/mana_spreader.json @@ -2,6 +2,6 @@ "parent": "botania:block/shapes/spreader", "textures": { "side": "botania:block/mana_spreader_side", - "material": "botania:block/livingwood0" + "material": "botania:block/livingwood" } } diff --git a/src/main/resources/assets/botania/models/block/mossy_dreamwood_planks.json b/src/main/resources/assets/botania/models/block/mossy_dreamwood_planks.json index bd8d67959..621b01d87 100644 --- a/src/main/resources/assets/botania/models/block/mossy_dreamwood_planks.json +++ b/src/main/resources/assets/botania/models/block/mossy_dreamwood_planks.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:block/dreamwood2" + "all": "botania:block/mossy_dreamwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/mossy_livingwood_planks.json b/src/main/resources/assets/botania/models/block/mossy_livingwood_planks.json index e9573fd92..0e11a52f3 100644 --- a/src/main/resources/assets/botania/models/block/mossy_livingwood_planks.json +++ b/src/main/resources/assets/botania/models/block/mossy_livingwood_planks.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:block/livingwood2" + "all": "botania:block/mossy_livingwood_planks" } } diff --git a/src/main/resources/assets/botania/models/block/pattern_framed_dreamwood.json b/src/main/resources/assets/botania/models/block/pattern_framed_dreamwood.json index 1abf74e46..1682858b4 100644 --- a/src/main/resources/assets/botania/models/block/pattern_framed_dreamwood.json +++ b/src/main/resources/assets/botania/models/block/pattern_framed_dreamwood.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:block/dreamwood4" + "all": "botania:block/pattern_framed_dreamwood" } } diff --git a/src/main/resources/assets/botania/models/block/pattern_framed_livingwood.json b/src/main/resources/assets/botania/models/block/pattern_framed_livingwood.json index e32ece180..7fbae4a3f 100644 --- a/src/main/resources/assets/botania/models/block/pattern_framed_livingwood.json +++ b/src/main/resources/assets/botania/models/block/pattern_framed_livingwood.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:block/livingwood4" + "all": "botania:block/pattern_framed_livingwood" } } diff --git a/src/main/resources/assets/botania/models/block/redstone_spreader.json b/src/main/resources/assets/botania/models/block/redstone_spreader.json index f4b1be817..d2c841cb8 100644 --- a/src/main/resources/assets/botania/models/block/redstone_spreader.json +++ b/src/main/resources/assets/botania/models/block/redstone_spreader.json @@ -2,6 +2,6 @@ "parent": "botania:block/shapes/spreader", "textures": { "side": "botania:block/redstone_spreader_side", - "material": "botania:block/livingwood0" + "material": "botania:block/livingwood" } } diff --git a/src/main/resources/assets/botania/models/item/dreamwood_fence.json b/src/main/resources/assets/botania/models/item/dreamwood_fence.json index 3eda6bad3..c34ea7ae5 100644 --- a/src/main/resources/assets/botania/models/item/dreamwood_fence.json +++ b/src/main/resources/assets/botania/models/item/dreamwood_fence.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "botania:block/dreamwood1" + "texture": "botania:block/dreamwood_planks" } } diff --git a/src/main/resources/assets/botania/models/item/dreamwood_wall.json b/src/main/resources/assets/botania/models/item/dreamwood_wall.json index d39b4f954..836ab6f87 100644 --- a/src/main/resources/assets/botania/models/item/dreamwood_wall.json +++ b/src/main/resources/assets/botania/models/item/dreamwood_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_inventory", "textures": { - "wall": "botania:block/dreamwood0" + "wall": "botania:block/dreamwood" } } diff --git a/src/main/resources/assets/botania/models/item/elven_spreader.json b/src/main/resources/assets/botania/models/item/elven_spreader.json index e27bb1d53..ab306d7d0 100644 --- a/src/main/resources/assets/botania/models/item/elven_spreader.json +++ b/src/main/resources/assets/botania/models/item/elven_spreader.json @@ -3,6 +3,6 @@ "textures": { "inside": "botania:block/elven_spreader_inside", "side": "botania:block/elven_spreader_side", - "material": "botania:block/dreamwood0" + "material": "botania:block/dreamwood" } } diff --git a/src/main/resources/assets/botania/models/item/livingwood_fence.json b/src/main/resources/assets/botania/models/item/livingwood_fence.json index b3fea4041..2d70f4d1b 100644 --- a/src/main/resources/assets/botania/models/item/livingwood_fence.json +++ b/src/main/resources/assets/botania/models/item/livingwood_fence.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/fence_inventory", "textures": { - "texture": "botania:block/livingwood1" + "texture": "botania:block/livingwood_planks" } } diff --git a/src/main/resources/assets/botania/models/item/livingwood_wall.json b/src/main/resources/assets/botania/models/item/livingwood_wall.json index 223844be5..da7961bf4 100644 --- a/src/main/resources/assets/botania/models/item/livingwood_wall.json +++ b/src/main/resources/assets/botania/models/item/livingwood_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_inventory", "textures": { - "wall": "botania:block/livingwood0" + "wall": "botania:block/livingwood" } } diff --git a/src/main/resources/assets/botania/models/item/mana_spreader.json b/src/main/resources/assets/botania/models/item/mana_spreader.json index c29b99ab1..d1708e30a 100644 --- a/src/main/resources/assets/botania/models/item/mana_spreader.json +++ b/src/main/resources/assets/botania/models/item/mana_spreader.json @@ -3,6 +3,6 @@ "textures": { "inside": "botania:block/mana_spreader_inside", "side": "botania:block/mana_spreader_side", - "material": "botania:block/livingwood0" + "material": "botania:block/livingwood" } } diff --git a/src/main/resources/assets/botania/models/item/redstone_spreader.json b/src/main/resources/assets/botania/models/item/redstone_spreader.json index edead0856..0b08131c2 100644 --- a/src/main/resources/assets/botania/models/item/redstone_spreader.json +++ b/src/main/resources/assets/botania/models/item/redstone_spreader.json @@ -3,6 +3,6 @@ "textures": { "inside": "botania:block/redstone_spreader_inside", "side": "botania:block/redstone_spreader_side", - "material": "botania:block/livingwood0" + "material": "botania:block/livingwood" } } diff --git a/src/main/resources/assets/botania/textures/block/dreamwood0.png b/src/main/resources/assets/botania/textures/block/dreamwood.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/dreamwood0.png rename to src/main/resources/assets/botania/textures/block/dreamwood.png diff --git a/src/main/resources/assets/botania/textures/block/dreamwood1.png b/src/main/resources/assets/botania/textures/block/dreamwood_planks.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/dreamwood1.png rename to src/main/resources/assets/botania/textures/block/dreamwood_planks.png diff --git a/src/main/resources/assets/botania/textures/block/dreamwood3.png b/src/main/resources/assets/botania/textures/block/framed_dreamwood.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/dreamwood3.png rename to src/main/resources/assets/botania/textures/block/framed_dreamwood.png diff --git a/src/main/resources/assets/botania/textures/block/livingwood3.png b/src/main/resources/assets/botania/textures/block/framed_livingwood.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/livingwood3.png rename to src/main/resources/assets/botania/textures/block/framed_livingwood.png diff --git a/src/main/resources/assets/botania/textures/block/dreamwood5.png b/src/main/resources/assets/botania/textures/block/glimmering_dreamwood.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/dreamwood5.png rename to src/main/resources/assets/botania/textures/block/glimmering_dreamwood.png diff --git a/src/main/resources/assets/botania/textures/block/livingwood5.png b/src/main/resources/assets/botania/textures/block/glimmering_livingwood.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/livingwood5.png rename to src/main/resources/assets/botania/textures/block/glimmering_livingwood.png diff --git a/src/main/resources/assets/botania/textures/block/livingwood0.png b/src/main/resources/assets/botania/textures/block/livingwood.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/livingwood0.png rename to src/main/resources/assets/botania/textures/block/livingwood.png diff --git a/src/main/resources/assets/botania/textures/block/livingwood1.png b/src/main/resources/assets/botania/textures/block/livingwood_planks.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/livingwood1.png rename to src/main/resources/assets/botania/textures/block/livingwood_planks.png diff --git a/src/main/resources/assets/botania/textures/block/dreamwood2.png b/src/main/resources/assets/botania/textures/block/mossy_dreamwood_planks.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/dreamwood2.png rename to src/main/resources/assets/botania/textures/block/mossy_dreamwood_planks.png diff --git a/src/main/resources/assets/botania/textures/block/livingwood2.png b/src/main/resources/assets/botania/textures/block/mossy_livingwood_planks.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/livingwood2.png rename to src/main/resources/assets/botania/textures/block/mossy_livingwood_planks.png diff --git a/src/main/resources/assets/botania/textures/block/dreamwood4.png b/src/main/resources/assets/botania/textures/block/pattern_framed_dreamwood.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/dreamwood4.png rename to src/main/resources/assets/botania/textures/block/pattern_framed_dreamwood.png diff --git a/src/main/resources/assets/botania/textures/block/livingwood4.png b/src/main/resources/assets/botania/textures/block/pattern_framed_livingwood.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/livingwood4.png rename to src/main/resources/assets/botania/textures/block/pattern_framed_livingwood.png