From 46566802504714da4aac59eebcac2c6b34d55bb9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 31 Jul 2016 17:05:51 -0500 Subject: [PATCH 1/6] New optimized floating island model --- .../client/model/SpecialFlowerModel.java | 7 +- .../botania/blockstates/miniIsland.json | 2 +- .../botania/models/block/miniIsland.json | 437 +++++++----------- 3 files changed, 166 insertions(+), 280 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 1f9c76a8f..cd3414082 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -192,7 +192,6 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public Optional load(@Nonnull String key) { - if (key == null) Botania.LOGGER.error("Null passed to special model cacheloader?!"); Map, ModelResourceLocation> loadFrom = loadBlocks ? blockModels : itemModels; ModelResourceLocation loc = loadFrom.get(Optional.of(key)); @@ -208,8 +207,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); @@ -219,6 +220,8 @@ public class SpecialFlowerModel implements IModelCustomData { Optional specialModel = bakedBlockModels.getUnchecked(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); if(specialModel.isPresent()) ret = specialModel.get(); + } else { + Botania.LOGGER.fatal("NULL SUBTILE ID"); } return ret.getQuads(state, face, rand); diff --git a/src/main/resources/assets/botania/blockstates/miniIsland.json b/src/main/resources/assets/botania/blockstates/miniIsland.json index 44a91fc1b..078eca7b7 100644 --- a/src/main/resources/assets/botania/blockstates/miniIsland.json +++ b/src/main/resources/assets/botania/blockstates/miniIsland.json @@ -5,7 +5,7 @@ }, "variants": { "variant": { - "grass": { "textures": { "all": "botania:model/miniIsland" } }, + "grass": { "textures": { "all": "blocks/grass_top" } }, "podzol": { "textures": { "all": "botania:model/miniIslandPodzol" } }, "mycel": { "textures": { "all": "botania:model/miniIslandMycelium" } }, "snow": { "textures": { "all": "botania:model/miniIslandSnow" } }, diff --git a/src/main/resources/assets/botania/models/block/miniIsland.json b/src/main/resources/assets/botania/models/block/miniIsland.json index 6da36e326..0b6e40f40 100644 --- a/src/main/resources/assets/botania/models/block/miniIsland.json +++ b/src/main/resources/assets/botania/models/block/miniIsland.json @@ -10,290 +10,173 @@ }, "elements": [ { - "name": "Shape0", - "from": [ 7.0, 2.0, 7.0 ], - "to": [ 9.0, 7.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.5, 0.5, 1.0, 1.75 ] }, - "east": { "texture": "#all", "uv": [ 1.0, 0.5, 1.5, 1.75 ] }, - "south": { "texture": "#all", "uv": [ 1.5, 0.5, 2.0, 1.75 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.5, 0.5, 1.75 ] }, - "up": { "texture": "#all", "uv": [ 0.5, 0.0, 1.0, 0.5 ] }, - "down": { "texture": "#all", "uv": [ 1.0, 0.0, 1.5, 0.5 ] } - } - }, - { - "name": "Shape1-1", - "from": [ 7.0, 3.0, 5.0 ], - "to": [ 9.0, 7.0, 7.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 2.5, 0.5, 3.0, 1.5 ] }, - "east": { "texture": "#all", "uv": [ 3.0, 0.5, 3.5, 1.5 ] }, - "south": { "texture": "#all", "uv": [ 3.5, 0.5, 4.0, 1.5 ] }, - "west": { "texture": "#all", "uv": [ 2.0, 0.5, 2.5, 1.5 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 0.0, 3.0, 0.5 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 0.0, 3.5, 0.5 ] } - } - }, - { - "name": "Shape1-2", - "from": [ 5.0, 3.0, 7.0 ], - "to": [ 7.0, 7.0, 9.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 4.5, 0.5, 5.0, 1.5 ] }, - "west": { "texture": "#all", "uv": [ 5.0, 0.5, 5.5, 1.5 ] }, - "north": { "texture": "#all", "uv": [ 5.5, 0.5, 6.0, 1.5 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 0.0, 5.0, 0.5 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 0.0, 5.5, 0.5 ] } - } - }, - { - "name": "Shape1-3", - "from": [ 7.0, 3.0, 9.0 ], - "to": [ 9.0, 7.0, 11.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 7.0, 0.5, 7.5, 1.5 ] }, - "south": { "texture": "#all", "uv": [ 7.5, 0.5, 8.0, 1.5 ] }, - "west": { "texture": "#all", "uv": [ 6.0, 0.5, 6.5, 1.5 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 0.0, 7.0, 0.5 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 0.0, 7.5, 0.5 ] } - } - }, - { - "name": "Shape1-4", - "from": [ 9.0, 3.0, 7.0 ], - "to": [ 11.0, 7.0, 9.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 8.5, 0.5, 9.0, 1.5 ] }, - "north": { "texture": "#all", "uv": [ 9.5, 0.5, 10.0, 1.5 ] }, - "east": { "texture": "#all", "uv": [ 8.0, 0.5, 8.5, 1.5 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 0.0, 9.0, 0.5 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 0.0, 9.5, 0.5 ] } - } - }, - { - "name": "Shape2-1", - "from": [ 7.0, 4.0, 3.0 ], - "to": [ 9.0, 7.0, 5.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 2.5, 2.0, 3.0, 2.75 ] }, - "east": { "texture": "#all", "uv": [ 3.0, 2.0, 3.5, 2.75 ] }, - "west": { "texture": "#all", "uv": [ 2.0, 2.0, 2.5, 2.75 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 1.5, 3.0, 2.0 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 1.5, 3.5, 2.0 ] } - } - }, - { - "name": "Shape2-2", - "from": [ 3.0, 4.0, 7.0 ], - "to": [ 5.0, 7.0, 9.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 4.5, 2.0, 5.0, 2.75 ] }, - "west": { "texture": "#all", "uv": [ 5.0, 2.0, 5.5, 2.75 ] }, - "north": { "texture": "#all", "uv": [ 5.5, 2.0, 6.0, 2.75 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 1.5, 5.0, 2.0 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 1.5, 5.5, 2.0 ] } - } - }, - { - "name": "Shape2-3", - "from": [ 7.0, 4.0, 11.0 ], - "to": [ 9.0, 7.0, 13.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 7.0, 2.0, 7.5, 2.75 ] }, - "south": { "texture": "#all", "uv": [ 7.5, 2.0, 8.0, 2.75 ] }, - "west": { "texture": "#all", "uv": [ 6.0, 2.0, 6.5, 2.75 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 1.5, 7.0, 2.0 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 1.5, 7.5, 2.0 ] } - } - }, - { - "name": "Shape2-4", - "from": [ 11.0, 4.0, 7.0 ], - "to": [ 13.0, 7.0, 9.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 8.5, 2.0, 9.0, 2.75 ] }, - "north": { "texture": "#all", "uv": [ 9.5, 2.0, 10.0, 2.75 ] }, - "east": { "texture": "#all", "uv": [ 8.0, 2.0, 8.5, 2.75 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 1.5, 9.0, 2.0 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 1.5, 9.5, 2.0 ] } - } - }, - { - "name": "Shape2-5", - "from": [ 5.0, 4.0, 5.0 ], - "to": [ 7.0, 7.0, 7.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 2.5, 3.25, 3.0, 4.0 ] }, - "north": { "texture": "#all", "uv": [ 3.0, 3.25, 3.5, 4.0 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 2.75, 3.0, 3.25 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 2.75, 3.5, 3.25 ] } - } - }, - { - "name": "Shape2-6", - "from": [ 5.0, 4.0, 9.0 ], - "to": [ 7.0, 7.0, 11.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 5.0, 3.25, 5.5, 4.0 ] }, - "west": { "texture": "#all", "uv": [ 5.5, 3.25, 6.0, 4.0 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 2.75, 5.0, 3.25 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 2.75, 5.5, 3.25 ] } - } - }, - { - "name": "Shape2-7", - "from": [ 9.0, 4.0, 9.0 ], - "to": [ 11.0, 7.0, 11.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 6.0, 3.25, 6.5, 4.0 ] }, - "east": { "texture": "#all", "uv": [ 7.5, 3.25, 8.0, 4.0 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 2.75, 7.0, 3.25 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 2.75, 7.5, 3.25 ] } - } - }, - { - "name": "Shape2-8", - "from": [ 9.0, 4.0, 5.0 ], - "to": [ 11.0, 7.0, 7.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 8.0, 3.25, 8.5, 4.0 ] }, - "east": { "texture": "#all", "uv": [ 8.5, 3.25, 9.0, 4.0 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 2.75, 9.0, 3.25 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 2.75, 9.5, 3.25 ] } - } - }, - { - "name": "Shape3-1", - "from": [ 5.0, 5.0, 3.0 ], - "to": [ 7.0, 7.0, 5.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 2.5, 4.5, 3.0, 5.0 ] }, - "north": { "texture": "#all", "uv": [ 3.0, 4.5, 3.5, 5.0 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 4.0, 3.0, 4.5 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 4.0, 3.5, 4.5 ] } - } - }, - { - "name": "Shape3-2", - "from": [ 3.0, 5.0, 9.0 ], - "to": [ 5.0, 7.0, 11.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 5.0, 4.5, 5.5, 5.0 ] }, - "west": { "texture": "#all", "uv": [ 5.5, 4.5, 6.0, 5.0 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 4.0, 5.0, 4.5 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 4.0, 5.5, 4.5 ] } - } - }, - { - "name": "Shape3-3", - "from": [ 9.0, 5.0, 11.0 ], - "to": [ 11.0, 7.0, 13.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 7.5, 4.5, 8.0, 5.0 ] }, - "south": { "texture": "#all", "uv": [ 6.0, 4.5, 6.5, 5.0 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 4.0, 7.0, 4.5 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 4.0, 7.5, 4.5 ] } - } - }, - { - "name": "Shape3-4", - "from": [ 11.0, 5.0, 5.0 ], - "to": [ 13.0, 7.0, 7.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 8.5, 4.5, 9.0, 5.0 ] }, - "north": { "texture": "#all", "uv": [ 8.0, 4.5, 8.5, 5.0 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 4.0, 9.0, 4.5 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 4.0, 9.5, 4.5 ] } - } - }, - { - "name": "Shape3-5", - "from": [ 3.0, 5.0, 5.0 ], - "to": [ 5.0, 7.0, 7.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 2.5, 5.5, 3.0, 6.0 ] }, - "north": { "texture": "#all", "uv": [ 3.0, 5.5, 3.5, 6.0 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 5.0, 3.0, 5.5 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 5.0, 3.5, 5.5 ] } - } - }, - { - "name": "Shape3-6", - "from": [ 5.0, 5.0, 11.0 ], - "to": [ 7.0, 7.0, 13.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 5.0, 5.5, 5.5, 6.0 ] }, - "west": { "texture": "#all", "uv": [ 5.5, 5.5, 6.0, 6.0 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 5.0, 5.0, 5.5 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 5.0, 5.5, 5.5 ] } - } - }, - { - "name": "Shape3-7", - "from": [ 11.0, 5.0, 9.0 ], - "to": [ 13.0, 7.0, 11.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 7.5, 5.5, 8.0, 6.0 ] }, - "south": { "texture": "#all", "uv": [ 6.0, 5.5, 6.5, 6.0 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 5.0, 7.0, 5.5 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 5.0, 7.5, 5.5 ] } - } - }, - { - "name": "Shape3-8", - "from": [ 9.0, 5.0, 3.0 ], - "to": [ 11.0, 7.0, 5.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 8.5, 5.5, 9.0, 6.0 ] }, - "north": { "texture": "#all", "uv": [ 8.0, 5.5, 8.5, 6.0 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 5.0, 9.0, 5.5 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 5.0, 9.5, 5.5 ] } - } - }, - { - "name": "Shape4-1", + "name": "Layer1", "from": [ 3.0, 6.0, 3.0 ], - "to": [ 5.0, 7.0, 5.0 ], - "faces": { - "west": { "texture": "#all", "uv": [ 2.5, 6.5, 3.0, 6.75 ] }, - "north": { "texture": "#all", "uv": [ 3.0, 6.5, 3.5, 6.75 ] }, - "up": { "texture": "#all", "uv": [ 2.5, 6.0, 3.0, 6.5 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 6.0, 3.5, 6.5 ] } - } - }, - { - "name": "Shape4-2", - "from": [ 3.0, 6.0, 11.0 ], - "to": [ 5.0, 7.0, 13.0 ], - "faces": { - "south": { "texture": "#all", "uv": [ 5.0, 6.5, 5.5, 6.75 ] }, - "west": { "texture": "#all", "uv": [ 5.5, 6.5, 6.0, 6.75 ] }, - "up": { "texture": "#all", "uv": [ 4.5, 6.0, 5.0, 6.5 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 6.0, 5.5, 6.5 ] } - } - }, - { - "name": "Shape4-3", - "from": [ 11.0, 6.0, 11.0 ], "to": [ 13.0, 7.0, 13.0 ], "faces": { - "south": { "texture": "#all", "uv": [ 6.0, 6.5, 6.5, 6.75 ] }, - "east": { "texture": "#all", "uv": [ 7.5, 6.5, 8.0, 6.75 ] }, - "up": { "texture": "#all", "uv": [ 6.5, 6.0, 7.0, 6.5 ] }, - "down": { "texture": "#all", "uv": [ 7.0, 6.0, 7.5, 6.5 ] } + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } } }, { - "name": "Shape4-4", - "from": [ 11.0, 6.0, 3.0 ], - "to": [ 13.0, 7.0, 5.0 ], + "name": "Layer2North", + "from": [ 5.0, 5.0, 3.0 ], + "to": [ 11.0, 6.0, 5.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 8.0, 6.5, 8.5, 6.75 ] }, - "east": { "texture": "#all", "uv": [ 8.5, 6.5, 9.0, 6.75 ] }, - "up": { "texture": "#all", "uv": [ 8.5, 6.0, 9.0, 6.5 ] }, - "down": { "texture": "#all", "uv": [ 9.0, 6.0, 9.5, 6.5 ] } + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 2.0 ] } + } + }, + { + "name": "Layer2South", + "from": [ 5.0, 5.0, 11.0 ], + "to": [ 11.0, 6.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 2.0 ] } + } + }, + { + "name": "Layer2West", + "from": [ 3.0, 5.0, 5.0 ], + "to": [ 5.0, 6.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 6.0 ] } + } + }, + { + "name": "Layer2East", + "from": [ 11.0, 5.0, 5.0 ], + "to": [ 13.0, 6.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 6.0 ] } + } + }, + { + "name": "Layer3Center", + "from": [ 5.0, 4.0, 5.0 ], + "to": [ 11.0, 5.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } + } + }, + { + "name": "Layer3North", + "from": [ 7.0, 4.0, 3.0 ], + "to": [ 9.0, 5.0, 5.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer3South", + "from": [ 7.0, 4.0, 11.0 ], + "to": [ 9.0, 5.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer3West", + "from": [ 3.0, 4.0, 7.0 ], + "to": [ 5.0, 5.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer3East", + "from": [ 11.0, 4.0, 7.0 ], + "to": [ 13.0, 5.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer4North", + "from": [ 7.0, 3.0, 5.0 ], + "to": [ 9.0, 4.0, 7.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer4South", + "from": [ 7.0, 3.0, 9.0 ], + "to": [ 9.0, 4.0, 11.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer4West", + "from": [ 5.0, 3.0, 7.0 ], + "to": [ 7.0, 4.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer4East", + "from": [ 9.0, 3.0, 7.0 ], + "to": [ 11.0, 4.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer5", + "from": [ 7.0, 2.0, 7.0 ], + "to": [ 9.0, 3.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } } } ] -} +} \ No newline at end of file From 64712d315fe18309e30c9dd4645b04cb99c572b7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 15 Aug 2016 17:14:40 -0500 Subject: [PATCH 2/6] WIP --- .../botania/models/block/miniIsland.json | 435 +++++++++++------- .../botania/models/block/miniIsland_new.json | 182 ++++++++ .../botania/textures/model/miniIsland_new.png | Bin 0 -> 1389 bytes 3 files changed, 458 insertions(+), 159 deletions(-) create mode 100644 src/main/resources/assets/botania/models/block/miniIsland_new.json create mode 100644 src/main/resources/assets/botania/textures/model/miniIsland_new.png diff --git a/src/main/resources/assets/botania/models/block/miniIsland.json b/src/main/resources/assets/botania/models/block/miniIsland.json index 0b6e40f40..3143f8d27 100644 --- a/src/main/resources/assets/botania/models/block/miniIsland.json +++ b/src/main/resources/assets/botania/models/block/miniIsland.json @@ -10,172 +10,289 @@ }, "elements": [ { - "name": "Layer1", + "name": "Shape0", + "from": [ 7.0, 2.0, 7.0 ], + "to": [ 9.0, 7.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.5, 0.5, 1.0, 1.75 ] }, + "east": { "texture": "#all", "uv": [ 1.0, 0.5, 1.5, 1.75 ] }, + "south": { "texture": "#all", "uv": [ 1.5, 0.5, 2.0, 1.75 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.5, 0.5, 1.75 ] }, + "up": { "texture": "#all", "uv": [ 0.5, 0.0, 1.0, 0.5 ] }, + "down": { "texture": "#all", "uv": [ 1.0, 0.0, 1.5, 0.5 ] } + } + }, + { + "name": "Shape1-1", + "from": [ 7.0, 3.0, 5.0 ], + "to": [ 9.0, 7.0, 7.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 2.5, 0.5, 3.0, 1.5 ] }, + "east": { "texture": "#all", "uv": [ 3.0, 0.5, 3.5, 1.5 ] }, + "south": { "texture": "#all", "uv": [ 3.5, 0.5, 4.0, 1.5 ] }, + "west": { "texture": "#all", "uv": [ 2.0, 0.5, 2.5, 1.5 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 0.0, 3.0, 0.5 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 0.0, 3.5, 0.5 ] } + } + }, + { + "name": "Shape1-2", + "from": [ 5.0, 3.0, 7.0 ], + "to": [ 7.0, 7.0, 9.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 4.5, 0.5, 5.0, 1.5 ] }, + "west": { "texture": "#all", "uv": [ 5.0, 0.5, 5.5, 1.5 ] }, + "north": { "texture": "#all", "uv": [ 5.5, 0.5, 6.0, 1.5 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 0.0, 5.0, 0.5 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 0.0, 5.5, 0.5 ] } + } + }, + { + "name": "Shape1-3", + "from": [ 7.0, 3.0, 9.0 ], + "to": [ 9.0, 7.0, 11.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 7.0, 0.5, 7.5, 1.5 ] }, + "south": { "texture": "#all", "uv": [ 7.5, 0.5, 8.0, 1.5 ] }, + "west": { "texture": "#all", "uv": [ 6.0, 0.5, 6.5, 1.5 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 0.0, 7.0, 0.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 0.0, 7.5, 0.5 ] } + } + }, + { + "name": "Shape1-4", + "from": [ 9.0, 3.0, 7.0 ], + "to": [ 11.0, 7.0, 9.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 8.5, 0.5, 9.0, 1.5 ] }, + "north": { "texture": "#all", "uv": [ 9.5, 0.5, 10.0, 1.5 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 0.5, 8.5, 1.5 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 0.0, 9.0, 0.5 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 0.0, 9.5, 0.5 ] } + } + }, + { + "name": "Shape2-1", + "from": [ 7.0, 4.0, 3.0 ], + "to": [ 9.0, 7.0, 5.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 2.5, 2.0, 3.0, 2.75 ] }, + "east": { "texture": "#all", "uv": [ 3.0, 2.0, 3.5, 2.75 ] }, + "west": { "texture": "#all", "uv": [ 2.0, 2.0, 2.5, 2.75 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 1.5, 3.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 1.5, 3.5, 2.0 ] } + } + }, + { + "name": "Shape2-2", + "from": [ 3.0, 4.0, 7.0 ], + "to": [ 5.0, 7.0, 9.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 4.5, 2.0, 5.0, 2.75 ] }, + "west": { "texture": "#all", "uv": [ 5.0, 2.0, 5.5, 2.75 ] }, + "north": { "texture": "#all", "uv": [ 5.5, 2.0, 6.0, 2.75 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 1.5, 5.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 1.5, 5.5, 2.0 ] } + } + }, + { + "name": "Shape2-3", + "from": [ 7.0, 4.0, 11.0 ], + "to": [ 9.0, 7.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 7.0, 2.0, 7.5, 2.75 ] }, + "south": { "texture": "#all", "uv": [ 7.5, 2.0, 8.0, 2.75 ] }, + "west": { "texture": "#all", "uv": [ 6.0, 2.0, 6.5, 2.75 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 1.5, 7.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 1.5, 7.5, 2.0 ] } + } + }, + { + "name": "Shape2-4", + "from": [ 11.0, 4.0, 7.0 ], + "to": [ 13.0, 7.0, 9.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 8.5, 2.0, 9.0, 2.75 ] }, + "north": { "texture": "#all", "uv": [ 9.5, 2.0, 10.0, 2.75 ] }, + "east": { "texture": "#all", "uv": [ 8.0, 2.0, 8.5, 2.75 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 1.5, 9.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 1.5, 9.5, 2.0 ] } + } + }, + { + "name": "Shape2-5", + "from": [ 5.0, 4.0, 5.0 ], + "to": [ 7.0, 7.0, 7.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 2.5, 3.25, 3.0, 4.0 ] }, + "north": { "texture": "#all", "uv": [ 3.0, 3.25, 3.5, 4.0 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 2.75, 3.0, 3.25 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 2.75, 3.5, 3.25 ] } + } + }, + { + "name": "Shape2-6", + "from": [ 5.0, 4.0, 9.0 ], + "to": [ 7.0, 7.0, 11.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 5.0, 3.25, 5.5, 4.0 ] }, + "west": { "texture": "#all", "uv": [ 5.5, 3.25, 6.0, 4.0 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 2.75, 5.0, 3.25 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 2.75, 5.5, 3.25 ] } + } + }, + { + "name": "Shape2-7", + "from": [ 9.0, 4.0, 9.0 ], + "to": [ 11.0, 7.0, 11.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 6.0, 3.25, 6.5, 4.0 ] }, + "east": { "texture": "#all", "uv": [ 7.5, 3.25, 8.0, 4.0 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 2.75, 7.0, 3.25 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 2.75, 7.5, 3.25 ] } + } + }, + { + "name": "Shape2-8", + "from": [ 9.0, 4.0, 5.0 ], + "to": [ 11.0, 7.0, 7.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 8.0, 3.25, 8.5, 4.0 ] }, + "east": { "texture": "#all", "uv": [ 8.5, 3.25, 9.0, 4.0 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 2.75, 9.0, 3.25 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 2.75, 9.5, 3.25 ] } + } + }, + { + "name": "Shape3-1", + "from": [ 5.0, 5.0, 3.0 ], + "to": [ 7.0, 7.0, 5.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 2.5, 4.5, 3.0, 5.0 ] }, + "north": { "texture": "#all", "uv": [ 3.0, 4.5, 3.5, 5.0 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 4.0, 3.0, 4.5 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 4.0, 3.5, 4.5 ] } + } + }, + { + "name": "Shape3-2", + "from": [ 3.0, 5.0, 9.0 ], + "to": [ 5.0, 7.0, 11.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 5.0, 4.5, 5.5, 5.0 ] }, + "west": { "texture": "#all", "uv": [ 5.5, 4.5, 6.0, 5.0 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 4.0, 5.0, 4.5 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 4.0, 5.5, 4.5 ] } + } + }, + { + "name": "Shape3-3", + "from": [ 9.0, 5.0, 11.0 ], + "to": [ 11.0, 7.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 7.5, 4.5, 8.0, 5.0 ] }, + "south": { "texture": "#all", "uv": [ 6.0, 4.5, 6.5, 5.0 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 4.0, 7.0, 4.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 4.0, 7.5, 4.5 ] } + } + }, + { + "name": "Shape3-4", + "from": [ 11.0, 5.0, 5.0 ], + "to": [ 13.0, 7.0, 7.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 8.5, 4.5, 9.0, 5.0 ] }, + "north": { "texture": "#all", "uv": [ 8.0, 4.5, 8.5, 5.0 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 4.0, 9.0, 4.5 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 4.0, 9.5, 4.5 ] } + } + }, + { + "name": "Shape3-5", + "from": [ 3.0, 5.0, 5.0 ], + "to": [ 5.0, 7.0, 7.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 2.5, 5.5, 3.0, 6.0 ] }, + "north": { "texture": "#all", "uv": [ 3.0, 5.5, 3.5, 6.0 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 5.0, 3.0, 5.5 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 5.0, 3.5, 5.5 ] } + } + }, + { + "name": "Shape3-6", + "from": [ 5.0, 5.0, 11.0 ], + "to": [ 7.0, 7.0, 13.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 5.0, 5.5, 5.5, 6.0 ] }, + "west": { "texture": "#all", "uv": [ 5.5, 5.5, 6.0, 6.0 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 5.0, 5.0, 5.5 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 5.0, 5.5, 5.5 ] } + } + }, + { + "name": "Shape3-7", + "from": [ 11.0, 5.0, 9.0 ], + "to": [ 13.0, 7.0, 11.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 7.5, 5.5, 8.0, 6.0 ] }, + "south": { "texture": "#all", "uv": [ 6.0, 5.5, 6.5, 6.0 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 5.0, 7.0, 5.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 5.0, 7.5, 5.5 ] } + } + }, + { + "name": "Shape3-8", + "from": [ 9.0, 5.0, 3.0 ], + "to": [ 11.0, 7.0, 5.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 8.5, 5.5, 9.0, 6.0 ] }, + "north": { "texture": "#all", "uv": [ 8.0, 5.5, 8.5, 6.0 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 5.0, 9.0, 5.5 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 5.0, 9.5, 5.5 ] } + } + }, + { + "name": "Shape4-1", "from": [ 3.0, 6.0, 3.0 ], + "to": [ 5.0, 7.0, 5.0 ], + "faces": { + "west": { "texture": "#all", "uv": [ 2.5, 6.5, 3.0, 6.75 ] }, + "north": { "texture": "#all", "uv": [ 3.0, 6.5, 3.5, 6.75 ] }, + "up": { "texture": "#all", "uv": [ 2.5, 6.0, 3.0, 6.5 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 6.0, 3.5, 6.5 ] } + } + }, + { + "name": "Shape4-2", + "from": [ 3.0, 6.0, 11.0 ], + "to": [ 5.0, 7.0, 13.0 ], + "faces": { + "south": { "texture": "#all", "uv": [ 5.0, 6.5, 5.5, 6.75 ] }, + "west": { "texture": "#all", "uv": [ 5.5, 6.5, 6.0, 6.75 ] }, + "up": { "texture": "#all", "uv": [ 4.5, 6.0, 5.0, 6.5 ] }, + "down": { "texture": "#all", "uv": [ 5.0, 6.0, 5.5, 6.5 ] } + } + }, + { + "name": "Shape4-3", + "from": [ 11.0, 6.0, 11.0 ], "to": [ 13.0, 7.0, 13.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "up": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } + "south": { "texture": "#all", "uv": [ 6.0, 6.5, 6.5, 6.75 ] }, + "east": { "texture": "#all", "uv": [ 7.5, 6.5, 8.0, 6.75 ] }, + "up": { "texture": "#all", "uv": [ 6.5, 6.0, 7.0, 6.5 ] }, + "down": { "texture": "#all", "uv": [ 7.0, 6.0, 7.5, 6.5 ] } } }, { - "name": "Layer2North", - "from": [ 5.0, 5.0, 3.0 ], - "to": [ 11.0, 6.0, 5.0 ], + "name": "Shape4-4", + "from": [ 11.0, 6.0, 3.0 ], + "to": [ 13.0, 7.0, 5.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 2.0 ] } - } - }, - { - "name": "Layer2South", - "from": [ 5.0, 5.0, 11.0 ], - "to": [ 11.0, 6.0, 13.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 2.0 ] } - } - }, - { - "name": "Layer2West", - "from": [ 3.0, 5.0, 5.0 ], - "to": [ 5.0, 6.0, 11.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 6.0 ] } - } - }, - { - "name": "Layer2East", - "from": [ 11.0, 5.0, 5.0 ], - "to": [ 13.0, 6.0, 11.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 6.0 ] } - } - }, - { - "name": "Layer3Center", - "from": [ 5.0, 4.0, 5.0 ], - "to": [ 11.0, 5.0, 11.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } - } - }, - { - "name": "Layer3North", - "from": [ 7.0, 4.0, 3.0 ], - "to": [ 9.0, 5.0, 5.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } - } - }, - { - "name": "Layer3South", - "from": [ 7.0, 4.0, 11.0 ], - "to": [ 9.0, 5.0, 13.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } - } - }, - { - "name": "Layer3West", - "from": [ 3.0, 4.0, 7.0 ], - "to": [ 5.0, 5.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } - } - }, - { - "name": "Layer3East", - "from": [ 11.0, 4.0, 7.0 ], - "to": [ 13.0, 5.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } - } - }, - { - "name": "Layer4North", - "from": [ 7.0, 3.0, 5.0 ], - "to": [ 9.0, 4.0, 7.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } - } - }, - { - "name": "Layer4South", - "from": [ 7.0, 3.0, 9.0 ], - "to": [ 9.0, 4.0, 11.0 ], - "faces": { - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } - } - }, - { - "name": "Layer4West", - "from": [ 5.0, 3.0, 7.0 ], - "to": [ 7.0, 4.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } - } - }, - { - "name": "Layer4East", - "from": [ 9.0, 3.0, 7.0 ], - "to": [ 11.0, 4.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } - } - }, - { - "name": "Layer5", - "from": [ 7.0, 2.0, 7.0 ], - "to": [ 9.0, 3.0, 9.0 ], - "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "north": { "texture": "#all", "uv": [ 8.0, 6.5, 8.5, 6.75 ] }, + "east": { "texture": "#all", "uv": [ 8.5, 6.5, 9.0, 6.75 ] }, + "up": { "texture": "#all", "uv": [ 8.5, 6.0, 9.0, 6.5 ] }, + "down": { "texture": "#all", "uv": [ 9.0, 6.0, 9.5, 6.5 ] } } } ] 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..f7d029511 --- /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, 0.0, 10.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } + } + }, + { + "name": "Layer2North", + "from": [ 5.0, 5.0, 3.0 ], + "to": [ 11.0, 6.0, 5.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 2.0 ] } + } + }, + { + "name": "Layer2South", + "from": [ 5.0, 5.0, 11.0 ], + "to": [ 11.0, 6.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 2.0 ] } + } + }, + { + "name": "Layer2West", + "from": [ 3.0, 5.0, 5.0 ], + "to": [ 5.0, 6.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 6.0 ] } + } + }, + { + "name": "Layer2East", + "from": [ 11.0, 5.0, 5.0 ], + "to": [ 13.0, 6.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 6.0 ] } + } + }, + { + "name": "Layer3Center", + "from": [ 5.0, 4.0, 5.0 ], + "to": [ 11.0, 5.0, 11.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } + } + }, + { + "name": "Layer3North", + "from": [ 7.0, 4.0, 3.0 ], + "to": [ 9.0, 5.0, 5.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer3South", + "from": [ 7.0, 4.0, 11.0 ], + "to": [ 9.0, 5.0, 13.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer3West", + "from": [ 3.0, 4.0, 7.0 ], + "to": [ 5.0, 5.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer3East", + "from": [ 11.0, 4.0, 7.0 ], + "to": [ 13.0, 5.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer4North", + "from": [ 7.0, 3.0, 5.0 ], + "to": [ 9.0, 4.0, 7.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer4South", + "from": [ 7.0, 3.0, 9.0 ], + "to": [ 9.0, 4.0, 11.0 ], + "faces": { + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer4West", + "from": [ 5.0, 3.0, 7.0 ], + "to": [ 7.0, 4.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer4East", + "from": [ 9.0, 3.0, 7.0 ], + "to": [ 11.0, 4.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + }, + { + "name": "Layer5", + "from": [ 7.0, 2.0, 7.0 ], + "to": [ 9.0, 3.0, 9.0 ], + "faces": { + "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/miniIsland_new.png b/src/main/resources/assets/botania/textures/model/miniIsland_new.png new file mode 100644 index 0000000000000000000000000000000000000000..a054c4cc8a4e53dfe552aff755ed29a750ddc44e GIT binary patch literal 1389 zcmV-z1(N!SP)acK-Wz_s!ckZ)OFkh(&{BWidk3$D8|O(V%Ak%3?&fe?Bxr=0h{O{d(8$ zG(GAA$xL4Ngo$A*?AjF3nZS-VS3bucshsAe_rDNU~?ydWG3IR zPp=ma_|NI6y@y-7TsIxS)6snT;uQciMwhnXfFGgRsmAYkI)}sYP>Ufgom#KfY1yT^ zZo^NG^dlVbL#y4~NgyT3jo&FrM&a4-ErzsoYQ0*gWtZx@?f@EkTJ6NJ7r@zwynK_@ z%n{AHcske6sr71|TCdi1o1V>`1OPO=t!^Lu_Jn)a0sxl3m?M8-62OylhUmLHG3+HN zN!EOKX%6}H+h5xD)7(Mrb(u5W9W z!ZfK-dy^ymNM`c5KX3xUbhY~+AmB=GTb*m)9j~v1Xf}CeWRli4*2myE`>)w zK5BceTKA1_qOD#%%0_m(#f2h(7B6!HbEb8AdOFf(?J^jh$MpMl`>Wd|xUT>Jp5OFh zE!KX|POU3tO9<{OEjv50Xpl7b8`)(r7z_rZ^H@6N+*`g!YLyz4iUJUT5CU6|4bFZi zPGKS zFUt8c1do8ST!uIxHuOeI&2qEBY zJdQF)c)a}Bviq_$0_?qZR7+KO#yuz=6hZ0)r?pd*VVSQ5|pxnp_w5ZygK_&z>#!>`e_}BKU46$ z?}4Mw(a^`DLESIKMjNbVu+#w@$H6`3Mn0JbI6&|Ss8wok^f}-fa>3y`Yn##glKc|Z vZJsh13c700000NkvXXu0mjf+Owc~ literal 0 HcmV?d00001 From 28febcac08b2ffd99676de5e020fd44cfde5d58a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 19 Aug 2016 12:42:30 -0500 Subject: [PATCH 3/6] UV map the bottom of the model. Add placeholders for sides --- .../botania/blockstates/miniIsland.json | 2 +- .../botania/models/block/miniIsland_new.json | 32 +++++++++--------- .../botania/textures/model/miniIsland_new.png | Bin 1389 -> 778 bytes 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/resources/assets/botania/blockstates/miniIsland.json b/src/main/resources/assets/botania/blockstates/miniIsland.json index 078eca7b7..44a91fc1b 100644 --- a/src/main/resources/assets/botania/blockstates/miniIsland.json +++ b/src/main/resources/assets/botania/blockstates/miniIsland.json @@ -5,7 +5,7 @@ }, "variants": { "variant": { - "grass": { "textures": { "all": "blocks/grass_top" } }, + "grass": { "textures": { "all": "botania:model/miniIsland" } }, "podzol": { "textures": { "all": "botania:model/miniIslandPodzol" } }, "mycel": { "textures": { "all": "botania:model/miniIslandMycelium" } }, "snow": { "textures": { "all": "botania:model/miniIslandSnow" } }, diff --git a/src/main/resources/assets/botania/models/block/miniIsland_new.json b/src/main/resources/assets/botania/models/block/miniIsland_new.json index f7d029511..732fb427e 100644 --- a/src/main/resources/assets/botania/models/block/miniIsland_new.json +++ b/src/main/resources/assets/botania/models/block/miniIsland_new.json @@ -18,8 +18,8 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "up": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 2.5, 2.5 ] }, + "down": { "texture": "#all", "uv": [ 3.0, 0.0, 5.5, 2.5 ] } } }, { @@ -30,7 +30,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 3.5, 2.0, 5.0, 2.5 ] } } }, { @@ -41,7 +41,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 3.5, 0.0, 5.0, 0.5 ] } } }, { @@ -52,7 +52,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 6.0 ] } + "down": { "texture": "#all", "uv": [ 3.0, 0.5, 3.5, 2.0 ] } } }, { @@ -63,7 +63,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 6.0 ] } + "down": { "texture": "#all", "uv": [ 5.0, 0.5, 5.5, 2.0 ] } } }, { @@ -75,7 +75,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } + "down": { "texture": "#all", "uv": [ 3.5, 0.5, 5.0, 2.0 ] } } }, { @@ -86,7 +86,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 4.0, 2.0, 4.5, 2.5 ] } } }, { @@ -97,7 +97,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 4.0, 0.0, 4.5, 0.5 ] } } }, { @@ -108,7 +108,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 3.0, 1.0, 3.5, 1.5 ] } } }, { @@ -119,7 +119,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 5.0, 1.0, 5.5, 1.5 ] } } }, { @@ -130,7 +130,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 4.0, 1.5, 4.5, 2.0 ] } } }, { @@ -141,7 +141,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 4.0, 0.5, 4.5, 1.0 ] } } }, { @@ -152,7 +152,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 3.5, 1.0, 4.0, 1.5 ] } } }, { @@ -163,7 +163,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 4.5, 1.0, 5.0, 1.5 ] } } }, { @@ -175,7 +175,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 4.0, 1.0, 4.5, 1.5 ] } } } ] diff --git a/src/main/resources/assets/botania/textures/model/miniIsland_new.png b/src/main/resources/assets/botania/textures/model/miniIsland_new.png index a054c4cc8a4e53dfe552aff755ed29a750ddc44e..4e7d86220cdf36b9f2eda652411233e89c780a9d 100644 GIT binary patch delta 739 zcmV<90v!GA3W^4hGk*fXNklm>{DxTI2TaBjf=NK3TtL$`+*dA%xddStVirug z&$=q1+38U(<$nQaZ#e3GdT+DwfVofCQ4pI+&EO3@ipPrdT0PRmG!uWq&>dpL4RXsl zhVD=$Shh>%pIy_y}tTno#n+G?F~nr1yQ2!^mnk=Y%okpCw~qyTbLzXOw)hcCk#RsjxMlN zT~Z0nP7lj=)#vtxgJrwwOxXJ@3iQ-`YPa__jqdXE93ezg+G64NztJtF|Mm~~+xGni$Qb;Zj6orU5JCtcgb+dqA%qY@2qAacK-Wz_s!ckZ)OFkh(&{BWidk3$A6pqW6_{y|H@)Sw|_n~ zL*_#>y8U|B?=(H?1IbKY_k@XIFSefVUHXFe=WYQ29&YWn?GMdPUE20#=vi5ekd!22 zV91T^K>-uPUZf-$^f++ll+f%HQj(16Q6GTT2Z%+3q}h2JOA92P&S84ghj==N&wpOy z0AO<`fn+A%uzydl7Y_K(>8QPjTf1C09l+DkeEQ-Q05nFIw&8#uq1ma%?|3?g!|_my zAuXL+uhwbVrMhmzPmc5>9PmS{-P}naCCQE7DM?1*+3ziev~+5{TBl`~>bmX#8hTpo z#IP5@*@(P+lhw=-&ANCx*U+i;YMolI)^(en&7A}QG=IFUZXf*ignQQl0G7X)BY$BM zz>{-^=({^H>?J8l)_iwq4*B%kU)uK5+(GSin;!arW;r-0pdT+Z`;EeOb0?uYy76?* zlF+BLOoM9Zoc?sC7lKCs{&;Ij7sL5lpxMzWNygpp?-IcypmJD&;1TfAJG;%Zfcm^{ zz?%_;1Al%f6$OPi1zlZmcFL5l*`A(09PpdDy(?kL0julV_++mN(I+CA$!p%&uN%)= zbnW!b_Vnzou5VxRvAT#+DQu=xHY$bn`a6xO2xul8@EeAvUO%k?w3r;}Zu5W9W!ZfK-dy^ymNM`c5KXZy)8 z$jENDFzo2qYSJ2R_3os+Q*M^nFi0*oQJ~U&vA8?f<+G#GF1XGf%Td5f( zFryWonIzjuOuqt=2NB{~Gu{aKiO<24$wNJgH2KkFNbMa)rr=rIYs?H47@f!T z`*!=Q+a$QJ005rf^kOa6e$P&=D`iUv?td#SJ3FyxkTmxj*<~;o3&2qEBYJdQF)c)a}Bviq_$0_?qZR7+KO#yuz=6hZ0)r?pd*u=0-l52ShkP@Cc|? zYH;*9;2Ltl;W}%Z(fgA864q^=G8ha7gTY`h7z_r3!C){L495S0e*yoj8ciG}7+3%R N002ovPDHLkV1kW`pGyD$ From 25a4877e1aaa336262e1e6c88464b4cb0447ca42 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 19 Aug 2016 12:52:22 -0500 Subject: [PATCH 4/6] Halved the texture size --- .../botania/models/block/miniIsland_new.json | 32 +++++++++--------- .../botania/textures/model/miniIsland_new.png | Bin 778 -> 729 bytes 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/resources/assets/botania/models/block/miniIsland_new.json b/src/main/resources/assets/botania/models/block/miniIsland_new.json index 732fb427e..e24740a6b 100644 --- a/src/main/resources/assets/botania/models/block/miniIsland_new.json +++ b/src/main/resources/assets/botania/models/block/miniIsland_new.json @@ -18,8 +18,8 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "up": { "texture": "#all", "uv": [ 0.0, 0.0, 2.5, 2.5 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 0.0, 5.5, 2.5 ] } + "up": { "texture": "#all", "uv": [ 0.0, 0.0, 5.0, 5.0 ] }, + "down": { "texture": "#all", "uv": [ 6.0, 0.0, 11.0, 5.0 ] } } }, { @@ -30,7 +30,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 3.5, 2.0, 5.0, 2.5 ] } + "down": { "texture": "#all", "uv": [ 7.0, 4.0, 10.0, 5.0 ] } } }, { @@ -41,7 +41,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 3.5, 0.0, 5.0, 0.5 ] } + "down": { "texture": "#all", "uv": [ 7.0, 0.0, 10.0, 1.0 ] } } }, { @@ -52,7 +52,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 0.5, 3.5, 2.0 ] } + "down": { "texture": "#all", "uv": [ 6.0, 1.0, 7.0, 4.0 ] } } }, { @@ -63,7 +63,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 0.5, 5.5, 2.0 ] } + "down": { "texture": "#all", "uv": [ 10.0, 1.0, 11.0, 4.0 ] } } }, { @@ -75,7 +75,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 3.5, 0.5, 5.0, 2.0 ] } + "down": { "texture": "#all", "uv": [ 7.0, 1.0, 10.0, 4.0 ] } } }, { @@ -86,7 +86,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 4.0, 2.0, 4.5, 2.5 ] } + "down": { "texture": "#all", "uv": [ 8.0, 4.0, 9.0, 5.0 ] } } }, { @@ -97,7 +97,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 4.0, 0.0, 4.5, 0.5 ] } + "down": { "texture": "#all", "uv": [ 8.0, 0.0, 9.0, 1.0 ] } } }, { @@ -108,7 +108,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 3.0, 1.0, 3.5, 1.5 ] } + "down": { "texture": "#all", "uv": [ 6.0, 2.0, 7.0, 3.0 ] } } }, { @@ -119,7 +119,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 5.0, 1.0, 5.5, 1.5 ] } + "down": { "texture": "#all", "uv": [ 10.0, 2.0, 11.0, 3.0 ] } } }, { @@ -130,7 +130,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 4.0, 1.5, 4.5, 2.0 ] } + "down": { "texture": "#all", "uv": [ 8.0, 3.0, 9.0, 4.0 ] } } }, { @@ -141,7 +141,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 4.0, 0.5, 4.5, 1.0 ] } + "down": { "texture": "#all", "uv": [ 8.0, 1.0, 9.0, 2.0 ] } } }, { @@ -152,7 +152,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 3.5, 1.0, 4.0, 1.5 ] } + "down": { "texture": "#all", "uv": [ 7.0, 2.0, 8.0, 3.0 ] } } }, { @@ -163,7 +163,7 @@ "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 4.5, 1.0, 5.0, 1.5 ] } + "down": { "texture": "#all", "uv": [ 9.0, 2.0, 10.0, 3.0 ] } } }, { @@ -175,7 +175,7 @@ "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "down": { "texture": "#all", "uv": [ 4.0, 1.0, 4.5, 1.5 ] } + "down": { "texture": "#all", "uv": [ 8.0, 2.0, 9.0, 3.0 ] } } } ] diff --git a/src/main/resources/assets/botania/textures/model/miniIsland_new.png b/src/main/resources/assets/botania/textures/model/miniIsland_new.png index 4e7d86220cdf36b9f2eda652411233e89c780a9d..2b0563b6127b44230444c93bdc6eb29c35e06cda 100644 GIT binary patch delta 724 zcmV;_0xSKB2H6E6iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPGe~?K; zK~z|U?UcQ5(@+$}f3}mxalX?wO#_ia7Ro{+*pQGSF~CAMwhsIo2r*WS{1a@9EM-8d z6bXr?Y8EO1`Jh%wUDDXJNs~H`&Cupikg7UJs7sFY^q$|l=e?tQ?zOb?YQ=K~4#U9^ zJn%dZC7=*ag|T!CEv?}?F6%GWeHwe{7WsuFx?%D1 z%?Ak|kdF_Jkz@%ituY)7i7&>9WFqvZ1e|lKCWkt1k$;VG+Oc7=81tuwa~t^K0J% zoD&B%u42}Aah(~g9Sbd`A;}Vhp973-16h#;pVvB6E>b z?xL!H##Z>5XP66OGV-T?D7L@t<%CQWK*IgeF=~xiFhuK*)$1iLDYnb-LnbB zLWH8HLk*~cF#g%pS{)%G#wPl?OA8aU;S|!lwN=kg;KS#yC4foeFN1t}$p6Ka3lM3# zD76=*a?*I;c(=CdD*5&KU*f0u8`CztaskseoMMV8ruYSQ=SQ-JM>M1W0000ErHs~e@0S8@lb93nXvR!W8 zd8iQq`u65Fnyz6MOva-znS&Wp#S}wlNHUvb=ngUGO_flqR;V{xoLM;n!0MBA0P2kv z08gp>`BnUeSl|at#uI``K%rbf(>2^zE{VAWVHjc-OuEmyDxulwQ7+{He`s$w>V0}| zv+;nrPuEcpn@P>!4Lpj+iu77N(#13rf5OlmV#Ez{%Q=SbP$gKlOXlPStjBj%3&3tA z?7fbPn7`wb%p`HvUlaHSvLKcoLuvA@A3C&Iq%XZc0_J)IHyXs8X z`z#9d)O>2U_ce{~^DbL&wis`ZF%OvNF&(Gv(0%dw445vk-e`T%`v(;SrDF?teGhNosf1d!Lakb%T*`Ch{3%ubf7AO>YlYZgbAWE> z6pt5q`*I6_5B3LwNx=Fei|pYnzUQli>EdeDit7IZD`#nTb`QRCDX&Ii6vQ-5BeRsj zX* Date: Fri, 19 Aug 2016 15:12:52 -0500 Subject: [PATCH 5/6] Finish UV remapping --- .../botania/models/block/miniIsland_new.json | 96 +++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/src/main/resources/assets/botania/models/block/miniIsland_new.json b/src/main/resources/assets/botania/models/block/miniIsland_new.json index e24740a6b..038eaa71a 100644 --- a/src/main/resources/assets/botania/models/block/miniIsland_new.json +++ b/src/main/resources/assets/botania/models/block/miniIsland_new.json @@ -14,10 +14,10 @@ "from": [ 3.0, 6.0, 3.0 ], "to": [ 13.0, 7.0, 13.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "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 ] } } @@ -27,9 +27,9 @@ "from": [ 5.0, 5.0, 3.0 ], "to": [ 11.0, 6.0, 5.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "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 ] } } }, @@ -38,9 +38,9 @@ "from": [ 5.0, 5.0, 11.0 ], "to": [ 11.0, 6.0, 13.0 ], "faces": { - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "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 ] } } }, @@ -49,9 +49,9 @@ "from": [ 3.0, 5.0, 5.0 ], "to": [ 5.0, 6.0, 11.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "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 ] } } }, @@ -60,9 +60,9 @@ "from": [ 11.0, 5.0, 5.0 ], "to": [ 13.0, 6.0, 11.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "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 ] } } }, @@ -71,10 +71,10 @@ "from": [ 5.0, 4.0, 5.0 ], "to": [ 11.0, 5.0, 11.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 6.0, 1.0 ] }, + "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 ] } } }, @@ -83,9 +83,9 @@ "from": [ 7.0, 4.0, 3.0 ], "to": [ 9.0, 5.0, 5.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "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 ] } } }, @@ -94,9 +94,9 @@ "from": [ 7.0, 4.0, 11.0 ], "to": [ 9.0, 5.0, 13.0 ], "faces": { - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "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 ] } } }, @@ -105,9 +105,9 @@ "from": [ 3.0, 4.0, 7.0 ], "to": [ 5.0, 5.0, 9.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "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 ] } } }, @@ -116,9 +116,9 @@ "from": [ 11.0, 4.0, 7.0 ], "to": [ 13.0, 5.0, 9.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "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 ] } } }, @@ -127,9 +127,9 @@ "from": [ 7.0, 3.0, 5.0 ], "to": [ 9.0, 4.0, 7.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "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 ] } } }, @@ -138,9 +138,9 @@ "from": [ 7.0, 3.0, 9.0 ], "to": [ 9.0, 4.0, 11.0 ], "faces": { - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "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 ] } } }, @@ -149,9 +149,9 @@ "from": [ 5.0, 3.0, 7.0 ], "to": [ 7.0, 4.0, 9.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "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 ] } } }, @@ -160,9 +160,9 @@ "from": [ 9.0, 3.0, 7.0 ], "to": [ 11.0, 4.0, 9.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "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 ] } } }, @@ -171,10 +171,10 @@ "from": [ 7.0, 2.0, 7.0 ], "to": [ 9.0, 3.0, 9.0 ], "faces": { - "north": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "east": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "south": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, - "west": { "texture": "#all", "uv": [ 0.0, 0.0, 2.0, 1.0 ] }, + "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 ] } } } From 815cdc9f52969609a065f9feb8021640306e386a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 19 Aug 2016 16:09:18 -0500 Subject: [PATCH 6/6] Fix all textures --- .../assets/botania/blockstates/miniIsland.json | 2 +- .../botania/textures/model/miniIsland.png | Bin 1471 -> 839 bytes .../botania/textures/model/miniIslandDry.png | Bin 1562 -> 833 bytes .../textures/model/miniIslandGolden.png | Bin 1474 -> 770 bytes .../textures/model/miniIslandInfused.png | Bin 1521 -> 813 bytes .../textures/model/miniIslandMutated.png | Bin 1533 -> 858 bytes .../textures/model/miniIslandMycelium.png | Bin 1558 -> 823 bytes .../textures/model/miniIslandPodzol.png | Bin 1503 -> 816 bytes .../textures/model/miniIslandScorched.png | Bin 1523 -> 825 bytes .../botania/textures/model/miniIslandSnow.png | Bin 1156 -> 605 bytes .../botania/textures/model/miniIslandVivid.png | Bin 1547 -> 821 bytes .../botania/textures/model/miniIsland_new.png | Bin 729 -> 0 bytes 12 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 src/main/resources/assets/botania/textures/model/miniIsland_new.png 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/textures/model/miniIsland.png b/src/main/resources/assets/botania/textures/model/miniIsland.png index 945d6b6fea2a5e7e6fed2f99bb789c96a5acc2db..ecd452714354494ff91e3168dfcbfd39fdd82b78 100644 GIT binary patch literal 839 zcmV-N1GxN&P) zXZC$(-@Z5Rjkx>6T^URQrjsd1kW!+@bW(*BuH|ADO~N4L!FLY?z~1h*td{e%+Ffdu z0?kI9PJal1WxG_%c`V!I`=5UmEP!@)a)!_ZX3=CinUdYik}jq391kOB;JF^=x~T-s zMx9o>%cpnV1>oVq5df`r7l1?Ri+ooR3xkl^bVfJ}Db|VzP2fItNvDdr6mEvDi090q^C+5^!CTJ7$Y+*`J* z-bJZc$N?nCP%`>&#QHlK^tg@|*YHO^TemmxM?U`8SAu4vPP0*`Rw?k+=bxzXNAt_3 zA~rr5qv;x@_e(tg=M;dK_DjN9$kA^WxtloxKTv{b@n)m0@_*yb4xRqR#;a8dsw5Y3 zKnOv0D~r=}h?{YYoPj^~NvcI)+56V}1`#j6qUxy0Q-tM-H{t#aE_Rqfk>5ZXW*8VzT(S2`sTmJaX z7xHqfy~$YDbpt>X!kD)gLano6VOC|hD#M8AxHDcW!?%^yvi2)htXT0@{s%#w*q@2m R3TOZT002ovPDHLkV1h(Cnp8RLL{aX*$;kkP-JE^Y#E*e;L`BjRraIb9u>-j!j|Dl z{N9$L>z50w`k~5QMfHo-grnp7N{fTW*BbE5#u*+h)>tYmm@CXBFO-~4VyUojqGvY% zmxk}IvWq3b;=&?+Z_7sRW5Za#c`qO$F@^g3i#)vkFCK3Tk(h$|JwP~`z&~vv^4Az` zzE<5E*c;9gzIF$eZ(#8A<03Q_r)`^?&{Uk0=kpnT<5;^0M-v7Ao~y@7n+I}bXvVur`2n9<;FU6YYd9Q%YaOx}Ko#Si1liskP(s zxZv6&UER*nIRHjpt;X)O(?|YyD#3SuDs=ZqOriVJZee%Y$;@W3JMHZFJqp0d<%Fo$ zHJYG}QhMQDL5HuETqeidIU)Hl`8;cL~cfNV0$_E#DJ{nAYzGt zVFu9RY;uyEPSV_1R~VN!1H(~PN7EBMyIE_Q(&`GMutu-ynj7md;?E~7!H6sFaZ!N9)(Nk=1SQg9AMz%0TX~Z7!b~AqL4|I;5$E> z0DfCO4+I0k*+0%~pap0DIL&{|0C3>)#pkmLzQ5!q%V(8Y` z^Vb6s;RKlS`}@#TyvUwSX35THb>9~Pq!VfEPCJp9LhY_YMRr@YjqH53@Qz@!c&0%J z^4UKZk8tJum6C(dO5KNUkFH+ZBi8dU#|9*3zq)HtM$=7>>63MyGuu zhu+)TKrkQ{vI`uUvFi4KKrkSd7M9p~drtTN4u`)yEEX~gy!jx1zF8x&;R-OBOw?|# z1<>8hRMzC@fIH|vziB0nquxP>uT{5Cq#mU(nN6F%8W@i9z7O_^_K6$-qq|)6_vvRy ztDAo~Py0l!s3Q7~wTqSZ_54aC5{X12kw_#Gi9{liNF)-8L?V$$Boc{4B9TZW5{YC3 Z{0D==Edg$K;=cd@002ovPDHLkV1kQ%+{gd` diff --git a/src/main/resources/assets/botania/textures/model/miniIslandDry.png b/src/main/resources/assets/botania/textures/model/miniIslandDry.png index 846c8c285e24259f811dd7678cdd6aac8a10ac83..87228df749de7d2c371aa75b7b8b851174900066 100644 GIT binary patch literal 833 zcmV-H1HSx;P)p43@es1IjMaB2RMMzQfqCF@(F=I|Xea@kou0&XL!;g4(WvUQ znkL=h7=VFgQ#UjQmd$tH|0=Nosp5W~@yjJH0f8ekyYN{qQuy;Mql-E2BIKRBIpNT1 znzTDTK0dw+z{98K0JJ+j0RF(-rF|`Ud3c{0Y~o^sg%=r(~wL#jb`LAv;tn_qt~tjXf;jL7j5c> zCJyTk$Mi=Ny2G*PhmA9!sVVj=SzO;|@iO9|R$}SHq(4JW=O}0yrWflaNSY0<%aHWM zz_ParAeGB!xtzGTp2Srg5P1%(Rmj16Wik~BZ=OagWQ9X=K)cghtNp;T#j~Uo8wKFZ z7wj2%mTrKSS9moKSxf_*QN(30AQOiSUMz$|t7+0|nl!39Uw`o-bwi^+nuz_R6q_Q~ z?-aS5uJB{<35nbQ<3MNp_Y_sn5aDrnqyrX!czLU7^6=?7bwi_a{3+exzm3Oztm zW#G?eOQaxVZ>3Pq#Z-?}vMUF*mLXDB>}w@fk}n*RG5%u4nt_-#+-yRBmg38*;Lq zou0(^zxgtLeV@9)zL>0U*=KLC-*F>58SZ45u&u0iGTgCa$N$DZCLZ#OVLBFb00000 LNkvXXu0mjfs7{ZV literal 1562 zcmV+#2IcvQP)&B4cAVuHba8k}2xk)Syrm zJJ@i7I5vD9K8vp+;)^~^5LBjuh&mq})#6a0bNaA}E^Rb!N!FU&G)>ax-_M77(>C{B zdYz{D@cX>n+??+{H~0L`@BGgF#m3(}6bXp3y~LiDVFG<#j=%nyjWs-TBp?^>74Hb;N7Xq>+DBPD56j(WB=8|*ho-! z|7Ky=K5XrCQ!GI&nlTj4=c-go6#_$Erhc5&*)y>P?5*wKHNH`1e{*t8I{0@mv~A=`yL>c%rNE;5>KfN4{R}f zfKktF#FDGQ`{L!pBAQ4uJg|jmB3&QRN$-q^B{OyZfxeadg$EU)&Q;y1@x3CJ%;+-Z zzotbSO|xS-q%bxTte-~{X|gws=^UBq8ug7jGryXy*|ZGx`v`{=%#M>6XNafN`guI1 zvT)%Oog*_{qrOpR=2z1-Jpkd5LNt-a>=@`6(pw^5P6Y zJ=%>&t(t$6zasj!`q)1*%q0}y{5nS;T%G1-znf@cWllHF-NP>gMJiUP*N}%^dS{*e z?)wLXYRlAX$EK|Ujmwo8{e#^&vIXKPl};|`?CuT+*|{=tVVt%Lb0v!T7A7yw7>=&D zyM^8!C(%TDQ&L~UzLDV6_+A0MF4Ix@OU0MHCJxESD<`476{k%UvzvYIAO=Q}Ygr zMZrSFNv*YJs%tiu0&x25G`E$5q_3BVB{QZ!?DW}b_V|VoE!1^J`qO8pxxLy?m&?K6 zLJxD97E@ibv7BBLFDhbDEwiH#0Q9LDzQ0#=b$Qrn_Z!;x-8&$>-EeU54yJyb)fLIe zk$}j|FLTpE51?Xe~g(`fXSGzDRvdzMB22}H{ zcvBweH@1KNVcZ6=Ws6&slIT0Z_g6;rOa1`h(THDo(%smUMZ}DUA-fNj_3sGH#&Q6T z-?7h9pZ<(8O4PNn?!=wlJL7u{`cCX~CFyg2j!s{w^vo{l~jv1G=u4{(So@vC{m{X&2x zDpU$~;whD`-H+<*rJR%GT&})Huvu7+vNor~A%(Yo`HC}d#|^JttNSSV9Z&S{;kED2 z@#)9cY(_eba7f|RAI|al2iG>W23XDjSZ!W*Z$EBHH{^eoXd=zNyH1+w*6QyaHP$r~ z%h7)Bgd+Z2EVDfyz-YI2|AW24?eE}_XQ$yDe>k#DbZ_+$%=Q@m?{M_Rph#S)5ee=D z*t8uX%Ng+VPep8%DuCh3jHlN{`g-y2?J_;R-cHK465)_ySSPY-g?z5G>8pX|C_fwt zh>&yTRd~*u;H@`j4X-_Ra#(Cj_5tv9{t8_kt%L~bGUC+uUh%E^3(lT)c2`$+lV;rs z-h12FuS6n|NF)-8L?V$$Boc{4B9TZW5{X12kw_#Gi9{liNN#|?08aufpxC`$G5`Po M07*qoM6N<$f=i4QRsaA1 diff --git a/src/main/resources/assets/botania/textures/model/miniIslandGolden.png b/src/main/resources/assets/botania/textures/model/miniIslandGolden.png index f6b7d231501b06cd0bcfffea943288af78af3dd5..24481d4d0728eb12b4205c01400b6846fa4806ca 100644 GIT binary patch literal 770 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 literal 1521 zcmVMTRn9tfO#+w!qrEZet9PpAX{} z)_ZSuLAnt0`@G!Uoo`QX&pAE6^ZV6-&ayheog$RmUARk~)NecB;9)-hSTHmmCDjQ) zXwUJH_Vw!oeOCzIyN;UFjP`Y32;!FrcAW!Yck9`a_AeU*eS-ueE%>V|jqjf)3bTK? zr$gTmu}IonnQ_3)6z)-4^Z~HD_3TLd;9Zu^s-))b z<;VFPk4<5C^}9k%YPi##s7VcXbtP(2L;pWOERn`PIgL7?Q8mqD`T>-JA!3&j;H(6o zY12{>ji;!ZRzftMqJHaF4uIzIH6oTsXZ^cNov2BTfGbV3Bbv>;Qa7wKRLT>kK+mSt zHQ@E&uddAAN8>4ar~3_#taQ2hT%DC)U6*ePD#~00ydJEs&8NCilUnv(O=@IL?lU;D z(&g%Nbyj|LUETu_@Op^GQ&?TyrA~nCeJo+#Bdm0}`dporUtO1P3Y$-L17xF}d)2$S z>i|6s9T%2b** zc|lBVAQ0i&~Kxm*F`X^fI7PReS0T6PPK|u*h9pYhoXy^Bi2(X~8W_WdJST5)t zgi;4+{U|q7=v1k{pOEbP+Dy>nQea0E@Ot3p5V%W6*WDQhQ~$A{n*=v+gX1}@@(}QP z>^$Co!d3tp4@FS4D-cf*OQbCytnp9;rC){at680yzVT25C3zBx3sEk#K?X}*zOi3k z8#W5xQj>1;DjD?AyC$XxKr`(o)^3yJOAN=2E=*aVk;E5yV_BAU7x9(-}ow|-N5b?!R-O-9o~&=;3~IlviZV(lvgbg!Lw(w9o#ZQ4QoZP?XaQK z8}uta6Tu6|*gaz&!N30+-EW?-T>(wy6K(C!o1X2lr>h#oUtLMlya{8n@3+Es52!so z0UV_$Xau|-a+j*@KOYf0PX9!-tKIZW(6@P`h-6}f`;(|i&9EEXd8|c*kG0X{^@!$E z-A`c;n4AIU@W^U52kdA$NaW}V^YcPr$|gn*F){e0r+9B>1!X>t#i#~bNURm7t+wU-(jZH33xr!wyChU<>~AJ@L+fey)xgH zZb|R(Szl=O80&>rs-xTlZKfy?;n>L@xAJYt11Dn$FxtZ zET4n#dFPm(2En6Lz=}_W(l?x)(Bw+^`djnYE`3KRL%qYgxqj&GKpE^YRD@DjBSK~6 z;FyXMKMla)d2bTguw_hpfJ7pZNF)-8L?V$$Boc{4B9TZW5{X12kw_#Gi9{li{IB^J XOhOF*cJ(ZC00000NkvXXu0mjf-LB+w diff --git a/src/main/resources/assets/botania/textures/model/miniIslandMutated.png b/src/main/resources/assets/botania/textures/model/miniIslandMutated.png index f34e10082032f5767510ec43b6f09f7761a9f517..465bad39730de3c6e3c56733fb44569fca368942 100644 GIT binary patch literal 858 zcmV-g1Eu_lP)KS$B!Hdm zl9$h>sZ{F}ath_5O08)Cpy?+0Y#L2Bxp4KCL;%QV-|g{mWbo%`A1gFu-|aDyhgb_1 zy}p6v4%nMK5QK73rBbbP`s51$e1G>304miw06(Dy@p~xX`n5dgKHOuU13WiO?Vw5~ zvdqE2Vj7jPr&FGbt_wn~X;8>105n=18m*3q20**|-An?)VQI?wOD__4ZIF6wW=^wb z)ltF;yrDyAF@hxx1wqqIlCQpvcIRu60zVRuKL?IL+v^aSEV3Ri5Dlf+cUz?8IBU^W z7Gp`?IQc`g@KQEba6Ul-?voFZB>kbrxmU$F5o-7ykNtS3*<9ZkqDWQjWwKL6x4 zXLkvzLKP__vfwZ$-@-Bb#fUS)fg`C3On@LuVt+Mq_Tg>(!uB~uI z`%?T1X0bmCa=ECowGk72{K2^&`FYrQVz#TBzYD^w_D2eMdbWRYCB;Kad**DP)&3}m zFzsxYJpT*faJIj(`_(^&a#s7J5cb!d?UMJ|`)_)W_VP3Am;Ci9`^dj>{{P0j4d-p> kW7f8sx8WRf%<-S$Z%xkn*VRw;$N&HU07*qoM6N<$g1+FKCjbBd literal 1533 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 uj(rd7qSuDKHgwT#TlLzohaP(PZ}_W0p) zFWr4{7xXs7oZpwTyXSwN-uv9A&w0)%!Cl_&^wBd{b66Sh!c$v?H$UztD4?sEr+Grr z^0*HGub%!2u}AP(%|cT_FKbW+(8}R$=JWxW;~Kj>2I#zUMoW<;Z6VdbhR$01ghFpJ$(o zJAgb84*DP9F&-S-CvSDrn3#sAwhEYEq5 zA3xklBk?2}msKMYPbzP8Wy2VaCQ>N;+?be#5DLuG?d@4ZqluIzQ~ql>`E44FLMVW6 z(63xa;z?Yu4{ID5>C}3)&d9Hv_pGa5a$RREw|8`TISom#Kf8TplUR%07HIR*eqwAG_r&5w;v(2nIcgo97u z90CA_=Q;Z6_tU6$5JckAcUt}3-T8utmJld4q~qN$=GnKd=IM#aX{B})Z52>2S4Q~V z9Ijlau;tTm;<(0M?I7SdVwkqc3xK!I=>W zp#bV?2x=<-`Cf!j0HhSin($Z30TVZ~s4OQKyG9LlR%0pveFG!#xILK3N{y1yjr9$T zz+J(E0~DQ}zHeXzkNLbfayAQhjR)>WV5qYi)9JOR(?q=SI+X(;rKMg5&{>M_e;rjc zYJQH+VM*hR(gUc8U(2JSjG&>;h2G9q(+}`(S+EGoJn8o;Yjq@^)YyMGc1db=o4mAd zU_`$a{tb|qPr21?sB?KZJd&i1;>aQ;;+WIeJx(Ln^X~~F*Y28k(W4R4W7Zbw*c0$Y{1LOTZzoZ0H zsk~v4wF=Ww-n@#Zj#8&m!HwR~j@3Mc&8eyMYW=QfdAg{K!+YQTfp@yw7xZftrZZso zX2I0{ymzBH-Ai2pg3DLn+(&N|{S>GW(>37c#iJORn8i{j498d3LsIr++ zzsZfQJf#HK@Qie3sNM~3YUAl*yL6H?cyjFFs{x;%ox!!+c|;Q_-9F&P9EFV#-Sa{K zaF+u)J4H-PqoQS##$M~>u>Gk;${9hiFdb#NIt!ryK0DKoZ@x_G&Mnj(=pV$Z-2x6A z9>iBiCyAa;MhFG4|HvS|9iDtRYXESsd1(#qF{KM_+%1h;b{pyn^=+HBVFotGrT6tlq3_XsM^!SzwD0)U5&Q+j(lsQas)0)BW9H$2t$anxc4dt<+}}>qO|j zGQd$Lje47zOqRe_io3^UTI{nFueFs!2nBTO1O>oxw5X>+z8#BNvpBHVeD|r6XKT%CcQELE$ z!C){L3 z-nsW2&O7Iv_gv+Usff3(>iqda=Sp>sfyU24PJ1=S$V`Me=UHg*;3!f6cDA=fx7}ng z+{Nx#IQxZmuevJF%o-9F;iPQVCP`$LmN*Z&suCg8pCNmYQA-J-xVP#biG1uyeba47T z)_)t&Z8v4GkvCy)95C`GvL8wlu+p4Mnn6N_H`Upw>8#~CBR64x4l9O^AD=jkya}!! z%J02#fa`~{Cr;m$B4AcD_C-ou(V&r#gb~MS#;t1_Z7U_rE11W+bSMH0hP!8K@A{#< zD@sv{z~MAvqoon$8MU;^Uv&tM;n&dM`NV)(j>}0CI{h9_zlYti_~gTP=(d~ejRSdJ zl%g~N+t3N8AnKr632~ltp}EHXQAW!EEs3#PHR({)+3ELWvt7LXzC5=(mXu^E0*@1e z#Zue7tytHOe3PHub^osO;Dt{AmREU4gblR64(pKa0z8+drN$G|0$O@ zZS0Ok@bD26!^FAk$l3n;!*BTfhg7}=i`btB)#>-RylG1vt96}Bjn2&W?AE)|VNv^Y z3A{Yp1N&{luy$s)pT?s0=Ru}vXM0N&e+VbD{e#cG`p;A@YJVPzQK#>0Z;3BI{it|< z)&H?yE!LOpE3Xp#&BjuOOBoheR8~tFF0sTCuMK|#iQD9LxrX3M00000NkvXXu0mjf Dz<`d% literal 1523 zcmVf!TCZmGeuEHMq&gp9W@o(5^QhX)~#!=k1yIQ z>-}*jv5hg$=gqU*?|aX+zx&!?O(Lu)l^QSwTVl zhP42Iqo>c8#1DF^$as>4e^(E}FZrwy?I;~!-Gn-e{l^eFDu@(Wp7iQzo=orE=xp*9o$w*#2qnpS~r`2n9 zX7j4LvL`?-J+ra7!36-tV>6F1(`ofuo!PvquH0}#qhkP2%(iw^-Tdmg?})qFiSFKY z_!(XR=SwE~=G0j%VR-}#&$Ra0JtXnuY9d$kkWH^0FNr_gAdu*l%SG>~*eal1uFUYb z?HC`MMmQ$JiHo{;HP0b71+XS%8<_$oY*iQ<9W%VUwb>jN@jQZ&ctuKIg_}=sWP29@ zfaKu!NI8kAuD)v(06@Ml0(l}`JWnN`=nPf?Bpj3R;sTaTFgetxs*qq9EbhrKk8@Xn zTj!Mz)`}?L_hMGbVu|hV<#{v9!OrsY>XP*$rfe)`8U?T9I0E<9E<|Su zLeYfj2OAh1L1*tu*s4&}8R-WGM<6|LFB}R7=b8@Oa0#Zma$~u?UT@_{d=^-^CSU5> z(%dT8NDVK*yV++Lf3Vs?>N8mco_h$xm#*ndvcH)lu^9z?dpiJqt6VNDRR93|F7x;$ z&LiOW8diWy1agiP0OQhi+R_lDT(JkxGM!T(WbJ5ati_%}yIcw8H9-}r=RTwhYjrRZ z*Tql7mArWYWMFW_xD`$U_$|MDs;zEIV=Y3_1a@v-QPdqheO@cO7x6RaK%Z24E_qjx(bS^DAxY-@*U*sb3c1h>-x*Z~yNFtp}(Rd|< zXnV`N^Og(CkHFIhAGg$}_rCOqCEcdNe60oduVnu}7t7h+yNn@9jz!ao)d={#y0^I< zl1SX+1ReV}814x^?`8s_X`0a!HT$c7J%UPMIm@a$2mD@~d+#&6D`yPPovS29~qDXE95p^=kkC*FPV@vB|XIxldNx$z5CW&Csu3ehWcyqIqM7t|E?X?;?ME zbrG4F43=(M4FKT2zJNC)mGuA$g+ifFC=?2XLZMJ76bgkxp-?Ck3WY+UP$(1%g+lpX Z^B0Vn4G!_Q1GNAE002ovPDHLkV1iqS$!Y)q diff --git a/src/main/resources/assets/botania/textures/model/miniIslandSnow.png b/src/main/resources/assets/botania/textures/model/miniIslandSnow.png index 9f07eca9d46e3d82599e797a4045caa997aae883..492b94af619e60c3e1eb2d7e39ead8e36f3614f2 100644 GIT binary patch literal 605 zcmV-j0;2tiP)vxuASpXy7lf6!x@nlNBYcp^if+z+cT(0PK+Jws$r{|XzCD3RI zp~)1Au~@3 zm|mx?$$}_mwnzw~Sm&Yi37ET8__e-vgSodHeDy03SYotz<*fBrjT_Q0xLF z52gXaWM9=v|n)~8cSfJxdCVk>Y7c?eA?|AQ#jBJOfUXw)cMYLvpr_hgu+ z^3Bm>Ir2RzrIcZs%CqC49QmF+J040YrMzwZJ~Rfd!^!Ya_pus8=4^lW`k7u(wSKRF z;%q+|9x~6eowL1a{XXbl=E(P?+97QE{Kfl^fBdaht>1^Hx+)*n&y5}RYIul3{hiy8 r|L3UNux`UOsuj^c0T%`n%`zj{u^kIq-&0pF98nyg7Q`^?A#60RZX6 zxq&%8Cq|`^C9B@V%=8pwSD@V~>BTu%^(HcjII7n+o|pFwf1+Y8NiyBnU*7N12X*2; z!MsBE=IFiA^VFY_F)^B|YbFs#dU4KcSFdgS`&GIpkxCcT2X(5vLKik;v(X4Li8xf( z!}Cj6^`_Uh>P>t&d)t#pr3>nVI#phw3%vux)Kgt&rl$bFYpZI6N*B}zb*j8V7dD2h zV*Ao;v1Xisg`=(b!J)oXhsQ(rJXNFZiN&2_y_kWqQ|7y$6g z?|-yE$fvqymSGrPb+_tGZ$<#^j@inm0Nli#zj zvch)9>h`nBL`0QBR%(SsTxFHRLTd&HTCR&sA}*Z)!pZ{jsoOxijtCDRi#GtwMkAhG z9t8u7pkOPX!qrU!PoF$M_1f-<&rD8w#cO;26bI`ozT49y$gF-KKU2A@y zykVi;0nc9_0BAcw8J6SFglXc%(gJ3q5vdcbxh`I2A1UJiJpT~(`Y+Hff-%#?glWR6 zH>FNZ_=G_POtr%ko1Jo_U9)<>Mnl!apb2!cfx;Wc(A^rJkwL12@0b$D1NZMB8`W|P&EK( zTUMD50NQ3qc3voAu}%%S_s#dx_=IVCX9S}{`+XCml1aqz?b=SyJ1x^aT-(9P#ws4J z?MRJ~znw|MvGDUN&rpqup^Bg|FQrmROLtZ(;fu~yr8_*oyw#V>!#vJtA>U?5wpkH1 zLiLX8{_jvJWJmhHfOZY2xvsb2ku8OyMqEJt{!W;tx6aGzM5~j3l&3*MAx5v5OOpRI zCy0N`?B5~>b;VqgEXV2ELfd`vG7Q5o48t%C!!QiPFbu;m48t%C!!QiPFbu;mci=zp W^+Rrq1lsNZ00004gyGsL{LgBF&GZqd7(`*B|0 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 LNkvXXu0mjf{Le`j