From 56228446b885b2c2330acb49fb059bb0f75059e7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 22 Dec 2015 12:49:18 -0600 Subject: [PATCH] Stub out all rendering. Compiles and runsgit add -A --- MC18_notes.txt | 3 +- .../api/lexicon/multiblock/Multiblock.java | 6 +- .../core/handler/BaubleRenderHandler.java | 2 +- .../core/handler/BoundTileRenderer.java | 2 +- .../client/core/handler/HUDHandler.java | 2 +- .../client/core/proxy/ClientProxy.java | 2 +- .../render/entity/RenderBabylonWeapon.java | 2 +- .../render/entity/RenderCorporeaSpark.java | 7 +- .../client/render/entity/RenderPixie.java | 6 +- .../client/render/entity/RenderSpark.java | 11 +- .../client/render/entity/RenderSparkBase.java | 5 +- .../render/entity/RenderThornChakram.java | 5 +- .../render/tile/RenderTileAlfPortal.java | 13 +-- .../client/render/tile/RenderTileAltar.java | 15 +-- .../client/render/tile/RenderTileAvatar.java | 2 +- .../client/render/tile/RenderTileBrewery.java | 2 +- .../render/tile/RenderTileEnchanter.java | 13 +-- .../render/tile/RenderTileFloatingFlower.java | 2 +- .../render/tile/RenderTileIncensePlate.java | 2 +- .../render/tile/RenderTileLightRelay.java | 15 +-- .../client/render/tile/RenderTilePool.java | 13 +-- .../client/render/tile/RenderTilePrism.java | 2 +- .../render/tile/RenderTileRuneAltar.java | 2 +- .../render/tile/RenderTileSparkChanger.java | 2 +- .../render/tile/RenderTileStarfield.java | 100 +++++++++--------- .../render/tile/RenderTileTerraPlate.java | 13 +-- .../render/tile/RenderTileTinyPotato.java | 80 +++++++------- .../botania/common/block/BlockAvatar.java | 10 ++ .../common/block/BlockModDoubleFlower.java | 31 ++---- .../common/block/BlockModDoubleFlower1.java | 36 +++++++ .../common/block/BlockModDoubleFlower2.java | 37 +++++++ .../botania/common/block/BlockModFlower.java | 9 +- .../common/block/BlockSpecialFlower.java | 6 +- .../botania/common/block/BlockStorage.java | 19 ++++ .../botania/common/block/ModBlocks.java | 4 +- .../botania/common/block/ModFluffBlocks.java | 8 ++ .../common/block/decor/BlockShinyFlower.java | 19 ---- .../decor/biomestone/BlockBiomeStoneB.java | 2 +- .../block/decor/walls/Block18StoneWall.java | 6 +- .../decor/walls/BlockBiomeStoneWall.java | 6 +- .../block/decor/walls/BlockModWall.java | 13 ++- .../botania/common/block/mana/BlockPump.java | 16 +++ .../common/block/tile/TileEnchanter.java | 2 +- .../botania/common/item/ItemCraftingHalo.java | 2 + .../botania/common/item/ItemTwigWand.java | 2 +- .../armor/terrasteel/ItemTerrasteelHelm.java | 2 + .../equipment/bauble/ItemBaubleCosmetic.java | 2 + .../equipment/bauble/ItemBloodPendant.java | 4 +- .../item/equipment/bauble/ItemDivaCharm.java | 2 + .../equipment/bauble/ItemFlightTiara.java | 4 +- .../equipment/bauble/ItemGoldenLaurel.java | 2 + .../item/equipment/bauble/ItemIcePendant.java | 12 +-- .../item/equipment/bauble/ItemItemFinder.java | 10 +- .../equipment/bauble/ItemLavaPendant.java | 10 +- .../item/equipment/bauble/ItemMonocle.java | 2 + .../bauble/ItemSuperLavaPendant.java | 10 +- .../item/material/ItemManaResource.java | 4 +- 57 files changed, 374 insertions(+), 247 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java create mode 100644 src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java diff --git a/MC18_notes.txt b/MC18_notes.txt index fd1c58afa..33bb81bd5 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -27,4 +27,5 @@ sorry :/ The systems needed to dynamically switch out the textures like that is * For rendering arbitrary icons (that DO NOT HAVE AN ITEM) in a 3D style (manaResource icons, etc.) - Sub to texture stitch and bake our own model there to use? - This remains the largest portion of what is left - - Where is the method to render an arbitrary baked model? \ No newline at end of file + - Where is the method to render an arbitrary baked model? +* CRITICAL: All blockstates are done, but they appear to not be registered correctly (always have default variant)... is it the itemblock's fault?? \ No newline at end of file diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index 0f7669474..94ee3dd3a 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -29,9 +29,9 @@ public class Multiblock { public List components = new ArrayList(); public List materials = new ArrayList(); - public BlockPos minPos; - public BlockPos maxPos; - public BlockPos offPos; + public BlockPos minPos = BlockPos.ORIGIN; + public BlockPos maxPos = BlockPos.ORIGIN; + public BlockPos offPos = BlockPos.ORIGIN; public HashMap locationCache = new HashMap(); diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index e707f8455..fc1321474 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -126,7 +126,7 @@ public final class BaubleRenderHandler { int lightmapX = light % 65536; int lightmapY = light / 65536; OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); - Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 // for(int j = 0; j < 2; j++) { // IIcon icon = item.getIcon(stack, j); // float f = icon.getMinU(); diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 3439fe137..2f14b0c0c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -137,7 +137,7 @@ public final class BoundTileRenderer { renderBlockOutline(axis); GL11.glLineWidth(thickness + 3F); - GlStateManager.color((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); + GL11.glColor3ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue()); renderBlockOutline(axis); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index c9172dd6a..2ce1d396d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -102,7 +102,7 @@ public final class HUDHandler { profiler.startSection("botania-hud"); MovingObjectPosition pos = mc.objectMouseOver; - if(pos != null) { + if(pos != null && pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { Block block = mc.theWorld.getBlockState(pos.getBlockPos()).getBlock(); TileEntity tile = mc.theWorld.getTileEntity(pos.getBlockPos()); diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 270285700..422a17bc6 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -316,7 +316,7 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, new RenderPixie()); RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.vineBall, Minecraft.getMinecraft().getRenderItem())); RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, new RenderDoppleganger(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, new RenderSpark()); + RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, new RenderSpark(Minecraft.getMinecraft().getRenderManager())); RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, new RenderThornChakram(Minecraft.getMinecraft().getRenderManager())); RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, new RenderCorporeaSpark(Minecraft.getMinecraft().getRenderManager())); RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.manaResource, Minecraft.getMinecraft().getRenderItem())); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java index 6bccb9ae3..edd749e57 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -69,7 +69,7 @@ public class RenderBabylonWeapon extends Render { OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); GlStateManager.disableLighting(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); GlStateManager.disableCull(); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java index d1755ba5f..20323dfa6 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -24,6 +24,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; + import org.lwjgl.opengl.GL11; import vazkii.botania.common.entity.EntityCorporeaSpark; @@ -37,7 +38,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public TextureAtlasSprite getBaseIcon(EntityCorporeaSpark entity) { - return entity.isMaster() ? ItemCorporeaSpark.worldIconMaster : ItemCorporeaSpark.worldIcon; + return null;//entity.isMaster() ? ItemCorporeaSpark.worldIconMaster : ItemCorporeaSpark.worldIcon; } @Override @@ -52,11 +53,12 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public TextureAtlasSprite getSpinningIcon(EntityCorporeaSpark entity) { - return ItemCorporeaSpark.iconColorStar; + return null;//ItemCorporeaSpark.iconColorStar; } @Override public void renderCallback(EntityCorporeaSpark entity, float pticks) { +/* int time = entity.getItemDisplayTicks(); if(time == 0) return; @@ -108,6 +110,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { GlStateManager.disableBlend(); GlStateManager.popMatrix(); +*/ } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java index 14c6de07e..216fe9ff9 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -45,7 +45,7 @@ public class RenderPixie extends RenderLiving { public RenderPixie() { super(Minecraft.getMinecraft().getRenderManager(), new ModelPixie(), 0.25F); - setRenderPassModel(new ModelPixie()); + //setRenderPassModel(new ModelPixie()); shadowSize = 0.0F; } @@ -88,8 +88,8 @@ public class RenderPixie extends RenderLiving { } } - @Override + /*@Override protected int shouldRenderPass(EntityLivingBase par1EntityLivingBase, int par2, float par3) { return setPixieBrightness((EntityPixie)par1EntityLivingBase, par2, par3); - } + }*/ } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java index 36149c941..7da7e3c52 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java @@ -10,17 +10,22 @@ */ package vazkii.botania.client.render.entity; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.IIcon; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.item.ItemSparkUpgrade; public class RenderSpark extends RenderSparkBase { + public RenderSpark(RenderManager renderManager) { + super(renderManager); + } + @Override public TextureAtlasSprite getSpinningIcon(EntitySpark entity) { - int upgrade = entity.getUpgrade() - 1; - return upgrade >= 0 && upgrade < ItemSparkUpgrade.worldIcons.length ? ItemSparkUpgrade.worldIcons[upgrade] : null; + return null; + /*int upgrade = entity.getUpgrade() - 1; + return upgrade >= 0 && upgrade < ItemSparkUpgrade.worldIcons.length ? ItemSparkUpgrade.worldIcons[upgrade] : null;*/ } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index 6053e8cc9..8872392c2 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -20,7 +20,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -82,7 +81,7 @@ public class RenderSparkBase extends RenderEntity { } public TextureAtlasSprite getBaseIcon(T entity) { - return ItemSpark.worldIcon; + return null;//ItemSpark.worldIcon; } public void colorSpinningIcon(T entity, float a) { @@ -112,7 +111,7 @@ public class RenderSparkBase extends RenderEntity { float f6 = 0.25F; p_77026_1_.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL); - p_77026_1_.getWorldRenderer().setBrightness(240); + //p_77026_1_.getWorldRenderer().setBrightness(240); p_77026_1_.getWorldRenderer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); p_77026_1_.getWorldRenderer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); p_77026_1_.getWorldRenderer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java index 0033c0719..918ff8232 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -37,7 +36,7 @@ public class RenderThornChakram extends Render { @Override public void doRender(EntityThornChakram c, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { boolean fire = c.isFire(); - IIcon iicon = ModItems.thornChakram.getIconFromDamage(fire ? 1 : 0); + TextureAtlasSprite iicon = null;//ModItems.thornChakram.getIconFromDamage(fire ? 1 : 0); if(iicon != null) { GlStateManager.pushMatrix(); @@ -70,7 +69,7 @@ public class RenderThornChakram extends Render { GlStateManager.rotate(-renderManager.playerViewX, 1.0F, 0.0F, 0.0F); p_77026_1_.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); if(light != -1) - p_77026_1_.getWorldRenderer().setBrightness(light); + //p_77026_1_.getWorldRenderer().setBrightness(light); p_77026_1_.getWorldRenderer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); p_77026_1_.getWorldRenderer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); p_77026_1_.getWorldRenderer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java index 7ecdec696..f1934498a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -16,6 +16,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; @@ -70,12 +71,12 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer { public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.getWorldRenderer().setBrightness(brightness); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + //tessellator.getWorldRenderer().setBrightness(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(); + tessellator.getWorldRenderer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).endVertex(); tessellator.draw(); } 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 19e17fecf..6f707b3ad 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -21,6 +21,7 @@ import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -121,7 +122,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { ItemStack stack = altar.getStackInSlot(i); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 // IIcon icon = stack.getItem().getIcon(stack, 0); // if(icon != null) { // Color color = new Color(stack.getItem().getColorFromItemStack(stack, 0)); @@ -171,13 +172,13 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); if(brightness != -1) - tessellator.getWorldRenderer().setBrightness(brightness); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + //tessellator.getWorldRenderer().setBrightness(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(); + tessellator.getWorldRenderer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).endVertex(); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java index 0245fbc55..dee5f1fe7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -69,7 +69,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { GlStateManager.translate(-1.2F, -3.5F, -0.65F); GlStateManager.rotate(20F, 0F, 0F, 1F); - Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 // int renderPass = 0; // do { // IIcon icon = stack.getItem().getIcon(stack, renderPass); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index 7016e9bc2..155ff4d7f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -70,7 +70,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { float s = 0.25F; GlStateManager.scale(s, s, s); GlStateManager.scale(2F, 2F, 2F); - mc.getRenderItem().renderItemModel(stack); // todo 1.8 +// mc.getRenderItem().renderItemModel(stack); // todo 1.8 // if(!ForgeHooksClient.renderEntityItem(new EntityItem(brewery.getWorld(), brewery.xCoord, brewery.yCoord, brewery.zCoord, stack), stack, 0F, 0F, brewery.getWorld().rand, mc.renderEngine, RenderBlocks.getInstance(), 1)) { // GlStateManager.scale(0.5F, 0.5F, 0.5F); // if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java index 1ebe0d32d..f9ff5bb5f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -20,6 +20,7 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.TileEntity; @@ -111,12 +112,12 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer { public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.getWorldRenderer().setBrightness(brightness); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + //tessellator.getWorldRenderer().setBrightness(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(); + tessellator.getWorldRenderer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).endVertex(); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 2718419f9..75b43e950 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -59,7 +59,7 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { GlStateManager.popMatrix(); ItemStack stack = flower.getDisplayStack(); - Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 // IIcon icon = stack.getIconIndex(); // // Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 32df4e8d8..7e701257a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -67,7 +67,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer { GlStateManager.translate(0.1F, -1.46F, 0F); GlStateManager.scale(s, s, s); GlStateManager.rotate(180F, 0F, 1F, 0F); - Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 // int renderPass = 0; // do { // IIcon icon = stack.getItem().getIcon(stack, renderPass); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index 4ada1c7fe..f6d388395 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -17,6 +17,7 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; @@ -74,13 +75,13 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer { float f5 = 0.5F; float f6 = 0.25F; - p_77026_1_.getWorldRenderer().startDrawingQuads(); - p_77026_1_.getWorldRenderer().setNormal(0.0F, 1.0F, 0.0F); - p_77026_1_.getWorldRenderer().setBrightness(240); - p_77026_1_.getWorldRenderer().addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); - p_77026_1_.getWorldRenderer().addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); - p_77026_1_.getWorldRenderer().addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); - p_77026_1_.getWorldRenderer().addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); + p_77026_1_.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + p_77026_1_.getWorldRenderer().putNormal(0.0F, 1.0F, 0.0F); + //p_77026_1_.getWorldRenderer().setBrightness(240); + p_77026_1_.getWorldRenderer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).endVertex(); + p_77026_1_.getWorldRenderer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).endVertex(); + p_77026_1_.getWorldRenderer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).endVertex(); + p_77026_1_.getWorldRenderer().pos(0.0F - f5, f4 - f6, 0.0D).tex(f, f2).endVertex(); p_77026_1_.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 7fcb7ff2e..30c32c351 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -20,6 +20,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -154,12 +155,12 @@ public class RenderTilePool extends TileEntitySpecialRenderer { public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.getWorldRenderer().setBrightness(brightness); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + //tessellator.getWorldRenderer().setBrightness(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(); + tessellator.getWorldRenderer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).endVertex(); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java index 3d8c13c94..5baca290e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -21,7 +21,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.render.item.RenderLens; +//import vazkii.botania.client.render.item.RenderLens; import vazkii.botania.common.block.tile.mana.TilePrism; public class RenderTilePrism extends TileEntitySpecialRenderer { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java index 1b24e6560..05ffa4d13 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -72,7 +72,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.scale(2F, 2F, 2F); - mc.getRenderItem().renderItemModel(stack); +// mc.getRenderItem().renderItemModel(stack); // if(!ForgeHooksClient.renderEntityItem(new EntityItem(altar.getWorld(), altar.xCoord, altar.yCoord, altar.zCoord, stack), stack, 0F, 0F, altar.getWorld().rand, mc.renderEngine, renderBlocks, 1)) { // GlStateManager.scale(0.5F, 0.5F, 0.5F); // if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index f787800d1..338540d6e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -43,7 +43,7 @@ public class RenderTileSparkChanger extends TileEntitySpecialRenderer { GlStateManager.rotate(180F, 0F, 1F, 0F); int renderPass = 0; - Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 // do { // IIcon icon = stack.getItem().getIcon(stack, renderPass); // if(icon != null) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index a1bfe2528..580be7a9b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -17,6 +17,7 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityEndPortal; import net.minecraft.util.ResourceLocation; @@ -31,55 +32,55 @@ import org.lwjgl.opengl.GL11; // todo 1.8 copied directly from new class, so need to update to be what botania was. possibly json model for frame, tesr for starfield public class RenderTileStarfield extends TileEntitySpecialRenderer { - private static final ResourceLocation field_147529_c = new ResourceLocation("textures/environment/end_sky.png"); - private static final ResourceLocation field_147526_d = new ResourceLocation("textures/entity/end_portal.png"); + private static final ResourceLocation END_SKY_TEXTURE = new ResourceLocation("textures/environment/end_sky.png"); + private static final ResourceLocation END_PORTAL_TEXTURE = new ResourceLocation("textures/entity/end_portal.png"); private static final Random field_147527_e = new Random(31100L); FloatBuffer field_147528_b = GLAllocation.createDirectFloatBuffer(16); - @Override - public void renderTileEntityAt(TileEntity p_180544_1_, double p_180544_2_, double p_180544_4_, double p_180544_6_, float p_180544_8_, int p_180544_9_) { - float f1 = (float)this.rendererDispatcher.entityX; - float f2 = (float)this.rendererDispatcher.entityY; - float f3 = (float)this.rendererDispatcher.entityZ; + public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTicks, int destroyStage) + { + float f = (float)this.rendererDispatcher.entityX; + float f1 = (float)this.rendererDispatcher.entityY; + float f2 = (float)this.rendererDispatcher.entityZ; GlStateManager.disableLighting(); field_147527_e.setSeed(31100L); - float f4 = 0.75F; + float f3 = 0.75F; - for (int j = 0; j < 16; ++j) + for (int i = 0; i < 16; ++i) { GlStateManager.pushMatrix(); - float f5 = (float)(16 - j); - float f6 = 0.0625F; - float f7 = 1.0F / (f5 + 1.0F); + float f4 = (float)(16 - i); + float f5 = 0.0625F; + float f6 = 1.0F / (f4 + 1.0F); - if (j == 0) + if (i == 0) { - this.bindTexture(field_147529_c); - f7 = 0.1F; - f5 = 65.0F; - f6 = 0.125F; + this.bindTexture(END_SKY_TEXTURE); + f6 = 0.1F; + f4 = 65.0F; + f5 = 0.125F; GlStateManager.enableBlend(); GlStateManager.blendFunc(770, 771); } - if (j >= 1) + if (i >= 1) { - this.bindTexture(field_147526_d); + this.bindTexture(END_PORTAL_TEXTURE); } - if (j == 1) + if (i == 1) { GlStateManager.enableBlend(); GlStateManager.blendFunc(1, 1); - f6 = 0.5F; + f5 = 0.5F; } - float f8 = (float)(-(p_180544_4_ + (double)f4)); - float f9 = f8 + (float)ActiveRenderInfo.getPosition().yCoord; - float f10 = f8 + f5 + (float)ActiveRenderInfo.getPosition().yCoord; - float f11 = f9 / f10; - f11 += (float)(p_180544_4_ + (double)f4); - GlStateManager.translate(f1, f11, f3); + float f7 = (float)(-(y + (double)f3)); + float f8 = f7 + (float)ActiveRenderInfo.getPosition().yCoord; + float f9 = f7 + f4 + (float)ActiveRenderInfo.getPosition().yCoord; + float f10 = f8 / f9; + f10 = (float)(y + (double)f3) + f10; + GlStateManager.translate(f, f10, f2); GlStateManager.texGen(GlStateManager.TexGen.S, 9217); GlStateManager.texGen(GlStateManager.TexGen.T, 9217); GlStateManager.texGen(GlStateManager.TexGen.R, 9217); @@ -97,35 +98,33 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); GlStateManager.loadIdentity(); GlStateManager.translate(0.0F, (float)(Minecraft.getSystemTime() % 700000L) / 700000.0F, 0.0F); - GlStateManager.scale(f6, f6, f6); + GlStateManager.scale(f5, f5, f5); GlStateManager.translate(0.5F, 0.5F, 0.0F); - GlStateManager.rotate((float)(j * j * 4321 + j * 9) * 2.0F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate((float)(i * i * 4321 + i * 9) * 2.0F, 0.0F, 0.0F, 1.0F); GlStateManager.translate(-0.5F, -0.5F, 0.0F); - GlStateManager.translate(-f1, -f3, -f2); - f9 = f8 + (float)ActiveRenderInfo.getPosition().yCoord; - GlStateManager.translate((float)ActiveRenderInfo.getPosition().xCoord * f5 / f9, (float)ActiveRenderInfo.getPosition().zCoord * f5 / f9, -f2); + GlStateManager.translate(-f, -f2, -f1); + f8 = f7 + (float)ActiveRenderInfo.getPosition().yCoord; + GlStateManager.translate((float)ActiveRenderInfo.getPosition().xCoord * f4 / f8, (float)ActiveRenderInfo.getPosition().zCoord * f4 / f8, -f1); Tessellator tessellator = Tessellator.getInstance(); WorldRenderer worldrenderer = tessellator.getWorldRenderer(); - worldrenderer.startDrawingQuads(); - float f12 = field_147527_e.nextFloat() * 0.5F + 0.1F; - float f13 = field_147527_e.nextFloat() * 0.5F + 0.4F; - float f14 = field_147527_e.nextFloat() * 0.5F + 0.5F; + worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR); + float f11 = (field_147527_e.nextFloat() * 0.5F + 0.1F) * f6; + float f12 = (field_147527_e.nextFloat() * 0.5F + 0.4F) * f6; + float f13 = (field_147527_e.nextFloat() * 0.5F + 0.5F) * f6; - if (j == 0) + if (i == 0) { - f14 = 1.0F; - f13 = 1.0F; - f12 = 1.0F; + f11 = f12 = f13 = 1.0F * f6; } - worldrenderer.setColorRGBA_F(f12 * f7, f13 * f7, f14 * f7, 1.0F); - worldrenderer.addVertex(p_180544_2_, p_180544_4_ + (double)f4, p_180544_6_); - worldrenderer.addVertex(p_180544_2_, p_180544_4_ + (double)f4, p_180544_6_ + 1.0D); - worldrenderer.addVertex(p_180544_2_ + 1.0D, p_180544_4_ + (double)f4, p_180544_6_ + 1.0D); - worldrenderer.addVertex(p_180544_2_ + 1.0D, p_180544_4_ + (double)f4, p_180544_6_); + worldrenderer.pos(x, y + (double)f3, z).color(f11, f12, f13, 1.0F).endVertex(); + worldrenderer.pos(x, y + (double)f3, z + 1.0D).color(f11, f12, f13, 1.0F).endVertex(); + worldrenderer.pos(x + 1.0D, y + (double)f3, z + 1.0D).color(f11, f12, f13, 1.0F).endVertex(); + worldrenderer.pos(x + 1.0D, y + (double)f3, z).color(f11, f12, f13, 1.0F).endVertex(); tessellator.draw(); GlStateManager.popMatrix(); GlStateManager.matrixMode(5888); + this.bindTexture(END_SKY_TEXTURE); } GlStateManager.disableBlend(); @@ -136,10 +135,11 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer { GlStateManager.enableLighting(); } - private FloatBuffer func_147525_a(float p_147525_1_, float p_147525_2_, float p_147525_3_, float p_147525_4_) { - field_147528_b.clear(); - field_147528_b.put(p_147525_1_).put(p_147525_2_).put(p_147525_3_).put(p_147525_4_); - field_147528_b.flip(); - return field_147528_b; + private FloatBuffer func_147525_a(float p_147525_1_, float p_147525_2_, float p_147525_3_, float p_147525_4_) + { + this.field_147528_b.clear(); + this.field_147528_b.put(p_147525_1_).put(p_147525_2_).put(p_147525_3_).put(p_147525_4_); + this.field_147528_b.flip(); + return this.field_147528_b; } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java index 3efdb4d30..8e5c1ece4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -17,6 +17,7 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; @@ -69,12 +70,12 @@ public class RenderTileTerraPlate extends TileEntitySpecialRenderer { public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); - tessellator.getWorldRenderer().startDrawingQuads(); - tessellator.getWorldRenderer().setBrightness(brightness); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); - tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + //tessellator.getWorldRenderer().setBrightness(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(); + tessellator.getWorldRenderer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).endVertex(); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 31e9bc314..1d051bcdf 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -19,8 +19,10 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; @@ -151,12 +153,12 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - renderIcon(ModItems.cosmetic.getIconFromDamage(23)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(23)); } else if(name.equals("kamina")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.1F, -0.4F); - renderIcon(ModItems.cosmetic.getIconFromDamage(26)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(26)); } else if(name.equals("haighyorkie")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); @@ -167,33 +169,33 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -0.7F, 0.1F); - renderIcon(ModItems.cosmetic.getIconFromDamage(7)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(7)); } else if(name.equals("direwolf20")) { GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -2.2F, -0.5F); - renderIcon(ModItems.cosmetic.getIconFromDamage(0)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(0)); } else if(name.equals("doctor")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.15F, -0.4F); - renderIcon(ModItems.cosmetic.getIconFromDamage(25)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(25)); } else if(name.equals("snoo")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -0.7F, 0.1F); GlStateManager.rotate(20F, 0F, 0F, 1F); - renderIcon(ModItems.cosmetic.getIconFromDamage(24)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(24)); } else if(name.equals("charlotte")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - renderIcon(ModItems.cosmetic.getIconFromDamage(12)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(12)); } else if(name.equals("greg") || name.equals("gregorioust")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.5F, -0.4F); - renderIcon(Items.book.getIconFromDamage(0)); + //renderIcon(Items.book.getIconFromDamage(0)); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.translate(0.5F, 0.5F, 0F); @@ -205,48 +207,48 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - renderIcon(Items.bread.getIconFromDamage(0)); + //renderIcon(Items.bread.getIconFromDamage(0)); } else if(name.equals("martysgames") || name.equals("marty")) { GlStateManager.scale(0.7F, 0.7F, 0.7F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.75F, -2.4F, -0.7F); GlStateManager.rotate(10F, 0F, 0F, 1F); - renderIcon(ItemInfiniteFruit.dasBootIcon); + //renderIcon(ItemInfiniteFruit.dasBootIcon); } else if(name.equals("tromped")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - renderIcon(ModItems.cacophonium.getIconFromDamage(0)); + //renderIcon(ModItems.cacophonium.getIconFromDamage(0)); } else if(name.equals("kain vinosec")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.3F, -1.5F, -0.4F); - renderIcon(ModItems.recordGaia1.getIconFromDamage(0)); + //renderIcon(ModItems.recordGaia1.getIconFromDamage(0)); GlStateManager.translate(0F, 0F, 0.85F); - renderIcon(ModItems.recordGaia2.getIconFromDamage(0)); + //renderIcon(ModItems.recordGaia2.getIconFromDamage(0)); } else if(name.equals("mankrik")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -0.2F, -0.1F); - renderIcon(ModItems.cosmetic.getIconFromDamage(31)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(31)); } else if(name.equals("kurumi")) { GlStateManager.scale(0.4F, 0.4F, 0.4F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.9F, -2.5F, -1.3F); - renderIcon(ModItems.cosmetic.getIconFromDamage(17)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(17)); } else if(name.equals("ichun")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - renderIcon(ModItems.cosmetic.getIconFromDamage(15)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(15)); } else if(name.equals("wiiv") || name.equals("dylan4ever") || name.equals("dylankaiser")) { GlStateManager.scale(1.5F, 1.5F, 1.5F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.1F, -0.325F); - renderIcon(Items.painting.getIconFromDamage(0)); + //renderIcon(Items.painting.getIconFromDamage(0)); } else if(name.equals("jibril")) { GlStateManager.scale(1.5F, 1.5F, 1.5F); GlStateManager.translate(0F, 0.7F, 0F); @@ -269,13 +271,13 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1F, 0.45F); - renderIcon(ModItems.cosmetic.getIconFromDamage(8)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(8)); } else if(name.equals("etho") || name.equals("ethoslab")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.5F, -1.2F, -0.4F); - renderIcon(Items.cookie.getIconFromDamage(0)); + //renderIcon(Items.cookie.getIconFromDamage(0)); } else if(name.equals("sethbling")) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.scale(1.2F, 1.2F, 1.2F); @@ -286,39 +288,39 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-1F, -1.1F, -0.1F); - renderIcon(Items.stick.getIconFromDamage(0)); + //renderIcon(Items.stick.getIconFromDamage(0)); } else if(name.equals("kingdaddydmac")) { GlStateManager.scale(0.5F, 0.5F, 0.5F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.translate(-0.3F, -2.5F, 1.075F); - renderIcon(ModItems.manaRing.getIconFromDamage(0)); + //renderIcon(ModItems.manaRing.getIconFromDamage(0)); GlStateManager.translate(0F, 0F, -4F); - renderIcon(ModItems.manaRing.getIconFromDamage(0)); + //renderIcon(ModItems.manaRing.getIconFromDamage(0)); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.scale(1.5F, 1.5F, 1.5F); GlStateManager.translate(1.5F, -0.5F, 0.7F); - mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.cake.getDefaultState()); + mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.cake.getDefaultState(), 1.0F); } else if(name.equals("sjin")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -1.27F, -0.4F); - renderIcon(ModItems.cosmetic.getIconFromDamage(27)); + //renderIcon(ModItems.cosmetic.getIconFromDamage(27)); } else if(name.equals("martyn") || name.equals("inthelittlewood")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); GlStateManager.translate(-0.5F, -0.45F, -0.1F); mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); - renderIcon(Blocks.sapling.getIcon(0, 0)); + //renderIcon(Blocks.sapling.getIcon(0, 0)); }else if(ContributorFancinessHandler.flowerMap != null && ContributorFancinessHandler.flowerMap.containsKey(name)) { - IIcon icon = ContributorFancinessHandler.flowerMap.get(name); + ItemStack icon = ContributorFancinessHandler.flowerMap.get(name); if(icon != null) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.5F, -0.5F, 0F); ShaderHelper.useShader(ShaderHelper.gold); - renderIcon(icon); + //renderIcon(icon); ShaderHelper.releaseShader(); } } @@ -349,13 +351,12 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { OpenGlHelper.glBlendFunc(770, 771, 1, 0); Tessellator tessellator = Tessellator.getInstance(); GlStateManager.disableTexture2D(); - tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); int i = mc.fontRendererObj.getStringWidth(potato.name) / 2; - tessellator.getWorldRenderer().setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); - tessellator.getWorldRenderer().addVertex(-i - 1, -1.0D, 0.0D); - tessellator.getWorldRenderer().addVertex(-i - 1, 8.0D, 0.0D); - tessellator.getWorldRenderer().addVertex(i + 1, 8.0D, 0.0D); - tessellator.getWorldRenderer().addVertex(i + 1, -1.0D, 0.0D); + tessellator.getWorldRenderer().pos(-i - 1, -1.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); + tessellator.getWorldRenderer().pos(-i - 1, 8.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); + tessellator.getWorldRenderer().pos(i + 1, 8.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); + tessellator.getWorldRenderer().pos(i + 1, -1.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); tessellator.draw(); GlStateManager.enableTexture2D(); GlStateManager.depthMask(true); @@ -367,13 +368,12 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.enableBlend(); OpenGlHelper.glBlendFunc(770, 771, 1, 0); GlStateManager.disableTexture2D(); - tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); i = mc.fontRendererObj.getStringWidth(s) / 2; - tessellator.getWorldRenderer().setColorRGBA_F(0.0F, 0.0F, 0.0F, 0.25F); - tessellator.getWorldRenderer().addVertex(-i - 1, -1.0D, 0.0D); - tessellator.getWorldRenderer().addVertex(-i - 1, 8.0D, 0.0D); - tessellator.getWorldRenderer().addVertex(i + 1, 8.0D, 0.0D); - tessellator.getWorldRenderer().addVertex(i + 1, -1.0D, 0.0D); + tessellator.getWorldRenderer().pos(-i - 1, -1.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); + tessellator.getWorldRenderer().pos(-i - 1, 8.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); + tessellator.getWorldRenderer().pos(i + 1, 8.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); + tessellator.getWorldRenderer().pos(i + 1, -1.0D, 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex(); tessellator.draw(); GlStateManager.enableTexture2D(); GlStateManager.depthMask(true); @@ -395,6 +395,6 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 256df27fc..f7c8b86a8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -54,6 +54,16 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { return new BlockState(this, BotaniaStateProps.CARDINALS); } + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getIndex(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); + } + @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing s, float xs, float ys, float zs) { TileAvatar avatar = (TileAvatar) world.getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index ccd69a219..6148fe2b2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -50,14 +50,16 @@ import java.util.List; import java.util.Random; // Lots of copy paste from BlockDoublePlant because we can no longer extend it in 1.8.x -public class BlockModDoubleFlower extends BlockBush implements IGrowable, IShearable, ILexiconable { +public abstract class BlockModDoubleFlower extends BlockBush implements IGrowable, IShearable, ILexiconable { public static final PropertyEnum HALF = BlockDoublePlant.HALF; private static final int COUNT = 8; final int offset; + final boolean second; public BlockModDoubleFlower(boolean second) { super(Material.vine); + this.second = second; this.setHardness(0.0F); this.setStepSound(soundTypeGrass); offset = second ? 8 : 0; @@ -66,37 +68,16 @@ public class BlockModDoubleFlower extends BlockBush implements IGrowable, IShear setStepSound(soundTypeGrass); setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); - - if (second) { - setDefaultState(blockState.getBaseState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER)); - } else { - setDefaultState(blockState.getBaseState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE)); - } } @Override - public BlockState createBlockState() { - return new BlockState(this, offset == 8 ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, HALF); - } + public abstract BlockState createBlockState(); @Override - public int getMetaFromState(IBlockState state) { - int meta = ((EnumDyeColor) state.getValue(offset == 8 ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1)).getMetadata(); - meta -= offset; - if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { - meta |= 8; - } - return meta; - } + public abstract int getMetaFromState(IBlockState state); @Override - public IBlockState getStateFromMeta(int meta) { - BlockDoublePlant.EnumBlockHalf half = (meta & 8) > 0 ? BlockDoublePlant.EnumBlockHalf.UPPER : BlockDoublePlant.EnumBlockHalf.LOWER; - meta &= -9; - meta += offset; - EnumDyeColor color = EnumDyeColor.byMetadata(meta); - return getDefaultState().withProperty(HALF, half).withProperty(offset == 8 ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, color); - } + public abstract IBlockState getStateFromMeta(int meta); @Override public Block setUnlocalizedName(String par1Str) { diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java new file mode 100644 index 000000000..350af4c3f --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java @@ -0,0 +1,36 @@ +package vazkii.botania.common.block; + +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.EnumDyeColor; +import vazkii.botania.api.state.BotaniaStateProps; + +// White to Gray +public class BlockModDoubleFlower1 extends BlockModDoubleFlower { + public BlockModDoubleFlower1() { + super(false); + setDefaultState(blockState.getBaseState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1, EnumDyeColor.WHITE)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_1); + } + + @Override + public int getMetaFromState(IBlockState state) { + int meta = ((EnumDyeColor) state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_1)).getMetadata(); + if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { + meta |= 8; + } + return meta; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + BlockDoublePlant.EnumBlockHalf half = (meta & 8) > 0 ? BlockDoublePlant.EnumBlockHalf.UPPER : BlockDoublePlant.EnumBlockHalf.LOWER; + meta &= -9; + return getDefaultState().withProperty(HALF, half).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.byMetadata(meta)); + } +} diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java new file mode 100644 index 000000000..8604b2ddb --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java @@ -0,0 +1,37 @@ +package vazkii.botania.common.block; + +import net.minecraft.block.BlockDoublePlant; +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.EnumDyeColor; +import vazkii.botania.api.state.BotaniaStateProps; + +// Silver to black +public class BlockModDoubleFlower2 extends BlockModDoubleFlower { + + public BlockModDoubleFlower2() { + super(true); + setDefaultState(blockState.getBaseState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.SILVER)); + } + + @Override + public BlockState createBlockState() { + return new BlockState(this, HALF, BotaniaStateProps.DOUBLEFLOWER_VARIANT_2); + } + + @Override + public int getMetaFromState(IBlockState state) { + int meta = ((EnumDyeColor) state.getValue(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2)).getMetadata() - 8; + if (state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER) { + meta |= 8; + } + return meta; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + BlockDoublePlant.EnumBlockHalf half = (meta & 8) > 0 ? BlockDoublePlant.EnumBlockHalf.UPPER : BlockDoublePlant.EnumBlockHalf.LOWER; + meta &= -9; + return getDefaultState().withProperty(HALF, half).withProperty(BotaniaStateProps.DOUBLEFLOWER_VARIANT_2, EnumDyeColor.byMetadata(meta + 8)); + } +} diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 21c118794..3e5af8e12 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -60,12 +60,12 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); setTickRandomly(false); setCreativeTab(registerInCreative() ? BotaniaCreativeTab.INSTANCE : null); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY)); } @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.COLOR); + return new BlockState(this, getTypeProperty(), BotaniaStateProps.COLOR); } @Override @@ -75,7 +75,10 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup @Override public IBlockState getStateFromMeta(int meta) { - return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); + if (meta >= EnumDyeColor.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)).withProperty(type, EnumFlowerType.POPPY); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 435195af9..07b9dfc0b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -112,12 +112,12 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid setTickRandomly(false); setCreativeTab(BotaniaCreativeTab.INSTANCE); setBlockBounds(0.3F, 0.0F, 0.3F, 0.8F, 1, 0.8F); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE).withProperty(type, EnumFlowerType.POPPY)); } @Override public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.COLOR); + return new BlockState(this, getTypeProperty(), BotaniaStateProps.COLOR); } @Override @@ -130,7 +130,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid if (meta > 15) { meta = 0; } - return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); + return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)).withProperty(type, EnumFlowerType.POPPY); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index bc7858a70..83eba0f92 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -14,6 +14,7 @@ import java.util.List; 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.player.EntityPlayer; @@ -45,6 +46,24 @@ public class BlockStorage extends BlockMod implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.MANASTEEL)); } + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.STORAGE_VARIANT); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((Enum) state.getValue(BotaniaStateProps.STORAGE_VARIANT)).ordinal(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + if (meta >= StorageVariant.values().length) { + meta = 0; + } + return getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.values()[meta]); + } + @Override public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < StorageVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index d84a51e37..6f201ef2b 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -333,8 +333,8 @@ public final class ModBlocks { endStoneBrick = new BlockEndStoneBrick(); mushroom = new BlockModMushroom(); pump = new BlockPump(); - doubleFlower1 = new BlockModDoubleFlower(false); - doubleFlower2 = new BlockModDoubleFlower(true); + doubleFlower1 = new BlockModDoubleFlower1(); + doubleFlower2 = new BlockModDoubleFlower2(); fakeAir = new BlockFakeAir(); blazeBlock = new BlockBlaze(); corporeaInterceptor = new BlockCorporeaInterceptor(); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index ed48b86cd..adbf4d7d3 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -83,7 +83,9 @@ import vazkii.botania.common.block.decor.walls.living.BlockLivingwoodWall; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibBlockNames; +import java.util.Arrays; import java.util.Collection; +import java.util.Locale; import java.util.Set; public final class ModFluffBlocks { @@ -315,6 +317,10 @@ public final class ModFluffBlocks { } for (BiomeBrickVariant variant : BiomeBrickVariant.values()) { + if (variant.getName().toLowerCase(Locale.ROOT).contains("chiseled")) { + // No chiseled stairs/slabs + continue; + } biomeStoneStairs[count] = new BlockBiomeStoneStairs(biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant)); biomeStoneSlabs[count] = new BlockBiomeStoneSlab(false, biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant), count); biomeStoneFullSlabs[count] = new BlockBiomeStoneSlab(true, biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant), count); @@ -343,6 +349,8 @@ public final class ModFluffBlocks { count = 0; for (EnumDyeColor color : ((Collection) BotaniaStateProps.PAVEMENT_COLOR.getAllowedValues())) { pavementStairs[count] = new BlockPavementStairs(color); + pavementSlabs[count] = new BlockPavementSlab(false, color, count); + pavementFullSlabs[count] = new BlockPavementSlab(true, color, count); count++; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index f887fb956..3472db034 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -37,25 +37,6 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili public BlockShinyFlower() { super(LibBlockNames.SHINY_FLOWER); setLightLevel(1F); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); - } - - @Override - public BlockState createBlockState() { - return new BlockState(this, BotaniaStateProps.COLOR); - } - - @Override - public int getMetaFromState(IBlockState state) { - return ((EnumDyeColor) state.getValue(BotaniaStateProps.COLOR)).getMetadata(); - } - - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta >= EnumDyeColor.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java index a0638efe9..b5b558802 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java @@ -31,7 +31,7 @@ public class BlockBiomeStoneB extends BlockBiomeStone { @Override public int getMetaFromState(IBlockState state) { - return ((BiomeStoneVariant) state.getValue(BotaniaStateProps.BIOMEBRICK_VARIANT)).ordinal(); + return ((BiomeBrickVariant) state.getValue(BotaniaStateProps.BIOMEBRICK_VARIANT)).ordinal(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index e31cb188c..86cc6edde 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -34,12 +34,12 @@ public class Block18StoneWall extends BlockModWall { super(ModFluffBlocks.stone, 4); setHardness(1.5F); setResistance(10F); - setDefaultState(getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE)); + setDefaultState(getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE).withProperty(VARIANT, EnumType.NORMAL)); } @Override public BlockState createBlockState() { - return new BlockState(this, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.FUTURESTONEWALL_VARIANT); + return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.FUTURESTONEWALL_VARIANT); } @Override @@ -52,7 +52,7 @@ public class Block18StoneWall extends BlockModWall { if (meta < 0 || meta > 3) { meta = 0; } - return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.values()[meta]); + return getDefaultState().withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.values()[meta]).withProperty(VARIANT, EnumType.NORMAL); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index d0ae84b91..44da2cace 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -34,12 +34,12 @@ public class BlockBiomeStoneWall extends BlockModWall { super(ModFluffBlocks.biomeStoneA, 8); setHardness(1.5F); setResistance(10F); - setDefaultState(getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.FOREST)); + setDefaultState(getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.FOREST).withProperty(VARIANT, EnumType.NORMAL)); } @Override public BlockState createBlockState() { - return new BlockState(this, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.BIOMESTONE_VARIANT); + return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.BIOMESTONE_VARIANT); } @Override @@ -52,7 +52,7 @@ public class BlockBiomeStoneWall extends BlockModWall { if (meta < 0 || meta >= BiomeStoneVariant.values().length) { meta = 0; } - return getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.values()[meta]); + return getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.values()[meta]).withProperty(VARIANT, EnumType.NORMAL); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index f4226fb41..0f8a53ee7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -43,12 +43,23 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { .withProperty(SOUTH, false) .withProperty(WEST, false) .withProperty(EAST, false) + .withProperty(VARIANT, EnumType.NORMAL) ); } @Override public BlockState createBlockState() { - return new BlockState(this, UP, NORTH, SOUTH, WEST, EAST); + return new BlockState(this, VARIANT, UP, NORTH, SOUTH, WEST, EAST); + } + + @Override + public int getMetaFromState(IBlockState state) { + return 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index 9c2667139..7b552bab6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -42,6 +43,21 @@ public class BlockPump extends BlockModContainer implements ILexiconable { setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } + @Override + public BlockState createBlockState() { + return new BlockState(this, BotaniaStateProps.CARDINALS); + } + + @Override + public int getMetaFromState(IBlockState state) { + return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getIndex(); + } + + @Override + public IBlockState getStateFromMeta(int meta) { + return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta)); + } + @Override public void onBlockPlacedBy(World p_149689_1_, BlockPos pos, IBlockState state, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { p_149689_1_.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, p_149689_5_.getHorizontalFacing().getOpposite()), 2); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 7d3329fca..8c8bf8b32 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -103,7 +103,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl for(BlockPos f : FLOWER_LOCATIONS) mb.addComponent(new FlowerComponent(f.up(), ModBlocks.flower)); - mb.addComponent(BlockPos.ORIGIN, Blocks.lapis_block.getDefaultState()); + mb.addComponent(BlockPos.ORIGIN.up(), Blocks.lapis_block.getDefaultState()); return mb.makeSet(); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 968a7f043..d4f2b3f70 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -395,6 +395,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { @SideOnly(Side.CLIENT) public void render(ItemStack stack, EntityPlayer player, float partialTicks) { +/* Minecraft mc = Minecraft.getMinecraft(); Tessellator tess = Tessellator.getInstance(); // todo 1.8.8 Tessellator.renderingWorldRenderer = false; @@ -506,6 +507,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { GlStateManager.popMatrix(); } GlStateManager.popMatrix(); +*/ } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 6d6324f06..a85eb647e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -272,7 +272,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { return bound; MovingObjectPosition pos = Minecraft.getMinecraft().objectMouseOver; - if(pos != null) { + if(pos != null && pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(pos.getBlockPos()); if(tile != null && tile instanceof ITileBound) { BlockPos coords = ((ITileBound) tile).getBinding(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index 3f30fb32c..d4fe9a896 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -113,6 +113,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc @SideOnly(Side.CLIENT) public static void renderOnPlayer(ItemStack stack, RenderPlayerEvent event) { +/* if(hasAnyWill(stack) && !((ItemTerrasteelArmor) stack.getItem()).hasPhantomInk(stack)) { GlStateManager.pushMatrix(); float f = willIcon.getMinU(); @@ -128,6 +129,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc IconHelper.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, willIcon.getIconWidth(), willIcon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); } +*/ } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index ebf46af02..048b424fa 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -317,11 +317,13 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } public void renderIcon(int i) { +/* IIcon icon = icons[i]; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); +*/ } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 191fe3515..a9918af7b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -173,12 +173,12 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre GlStateManager.scale(0.5F, 0.5F, 0.5F); for(int i = 2; i < 4; i++) { - IIcon icon = icons[i]; + /*IIcon icon = icons[i]; float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); + ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F);*/ Color color = new Color(getColorFromItemStack(stack, 1)); GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index bb9a10363..94a28e36c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -100,6 +100,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble @Override @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { +/* if(type == RenderType.HEAD) { float f = itemIcon.getMinU(); float f1 = itemIcon.getMaxU(); @@ -114,6 +115,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble GlStateManager.scale(0.5F, 0.5F, 0.5F); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); } +*/ } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index faad2732c..094a9d700 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -83,7 +83,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub private static final int COST_OVERKILL = COST * 3; private static final int MAX_FLY_TIME = 1200; - public static IIcon[] wingIcons; + //public static IIcon[] wingIcons; private static final int SUBTYPES = 8; private static final int WING_TYPES = 9; @@ -332,6 +332,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub @Override @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { +/* int meta = stack.getItemDamage(); if(type == RenderType.BODY) { if(meta > 0 && meta <= ItemFlightTiara.wingIcons.length) { @@ -451,6 +452,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } } else if(meta == 1) // Jibril's Halo renderHalo(event.entityPlayer, event.partialRenderTick); +*/ } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java index a3ed3e373..c8ed82fb2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java @@ -67,6 +67,7 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { @Override @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { +/* if(type == RenderType.HEAD) { float f = itemIcon.getMinU(); float f1 = itemIcon.getMaxU(); @@ -85,5 +86,6 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { } ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 32F); } +*/ } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java index 7354ce3c5..0fb82c8e3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java @@ -21,14 +21,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderPlayerEvent; @@ -42,7 +40,7 @@ import baubles.api.BaubleType; public class ItemIcePendant extends ItemBauble implements IBaubleRender { - IIcon gemIcon; + //IIcon gemIcon; public static Map> playerIceBlocks = new HashMap(); public ItemIcePendant() { @@ -54,11 +52,11 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { return BaubleType.AMULET; } - @Override + /*@Override public void registerIcons(IIconRegister par1IconRegister) { super.registerIcons(par1IconRegister); gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem"); - } + }*/ @Override public void onWornTick(ItemStack stack, EntityLivingBase entity) { @@ -113,7 +111,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { @Override public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { - if(type == RenderType.BODY) { + /*if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); Helper.rotateIfSneaking(event.entityPlayer); boolean armor = event.entityPlayer.getCurrentArmor(2) != null; @@ -127,7 +125,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { float f2 = gemIcon.getMinV(); float f3 = gemIcon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); - } + }*/ } class IceRemover { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 5ded3be7f..34917a261 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -17,7 +17,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -32,7 +31,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; -import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.village.MerchantRecipe; import net.minecraftforge.client.event.RenderPlayerEvent; @@ -56,18 +54,18 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemItemFinder extends ItemBauble implements IBaubleRender { - IIcon gemIcon; + //IIcon gemIcon; private static final String TAG_POSITIONS = "highlightPositions"; public ItemItemFinder() { super(LibItemNames.ITEM_FINDER); } - @Override + /*@Override public void registerIcons(IIconRegister par1IconRegister) { super.registerIcons(par1IconRegister); gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem"); - } + }*/ @Override public void onWornTick(ItemStack stack, EntityLivingBase player) { @@ -215,6 +213,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { @Override @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { +/* if(type == RenderType.HEAD) { float f = gemIcon.getMinU(); float f1 = gemIcon.getMaxU(); @@ -229,6 +228,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { GlStateManager.scale(0.75F, 0.75F, 0.75F); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 16F); } +*/ } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java index bd7ac4f42..14230cfb9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java @@ -13,11 +13,9 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraftforge.client.event.RenderPlayerEvent; import org.lwjgl.opengl.GL11; @@ -29,7 +27,7 @@ import baubles.api.BaubleType; public class ItemLavaPendant extends ItemBauble implements IBaubleRender { - IIcon gemIcon; + //IIcon gemIcon; public ItemLavaPendant() { super(LibItemNames.LAVA_PENDANT); @@ -46,14 +44,15 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { return BaubleType.AMULET; } - @Override + /*@Override public void registerIcons(IIconRegister par1IconRegister) { super.registerIcons(par1IconRegister); gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem"); - } + }*/ @Override public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { +/* if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); Helper.rotateIfSneaking(event.entityPlayer); @@ -69,6 +68,7 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { float f3 = gemIcon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); } +*/ } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java index cdd730aa5..cfb640808 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -51,6 +51,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm @Override public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { +/* if(type == RenderType.HEAD) { float f = itemIcon.getMinU(); float f1 = itemIcon.getMaxU(); @@ -65,6 +66,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm GlStateManager.scale(0.35F, 0.35F, 0.35F); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); } +*/ } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java index 4e1171c70..9db5d72d8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java @@ -14,12 +14,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraftforge.client.event.RenderPlayerEvent; import org.lwjgl.opengl.GL11; @@ -33,7 +31,7 @@ import net.minecraftforge.fml.relauncher.ReflectionHelper; public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { - IIcon gemIcon; + //IIcon gemIcon; public ItemSuperLavaPendant() { super(LibItemNames.SUPER_LAVA_PENDANT); @@ -58,14 +56,15 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { return BaubleType.AMULET; } - @Override + /*@Override public void registerIcons(IIconRegister par1IconRegister) { super.registerIcons(par1IconRegister); gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem"); - } + }*/ @Override public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { +/* if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); Helper.rotateIfSneaking(event.entityPlayer); @@ -81,5 +80,6 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { float f3 = gemIcon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F); } +*/ } } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 92186dc7f..2e9d55c42 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -81,10 +81,10 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @SubscribeEvent @SideOnly(Side.CLIENT) public void onModelBake(ModelBakeEvent evt) { - evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/tail", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/tail"))); + /*evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/tail", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/tail"))); evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/phiFlower", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/phiFlower"))); evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/goldfish", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/goldfish"))); - evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/nerfBat", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/nerfBat"))); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/nerfBat", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/nerfBat")));*/ } @SubscribeEvent