From 65837fbf38f51ae63504f553f6f1a56d64ea641d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 27 Dec 2015 12:52:02 -0600 Subject: [PATCH] Punt on apothecary. Items first --- .../botania/api/state/BotaniaStateProps.java | 1 - .../api/state/enums/AltarLiquidState.java | 16 -------- .../client/core/handler/ModelHandler.java | 2 +- .../client/render/tile/RenderTileAltar.java | 35 +++++++++++++++--- .../botania/common/block/BlockAltar.java | 20 +++++----- .../{altar.json => altar_temp.json} | 19 ---------- .../botania/models/block/altar_liquid.json | 12 ------ .../model/altar/default/gobletBase.png | Bin 798 -> 932 bytes 8 files changed, 42 insertions(+), 63 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/state/enums/AltarLiquidState.java rename src/main/resources/assets/botania/blockstates/{altar.json => altar_temp.json} (94%) delete mode 100644 src/main/resources/assets/botania/models/block/altar_liquid.json diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index ea13625a2..9b7040041 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -67,7 +67,6 @@ public class BotaniaStateProps { 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"); diff --git a/src/main/java/vazkii/botania/api/state/enums/AltarLiquidState.java b/src/main/java/vazkii/botania/api/state/enums/AltarLiquidState.java deleted file mode 100644 index 78d7f8936..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/AltarLiquidState.java +++ /dev/null @@ -1,16 +0,0 @@ -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/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index a7e1632b5..79663328e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -639,7 +639,7 @@ public final class ModelHandler { 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(); + String variantName = "mossy=false,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 541185828..97fe55f40 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -28,6 +28,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -62,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(); @@ -130,6 +132,28 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); } } + + + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + Fluid fluid = lava ? FluidRegistry.LAVA : FluidRegistry.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, fluid.getStill(), 16, 16, brightness); + if(lava) + GlStateManager.enableLighting(); + GlStateManager.enableAlpha(); + GlStateManager.disableBlend(); GlStateManager.popMatrix(); } GlStateManager.popMatrix(); @@ -137,11 +161,12 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { forceMeta = -1; } - public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { + public void renderIcon(int par1, int par2, ResourceLocation loc, int par4, int par5, int brightness) { + TextureAtlasSprite par3Icon = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(loc.toString()); Tessellator tessellator = Tessellator.getInstance(); tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - if(brightness != -1) - //tessellator.getWorldRenderer().setBrightness(brightness); + //if(brightness != -1) + //tessellator.getWorldRenderer().putBrightness4(brightness, brightness, brightness, brightness); tessellator.getWorldRenderer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).endVertex(); tessellator.getWorldRenderer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).endVertex(); tessellator.getWorldRenderer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).endVertex(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 8a70b46af..48a74775a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -28,6 +28,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -39,7 +40,6 @@ 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; @@ -69,14 +69,13 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { 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); + return new BlockState(this, BotaniaStateProps.ALTAR_VARIANT, BotaniaStateProps.MOSSY); } @Override @@ -97,19 +96,19 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { 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 + public int getRenderType() { + return 2; + } + @Override protected boolean shouldRegisterInNameSet() { return false; @@ -171,6 +170,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { tile.setWater(true); par1World.updateComparatorOutputLevel(pos, this); + par1World.checkLight(pos); } return true; @@ -181,6 +181,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { tile.setLava(true); tile.setWater(false); par1World.updateComparatorOutputLevel(pos, this); + par1World.checkLight(pos); return true; } else if(stack != null && stack.getItem() == Items.bucket && (tile.hasWater || tile.hasLava) && !Botania.gardenOfGlassLoaded) { @@ -197,6 +198,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { tile.setLava(false); else tile.setWater(false); par1World.updateComparatorOutputLevel(pos, this); + par1World.checkLight(pos); return true; } diff --git a/src/main/resources/assets/botania/blockstates/altar.json b/src/main/resources/assets/botania/blockstates/altar_temp.json similarity index 94% rename from src/main/resources/assets/botania/blockstates/altar.json rename to src/main/resources/assets/botania/blockstates/altar_temp.json index 5ccfbae44..172fe66d2 100644 --- a/src/main/resources/assets/botania/blockstates/altar.json +++ b/src/main/resources/assets/botania/blockstates/altar_temp.json @@ -17,25 +17,6 @@ "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": { diff --git a/src/main/resources/assets/botania/models/block/altar_liquid.json b/src/main/resources/assets/botania/models/block/altar_liquid.json deleted file mode 100644 index 0f6d658d3..000000000 --- a/src/main/resources/assets/botania/models/block/altar_liquid.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "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/default/gobletBase.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase.png index bbcc942a1fa99b151affda6f4f28a8d32fb4f0ac..24c7ef284b3a9952dbc6dafac3d7338c741c7f47 100644 GIT binary patch delta 923 zcmbQowuF6xc)bG$8v_Hws?5TBK#HZ<$uool2x>S|Iv5z3qdi?5Ln`LHz3%P*%17q- z$M;(tw67QWGU&UDI2XJ=7yi8aL#gDQ83N8Kaou-TUYZtn?$C{=n^V&0KMNB(dV^^=OLm|^P8@ZAf3Y4Yu~MCX-uro~XMW@N@8v+J z?RziWrnvIT^$CswDxsH3=f@{Y_@W`Sbohm#3UNJt>ayZl3whg;8tWw%@K-XWbowM zw`m$(5qi^)6#D2*cfS5r{^aRN^B9g77Q{}E(L0`DqQud(zA;#{N#TG2&#J3h<>loS z^W3fGs&O#&_4Q?Jjk;7Bc_})GvD%d9g3 z8Y=u@ulwq&TBn~*nm%3pk%d~9lGjq9!w)BTEp=LaQK2u{=kk*$Pgsr@uDF_Y=l*@~ zr~f-SSA?zJvv1#~sI?uBXIS(_uD`zJb}ld+C!b`wY;yDV?ZdzjNo$#n-E9YFsXx@G81oifIve rQ)d0I^>O{LsIEmC_|d8VSMx>sjpD?woVcY6%zX@=u6{1-oD!M<^w`L; delta 788 zcmZ3&K96mJc)bD#8v_HwqPcY~K#H+A$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBK4*bP zWHAE+-(e7DJf6QI1t=&{;u=vBoS#-wo>-L1P>`6JSE84fTB2a0XP{^HrziP70|QgP zr;B4qhV#?uvEHv71&;lWyX0=rb>-A`C$F_N^`38)6rH)hI_(WublUEfOx@u=kvEny zF-gs`6$Sr|`RpDWZ{GdCIiR|}e)`)o?ax1B+72(Yv9a;k8+Sdu`yun1<(F3;6YFl> zvuDqneVg<5EfzfQws_*CriA_Xr_Y`(tvS`pNP_1`(&LX2kI$b!|LNB+t-W#nYLh#~ zgl4_ZIAR=J&s20bFZ|s3^GhRiUTr?g(0b?Y-OPz1&FgRGyn~wO(|I*Zb*h&uS8G$# z)}spCKY#zOzL{ed#c+O0O$Nw9h18aSa|MNk8-qI~KJSjvyUKooapBKCH=EZbR$lL3 zzVz&zdO9_Rw|DRy$=*6EWOZof z)~KTD>eZ|*&#a|Bo)Jkr?q)cJahqFWS5mRHrRBw+%Z{%7aiPXtd0y?@K!!+<;Suqf{UqC4k!F1AXV0X~H+{Mv$^5_dXp64av(J@t^SNBV zg7x3*so%GE@5?z(2GdV#dIonMVrVVwT&NHwKh^m&Shtt-=4R)4VXnHtoL|>m= zd*z0&zRCTI9qDF^=UhDV{N~M>Vh5M6bh*Qo;LEt}U@OSQJWdRowyfQ1AboZJyU#fV zHEm#Tq)oZ`MEBjNPoMV3XKC1gjhK+^R=r|2zrO1qQ1p-PUuKs}ZP#ZC z?KwB)LFqD<^~S0db2SgX_Th|6_xfNJ+=M3e(t+d%;4$j=d#Wz Gp$P!DIC+Ku