Done with apothecaries for today >.>

This commit is contained in:
Vincent Lee committed 2015-12-27 01:51:06 -06:00
1 parent b740a22684
commit 33a8d5e33c
90 files changed
+417 -181

No files matched your search

@@ -66,6 +66,11 @@ public class BotaniaStateProps {
// BlockAlfPortal
public static final PropertyEnum<AlfPortalState> ALFPORTAL_STATE = PropertyEnum.create("state", AlfPortalState.class);
// BlockAltar
public static final PropertyEnum<AltarLiquidState> ALTAR_LIQUID_STATE = PropertyEnum.create("liquid", AltarLiquidState.class);
public static final PropertyEnum<AltarVariant> ALTAR_VARIANT = PropertyEnum.create("variant", AltarVariant.class);
public static final PropertyBool MOSSY = PropertyBool.create("mossy");
// BlockAltGrass
public static final PropertyEnum<AltGrassVariant> ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class);
@@ -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);
}
}
@@ -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);
}
}
@@ -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 <T extends Enum<T> & IStringSerializable> void registerVariantsDefaulted(Block b, Class<T> enumclazz, String variantHeader) {
Item item = Item.getItemFromBlock(b);
for (T e : enumclazz.getEnumConstants()) {
@@ -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();
@@ -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();
@@ -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"
}}
}
}
}
@@ -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 ] }
}
}
]
}
@@ -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 ] }
}
}
]
}
File renamed without changes.

Before

Width:  |  Height:  |  Size: 798 B

After

Width:  |  Height:  |  Size: 798 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 696 B

After

Width:  |  Height:  |  Size: 696 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 632 B

After

Width:  |  Height:  |  Size: 632 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 468 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 471 B

After

Width:  |  Height:  |  Size: 471 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 726 B

After

Width:  |  Height:  |  Size: 726 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 402 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 402 B

After

Width:  |  Height:  |  Size: 402 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 733 B

After

Width:  |  Height:  |  Size: 733 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 664 B

After

Width:  |  Height:  |  Size: 664 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 591 B

After

Width:  |  Height:  |  Size: 591 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 449 B

After

Width:  |  Height:  |  Size: 449 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 412 B

After

Width:  |  Height:  |  Size: 412 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 617 B

After

Width:  |  Height:  |  Size: 617 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 387 B

After

Width:  |  Height:  |  Size: 387 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 387 B

After

Width:  |  Height:  |  Size: 387 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 787 B

After

Width:  |  Height:  |  Size: 787 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 687 B

After

Width:  |  Height:  |  Size: 687 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 612 B

After

Width:  |  Height:  |  Size: 612 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 546 B

After

Width:  |  Height:  |  Size: 546 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 411 B

After

Width:  |  Height:  |  Size: 411 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 387 B

After

Width:  |  Height:  |  Size: 387 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 578 B

After

Width:  |  Height:  |  Size: 578 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 625 B

After

Width:  |  Height:  |  Size: 625 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 689 B

After

Width:  |  Height:  |  Size: 689 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 625 B

After

Width:  |  Height:  |  Size: 625 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 557 B

After

Width:  |  Height:  |  Size: 557 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 420 B

After

Width:  |  Height:  |  Size: 420 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 389 B

After

Width:  |  Height:  |  Size: 389 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 578 B

After

Width:  |  Height:  |  Size: 578 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 366 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 626 B

After

Width:  |  Height:  |  Size: 626 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 694 B

After

Width:  |  Height:  |  Size: 694 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 632 B

After

Width:  |  Height:  |  Size: 632 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 581 B

After

Width:  |  Height:  |  Size: 581 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 422 B

After

Width:  |  Height:  |  Size: 422 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 403 B

After

Width:  |  Height:  |  Size: 403 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 593 B

After

Width:  |  Height:  |  Size: 593 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 372 B

After

Width:  |  Height:  |  Size: 372 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 372 B

After

Width:  |  Height:  |  Size: 372 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 667 B

After

Width:  |  Height:  |  Size: 667 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 670 B

After

Width:  |  Height:  |  Size: 670 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 603 B

After

Width:  |  Height:  |  Size: 603 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 541 B

After

Width:  |  Height:  |  Size: 541 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 413 B

After

Width:  |  Height:  |  Size: 413 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 376 B

After

Width:  |  Height:  |  Size: 376 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 568 B

After

Width:  |  Height:  |  Size: 568 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 358 B

After

Width:  |  Height:  |  Size: 358 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 358 B

After

Width:  |  Height:  |  Size: 358 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 607 B

After

Width:  |  Height:  |  Size: 607 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 684 B

After

Width:  |  Height:  |  Size: 684 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 611 B

After

Width:  |  Height:  |  Size: 611 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 545 B

After

Width:  |  Height:  |  Size: 545 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 414 B

After

Width:  |  Height:  |  Size: 414 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 387 B

After

Width:  |  Height:  |  Size: 387 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 575 B

After

Width:  |  Height:  |  Size: 575 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 364 B

After

Width:  |  Height:  |  Size: 364 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 364 B

After

Width:  |  Height:  |  Size: 364 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 499 B

After

Width:  |  Height:  |  Size: 499 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 653 B

After

Width:  |  Height:  |  Size: 653 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 595 B

After

Width:  |  Height:  |  Size: 595 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 527 B

After

Width:  |  Height:  |  Size: 527 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 400 B

After

Width:  |  Height:  |  Size: 400 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 374 B

After

Width:  |  Height:  |  Size: 374 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 555 B

After

Width:  |  Height:  |  Size: 555 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 347 B

After

Width:  |  Height:  |  Size: 347 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 347 B

After

Width:  |  Height:  |  Size: 347 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 633 B

After

Width:  |  Height:  |  Size: 633 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 745 B

After

Width:  |  Height:  |  Size: 745 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 666 B

After

Width:  |  Height:  |  Size: 666 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 596 B

After

Width:  |  Height:  |  Size: 596 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 453 B

After

Width:  |  Height:  |  Size: 453 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 413 B

After

Width:  |  Height:  |  Size: 413 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 629 B

After

Width:  |  Height:  |  Size: 629 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 395 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 395 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 757 B

After

Width:  |  Height:  |  Size: 757 B

-150
View File
@@ -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 ] }
}
}
]
}