diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 975a10166..f9c02ca6c 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -69,7 +69,6 @@ public class BotaniaStateProps { // BlockAltar 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/AltarVariant.java b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java index 659d8436a..329ac2949 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java @@ -13,7 +13,8 @@ public enum AltarVariant implements IStringSerializable { SWAMP, DESERT, TAIGA, - MESA; + MESA, + MOSSY; @Override public String getName() { 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 f3a2d6081..b62d05d50 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -824,8 +824,8 @@ 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 = "mossy=false,variant=" + AltarVariant.values()[i].getName(); + for (int i = 0; i < AltarVariant.values().length - 1; i++) { // Off by one on purpose to exclude MOSSY + String variantName = "variant=" + AltarVariant.values()[i].getName(); ModelLoader.registerItemVariants(item, new ModelResourceLocation(name, variantName)); ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(name, variantName)); } 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 97fe55f40..03a0a085c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -64,11 +64,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(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 352c9cf08..7575d9e59 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -68,14 +68,13 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { random = new Random(); setDefaultState(blockState.getBaseState() - .withProperty(BotaniaStateProps.MOSSY, false) .withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.DEFAULT) ); } @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.ALTAR_VARIANT, BotaniaStateProps.MOSSY); + return new BlockState(this, BotaniaStateProps.ALTAR_VARIANT); } @Override @@ -85,9 +84,10 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { @Override public IBlockState getStateFromMeta(int meta) { - if (meta < 0 || meta >= AltarVariant.values().length) { + if (meta < 0 || meta >= AltarVariant.values().length ) { meta = 0; } + System.out.println(AltarVariant.values()[meta]); return getDefaultState().withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.values()[meta]); } @@ -98,15 +98,15 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { TileAltar altar = ((TileAltar) te); if (altar.isMossy) { - state = state.withProperty(BotaniaStateProps.MOSSY, true); + state = state.withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.MOSSY); } } return state; } @Override - public int getRenderType() { - return 2; + public EnumWorldBlockLayer getBlockLayer() { + return EnumWorldBlockLayer.CUTOUT; } @Override @@ -145,7 +145,6 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumFacing par6, float par7, float par8, float par9) { ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); TileAltar tile = (TileAltar) par1World.getTileEntity(pos); - if(par5EntityPlayer.isSneaking()) { for(int i = tile.getSizeInventory() - 1; i >= 0; i--) { ItemStack stackAt = tile.getStackInSlot(i); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index ab001f87c..65d480123 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -68,13 +68,17 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I return false; if(!isMossy && getBlockMetadata() == 0) { - if(stack.getItem() == Item.getItemFromBlock(Blocks.vine) && !worldObj.isRemote) { + if(stack.getItem() == Item.getItemFromBlock(Blocks.vine)) { isMossy = true; - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); - stack.stackSize--; - if(stack.stackSize == 0) - item.setDead(); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + if (worldObj.isRemote) { + worldObj.markBlockRangeForRenderUpdate(getPos(), getPos()); + } else { + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + stack.stackSize--; + if(stack.stackSize == 0) + item.setDead(); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + } } } 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..20c72391a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/altar.json @@ -0,0 +1,51 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:altar", + "transform": "forge:default-block" + }, + "variants": { + "variant": { + "default": { "textures": { + "all": "botania:model/altar", + "particle": "minecraft:blocks/cobblestone" + }}, + "forest": { "textures": { + "all": "botania:model/altarMeta0", + "particle": "botania:blocks/biomeStone0" + }}, + "plains": { "textures": { + "all": "botania:model/altarMeta1", + "particle": "botania:blocks/biomeStone1" + }}, + "mountain": { "textures": { + "all": "botania:model/altarMeta2", + "particle": "botania:blocks/biomeStone2" + }}, + "fungal": { "textures": { + "all": "botania:model/altarMeta3", + "particle": "botania:blocks/biomeStone3" + }}, + "swamp": { "textures": { + "all": "botania:model/altarMeta4", + "particle": "botania:blocks/biomeStone4" + }}, + "desert": { "textures": { + "all": "botania:model/altarMeta5", + "particle": "botania:blocks/biomeStone5" + }}, + "taiga": { "textures": { + "all": "botania:model/altarMeta6", + "particle": "botania:blocks/biomeStone6" + }}, + "mesa": { "textures": { + "all": "botania:model/altarMeta7", + "particle": "botania:blocks/biomeStone7" + }}, + "mossy": { "textures": { + "all": "botania:model/altarMossy", + "particle": "minecraft:blocks/cobblestone" + }} + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/altar_temp.json b/src/main/resources/assets/botania/blockstates/altar_temp.json deleted file mode 100644 index 172fe66d2..000000000 --- a/src/main/resources/assets/botania/blockstates/altar_temp.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "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": { - "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 index f62c1febb..b074823d7 100644 --- a/src/main/resources/assets/botania/models/block/altar.json +++ b/src/main/resources/assets/botania/models/block/altar.json @@ -1,20 +1,17 @@ { "__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" } + "west": { "texture": "#all", "uv": [ 0.0, 2.0, 2.0, 2.25 ] }, + "south": { "texture": "#all", "uv": [ 2.0, 2.0, 4.0, 2.25 ] }, + "east": { "texture": "#all", "uv": [ 4.0, 2.0, 6.0, 2.25 ] }, + "north": { "texture": "#all", "uv": [ 6.0, 2.0, 8.0, 2.25 ] }, + "up": { "texture": "#all", "uv": [ 2.0, 0, 4.0, 2.0 ] }, + "down": { "texture": "#all", "uv": [ 4.0, 0, 6.0, 2.0 ], "cullface": "down" } } }, { @@ -22,11 +19,11 @@ "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 ] } + "west": { "texture": "#all", "uv": [ 0.0, 4.0, 1.75, 4.125 ] }, + "south": { "texture": "#all", "uv": [ 1.75, 4.0, 3.5, 4.125 ] }, + "east": { "texture": "#all", "uv": [ 3.5, 4.0, 5.25, 4.125 ] }, + "north": { "texture": "#all", "uv": [ 5.25, 4.0, 7.0, 4.125 ] }, + "up": { "texture": "#all", "uv": [ 1.75, 2.25, 3.5, 4.0 ] } } }, { @@ -34,11 +31,11 @@ "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 ] } + "west": { "texture": "#all", "uv": [ 0.0, 5.625, 1.5, 5.75 ] }, + "south": { "texture": "#all", "uv": [ 1.5, 5.625, 3.0, 5.75 ] }, + "east": { "texture": "#all", "uv": [ 3.0, 5.625, 4.5, 5.75 ] }, + "north": { "texture": "#all", "uv": [ 4.5, 5.625, 6.0, 5.75 ] }, + "up": { "texture": "#all", "uv": [ 1.5, 4.125, 3.0, 5.625 ] } } }, { @@ -46,10 +43,10 @@ "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 ] } + "west": { "texture": "#all", "uv": [ 8.5, 0.75, 9.25, 1.75 ] }, + "south": { "texture": "#all", "uv": [ 9.25, 0.75, 10.0, 1.75 ] }, + "east": { "texture": "#all", "uv": [ 10.0, 0.75, 10.75, 1.75 ] }, + "north": { "texture": "#all", "uv": [ 10.75, 0.75, 11.5, 1.75 ] } } }, { @@ -57,11 +54,11 @@ "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 ] } + "west": { "texture": "#all", "uv": [ 9.0, 6.625, 10.0, 6.75 ] }, + "south": { "texture": "#all", "uv": [ 10.0, 6.625, 11.0, 6.75 ] }, + "east": { "texture": "#all", "uv": [ 11.0, 6.625, 12.0, 6.75 ] }, + "north": { "texture": "#all", "uv": [ 12.0, 6.625, 13.0, 6.75 ] }, + "down": { "texture": "#all", "uv": [ 11.0, 5.625, 12.0, 6.625 ] } } }, { @@ -69,12 +66,12 @@ "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 ] } + "west": { "texture": "#all", "uv": [ 9.0, 5.5, 10.25, 5.625 ] }, + "south": { "texture": "#all", "uv": [ 10.25, 5.5, 11.5, 5.625 ] }, + "east": { "texture": "#all", "uv": [ 11.5, 5.5, 12.75, 5.625 ] }, + "north": { "texture": "#all", "uv": [ 12.75, 5.5, 14.0, 5.625 ] }, + "up": { "texture": "#all", "uv": [ 10.25, 4.25, 11.5, 5.5 ] }, + "down": { "texture": "#all", "uv": [ 11.5, 4.25, 12.75, 5.5 ] } } }, { @@ -82,12 +79,12 @@ "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 ] } + "west": { "texture": "#all", "uv": [ 11.75, 2.375, 11.875, 3.125 ] }, + "north": { "texture": "#all", "uv": [ 11.875, 2.375, 13.125, 3.125 ] }, + "south": { "texture": "#all", "uv": [ 13.125, 2.375, 14.375, 3.125 ] }, + "east": { "texture": "#all", "uv": [ 14.375, 2.375, 14.5, 3.125 ] }, + "up": { "texture": "#all", "uv": [ 11.875, 2.25, 13.125, 2.375 ] }, + "down": { "texture": "#all", "uv": [ 13.125, 2.25, 14.375, 2.375 ] } } }, { @@ -95,12 +92,12 @@ "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 ] } + "west": { "texture": "#all", "uv": [ 11.75, 2.375, 11.875, 3.125] }, + "north": { "texture": "#all", "uv": [ 11.875, 2.375, 13.125, 3.125 ] }, + "south": { "texture": "#all", "uv": [ 13.125, 2.375, 14.375, 3.125 ] }, + "east": { "texture": "#all", "uv": [ 14.375, 2.375, 14.5, 3.125 ] }, + "up": { "texture": "#all", "uv": [ 11.875, 2.25, 13.125, 2.375 ] }, + "down": { "texture": "#all", "uv": [ 13.125, 2.25, 14.375, 2.375 ] } } }, { @@ -108,12 +105,12 @@ "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 ] } + "west": { "texture": "#all", "uv": [ 9.0, 3.5, 10.25, 4.25 ] }, + "south": { "texture": "#all", "uv": [ 10.25, 3.5, 10.375, 4.25 ] }, + "north": { "texture": "#all", "uv": [ 10.375, 3.5, 10.5, 4.25 ] }, + "east": { "texture": "#all", "uv": [ 10.5, 3.5, 11.75, 4.25 ] }, + "up": { "texture": "#all", "uv": [ 10.25, 2.125, 10.375, 3.5 ] }, + "down": { "texture": "#all", "uv": [ 10.375, 2.125, 10.5, 3.5 ] } } }, { @@ -121,12 +118,12 @@ "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 ] } + "west": { "texture": "#all", "uv": [ 9.0, 3.5, 10.25, 4.25 ] }, + "south": { "texture": "#all", "uv": [ 10.25, 3.5, 10.375, 4.25 ] }, + "north": { "texture": "#all", "uv": [ 10.375, 3.5, 10.5, 4.25 ] }, + "east": { "texture": "#all", "uv": [ 10.5, 3.5, 11.75, 4.25 ] }, + "up": { "texture": "#all", "uv": [ 10.25, 2.125, 10.375, 3.5 ] }, + "down": { "texture": "#all", "uv": [ 10.375, 2.125, 10.5, 3.5 ] } } } ] diff --git a/src/main/resources/assets/botania/textures/model/altar.png b/src/main/resources/assets/botania/textures/model/altar.png index 45d22bdd6..8b5a0a406 100644 Binary files a/src/main/resources/assets/botania/textures/model/altar.png and b/src/main/resources/assets/botania/textures/model/altar.png differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase.png deleted file mode 100644 index 24c7ef284..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2.png deleted file mode 100644 index 6b09c1aad..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3.png deleted file mode 100644 index 4762be540..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletStand.png deleted file mode 100644 index a3cdcfcb4..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/gobletStand.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase.png deleted file mode 100644 index 2cd2e9516..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2.png deleted file mode 100644 index a1c645f0c..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkWallNS.png deleted file mode 100644 index f64010f79..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/kelkWallNS.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkWallWE.png deleted file mode 100644 index f64010f79..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/kelkWallWE.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase.png deleted file mode 100644 index 26113d880..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2.png deleted file mode 100644 index 8dc2bb776..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3.png deleted file mode 100644 index bbd3172f8..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletStand.png deleted file mode 100644 index a834c6a89..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/gobletStand.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkBase.png deleted file mode 100644 index b6637d973..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/kelkBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2.png deleted file mode 100644 index 72e557271..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkWallNS.png deleted file mode 100644 index 90a772fd4..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/kelkWallNS.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkWallWE.png deleted file mode 100644 index 90a772fd4..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/kelkWallWE.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/desert/wtfisthis.png deleted file mode 100644 index a618aed5f..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/desert/wtfisthis.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase.png deleted file mode 100644 index 95f00c3c8..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2.png deleted file mode 100644 index a49444271..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3.png deleted file mode 100644 index 6e86876ef..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletStand.png deleted file mode 100644 index eb30580f6..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/gobletStand.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase.png deleted file mode 100644 index 5ed5b4e79..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2.png deleted file mode 100644 index d7aac80a7..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkWallNS.png deleted file mode 100644 index 596503278..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/kelkWallNS.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkWallWE.png deleted file mode 100644 index 596503278..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/kelkWallWE.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/forest/wtfisthis.png deleted file mode 100644 index 2c4ef9f10..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/forest/wtfisthis.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase.png deleted file mode 100644 index 1d37ae3c7..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2.png deleted file mode 100644 index ff7724cfa..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3.png deleted file mode 100644 index 4406a0e91..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand.png deleted file mode 100644 index 5e3927cb4..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase.png deleted file mode 100644 index c9f911570..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2.png deleted file mode 100644 index 72c5bd64e..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallNS.png deleted file mode 100644 index 5a1118d74..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallNS.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallWE.png deleted file mode 100644 index 5a1118d74..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkWallWE.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/fungal/wtfisthis.png deleted file mode 100644 index 611207c33..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/fungal/wtfisthis.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase.png deleted file mode 100644 index e5ccab632..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2.png deleted file mode 100644 index c28beeccd..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3.png deleted file mode 100644 index d9584c5ec..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand.png deleted file mode 100644 index c7704b01c..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase.png deleted file mode 100644 index d302e0afc..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2.png deleted file mode 100644 index a67bfe2b2..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallNS.png deleted file mode 100644 index ca2a3e721..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallNS.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallWE.png deleted file mode 100644 index ca2a3e721..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkWallWE.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/mesa/wtfisthis.png deleted file mode 100644 index 8b9e32156..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mesa/wtfisthis.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase.png deleted file mode 100644 index 2fcf2599d..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase2.png deleted file mode 100644 index d863aad7a..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3.png deleted file mode 100644 index e174532b2..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletStand.png deleted file mode 100644 index 460df3059..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletStand.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase.png deleted file mode 100644 index 2cd2e9516..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2.png deleted file mode 100644 index 771416348..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallNS.png deleted file mode 100644 index d629c395f..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallNS.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallWE.png deleted file mode 100644 index d629c395f..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkWallWE.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase.png deleted file mode 100644 index ff3365d30..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2.png deleted file mode 100644 index 2042cdcd1..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3.png deleted file mode 100644 index 32c79728c..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletStand.png deleted file mode 100644 index bcbc97591..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletStand.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase.png deleted file mode 100644 index 85fb1ccb1..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2.png deleted file mode 100644 index a26c7061b..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallNS.png deleted file mode 100644 index 20800218e..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallNS.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallWE.png deleted file mode 100644 index 20800218e..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkWallWE.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/mountain/wtfisthis.png deleted file mode 100644 index 376d11e63..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/mountain/wtfisthis.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase.png deleted file mode 100644 index 142ddd894..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2.png deleted file mode 100644 index e0857697c..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3.png deleted file mode 100644 index 67a377447..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletStand.png deleted file mode 100644 index b559727b9..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/gobletStand.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase.png deleted file mode 100644 index 0112b4731..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2.png deleted file mode 100644 index 312e38df9..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkWallNS.png deleted file mode 100644 index 26a6a6c85..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/kelkWallNS.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkWallWE.png deleted file mode 100644 index 26a6a6c85..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/kelkWallWE.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/plains/wtfisthis.png deleted file mode 100644 index c353e4d06..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/plains/wtfisthis.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase.png deleted file mode 100644 index be304e1e1..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2.png deleted file mode 100644 index 70cf94e1a..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3.png deleted file mode 100644 index 803396d68..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletStand.png deleted file mode 100644 index 218000f3c..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletStand.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase.png deleted file mode 100644 index ebe1f2b0c..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2.png deleted file mode 100644 index c83e38ea6..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallNS.png deleted file mode 100644 index 8880c23ed..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallNS.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallWE.png deleted file mode 100644 index 8880c23ed..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkWallWE.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/swamp/wtfisthis.png deleted file mode 100644 index bae696642..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/swamp/wtfisthis.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase.png deleted file mode 100644 index 1c2eaa399..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2.png deleted file mode 100644 index 3f719496d..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3.png deleted file mode 100644 index 876def1c2..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand.png deleted file mode 100644 index 2d215596d..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase.png deleted file mode 100644 index 9d4317f4d..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2.png deleted file mode 100644 index 4929a0d1b..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallNS.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallNS.png deleted file mode 100644 index 7ae6a0ea7..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallNS.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallWE.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallWE.png deleted file mode 100644 index 7ae6a0ea7..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkWallWE.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/wtfisthis.png b/src/main/resources/assets/botania/textures/model/altar/taiga/wtfisthis.png deleted file mode 100644 index f1a472592..000000000 Binary files a/src/main/resources/assets/botania/textures/model/altar/taiga/wtfisthis.png and /dev/null differ diff --git a/src/main/resources/assets/botania/textures/model/altarMeta0.png b/src/main/resources/assets/botania/textures/model/altarMeta0.png index 1e635f6fc..03f1bccd4 100644 Binary files a/src/main/resources/assets/botania/textures/model/altarMeta0.png and b/src/main/resources/assets/botania/textures/model/altarMeta0.png differ diff --git a/src/main/resources/assets/botania/textures/model/altarMeta1.png b/src/main/resources/assets/botania/textures/model/altarMeta1.png index bd8f9975d..717ef2305 100644 Binary files a/src/main/resources/assets/botania/textures/model/altarMeta1.png and b/src/main/resources/assets/botania/textures/model/altarMeta1.png differ diff --git a/src/main/resources/assets/botania/textures/model/altarMeta2.png b/src/main/resources/assets/botania/textures/model/altarMeta2.png index 4547abd77..66352777f 100644 Binary files a/src/main/resources/assets/botania/textures/model/altarMeta2.png and b/src/main/resources/assets/botania/textures/model/altarMeta2.png differ diff --git a/src/main/resources/assets/botania/textures/model/altarMeta3.png b/src/main/resources/assets/botania/textures/model/altarMeta3.png index 4ec0d7760..f3abecabe 100644 Binary files a/src/main/resources/assets/botania/textures/model/altarMeta3.png and b/src/main/resources/assets/botania/textures/model/altarMeta3.png differ diff --git a/src/main/resources/assets/botania/textures/model/altarMeta4.png b/src/main/resources/assets/botania/textures/model/altarMeta4.png index c9c53c2ec..883b2cc57 100644 Binary files a/src/main/resources/assets/botania/textures/model/altarMeta4.png and b/src/main/resources/assets/botania/textures/model/altarMeta4.png differ diff --git a/src/main/resources/assets/botania/textures/model/altarMeta5.png b/src/main/resources/assets/botania/textures/model/altarMeta5.png index 2a903a8a4..90b7d6834 100644 Binary files a/src/main/resources/assets/botania/textures/model/altarMeta5.png and b/src/main/resources/assets/botania/textures/model/altarMeta5.png differ diff --git a/src/main/resources/assets/botania/textures/model/altarMeta6.png b/src/main/resources/assets/botania/textures/model/altarMeta6.png index 1984a217a..3d3a9332e 100644 Binary files a/src/main/resources/assets/botania/textures/model/altarMeta6.png and b/src/main/resources/assets/botania/textures/model/altarMeta6.png differ diff --git a/src/main/resources/assets/botania/textures/model/altarMeta7.png b/src/main/resources/assets/botania/textures/model/altarMeta7.png index 8bf11260c..c00ead7ef 100644 Binary files a/src/main/resources/assets/botania/textures/model/altarMeta7.png and b/src/main/resources/assets/botania/textures/model/altarMeta7.png differ diff --git a/src/main/resources/assets/botania/textures/model/altarMossy.png b/src/main/resources/assets/botania/textures/model/altarMossy.png index fa3e649c4..3b77b8d6d 100644 Binary files a/src/main/resources/assets/botania/textures/model/altarMossy.png and b/src/main/resources/assets/botania/textures/model/altarMossy.png differ