From 505e9fa1bf455ddb4851ea103c96d70a06487e96 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 17 Jan 2020 19:22:22 -0600 Subject: [PATCH] Apothecaries data generated --- .../assets/botania/blockstates/apothecary_default.json | 7 +++++++ .../assets/botania/blockstates/apothecary_desert.json | 7 +++++++ .../assets/botania/blockstates/apothecary_forest.json | 7 +++++++ .../assets/botania/blockstates/apothecary_fungal.json | 7 +++++++ .../assets/botania/blockstates/apothecary_mesa.json | 7 +++++++ .../assets/botania/blockstates/apothecary_mossy.json | 7 +++++++ .../assets/botania/blockstates/apothecary_mountain.json | 7 +++++++ .../assets/botania/blockstates/apothecary_plains.json | 7 +++++++ .../assets/botania/blockstates/apothecary_swamp.json | 7 +++++++ .../assets/botania/blockstates/apothecary_taiga.json | 7 +++++++ src/main/java/vazkii/botania/data/BlockstateProvider.java | 2 +- .../assets/botania/blockstates/apothecary_default.json | 5 ----- .../assets/botania/blockstates/apothecary_desert.json | 5 ----- .../assets/botania/blockstates/apothecary_forest.json | 5 ----- .../assets/botania/blockstates/apothecary_fungal.json | 5 ----- .../assets/botania/blockstates/apothecary_mesa.json | 5 ----- .../assets/botania/blockstates/apothecary_mossy.json | 5 ----- .../assets/botania/blockstates/apothecary_mountain.json | 5 ----- .../assets/botania/blockstates/apothecary_plains.json | 5 ----- .../assets/botania/blockstates/apothecary_swamp.json | 5 ----- .../assets/botania/blockstates/apothecary_taiga.json | 5 ----- 21 files changed, 71 insertions(+), 51 deletions(-) create mode 100644 src/generated/resources/assets/botania/blockstates/apothecary_default.json create mode 100644 src/generated/resources/assets/botania/blockstates/apothecary_desert.json create mode 100644 src/generated/resources/assets/botania/blockstates/apothecary_forest.json create mode 100644 src/generated/resources/assets/botania/blockstates/apothecary_fungal.json create mode 100644 src/generated/resources/assets/botania/blockstates/apothecary_mesa.json create mode 100644 src/generated/resources/assets/botania/blockstates/apothecary_mossy.json create mode 100644 src/generated/resources/assets/botania/blockstates/apothecary_mountain.json create mode 100644 src/generated/resources/assets/botania/blockstates/apothecary_plains.json create mode 100644 src/generated/resources/assets/botania/blockstates/apothecary_swamp.json create mode 100644 src/generated/resources/assets/botania/blockstates/apothecary_taiga.json delete mode 100644 src/main/resources/assets/botania/blockstates/apothecary_default.json delete mode 100644 src/main/resources/assets/botania/blockstates/apothecary_desert.json delete mode 100644 src/main/resources/assets/botania/blockstates/apothecary_forest.json delete mode 100644 src/main/resources/assets/botania/blockstates/apothecary_fungal.json delete mode 100644 src/main/resources/assets/botania/blockstates/apothecary_mesa.json delete mode 100644 src/main/resources/assets/botania/blockstates/apothecary_mossy.json delete mode 100644 src/main/resources/assets/botania/blockstates/apothecary_mountain.json delete mode 100644 src/main/resources/assets/botania/blockstates/apothecary_plains.json delete mode 100644 src/main/resources/assets/botania/blockstates/apothecary_swamp.json delete mode 100644 src/main/resources/assets/botania/blockstates/apothecary_taiga.json diff --git a/src/generated/resources/assets/botania/blockstates/apothecary_default.json b/src/generated/resources/assets/botania/blockstates/apothecary_default.json new file mode 100644 index 000000000..fa955f1f9 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/apothecary_default.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/apothecary_default" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/apothecary_desert.json b/src/generated/resources/assets/botania/blockstates/apothecary_desert.json new file mode 100644 index 000000000..691f96685 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/apothecary_desert.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/apothecary_desert" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/apothecary_forest.json b/src/generated/resources/assets/botania/blockstates/apothecary_forest.json new file mode 100644 index 000000000..d9067f514 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/apothecary_forest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/apothecary_forest" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/apothecary_fungal.json b/src/generated/resources/assets/botania/blockstates/apothecary_fungal.json new file mode 100644 index 000000000..ad7f41d9d --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/apothecary_fungal.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/apothecary_fungal" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/apothecary_mesa.json b/src/generated/resources/assets/botania/blockstates/apothecary_mesa.json new file mode 100644 index 000000000..48a3f779c --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/apothecary_mesa.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/apothecary_mesa" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/apothecary_mossy.json b/src/generated/resources/assets/botania/blockstates/apothecary_mossy.json new file mode 100644 index 000000000..e43336fca --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/apothecary_mossy.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/apothecary_mossy" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/apothecary_mountain.json b/src/generated/resources/assets/botania/blockstates/apothecary_mountain.json new file mode 100644 index 000000000..017657bdc --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/apothecary_mountain.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/apothecary_mountain" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/apothecary_plains.json b/src/generated/resources/assets/botania/blockstates/apothecary_plains.json new file mode 100644 index 000000000..6f0e390d3 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/apothecary_plains.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/apothecary_plains" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/apothecary_swamp.json b/src/generated/resources/assets/botania/blockstates/apothecary_swamp.json new file mode 100644 index 000000000..194c6e0de --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/apothecary_swamp.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/apothecary_swamp" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/botania/blockstates/apothecary_taiga.json b/src/generated/resources/assets/botania/blockstates/apothecary_taiga.json new file mode 100644 index 000000000..1d171c9f5 --- /dev/null +++ b/src/generated/resources/assets/botania/blockstates/apothecary_taiga.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "botania:block/apothecary_taiga" + } + } +} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index b71aa40c7..6085dfaf5 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -50,7 +50,7 @@ public class BlockstateProvider extends BlockStateProvider { protected void registerStatesAndModels() { Registry.BLOCK.stream().filter(b -> LibMisc.MOD_ID.equals(b.getRegistryName().getNamespace())) .forEach(b -> { - if (b instanceof FlowerBlock || b instanceof BlockAltar || b == ModBlocks.tinyPotato + if (b instanceof FlowerBlock || b == ModBlocks.tinyPotato || b instanceof BlockRedString || b instanceof BlockFloatingFlower || b instanceof BlockModMushroom || b instanceof BlockModDoubleFlower || b == ModBlocks.craftCrate || b == ModBlocks.ghostRail diff --git a/src/main/resources/assets/botania/blockstates/apothecary_default.json b/src/main/resources/assets/botania/blockstates/apothecary_default.json deleted file mode 100644 index 4ac6beb60..000000000 --- a/src/main/resources/assets/botania/blockstates/apothecary_default.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "botania:block/apothecary_default" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_desert.json b/src/main/resources/assets/botania/blockstates/apothecary_desert.json deleted file mode 100644 index a1184bd8c..000000000 --- a/src/main/resources/assets/botania/blockstates/apothecary_desert.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "botania:block/apothecary_desert" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_forest.json b/src/main/resources/assets/botania/blockstates/apothecary_forest.json deleted file mode 100644 index d0fc33ff1..000000000 --- a/src/main/resources/assets/botania/blockstates/apothecary_forest.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "botania:block/apothecary_forest" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_fungal.json b/src/main/resources/assets/botania/blockstates/apothecary_fungal.json deleted file mode 100644 index 447bba155..000000000 --- a/src/main/resources/assets/botania/blockstates/apothecary_fungal.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "botania:block/apothecary_fungal" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_mesa.json b/src/main/resources/assets/botania/blockstates/apothecary_mesa.json deleted file mode 100644 index 11170150d..000000000 --- a/src/main/resources/assets/botania/blockstates/apothecary_mesa.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "botania:block/apothecary_mesa" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_mossy.json b/src/main/resources/assets/botania/blockstates/apothecary_mossy.json deleted file mode 100644 index a12f660fd..000000000 --- a/src/main/resources/assets/botania/blockstates/apothecary_mossy.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "botania:block/apothecary_mossy" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_mountain.json b/src/main/resources/assets/botania/blockstates/apothecary_mountain.json deleted file mode 100644 index f9270c268..000000000 --- a/src/main/resources/assets/botania/blockstates/apothecary_mountain.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "botania:block/apothecary_mountain" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_plains.json b/src/main/resources/assets/botania/blockstates/apothecary_plains.json deleted file mode 100644 index fc924b2a0..000000000 --- a/src/main/resources/assets/botania/blockstates/apothecary_plains.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "botania:block/apothecary_plains" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_swamp.json b/src/main/resources/assets/botania/blockstates/apothecary_swamp.json deleted file mode 100644 index 968c2164b..000000000 --- a/src/main/resources/assets/botania/blockstates/apothecary_swamp.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "botania:block/apothecary_swamp" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/apothecary_taiga.json b/src/main/resources/assets/botania/blockstates/apothecary_taiga.json deleted file mode 100644 index 3e9b59f40..000000000 --- a/src/main/resources/assets/botania/blockstates/apothecary_taiga.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "botania:block/apothecary_taiga" } - } -} \ No newline at end of file