diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index f382459c1..2387dbed1 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -209,8 +209,10 @@ public class SpecialFlowerModel implements IModelCustomData { @Nonnull @Override public List getQuads(IBlockState state, EnumFacing face, long rand) { - if(state.getBlock() != ModBlocks.specialFlower) + if(state.getBlock() != ModBlocks.specialFlower) { + Botania.LOGGER.fatal("FOREIGN BLOCK: " + state); return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel().getQuads(state, face, rand); + } IExtendedBlockState extendedState = ((IExtendedBlockState) state); String subtileId = extendedState.getValue(BotaniaStateProps.SUBTILE_ID); diff --git a/src/main/resources/assets/botania/blockstates/miniIsland.json b/src/main/resources/assets/botania/blockstates/miniIsland.json index 44a91fc1b..d3063c63d 100644 --- a/src/main/resources/assets/botania/blockstates/miniIsland.json +++ b/src/main/resources/assets/botania/blockstates/miniIsland.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "botania:miniIsland" + "model": "botania:miniIsland_new" }, "variants": { "variant": { diff --git a/src/main/resources/assets/botania/models/block/miniIsland.json b/src/main/resources/assets/botania/models/block/miniIsland.json index 6da36e326..3143f8d27 100644 --- a/src/main/resources/assets/botania/models/block/miniIsland.json +++ b/src/main/resources/assets/botania/models/block/miniIsland.json @@ -296,4 +296,4 @@ } } ] -} +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/miniIsland_new.json b/src/main/resources/assets/botania/models/block/miniIsland_new.json new file mode 100644 index 000000000..038eaa71a --- /dev/null +++ b/src/main/resources/assets/botania/models/block/miniIsland_new.json @@ -0,0 +1,182 @@ +{ + "__comment": "Author: wiiv", + "parent": "minecraft:block/block", + "display": { + "gui": { + "rotation": [ 30, 225, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.75, 0.75, 0.75 ] + } + }, + "elements": [ + { + "name": "Layer1", + "from": [ 3.0, 6.0, 3.0 ], + "to": [ 13.0, 7.0, 13.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 6.0, 5.0, 6.5 ] }, + "south": { "texture": "#all", "uv": [ 6.0, 6.0, 11.0, 6.5 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 9.5, 5.0, 10.0 ] }, + "east": { "texture": "#all", "uv": [ 6.0, 9.5, 11.0, 10.0 ] }, + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 5.0, 5.0 ] }, + "down": { "texture": "#all", "uv": [ 6.0, 0.0, 11.0, 5.0 ] } + } + }, + { + "name": "Layer2North", + "from": [ 5.0, 5.0, 3.0 ], + "to": [ 11.0, 6.0, 5.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 1.0, 6.5, 4.0, 7.0 ] }, + "east": { "texture": "#all", "uv": [ 10.0, 10.0, 11.0, 10.5 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 10.0, 1.0, 10.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 4.0, 10.0, 5.0 ] } + } + }, + { + "name": "Layer2South", + "from": [ 5.0, 5.0, 11.0 ], + "to": [ 11.0, 6.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 6.0, 10.0, 7.0, 10.5 ] }, + "south": { "texture": "#all", "uv": [ 7.0, 6.5, 10.0, 7.0 ] }, + "west": { "texture": "#all", "uv": [ 4.0, 10.0, 5.0, 10.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 0.0, 10.0, 1.0 ] } + } + }, + { + "name": "Layer2West", + "from": [ 3.0, 5.0, 5.0 ], + "to": [ 5.0, 6.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 4.0, 6.5, 5.0, 7.0 ] }, + "south": { "texture": "#all", "uv": [ 6.0, 6.5, 7.0, 7.0 ] }, + "west": { "texture": "#all", "uv": [ 1.0, 10.0, 4.0, 10.5 ] }, + "down": { "texture": "#all", "uv": [ 6.0, 1.0, 7.0, 4.0 ] } + } + }, + { + "name": "Layer2East", + "from": [ 11.0, 5.0, 5.0 ], + "to": [ 13.0, 6.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 6.5, 1.0, 7.0 ] }, + "east": { "texture": "#all", "uv": [ 7.0, 10.0, 10.0, 10.5 ] }, + "south": { "texture": "#all", "uv": [ 10.0, 6.5, 11.0, 7.0 ] }, + "down": { "texture": "#all", "uv": [ 10.0, 1.0, 11.0, 4.0 ] } + } + }, + { + "name": "Layer3Center", + "from": [ 5.0, 4.0, 5.0 ], + "to": [ 11.0, 5.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 1.0, 7.0, 4.0, 7.5 ] }, + "south": { "texture": "#all", "uv": [ 7.0, 7.0, 10.0, 7.5 ] }, + "west": { "texture": "#all", "uv": [ 1.0, 10.5, 4.0, 11.0 ] }, + "east": { "texture": "#all", "uv": [ 7.0, 10.5, 10.0, 11.0 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 1.0, 10.0, 4.0 ] } + } + }, + { + "name": "Layer3North", + "from": [ 7.0, 4.0, 3.0 ], + "to": [ 9.0, 5.0, 5.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 2.0, 7.0, 3.0, 7.5 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 10.5, 1.0, 11.0 ] }, + "east": { "texture": "#all", "uv": [ 10.0, 10.5, 11.0, 11.0 ] }, + "down": { "texture": "#all", "uv": [ 8.0, 4.0, 9.0, 5.0 ] } + } + }, + { + "name": "Layer3South", + "from": [ 7.0, 4.0, 11.0 ], + "to": [ 9.0, 5.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 6.0, 10.5, 7.0, 11.0 ] }, + "south": { "texture": "#all", "uv": [ 8.0, 7.0, 9.0, 7.5 ] }, + "west": { "texture": "#all", "uv": [ 4.0, 10.5, 5.0, 11.0 ] }, + "down": { "texture": "#all", "uv": [ 8.0, 0.0, 9.0, 1.0 ] } + } + }, + { + "name": "Layer3West", + "from": [ 3.0, 4.0, 7.0 ], + "to": [ 5.0, 5.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 4.0, 7.0, 5.0, 7.5 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 7.0, 2.0, 7.5 ] }, + "west": { "texture": "#all", "uv": [ 2.0, 10.5, 3.0, 11.0 ] }, + "down": { "texture": "#all", "uv": [ 6.0, 2.0, 7.0, 3.0 ] } + } + }, + { + "name": "Layer3East", + "from": [ 11.0, 4.0, 7.0 ], + "to": [ 13.0, 5.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 7.0, 1.0, 7.5 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 10.5, 9.0, 11.0 ] }, + "south": { "texture": "#all", "uv": [ 6.0, 7.0, 7.0, 7.5 ] }, + "down": { "texture": "#all", "uv": [ 10.0, 2.0, 11.0, 3.0 ] } + } + }, + { + "name": "Layer4North", + "from": [ 7.0, 3.0, 5.0 ], + "to": [ 9.0, 4.0, 7.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 2.0, 7.5, 3.0, 8.0 ] }, + "east": { "texture": "#all", "uv": [ 9.0, 11.0, 10.0, 11.5 ] }, + "west": { "texture": "#all", "uv": [ 1.0, 11.0, 2.0, 11.5 ] }, + "down": { "texture": "#all", "uv": [ 8.0, 3.0, 9.0, 4.0 ] } + } + }, + { + "name": "Layer4South", + "from": [ 7.0, 3.0, 9.0 ], + "to": [ 9.0, 4.0, 11.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 7.0, 11.0, 8.0, 11.5 ] }, + "south": { "texture": "#all", "uv": [ 8.0, 7.5, 9.0, 8.0 ] }, + "west": { "texture": "#all", "uv": [ 3.0, 11.0, 4.0, 11.5 ] }, + "down": { "texture": "#all", "uv": [ 8.0, 1.0, 9.0, 2.0 ] } + } + }, + { + "name": "Layer4West", + "from": [ 5.0, 3.0, 7.0 ], + "to": [ 7.0, 4.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 3.0, 7.5, 4.0, 8.0 ] }, + "south": { "texture": "#all", "uv": [ 7.0, 7.5, 8.0, 8.0 ] }, + "west": { "texture": "#all", "uv": [ 2.0, 11.0, 3.0, 11.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 2.0, 8.0, 3.0 ] } + } + }, + { + "name": "Layer4East", + "from": [ 9.0, 3.0, 7.0 ], + "to": [ 11.0, 4.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 1.0, 7.5, 2.0, 8.0 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 11.0, 9.0, 11.5 ] }, + "south": { "texture": "#all", "uv": [ 9.0, 7.5, 10.0, 8.0 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 2.0, 10.0, 3.0 ] } + } + }, + { + "name": "Layer5", + "from": [ 7.0, 2.0, 7.0 ], + "to": [ 9.0, 3.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 2.0, 8.0, 3.0, 8.5 ] }, + "south": { "texture": "#all", "uv": [ 8.0, 8.0, 9.0, 8.5 ] }, + "west": { "texture": "#all", "uv": [ 2.0, 11.5, 3.0, 12.0 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 11.5, 9.0, 12.0 ] }, + "down": { "texture": "#all", "uv": [ 8.0, 2.0, 9.0, 3.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/miniIsland.png b/src/main/resources/assets/botania/textures/model/miniIsland.png index 945d6b6fe..ecd452714 100644 Binary files a/src/main/resources/assets/botania/textures/model/miniIsland.png and b/src/main/resources/assets/botania/textures/model/miniIsland.png differ diff --git a/src/main/resources/assets/botania/textures/model/miniIslandDry.png b/src/main/resources/assets/botania/textures/model/miniIslandDry.png index 846c8c285..87228df74 100644 Binary files a/src/main/resources/assets/botania/textures/model/miniIslandDry.png and b/src/main/resources/assets/botania/textures/model/miniIslandDry.png differ diff --git a/src/main/resources/assets/botania/textures/model/miniIslandGolden.png b/src/main/resources/assets/botania/textures/model/miniIslandGolden.png index f6b7d2315..24481d4d0 100644 Binary files a/src/main/resources/assets/botania/textures/model/miniIslandGolden.png and b/src/main/resources/assets/botania/textures/model/miniIslandGolden.png differ diff --git a/src/main/resources/assets/botania/textures/model/miniIslandInfused.png b/src/main/resources/assets/botania/textures/model/miniIslandInfused.png index e3fc55f57..0ffdedf88 100644 Binary files a/src/main/resources/assets/botania/textures/model/miniIslandInfused.png and b/src/main/resources/assets/botania/textures/model/miniIslandInfused.png differ diff --git a/src/main/resources/assets/botania/textures/model/miniIslandMutated.png b/src/main/resources/assets/botania/textures/model/miniIslandMutated.png index f34e10082..465bad397 100644 Binary files a/src/main/resources/assets/botania/textures/model/miniIslandMutated.png and b/src/main/resources/assets/botania/textures/model/miniIslandMutated.png differ diff --git a/src/main/resources/assets/botania/textures/model/miniIslandMycelium.png b/src/main/resources/assets/botania/textures/model/miniIslandMycelium.png index 8bd2b8b67..9f0656bef 100644 Binary files a/src/main/resources/assets/botania/textures/model/miniIslandMycelium.png and b/src/main/resources/assets/botania/textures/model/miniIslandMycelium.png differ diff --git a/src/main/resources/assets/botania/textures/model/miniIslandPodzol.png b/src/main/resources/assets/botania/textures/model/miniIslandPodzol.png index cb90de64d..a0d5bc8f0 100644 Binary files a/src/main/resources/assets/botania/textures/model/miniIslandPodzol.png and b/src/main/resources/assets/botania/textures/model/miniIslandPodzol.png differ diff --git a/src/main/resources/assets/botania/textures/model/miniIslandScorched.png b/src/main/resources/assets/botania/textures/model/miniIslandScorched.png index 217f7e351..0a8752f8e 100644 Binary files a/src/main/resources/assets/botania/textures/model/miniIslandScorched.png and b/src/main/resources/assets/botania/textures/model/miniIslandScorched.png differ diff --git a/src/main/resources/assets/botania/textures/model/miniIslandSnow.png b/src/main/resources/assets/botania/textures/model/miniIslandSnow.png index 9f07eca9d..492b94af6 100644 Binary files a/src/main/resources/assets/botania/textures/model/miniIslandSnow.png and b/src/main/resources/assets/botania/textures/model/miniIslandSnow.png differ diff --git a/src/main/resources/assets/botania/textures/model/miniIslandVivid.png b/src/main/resources/assets/botania/textures/model/miniIslandVivid.png index badf6142b..90bff2c7d 100644 Binary files a/src/main/resources/assets/botania/textures/model/miniIslandVivid.png and b/src/main/resources/assets/botania/textures/model/miniIslandVivid.png differ