From 6c0f99ca93e37989fa507164c188fabacf2751b9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 29 Jun 2020 22:30:03 -0500 Subject: [PATCH] Generate mystical mushroom models --- .../assets/botania/models/block/black_mushroom.json | 4 ++-- .../assets/botania/models/block/blue_mushroom.json | 4 ++-- .../assets/botania/models/block/brown_mushroom.json | 4 ++-- .../assets/botania/models/block/cyan_mushroom.json | 4 ++-- .../assets/botania/models/block/gray_mushroom.json | 4 ++-- .../assets/botania/models/block/green_mushroom.json | 4 ++-- .../botania/models/block/light_blue_mushroom.json | 4 ++-- .../botania/models/block/light_gray_mushroom.json | 4 ++-- .../assets/botania/models/block/lime_mushroom.json | 4 ++-- .../botania/models/block/magenta_mushroom.json | 4 ++-- .../botania/models/block/orange_mushroom.json | 4 ++-- .../assets/botania/models/block/pink_mushroom.json | 4 ++-- .../botania/models/block/purple_mushroom.json | 4 ++-- .../assets/botania/models/block/red_mushroom.json | 4 ++-- .../assets/botania/models/block/white_mushroom.json | 4 ++-- .../botania/models/block/yellow_mushroom.json | 4 ++-- .../assets/botania/models/item/black_mushroom.json | 6 ++++++ .../assets/botania/models/item/blue_mushroom.json | 6 ++++++ .../assets/botania/models/item/brown_mushroom.json | 6 ++++++ .../assets/botania/models/item/cyan_mushroom.json | 6 ++++++ .../assets/botania/models/item/gray_mushroom.json | 6 ++++++ .../assets/botania/models/item/green_mushroom.json | 6 ++++++ .../botania/models/item/light_blue_mushroom.json | 6 ++++++ .../botania/models/item/light_gray_mushroom.json | 6 ++++++ .../assets/botania/models/item/lime_mushroom.json | 6 ++++++ .../botania/models/item/magenta_mushroom.json | 6 ++++++ .../assets/botania/models/item/orange_mushroom.json | 6 ++++++ .../assets/botania/models/item/pink_mushroom.json | 6 ++++++ .../assets/botania/models/item/purple_mushroom.json | 6 ++++++ .../assets/botania/models/item/red_mushroom.json | 6 ++++++ .../assets/botania/models/item/white_mushroom.json | 6 ++++++ .../assets/botania/models/item/yellow_mushroom.json | 6 ++++++ .../common/block/decor/BlockModMushroom.java | 3 --- .../vazkii/botania/data/BlockstateProvider.java | 3 ++- .../java/vazkii/botania/data/ItemModelProvider.java | 3 ++- .../assets/botania/models/item/black_mushroom.json | 6 ------ .../assets/botania/models/item/blue_mushroom.json | 6 ------ .../assets/botania/models/item/brown_mushroom.json | 6 ------ .../assets/botania/models/item/cyan_mushroom.json | 6 ------ .../assets/botania/models/item/gray_mushroom.json | 6 ------ .../assets/botania/models/item/green_mushroom.json | 6 ------ .../botania/models/item/light_blue_mushroom.json | 6 ------ .../botania/models/item/light_gray_mushroom.json | 6 ------ .../assets/botania/models/item/lime_mushroom.json | 6 ------ .../botania/models/item/magenta_mushroom.json | 6 ------ .../assets/botania/models/item/orange_mushroom.json | 6 ------ .../assets/botania/models/item/pink_mushroom.json | 6 ------ .../assets/botania/models/item/purple_mushroom.json | 6 ------ .../assets/botania/models/item/red_mushroom.json | 6 ------ .../assets/botania/models/item/white_mushroom.json | 6 ------ .../assets/botania/models/item/yellow_mushroom.json | 6 ------ .../block/{mushroom15.png => black_mushroom.png} | Bin .../block/{mushroom11.png => blue_mushroom.png} | Bin .../block/{mushroom12.png => brown_mushroom.png} | Bin .../block/{mushroom9.png => cyan_mushroom.png} | Bin .../block/{mushroom7.png => gray_mushroom.png} | Bin .../block/{mushroom13.png => green_mushroom.png} | Bin .../{mushroom3.png => light_blue_mushroom.png} | Bin .../{mushroom8.png => light_gray_mushroom.png} | Bin .../block/{mushroom5.png => lime_mushroom.png} | Bin .../block/{mushroom2.png => magenta_mushroom.png} | Bin .../block/{mushroom1.png => orange_mushroom.png} | Bin .../block/{mushroom6.png => pink_mushroom.png} | Bin .../block/{mushroom10.png => purple_mushroom.png} | Bin .../block/{mushroom14.png => red_mushroom.png} | Bin .../block/{mushroom0.png => white_mushroom.png} | Bin .../block/{mushroom4.png => yellow_mushroom.png} | Bin 67 files changed, 132 insertions(+), 133 deletions(-) rename src/{main => generated}/resources/assets/botania/models/block/black_mushroom.json (58%) rename src/{main => generated}/resources/assets/botania/models/block/blue_mushroom.json (59%) rename src/{main => generated}/resources/assets/botania/models/block/brown_mushroom.json (58%) rename src/{main => generated}/resources/assets/botania/models/block/cyan_mushroom.json (59%) rename src/{main => generated}/resources/assets/botania/models/block/gray_mushroom.json (59%) rename src/{main => generated}/resources/assets/botania/models/block/green_mushroom.json (58%) rename src/{main => generated}/resources/assets/botania/models/block/light_blue_mushroom.json (56%) rename src/{main => generated}/resources/assets/botania/models/block/light_gray_mushroom.json (56%) rename src/{main => generated}/resources/assets/botania/models/block/lime_mushroom.json (59%) rename src/{main => generated}/resources/assets/botania/models/block/magenta_mushroom.json (57%) rename src/{main => generated}/resources/assets/botania/models/block/orange_mushroom.json (58%) rename src/{main => generated}/resources/assets/botania/models/block/pink_mushroom.json (59%) rename src/{main => generated}/resources/assets/botania/models/block/purple_mushroom.json (58%) rename src/{main => generated}/resources/assets/botania/models/block/red_mushroom.json (59%) rename src/{main => generated}/resources/assets/botania/models/block/white_mushroom.json (58%) rename src/{main => generated}/resources/assets/botania/models/block/yellow_mushroom.json (58%) create mode 100644 src/generated/resources/assets/botania/models/item/black_mushroom.json create mode 100644 src/generated/resources/assets/botania/models/item/blue_mushroom.json create mode 100644 src/generated/resources/assets/botania/models/item/brown_mushroom.json create mode 100644 src/generated/resources/assets/botania/models/item/cyan_mushroom.json create mode 100644 src/generated/resources/assets/botania/models/item/gray_mushroom.json create mode 100644 src/generated/resources/assets/botania/models/item/green_mushroom.json create mode 100644 src/generated/resources/assets/botania/models/item/light_blue_mushroom.json create mode 100644 src/generated/resources/assets/botania/models/item/light_gray_mushroom.json create mode 100644 src/generated/resources/assets/botania/models/item/lime_mushroom.json create mode 100644 src/generated/resources/assets/botania/models/item/magenta_mushroom.json create mode 100644 src/generated/resources/assets/botania/models/item/orange_mushroom.json create mode 100644 src/generated/resources/assets/botania/models/item/pink_mushroom.json create mode 100644 src/generated/resources/assets/botania/models/item/purple_mushroom.json create mode 100644 src/generated/resources/assets/botania/models/item/red_mushroom.json create mode 100644 src/generated/resources/assets/botania/models/item/white_mushroom.json create mode 100644 src/generated/resources/assets/botania/models/item/yellow_mushroom.json delete mode 100644 src/main/resources/assets/botania/models/item/black_mushroom.json delete mode 100644 src/main/resources/assets/botania/models/item/blue_mushroom.json delete mode 100644 src/main/resources/assets/botania/models/item/brown_mushroom.json delete mode 100644 src/main/resources/assets/botania/models/item/cyan_mushroom.json delete mode 100644 src/main/resources/assets/botania/models/item/gray_mushroom.json delete mode 100644 src/main/resources/assets/botania/models/item/green_mushroom.json delete mode 100644 src/main/resources/assets/botania/models/item/light_blue_mushroom.json delete mode 100644 src/main/resources/assets/botania/models/item/light_gray_mushroom.json delete mode 100644 src/main/resources/assets/botania/models/item/lime_mushroom.json delete mode 100644 src/main/resources/assets/botania/models/item/magenta_mushroom.json delete mode 100644 src/main/resources/assets/botania/models/item/orange_mushroom.json delete mode 100644 src/main/resources/assets/botania/models/item/pink_mushroom.json delete mode 100644 src/main/resources/assets/botania/models/item/purple_mushroom.json delete mode 100644 src/main/resources/assets/botania/models/item/red_mushroom.json delete mode 100644 src/main/resources/assets/botania/models/item/white_mushroom.json delete mode 100644 src/main/resources/assets/botania/models/item/yellow_mushroom.json rename src/main/resources/assets/botania/textures/block/{mushroom15.png => black_mushroom.png} (100%) rename src/main/resources/assets/botania/textures/block/{mushroom11.png => blue_mushroom.png} (100%) rename src/main/resources/assets/botania/textures/block/{mushroom12.png => brown_mushroom.png} (100%) rename src/main/resources/assets/botania/textures/block/{mushroom9.png => cyan_mushroom.png} (100%) rename src/main/resources/assets/botania/textures/block/{mushroom7.png => gray_mushroom.png} (100%) rename src/main/resources/assets/botania/textures/block/{mushroom13.png => green_mushroom.png} (100%) rename src/main/resources/assets/botania/textures/block/{mushroom3.png => light_blue_mushroom.png} (100%) rename src/main/resources/assets/botania/textures/block/{mushroom8.png => light_gray_mushroom.png} (100%) rename src/main/resources/assets/botania/textures/block/{mushroom5.png => lime_mushroom.png} (100%) rename src/main/resources/assets/botania/textures/block/{mushroom2.png => magenta_mushroom.png} (100%) rename src/main/resources/assets/botania/textures/block/{mushroom1.png => orange_mushroom.png} (100%) rename src/main/resources/assets/botania/textures/block/{mushroom6.png => pink_mushroom.png} (100%) rename src/main/resources/assets/botania/textures/block/{mushroom10.png => purple_mushroom.png} (100%) rename src/main/resources/assets/botania/textures/block/{mushroom14.png => red_mushroom.png} (100%) rename src/main/resources/assets/botania/textures/block/{mushroom0.png => white_mushroom.png} (100%) rename src/main/resources/assets/botania/textures/block/{mushroom4.png => yellow_mushroom.png} (100%) diff --git a/src/main/resources/assets/botania/models/block/black_mushroom.json b/src/generated/resources/assets/botania/models/block/black_mushroom.json similarity index 58% rename from src/main/resources/assets/botania/models/block/black_mushroom.json rename to src/generated/resources/assets/botania/models/block/black_mushroom.json index bade3dcbc..3e93ee755 100644 --- a/src/main/resources/assets/botania/models/block/black_mushroom.json +++ b/src/generated/resources/assets/botania/models/block/black_mushroom.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/mushroom15" + "cross": "botania:block/black_mushroom" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/blue_mushroom.json b/src/generated/resources/assets/botania/models/block/blue_mushroom.json similarity index 59% rename from src/main/resources/assets/botania/models/block/blue_mushroom.json rename to src/generated/resources/assets/botania/models/block/blue_mushroom.json index bb029582f..14b3009e8 100644 --- a/src/main/resources/assets/botania/models/block/blue_mushroom.json +++ b/src/generated/resources/assets/botania/models/block/blue_mushroom.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/mushroom11" + "cross": "botania:block/blue_mushroom" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/brown_mushroom.json b/src/generated/resources/assets/botania/models/block/brown_mushroom.json similarity index 58% rename from src/main/resources/assets/botania/models/block/brown_mushroom.json rename to src/generated/resources/assets/botania/models/block/brown_mushroom.json index 89c569093..79ac5aa3e 100644 --- a/src/main/resources/assets/botania/models/block/brown_mushroom.json +++ b/src/generated/resources/assets/botania/models/block/brown_mushroom.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/mushroom12" + "cross": "botania:block/brown_mushroom" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cyan_mushroom.json b/src/generated/resources/assets/botania/models/block/cyan_mushroom.json similarity index 59% rename from src/main/resources/assets/botania/models/block/cyan_mushroom.json rename to src/generated/resources/assets/botania/models/block/cyan_mushroom.json index b0899177c..8ad2fd3f9 100644 --- a/src/main/resources/assets/botania/models/block/cyan_mushroom.json +++ b/src/generated/resources/assets/botania/models/block/cyan_mushroom.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/mushroom9" + "cross": "botania:block/cyan_mushroom" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/gray_mushroom.json b/src/generated/resources/assets/botania/models/block/gray_mushroom.json similarity index 59% rename from src/main/resources/assets/botania/models/block/gray_mushroom.json rename to src/generated/resources/assets/botania/models/block/gray_mushroom.json index d923c3a1a..576692296 100644 --- a/src/main/resources/assets/botania/models/block/gray_mushroom.json +++ b/src/generated/resources/assets/botania/models/block/gray_mushroom.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/mushroom7" + "cross": "botania:block/gray_mushroom" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/green_mushroom.json b/src/generated/resources/assets/botania/models/block/green_mushroom.json similarity index 58% rename from src/main/resources/assets/botania/models/block/green_mushroom.json rename to src/generated/resources/assets/botania/models/block/green_mushroom.json index e501e4f63..ae771fe34 100644 --- a/src/main/resources/assets/botania/models/block/green_mushroom.json +++ b/src/generated/resources/assets/botania/models/block/green_mushroom.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/mushroom13" + "cross": "botania:block/green_mushroom" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/light_blue_mushroom.json b/src/generated/resources/assets/botania/models/block/light_blue_mushroom.json similarity index 56% rename from src/main/resources/assets/botania/models/block/light_blue_mushroom.json rename to src/generated/resources/assets/botania/models/block/light_blue_mushroom.json index 5a2e6ad3f..b2057220c 100644 --- a/src/main/resources/assets/botania/models/block/light_blue_mushroom.json +++ b/src/generated/resources/assets/botania/models/block/light_blue_mushroom.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/mushroom3" + "cross": "botania:block/light_blue_mushroom" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/light_gray_mushroom.json b/src/generated/resources/assets/botania/models/block/light_gray_mushroom.json similarity index 56% rename from src/main/resources/assets/botania/models/block/light_gray_mushroom.json rename to src/generated/resources/assets/botania/models/block/light_gray_mushroom.json index aab09d38f..406f07b0a 100644 --- a/src/main/resources/assets/botania/models/block/light_gray_mushroom.json +++ b/src/generated/resources/assets/botania/models/block/light_gray_mushroom.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/mushroom8" + "cross": "botania:block/light_gray_mushroom" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/lime_mushroom.json b/src/generated/resources/assets/botania/models/block/lime_mushroom.json similarity index 59% rename from src/main/resources/assets/botania/models/block/lime_mushroom.json rename to src/generated/resources/assets/botania/models/block/lime_mushroom.json index 4ac460bc2..e5477619c 100644 --- a/src/main/resources/assets/botania/models/block/lime_mushroom.json +++ b/src/generated/resources/assets/botania/models/block/lime_mushroom.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/mushroom5" + "cross": "botania:block/lime_mushroom" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/magenta_mushroom.json b/src/generated/resources/assets/botania/models/block/magenta_mushroom.json similarity index 57% rename from src/main/resources/assets/botania/models/block/magenta_mushroom.json rename to src/generated/resources/assets/botania/models/block/magenta_mushroom.json index ef9d40d2f..ce4334cfb 100644 --- a/src/main/resources/assets/botania/models/block/magenta_mushroom.json +++ b/src/generated/resources/assets/botania/models/block/magenta_mushroom.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/mushroom2" + "cross": "botania:block/magenta_mushroom" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/orange_mushroom.json b/src/generated/resources/assets/botania/models/block/orange_mushroom.json similarity index 58% rename from src/main/resources/assets/botania/models/block/orange_mushroom.json rename to src/generated/resources/assets/botania/models/block/orange_mushroom.json index c1ff5a16f..838ecfc77 100644 --- a/src/main/resources/assets/botania/models/block/orange_mushroom.json +++ b/src/generated/resources/assets/botania/models/block/orange_mushroom.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/mushroom1" + "cross": "botania:block/orange_mushroom" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pink_mushroom.json b/src/generated/resources/assets/botania/models/block/pink_mushroom.json similarity index 59% rename from src/main/resources/assets/botania/models/block/pink_mushroom.json rename to src/generated/resources/assets/botania/models/block/pink_mushroom.json index 4751b8e7a..cd2d6c800 100644 --- a/src/main/resources/assets/botania/models/block/pink_mushroom.json +++ b/src/generated/resources/assets/botania/models/block/pink_mushroom.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/mushroom6" + "cross": "botania:block/pink_mushroom" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/purple_mushroom.json b/src/generated/resources/assets/botania/models/block/purple_mushroom.json similarity index 58% rename from src/main/resources/assets/botania/models/block/purple_mushroom.json rename to src/generated/resources/assets/botania/models/block/purple_mushroom.json index c96d02f16..36de601bd 100644 --- a/src/main/resources/assets/botania/models/block/purple_mushroom.json +++ b/src/generated/resources/assets/botania/models/block/purple_mushroom.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/mushroom10" + "cross": "botania:block/purple_mushroom" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_mushroom.json b/src/generated/resources/assets/botania/models/block/red_mushroom.json similarity index 59% rename from src/main/resources/assets/botania/models/block/red_mushroom.json rename to src/generated/resources/assets/botania/models/block/red_mushroom.json index 1d6ae47e1..8d80c9039 100644 --- a/src/main/resources/assets/botania/models/block/red_mushroom.json +++ b/src/generated/resources/assets/botania/models/block/red_mushroom.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/mushroom14" + "cross": "botania:block/red_mushroom" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/white_mushroom.json b/src/generated/resources/assets/botania/models/block/white_mushroom.json similarity index 58% rename from src/main/resources/assets/botania/models/block/white_mushroom.json rename to src/generated/resources/assets/botania/models/block/white_mushroom.json index 67d94191d..da1e6a549 100644 --- a/src/main/resources/assets/botania/models/block/white_mushroom.json +++ b/src/generated/resources/assets/botania/models/block/white_mushroom.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/mushroom0" + "cross": "botania:block/white_mushroom" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/yellow_mushroom.json b/src/generated/resources/assets/botania/models/block/yellow_mushroom.json similarity index 58% rename from src/main/resources/assets/botania/models/block/yellow_mushroom.json rename to src/generated/resources/assets/botania/models/block/yellow_mushroom.json index da9a499c2..37059cf74 100644 --- a/src/main/resources/assets/botania/models/block/yellow_mushroom.json +++ b/src/generated/resources/assets/botania/models/block/yellow_mushroom.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cross", "textures": { - "cross": "botania:block/mushroom4" + "cross": "botania:block/yellow_mushroom" } -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/black_mushroom.json b/src/generated/resources/assets/botania/models/item/black_mushroom.json new file mode 100644 index 000000000..41f2e9354 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/black_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/black_mushroom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/blue_mushroom.json b/src/generated/resources/assets/botania/models/item/blue_mushroom.json new file mode 100644 index 000000000..38ebc7fa2 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/blue_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/blue_mushroom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/brown_mushroom.json b/src/generated/resources/assets/botania/models/item/brown_mushroom.json new file mode 100644 index 000000000..68c9d6d40 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/brown_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/brown_mushroom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/cyan_mushroom.json b/src/generated/resources/assets/botania/models/item/cyan_mushroom.json new file mode 100644 index 000000000..125c0514a --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/cyan_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/cyan_mushroom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/gray_mushroom.json b/src/generated/resources/assets/botania/models/item/gray_mushroom.json new file mode 100644 index 000000000..62f7c77c9 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/gray_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/gray_mushroom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/green_mushroom.json b/src/generated/resources/assets/botania/models/item/green_mushroom.json new file mode 100644 index 000000000..9b7432793 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/green_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/green_mushroom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/light_blue_mushroom.json b/src/generated/resources/assets/botania/models/item/light_blue_mushroom.json new file mode 100644 index 000000000..d88503a00 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/light_blue_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/light_blue_mushroom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/light_gray_mushroom.json b/src/generated/resources/assets/botania/models/item/light_gray_mushroom.json new file mode 100644 index 000000000..5ba0cd45e --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/light_gray_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/light_gray_mushroom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/lime_mushroom.json b/src/generated/resources/assets/botania/models/item/lime_mushroom.json new file mode 100644 index 000000000..6820eae0d --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/lime_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/lime_mushroom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/magenta_mushroom.json b/src/generated/resources/assets/botania/models/item/magenta_mushroom.json new file mode 100644 index 000000000..cc5c7230a --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/magenta_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/magenta_mushroom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/orange_mushroom.json b/src/generated/resources/assets/botania/models/item/orange_mushroom.json new file mode 100644 index 000000000..62b7d1898 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/orange_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/orange_mushroom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/pink_mushroom.json b/src/generated/resources/assets/botania/models/item/pink_mushroom.json new file mode 100644 index 000000000..0f24ce669 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/pink_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/pink_mushroom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/purple_mushroom.json b/src/generated/resources/assets/botania/models/item/purple_mushroom.json new file mode 100644 index 000000000..296e5d103 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/purple_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/purple_mushroom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/red_mushroom.json b/src/generated/resources/assets/botania/models/item/red_mushroom.json new file mode 100644 index 000000000..06f6834d6 --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/red_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/red_mushroom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/white_mushroom.json b/src/generated/resources/assets/botania/models/item/white_mushroom.json new file mode 100644 index 000000000..8c3b5a87a --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/white_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/white_mushroom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/models/item/yellow_mushroom.json b/src/generated/resources/assets/botania/models/item/yellow_mushroom.json new file mode 100644 index 000000000..73a28b62d --- /dev/null +++ b/src/generated/resources/assets/botania/models/item/yellow_mushroom.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:block/yellow_mushroom" + } +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index 173485ad6..a53ec7290 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -50,9 +50,6 @@ public class BlockModMushroom extends MushroomBlock implements IHornHarvestable, return SHAPE; } - @Override - public void tick(@Nonnull BlockState state, @Nonnull ServerWorld world, @Nonnull BlockPos pos, Random rand) {} // Prevent spreading - // [VanillaCopy] super, without light level requirement @Override public boolean isValidPosition(BlockState state, IWorldReader worldIn, BlockPos pos) { diff --git a/src/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index bea483a29..ef655358e 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -28,6 +28,7 @@ import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder; import vazkii.botania.common.block.BlockAltGrass; import vazkii.botania.common.block.BlockSpecialFlower; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.decor.BlockModMushroom; import vazkii.botania.common.block.decor.BlockPetalBlock; import vazkii.botania.common.block.string.BlockRedString; import vazkii.botania.common.lib.LibBlockNames; @@ -61,7 +62,7 @@ public class BlockstateProvider extends BlockStateProvider { } String name = Registry.BLOCK.getKey(b).getPath(); - if (b instanceof BlockSpecialFlower) { + if (b instanceof BlockSpecialFlower || b instanceof BlockModMushroom) { ModelFile model = models().withExistingParent(name, prefix("block/shapes/cross")) .texture("cross", prefix("block/" + name)); simpleBlock(b, model); diff --git a/src/main/java/vazkii/botania/data/ItemModelProvider.java b/src/main/java/vazkii/botania/data/ItemModelProvider.java index 20e98765e..44d2bb324 100644 --- a/src/main/java/vazkii/botania/data/ItemModelProvider.java +++ b/src/main/java/vazkii/botania/data/ItemModelProvider.java @@ -16,6 +16,7 @@ import net.minecraftforge.client.model.generators.ExistingFileHelper; import vazkii.botania.common.block.BlockSpecialFlower; import vazkii.botania.common.block.decor.BlockFloatingFlower; +import vazkii.botania.common.block.decor.BlockModMushroom; import vazkii.botania.common.block.string.BlockRedString; import vazkii.botania.common.lib.LibMisc; @@ -36,7 +37,7 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator if (i instanceof BlockItem) { Block b = ((BlockItem) i).getBlock(); String name = Registry.ITEM.getKey(i).getPath(); - if (b instanceof BlockSpecialFlower) { + if (b instanceof BlockSpecialFlower || b instanceof BlockModMushroom) { withExistingParent(name, "item/generated").texture("layer0", prefix("block/" + name)); } else if (b instanceof BlockFloatingFlower || b instanceof BlockRedString) { withExistingParent(name, prefix("block/" + name)); diff --git a/src/main/resources/assets/botania/models/item/black_mushroom.json b/src/main/resources/assets/botania/models/item/black_mushroom.json deleted file mode 100644 index f967e1454..000000000 --- a/src/main/resources/assets/botania/models/item/black_mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/mushroom15" - } -} diff --git a/src/main/resources/assets/botania/models/item/blue_mushroom.json b/src/main/resources/assets/botania/models/item/blue_mushroom.json deleted file mode 100644 index 463b59f72..000000000 --- a/src/main/resources/assets/botania/models/item/blue_mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/mushroom11" - } -} diff --git a/src/main/resources/assets/botania/models/item/brown_mushroom.json b/src/main/resources/assets/botania/models/item/brown_mushroom.json deleted file mode 100644 index 33a49a6f3..000000000 --- a/src/main/resources/assets/botania/models/item/brown_mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/mushroom12" - } -} diff --git a/src/main/resources/assets/botania/models/item/cyan_mushroom.json b/src/main/resources/assets/botania/models/item/cyan_mushroom.json deleted file mode 100644 index fe4cf8e4e..000000000 --- a/src/main/resources/assets/botania/models/item/cyan_mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/mushroom9" - } -} diff --git a/src/main/resources/assets/botania/models/item/gray_mushroom.json b/src/main/resources/assets/botania/models/item/gray_mushroom.json deleted file mode 100644 index edabf232b..000000000 --- a/src/main/resources/assets/botania/models/item/gray_mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/mushroom7" - } -} diff --git a/src/main/resources/assets/botania/models/item/green_mushroom.json b/src/main/resources/assets/botania/models/item/green_mushroom.json deleted file mode 100644 index baf43fc20..000000000 --- a/src/main/resources/assets/botania/models/item/green_mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/mushroom13" - } -} diff --git a/src/main/resources/assets/botania/models/item/light_blue_mushroom.json b/src/main/resources/assets/botania/models/item/light_blue_mushroom.json deleted file mode 100644 index 5a632f2f5..000000000 --- a/src/main/resources/assets/botania/models/item/light_blue_mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/mushroom3" - } -} diff --git a/src/main/resources/assets/botania/models/item/light_gray_mushroom.json b/src/main/resources/assets/botania/models/item/light_gray_mushroom.json deleted file mode 100644 index 428c8ff36..000000000 --- a/src/main/resources/assets/botania/models/item/light_gray_mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/mushroom8" - } -} diff --git a/src/main/resources/assets/botania/models/item/lime_mushroom.json b/src/main/resources/assets/botania/models/item/lime_mushroom.json deleted file mode 100644 index 197b1b10f..000000000 --- a/src/main/resources/assets/botania/models/item/lime_mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/mushroom5" - } -} diff --git a/src/main/resources/assets/botania/models/item/magenta_mushroom.json b/src/main/resources/assets/botania/models/item/magenta_mushroom.json deleted file mode 100644 index 638c0407f..000000000 --- a/src/main/resources/assets/botania/models/item/magenta_mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/mushroom2" - } -} diff --git a/src/main/resources/assets/botania/models/item/orange_mushroom.json b/src/main/resources/assets/botania/models/item/orange_mushroom.json deleted file mode 100644 index 366693b3a..000000000 --- a/src/main/resources/assets/botania/models/item/orange_mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/mushroom1" - } -} diff --git a/src/main/resources/assets/botania/models/item/pink_mushroom.json b/src/main/resources/assets/botania/models/item/pink_mushroom.json deleted file mode 100644 index 4f943909c..000000000 --- a/src/main/resources/assets/botania/models/item/pink_mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/mushroom6" - } -} diff --git a/src/main/resources/assets/botania/models/item/purple_mushroom.json b/src/main/resources/assets/botania/models/item/purple_mushroom.json deleted file mode 100644 index 41988ac77..000000000 --- a/src/main/resources/assets/botania/models/item/purple_mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/mushroom10" - } -} diff --git a/src/main/resources/assets/botania/models/item/red_mushroom.json b/src/main/resources/assets/botania/models/item/red_mushroom.json deleted file mode 100644 index e895b66bb..000000000 --- a/src/main/resources/assets/botania/models/item/red_mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/mushroom14" - } -} diff --git a/src/main/resources/assets/botania/models/item/white_mushroom.json b/src/main/resources/assets/botania/models/item/white_mushroom.json deleted file mode 100644 index b58863490..000000000 --- a/src/main/resources/assets/botania/models/item/white_mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/mushroom0" - } -} diff --git a/src/main/resources/assets/botania/models/item/yellow_mushroom.json b/src/main/resources/assets/botania/models/item/yellow_mushroom.json deleted file mode 100644 index adf90766b..000000000 --- a/src/main/resources/assets/botania/models/item/yellow_mushroom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:block/mushroom4" - } -} diff --git a/src/main/resources/assets/botania/textures/block/mushroom15.png b/src/main/resources/assets/botania/textures/block/black_mushroom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/mushroom15.png rename to src/main/resources/assets/botania/textures/block/black_mushroom.png diff --git a/src/main/resources/assets/botania/textures/block/mushroom11.png b/src/main/resources/assets/botania/textures/block/blue_mushroom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/mushroom11.png rename to src/main/resources/assets/botania/textures/block/blue_mushroom.png diff --git a/src/main/resources/assets/botania/textures/block/mushroom12.png b/src/main/resources/assets/botania/textures/block/brown_mushroom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/mushroom12.png rename to src/main/resources/assets/botania/textures/block/brown_mushroom.png diff --git a/src/main/resources/assets/botania/textures/block/mushroom9.png b/src/main/resources/assets/botania/textures/block/cyan_mushroom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/mushroom9.png rename to src/main/resources/assets/botania/textures/block/cyan_mushroom.png diff --git a/src/main/resources/assets/botania/textures/block/mushroom7.png b/src/main/resources/assets/botania/textures/block/gray_mushroom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/mushroom7.png rename to src/main/resources/assets/botania/textures/block/gray_mushroom.png diff --git a/src/main/resources/assets/botania/textures/block/mushroom13.png b/src/main/resources/assets/botania/textures/block/green_mushroom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/mushroom13.png rename to src/main/resources/assets/botania/textures/block/green_mushroom.png diff --git a/src/main/resources/assets/botania/textures/block/mushroom3.png b/src/main/resources/assets/botania/textures/block/light_blue_mushroom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/mushroom3.png rename to src/main/resources/assets/botania/textures/block/light_blue_mushroom.png diff --git a/src/main/resources/assets/botania/textures/block/mushroom8.png b/src/main/resources/assets/botania/textures/block/light_gray_mushroom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/mushroom8.png rename to src/main/resources/assets/botania/textures/block/light_gray_mushroom.png diff --git a/src/main/resources/assets/botania/textures/block/mushroom5.png b/src/main/resources/assets/botania/textures/block/lime_mushroom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/mushroom5.png rename to src/main/resources/assets/botania/textures/block/lime_mushroom.png diff --git a/src/main/resources/assets/botania/textures/block/mushroom2.png b/src/main/resources/assets/botania/textures/block/magenta_mushroom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/mushroom2.png rename to src/main/resources/assets/botania/textures/block/magenta_mushroom.png diff --git a/src/main/resources/assets/botania/textures/block/mushroom1.png b/src/main/resources/assets/botania/textures/block/orange_mushroom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/mushroom1.png rename to src/main/resources/assets/botania/textures/block/orange_mushroom.png diff --git a/src/main/resources/assets/botania/textures/block/mushroom6.png b/src/main/resources/assets/botania/textures/block/pink_mushroom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/mushroom6.png rename to src/main/resources/assets/botania/textures/block/pink_mushroom.png diff --git a/src/main/resources/assets/botania/textures/block/mushroom10.png b/src/main/resources/assets/botania/textures/block/purple_mushroom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/mushroom10.png rename to src/main/resources/assets/botania/textures/block/purple_mushroom.png diff --git a/src/main/resources/assets/botania/textures/block/mushroom14.png b/src/main/resources/assets/botania/textures/block/red_mushroom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/mushroom14.png rename to src/main/resources/assets/botania/textures/block/red_mushroom.png diff --git a/src/main/resources/assets/botania/textures/block/mushroom0.png b/src/main/resources/assets/botania/textures/block/white_mushroom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/mushroom0.png rename to src/main/resources/assets/botania/textures/block/white_mushroom.png diff --git a/src/main/resources/assets/botania/textures/block/mushroom4.png b/src/main/resources/assets/botania/textures/block/yellow_mushroom.png similarity index 100% rename from src/main/resources/assets/botania/textures/block/mushroom4.png rename to src/main/resources/assets/botania/textures/block/yellow_mushroom.png