From f82f08eb7e49859ac11eb375ae1bafb0086faf20 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 8 Feb 2014 23:29:49 +0000 Subject: [PATCH] Cleanup run, enough pain for today. --- MODSRC/vazkii/botania/api/BotaniaAPI.java | 4 +- MODSRC/vazkii/botania/api/ILexiconable.java | 2 +- MODSRC/vazkii/botania/api/IWandHUD.java | 2 +- .../api/internal/DummyMethodHandler.java | 4 +- .../api/internal/IInternalMethodHandler.java | 8 +- .../api/internal/MappableStackWrapper.java | 2 +- .../api/recipe/RecipeManaInfusion.java | 2 +- .../botania/api/recipe/RecipePetals.java | 12 +- .../botania/api/recipe/RecipeRuneAltar.java | 4 +- .../client/core/handler/HUDHandler.java | 19 +- .../client/core/handler/LightningHandler.java | 208 +++++++++--------- .../client/core/helper/RenderHelper.java | 8 +- .../client/core/proxy/ClientProxy.java | 4 +- .../client/model/ModelSpinningCubes.java | 6 +- .../render/tile/RenderTileRuneAltar.java | 10 +- .../vazkii/botania/common/block/BlockMod.java | 2 +- .../botania/common/block/BlockRuneAltar.java | 6 +- .../botania/common/block/BlockUnstable.java | 16 +- .../botania/common/block/ModBlocks.java | 4 +- .../block/subtile/SubTilePureDaisy.java | 2 +- .../common/block/tile/TileRuneAltar.java | 22 +- .../core/handler/InternalMethodHandler.java | 2 +- .../botania/common/core/helper/Vector3.java | 6 +- .../common/core/proxy/CommonProxy.java | 4 +- .../common/crafting/ModCrafingRecipes.java | 1 - .../crafting/ModManaInfusionRecipes.java | 3 +- .../common/crafting/ModRuneRecipes.java | 4 +- .../common/entity/EntityManaBurst.java | 2 +- .../botania/common/item/ItemManaPetal.java | 8 +- .../vazkii/botania/common/item/ItemRune.java | 8 +- .../vazkii/botania/common/item/ModItems.java | 2 +- .../botania/common/lexicon/LexiconData.java | 15 +- .../lexicon/page/PageCraftingRecipe.java | 8 +- .../lexicon/page/PageManaInfusionRecipe.java | 18 +- .../common/lexicon/page/PagePetalRecipe.java | 28 +-- .../common/lexicon/page/PageRecipe.java | 20 +- .../common/lexicon/page/PageRuneRecipe.java | 6 +- .../vazkii/botania/common/lib/LibLexicon.java | 2 +- .../vazkii/botania/common/lib/LibOreDict.java | 6 +- 39 files changed, 238 insertions(+), 252 deletions(-) diff --git a/MODSRC/vazkii/botania/api/BotaniaAPI.java b/MODSRC/vazkii/botania/api/BotaniaAPI.java index d28ea6f03..05c71998a 100644 --- a/MODSRC/vazkii/botania/api/BotaniaAPI.java +++ b/MODSRC/vazkii/botania/api/BotaniaAPI.java @@ -14,8 +14,6 @@ package vazkii.botania.api; import java.util.ArrayList; import java.util.List; -import javax.swing.text.html.HTMLDocument.RunElement; - import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; @@ -63,7 +61,7 @@ public final class BotaniaAPI { petalRecipes.add(recipe); return recipe; } - + /** * Registers a Rune Altar * @param output The ItemStack to craft. diff --git a/MODSRC/vazkii/botania/api/ILexiconable.java b/MODSRC/vazkii/botania/api/ILexiconable.java index 7589cae75..20fe16ccd 100644 --- a/MODSRC/vazkii/botania/api/ILexiconable.java +++ b/MODSRC/vazkii/botania/api/ILexiconable.java @@ -11,10 +11,10 @@ */ package vazkii.botania.api; -import vazkii.botania.api.lexicon.LexiconEntry; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import vazkii.botania.api.lexicon.LexiconEntry; /** * Any block that implements this can be right clicked with diff --git a/MODSRC/vazkii/botania/api/IWandHUD.java b/MODSRC/vazkii/botania/api/IWandHUD.java index e6ec2e905..41436c251 100644 --- a/MODSRC/vazkii/botania/api/IWandHUD.java +++ b/MODSRC/vazkii/botania/api/IWandHUD.java @@ -22,5 +22,5 @@ import net.minecraft.world.World; public interface IWandHUD { public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z); - + } diff --git a/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java b/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java index cbd2d962b..35c7239d1 100644 --- a/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java @@ -73,11 +73,11 @@ public class DummyMethodHandler implements IInternalMethodHandler { public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe) { return dummyPage(key); } - + private LexiconPage dummyPage(String key) { return new DummyPage(key); } - + @Override public ItemStack getSubTileAsStack(String subTile) { return new ItemStack(1, 0, 0); diff --git a/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java b/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java index f238ad358..68e99dd33 100644 --- a/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -41,17 +41,17 @@ public interface IInternalMethodHandler { public LexiconPage petalRecipesPage(String key, List recipes); public LexiconPage petalRecipePage(String key, RecipePetals recipe); - + public LexiconPage runeRecipesPage(String key, List recipes); public LexiconPage runeRecipePage(String key, RecipeRuneAltar recipe); - + public LexiconPage manaInfusionRecipesPage(String key, List recipes); public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe); - + public ItemStack getSubTileAsStack(String subTile); - + public Icon getSubTileIconForName(String name); } diff --git a/MODSRC/vazkii/botania/api/internal/MappableStackWrapper.java b/MODSRC/vazkii/botania/api/internal/MappableStackWrapper.java index c3a84ae26..90bb6b76e 100644 --- a/MODSRC/vazkii/botania/api/internal/MappableStackWrapper.java +++ b/MODSRC/vazkii/botania/api/internal/MappableStackWrapper.java @@ -23,7 +23,7 @@ public class MappableStackWrapper { @Override public boolean equals(Object obj) { - if (!(obj instanceof MappableStackWrapper)) + if (!(obj instanceof MappableStackWrapper)) return false; MappableStackWrapper isw = (MappableStackWrapper) obj; diff --git a/MODSRC/vazkii/botania/api/recipe/RecipeManaInfusion.java b/MODSRC/vazkii/botania/api/recipe/RecipeManaInfusion.java index 5d6c94fce..c92d33dba 100644 --- a/MODSRC/vazkii/botania/api/recipe/RecipeManaInfusion.java +++ b/MODSRC/vazkii/botania/api/recipe/RecipeManaInfusion.java @@ -33,7 +33,7 @@ public class RecipeManaInfusion { String oredict = OreDictionary.getOreName(OreDictionary.getOreID(stack)); return oredict.equals(input); } - + public Object getInput() { return input; } diff --git a/MODSRC/vazkii/botania/api/recipe/RecipePetals.java b/MODSRC/vazkii/botania/api/recipe/RecipePetals.java index 3b8788413..f7aa14b44 100644 --- a/MODSRC/vazkii/botania/api/recipe/RecipePetals.java +++ b/MODSRC/vazkii/botania/api/recipe/RecipePetals.java @@ -14,10 +14,10 @@ package vazkii.botania.api.recipe; import java.util.ArrayList; import java.util.List; -import vazkii.botania.api.internal.MappableStackWrapper; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.api.internal.MappableStackWrapper; public class RecipePetals { @@ -26,7 +26,7 @@ public class RecipePetals { public RecipePetals(ItemStack output, Object... inputs) { this.output = output; - + List inputsToSet = new ArrayList(); for(Object obj : inputs) { if(obj instanceof String) @@ -37,7 +37,7 @@ public class RecipePetals { inputsToSet.add(new MappableStackWrapper((ItemStack) obj)); else throw new IllegalArgumentException("Invalid input"); } - + this.inputs = inputsToSet; } @@ -50,10 +50,10 @@ public class RecipePetals { break; String oredict = OreDictionary.getOreName(OreDictionary.getOreID(stack)); - + if(!inputsMissing.contains(stack) && !inputsMissing.contains(oredict)) return false; - + if(inputsMissing.contains(stack)) inputsMissing.remove(stack); else inputsMissing.remove(oredict); @@ -61,7 +61,7 @@ public class RecipePetals { return inputsMissing.isEmpty(); } - + public List getInputs() { return new ArrayList(inputs); } diff --git a/MODSRC/vazkii/botania/api/recipe/RecipeRuneAltar.java b/MODSRC/vazkii/botania/api/recipe/RecipeRuneAltar.java index cd1a3019e..745c9573e 100644 --- a/MODSRC/vazkii/botania/api/recipe/RecipeRuneAltar.java +++ b/MODSRC/vazkii/botania/api/recipe/RecipeRuneAltar.java @@ -23,9 +23,9 @@ public class RecipeRuneAltar extends RecipePetals { this.output = output; this.mana = mana; } - + public int getManaUsage() { return mana; } - + } diff --git a/MODSRC/vazkii/botania/client/core/handler/HUDHandler.java b/MODSRC/vazkii/botania/client/core/handler/HUDHandler.java index 2ae54ea42..ac01e957b 100644 --- a/MODSRC/vazkii/botania/client/core/handler/HUDHandler.java +++ b/MODSRC/vazkii/botania/client/core/handler/HUDHandler.java @@ -16,7 +16,6 @@ import java.awt.Color; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -34,7 +33,7 @@ import vazkii.botania.common.item.ModItems; public final class HUDHandler { private static final ResourceLocation manaBar = new ResourceLocation(LibResources.GUI_MANA_HUD); - + @ForgeSubscribe public void onDrawScreen(RenderGameOverlayEvent.Post event) { if(event.type == ElementType.ALL) { @@ -47,19 +46,19 @@ public final class HUDHandler { } } } - + public static void drawSimpleManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res) { GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); Minecraft mc = Minecraft.getMinecraft(); int x = res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(name) / 2; int y = res.getScaledHeight() / 2 + 10; - + mc.fontRenderer.drawStringWithShadow(name, x, y, color); - + x = res.getScaledWidth() / 2 - 51; y += 10; - + renderManaBar(x, y, color, 0.5F, mana, maxMana); if(mana < 0) { @@ -68,20 +67,20 @@ public final class HUDHandler { y -= 1; mc.fontRenderer.drawStringWithShadow(text, x, y, color); } - + GL11.glDisable(GL11.GL_BLEND); } - + public static void renderManaBar(int x, int y, int color, float alpha, int mana, int maxMana) { Minecraft mc = Minecraft.getMinecraft(); GL11.glColor4f(1F, 1F, 1F, alpha); mc.renderEngine.bindTexture(manaBar); RenderHelper.drawTexturedModalRect(x, y, 0, 0, 0, 102, 5); - + int manaPercentage = Math.max(0, (int) ((double) mana / (double) maxMana * 100)); RenderHelper.drawTexturedModalRect(x + 1 + manaPercentage, y + 1, 0, 0, 5, 100 - manaPercentage, 3); - + Color color_ = new Color(color); GL11.glColor4ub((byte) color_.getRed(), (byte) color_.getGreen(),(byte) color_.getBlue(), (byte) (255F * alpha)); RenderHelper.drawTexturedModalRect(x + 1, y + 1, 0, 0, 5, manaPercentage, 3); diff --git a/MODSRC/vazkii/botania/client/core/handler/LightningHandler.java b/MODSRC/vazkii/botania/client/core/handler/LightningHandler.java index 2d80b95d2..880c4037b 100644 --- a/MODSRC/vazkii/botania/client/core/handler/LightningHandler.java +++ b/MODSRC/vazkii/botania/client/core/handler/LightningHandler.java @@ -42,118 +42,118 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.helper.Vector3; public class LightningHandler { - + private static final ResourceLocation outsideResource = new ResourceLocation(LibResources.MISC_WISP_LARGE); private static final ResourceLocation insideResource = new ResourceLocation(LibResources.MISC_WISP_SMALL); - static double interpPosX; - static double interpPosY; - static double interpPosZ; - - private static Vector3 getRelativeViewVector(Vector3 pos) { - Entity renderEntity = Minecraft.getMinecraft().renderViewEntity; - return new Vector3((float) renderEntity.posX - pos.x, (float) renderEntity.posY + renderEntity.getEyeHeight() - pos.y, (float) renderEntity.posZ - pos.z); - } - - @ForgeSubscribe - public void onRenderWorldLast(RenderWorldLastEvent event) { - float frame = event.partialTicks; - Entity entity = Minecraft.getMinecraft().thePlayer; - - interpPosX = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * frame; - interpPosY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * frame; - interpPosZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * frame; - - GL11.glTranslated(-interpPosX, -interpPosY, -interpPosZ); - - Tessellator tessellator = Tessellator.instance; - - GL11.glDepthMask(false); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - - TextureManager render = Minecraft.getMinecraft().renderEngine; - - render.bindTexture(outsideResource); - tessellator.startDrawingQuads(); - tessellator.setBrightness(0xF000F0); - for (LightningBolt bolt : LightningBolt.boltlist) - renderBolt(bolt, tessellator, frame, ActiveRenderInfo.rotationX, ActiveRenderInfo.rotationXZ, ActiveRenderInfo.rotationZ, ActiveRenderInfo.rotationXY, 0, false); - tessellator.draw(); - - render.bindTexture(insideResource); - tessellator.startDrawingQuads(); - tessellator.setBrightness(0xF000F0); - for (LightningBolt bolt : LightningBolt.boltlist) - renderBolt(bolt, tessellator, frame, ActiveRenderInfo.rotationX, ActiveRenderInfo.rotationXZ, ActiveRenderInfo.rotationZ, ActiveRenderInfo.rotationXY, 1, true); - tessellator.draw(); - - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); - - GL11.glTranslated(interpPosX, interpPosY, interpPosZ); - } - - public static void spawnLightningBolt(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) { + static double interpPosX; + static double interpPosY; + static double interpPosZ; + + private static Vector3 getRelativeViewVector(Vector3 pos) { + Entity renderEntity = Minecraft.getMinecraft().renderViewEntity; + return new Vector3((float) renderEntity.posX - pos.x, (float) renderEntity.posY + renderEntity.getEyeHeight() - pos.y, (float) renderEntity.posZ - pos.z); + } + + @ForgeSubscribe + public void onRenderWorldLast(RenderWorldLastEvent event) { + float frame = event.partialTicks; + Entity entity = Minecraft.getMinecraft().thePlayer; + + interpPosX = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * frame; + interpPosY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * frame; + interpPosZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * frame; + + GL11.glTranslated(-interpPosX, -interpPosY, -interpPosZ); + + Tessellator tessellator = Tessellator.instance; + + GL11.glDepthMask(false); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + TextureManager render = Minecraft.getMinecraft().renderEngine; + + render.bindTexture(outsideResource); + tessellator.startDrawingQuads(); + tessellator.setBrightness(0xF000F0); + for (LightningBolt bolt : LightningBolt.boltlist) + renderBolt(bolt, tessellator, frame, ActiveRenderInfo.rotationX, ActiveRenderInfo.rotationXZ, ActiveRenderInfo.rotationZ, ActiveRenderInfo.rotationXY, 0, false); + tessellator.draw(); + + render.bindTexture(insideResource); + tessellator.startDrawingQuads(); + tessellator.setBrightness(0xF000F0); + for (LightningBolt bolt : LightningBolt.boltlist) + renderBolt(bolt, tessellator, frame, ActiveRenderInfo.rotationX, ActiveRenderInfo.rotationXZ, ActiveRenderInfo.rotationZ, ActiveRenderInfo.rotationXY, 1, true); + tessellator.draw(); + + GL11.glDisable(GL11.GL_BLEND); + GL11.glDepthMask(true); + + GL11.glTranslated(interpPosX, interpPosY, interpPosZ); + } + + public static void spawnLightningBolt(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) { LightningBolt bolt = new LightningBolt(world, vectorStart, vectorEnd, ticksPerMeter, seed, colorOuter, colorInner); bolt.defaultFractal(); bolt.finalizeBolt(); LightningBolt.boltlist.add(bolt); } - - private void renderBolt(LightningBolt bolt, Tessellator tessellator, float partialframe, float cosyaw, float cospitch, float sinyaw, float cossinpitch, int pass, boolean inner) { - float boltage = bolt.particleAge < 0 ? 0 : (float) bolt.particleAge / (float) bolt.particleMaxAge; - float mainalpha = 1; - if(pass == 0) - mainalpha = (1 - boltage) * 0.4F; - else mainalpha = 1 - boltage * 0.5F; - - int expandTime = (int) (bolt.length * bolt.speed); - - int renderstart = (int) ((expandTime / 2 - bolt.particleMaxAge + bolt.particleAge) / (float) (expandTime / 2) * bolt.numsegments0); - int renderend = (int) ((bolt.particleAge + expandTime) / (float) expandTime * bolt.numsegments0); - - for(Segment rendersegment : bolt.segments) { - if(rendersegment.segmentno < renderstart || rendersegment.segmentno > renderend) - continue; - - Vector3 playervec = getRelativeViewVector(rendersegment.startpoint.point).multiply(-1); - - double width = 0.025F * (playervec.mag() / 5 + 1) * (1 + rendersegment.light) * 0.5F; - - Vector3 diff1 = playervec.copy().crossProduct(rendersegment.prevdiff).normalize().multiply(width / rendersegment.sinprev); - Vector3 diff2 = playervec.copy().crossProduct(rendersegment.nextdiff).normalize().multiply(width / rendersegment.sinnext); - - Vector3 startvec = rendersegment.startpoint.point; - Vector3 endvec = rendersegment.endpoint.point; - - tessellator.setColorRGBA_I(inner ? bolt.colorInner : bolt.colorOuter, (int) (mainalpha * rendersegment.light * 255)); - - tessellator.addVertexWithUV(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z, 0.5, 0); - tessellator.addVertexWithUV(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z, 0.5, 0); - tessellator.addVertexWithUV(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z, 0.5, 1); - tessellator.addVertexWithUV(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z, 0.5, 1); - - if(rendersegment.next == null) { - Vector3 roundend = rendersegment.endpoint.point.copy().add(rendersegment.diff.copy().normalize().multiply(width)); - - tessellator.addVertexWithUV(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z, 0, 0); - tessellator.addVertexWithUV(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z, 0.5, 0); - tessellator.addVertexWithUV(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z, 0.5, 1); - tessellator.addVertexWithUV(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z, 0, 1); - } - - if(rendersegment.prev == null) { - Vector3 roundend = rendersegment.startpoint.point.copy().subtract(rendersegment.diff.copy().normalize().multiply(width)); - - tessellator.addVertexWithUV(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z, 0.5, 0); - tessellator.addVertexWithUV(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z, 0, 0); - tessellator.addVertexWithUV(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z, 0, 1); - tessellator.addVertexWithUV(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z, 0.5, 1); - } - } - } - + + private void renderBolt(LightningBolt bolt, Tessellator tessellator, float partialframe, float cosyaw, float cospitch, float sinyaw, float cossinpitch, int pass, boolean inner) { + float boltage = bolt.particleAge < 0 ? 0 : (float) bolt.particleAge / (float) bolt.particleMaxAge; + float mainalpha = 1; + if(pass == 0) + mainalpha = (1 - boltage) * 0.4F; + else mainalpha = 1 - boltage * 0.5F; + + int expandTime = (int) (bolt.length * bolt.speed); + + int renderstart = (int) ((expandTime / 2 - bolt.particleMaxAge + bolt.particleAge) / (float) (expandTime / 2) * bolt.numsegments0); + int renderend = (int) ((bolt.particleAge + expandTime) / (float) expandTime * bolt.numsegments0); + + for(Segment rendersegment : bolt.segments) { + if(rendersegment.segmentno < renderstart || rendersegment.segmentno > renderend) + continue; + + Vector3 playervec = getRelativeViewVector(rendersegment.startpoint.point).multiply(-1); + + double width = 0.025F * (playervec.mag() / 5 + 1) * (1 + rendersegment.light) * 0.5F; + + Vector3 diff1 = playervec.copy().crossProduct(rendersegment.prevdiff).normalize().multiply(width / rendersegment.sinprev); + Vector3 diff2 = playervec.copy().crossProduct(rendersegment.nextdiff).normalize().multiply(width / rendersegment.sinnext); + + Vector3 startvec = rendersegment.startpoint.point; + Vector3 endvec = rendersegment.endpoint.point; + + tessellator.setColorRGBA_I(inner ? bolt.colorInner : bolt.colorOuter, (int) (mainalpha * rendersegment.light * 255)); + + tessellator.addVertexWithUV(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z, 0.5, 0); + tessellator.addVertexWithUV(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z, 0.5, 0); + tessellator.addVertexWithUV(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z, 0.5, 1); + tessellator.addVertexWithUV(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z, 0.5, 1); + + if(rendersegment.next == null) { + Vector3 roundend = rendersegment.endpoint.point.copy().add(rendersegment.diff.copy().normalize().multiply(width)); + + tessellator.addVertexWithUV(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z, 0, 0); + tessellator.addVertexWithUV(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z, 0.5, 0); + tessellator.addVertexWithUV(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z, 0.5, 1); + tessellator.addVertexWithUV(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z, 0, 1); + } + + if(rendersegment.prev == null) { + Vector3 roundend = rendersegment.startpoint.point.copy().subtract(rendersegment.diff.copy().normalize().multiply(width)); + + tessellator.addVertexWithUV(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z, 0.5, 0); + tessellator.addVertexWithUV(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z, 0, 0); + tessellator.addVertexWithUV(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z, 0, 1); + tessellator.addVertexWithUV(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z, 0.5, 1); + } + } + } + public static class LightningBolt { public ArrayList segments = new ArrayList(); diff --git a/MODSRC/vazkii/botania/client/core/helper/RenderHelper.java b/MODSRC/vazkii/botania/client/core/helper/RenderHelper.java index 06ddac85b..b02933d22 100644 --- a/MODSRC/vazkii/botania/client/core/helper/RenderHelper.java +++ b/MODSRC/vazkii/botania/client/core/helper/RenderHelper.java @@ -115,10 +115,10 @@ public final class RenderHelper { float f1 = 0.00390625F; Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); - tessellator.addVertexWithUV((double)(par1 + 0), (double)(par2 + par6), (double)z, (double)((float)(par3 + 0) * f), (double)((float)(par4 + par6) * f1)); - tessellator.addVertexWithUV((double)(par1 + par5), (double)(par2 + par6), (double)z, (double)((float)(par3 + par5) * f), (double)((float)(par4 + par6) * f1)); - tessellator.addVertexWithUV((double)(par1 + par5), (double)(par2 + 0), (double)z, (double)((float)(par3 + par5) * f), (double)((float)(par4 + 0) * f1)); - tessellator.addVertexWithUV((double)(par1 + 0), (double)(par2 + 0), (double)z, (double)((float)(par3 + 0) * f), (double)((float)(par4 + 0) * f1)); + tessellator.addVertexWithUV(par1 + 0, par2 + par6, z, (par3 + 0) * f, (par4 + par6) * f1); + tessellator.addVertexWithUV(par1 + par5, par2 + par6, z, (par3 + par5) * f, (par4 + par6) * f1); + tessellator.addVertexWithUV(par1 + par5, par2 + 0, z, (par3 + par5) * f, (par4 + 0) * f1); + tessellator.addVertexWithUV(par1 + 0, par2 + 0, z, (par3 + 0) * f, (par4 + 0) * f1); tessellator.draw(); } } diff --git a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java index 8a2d04917..fd7889965 100644 --- a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java @@ -57,7 +57,7 @@ public class ClientProxy extends CommonProxy { super.init(event); TickRegistry.registerTickHandler(new ClientTickHandler(), Side.CLIENT); - + MinecraftForge.EVENT_BUS.register(new HUDHandler()); MinecraftForge.EVENT_BUS.register(new LightningHandler()); @@ -113,7 +113,7 @@ public class ClientProxy extends CommonProxy { Minecraft.getMinecraft().effectRenderer.addEffect(wisp); } - + @Override public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) { LightningHandler.spawnLightningBolt(world, vectorStart, vectorEnd, ticksPerMeter, seed, colorOuter, colorInner); diff --git a/MODSRC/vazkii/botania/client/model/ModelSpinningCubes.java b/MODSRC/vazkii/botania/client/model/ModelSpinningCubes.java index 22a2811da..4e573d3a3 100644 --- a/MODSRC/vazkii/botania/client/model/ModelSpinningCubes.java +++ b/MODSRC/vazkii/botania/client/model/ModelSpinningCubes.java @@ -66,10 +66,10 @@ public class ModelSpinningCubes extends ModelBase { } else GL11.glColor4f(1F, 1F, 1F, 1F); int light = 15728880; - int lightmapX = light % 65536; - int lightmapY = light / 65536; + int lightmapX = light % 65536; + int lightmapY = light / 65536; - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); spinningCube.render(1F / 16F); if(repeat < origRepeat) diff --git a/MODSRC/vazkii/botania/client/render/tile/RenderTileRuneAltar.java b/MODSRC/vazkii/botania/client/render/tile/RenderTileRuneAltar.java index 10b58ae4b..15a7be042 100644 --- a/MODSRC/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/MODSRC/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -11,8 +11,6 @@ */ package vazkii.botania.client.render.tile; -import static net.minecraftforge.client.IItemRenderer.ItemRenderType.ENTITY; - import java.awt.Color; import net.minecraft.block.Block; @@ -26,10 +24,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Icon; -import net.minecraftforge.client.ForgeHooksClient; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; import org.lwjgl.opengl.GL11; @@ -49,13 +43,13 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer { GL11.glTranslated(x, y, z); for(int i = 0; i < altar.getSizeInventory(); i++) { - GL11.glPushMatrix(); + GL11.glPushMatrix(); GL11.glScalef(0.5F, 0.5F, 0.5F); GL11.glTranslatef(1F, 2.5F, 1F); GL11.glRotatef(altar.angles[i], 0F, 1F, 0F); GL11.glTranslatef(2.25F, 0F, 0.5F); GL11.glRotatef(90F, 0F, 1F, 0F); - GL11.glTranslated(0D, 0.1 * Math.sin((double) (tileentity.worldObj.getTotalWorldTime() + i * 10) / 5D), 0F); + GL11.glTranslated(0D, 0.1 * Math.sin((tileentity.worldObj.getTotalWorldTime() + i * 10) / 5D), 0F); ItemStack stack = altar.getStackInSlot(i); Minecraft mc = Minecraft.getMinecraft(); if(stack != null) { diff --git a/MODSRC/vazkii/botania/common/block/BlockMod.java b/MODSRC/vazkii/botania/common/block/BlockMod.java index 83a7cdcab..82c578f86 100644 --- a/MODSRC/vazkii/botania/common/block/BlockMod.java +++ b/MODSRC/vazkii/botania/common/block/BlockMod.java @@ -34,7 +34,7 @@ public class BlockMod extends Block { GameRegistry.registerBlock(this, par1Str); return super.setUnlocalizedName(par1Str); } - + protected boolean shouldRegisterInNameSet() { return true; } diff --git a/MODSRC/vazkii/botania/common/block/BlockRuneAltar.java b/MODSRC/vazkii/botania/common/block/BlockRuneAltar.java index 8fe41454d..edd72609d 100644 --- a/MODSRC/vazkii/botania/common/block/BlockRuneAltar.java +++ b/MODSRC/vazkii/botania/common/block/BlockRuneAltar.java @@ -41,7 +41,7 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable { setResistance(10.0F); setStepSound(soundStoneFootstep); setUnlocalizedName(LibBlockNames.RUNE_ALTAR); - + random = new Random(); } @@ -67,10 +67,10 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable { ItemStack stack = par5EntityPlayer.getCurrentEquippedItem(); if(stack != null) return ((TileRuneAltar) par1World.getBlockTileEntity(par2, par3, par4)).addItem(par5EntityPlayer, stack); - + return false; } - + @Override public void breakBlock(World par1World, int par2, int par3, int par4, int par5, int par6) { TileSimpleInventory inv = (TileSimpleInventory) par1World.getBlockTileEntity(par2, par3, par4); diff --git a/MODSRC/vazkii/botania/common/block/BlockUnstable.java b/MODSRC/vazkii/botania/common/block/BlockUnstable.java index 00ce24e66..bb4e4b736 100644 --- a/MODSRC/vazkii/botania/common/block/BlockUnstable.java +++ b/MODSRC/vazkii/botania/common/block/BlockUnstable.java @@ -40,7 +40,7 @@ public class BlockUnstable extends BlockMod { setUnlocalizedName(LibBlockNames.UNSTABLE_BLOCK); setTickRandomly(true); } - + @Override public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) @@ -52,28 +52,28 @@ public class BlockUnstable extends BlockMod { GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); return super.setUnlocalizedName(par1Str); } - + @Override protected boolean shouldRegisterInNameSet() { return false; } - + @Override public boolean renderAsNormalBlock() { return false; } - + @Override public boolean isOpaqueCube() { return false; } - + @Override public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { int color = getRenderColor(par1World.getBlockMetadata(par2, par3, par4)); int colorBright = new Color(color).brighter().getRGB(); int colorDark = new Color(color).darker().getRGB(); - + Vector3 origVector = new Vector3(par2 + 0.5, par3 + 0.5, par4 + 0.5); Vector3 endVector = origVector.copy().add(par1World.rand.nextDouble() * 2 - 1, par1World.rand.nextDouble() * 2 - 1, par1World.rand.nextDouble() * 2 - 1); Botania.proxy.lightningFX(par1World, origVector, endVector, 5F, colorDark, colorBright); @@ -83,13 +83,13 @@ public class BlockUnstable extends BlockMod { public int damageDropped(int par1) { return par1; } - + @Override public int getRenderColor(int par1) { float[] color = EntitySheep.fleeceColorTable[par1]; return new Color(color[0], color[1], color[2]).getRGB(); } - + @Override public int colorMultiplier(IBlockAccess par1iBlockAccess, int par2, int par3, int par4) { return getRenderColor(par1iBlockAccess.getBlockMetadata(par2, par3, par4)); diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index eedf9fd0e..2dd5fc90a 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -52,10 +52,10 @@ public final class ModBlocks { for(int i = 0; i < 16; i++) OreDictionary.registerOre(LibOreDict.FLOWER[i], new ItemStack(flower.blockID, 1, i)); - + OreDictionary.registerOre(LibOreDict.LIVING_ROCK, livingrock); OreDictionary.registerOre(LibOreDict.LIVING_WOOD, livingwood); - + initTileEntities(); } diff --git a/MODSRC/vazkii/botania/common/block/subtile/SubTilePureDaisy.java b/MODSRC/vazkii/botania/common/block/subtile/SubTilePureDaisy.java index 95adedade..fcd801365 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/MODSRC/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -94,7 +94,7 @@ public class SubTilePureDaisy extends SubTileEntity { for(int i = 0; i < ticksRemaining.length; i++) cmp.setInteger(TAG_TICKS_REMAINING + i, ticksRemaining[i]); } - + @Override public LexiconEntry getEntry() { return LexiconData.pureDaisy; diff --git a/MODSRC/vazkii/botania/common/block/tile/TileRuneAltar.java b/MODSRC/vazkii/botania/common/block/tile/TileRuneAltar.java index dced069c6..9b1ceefa3 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/MODSRC/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -38,7 +38,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor public boolean addItem(EntityPlayer player, ItemStack stack) { if(stack.itemID == ModItems.twigWand.itemID) return false; - + boolean did = false; for(int i = 0; i < getSizeInventory(); i++) @@ -56,10 +56,10 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor break; } - + if(did) PacketDispatcher.sendPacketToAllInDimension(getDescriptionPacket(), worldObj.provider.dimensionId); - + return true; } @@ -120,10 +120,10 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor break; else items++; - float anglePer = 360F / (float) items; + float anglePer = 360F / items; float totalAngle = 0F; for(int i = 0; i < angles.length; i++) - angles[i] = (totalAngle += anglePer); + angles[i] = totalAngle += anglePer; } public void onWanded(EntityPlayer player, ItemStack wand) { @@ -131,7 +131,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor if(manaToGet > 0 && mana >= manaToGet) { RecipeRuneAltar recipe = null; - + for(RecipeRuneAltar recipe_ : BotaniaAPI.runeAltarRecipes) if(recipe_.matches(this)) { recipe = recipe_; @@ -140,12 +140,12 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor List items = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); EntityItem livingrock = null; - for(EntityItem item : items) + for(EntityItem item : items) if(item.getEntityItem() != null && item.getEntityItem().itemID == ModBlocks.livingrock.blockID) { livingrock = item; break; } - + if(livingrock != null) { int mana = recipe.getManaUsage(); recieveMana(-mana); @@ -154,15 +154,15 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor EntityItem outputItem = new EntityItem(worldObj, xCoord + 0.5, yCoord + 1.5, zCoord + 0.5, output); worldObj.spawnEntityInWorld(outputItem); } - + for(int i = 0; i < getSizeInventory(); i++) setInventorySlotContents(i, null); - ItemStack livingrockItem = livingrock.getEntityItem(); + ItemStack livingrockItem = livingrock.getEntityItem(); livingrockItem.stackSize--; if(livingrockItem.stackSize == 0) livingrock.setDead(); - + craftingFanciness(); updateRecipe(); } diff --git a/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java b/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java index 1832bdec8..1c9a87281 100644 --- a/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -85,7 +85,7 @@ public class InternalMethodHandler implements IInternalMethodHandler { public ItemStack getSubTileAsStack(String subTile) { return ItemBlockSpecialFlower.ofType(subTile); } - + @Override public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe) { return null; diff --git a/MODSRC/vazkii/botania/common/core/helper/Vector3.java b/MODSRC/vazkii/botania/common/core/helper/Vector3.java index ea1e1c757..ac9ec6da7 100644 --- a/MODSRC/vazkii/botania/common/core/helper/Vector3.java +++ b/MODSRC/vazkii/botania/common/core/helper/Vector3.java @@ -276,12 +276,12 @@ public class Vector3 set(0, 0, 0); return this; } - + double m = dotProduct(b)/l; set(b).multiply(m); return this; } - + public Vector3 rotate(double angle, Vector3 axis) { Quat.aroundAxis(axis.copy().normalize(), angle).rotate(this); return this; @@ -291,7 +291,7 @@ public class Vector3 public boolean equals(Object o) { if(!(o instanceof Vector3)) return false; - + Vector3 v = (Vector3)o; return x == v.x && y == v.y && z == v.z; } diff --git a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java index db69be149..55eaef8ff 100644 --- a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java @@ -92,11 +92,11 @@ public class CommonProxy { public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz) { // NO-OP } - + public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, int colorOuter, int colorInner) { lightningFX(world, vectorStart, vectorEnd, ticksPerMeter, System.nanoTime(), colorOuter, colorInner); } - + public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) { // NO-OP } diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index ff1815569..90f3cbc31 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -18,7 +18,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import vazkii.botania.api.BotaniaAPI; diff --git a/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 4360ff7f1..c4472ba68 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -18,7 +18,6 @@ import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibOreDict; public final class ModManaInfusionRecipes { @@ -30,7 +29,7 @@ public final class ModManaInfusionRecipes { manaPetalRecipes = new ArrayList(); for(int i = 0; i < 16; i++) manaPetalRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPetal, 1, i), LibOreDict.PETAL[i], 1000)); - + manasteelRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 0), "ingotIron", 5000); } diff --git a/MODSRC/vazkii/botania/common/crafting/ModRuneRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModRuneRecipes.java index c07f82cf5..49a0e94a0 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModRuneRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModRuneRecipes.java @@ -19,9 +19,9 @@ import vazkii.botania.api.recipe.RecipeRuneAltar; public final class ModRuneRecipes { public static RecipeRuneAltar recipeDebug; - + public static void init() { recipeDebug = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(Item.diamond), 1000, "ingotIron", "cobblestone", "plankWood", "ingotGold"); } - + } diff --git a/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java b/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java index 2ce6cdaa2..6d3a94a00 100644 --- a/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java +++ b/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java @@ -198,7 +198,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { lastYMotion = motionY; lastZMotion = motionZ; } - + @Override public boolean handleWaterMovement() { return false; diff --git a/MODSRC/vazkii/botania/common/item/ItemManaPetal.java b/MODSRC/vazkii/botania/common/item/ItemManaPetal.java index 67cc5ee9d..e22bc22fd 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaPetal.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaPetal.java @@ -11,22 +11,22 @@ */ package vazkii.botania.common.item; -import vazkii.botania.common.lib.LibItemIDs; -import vazkii.botania.common.lib.LibItemNames; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; +import vazkii.botania.common.lib.LibItemIDs; +import vazkii.botania.common.lib.LibItemNames; public class ItemManaPetal extends Item16Colors { public ItemManaPetal() { super(LibItemIDs.idManaPetal, LibItemNames.MANA_PETAL); } - + @Override public boolean hasEffect(ItemStack par1ItemStack, int pass) { return true; } - + @Override public Icon getIconFromDamage(int par1) { return ModItems.petal.getIconFromDamage(par1); diff --git a/MODSRC/vazkii/botania/common/item/ItemRune.java b/MODSRC/vazkii/botania/common/item/ItemRune.java index 5d656ff14..abf0ac228 100644 --- a/MODSRC/vazkii/botania/common/item/ItemRune.java +++ b/MODSRC/vazkii/botania/common/item/ItemRune.java @@ -24,20 +24,20 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemRune extends ItemMod { Icon[] icons; - + public ItemRune() { super(LibItemIDs.idRune); setHasSubtypes(true); setUnlocalizedName(LibItemNames.RUNE); } - + @Override public void registerIcons(IconRegister par1IconRegister) { icons = new Icon[16]; for(int i = 0; i < icons.length; i++) icons[i] = IconHelper.forItem(par1IconRegister, this, i); } - + @Override public Icon getIconFromDamage(int par1) { return icons[Math.min(icons.length - 1, par1)]; @@ -57,5 +57,5 @@ public class ItemRune extends ItemMod { String getUnlocalizedNameLazy(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack); } - + } diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index 1e30a37e8..f73dedc4d 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -38,7 +38,7 @@ public final class ModItems { lens = new ItemLens(); manaPetal = new ItemManaPetal(); rune = new ItemRune(); - + OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal.itemID, 1, i)); diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 2c3d620cb..0996ca8bc 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -20,7 +20,6 @@ import vazkii.botania.common.crafting.ModPetalRecipes; import vazkii.botania.common.lexicon.page.PageCraftingRecipe; import vazkii.botania.common.lexicon.page.PageImage; import vazkii.botania.common.lexicon.page.PagePetalRecipe; -import vazkii.botania.common.lexicon.page.PageRecipe; import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibLexicon; @@ -39,7 +38,7 @@ public final class LexiconData { public static LexiconEntry lexicon; public static LexiconEntry wand; public static LexiconEntry pureDaisy; - + public static LexiconEntry manaIntro; public static LexiconEntry spreader; public static LexiconEntry pool; @@ -65,19 +64,19 @@ public final class LexiconData { wand = new BLexiconEntry(LibLexicon.BASICS_WAND, categoryBasics); wand.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCrafingRecipes.recipesTwigWand)); - + pureDaisy = new BLexiconEntry(LibLexicon.BASICS_PURE_DAISY, categoryBasics); pureDaisy.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_PURE_DAISY), new PagePetalRecipe("2", ModPetalRecipes.pureDaisyRecipe)); - + // MANA ENTRIES manaIntro = new BLexiconEntry(LibLexicon.MANA_INTRO, categoryMana); manaIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2")); - + spreader = new BLexiconEntry(LibLexicon.MANA_SPREADER, categoryMana); spreader.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_SPREADER), new PageText("2"), new PageText("3"), new PageText("4"), new PageCraftingRecipe("5", ModCrafingRecipes.recipesSpreader), new PageText("6"), new PageCraftingRecipe("7", ModCrafingRecipes.recipeManaLens), new PageCraftingRecipe("8", ModCrafingRecipes.recipesLensDying), new PageCraftingRecipe("9", ModCrafingRecipes.recipeRainbowLens)); - -// pool = new BLexiconEntry(LibLexicon.MANA_POOL, categoryMana); -// pool.setPriority().setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaInfusionRecipes.manaPetalRecipes), new PagePetalRecipe("2", ModPetalRecipes.pureDaisyRecipe), new PageRuneRecipe("3", ModRuneRecipes.recipeDebug)); + + // pool = new BLexiconEntry(LibLexicon.MANA_POOL, categoryMana); + // pool.setPriority().setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", ModManaInfusionRecipes.manaPetalRecipes), new PagePetalRecipe("2", ModPetalRecipes.pureDaisyRecipe), new PageRuneRecipe("3", ModRuneRecipes.recipeDebug)); } } diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index 82e4cbfbb..7be6ee75a 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -57,14 +57,14 @@ public class PageCraftingRecipe extends PageRecipe { public void renderScreen(IGuiLexiconEntry gui, int mx, int my) { super.renderScreen(gui, mx, my); } - + @Override public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { oreDictRecipe = shapelessRecipe = false; IRecipe recipe = recipes.get(recipeAt); renderCraftingRecipe(gui, recipe); - + TextureManager render = Minecraft.getMinecraft().renderEngine; render.bindTexture(craftingOverlay); @@ -79,7 +79,7 @@ public class PageCraftingRecipe extends PageRecipe { GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - + if(shapelessRecipe) { ((GuiScreen) gui).drawTexturedModalRect(iconX, iconY, 240, 0, 16, 16); @@ -91,7 +91,7 @@ public class PageCraftingRecipe extends PageRecipe { render.bindTexture(craftingOverlay); GL11.glEnable(GL11.GL_BLEND); - + if(oreDictRecipe) { ((GuiScreen) gui).drawTexturedModalRect(iconX, iconY, 240, 16, 16, 16); diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index 144539e48..835ade1f7 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -35,34 +35,34 @@ import vazkii.botania.common.block.tile.TilePool; public class PageManaInfusionRecipe extends PageRecipe { private static final ResourceLocation manaInfusionOverlay = new ResourceLocation(LibResources.GUI_MANA_INFUSION_OVERLAY); - + List recipes; int ticksElapsed = 0; int recipeAt = 0; - + public PageManaInfusionRecipe(String unlocalizedName, List recipes) { super(unlocalizedName); this.recipes = recipes; } - + public PageManaInfusionRecipe(String unlocalizedName, RecipeManaInfusion recipe) { this(unlocalizedName, Arrays.asList(recipe)); } - + @Override public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { RecipeManaInfusion recipe = recipes.get(recipeAt); TextureManager render = Minecraft.getMinecraft().renderEngine; FontRenderer font = Minecraft.getMinecraft().fontRenderer; - + Object input = recipe.getInput(); if(input instanceof String) input = OreDictionary.getOres((String) input).get(0); - + renderItemAtGridPos(gui, 1, 1, (ItemStack) input, false); renderItemAtGridPos(gui, 2, 1, new ItemStack(ModBlocks.pool), false); renderItemAtGridPos(gui, 3, 1, recipe.getOutput(), false); - + GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); String manaUsage = StatCollector.translateToLocal("botaniamisc.manaUsage"); @@ -70,7 +70,7 @@ public class PageManaInfusionRecipe extends PageRecipe { HUDHandler.renderManaBar(gui.getLeft() + gui.getWidth() / 2 - 50, gui.getTop() + 115, 0x0000FF, 0.75F, recipe.getManaToConsume(), TilePool.MAX_MANA / 10); GL11.glDisable(GL11.GL_BLEND); - + render.bindTexture(manaInfusionOverlay); GL11.glEnable(GL11.GL_BLEND); @@ -79,7 +79,7 @@ public class PageManaInfusionRecipe extends PageRecipe { ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); GL11.glDisable(GL11.GL_BLEND); } - + @Override public void updateScreen() { if(ticksElapsed % 20 == 0) { diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index 94830ea91..aa819ce2b 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -31,44 +31,44 @@ import vazkii.botania.common.block.ModBlocks; public class PagePetalRecipe extends PageRecipe { private static final ResourceLocation petalOverlay = new ResourceLocation(LibResources.GUI_PETAL_OVERLAY); - + List recipes; int ticksElapsed = 0; int recipeAt = 0; - + public PagePetalRecipe(String unlocalizedName, List recipes) { super(unlocalizedName); this.recipes = recipes; } - + public PagePetalRecipe(String unlocalizedName, T recipe) { this(unlocalizedName, Arrays.asList(recipe)); } - + @Override public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { T recipe = recipes.get(recipeAt); TextureManager render = Minecraft.getMinecraft().renderEngine; - + renderItemAtGridPos(gui, 3, 0, recipe.getOutput(), false); renderItemAtGridPos(gui, 2, 1, getMiddleStack(), false); - + List inputs = recipe.getInputs(); - int degreePerInput = (int) (360F / (float) inputs.size()); + int degreePerInput = (int) (360F / inputs.size()); int currentDegree = 0; - + for(Object obj : inputs) { Object input = obj; if(input instanceof String) input = OreDictionary.getOres((String) input).get(0); - + renderItemAtAngle(gui, currentDegree, (ItemStack) input); - + currentDegree += degreePerInput; } renderManaBar(gui, recipe, mx, my); - + render.bindTexture(petalOverlay); GL11.glEnable(GL11.GL_BLEND); @@ -77,15 +77,15 @@ public class PagePetalRecipe extends PageRecipe { ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); GL11.glDisable(GL11.GL_BLEND); } - + ItemStack getMiddleStack() { return new ItemStack(ModBlocks.altar); } - + public void renderManaBar(IGuiLexiconEntry gui, T recipe, int mx, int my) { // NO-OP } - + @Override public void updateScreen() { if(ticksElapsed % 20 == 0) { diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PageRecipe.java index b799e7859..210bce9ef 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -16,12 +16,10 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraftforge.client.ForgeHooksClient; @@ -36,7 +34,7 @@ public class PageRecipe extends LexiconPage { int relativeMouseX, relativeMouseY; ItemStack tooltipStack, tooltipContainerStack; - + public PageRecipe(String unlocalizedName) { super(unlocalizedName); } @@ -47,13 +45,13 @@ public class PageRecipe extends LexiconPage { relativeMouseY = my; renderRecipe(gui, mx, my); - + int width = gui.getWidth() - 30; int height = gui.getHeight(); int x = gui.getLeft() + 16; int y = gui.getTop() + height - 40; PageText.renderText(x, y, width, height, getUnlocalizedName()); - + if(tooltipStack != null) { List tooltipData = tooltipStack.getTooltip(Minecraft.getMinecraft().thePlayer, false); @@ -64,11 +62,11 @@ public class PageRecipe extends LexiconPage { tooltipStack = tooltipContainerStack = null; GL11.glDisable(GL11.GL_BLEND); } - + public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { // NO-OP } - + public void renderItemAtAngle(IGuiLexiconEntry gui, int angle, ItemStack stack) { if(stack == null || stack.getItem() == null) return; @@ -87,7 +85,7 @@ public class PageRecipe extends LexiconPage { renderItem(gui, (int) xPos, (int) yPos, stack1, false); } - + public void renderItemAtGridPos(IGuiLexiconEntry gui, int x, int y, ItemStack stack, boolean accountForContainer) { if(stack == null || stack.getItem() == null) return; @@ -104,7 +102,7 @@ public class PageRecipe extends LexiconPage { renderItem(gui, xPos, yPos, stack1, accountForContainer); } - + public void renderItem(IGuiLexiconEntry gui, int xPos, int yPos, ItemStack stack, boolean accountForContainer) { RenderItem render = new RenderItem(); TextureManager renderEngine = Minecraft.getMinecraft().renderEngine; @@ -116,7 +114,7 @@ public class PageRecipe extends LexiconPage { render.renderItemIntoGUI(fontRenderer, renderEngine, stack, xPos, yPos); render.renderItemOverlayIntoGUI(fontRenderer, renderEngine, stack, xPos, yPos); GL11.glTranslatef(0F, 0F, -200F); - + if(relativeMouseX >= xPos && relativeMouseY >= yPos && relativeMouseX <= xPos + 16 && relativeMouseY <= yPos + 16) { tooltipStack = stack; if(accountForContainer) { @@ -128,5 +126,5 @@ public class PageRecipe extends LexiconPage { GL11.glDisable(GL11.GL_LIGHTING); } - + } diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index 01793d740..5acb6922b 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -35,12 +35,12 @@ public class PageRuneRecipe extends PagePetalRecipe { public PageRuneRecipe(String unlocalizedName, RecipeRuneAltar recipes) { super(unlocalizedName, recipes); } - + @Override ItemStack getMiddleStack() { return new ItemStack(ModBlocks.runeAltar); } - + @Override public void renderManaBar(IGuiLexiconEntry gui, RecipeRuneAltar recipe, int mx, int my) { FontRenderer font = Minecraft.getMinecraft().fontRenderer; @@ -52,5 +52,5 @@ public class PageRuneRecipe extends PagePetalRecipe { HUDHandler.renderManaBar(gui.getLeft() + gui.getWidth() / 2 - 50, gui.getTop() + 130, 0x0000FF, 0.75F, recipe.getManaUsage(), TilePool.MAX_MANA / 10); GL11.glDisable(GL11.GL_BLEND); } - + } diff --git a/MODSRC/vazkii/botania/common/lib/LibLexicon.java b/MODSRC/vazkii/botania/common/lib/LibLexicon.java index 9a8304d91..6f03b3ba0 100644 --- a/MODSRC/vazkii/botania/common/lib/LibLexicon.java +++ b/MODSRC/vazkii/botania/common/lib/LibLexicon.java @@ -32,7 +32,7 @@ public final class LibLexicon { public static final String MANA_INTRO = "mIntro"; public static final String MANA_SPREADER = "spreader"; public static final String MANA_POOL = "pool"; - + public static final String FFLOWER_INTRO = "fIntro"; public static final String GFLOWER_INTRO = "gIntro"; diff --git a/MODSRC/vazkii/botania/common/lib/LibOreDict.java b/MODSRC/vazkii/botania/common/lib/LibOreDict.java index 8bb04de8e..f5b45514e 100644 --- a/MODSRC/vazkii/botania/common/lib/LibOreDict.java +++ b/MODSRC/vazkii/botania/common/lib/LibOreDict.java @@ -11,7 +11,7 @@ */ package vazkii.botania.common.lib; -public final class LibOreDict { +public final class LibOreDict { public static final String LEXICON = "lexicaBotania"; public static final String PESTLE_AND_MORTAR = "pestleAndMortar"; @@ -33,11 +33,11 @@ public final class LibOreDict { public static final String[] DYE = new String[] { "dyeWhite", "dyeOrange", "dyeMagenta", "dyeLightBlue", "dyeYellow", "dyeLime", "dyePink", "dyeGray", "dyeLightGray", "dyeCyan", "dyePurple", "dyeBlue", "dyeBrown", "dyeGreen", "dyeRed", "dyeBlack", }; - + public static final String[] MANA_PETAL = new String[] { "manaPetalWhite", "manaPetalOrange", "manaPetalMagenta", "manaPetalLightBlue", "manaPetalYellow", "manaPetalLime", "manaPetalPink", "manaPetalGray", "manaPetalLightGray", "manaPetalCyan", "manaPetalPurple", "manaPetalBlue", "manaPetalBrown", "manaPetalGreen", "manaPetalRed", "manaPetalBlack", }; - + public static final String[] RUNE = new String[] { "runeWaterB", "runeFireB", "runeEarthB", "runeAirB", "runeSpringB", "runeSummerB", "runeAutumnB", "runeWinterB", "runeManaB", "runeLustB", "runeGluttonyB", "runeGreedB", "runeSlothB", "runeWrathB", "runeEnvyB", "runePrideB" };