From 33a8d5e33cf09a8b9c39d1605cf30d283f7bf594 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 27 Dec 2015 01:51:06 -0600 Subject: [PATCH] Done with apothecaries for today >.> --- .../botania/api/state/BotaniaStateProps.java | 5 + .../api/state/enums/AltarLiquidState.java | 16 ++ .../botania/api/state/enums/AltarVariant.java | 22 +++ .../client/core/handler/ModelHandler.java | 12 ++ .../client/render/tile/RenderTileAltar.java | 28 +-- .../botania/common/block/BlockAltar.java | 52 +++++- .../assets/botania/blockstates/altar.json | 168 ++++++++++++++++++ .../assets/botania/models/block/altar.json | 133 ++++++++++++++ .../botania/models/block/altar_liquid.json | 12 ++ .../altar/{base => default}/gobletBase.png | Bin .../altar/{base => default}/gobletBase2.png | Bin .../altar/{base => default}/gobletBase3.png | Bin .../altar/{base => default}/gobletStand.png | Bin .../altar/{base => default}/kelkBase.png | Bin .../altar/{base => default}/kelkBase2.png | Bin .../altar/{base => default}/kelkWallNS.png | Bin .../altar/{base => default}/kelkWallWE.png | Bin .../altar/{meta5 => desert}/gobletBase.png | Bin .../altar/{meta5 => desert}/gobletBase2.png | Bin .../altar/{meta5 => desert}/gobletBase3.png | Bin .../altar/{meta5 => desert}/gobletStand.png | Bin .../altar/{meta5 => desert}/kelkBase.png | Bin .../altar/{meta5 => desert}/kelkBase2.png | Bin .../altar/{meta5 => desert}/kelkWallNS.png | Bin .../altar/{meta5 => desert}/kelkWallWE.png | Bin .../altar/{meta5 => desert}/wtfisthis.png | Bin .../altar/{meta0 => forest}/gobletBase.png | Bin .../altar/{meta0 => forest}/gobletBase2.png | Bin .../altar/{meta0 => forest}/gobletBase3.png | Bin .../altar/{meta0 => forest}/gobletStand.png | Bin .../altar/{meta0 => forest}/kelkBase.png | Bin .../altar/{meta0 => forest}/kelkBase2.png | Bin .../altar/{meta0 => forest}/kelkWallNS.png | Bin .../altar/{meta0 => forest}/kelkWallWE.png | Bin .../altar/{meta0 => forest}/wtfisthis.png | Bin .../altar/{meta3 => fungal}/gobletBase.png | Bin .../altar/{meta3 => fungal}/gobletBase2.png | Bin .../altar/{meta3 => fungal}/gobletBase3.png | Bin .../altar/{meta3 => fungal}/gobletStand.png | Bin .../altar/{meta3 => fungal}/kelkBase.png | Bin .../altar/{meta3 => fungal}/kelkBase2.png | Bin .../altar/{meta3 => fungal}/kelkWallNS.png | Bin .../altar/{meta3 => fungal}/kelkWallWE.png | Bin .../altar/{meta3 => fungal}/wtfisthis.png | Bin .../altar/{meta7 => mesa}/gobletBase.png | Bin .../altar/{meta7 => mesa}/gobletBase2.png | Bin .../altar/{meta7 => mesa}/gobletBase3.png | Bin .../altar/{meta7 => mesa}/gobletStand.png | Bin .../model/altar/{meta7 => mesa}/kelkBase.png | Bin .../model/altar/{meta7 => mesa}/kelkBase2.png | Bin .../altar/{meta7 => mesa}/kelkWallNS.png | Bin .../altar/{meta7 => mesa}/kelkWallWE.png | Bin .../model/altar/{meta7 => mesa}/wtfisthis.png | Bin .../altar/{meta2 => mountain}/gobletBase.png | Bin .../altar/{meta2 => mountain}/gobletBase2.png | Bin .../altar/{meta2 => mountain}/gobletBase3.png | Bin .../altar/{meta2 => mountain}/gobletStand.png | Bin .../altar/{meta2 => mountain}/kelkBase.png | Bin .../altar/{meta2 => mountain}/kelkBase2.png | Bin .../altar/{meta2 => mountain}/kelkWallNS.png | Bin .../altar/{meta2 => mountain}/kelkWallWE.png | Bin .../altar/{meta2 => mountain}/wtfisthis.png | Bin .../altar/{meta1 => plains}/gobletBase.png | Bin .../altar/{meta1 => plains}/gobletBase2.png | Bin .../altar/{meta1 => plains}/gobletBase3.png | Bin .../altar/{meta1 => plains}/gobletStand.png | Bin .../altar/{meta1 => plains}/kelkBase.png | Bin .../altar/{meta1 => plains}/kelkBase2.png | Bin .../altar/{meta1 => plains}/kelkWallNS.png | Bin .../altar/{meta1 => plains}/kelkWallWE.png | Bin .../altar/{meta1 => plains}/wtfisthis.png | Bin .../altar/{meta4 => swamp}/gobletBase.png | Bin .../altar/{meta4 => swamp}/gobletBase2.png | Bin .../altar/{meta4 => swamp}/gobletBase3.png | Bin .../altar/{meta4 => swamp}/gobletStand.png | Bin .../model/altar/{meta4 => swamp}/kelkBase.png | Bin .../altar/{meta4 => swamp}/kelkBase2.png | Bin .../altar/{meta4 => swamp}/kelkWallNS.png | Bin .../altar/{meta4 => swamp}/kelkWallWE.png | Bin .../altar/{meta4 => swamp}/wtfisthis.png | Bin .../altar/{meta6 => taiga}/gobletBase.png | Bin .../altar/{meta6 => taiga}/gobletBase2.png | Bin .../altar/{meta6 => taiga}/gobletBase3.png | Bin .../altar/{meta6 => taiga}/gobletStand.png | Bin .../model/altar/{meta6 => taiga}/kelkBase.png | Bin .../altar/{meta6 => taiga}/kelkBase2.png | Bin .../altar/{meta6 => taiga}/kelkWallNS.png | Bin .../altar/{meta6 => taiga}/kelkWallWE.png | Bin .../altar/{meta6 => taiga}/wtfisthis.png | Bin temp.json | 150 ---------------- 90 files changed, 417 insertions(+), 181 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/state/enums/AltarLiquidState.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/AltarVariant.java create mode 100644 src/main/resources/assets/botania/blockstates/altar.json create mode 100644 src/main/resources/assets/botania/models/block/altar.json create mode 100644 src/main/resources/assets/botania/models/block/altar_liquid.json rename src/main/resources/assets/botania/textures/model/altar/{base => default}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{base => default}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{base => default}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{base => default}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{base => default}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{base => default}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{base => default}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{base => default}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta5 => desert}/wtfisthis.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta0 => forest}/wtfisthis.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta3 => fungal}/wtfisthis.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta7 => mesa}/wtfisthis.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta2 => mountain}/wtfisthis.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta1 => plains}/wtfisthis.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta4 => swamp}/wtfisthis.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/gobletBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/gobletBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/gobletBase3.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/gobletStand.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/kelkBase.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/kelkBase2.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/kelkWallNS.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/kelkWallWE.png (100%) rename src/main/resources/assets/botania/textures/model/altar/{meta6 => taiga}/wtfisthis.png (100%) delete mode 100644 temp.json diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index c8e9691fe..ea13625a2 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -66,6 +66,11 @@ public class BotaniaStateProps { // BlockAlfPortal public static final PropertyEnum ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class); + // BlockAltar + public static final PropertyEnum ALTAR_LIQUID_STATE = PropertyEnum.create("liquid", AltarLiquidState.class); + public static final PropertyEnum ALTAR_VARIANT = PropertyEnum.create("variant", AltarVariant.class); + public static final PropertyBool MOSSY = PropertyBool.create("mossy"); + // BlockAltGrass public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class); diff --git a/src/main/java/vazkii/botania/api/state/enums/AltarLiquidState.java b/src/main/java/vazkii/botania/api/state/enums/AltarLiquidState.java new file mode 100644 index 000000000..78d7f8936 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/AltarLiquidState.java @@ -0,0 +1,16 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum AltarLiquidState implements IStringSerializable { + NONE, + WATER, + LAVA; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java new file mode 100644 index 000000000..659d8436a --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java @@ -0,0 +1,22 @@ +package vazkii.botania.api.state.enums; + +import net.minecraft.util.IStringSerializable; + +import java.util.Locale; + +public enum AltarVariant implements IStringSerializable { + DEFAULT, + FOREST, + PLAINS, + MOUNTAIN, + FUNGAL, + SWAMP, + DESERT, + TAIGA, + MESA; + + @Override + public String getName() { + return name().toLowerCase(Locale.ROOT); + } +} diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index cfa72a1a9..a7e1632b5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -21,6 +21,7 @@ import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.render.SpecialFlowerModel; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; +import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.api.state.enums.CrateVariant; @@ -111,6 +112,7 @@ public final class ModelHandler { registerWalls(); registerPanes(); registerUnstableBeaconPetal(); + registerAltars(); /** Normal Items **/ registerStandardItems(); @@ -633,6 +635,16 @@ public final class ModelHandler { } } + private static void registerAltars() { + Item item = Item.getItemFromBlock(ModBlocks.altar); + String name = GameData.getBlockRegistry().getNameForObject(ModBlocks.altar).toString(); + for (int i = 0; i < AltarVariant.values().length; i++) { + String variantName = "liquid=none,mossy=false,variant=" + AltarVariant.values()[i].getName(); + ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variantName)); + ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, variantName)); + } + } + private static & IStringSerializable> void registerVariantsDefaulted(Block b, Class enumclazz, String variantHeader) { Item item = Item.getItemFromBlock(b); for (T e : enumclazz.getEnumConstants()) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index c739e8702..541185828 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -62,11 +62,11 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); GlStateManager.color(1F, 1F, 1F, 1F); - Minecraft.getMinecraft().renderEngine.bindTexture(altar.isMossy ? textureMossy : textures[Math.min(textures.length - 1, forceMeta == -1 ? tileentity.getBlockMetadata() : forceMeta)]); + //Minecraft.getMinecraft().renderEngine.bindTexture(altar.isMossy ? textureMossy : textures[Math.min(textures.length - 1, forceMeta == -1 ? tileentity.getBlockMetadata() : forceMeta)]); GlStateManager.translate(d0 + 0.5, d1 + 1.5, d2 + 0.5); GlStateManager.scale(1F, -1F, -1F); - model.render(); + //model.render(); GlStateManager.scale(1F, -1F, -1F); GlStateManager.enableRescaleNormal(); @@ -130,29 +130,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); } } - - // todo 1.8 this theoretically would be completely done in models and getActualState -// Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); -// Block block = lava ? Blocks.lava : Blocks.water; -// int brightness = lava ? 240 : -1; -// float alpha = lava ? 1F : 0.7F; -// -// GlStateManager.enableBlend(); -// GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); -// GlStateManager.disableAlpha(); -// if(lava) -// GlStateManager.disableLighting(); -// GlStateManager.color(1F, 1F, 1F, alpha); -// GlStateManager.translate(w, -0.3F, w); -// GlStateManager.rotate(90F, 1F, 0F, 0F); -// GlStateManager.scale(s, s, s); -// -// renderIcon(0, 0, block.getIcon(0, 0), 16, 16, brightness); -// if(lava) -// GlStateManager.enableLighting(); -// GlStateManager.enableAlpha(); -// GlStateManager.disableBlend(); -// GlStateManager.popMatrix(); + GlStateManager.popMatrix(); } GlStateManager.popMatrix(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index a01115eeb..8a70b46af 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -15,12 +15,12 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -38,6 +38,9 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.AltarLiquidState; +import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileAltar; @@ -63,6 +66,48 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { setBlockBounds(f, f, f, 1F - f, 1F / 16F * 20F, 1F - f); random = new Random(); + + setDefaultState(blockState.getBaseState() + .withProperty(BotaniaStateProps.MOSSY, false) + .withProperty(BotaniaStateProps.ALTAR_LIQUID_STATE, AltarLiquidState.NONE) + .withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.DEFAULT) + ); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.ALTAR_LIQUID_STATE, BotaniaStateProps.ALTAR_VARIANT, BotaniaStateProps.MOSSY); + } + + @Override + public int getMetaFromState(IBlockState state) { + return state.getValue(BotaniaStateProps.ALTAR_VARIANT).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta < 0 || meta >= AltarVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.values()[meta]); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) { + TileEntity te = worldIn.getTileEntity(pos); + if (te instanceof TileAltar) { + TileAltar altar = ((TileAltar) te); + if (altar.isMossy) { + state = state.withProperty(BotaniaStateProps.MOSSY, true); + } + if (altar.hasLava()) { + state = state.withProperty(BotaniaStateProps.ALTAR_LIQUID_STATE, AltarLiquidState.LAVA); + } + if (altar.hasWater()) { + state = state.withProperty(BotaniaStateProps.ALTAR_LIQUID_STATE, AltarLiquidState.WATER); + } + } + return state; } @Override @@ -214,11 +259,6 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { return false; } - @Override - public int getRenderType() { - return LibRenderIDs.idAltar; - } - @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileAltar(); diff --git a/src/main/resources/assets/botania/blockstates/altar.json b/src/main/resources/assets/botania/blockstates/altar.json new file mode 100644 index 000000000..5ccfbae44 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/altar.json @@ -0,0 +1,168 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:altar", + "textures": { + "gobletBase": "botania:model/altar/default/gobletBase", + "gobletBase2": "botania:model/altar/default/gobletBase2", + "gobletBase3": "botania:model/altar/default/gobletBase3", + "gobletStand": "botania:model/altar/default/gobletStand", + "kelkBase": "botania:model/altar/default/kelkBase", + "kelkBase2": "botania:model/altar/default/kelkBase2", + "kelkWallNorth": "botania:model/altar/default/kelkWallNS", + "kelkWallSouth": "botania:model/altar/default/kelkWallNS", + "kelkWallWest": "botania:model/altar/default/kelkWallWE", + "kelkWallEast": "botania:model/altar/default/kelkWallWE" + }, + "transform": "forge:default-block" + }, + "variants": { + "liquid": { + "none": {}, + "water": { + "submodel": { + "waterlayer": { + "model": "botania:altar_liquid", + "textures": { "liquid": "minecraft:blocks/water_still" } + } + } + }, + "lava": { + "submodel": { + "lavalayer": { + "model": "botania:altar_liquid", + "textures": { "liquid": "minecraft:blocks/lava_still" } + } + } + } + }, + "mossy": { + "true": { + "textures": { + "gobletBase": "botania:model/altar/mossy/gobletBase", + "gobletBase2": "botania:model/altar/mossy/gobletBase2", + "gobletBase3": "botania:model/altar/mossy/gobletBase3", + "gobletStand": "botania:model/altar/mossy/gobletStand", + "kelkBase": "botania:model/altar/mossy/kelkBase", + "kelkBase2": "botania:model/altar/mossy/kelkBase2", + "kelkWallNorth": "botania:model/altar/mossy/kelkWallNS", + "kelkWallSouth": "botania:model/altar/mossy/kelkWallNS", + "kelkWallWest": "botania:model/altar/mossy/kelkWallWE", + "kelkWallEast": "botania:model/altar/mossy/kelkWallWE" + } + }, + "false": {} + }, + "variant": { + "default": {}, + "forest": { "textures": { + "gobletBase": "botania:model/altar/forest/gobletBase", + "gobletBase2": "botania:model/altar/forest/gobletBase2", + "gobletBase3": "botania:model/altar/forest/gobletBase3", + "gobletStand": "botania:model/altar/forest/gobletStand", + "kelkBase": "botania:model/altar/forest/kelkBase", + "kelkBase2": "botania:model/altar/forest/kelkBase2", + "kelkWallNorth": "botania:model/altar/forest/kelkWallNS", + "kelkWallSouth": "botania:model/altar/forest/kelkWallNS", + "kelkWallWest": "botania:model/altar/forest/kelkWallWE", + "kelkWallEast": "botania:model/altar/forest/kelkWallWE" + }}, + "plains": { "textures": { + "gobletBase": "botania:model/altar/plains/gobletBase", + "gobletBase2": "botania:model/altar/plains/gobletBase2", + "gobletBase3": "botania:model/altar/plains/gobletBase3", + "gobletStand": "botania:model/altar/plains/gobletStand", + "kelkBase": "botania:model/altar/plains/kelkBase", + "kelkBase2": "botania:model/altar/plains/kelkBase2", + "kelkWallNorth": "botania:model/altar/plains/kelkWallNS", + "kelkWallSouth": "botania:model/altar/plains/kelkWallNS", + "kelkWallWest": "botania:model/altar/plains/kelkWallWE", + "kelkWallEast": "botania:model/altar/plains/kelkWallWE" + }}, + "mountain": { "textures": { + "gobletBase": "botania:model/altar/mountain/gobletBase", + "gobletBase2": "botania:model/altar/mountain/gobletBase2", + "gobletBase3": "botania:model/altar/mountain/gobletBase3", + "gobletStand": "botania:model/altar/mountain/gobletStand", + "kelkBase": "botania:model/altar/mountain/kelkBase", + "kelkBase2": "botania:model/altar/mountain/kelkBase2", + "kelkWallNorth": "botania:model/altar/mountain/kelkWallNS", + "kelkWallSouth": "botania:model/altar/mountain/kelkWallNS", + "kelkWallWest": "botania:model/altar/mountain/kelkWallWE", + "kelkWallEast": "botania:model/altar/mountain/kelkWallWE" + }}, + "fungal": { "textures": { + "gobletBase": "botania:model/altar/fungal/gobletBase", + "gobletBase2": "botania:model/altar/fungal/gobletBase2", + "gobletBase3": "botania:model/altar/fungal/gobletBase3", + "gobletStand": "botania:model/altar/fungal/gobletStand", + "kelkBase": "botania:model/altar/fungal/kelkBase", + "kelkBase2": "botania:model/altar/fungal/kelkBase2", + "kelkWallNorth": "botania:model/altar/fungal/kelkWallNS", + "kelkWallSouth": "botania:model/altar/fungal/kelkWallNS", + "kelkWallWest": "botania:model/altar/fungal/kelkWallWE", + "kelkWallEast": "botania:model/altar/fungal/kelkWallWE" + }}, + "swamp": { "textures": { + "gobletBase": "botania:model/altar/swamp/gobletBase", + "gobletBase2": "botania:model/altar/swamp/gobletBase2", + "gobletBase3": "botania:model/altar/swamp/gobletBase3", + "gobletStand": "botania:model/altar/swamp/gobletStand", + "kelkBase": "botania:model/altar/swamp/kelkBase", + "kelkBase2": "botania:model/altar/swamp/kelkBase2", + "kelkWallNorth": "botania:model/altar/swamp/kelkWallNS", + "kelkWallSouth": "botania:model/altar/swamp/kelkWallNS", + "kelkWallWest": "botania:model/altar/swamp/kelkWallWE", + "kelkWallEast": "botania:model/altar/swamp/kelkWallWE" + }}, + "desert": { "textures": { + "gobletBase": "botania:model/altar/desert/gobletBase", + "gobletBase2": "botania:model/altar/desert/gobletBase2", + "gobletBase3": "botania:model/altar/desert/gobletBase3", + "gobletStand": "botania:model/altar/desert/gobletStand", + "kelkBase": "botania:model/altar/desert/kelkBase", + "kelkBase2": "botania:model/altar/desert/kelkBase2", + "kelkWallNorth": "botania:model/altar/desert/kelkWallNS", + "kelkWallSouth": "botania:model/altar/desert/kelkWallNS", + "kelkWallWest": "botania:model/altar/desert/kelkWallWE", + "kelkWallEast": "botania:model/altar/desert/kelkWallWE" + }}, + "taiga": { "textures": { + "gobletBase": "botania:model/altar/taiga/gobletBase", + "gobletBase2": "botania:model/altar/taiga/gobletBase2", + "gobletBase3": "botania:model/altar/taiga/gobletBase3", + "gobletStand": "botania:model/altar/taiga/gobletStand", + "kelkBase": "botania:model/altar/taiga/kelkBase", + "kelkBase2": "botania:model/altar/taiga/kelkBase2", + "kelkWallNorth": "botania:model/altar/taiga/kelkWallNS", + "kelkWallSouth": "botania:model/altar/taiga/kelkWallNS", + "kelkWallWest": "botania:model/altar/taiga/kelkWallWE", + "kelkWallEast": "botania:model/altar/taiga/kelkWallWE" + }}, + "mesa": { "textures": { + "gobletBase": "botania:model/altar/mesa/gobletBase", + "gobletBase2": "botania:model/altar/mesa/gobletBase2", + "gobletBase3": "botania:model/altar/mesa/gobletBase3", + "gobletStand": "botania:model/altar/mesa/gobletStand", + "kelkBase": "botania:model/altar/mesa/kelkBase", + "kelkBase2": "botania:model/altar/mesa/kelkBase2", + "kelkWallNorth": "botania:model/altar/mesa/kelkWallNS", + "kelkWallSouth": "botania:model/altar/mesa/kelkWallNS", + "kelkWallWest": "botania:model/altar/mesa/kelkWallWE", + "kelkWallEast": "botania:model/altar/mesa/kelkWallWE" + }}, + "mossy": { "textures": { + "gobletBase": "botania:model/altar/mossy/gobletBase", + "gobletBase2": "botania:model/altar/mossy/gobletBase2", + "gobletBase3": "botania:model/altar/mossy/gobletBase3", + "gobletStand": "botania:model/altar/mossy/gobletStand", + "kelkBase": "botania:model/altar/mossy/kelkBase", + "kelkBase2": "botania:model/altar/mossy/kelkBase2", + "kelkWallNorth": "botania:model/altar/mossy/kelkWallNS", + "kelkWallSouth": "botania:model/altar/mossy/kelkWallNS", + "kelkWallWest": "botania:model/altar/mossy/kelkWallWE", + "kelkWallEast": "botania:model/altar/mossy/kelkWallWE" + }} + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altar.json b/src/main/resources/assets/botania/models/block/altar.json new file mode 100644 index 000000000..f62c1febb --- /dev/null +++ b/src/main/resources/assets/botania/models/block/altar.json @@ -0,0 +1,133 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "particle": "#gobletBase" + }, + "elements": [ + { + "name": "gobletBase", + "from": [ 0.0, 0.0, 0.0 ], + "to": [ 16.0, 2.0, 16.0 ], + "faces": { + "north": { "texture": "#gobletBase", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, + "east": { "texture": "#gobletBase", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, + "south": { "texture": "#gobletBase", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, + "west": { "texture": "#gobletBase", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, + "up": { "texture": "#gobletBase", "uv": [ 4, 0, 8, 4 ] }, + "down": { "texture": "#gobletBase", "uv": [ 8, 0, 12, 4 ], "cullface": "down" } + } + }, + { + "name": "gobletBase2", + "from": [ 1.0, 2.0, 1.0 ], + "to": [ 15.0, 3.0, 15.0 ], + "faces": { + "north": { "texture": "#gobletBase2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "east": { "texture": "#gobletBase2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "south": { "texture": "#gobletBase2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "west": { "texture": "#gobletBase2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "up": { "texture": "#gobletBase2", "uv": [ 0.0, 0.0, 14.0, 14.0 ] } + } + }, + { + "name": "gobletBase3", + "from": [ 2.0, 3.0, 2.0 ], + "to": [ 14.0, 4.0, 14.0 ], + "faces": { + "north": { "texture": "#gobletBase3", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, + "east": { "texture": "#gobletBase3", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, + "south": { "texture": "#gobletBase3", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, + "west": { "texture": "#gobletBase3", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, + "up": { "texture": "#gobletBase3", "uv": [ 0.0, 0.0, 12.0, 12.0 ] } + } + }, + { + "name": "gobletStand", + "from": [ 5.0, 4.0, 5.0 ], + "to": [ 11.0, 12.0, 11.0 ], + "faces": { + "north": { "texture": "#gobletStand", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, + "east": { "texture": "#gobletStand", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, + "south": { "texture": "#gobletStand", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, + "west": { "texture": "#gobletStand", "uv": [ 0.0, 0.0, 6.0, 8.0 ] } + } + }, + { + "name": "kelkBase", + "from": [ 4.0, 12.0, 4.0 ], + "to": [ 12.0, 13.0, 12.0 ], + "faces": { + "north": { "texture": "#kelkBase", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "east": { "texture": "#kelkBase", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "south": { "texture": "#kelkBase", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "west": { "texture": "#kelkBase", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, + "down": { "texture": "#kelkBase", "uv": [ 0.0, 0.0, 8.0, 8.0 ] } + } + }, + { + "name": "kelkBase2", + "from": [ 3.0, 13.0, 3.0 ], + "to": [ 13.0, 14.0, 13.0 ], + "faces": { + "north": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "east": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "south": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "west": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "up": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, + "down": { "texture": "#kelkBase2", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } + } + }, + { + "name": "kelkWallNorth", + "from": [ 3.0, 14.0, 2.0 ], + "to": [ 13.0, 20.0, 3.0 ], + "faces": { + "north": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "east": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "south": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "west": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "up": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "down": { "texture": "#kelkWallNorth", "uv": [ 0.0, 0.0, 10.0, 1.0 ] } + } + }, + { + "name": "kelkWallSouth", + "from": [ 3.0, 14.0, 13.0 ], + "to": [ 13.0, 20.0, 14.0 ], + "faces": { + "north": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "east": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "south": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "west": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "up": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, + "down": { "texture": "#kelkWallSouth", "uv": [ 0.0, 0.0, 10.0, 1.0 ] } + } + }, + { + "name": "kelkWallWest", + "from": [ 2.0, 14.0, 3.0 ], + "to": [ 3.0, 20.0, 13.0 ], + "faces": { + "north": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "east": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "south": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "west": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "up": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 1.0, 10.0 ] }, + "down": { "texture": "#kelkWallWest", "uv": [ 0.0, 0.0, 1.0, 10.0 ] } + } + }, + { + "name": "kelkWallEast", + "from": [ 13.0, 14.0, 3.0 ], + "to": [ 14.0, 20.0, 13.0 ], + "faces": { + "north": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "east": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "south": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, + "west": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, + "up": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 1.0, 10.0 ] }, + "down": { "texture": "#kelkWallEast", "uv": [ 0.0, 0.0, 1.0, 10.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/altar_liquid.json b/src/main/resources/assets/botania/models/block/altar_liquid.json new file mode 100644 index 000000000..0f6d658d3 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/altar_liquid.json @@ -0,0 +1,12 @@ +{ + "elements": [ + { + "name": "liquid", + "from": [ 3.0, 19.0, 3.0 ], + "to": [ 13.0, 19.0, 13.0 ], + "faces": { + "up": { "texture": "#liquid", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/model/altar/base/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/base/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/base/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/base/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/base/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/base/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/base/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/base/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/base/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/base/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/default/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/base/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/base/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/default/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/base/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/base/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/default/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/base/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/base/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/default/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/desert/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/desert/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/desert/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta5/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/desert/wtfisthis.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta5/wtfisthis.png rename to src/main/resources/assets/botania/textures/model/altar/desert/wtfisthis.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/forest/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/forest/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/forest/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta0/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/forest/wtfisthis.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta0/wtfisthis.png rename to src/main/resources/assets/botania/textures/model/altar/forest/wtfisthis.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta3/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/fungal/wtfisthis.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta3/wtfisthis.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/wtfisthis.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta7/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/mesa/wtfisthis.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta7/wtfisthis.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/wtfisthis.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta2/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/mountain/wtfisthis.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta2/wtfisthis.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/wtfisthis.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/plains/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/plains/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/plains/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta1/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/plains/wtfisthis.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta1/wtfisthis.png rename to src/main/resources/assets/botania/textures/model/altar/plains/wtfisthis.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta4/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/swamp/wtfisthis.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta4/wtfisthis.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/wtfisthis.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase2.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/gobletBase3.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/gobletStand.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/kelkBase.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/kelkBase2.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallNS.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/kelkWallNS.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallNS.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallWE.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/kelkWallWE.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallWE.png diff --git a/src/main/resources/assets/botania/textures/model/altar/meta6/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/taiga/wtfisthis.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/meta6/wtfisthis.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/wtfisthis.png diff --git a/temp.json b/temp.json deleted file mode 100644 index 0c912e884..000000000 --- a/temp.json +++ /dev/null @@ -1,150 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, - "elements": [ - { - "name": "gobletBase", - "from": [ 0.0, 0.0, 0.0 ], - "to": [ 16.0, 2.0, 16.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 2.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } - } - }, - { - "name": "gobletBase2", - "from": [ 1.0, 2.0, 1.0 ], - "to": [ 15.0, 3.0, 15.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 14.0, 14.0 ] } - } - }, - { - "name": "gobletBase3", - "from": [ 2.0, 3.0, 2.0 ], - "to": [ 14.0, 4.0, 14.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 12.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 12.0, 12.0 ] } - } - }, - { - "name": "gobletStand", - "from": [ 5.0, 4.0, 5.0 ], - "to": [ 11.0, 12.0, 11.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 8.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 6.0, 6.0 ] } - } - }, - { - "name": "kelkBase", - "from": [ 4.0, 12.0, 4.0 ], - "to": [ 12.0, 13.0, 12.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 8.0, 8.0 ] } - } - }, - { - "name": "kelkBase2", - "from": [ 3.0, 13.0, 3.0 ], - "to": [ 13.0, 14.0, 13.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } - } - }, - { - "name": "kelkWallNorth", - "from": [ 3.0, 14.0, 2.0 ], - "to": [ 13.0, 20.0, 3.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] } - } - }, - { - "name": "kelkWallSouth", - "from": [ 3.0, 14.0, 13.0 ], - "to": [ 13.0, 20.0, 14.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 1.0 ] } - } - }, - { - "name": "kelkWallWest", - "from": [ 2.0, 14.0, 3.0 ], - "to": [ 3.0, 20.0, 13.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 10.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 10.0 ] } - } - }, - { - "name": "kelkWallEast", - "from": [ 13.0, 14.0, 3.0 ], - "to": [ 14.0, 20.0, 13.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 6.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 6.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 10.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 1.0, 10.0 ] } - } - }, - { - "name": "liquid", - "from": [ 3.0, 19.0, 3.0 ], - "to": [ 13.0, 19.0, 13.0 ], - "faces": { - "north": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 0.0 ] }, - "east": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 0.0 ] }, - "south": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 0.0 ] }, - "west": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 0.0 ] }, - "up": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] }, - "down": { "texture": "#-1", "uv": [ 0.0, 0.0, 10.0, 10.0 ] } - } - } - ] -} \ No newline at end of file