From 88e3d8ffc035ecbd62fb2d72ddbc73f02bb9b5fa Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 1 Jul 2020 21:15:37 -0500 Subject: [PATCH] datagenerate block models for particle-only tesrs --- .../assets/botania/blockstates/gaia_head.json | 2 +- .../botania/blockstates/gaia_wall_head.json | 2 +- .../botania/models/block/animated_torch.json | 5 ++ .../assets/botania/models/block/avatar.json | 10 +-- .../assets/botania/models/block/bellows.json | 10 +-- .../models/block/black_buried_petals.json | 5 ++ .../models/block/blue_buried_petals.json | 5 ++ .../assets/botania/models/block/brewery.json | 10 +-- .../models/block/brown_buried_petals.json | 5 ++ .../botania/models/block/corporea_index.json | 10 +-- .../models/block/cyan_buried_petals.json | 5 ++ .../models/block/detector_light_relay.json | 10 +-- .../assets/botania/models/block/fake_air.json | 1 + .../models/block/fork_light_relay.json | 10 +-- .../botania/models/block/gaia_head.json | 5 ++ .../botania/models/block/gaia_pylon.json | 5 ++ .../botania/models/block/gaia_wall_head.json | 5 ++ .../models/block/gray_buried_petals.json | 5 ++ .../models/block/green_buried_petals.json | 5 ++ .../botania/models/block/hourglass.json | 10 +-- .../block/light_blue_buried_petals.json | 5 ++ .../block/light_gray_buried_petals.json | 5 ++ .../botania/models/block/light_relay.json | 10 +-- .../models/block/lime_buried_petals.json | 5 ++ .../models/block/magenta_buried_petals.json | 5 ++ .../botania/models/block/mana_flame.json | 5 ++ .../botania/models/block/mana_pylon.json | 5 ++ .../botania/models/block/natura_pylon.json | 5 ++ .../models/block/orange_buried_petals.json | 5 ++ .../models/block/pink_buried_petals.json | 5 ++ .../models/block/purple_buried_petals.json | 5 ++ .../models/block/red_buried_petals.json | 5 ++ .../botania/models/block/teru_teru_bozu.json | 5 ++ .../models/block/toggle_light_relay.json | 10 +-- .../models/block/white_buried_petals.json | 5 ++ .../models/block/yellow_buried_petals.json | 5 ++ .../common/block/decor/BlockBuriedPetals.java | 2 +- .../botania/data/BlockstateProvider.java | 62 ++++++++++++++----- .../botania/models/block/animated_torch.json | 5 -- .../models/block/black_buried_petals.json | 5 -- .../models/block/blue_buried_petals.json | 5 -- .../models/block/brown_buried_petals.json | 5 -- .../models/block/cyan_buried_petals.json | 5 -- .../assets/botania/models/block/fake_air.json | 5 -- .../botania/models/block/gaia_head.json | 5 -- .../botania/models/block/gaia_pylon.json | 5 -- .../models/block/gray_buried_petals.json | 5 -- .../models/block/green_buried_petals.json | 5 -- .../block/light_blue_buried_petals.json | 5 -- .../block/light_gray_buried_petals.json | 5 -- .../models/block/lime_buried_petals.json | 5 -- .../models/block/magenta_buried_petals.json | 5 -- .../botania/models/block/mana_flame.json | 5 -- .../botania/models/block/mana_pylon.json | 5 -- .../botania/models/block/natura_pylon.json | 5 -- .../models/block/orange_buried_petals.json | 5 -- .../models/block/pink_buried_petals.json | 5 -- .../models/block/purple_buried_petals.json | 5 -- .../models/block/red_buried_petals.json | 5 -- .../botania/models/block/teru_teru_bozu.json | 5 -- .../botania/models/block/trodden_dirt.json | 6 -- .../models/block/white_buried_petals.json | 5 -- .../models/block/yellow_buried_petals.json | 5 -- 63 files changed, 217 insertions(+), 188 deletions(-) create mode 100644 src/generated/resources/assets/botania/models/block/animated_torch.json rename src/{main => generated}/resources/assets/botania/models/block/avatar.json (90%) rename src/{main => generated}/resources/assets/botania/models/block/bellows.json (90%) create mode 100644 src/generated/resources/assets/botania/models/block/black_buried_petals.json create mode 100644 src/generated/resources/assets/botania/models/block/blue_buried_petals.json rename src/{main => generated}/resources/assets/botania/models/block/brewery.json (90%) create mode 100644 src/generated/resources/assets/botania/models/block/brown_buried_petals.json rename src/{main => generated}/resources/assets/botania/models/block/corporea_index.json (91%) create mode 100644 src/generated/resources/assets/botania/models/block/cyan_buried_petals.json rename src/{main => generated}/resources/assets/botania/models/block/detector_light_relay.json (91%) create mode 100644 src/generated/resources/assets/botania/models/block/fake_air.json rename src/{main => generated}/resources/assets/botania/models/block/fork_light_relay.json (90%) create mode 100644 src/generated/resources/assets/botania/models/block/gaia_head.json create mode 100644 src/generated/resources/assets/botania/models/block/gaia_pylon.json create mode 100644 src/generated/resources/assets/botania/models/block/gaia_wall_head.json create mode 100644 src/generated/resources/assets/botania/models/block/gray_buried_petals.json create mode 100644 src/generated/resources/assets/botania/models/block/green_buried_petals.json rename src/{main => generated}/resources/assets/botania/models/block/hourglass.json (90%) create mode 100644 src/generated/resources/assets/botania/models/block/light_blue_buried_petals.json create mode 100644 src/generated/resources/assets/botania/models/block/light_gray_buried_petals.json rename src/{main => generated}/resources/assets/botania/models/block/light_relay.json (90%) create mode 100644 src/generated/resources/assets/botania/models/block/lime_buried_petals.json create mode 100644 src/generated/resources/assets/botania/models/block/magenta_buried_petals.json create mode 100644 src/generated/resources/assets/botania/models/block/mana_flame.json create mode 100644 src/generated/resources/assets/botania/models/block/mana_pylon.json create mode 100644 src/generated/resources/assets/botania/models/block/natura_pylon.json create mode 100644 src/generated/resources/assets/botania/models/block/orange_buried_petals.json create mode 100644 src/generated/resources/assets/botania/models/block/pink_buried_petals.json create mode 100644 src/generated/resources/assets/botania/models/block/purple_buried_petals.json create mode 100644 src/generated/resources/assets/botania/models/block/red_buried_petals.json create mode 100644 src/generated/resources/assets/botania/models/block/teru_teru_bozu.json rename src/{main => generated}/resources/assets/botania/models/block/toggle_light_relay.json (91%) create mode 100644 src/generated/resources/assets/botania/models/block/white_buried_petals.json create mode 100644 src/generated/resources/assets/botania/models/block/yellow_buried_petals.json delete mode 100644 src/main/resources/assets/botania/models/block/animated_torch.json delete mode 100644 src/main/resources/assets/botania/models/block/black_buried_petals.json delete mode 100644 src/main/resources/assets/botania/models/block/blue_buried_petals.json delete mode 100644 src/main/resources/assets/botania/models/block/brown_buried_petals.json delete mode 100644 src/main/resources/assets/botania/models/block/cyan_buried_petals.json delete mode 100644 src/main/resources/assets/botania/models/block/fake_air.json delete mode 100644 src/main/resources/assets/botania/models/block/gaia_head.json delete mode 100644 src/main/resources/assets/botania/models/block/gaia_pylon.json delete mode 100644 src/main/resources/assets/botania/models/block/gray_buried_petals.json delete mode 100644 src/main/resources/assets/botania/models/block/green_buried_petals.json delete mode 100644 src/main/resources/assets/botania/models/block/light_blue_buried_petals.json delete mode 100644 src/main/resources/assets/botania/models/block/light_gray_buried_petals.json delete mode 100644 src/main/resources/assets/botania/models/block/lime_buried_petals.json delete mode 100644 src/main/resources/assets/botania/models/block/magenta_buried_petals.json delete mode 100644 src/main/resources/assets/botania/models/block/mana_flame.json delete mode 100644 src/main/resources/assets/botania/models/block/mana_pylon.json delete mode 100644 src/main/resources/assets/botania/models/block/natura_pylon.json delete mode 100644 src/main/resources/assets/botania/models/block/orange_buried_petals.json delete mode 100644 src/main/resources/assets/botania/models/block/pink_buried_petals.json delete mode 100644 src/main/resources/assets/botania/models/block/purple_buried_petals.json delete mode 100644 src/main/resources/assets/botania/models/block/red_buried_petals.json delete mode 100644 src/main/resources/assets/botania/models/block/teru_teru_bozu.json delete mode 100644 src/main/resources/assets/botania/models/block/trodden_dirt.json delete mode 100644 src/main/resources/assets/botania/models/block/white_buried_petals.json delete mode 100644 src/main/resources/assets/botania/models/block/yellow_buried_petals.json diff --git a/src/generated/resources/assets/botania/blockstates/gaia_head.json b/src/generated/resources/assets/botania/blockstates/gaia_head.json index e28fd5eac..8a276536d 100644 --- a/src/generated/resources/assets/botania/blockstates/gaia_head.json +++ b/src/generated/resources/assets/botania/blockstates/gaia_head.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "minecraft:block/soul_sand" + "model": "botania:block/gaia_head" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/gaia_wall_head.json b/src/generated/resources/assets/botania/blockstates/gaia_wall_head.json index e28fd5eac..2a06da290 100644 --- a/src/generated/resources/assets/botania/blockstates/gaia_wall_head.json +++ b/src/generated/resources/assets/botania/blockstates/gaia_wall_head.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "minecraft:block/soul_sand" + "model": "botania:block/gaia_wall_head" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/animated_torch.json b/src/generated/resources/assets/botania/models/block/animated_torch.json new file mode 100644 index 000000000..8e0b88eb0 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/animated_torch.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/redstone_torch" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/avatar.json b/src/generated/resources/assets/botania/models/block/avatar.json similarity index 90% rename from src/main/resources/assets/botania/models/block/avatar.json rename to src/generated/resources/assets/botania/models/block/avatar.json index 5cdff46ca..39b4c053d 100644 --- a/src/main/resources/assets/botania/models/block/avatar.json +++ b/src/generated/resources/assets/botania/models/block/avatar.json @@ -1,5 +1,5 @@ -{ - "textures": { - "particle": "botania:block/livingwood" - } -} +{ + "textures": { + "particle": "botania:block/livingwood" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bellows.json b/src/generated/resources/assets/botania/models/block/bellows.json similarity index 90% rename from src/main/resources/assets/botania/models/block/bellows.json rename to src/generated/resources/assets/botania/models/block/bellows.json index 5cdff46ca..39b4c053d 100644 --- a/src/main/resources/assets/botania/models/block/bellows.json +++ b/src/generated/resources/assets/botania/models/block/bellows.json @@ -1,5 +1,5 @@ -{ - "textures": { - "particle": "botania:block/livingwood" - } -} +{ + "textures": { + "particle": "botania:block/livingwood" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/black_buried_petals.json b/src/generated/resources/assets/botania/models/block/black_buried_petals.json new file mode 100644 index 000000000..d84db9183 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/black_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/black_wool" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/blue_buried_petals.json b/src/generated/resources/assets/botania/models/block/blue_buried_petals.json new file mode 100644 index 000000000..81db96320 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/blue_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/blue_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/brewery.json b/src/generated/resources/assets/botania/models/block/brewery.json similarity index 90% rename from src/main/resources/assets/botania/models/block/brewery.json rename to src/generated/resources/assets/botania/models/block/brewery.json index 33749d656..ddf8ae15b 100644 --- a/src/main/resources/assets/botania/models/block/brewery.json +++ b/src/generated/resources/assets/botania/models/block/brewery.json @@ -1,5 +1,5 @@ -{ - "textures": { - "particle": "botania:block/livingrock" - } -} +{ + "textures": { + "particle": "botania:block/livingrock" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/brown_buried_petals.json b/src/generated/resources/assets/botania/models/block/brown_buried_petals.json new file mode 100644 index 000000000..491dd2c21 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/brown_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/brown_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/corporea_index.json b/src/generated/resources/assets/botania/models/block/corporea_index.json similarity index 91% rename from src/main/resources/assets/botania/models/block/corporea_index.json rename to src/generated/resources/assets/botania/models/block/corporea_index.json index 020f0b888..17b9e7084 100644 --- a/src/main/resources/assets/botania/models/block/corporea_index.json +++ b/src/generated/resources/assets/botania/models/block/corporea_index.json @@ -1,5 +1,5 @@ -{ - "textures": { - "particle": "botania:block/elementium_block" - } -} +{ + "textures": { + "particle": "botania:block/elementium_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/cyan_buried_petals.json b/src/generated/resources/assets/botania/models/block/cyan_buried_petals.json new file mode 100644 index 000000000..d897f0ca2 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/cyan_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/cyan_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/detector_light_relay.json b/src/generated/resources/assets/botania/models/block/detector_light_relay.json similarity index 91% rename from src/main/resources/assets/botania/models/block/detector_light_relay.json rename to src/generated/resources/assets/botania/models/block/detector_light_relay.json index 9693f32a3..6d5e51d25 100644 --- a/src/main/resources/assets/botania/models/block/detector_light_relay.json +++ b/src/generated/resources/assets/botania/models/block/detector_light_relay.json @@ -1,5 +1,5 @@ -{ - "textures": { - "particle": "botania:block/luminizer_detector" - } -} +{ + "textures": { + "particle": "botania:block/luminizer_detector" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/fake_air.json b/src/generated/resources/assets/botania/models/block/fake_air.json new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/fake_air.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fork_light_relay.json b/src/generated/resources/assets/botania/models/block/fork_light_relay.json similarity index 90% rename from src/main/resources/assets/botania/models/block/fork_light_relay.json rename to src/generated/resources/assets/botania/models/block/fork_light_relay.json index 7742b07e8..34833a11c 100644 --- a/src/main/resources/assets/botania/models/block/fork_light_relay.json +++ b/src/generated/resources/assets/botania/models/block/fork_light_relay.json @@ -1,5 +1,5 @@ -{ - "textures": { - "particle": "botania:block/luminizer_fork" - } -} +{ + "textures": { + "particle": "botania:block/luminizer_fork" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/gaia_head.json b/src/generated/resources/assets/botania/models/block/gaia_head.json new file mode 100644 index 000000000..a4a6df993 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/gaia_head.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/soul_sand" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/gaia_pylon.json b/src/generated/resources/assets/botania/models/block/gaia_pylon.json new file mode 100644 index 000000000..17b9e7084 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/gaia_pylon.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "botania:block/elementium_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/gaia_wall_head.json b/src/generated/resources/assets/botania/models/block/gaia_wall_head.json new file mode 100644 index 000000000..a4a6df993 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/gaia_wall_head.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/soul_sand" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/gray_buried_petals.json b/src/generated/resources/assets/botania/models/block/gray_buried_petals.json new file mode 100644 index 000000000..c9d58a80e --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/gray_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/gray_wool" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/green_buried_petals.json b/src/generated/resources/assets/botania/models/block/green_buried_petals.json new file mode 100644 index 000000000..56b2c189f --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/green_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/green_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/hourglass.json b/src/generated/resources/assets/botania/models/block/hourglass.json similarity index 90% rename from src/main/resources/assets/botania/models/block/hourglass.json rename to src/generated/resources/assets/botania/models/block/hourglass.json index 54233b520..91b970e17 100644 --- a/src/main/resources/assets/botania/models/block/hourglass.json +++ b/src/generated/resources/assets/botania/models/block/hourglass.json @@ -1,5 +1,5 @@ -{ - "textures": { - "particle": "botania:block/mana_glass" - } -} +{ + "textures": { + "particle": "botania:block/mana_glass" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/light_blue_buried_petals.json b/src/generated/resources/assets/botania/models/block/light_blue_buried_petals.json new file mode 100644 index 000000000..50046cd16 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/light_blue_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/light_blue_wool" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/light_gray_buried_petals.json b/src/generated/resources/assets/botania/models/block/light_gray_buried_petals.json new file mode 100644 index 000000000..76892b760 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/light_gray_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/light_gray_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/light_relay.json b/src/generated/resources/assets/botania/models/block/light_relay.json similarity index 90% rename from src/main/resources/assets/botania/models/block/light_relay.json rename to src/generated/resources/assets/botania/models/block/light_relay.json index 57f98c4fa..3c8b6face 100644 --- a/src/main/resources/assets/botania/models/block/light_relay.json +++ b/src/generated/resources/assets/botania/models/block/light_relay.json @@ -1,5 +1,5 @@ -{ - "textures": { - "particle": "botania:block/luminizer" - } -} +{ + "textures": { + "particle": "botania:block/luminizer" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/lime_buried_petals.json b/src/generated/resources/assets/botania/models/block/lime_buried_petals.json new file mode 100644 index 000000000..b65af52f9 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/lime_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/lime_wool" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/magenta_buried_petals.json b/src/generated/resources/assets/botania/models/block/magenta_buried_petals.json new file mode 100644 index 000000000..437694c10 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/magenta_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/magenta_wool" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/mana_flame.json b/src/generated/resources/assets/botania/models/block/mana_flame.json new file mode 100644 index 000000000..fc9508d9e --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/mana_flame.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/fire_0" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/mana_pylon.json b/src/generated/resources/assets/botania/models/block/mana_pylon.json new file mode 100644 index 000000000..071ff543c --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/mana_pylon.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "botania:block/manasteel_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/natura_pylon.json b/src/generated/resources/assets/botania/models/block/natura_pylon.json new file mode 100644 index 000000000..0558bd48d --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/natura_pylon.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "botania:block/terrasteel_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/orange_buried_petals.json b/src/generated/resources/assets/botania/models/block/orange_buried_petals.json new file mode 100644 index 000000000..f25bba65b --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/orange_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/orange_wool" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/pink_buried_petals.json b/src/generated/resources/assets/botania/models/block/pink_buried_petals.json new file mode 100644 index 000000000..e5f2fd909 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/pink_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/pink_wool" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/purple_buried_petals.json b/src/generated/resources/assets/botania/models/block/purple_buried_petals.json new file mode 100644 index 000000000..f8c22cb1b --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/purple_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/purple_wool" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/red_buried_petals.json b/src/generated/resources/assets/botania/models/block/red_buried_petals.json new file mode 100644 index 000000000..a4af9f54e --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/red_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/red_wool" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/teru_teru_bozu.json b/src/generated/resources/assets/botania/models/block/teru_teru_bozu.json new file mode 100644 index 000000000..1a1e5b242 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/teru_teru_bozu.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/white_wool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/toggle_light_relay.json b/src/generated/resources/assets/botania/models/block/toggle_light_relay.json similarity index 91% rename from src/main/resources/assets/botania/models/block/toggle_light_relay.json rename to src/generated/resources/assets/botania/models/block/toggle_light_relay.json index 57b6bb374..db7f5fd02 100644 --- a/src/main/resources/assets/botania/models/block/toggle_light_relay.json +++ b/src/generated/resources/assets/botania/models/block/toggle_light_relay.json @@ -1,5 +1,5 @@ -{ - "textures": { - "particle": "botania:block/luminizer_toggle" - } -} +{ + "textures": { + "particle": "botania:block/luminizer_toggle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/white_buried_petals.json b/src/generated/resources/assets/botania/models/block/white_buried_petals.json new file mode 100644 index 000000000..1a1e5b242 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/white_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/white_wool" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/block/yellow_buried_petals.json b/src/generated/resources/assets/botania/models/block/yellow_buried_petals.json new file mode 100644 index 000000000..f6d0d31a2 --- /dev/null +++ b/src/generated/resources/assets/botania/models/block/yellow_buried_petals.json @@ -0,0 +1,5 @@ +{ + "textures": { + "particle": "block/yellow_wool" + } +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 1df237020..326f8d2ad 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -30,7 +30,7 @@ public class BlockBuriedPetals extends BushBlock implements IGrowable { private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 1.6, 16); - private final DyeColor color; + public final DyeColor color; public BlockBuriedPetals(DyeColor color, Properties builder) { super(builder); diff --git a/src/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index 8f6bd09b4..3cef6d817 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -12,6 +12,7 @@ import com.google.common.collect.ImmutableMap; import net.minecraft.block.*; import net.minecraft.data.DataGenerator; +import net.minecraft.item.DyeColor; import net.minecraft.state.EnumProperty; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.state.properties.DoubleBlockHalf; @@ -26,9 +27,9 @@ import net.minecraftforge.client.model.generators.ModelFile; import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder; import vazkii.botania.common.block.*; +import vazkii.botania.common.block.decor.BlockBuriedPetals; import vazkii.botania.common.block.decor.BlockModMushroom; import vazkii.botania.common.block.decor.BlockPetalBlock; -import vazkii.botania.common.block.decor.BlockShinyFlower; import vazkii.botania.common.block.string.BlockRedString; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -40,6 +41,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.IntStream; +import static vazkii.botania.common.block.ModBlocks.*; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; public class BlockstateProvider extends BlockStateProvider { @@ -59,22 +61,46 @@ public class BlockstateProvider extends BlockStateProvider { .filter(b -> LibMisc.MOD_ID.equals(Registry.BLOCK.getKey(b).getNamespace())) .collect(Collectors.toSet()); // Manually written blockstates + models - blocks.remove(ModBlocks.craftCrate); - blocks.remove(ModBlocks.ghostRail); - blocks.remove(ModBlocks.solidVines); + blocks.remove(craftCrate); + blocks.remove(ghostRail); + blocks.remove(solidVines); // Single blocks - String elfGlassName = Registry.BLOCK.getKey(ModBlocks.elfGlass).getPath(); + String elfGlassName = Registry.BLOCK.getKey(elfGlass).getPath(); ConfiguredModel[] elfGlassFiles = IntStream.rangeClosed(0, 3) .mapToObj(i -> models().getExistingFile(prefix("block/" + elfGlassName + "_" + i))) .map(ConfiguredModel::new).toArray(ConfiguredModel[]::new); - getVariantBuilder(ModBlocks.elfGlass).partialState().setModels(elfGlassFiles); - blocks.remove(ModBlocks.elfGlass); + getVariantBuilder(elfGlass).partialState().setModels(elfGlassFiles); + blocks.remove(elfGlass); String plateName = Registry.BLOCK.getKey(ModBlocks.incensePlate).getPath(); ModelFile plateFile = models().getExistingFile(prefix("block/" + plateName)); - horizontalBlock(ModBlocks.incensePlate, plateFile, 0); - blocks.remove(ModBlocks.incensePlate); + horizontalBlock(incensePlate, plateFile, 0); + blocks.remove(incensePlate); + + // TESRs with only particles + particleOnly(animatedTorch, new ResourceLocation("block/redstone_torch")); + particleOnly(avatar, prefix("block/livingwood")); + particleOnly(bellows, prefix("block/livingwood")); + particleOnly(brewery, prefix("block/livingrock")); + particleOnly(corporeaIndex, prefix("block/elementium_block")); + particleOnly(lightRelayDetector, prefix("block/luminizer_detector")); + simpleBlock(fakeAir, models().getBuilder(Registry.BLOCK.getKey(ModBlocks.fakeAir).getPath())); + particleOnly(lightRelayFork, prefix("block/luminizer_fork")); + particleOnly(gaiaHead, new ResourceLocation("block/soul_sand")); + particleOnly(gaiaHeadWall, new ResourceLocation("block/soul_sand")); + particleOnly(gaiaPylon, prefix("block/elementium_block")); + particleOnly(hourglass, prefix("block/mana_glass")); + particleOnly(lightRelayDefault, prefix("block/luminizer")); + particleOnly(manaFlame, new ResourceLocation("block/fire_0")); + particleOnly(manaPylon, prefix("block/manasteel_block")); + particleOnly(naturaPylon, prefix("block/terrasteel_block")); + particleOnly(teruTeruBozu, new ResourceLocation("block/white_wool")); + particleOnly(lightRelayToggle, prefix("block/luminizer_toggle")); + + blocks.removeAll(Arrays.asList(animatedTorch, avatar, bellows, brewery, corporeaIndex, lightRelayDetector, + fakeAir, lightRelayFork, gaiaHead, gaiaHeadWall, gaiaPylon, hourglass, + lightRelayDefault, manaFlame, manaPylon, naturaPylon, teruTeruBozu, lightRelayToggle)); // Block types Predicate flowers = b -> b instanceof BlockSpecialFlower @@ -87,11 +113,6 @@ public class BlockstateProvider extends BlockStateProvider { simpleBlock(b, model); }); - takeAll(blocks, ModBlocks.gaiaHead, ModBlocks.gaiaHeadWall).forEach(b -> { - ModelFile file = models().getExistingFile(new ResourceLocation("block/soul_sand")); - getVariantBuilder(b).partialState().setModels(new ConfiguredModel(file)); - }); - takeAll(blocks, b -> b instanceof BlockAltGrass).forEach(b -> { String name = Registry.BLOCK.getKey(b).getPath(); ResourceLocation side = prefix("block/" + name + "_side"); @@ -114,6 +135,12 @@ public class BlockstateProvider extends BlockStateProvider { .partialState().with(TallFlowerBlock.HALF, DoubleBlockHalf.UPPER).setModels(new ConfiguredModel(top)); }); + takeAll(blocks, b -> b instanceof BlockBuriedPetals).forEach(b -> { + DyeColor color = ((BlockBuriedPetals) b).color; + ResourceLocation wool = new ResourceLocation("block/" + color.func_176610_l() + "_wool"); + particleOnly(b, wool); + }); + blocks.forEach(b -> { String name = Registry.BLOCK.getKey(b).getPath(); if (name.contains("quartz") && b instanceof RotatedPillarBlock) { @@ -173,6 +200,13 @@ public class BlockstateProvider extends BlockStateProvider { }); } + private void particleOnly(Block b, ResourceLocation particle) { + String name = Registry.BLOCK.getKey(b).getPath(); + ModelFile f = models().getBuilder(name) + .texture("particle", particle); + simpleBlock(b, f); + } + @SafeVarargs private static Iterable takeAll(Set src, T... items) { List ret = Arrays.asList(items); diff --git a/src/main/resources/assets/botania/models/block/animated_torch.json b/src/main/resources/assets/botania/models/block/animated_torch.json deleted file mode 100644 index 9a45f4eb3..000000000 --- a/src/main/resources/assets/botania/models/block/animated_torch.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/redstone_torch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/black_buried_petals.json b/src/main/resources/assets/botania/models/block/black_buried_petals.json deleted file mode 100644 index a067ae3de..000000000 --- a/src/main/resources/assets/botania/models/block/black_buried_petals.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/black_wool" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/blue_buried_petals.json b/src/main/resources/assets/botania/models/block/blue_buried_petals.json deleted file mode 100644 index 91426203c..000000000 --- a/src/main/resources/assets/botania/models/block/blue_buried_petals.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/blue_wool" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/brown_buried_petals.json b/src/main/resources/assets/botania/models/block/brown_buried_petals.json deleted file mode 100644 index ebc6fa898..000000000 --- a/src/main/resources/assets/botania/models/block/brown_buried_petals.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/brown_wool" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cyan_buried_petals.json b/src/main/resources/assets/botania/models/block/cyan_buried_petals.json deleted file mode 100644 index ce5043aeb..000000000 --- a/src/main/resources/assets/botania/models/block/cyan_buried_petals.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/cyan_wool" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fake_air.json b/src/main/resources/assets/botania/models/block/fake_air.json deleted file mode 100644 index 576b88d12..000000000 --- a/src/main/resources/assets/botania/models/block/fake_air.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:item/barrier" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/gaia_head.json b/src/main/resources/assets/botania/models/block/gaia_head.json deleted file mode 100644 index d8969567a..000000000 --- a/src/main/resources/assets/botania/models/block/gaia_head.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/soul_sand" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/gaia_pylon.json b/src/main/resources/assets/botania/models/block/gaia_pylon.json deleted file mode 100644 index bb02dcef2..000000000 --- a/src/main/resources/assets/botania/models/block/gaia_pylon.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "botania:model/pylon_gaia" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/gray_buried_petals.json b/src/main/resources/assets/botania/models/block/gray_buried_petals.json deleted file mode 100644 index d91c5db26..000000000 --- a/src/main/resources/assets/botania/models/block/gray_buried_petals.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/gray_wool" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/green_buried_petals.json b/src/main/resources/assets/botania/models/block/green_buried_petals.json deleted file mode 100644 index 0b5726a9f..000000000 --- a/src/main/resources/assets/botania/models/block/green_buried_petals.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/green_wool" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/light_blue_buried_petals.json b/src/main/resources/assets/botania/models/block/light_blue_buried_petals.json deleted file mode 100644 index 81fe46989..000000000 --- a/src/main/resources/assets/botania/models/block/light_blue_buried_petals.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/light_blue_wool" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/light_gray_buried_petals.json b/src/main/resources/assets/botania/models/block/light_gray_buried_petals.json deleted file mode 100644 index a0c91390b..000000000 --- a/src/main/resources/assets/botania/models/block/light_gray_buried_petals.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/light_gray_wool" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/lime_buried_petals.json b/src/main/resources/assets/botania/models/block/lime_buried_petals.json deleted file mode 100644 index 7c2b94299..000000000 --- a/src/main/resources/assets/botania/models/block/lime_buried_petals.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/lime_wool" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/magenta_buried_petals.json b/src/main/resources/assets/botania/models/block/magenta_buried_petals.json deleted file mode 100644 index 2bd1c5e8f..000000000 --- a/src/main/resources/assets/botania/models/block/magenta_buried_petals.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/magenta_wool" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_flame.json b/src/main/resources/assets/botania/models/block/mana_flame.json deleted file mode 100644 index 4a9098406..000000000 --- a/src/main/resources/assets/botania/models/block/mana_flame.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/fire_0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_pylon.json b/src/main/resources/assets/botania/models/block/mana_pylon.json deleted file mode 100644 index 998720732..000000000 --- a/src/main/resources/assets/botania/models/block/mana_pylon.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "botania:model/pylon_mana" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/natura_pylon.json b/src/main/resources/assets/botania/models/block/natura_pylon.json deleted file mode 100644 index 1fb3a45b6..000000000 --- a/src/main/resources/assets/botania/models/block/natura_pylon.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "botania:model/pylon_natura" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/orange_buried_petals.json b/src/main/resources/assets/botania/models/block/orange_buried_petals.json deleted file mode 100644 index a0e6ad46f..000000000 --- a/src/main/resources/assets/botania/models/block/orange_buried_petals.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/orange_wool" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pink_buried_petals.json b/src/main/resources/assets/botania/models/block/pink_buried_petals.json deleted file mode 100644 index 62069c300..000000000 --- a/src/main/resources/assets/botania/models/block/pink_buried_petals.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/pink_wool" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/purple_buried_petals.json b/src/main/resources/assets/botania/models/block/purple_buried_petals.json deleted file mode 100644 index 3184ccbb6..000000000 --- a/src/main/resources/assets/botania/models/block/purple_buried_petals.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/purple_wool" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_buried_petals.json b/src/main/resources/assets/botania/models/block/red_buried_petals.json deleted file mode 100644 index 669ba1267..000000000 --- a/src/main/resources/assets/botania/models/block/red_buried_petals.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/red_wool" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/teru_teru_bozu.json b/src/main/resources/assets/botania/models/block/teru_teru_bozu.json deleted file mode 100644 index 0d2e2ad7a..000000000 --- a/src/main/resources/assets/botania/models/block/teru_teru_bozu.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/white_wool" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/trodden_dirt.json b/src/main/resources/assets/botania/models/block/trodden_dirt.json deleted file mode 100644 index 6f742b713..000000000 --- a/src/main/resources/assets/botania/models/block/trodden_dirt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:block/shapes/fifteen_high_all", - "textures": { - "all": "botania:block/dirtpath" - } -} diff --git a/src/main/resources/assets/botania/models/block/white_buried_petals.json b/src/main/resources/assets/botania/models/block/white_buried_petals.json deleted file mode 100644 index 0d2e2ad7a..000000000 --- a/src/main/resources/assets/botania/models/block/white_buried_petals.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/white_wool" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/yellow_buried_petals.json b/src/main/resources/assets/botania/models/block/yellow_buried_petals.json deleted file mode 100644 index 378086044..000000000 --- a/src/main/resources/assets/botania/models/block/yellow_buried_petals.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "textures": { - "particle": "minecraft:block/yellow_wool" - } -} \ No newline at end of file