From 40193538c54ecb4d67506c25d5b3d43ba0df7f0a Mon Sep 17 00:00:00 2001 From: zontreck Date: Thu, 21 Nov 2024 22:26:22 -0700 Subject: [PATCH] Add more pool tile variants --- .../blockstates/blue_pool_light.json | 7 ------- .../blockstates/blue_pool_tile_light.json | 7 +++++++ .../blockstates/dark_pool_light.json | 7 ------- .../blockstates/dark_pool_tile_light.json | 7 +++++++ .../blockstates/dirty_green_pool_light.json | 7 ------- .../dirty_green_pool_tile_light.json | 7 +++++++ .../blockstates/dirty_pool_light.json | 7 ------- .../blockstates/dirty_pool_tile_light.json | 7 +++++++ .../blockstates/dirty_red_pool_light.json | 7 ------- .../dirty_red_pool_tile_light.json | 7 +++++++ .../blockstates/filthy_blue_pool_light.json | 7 ------- .../filthy_blue_pool_tile_light.json | 7 +++++++ .../blockstates/filthy_green_pool_light.json | 7 ------- .../filthy_green_pool_tile_light.json | 7 +++++++ .../blockstates/filthy_pool_light.json | 7 ------- .../blockstates/filthy_pool_tile_light.json | 7 +++++++ .../blockstates/filthy_red_pool_light.json | 7 ------- .../filthy_red_pool_tile_light.json | 7 +++++++ .../blockstates/green_pool_light.json | 7 ------- .../blockstates/green_pool_tile_light.json | 7 +++++++ .../blockstates/pool_light.json | 7 ------- .../blockstates/pool_tile_light.json | 7 +++++++ .../blockstates/red_pool_light.json | 7 ------- .../blockstates/red_pool_tile_light.json | 7 +++++++ ...l_light.json => blue_pool_tile_light.json} | 2 +- ...ed_pool_light.json => cyan_pool_tile.json} | 2 +- .../models/block/dark_pool_tile_light.json | 6 ++++++ .../block/dirty_blue_pool_tile_light.json | 6 ++++++ .../block/dirty_cyan_pool_tile_light.json | 6 ++++++ ..._light.json => dirty_pool_tile_light.json} | 2 +- .../models/block/filthy_blue_pool_light.json | 6 ------ ...light.json => filthy_pool_tile_light.json} | 2 +- .../models/block/filthy_red_pool_light.json | 6 ------ .../models/block/green_pool_light.json | 6 ------ ..._light.json => green_pool_tile_light.json} | 2 +- .../block/{pool_light.json => mini_sun.json} | 2 +- ...e_pool_light.json => pool_tile_light.json} | 2 +- ...ol_light.json => red_pool_tile_light.json} | 2 +- .../models/item/blue_pool_light.json | 3 --- .../models/item/blue_pool_tile_light.json | 3 +++ .../models/item/dirty_blue_pool_light.json | 3 --- .../item/dirty_blue_pool_tile_light.json | 3 +++ .../models/item/dirty_green_pool_light.json | 3 --- .../item/dirty_green_pool_tile_light.json | 3 +++ .../models/item/dirty_pool_light.json | 3 --- .../models/item/dirty_pool_tile_light.json | 3 +++ .../models/item/filthy_blue_pool_light.json | 3 --- .../item/filthy_blue_pool_tile_light.json | 3 +++ .../models/item/filthy_green_pool_light.json | 3 --- .../item/filthy_green_pool_tile_light.json | 3 +++ .../models/item/filthy_pool_light.json | 3 --- .../models/item/filthy_pool_tile_light.json | 3 +++ .../models/item/filthy_red_pool_light.json | 3 --- .../item/filthy_red_pool_tile_light.json | 3 +++ .../models/item/green_pool_light.json | 3 --- .../models/item/green_pool_tile_light.json | 3 +++ .../models/item/pool_light.json | 3 --- .../models/item/pool_tile_light.json | 3 +++ .../models/item/red_pool_light.json | 3 --- .../models/item/red_pool_tile_light.json | 3 +++ .../blocks/{tflipflop.json => mini_sun.json} | 4 ++-- .../loot_tables/blocks/steel_railing.json | 21 ------------------- 62 files changed, 145 insertions(+), 166 deletions(-) delete mode 100644 src/main/resources/assets/ariasessentials/blockstates/blue_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/blockstates/blue_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/blockstates/dark_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/blockstates/dark_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/blockstates/dirty_green_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/blockstates/dirty_green_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/blockstates/dirty_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/blockstates/dirty_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/blockstates/dirty_red_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/blockstates/dirty_red_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/blockstates/filthy_blue_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/blockstates/filthy_blue_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/blockstates/filthy_green_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/blockstates/filthy_green_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/blockstates/filthy_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/blockstates/filthy_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/blockstates/filthy_red_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/blockstates/filthy_red_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/blockstates/green_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/blockstates/green_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/blockstates/pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/blockstates/pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/blockstates/red_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/blockstates/red_pool_tile_light.json rename src/main/resources/assets/ariasessentials/models/block/{filthy_pool_light.json => blue_pool_tile_light.json} (52%) rename src/main/resources/assets/ariasessentials/models/block/{red_pool_light.json => cyan_pool_tile.json} (55%) create mode 100644 src/main/resources/assets/ariasessentials/models/block/dark_pool_tile_light.json create mode 100644 src/main/resources/assets/ariasessentials/models/block/dirty_blue_pool_tile_light.json create mode 100644 src/main/resources/assets/ariasessentials/models/block/dirty_cyan_pool_tile_light.json rename src/main/resources/assets/ariasessentials/models/block/{dirty_blue_pool_light.json => dirty_pool_tile_light.json} (52%) delete mode 100644 src/main/resources/assets/ariasessentials/models/block/filthy_blue_pool_light.json rename src/main/resources/assets/ariasessentials/models/block/{dirty_green_pool_light.json => filthy_pool_tile_light.json} (52%) delete mode 100644 src/main/resources/assets/ariasessentials/models/block/filthy_red_pool_light.json delete mode 100644 src/main/resources/assets/ariasessentials/models/block/green_pool_light.json rename src/main/resources/assets/ariasessentials/models/block/{dirty_pool_light.json => green_pool_tile_light.json} (52%) rename src/main/resources/assets/ariasessentials/models/block/{pool_light.json => mini_sun.json} (57%) rename src/main/resources/assets/ariasessentials/models/block/{blue_pool_light.json => pool_tile_light.json} (55%) rename src/main/resources/assets/ariasessentials/models/block/{dark_pool_light.json => red_pool_tile_light.json} (53%) delete mode 100644 src/main/resources/assets/ariasessentials/models/item/blue_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/models/item/blue_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/models/item/dirty_blue_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/models/item/dirty_blue_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/models/item/dirty_green_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/models/item/dirty_green_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/models/item/dirty_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/models/item/dirty_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/models/item/filthy_blue_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/models/item/filthy_blue_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/models/item/filthy_green_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/models/item/filthy_green_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/models/item/filthy_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/models/item/filthy_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/models/item/filthy_red_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/models/item/filthy_red_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/models/item/green_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/models/item/green_pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/models/item/pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/models/item/pool_tile_light.json delete mode 100644 src/main/resources/assets/ariasessentials/models/item/red_pool_light.json create mode 100644 src/main/resources/assets/ariasessentials/models/item/red_pool_tile_light.json rename src/main/resources/data/ariasessentials/loot_tables/blocks/{tflipflop.json => mini_sun.json} (74%) delete mode 100644 src/main/resources/data/ariasessentials/loot_tables/blocks/steel_railing.json diff --git a/src/main/resources/assets/ariasessentials/blockstates/blue_pool_light.json b/src/main/resources/assets/ariasessentials/blockstates/blue_pool_light.json deleted file mode 100644 index fb8e20c..0000000 --- a/src/main/resources/assets/ariasessentials/blockstates/blue_pool_light.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "ariasessentials:block/blue_pool_light" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/blue_pool_tile_light.json b/src/main/resources/assets/ariasessentials/blockstates/blue_pool_tile_light.json new file mode 100644 index 0000000..22f1f40 --- /dev/null +++ b/src/main/resources/assets/ariasessentials/blockstates/blue_pool_tile_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ariasessentials:block/blue_pool_tile_light" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/dark_pool_light.json b/src/main/resources/assets/ariasessentials/blockstates/dark_pool_light.json deleted file mode 100644 index 1c52dc6..0000000 --- a/src/main/resources/assets/ariasessentials/blockstates/dark_pool_light.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "ariasessentials:block/dark_pool_light" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/dark_pool_tile_light.json b/src/main/resources/assets/ariasessentials/blockstates/dark_pool_tile_light.json new file mode 100644 index 0000000..364998b --- /dev/null +++ b/src/main/resources/assets/ariasessentials/blockstates/dark_pool_tile_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ariasessentials:block/dark_pool_tile_light" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/dirty_green_pool_light.json b/src/main/resources/assets/ariasessentials/blockstates/dirty_green_pool_light.json deleted file mode 100644 index e3a46d7..0000000 --- a/src/main/resources/assets/ariasessentials/blockstates/dirty_green_pool_light.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "ariasessentials:block/dirty_green_pool_light" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/dirty_green_pool_tile_light.json b/src/main/resources/assets/ariasessentials/blockstates/dirty_green_pool_tile_light.json new file mode 100644 index 0000000..81f3b33 --- /dev/null +++ b/src/main/resources/assets/ariasessentials/blockstates/dirty_green_pool_tile_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ariasessentials:block/dirty_green_pool_tile_light" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/dirty_pool_light.json b/src/main/resources/assets/ariasessentials/blockstates/dirty_pool_light.json deleted file mode 100644 index 39fb67b..0000000 --- a/src/main/resources/assets/ariasessentials/blockstates/dirty_pool_light.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "ariasessentials:block/dirty_pool_light" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/dirty_pool_tile_light.json b/src/main/resources/assets/ariasessentials/blockstates/dirty_pool_tile_light.json new file mode 100644 index 0000000..71277d0 --- /dev/null +++ b/src/main/resources/assets/ariasessentials/blockstates/dirty_pool_tile_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ariasessentials:block/dirty_pool_tile_light" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/dirty_red_pool_light.json b/src/main/resources/assets/ariasessentials/blockstates/dirty_red_pool_light.json deleted file mode 100644 index a3621c2..0000000 --- a/src/main/resources/assets/ariasessentials/blockstates/dirty_red_pool_light.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "ariasessentials:block/dirty_red_pool_light" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/dirty_red_pool_tile_light.json b/src/main/resources/assets/ariasessentials/blockstates/dirty_red_pool_tile_light.json new file mode 100644 index 0000000..1baee3d --- /dev/null +++ b/src/main/resources/assets/ariasessentials/blockstates/dirty_red_pool_tile_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ariasessentials:block/dirty_red_pool_tile_light" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/filthy_blue_pool_light.json b/src/main/resources/assets/ariasessentials/blockstates/filthy_blue_pool_light.json deleted file mode 100644 index eb45c06..0000000 --- a/src/main/resources/assets/ariasessentials/blockstates/filthy_blue_pool_light.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "ariasessentials:block/filthy_blue_pool_light" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/filthy_blue_pool_tile_light.json b/src/main/resources/assets/ariasessentials/blockstates/filthy_blue_pool_tile_light.json new file mode 100644 index 0000000..cc9a18a --- /dev/null +++ b/src/main/resources/assets/ariasessentials/blockstates/filthy_blue_pool_tile_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ariasessentials:block/filthy_blue_pool_tile_light" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/filthy_green_pool_light.json b/src/main/resources/assets/ariasessentials/blockstates/filthy_green_pool_light.json deleted file mode 100644 index 56ea249..0000000 --- a/src/main/resources/assets/ariasessentials/blockstates/filthy_green_pool_light.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "ariasessentials:block/filthy_green_pool_light" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/filthy_green_pool_tile_light.json b/src/main/resources/assets/ariasessentials/blockstates/filthy_green_pool_tile_light.json new file mode 100644 index 0000000..b2939d8 --- /dev/null +++ b/src/main/resources/assets/ariasessentials/blockstates/filthy_green_pool_tile_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ariasessentials:block/filthy_green_pool_tile_light" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/filthy_pool_light.json b/src/main/resources/assets/ariasessentials/blockstates/filthy_pool_light.json deleted file mode 100644 index eaf2bff..0000000 --- a/src/main/resources/assets/ariasessentials/blockstates/filthy_pool_light.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "ariasessentials:block/filthy_pool_light" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/filthy_pool_tile_light.json b/src/main/resources/assets/ariasessentials/blockstates/filthy_pool_tile_light.json new file mode 100644 index 0000000..6c92831 --- /dev/null +++ b/src/main/resources/assets/ariasessentials/blockstates/filthy_pool_tile_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ariasessentials:block/filthy_pool_tile_light" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/filthy_red_pool_light.json b/src/main/resources/assets/ariasessentials/blockstates/filthy_red_pool_light.json deleted file mode 100644 index 6c66181..0000000 --- a/src/main/resources/assets/ariasessentials/blockstates/filthy_red_pool_light.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "ariasessentials:block/filthy_red_pool_light" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/filthy_red_pool_tile_light.json b/src/main/resources/assets/ariasessentials/blockstates/filthy_red_pool_tile_light.json new file mode 100644 index 0000000..4891645 --- /dev/null +++ b/src/main/resources/assets/ariasessentials/blockstates/filthy_red_pool_tile_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ariasessentials:block/filthy_red_pool_tile_light" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/green_pool_light.json b/src/main/resources/assets/ariasessentials/blockstates/green_pool_light.json deleted file mode 100644 index 5b4d3b0..0000000 --- a/src/main/resources/assets/ariasessentials/blockstates/green_pool_light.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "ariasessentials:block/green_pool_light" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/green_pool_tile_light.json b/src/main/resources/assets/ariasessentials/blockstates/green_pool_tile_light.json new file mode 100644 index 0000000..82c368e --- /dev/null +++ b/src/main/resources/assets/ariasessentials/blockstates/green_pool_tile_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ariasessentials:block/green_pool_tile_light" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/pool_light.json b/src/main/resources/assets/ariasessentials/blockstates/pool_light.json deleted file mode 100644 index 2e4139f..0000000 --- a/src/main/resources/assets/ariasessentials/blockstates/pool_light.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "ariasessentials:block/pool_light" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/pool_tile_light.json b/src/main/resources/assets/ariasessentials/blockstates/pool_tile_light.json new file mode 100644 index 0000000..418cd84 --- /dev/null +++ b/src/main/resources/assets/ariasessentials/blockstates/pool_tile_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ariasessentials:block/pool_tile_light" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/red_pool_light.json b/src/main/resources/assets/ariasessentials/blockstates/red_pool_light.json deleted file mode 100644 index a29ae57..0000000 --- a/src/main/resources/assets/ariasessentials/blockstates/red_pool_light.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "ariasessentials:block/red_pool_light" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/blockstates/red_pool_tile_light.json b/src/main/resources/assets/ariasessentials/blockstates/red_pool_tile_light.json new file mode 100644 index 0000000..9be99bb --- /dev/null +++ b/src/main/resources/assets/ariasessentials/blockstates/red_pool_tile_light.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ariasessentials:block/red_pool_tile_light" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/block/filthy_pool_light.json b/src/main/resources/assets/ariasessentials/models/block/blue_pool_tile_light.json similarity index 52% rename from src/main/resources/assets/ariasessentials/models/block/filthy_pool_light.json rename to src/main/resources/assets/ariasessentials/models/block/blue_pool_tile_light.json index 6f9d8e7..f2b53d3 100644 --- a/src/main/resources/assets/ariasessentials/models/block/filthy_pool_light.json +++ b/src/main/resources/assets/ariasessentials/models/block/blue_pool_tile_light.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "ariasessentials:block/filthy_pool_light" + "all": "ariasessentials:block/blue_pool_tile_light" } } \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/block/red_pool_light.json b/src/main/resources/assets/ariasessentials/models/block/cyan_pool_tile.json similarity index 55% rename from src/main/resources/assets/ariasessentials/models/block/red_pool_light.json rename to src/main/resources/assets/ariasessentials/models/block/cyan_pool_tile.json index 850f0c1..611e861 100644 --- a/src/main/resources/assets/ariasessentials/models/block/red_pool_light.json +++ b/src/main/resources/assets/ariasessentials/models/block/cyan_pool_tile.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "ariasessentials:block/red_pool_light" + "all": "ariasessentials:block/cyan_pool_tile" } } \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/block/dark_pool_tile_light.json b/src/main/resources/assets/ariasessentials/models/block/dark_pool_tile_light.json new file mode 100644 index 0000000..9f73b98 --- /dev/null +++ b/src/main/resources/assets/ariasessentials/models/block/dark_pool_tile_light.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "ariasessentials:block/dark_pool_tile_light" + } +} diff --git a/src/main/resources/assets/ariasessentials/models/block/dirty_blue_pool_tile_light.json b/src/main/resources/assets/ariasessentials/models/block/dirty_blue_pool_tile_light.json new file mode 100644 index 0000000..dd1fa7a --- /dev/null +++ b/src/main/resources/assets/ariasessentials/models/block/dirty_blue_pool_tile_light.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "ariasessentials:block/dirty_blue_pool_tile_light" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/block/dirty_cyan_pool_tile_light.json b/src/main/resources/assets/ariasessentials/models/block/dirty_cyan_pool_tile_light.json new file mode 100644 index 0000000..1027381 --- /dev/null +++ b/src/main/resources/assets/ariasessentials/models/block/dirty_cyan_pool_tile_light.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "ariasessentials:block/dirty_cyan_pool_tile_light" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/block/dirty_blue_pool_light.json b/src/main/resources/assets/ariasessentials/models/block/dirty_pool_tile_light.json similarity index 52% rename from src/main/resources/assets/ariasessentials/models/block/dirty_blue_pool_light.json rename to src/main/resources/assets/ariasessentials/models/block/dirty_pool_tile_light.json index 6b2dacd..f9d2c9d 100644 --- a/src/main/resources/assets/ariasessentials/models/block/dirty_blue_pool_light.json +++ b/src/main/resources/assets/ariasessentials/models/block/dirty_pool_tile_light.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "ariasessentials:block/dirty_blue_pool_light" + "all": "ariasessentials:block/dirty_pool_tile_light" } } \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/block/filthy_blue_pool_light.json b/src/main/resources/assets/ariasessentials/models/block/filthy_blue_pool_light.json deleted file mode 100644 index ee08e8d..0000000 --- a/src/main/resources/assets/ariasessentials/models/block/filthy_blue_pool_light.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "ariasessentials:block/filthy_blue_pool_light" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/block/dirty_green_pool_light.json b/src/main/resources/assets/ariasessentials/models/block/filthy_pool_tile_light.json similarity index 52% rename from src/main/resources/assets/ariasessentials/models/block/dirty_green_pool_light.json rename to src/main/resources/assets/ariasessentials/models/block/filthy_pool_tile_light.json index 5db84f0..827d2a9 100644 --- a/src/main/resources/assets/ariasessentials/models/block/dirty_green_pool_light.json +++ b/src/main/resources/assets/ariasessentials/models/block/filthy_pool_tile_light.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "ariasessentials:block/dirty_green_pool_light" + "all": "ariasessentials:block/filthy_pool_tile_light" } } \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/block/filthy_red_pool_light.json b/src/main/resources/assets/ariasessentials/models/block/filthy_red_pool_light.json deleted file mode 100644 index 7604167..0000000 --- a/src/main/resources/assets/ariasessentials/models/block/filthy_red_pool_light.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "ariasessentials:block/filthy_red_pool_light" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/block/green_pool_light.json b/src/main/resources/assets/ariasessentials/models/block/green_pool_light.json deleted file mode 100644 index 7d9622b..0000000 --- a/src/main/resources/assets/ariasessentials/models/block/green_pool_light.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "ariasessentials:block/green_pool_light" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/block/dirty_pool_light.json b/src/main/resources/assets/ariasessentials/models/block/green_pool_tile_light.json similarity index 52% rename from src/main/resources/assets/ariasessentials/models/block/dirty_pool_light.json rename to src/main/resources/assets/ariasessentials/models/block/green_pool_tile_light.json index de379b2..7c7f2d3 100644 --- a/src/main/resources/assets/ariasessentials/models/block/dirty_pool_light.json +++ b/src/main/resources/assets/ariasessentials/models/block/green_pool_tile_light.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "ariasessentials:block/dirty_pool_light" + "all": "ariasessentials:block/green_pool_tile_light" } } \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/block/pool_light.json b/src/main/resources/assets/ariasessentials/models/block/mini_sun.json similarity index 57% rename from src/main/resources/assets/ariasessentials/models/block/pool_light.json rename to src/main/resources/assets/ariasessentials/models/block/mini_sun.json index c972778..236bba5 100644 --- a/src/main/resources/assets/ariasessentials/models/block/pool_light.json +++ b/src/main/resources/assets/ariasessentials/models/block/mini_sun.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "ariasessentials:block/pool_light" + "all": "ariasessentials:block/mini_sun" } } \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/block/blue_pool_light.json b/src/main/resources/assets/ariasessentials/models/block/pool_tile_light.json similarity index 55% rename from src/main/resources/assets/ariasessentials/models/block/blue_pool_light.json rename to src/main/resources/assets/ariasessentials/models/block/pool_tile_light.json index 14a2016..5ba9188 100644 --- a/src/main/resources/assets/ariasessentials/models/block/blue_pool_light.json +++ b/src/main/resources/assets/ariasessentials/models/block/pool_tile_light.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "ariasessentials:block/blue_pool_light" + "all": "ariasessentials:block/pool_tile_light" } } \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/block/dark_pool_light.json b/src/main/resources/assets/ariasessentials/models/block/red_pool_tile_light.json similarity index 53% rename from src/main/resources/assets/ariasessentials/models/block/dark_pool_light.json rename to src/main/resources/assets/ariasessentials/models/block/red_pool_tile_light.json index 06a6e23..37d449c 100644 --- a/src/main/resources/assets/ariasessentials/models/block/dark_pool_light.json +++ b/src/main/resources/assets/ariasessentials/models/block/red_pool_tile_light.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "ariasessentials:block/dark_pool_light" + "all": "ariasessentials:block/red_pool_tile_light" } } \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/blue_pool_light.json b/src/main/resources/assets/ariasessentials/models/item/blue_pool_light.json deleted file mode 100644 index ca9338d..0000000 --- a/src/main/resources/assets/ariasessentials/models/item/blue_pool_light.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ariasessentials:block/blue_pool_light" -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/blue_pool_tile_light.json b/src/main/resources/assets/ariasessentials/models/item/blue_pool_tile_light.json new file mode 100644 index 0000000..670e37d --- /dev/null +++ b/src/main/resources/assets/ariasessentials/models/item/blue_pool_tile_light.json @@ -0,0 +1,3 @@ +{ + "parent": "ariasessentials:block/blue_pool_tile_light" +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/dirty_blue_pool_light.json b/src/main/resources/assets/ariasessentials/models/item/dirty_blue_pool_light.json deleted file mode 100644 index 22a34ea..0000000 --- a/src/main/resources/assets/ariasessentials/models/item/dirty_blue_pool_light.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ariasessentials:block/dirty_blue_pool_light" -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/dirty_blue_pool_tile_light.json b/src/main/resources/assets/ariasessentials/models/item/dirty_blue_pool_tile_light.json new file mode 100644 index 0000000..eed1bae --- /dev/null +++ b/src/main/resources/assets/ariasessentials/models/item/dirty_blue_pool_tile_light.json @@ -0,0 +1,3 @@ +{ + "parent": "ariasessentials:block/dirty_blue_pool_tile_light" +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/dirty_green_pool_light.json b/src/main/resources/assets/ariasessentials/models/item/dirty_green_pool_light.json deleted file mode 100644 index 2a63895..0000000 --- a/src/main/resources/assets/ariasessentials/models/item/dirty_green_pool_light.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ariasessentials:block/dirty_green_pool_light" -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/dirty_green_pool_tile_light.json b/src/main/resources/assets/ariasessentials/models/item/dirty_green_pool_tile_light.json new file mode 100644 index 0000000..e79fae2 --- /dev/null +++ b/src/main/resources/assets/ariasessentials/models/item/dirty_green_pool_tile_light.json @@ -0,0 +1,3 @@ +{ + "parent": "ariasessentials:block/dirty_green_pool_tile_light" +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/dirty_pool_light.json b/src/main/resources/assets/ariasessentials/models/item/dirty_pool_light.json deleted file mode 100644 index cc400eb..0000000 --- a/src/main/resources/assets/ariasessentials/models/item/dirty_pool_light.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ariasessentials:block/dirty_pool_light" -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/dirty_pool_tile_light.json b/src/main/resources/assets/ariasessentials/models/item/dirty_pool_tile_light.json new file mode 100644 index 0000000..da3889c --- /dev/null +++ b/src/main/resources/assets/ariasessentials/models/item/dirty_pool_tile_light.json @@ -0,0 +1,3 @@ +{ + "parent": "ariasessentials:block/dirty_pool_tile_light" +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/filthy_blue_pool_light.json b/src/main/resources/assets/ariasessentials/models/item/filthy_blue_pool_light.json deleted file mode 100644 index 47fbc8a..0000000 --- a/src/main/resources/assets/ariasessentials/models/item/filthy_blue_pool_light.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ariasessentials:block/filthy_blue_pool_light" -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/filthy_blue_pool_tile_light.json b/src/main/resources/assets/ariasessentials/models/item/filthy_blue_pool_tile_light.json new file mode 100644 index 0000000..e74d5d3 --- /dev/null +++ b/src/main/resources/assets/ariasessentials/models/item/filthy_blue_pool_tile_light.json @@ -0,0 +1,3 @@ +{ + "parent": "ariasessentials:block/filthy_blue_pool_tile_light" +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/filthy_green_pool_light.json b/src/main/resources/assets/ariasessentials/models/item/filthy_green_pool_light.json deleted file mode 100644 index 42b3128..0000000 --- a/src/main/resources/assets/ariasessentials/models/item/filthy_green_pool_light.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ariasessentials:block/filthy_green_pool_light" -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/filthy_green_pool_tile_light.json b/src/main/resources/assets/ariasessentials/models/item/filthy_green_pool_tile_light.json new file mode 100644 index 0000000..10ed33d --- /dev/null +++ b/src/main/resources/assets/ariasessentials/models/item/filthy_green_pool_tile_light.json @@ -0,0 +1,3 @@ +{ + "parent": "ariasessentials:block/filthy_green_pool_tile_light" +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/filthy_pool_light.json b/src/main/resources/assets/ariasessentials/models/item/filthy_pool_light.json deleted file mode 100644 index 2da8a2a..0000000 --- a/src/main/resources/assets/ariasessentials/models/item/filthy_pool_light.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ariasessentials:block/filthy_pool_light" -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/filthy_pool_tile_light.json b/src/main/resources/assets/ariasessentials/models/item/filthy_pool_tile_light.json new file mode 100644 index 0000000..e10fba6 --- /dev/null +++ b/src/main/resources/assets/ariasessentials/models/item/filthy_pool_tile_light.json @@ -0,0 +1,3 @@ +{ + "parent": "ariasessentials:block/filthy_pool_tile_light" +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/filthy_red_pool_light.json b/src/main/resources/assets/ariasessentials/models/item/filthy_red_pool_light.json deleted file mode 100644 index 9bc4206..0000000 --- a/src/main/resources/assets/ariasessentials/models/item/filthy_red_pool_light.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ariasessentials:block/filthy_red_pool_light" -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/filthy_red_pool_tile_light.json b/src/main/resources/assets/ariasessentials/models/item/filthy_red_pool_tile_light.json new file mode 100644 index 0000000..3a1a28a --- /dev/null +++ b/src/main/resources/assets/ariasessentials/models/item/filthy_red_pool_tile_light.json @@ -0,0 +1,3 @@ +{ + "parent": "ariasessentials:block/filthy_red_pool_tile_light" +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/green_pool_light.json b/src/main/resources/assets/ariasessentials/models/item/green_pool_light.json deleted file mode 100644 index 484a2c4..0000000 --- a/src/main/resources/assets/ariasessentials/models/item/green_pool_light.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ariasessentials:block/green_pool_light" -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/green_pool_tile_light.json b/src/main/resources/assets/ariasessentials/models/item/green_pool_tile_light.json new file mode 100644 index 0000000..17f2698 --- /dev/null +++ b/src/main/resources/assets/ariasessentials/models/item/green_pool_tile_light.json @@ -0,0 +1,3 @@ +{ + "parent": "ariasessentials:block/green_pool_tile_light" +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/pool_light.json b/src/main/resources/assets/ariasessentials/models/item/pool_light.json deleted file mode 100644 index b3c0cd5..0000000 --- a/src/main/resources/assets/ariasessentials/models/item/pool_light.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ariasessentials:block/pool_light" -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/pool_tile_light.json b/src/main/resources/assets/ariasessentials/models/item/pool_tile_light.json new file mode 100644 index 0000000..3bd9f3f --- /dev/null +++ b/src/main/resources/assets/ariasessentials/models/item/pool_tile_light.json @@ -0,0 +1,3 @@ +{ + "parent": "ariasessentials:block/pool_tile_light" +} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/red_pool_light.json b/src/main/resources/assets/ariasessentials/models/item/red_pool_light.json deleted file mode 100644 index 617a8b2..0000000 --- a/src/main/resources/assets/ariasessentials/models/item/red_pool_light.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ariasessentials:block/red_pool_light" -} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/item/red_pool_tile_light.json b/src/main/resources/assets/ariasessentials/models/item/red_pool_tile_light.json new file mode 100644 index 0000000..b334fe0 --- /dev/null +++ b/src/main/resources/assets/ariasessentials/models/item/red_pool_tile_light.json @@ -0,0 +1,3 @@ +{ + "parent": "ariasessentials:block/red_pool_tile_light" +} \ No newline at end of file diff --git a/src/main/resources/data/ariasessentials/loot_tables/blocks/tflipflop.json b/src/main/resources/data/ariasessentials/loot_tables/blocks/mini_sun.json similarity index 74% rename from src/main/resources/data/ariasessentials/loot_tables/blocks/tflipflop.json rename to src/main/resources/data/ariasessentials/loot_tables/blocks/mini_sun.json index 0db794a..396ed69 100644 --- a/src/main/resources/data/ariasessentials/loot_tables/blocks/tflipflop.json +++ b/src/main/resources/data/ariasessentials/loot_tables/blocks/mini_sun.json @@ -11,11 +11,11 @@ "entries": [ { "type": "minecraft:item", - "name": "ariasessentials:tflipflop" + "name": "ariasessentials:mini_sun" } ], "rolls": 1.0 } ], - "random_sequence": "ariasessentials:blocks/tflipflop" + "random_sequence": "ariasessentials:blocks/mini_sun" } \ No newline at end of file diff --git a/src/main/resources/data/ariasessentials/loot_tables/blocks/steel_railing.json b/src/main/resources/data/ariasessentials/loot_tables/blocks/steel_railing.json deleted file mode 100644 index 3f1f834..0000000 --- a/src/main/resources/data/ariasessentials/loot_tables/blocks/steel_railing.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "ariasessentials:steel_railing" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "ariasessentials:blocks/steel_railing" -} \ No newline at end of file