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 bbcc942a1..24c7ef284 100644 Binary files a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase.png and b/src/main/resources/assets/botania/textures/model/altar/default/gobletBase.png differ