From 4eeadecc98ef4d1a626819231a0321b33ee05896 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Wed, 1 Apr 2015 00:34:50 +0100 Subject: [PATCH] Cleanup. --- .../java/vazkii/botania/api/BotaniaAPI.java | 2 +- .../api/internal/DummyMethodHandler.java | 4 +- .../api/internal/IInternalMethodHandler.java | 2 +- .../java/vazkii/botania/api/item/IRelic.java | 9 +- .../botania/api/item/ISequentialBreaker.java | 6 +- .../IWireframeCoordinateListProvider.java | 2 +- .../botania/api/subtile/RadiusDescriptor.java | 44 +-- .../botania/api/subtile/SubTileEntity.java | 4 +- .../core/handler/BoundTileRenderer.java | 4 +- .../client/core/handler/HUDHandler.java | 2 +- .../handler/SubTileRadiusRenderHandler.java | 37 +- .../client/gui/lexicon/GuiLexiconEntry.java | 1 - .../render/block/RenderDoubleFlower.java | 58 ++- .../render/entity/RenderPinkWither.java | 34 +- .../render/tile/RenderTileFloatingFlower.java | 2 - .../common/achievement/AchievementMod.java | 4 +- .../common/achievement/ModAchievements.java | 4 +- .../botania/common/block/BlockAltar.java | 2 +- .../common/block/BlockModDoubleFlower.java | 42 +-- .../botania/common/block/BlockModFlower.java | 2 +- .../botania/common/block/ModBlocks.java | 4 +- .../block/corporea/BlockCorporeaBase.java | 2 +- .../block/decor/BlockFloatingFlower.java | 9 +- .../common/block/decor/BlockShinyFlower.java | 2 +- .../common/block/decor/IFloatingFlower.java | 22 +- .../botania/common/block/mana/BlockPump.java | 4 +- .../block/subtile/SubTilePureDaisy.java | 2 +- .../functional/SubTileAgricarnation.java | 5 +- .../subtile/functional/SubTileBellethorn.java | 5 +- .../subtile/functional/SubTileClayconia.java | 4 +- .../subtile/functional/SubTileDaffomill.java | 6 +- .../subtile/functional/SubTileExoflame.java | 2 +- .../functional/SubTileFallenKanade.java | 6 +- .../functional/SubTileHeiseiDream.java | 4 +- .../subtile/functional/SubTileHopperhock.java | 7 +- .../subtile/functional/SubTileHyacidus.java | 5 +- .../functional/SubTileJadedAmaranthus.java | 3 +- .../functional/SubTileMarimorphosis.java | 4 +- .../subtile/functional/SubTileMedumone.java | 6 +- .../functional/SubTilePollidisiac.java | 5 +- .../functional/SubTileRannuncarpus.java | 5 +- .../functional/SubTileSpectranthemum.java | 2 +- .../functional/SubTileTangleberrie.java | 2 +- .../subtile/functional/SubTileTigerseye.java | 7 +- .../subtile/functional/SubTileVinculotus.java | 4 +- .../subtile/functional/SubtileOrechid.java | 3 +- .../subtile/generating/SubTileArcaneRose.java | 6 +- .../subtile/generating/SubTileEndoflame.java | 2 +- .../generating/SubTileEntropinnyum.java | 3 +- .../generating/SubTileGourmaryllis.java | 2 +- .../generating/SubTileHydroangeas.java | 3 +- .../subtile/generating/SubTileKekimurus.java | 5 +- .../subtile/generating/SubTileMunchdew.java | 5 +- .../subtile/generating/SubTileNarslimmus.java | 4 +- .../subtile/generating/SubTileSpectrolus.java | 3 +- .../common/block/tile/TileFloatingFlower.java | 5 +- .../block/tile/TileFloatingSpecialFlower.java | 7 +- .../common/block/tile/mana/TilePump.java | 12 +- .../common/core/handler/ConfigHandler.java | 6 +- .../common/core/handler/IMCHandler.java | 28 +- .../core/handler/InternalMethodHandler.java | 2 +- .../common/crafting/ModCraftingRecipes.java | 8 +- .../crafting/recipe/AesirRingRecipe.java | 11 +- .../common/crafting/recipe/KeepIvyRecipe.java | 3 +- .../common/entity/EntityDoppleganger.java | 2 +- .../common/entity/EntityPinkWither.java | 86 ++--- .../common/entity/EntityPoolMinecart.java | 10 +- .../botania/common/entity/ModEntities.java | 1 - .../common/item/ItemBlackHoleTalisman.java | 347 +++++++++--------- .../botania/common/item/ItemGrassSeeds.java | 4 +- .../botania/common/item/ItemKeepIvy.java | 24 +- .../botania/common/item/ItemPinkinator.java | 5 +- .../vazkii/botania/common/item/ModItems.java | 2 +- .../common/item/block/IRarityBlock.java | 2 +- .../item/equipment/bauble/ItemBauble.java | 2 +- .../item/equipment/bauble/ItemMagnetRing.java | 2 +- .../item/equipment/tool/ItemTerraPick.java | 4 +- .../botania/common/item/material/ItemDye.java | 1 - .../common/item/relic/ItemAesirRing.java | 19 +- .../botania/common/item/relic/ItemDice.java | 26 +- .../common/item/relic/ItemExcaliber.java | 46 +-- .../common/item/relic/ItemFlugelEye.java | 37 +- .../common/item/relic/ItemInfiniteFruit.java | 10 +- .../common/item/relic/ItemLokiRing.java | 44 +-- .../common/item/relic/ItemOdinRing.java | 18 +- .../botania/common/item/relic/ItemRelic.java | 36 +- .../common/item/relic/ItemRelicBauble.java | 16 +- .../common/item/relic/ItemThorRing.java | 10 +- .../botania/common/lexicon/LexiconData.java | 10 +- .../common/lib/LibAchievementNames.java | 2 +- .../botania/common/lib/LibItemNames.java | 2 +- .../vazkii/botania/common/lib/LibOreDict.java | 6 +- web/css/botania.css | 10 + 93 files changed, 620 insertions(+), 674 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index ba16ca6f7..0ab58bbe7 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -85,7 +85,7 @@ public final class BotaniaAPI { public static ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 4, 2300, 9F, 3F, 26); public static EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", EnumChatFormatting.GOLD, "Relic"); - + public static KnowledgeType basicKnowledge, elvenKnowledge; // All of these categories are initialized during botania's PreInit stage. diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 94d165359..3a111cf23 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -183,6 +183,6 @@ public class DummyMethodHandler implements IInternalMethodHandler { public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, int x, int y, int z, int side) { // NO-OP } - - + + } diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index b3f257743..f9485232b 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -87,7 +87,7 @@ public interface IInternalMethodHandler { public IInventory getBaublesInventory(EntityPlayer player); public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, int x, int y, int z, int side); - + @SideOnly(Side.CLIENT) public void drawSimpleManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res); diff --git a/src/main/java/vazkii/botania/api/item/IRelic.java b/src/main/java/vazkii/botania/api/item/IRelic.java index e8491a1a4..aecd1cde4 100644 --- a/src/main/java/vazkii/botania/api/item/IRelic.java +++ b/src/main/java/vazkii/botania/api/item/IRelic.java @@ -10,7 +10,6 @@ */ package vazkii.botania.api.item; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; @@ -24,20 +23,20 @@ public interface IRelic { * Binds to the player name passed in. */ public void bindToUsername(String playerName, ItemStack stack); - + /** * Gets the username of the person this relic is bound to. */ public String getSoulbindUsername(ItemStack stack); - + /** * Sets the achievement that this relic binds to. */ public void setBindAchievement(Achievement achievement); - + /** * Gets the achievement that this relic binds to. */ public Achievement getBindAchievement(); - + } diff --git a/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java b/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java index d135abfdb..87af2d04d 100644 --- a/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java +++ b/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java @@ -16,12 +16,12 @@ import net.minecraft.item.ItemStack; /** * An item that implements this can break multiple blocks at once * with a Ring of Loki. Usage of this interface requires an implementation - * (see ItemTerraPick). + * (see ItemTerraPick). */ public interface ISequentialBreaker { public void breakOtherBlock(EntityPlayer player, ItemStack stack, int x, int y, int z, int originX, int originY, int originZ, int side); - + public boolean disposeOfTrashBlocks(ItemStack stack); - + } diff --git a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java index 827163d39..d419c992e 100644 --- a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java @@ -22,7 +22,7 @@ import net.minecraft.util.ChunkCoordinates; * armor slot or bauble slots. */ public interface IWireframeCoordinateListProvider { - + /** * Returns a list of ChunkCoordinates for the wireframes to draw. * Can be null. diff --git a/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java b/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java index 66e9cfe01..f57b6fa71 100644 --- a/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java +++ b/src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java @@ -15,75 +15,75 @@ import net.minecraft.util.ChunkCoordinates; /** * This object describes the Radius of a SubTileEntity. It can either be - * a circle or rectangle, it's to note that the + * a circle or rectangle, it's to note that the */ public class RadiusDescriptor { final ChunkCoordinates subtileCoords; - + public RadiusDescriptor(ChunkCoordinates subtileCoords) { this.subtileCoords = subtileCoords; } - + public ChunkCoordinates getSubtileCoords() { return subtileCoords; } - + public boolean isCircle() { return false; } - + public double getCircleRadius() { return 0; } - + public AxisAlignedBB getAABB() { return null; } - + public static class Circle extends RadiusDescriptor { - - final double radius; - + + final double radius; + public Circle(ChunkCoordinates subtileCoords, double radius) { super(subtileCoords); this.radius = radius; } - + @Override public boolean isCircle() { return true; } - + @Override public double getCircleRadius() { return radius; } - + } - + public static class Rectangle extends RadiusDescriptor { - + final AxisAlignedBB aabb; - + public Rectangle(ChunkCoordinates subtileCoords, AxisAlignedBB aabb) { super(subtileCoords); this.aabb = aabb; } - + @Override public AxisAlignedBB getAABB() { return aabb; } - + } - + public static class Square extends Rectangle { - + public Square(ChunkCoordinates subtileCoords, int expand) { super(subtileCoords, AxisAlignedBB.getBoundingBox(subtileCoords.posX - expand, subtileCoords.posY, subtileCoords.posZ - expand, subtileCoords.posX + 1 + expand, subtileCoords.posY, subtileCoords.posZ + 1 + expand)); } - + } - + } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index e348dfc70..6598cfe90 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -152,7 +152,7 @@ public class SubTileEntity { public ChunkCoordinates getBinding() { return null; } - + /** * Returns a descriptor for the radius of this sub tile. This is called while a player * is looking at the block with a Manaseer Monocle (IBurstViewerBauble). @@ -161,7 +161,7 @@ public class SubTileEntity { public RadiusDescriptor getRadius() { return null; } - + /** * Gets a ChunkCoordinates instance with the position of this sub tile. */ 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 70e05723b..48a6de2a6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -52,7 +52,7 @@ public final class BoundTileRenderer { if(coords != null) renderBlockOutlineAt(coords, color); } - + IInventory mainInv = player.inventory; IInventory baublesInv = BotaniaAPI.internalHandler.getBaublesInventory(player); @@ -65,7 +65,7 @@ public final class BoundTileRenderer { boolean useBaubles = i >= invSize; IInventory inv = useBaubles ? baublesInv : mainInv; ItemStack stackInSlot = inv.getStackInSlot(i - (useBaubles ? invSize : 0)); - + if(stackInSlot != null && stackInSlot.getItem() instanceof IWireframeCoordinateListProvider) { IWireframeCoordinateListProvider provider = (IWireframeCoordinateListProvider) stackInSlot.getItem(); List coordsList = provider.getWireframesToDraw(player, stackInSlot); 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 86bf1f170..900617e3b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -107,7 +107,7 @@ public final class HUDHandler { ItemCraftingHalo.renderHUD(event.resolution, mc.thePlayer, equippedStack); profiler.endSection(); } - + if(equippedStack != null && equippedStack.getItem() == ModItems.flugelEye) { profiler.startSection("flugelEye"); ItemFlugelEye.renderHUD(event.resolution, mc.thePlayer, equippedStack); diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index 700d57c96..16547b29b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -12,16 +12,13 @@ package vazkii.botania.client.core.handler; import java.awt.Color; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import org.lwjgl.opengl.GL11; @@ -29,7 +26,6 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.wand.IWireframeAABBProvider; import vazkii.botania.common.Botania; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -38,9 +34,8 @@ public final class SubTileRadiusRenderHandler { @SubscribeEvent public void onWorldRenderLast(RenderWorldLastEvent event) { Minecraft mc = Minecraft.getMinecraft(); - EntityPlayer player = mc.thePlayer; MovingObjectPosition pos = mc.objectMouseOver; - + if(!Botania.proxy.isClientPlayerWearingMonocle() || pos == null || pos.entityHit != null) return; TileEntity tile = mc.theWorld.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); @@ -53,23 +48,23 @@ public final class SubTileRadiusRenderHandler { RadiusDescriptor descriptor = subtile.getRadius(); if(descriptor == null) return; - + GL11.glPushMatrix(); GL11.glDisable(GL11.GL_TEXTURE_2D); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - + Tessellator.renderingWorldRenderer = false; if(descriptor.isCircle()) renderCircle(descriptor.getSubtileCoords(), descriptor.getCircleRadius()); else renderRectangle(descriptor.getAABB()); - + GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glDisable(GL11.GL_BLEND); GL11.glPopMatrix(); } - + public void renderRectangle(AxisAlignedBB aabb) { GL11.glPushMatrix(); GL11.glTranslated(aabb.minX - RenderManager.renderPosX, aabb.minY - RenderManager.renderPosY, aabb.minZ - RenderManager.renderPosZ); @@ -80,9 +75,8 @@ public final class SubTileRadiusRenderHandler { double f = 1F / 16F; double x = aabb.maxX - aabb.minX - f; - double y = aabb.maxY - aabb.minY - f; double z = aabb.maxZ - aabb.minZ - f; - + Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.addVertex(x, f, f); @@ -90,9 +84,8 @@ public final class SubTileRadiusRenderHandler { tessellator.addVertex(f, f, z); tessellator.addVertex(x, f, z); tessellator.draw(); - + x += f; - y += f; z += f; double f1 = f + f / 4F; GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); @@ -102,10 +95,10 @@ public final class SubTileRadiusRenderHandler { tessellator.addVertex(0, f1, z); tessellator.addVertex(x, f1, z); tessellator.draw(); - + GL11.glPopMatrix(); } - + public void renderCircle(ChunkCoordinates center, double radius) { GL11.glPushMatrix(); double x = center.posX + 0.5; @@ -118,31 +111,31 @@ public final class SubTileRadiusRenderHandler { GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 32); double f = 1F / 16F; - + int totalAngles = 360; int drawAngles = 360; int step = totalAngles / drawAngles; - + radius -= f; Tessellator tessellator = Tessellator.instance; tessellator.startDrawing(GL11.GL_TRIANGLE_FAN); tessellator.addVertex(0, f, 0); for(int i = 0; i < totalAngles + 1; i += step) { - double rad = (double) (totalAngles - i) * Math.PI / 180.0; + double rad = (totalAngles - i) * Math.PI / 180.0; double xp = Math.cos(rad) * radius; double zp = Math.sin(rad) * radius; tessellator.addVertex(xp, f, zp); } tessellator.addVertex(0, f, 0); tessellator.draw(); - + radius += f; double f1 = f + f / 4F; GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64); tessellator.startDrawing(GL11.GL_TRIANGLE_FAN); tessellator.addVertex(0, f1, 0); for(int i = 0; i < totalAngles + 1; i += step) { - double rad = (double) (totalAngles - i) * Math.PI / 180.0; + double rad = (totalAngles - i) * Math.PI / 180.0; double xp = Math.cos(rad) * radius; double zp = Math.sin(rad) * radius; tessellator.addVertex(xp, f1, zp); @@ -151,5 +144,5 @@ public final class SubTileRadiusRenderHandler { tessellator.draw(); GL11.glPopMatrix(); } - + } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index 9cffb7f9d..7164e1b39 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -33,7 +33,6 @@ import vazkii.botania.client.gui.lexicon.button.GuiButtonBackWithShift; import vazkii.botania.client.gui.lexicon.button.GuiButtonPage; import vazkii.botania.client.gui.lexicon.button.GuiButtonShare; import vazkii.botania.client.gui.lexicon.button.GuiButtonViewOnline; -import vazkii.botania.common.lexicon.LexiconData; public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IParented { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java b/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java index f0156ea64..56bfc46d7 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderDoubleFlower.java @@ -10,15 +10,13 @@ */ package vazkii.botania.client.render.block; -import vazkii.botania.client.lib.LibRenderIDs; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; -import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import vazkii.botania.client.lib.LibRenderIDs; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderDoubleFlower implements ISimpleBlockRenderingHandler { @@ -29,38 +27,30 @@ public class RenderDoubleFlower implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess world, int p_147774_2_, int p_147774_3_, int p_147774_4_, Block block, int modelId, RenderBlocks renderer) { - BlockDoublePlant p_147774_1_ = (BlockDoublePlant) block; + BlockDoublePlant p_147774_1_ = (BlockDoublePlant) block; Tessellator tessellator = Tessellator.instance; - tessellator.setBrightness(p_147774_1_.getMixedBrightnessForBlock(world, p_147774_2_, p_147774_3_, p_147774_4_)); - tessellator.setColorOpaque_F(1F, 1F, 1F); - long j1 = (long)(p_147774_2_ * 3129871) ^ (long)p_147774_4_ * 116129781L; - j1 = j1 * j1 * 42317861L + j1 * 11L; - double d19 = (double)p_147774_2_; - double d0 = (double)p_147774_3_; - double d1 = (double)p_147774_4_; - d19 += ((double)((float)(j1 >> 16 & 15L) / 15.0F) - 0.5D) * 0.3D; - d1 += ((double)((float)(j1 >> 24 & 15L) / 15.0F) - 0.5D) * 0.3D; - int i1 = world.getBlockMetadata(p_147774_2_, p_147774_3_, p_147774_4_); - boolean flag = false; - boolean flag1 = BlockDoublePlant.func_149887_c(i1); - int k1; + tessellator.setBrightness(p_147774_1_.getMixedBrightnessForBlock(world, p_147774_2_, p_147774_3_, p_147774_4_)); + tessellator.setColorOpaque_F(1F, 1F, 1F); + long j1 = p_147774_2_ * 3129871 ^ p_147774_4_ * 116129781L; + j1 = j1 * j1 * 42317861L + j1 * 11L; + int i1 = world.getBlockMetadata(p_147774_2_, p_147774_3_, p_147774_4_); + boolean flag1 = BlockDoublePlant.func_149887_c(i1); + if (flag1) + { + if (world.getBlock(p_147774_2_, p_147774_3_ - 1, p_147774_4_) != p_147774_1_) + { + return false; + } - if (flag1) - { - if (world.getBlock(p_147774_2_, p_147774_3_ - 1, p_147774_4_) != p_147774_1_) - { - return false; - } + BlockDoublePlant.func_149890_d(world.getBlockMetadata(p_147774_2_, p_147774_3_ - 1, p_147774_4_)); + } + else + { + BlockDoublePlant.func_149890_d(i1); + } - k1 = BlockDoublePlant.func_149890_d(world.getBlockMetadata(p_147774_2_, p_147774_3_ - 1, p_147774_4_)); - } - else - { - k1 = BlockDoublePlant.func_149890_d(i1); - } - - RenderSpecialFlower.drawCrossedSquares(world, block, p_147774_2_, p_147774_3_, p_147774_4_, p_147774_2_, p_147774_3_, p_147774_4_, 1F, renderer); - return true; + RenderSpecialFlower.drawCrossedSquares(world, block, p_147774_2_, p_147774_3_, p_147774_4_, p_147774_2_, p_147774_3_, p_147774_4_, 1F, renderer); + return true; } @Override @@ -72,5 +62,5 @@ public class RenderDoubleFlower implements ISimpleBlockRenderingHandler { public int getRenderId() { return LibRenderIDs.idDoubleFlower; } - + } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java index da2b36652..a6806ca39 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java @@ -10,32 +10,30 @@ */ package vazkii.botania.client.render.entity; -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.client.lib.LibResources; -import net.minecraft.client.model.ModelWither; import net.minecraft.client.renderer.entity.RenderWither; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.boss.BossStatus; import net.minecraft.entity.boss.EntityWither; import net.minecraft.util.ResourceLocation; +import vazkii.botania.client.lib.LibResources; public class RenderPinkWither extends RenderWither { private static final ResourceLocation resource = new ResourceLocation(LibResources.MODEL_PINK_WITHER); - + int idk = -1; - - public void doRender(EntityWither p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { - super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); - if(BossStatus.bossName.equals(p_76986_1_.func_145748_c_().getFormattedText())) { - BossStatus.statusBarTime = -1; - BossStatus.hasColorModifier = false; - } - } - + @Override - protected ResourceLocation getEntityTexture(EntityWither p_110775_1_) { - return resource; - } - + public void doRender(EntityWither p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { + super.doRender(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_); + if(BossStatus.bossName.equals(p_76986_1_.func_145748_c_().getFormattedText())) { + BossStatus.statusBarTime = -1; + BossStatus.hasColorModifier = false; + } + } + + @Override + protected ResourceLocation getEntityTexture(EntityWither p_110775_1_) { + return resource; + } + } 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 266d0db97..bea58c6d8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -20,12 +20,10 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelMiniIsland; import vazkii.botania.common.block.decor.IFloatingFlower; diff --git a/src/main/java/vazkii/botania/common/achievement/AchievementMod.java b/src/main/java/vazkii/botania/common/achievement/AchievementMod.java index 33a81f1e7..7da1fa5f2 100644 --- a/src/main/java/vazkii/botania/common/achievement/AchievementMod.java +++ b/src/main/java/vazkii/botania/common/achievement/AchievementMod.java @@ -13,11 +13,11 @@ package vazkii.botania.common.achievement; import java.util.ArrayList; import java.util.List; -import vazkii.botania.api.item.IRelic; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import vazkii.botania.api.item.IRelic; public class AchievementMod extends Achievement { @@ -27,7 +27,7 @@ public class AchievementMod extends Achievement { super("achievement.botania:" + name, "botania:" + name, x, y, icon, parent); achievements.add(this); registerStat(); - + if(icon.getItem() instanceof IRelic) ((IRelic) icon.getItem()).setBindAchievement(this); } diff --git a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java index d3797f14e..e97d1453f 100644 --- a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java +++ b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java @@ -90,7 +90,7 @@ public final class ModAchievements { heiseiDreamPickup = new AchievementMod(LibAchievementNames.HEISEI_DREAM_PICKUP, 5, 6, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HEISEI_DREAM), elfPortalOpen); enderAirMake = new AchievementMod(LibAchievementNames.ENDER_AIR_MAKE, 4, 8, new ItemStack(ModItems.manaResource, 1, 15), elfPortalOpen); corporeaCraft = new AchievementMod(LibAchievementNames.CORPOREA_CRAFT, 2, 8, ModBlocks.corporeaFunnel, enderAirMake); - + gaiaGuardianKill = new AchievementMod(LibAchievementNames.GAIA_GUARDIAN_KILL, 2, 4, new ItemStack(ModItems.manaResource, 1, 5), elfPortalOpen).setSpecial(); spawnerMoverUse = new AchievementMod(LibAchievementNames.SPAWNER_MOVER_USE, -1, 5, ModItems.spawnerMover, gaiaGuardianKill); @@ -110,7 +110,7 @@ public final class ModAchievements { relicOdinRing = new AchievementMod(LibAchievementNames.RELIC_ODIN_RING, -9, 6, ModItems.odinRing, null); relicLokiRing = new AchievementMod(LibAchievementNames.RELIC_LOKI_RING, -5, 6, ModItems.lokiRing, null); relicAesirRing = new AchievementMod(LibAchievementNames.RELIC_AESIR_RING, -7, 5, ModItems.aesirRing, null).setSpecial(); - + ItemStack desu = new ItemStack(ModItems.manaGun); desu.setStackDisplayName("desu gun"); desuGun = new AchievementMod(LibAchievementNames.DESU_GUN, -8, -2, desu, null).setSpecial(); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 0eb42e51c..3e0733052 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -117,7 +117,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { par5EntityPlayer.dropPlayerItemWithRandomChoice(bucket, false); stack.stackSize--; } - + if(tile.hasLava) tile.setLava(false); else tile.setWater(false); diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 000ab4038..07aad215a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -21,16 +21,11 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; -import net.minecraft.stats.StatList; import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.event.ForgeEventFactory; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; @@ -65,34 +60,33 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str); return super.setBlockName(par1Str); } - + @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { return null; - } + } @Override - public int damageDropped(int p_149692_1_) { - return p_149692_1_ & 7; - } - - @Override - public void func_149889_c(World p_149889_1_, int p_149889_2_, int p_149889_3_, int p_149889_4_, int p_149889_5_, int p_149889_6_) { - p_149889_1_.setBlock(p_149889_2_, p_149889_3_, p_149889_4_, this, p_149889_5_, p_149889_6_); - p_149889_1_.setBlock(p_149889_2_, p_149889_3_ + 1, p_149889_4_, this, p_149889_5_ | 8, p_149889_6_); - } + public int damageDropped(int p_149692_1_) { + return p_149692_1_ & 7; + } @Override - public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { - int l = ((MathHelper.floor_double((double)(p_149689_5_.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) + 2) % 4; - p_149689_1_.setBlock(p_149689_2_, p_149689_3_ + 1, p_149689_4_, this, p_149689_6_.getItemDamage() | 8, 2); - } - + public void func_149889_c(World p_149889_1_, int p_149889_2_, int p_149889_3_, int p_149889_4_, int p_149889_5_, int p_149889_6_) { + p_149889_1_.setBlock(p_149889_2_, p_149889_3_, p_149889_4_, this, p_149889_5_, p_149889_6_); + p_149889_1_.setBlock(p_149889_2_, p_149889_3_ + 1, p_149889_4_, this, p_149889_5_ | 8, p_149889_6_); + } + + @Override + public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) { + p_149689_1_.setBlock(p_149689_2_, p_149689_3_ + 1, p_149689_4_, this, p_149689_6_.getItemDamage() | 8, 2); + } + @Override public boolean func_149851_a(World world, int x, int y, int z, boolean fuckifiknow) { return false; } - + @Override public boolean isShearable(ItemStack item, IBlockAccess world, int x, int y, int z) { return true; @@ -104,7 +98,7 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab ret.add(new ItemStack(this, 1, world.getBlockMetadata(x, y, z) & 7)); return ret; } - + @Override public ArrayList getDrops(World world, int x, int y, int z, int meta, int fortune) { return new ArrayList(); diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 4d54628d8..686c5d097 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -151,5 +151,5 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup world.setBlock(x, y, z, flower, placeMeta, 1 | 2); world.setBlock(x, y + 1, z, flower, placeMeta | 8, 1 | 2); } - + } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 77560976a..fc671a4d4 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -276,7 +276,7 @@ public final class ModBlocks { pump = new BlockPump(); doubleFlower1 = new BlockModDoubleFlower(false); doubleFlower2 = new BlockModDoubleFlower(true); - + ModFluffBlocks.init(); for(int i = 0; i < 16; i++) @@ -290,7 +290,7 @@ public final class ModBlocks { OreDictionary.registerOre(LibOreDict.DOUBLE_FLOWER[i], new ItemStack(doubleFlower1, 1, i)); OreDictionary.registerOre(LibOreDict.DOUBLE_FLOWER[i + 8], new ItemStack(doubleFlower2, 1, i)); } - + // Vanilla OreDict entries OreDictionary.registerOre("dirt", Blocks.dirt); OreDictionary.registerOre("grass", Blocks.grass); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index c950e49a1..4be814d28 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -80,5 +80,5 @@ public abstract class BlockCorporeaBase extends BlockModContainer 1) mana--; } - + public boolean canAcceptItem(ItemStack stack, List filter, int filterType) { if(stack == null) return false; @@ -189,7 +188,7 @@ public class SubTileHopperhock extends SubTileFunctional { public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), mana > 0 ? RANGE_MANA : RANGE); } - + @Override public void writeToPacketNBT(NBTTagCompound cmp) { super.writeToPacketNBT(cmp); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java index a1b1b6535..c658d1d6a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java @@ -21,13 +21,12 @@ import net.minecraft.util.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.RadiusDescriptor.Square; import vazkii.botania.common.lexicon.LexiconData; public class SubTileHyacidus extends SubTileFunctional { private static final int RANGE = 6; - + @Override public void onUpdate() { super.onUpdate(); @@ -65,7 +64,7 @@ public class SubTileHyacidus extends SubTileFunctional { public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); } - + @Override public LexiconEntry getEntry() { return LexiconData.hyacidus; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java index 155d0ba63..8501cd179 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java @@ -15,7 +15,6 @@ import net.minecraft.block.material.Material; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.RadiusDescriptor.Square; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; @@ -67,7 +66,7 @@ public class SubTileJadedAmaranthus extends SubTileFunctional { public int getColor() { return 0x961283; } - + @Override public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java index 5e035c167..e25368674 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java @@ -32,7 +32,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { private static final int COST = 12; private static final int RANGE = 8; private static final int RANGE_Y = 5; - + private static final Type[] TYPES = new Type[] { Type.FOREST, Type.PLAINS, @@ -107,7 +107,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); } - + @Override public int getColor() { return 0x769897; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java index 8a7c1edde..ec614af02 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java @@ -23,9 +23,9 @@ import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; public class SubTileMedumone extends SubTileFunctional { - + private static final int RANGE = 6; - + @Override public void onUpdate() { super.onUpdate(); @@ -52,7 +52,7 @@ public class SubTileMedumone extends SubTileFunctional { public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); } - + @Override public int getColor() { return 0x3D2204; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index e85d9ad43..95d81b8e9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -18,7 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.RadiusDescriptor.Square; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; @@ -27,7 +26,7 @@ import cpw.mods.fml.relauncher.ReflectionHelper; public class SubTilePollidisiac extends SubTileFunctional { private static final int RANGE = 6; - + @Override public void onUpdate() { super.onUpdate(); @@ -64,7 +63,7 @@ public class SubTilePollidisiac extends SubTileFunctional { } } } - + @Override public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index 9352a8167..9e04eedac 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -33,7 +33,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.RadiusDescriptor.Square; import vazkii.botania.common.block.decor.IFloatingFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; @@ -47,7 +46,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { private static final int RANGE_PLACE_MANA = 8; private static final int RANGE_PLACE = 6; private static final int RANGE_PLACE_Y = 6; - + @Override public void onUpdate() { super.onUpdate(); @@ -160,7 +159,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_BLEND); } - + @Override public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), mana > 0 ? RANGE_PLACE_MANA : RANGE_PLACE); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index a59211671..7d739b67a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -89,7 +89,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { item.worldObj.spawnParticle("explode", item.posX + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d0 * d3, item.posY + item.worldObj.rand.nextFloat() * item.height - d1 * d3, item.posZ + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d2 * d3, d0, d1, d2); } } - + @Override public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index 21d159922..ae7e0b272 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -76,7 +76,7 @@ public class SubTileTangleberrie extends SubTileFunctional { float getMotionVelocity() { return 0.05F; } - + @Override public RadiusDescriptor getRadius() { return new RadiusDescriptor.Circle(toChunkCoordinates(), getRange()); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index c6ed41e33..133e8768d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block.subtile.functional; import java.util.ArrayList; import java.util.List; -import java.util.Random; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.ai.EntityAIAvoidEntity; @@ -23,11 +22,9 @@ import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChunkCoordinates; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.RadiusDescriptor.Square; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; import cpw.mods.fml.relauncher.ReflectionHelper; @@ -36,7 +33,7 @@ public class SubTileTigerseye extends SubTileFunctional { private static final int RANGE = 10; private static final int RANGE_Y = 4; - + @Override public void onUpdate() { super.onUpdate(); @@ -90,7 +87,7 @@ public class SubTileTigerseye extends SubTileFunctional { public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); } - + @Override public int getColor() { return 0xB1A618; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index fdd5e829d..74110d252 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -31,7 +31,7 @@ public class SubTileVinculotus extends SubTileFunctional { public static Set existingFlowers = Collections.newSetFromMap(new WeakHashMap()); private static boolean registered = false; private static final int RANGE = 64; - + @Override public void onUpdate() { super.onUpdate(); @@ -49,7 +49,7 @@ public class SubTileVinculotus extends SubTileFunctional { public RadiusDescriptor getRadius() { return new RadiusDescriptor.Circle(toChunkCoordinates(), RANGE); } - + @Override public boolean acceptsRedstone() { return true; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubtileOrechid.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubtileOrechid.java index a921ce57e..ea8a548b3 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubtileOrechid.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubtileOrechid.java @@ -25,7 +25,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.RadiusDescriptor.Square; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; @@ -113,7 +112,7 @@ public class SubtileOrechid extends SubTileFunctional { public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); } - + @Override public boolean acceptsRedstone() { return true; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java index ee19c1d0b..6bcb74ef2 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java @@ -21,9 +21,9 @@ import vazkii.botania.common.core.helper.ExperienceHelper; import vazkii.botania.common.lexicon.LexiconData; public class SubTileArcaneRose extends SubTileGenerating { - + private static final int RANGE = 1; - + @Override public void onUpdate() { super.onUpdate(); @@ -39,7 +39,7 @@ public class SubTileArcaneRose extends SubTileGenerating { return; } } - + @Override public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index afbc8ca93..6bd1aa961 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -91,7 +91,7 @@ public class SubTileEndoflame extends SubTileGenerating { public int getColor() { return 0x785000; } - + @Override public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java index 6051f6735..fa03c4460 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java @@ -16,7 +16,6 @@ import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.util.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.RadiusDescriptor.Square; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; @@ -64,7 +63,7 @@ public class SubTileEntropinnyum extends SubTileGenerating { public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); }; - + @Override public LexiconEntry getEntry() { return LexiconData.entropinnyum; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index 685129cbd..4842c85ff 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -78,7 +78,7 @@ public class SubTileGourmaryllis extends SubTileGenerating { public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); } - + @Override public int getMaxMana() { return 8000; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java index e4bf8b776..971e58096 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java @@ -22,7 +22,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.RadiusDescriptor.Square; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; @@ -102,7 +101,7 @@ public class SubTileHydroangeas extends SubTilePassiveGenerating { public int getBurnTime() { return 40; } - + @Override public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), 1); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java index 2bea5d225..cbb2a15e1 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java @@ -15,13 +15,12 @@ import net.minecraft.block.BlockCake; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.api.subtile.RadiusDescriptor.Square; import vazkii.botania.common.lexicon.LexiconData; public class SubTileKekimurus extends SubTileGenerating { private static final int RANGE = 5; - + @Override public void onUpdate() { super.onUpdate(); @@ -51,7 +50,7 @@ public class SubTileKekimurus extends SubTileGenerating { } } } - + @Override public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java index 936c19a80..0b7a66f58 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java @@ -25,7 +25,6 @@ import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.api.subtile.RadiusDescriptor.Square; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; @@ -37,7 +36,7 @@ public class SubTileMunchdew extends SubTileGenerating { private static final int RANGE = 8; private static final int RANGE_Y = 16; - + boolean ateOnce = false; int ticksWithoutEating = -1; int cooldown = 0; @@ -107,7 +106,7 @@ public class SubTileMunchdew extends SubTileGenerating { public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); } - + @Override public void writeToPacketNBT(NBTTagCompound cmp) { super.writeToPacketNBT(cmp); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java index fead279d8..ba766247f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java @@ -30,7 +30,7 @@ public class SubTileNarslimmus extends SubTileGenerating { public static final String TAG_WORLD_SPAWNED = "Botania:WorldSpawned"; private static final int RANGE = 2; - + @Override public void onUpdate() { super.onUpdate(); @@ -62,7 +62,7 @@ public class SubTileNarslimmus extends SubTileGenerating { } } } - + @Override public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java index 9a0a9f369..a8edf96ad 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java @@ -29,7 +29,6 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.api.subtile.RadiusDescriptor.Square; import vazkii.botania.common.lexicon.LexiconData; public class SubTileSpectrolus extends SubTileGenerating { @@ -67,7 +66,7 @@ public class SubTileSpectrolus extends SubTileGenerating { public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); } - + @Override public int getMaxMana() { return 2000; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java index 342a5812b..8811ba542 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.IFloatingFlower; @@ -47,12 +46,12 @@ public class TileFloatingFlower extends TileMod implements IFloatingFlower { public void setIslandType(IslandType type) { this.type = type; } - + @Override public void writeCustomNBT(NBTTagCompound cmp) { cmp.setString(TAG_ISLAND_TYPE, type.toString()); } - + @Override public void readCustomNBT(NBTTagCompound cmp) { type = IslandType.ofType(cmp.getString(TAG_ISLAND_TYPE)); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java index b84d45b44..a68e4a943 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java @@ -13,14 +13,13 @@ package vazkii.botania.common.block.tile; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import vazkii.botania.common.block.decor.IFloatingFlower; -import vazkii.botania.common.block.decor.IFloatingFlower.IslandType; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; public class TileFloatingSpecialFlower extends TileSpecialFlower implements IFloatingFlower { public static final String TAG_ISLAND_TYPE = "islandType"; IslandType type = IslandType.GRASS; - + @Override public boolean isOnSpecialSoil() { return false; @@ -40,13 +39,13 @@ public class TileFloatingSpecialFlower extends TileSpecialFlower implements IFlo public void setIslandType(IslandType type) { this.type = type; } - + @Override public void writeCustomNBT(NBTTagCompound cmp) { super.writeCustomNBT(cmp); cmp.setString(TAG_ISLAND_TYPE, type.toString()); } - + @Override public void readCustomNBT(NBTTagCompound cmp) { super.readCustomNBT(cmp); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 8b76f3c6c..cf4f668f2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -23,11 +23,11 @@ public class TilePump extends TileMod { public boolean hasCart = false; public boolean hasCartOnTop = false; public float moving = 0F; - + public int comparator; public boolean hasRedstone = false; int lastComparator = 0; - + @Override public void updateEntity() { hasRedstone = false; @@ -38,7 +38,7 @@ public class TilePump extends TileMod { break; } } - + float max = 8F; float min = 0F; @@ -66,14 +66,14 @@ public class TilePump extends TileMod { setActive(false); if(active && hasRedstone) setActive(false); - + hasCart = false; hasCartOnTop = false; - + if(comparator != lastComparator) worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); lastComparator = comparator; - + super.updateEntity(); } diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 92a168775..ce4b5d0a5 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -172,16 +172,16 @@ public final class ConfigHandler { desc = "The density of each Botania flower patch generated, defaults to 16, the lower the number, the less each patch will have."; flowerDensity = loadPropInt("worldgen.flower.density", desc, flowerDensity); - + desc = "The size of each Botania flower patch. The larger this is the farther the each patch can spread"; flowerPatchSize = loadPropInt("worldgen.flower.patchSize", desc, flowerPatchSize); desc = "The chance for a Botania flower patch to be generated. The higher this value is the less patches will exist and the more flower each will have."; flowerPatchChance = loadPropInt("worldgen.flower.patchChance", desc, flowerPatchChance); - + desc = "The chance for a Botania flower generated in a patch to be a tall flowe. 0.1 is 10%, 1 is 100%."; flowerTallChance = loadPropDouble("worldgen.flower.tallChance", desc, flowerTallChance); - + desc = "The quantity of Botania mushrooms to generate underground, in the world, defaults to 40, the lower the number the less patches generate."; mushroomQuantity = loadPropInt("worldgen.mushroom.quantity", desc, mushroomQuantity); diff --git a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java index f4b2e7cc7..a12ad98f9 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java @@ -1,24 +1,24 @@ package vazkii.botania.common.core.handler; -import com.google.common.collect.ImmutableList; - import java.util.Iterator; -import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; - import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing; import vazkii.botania.common.lib.LibMisc; +import com.google.common.collect.ImmutableList; + +import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; + public final class IMCHandler { - public static void processMessages(ImmutableList messageList) { - Iterator iterator = messageList.iterator(); - while(iterator.hasNext()) { - IMCMessage message = iterator.next(); - if(message != null && message.key != null && message.key.equals(LibMisc.BLACKLIST_ITEM) && message.isStringMessage()) { - String value = message.getStringValue(); - ItemMagnetRing.addItemToBlackList(value); - } - } - } + public static void processMessages(ImmutableList messageList) { + Iterator iterator = messageList.iterator(); + while(iterator.hasNext()) { + IMCMessage message = iterator.next(); + if(message != null && message.key != null && message.key.equals(LibMisc.BLACKLIST_ITEM) && message.isStringMessage()) { + String value = message.getStringValue(); + ItemMagnetRing.addItemToBlackList(value); + } + } + } } diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 589b4806c..2dbac0117 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -201,7 +201,7 @@ public class InternalMethodHandler extends DummyMethodHandler { public boolean isBuildcraftPipe(TileEntity tile) { return tile instanceof IPipeTile; } - + @Override public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, int x, int y, int z, int side) { ItemLokiRing.breakOnAllCursors(player, item, stack, x, y, z, side); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index c0889d22e..5b9f3c25f 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1622,7 +1622,7 @@ public final class ModCraftingRecipes { 'I', LibOreDict.MANA_STEEL, 'B', new ItemStack(Items.bucket)); recipePump = BotaniaAPI.getLatestAddedRecipe(); - + // Double Petal Recipes for(int i = 0; i < 16; i++) addShapelessOreDictRecipe(new ItemStack(ModItems.petal, 4, i), LibOreDict.DOUBLE_FLOWER[i]); @@ -1631,15 +1631,15 @@ public final class ModCraftingRecipes { // Resolute Ivy Recipe addShapelessOreDictRecipe(new ItemStack(ModItems.keepIvy), LibOreDict.PIXIE_DUST, new ItemStack(Blocks.vine), LibOreDict.ENDER_AIR_BOTTLE); recipeKeepIvy = BotaniaAPI.getLatestAddedRecipe(); - + // Black Hole Talisman Recipe - addOreDictRecipe(new ItemStack(ModItems.blackHoleTalisman), + addOreDictRecipe(new ItemStack(ModItems.blackHoleTalisman), " G ", "EAE", " E ", 'G', LibOreDict.LIFE_ESSENCE, 'E', LibOreDict.ELEMENTIUM, 'A', LibOreDict.ENDER_AIR_BOTTLE); recipeBlackHoleTalisman = BotaniaAPI.getLatestAddedRecipe(); - + // Storage Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java index 7ec5f6885..5f784a685 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java @@ -10,15 +10,12 @@ */ package vazkii.botania.common.crafting.recipe; -import vazkii.botania.api.item.IRelic; -import vazkii.botania.api.mana.ILens; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.lens.ItemLens; -import net.minecraft.init.Items; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import vazkii.botania.api.item.IRelic; +import vazkii.botania.common.item.ModItems; public class AesirRingRecipe implements IRecipe { @@ -47,7 +44,7 @@ public class AesirRingRecipe implements IRecipe { @Override public ItemStack getCraftingResult(InventoryCrafting var1) { String soulbind = null; - + for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); if(stack != null) { @@ -58,7 +55,7 @@ public class AesirRingRecipe implements IRecipe { else if(!soulbind.equals(bind)) return null; } else return null; - } + } } ItemStack stack = new ItemStack(ModItems.aesirRing); diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java index 3a9f676f0..14fe81fef 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java @@ -14,7 +14,6 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; -import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; import vazkii.botania.common.item.ModItems; @@ -64,5 +63,5 @@ public class KeepIvyRecipe implements IRecipe { public ItemStack getRecipeOutput() { return null; } - + } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 05e91b5be..c23b07b36 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -315,7 +315,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi if(hard) { entityDropItem(new ItemStack(ModItems.ancientWill, 1, rand.nextInt(6)), 1F); entityDropItem(new ItemStack(ModItems.dice), 1F); - + if(Math.random() < 0.25) entityDropItem(new ItemStack(ModItems.overgrowthSeed, rand.nextInt(3) + 1), 1F); if(Math.random() < 0.5) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 40706c3ec..b0fb47a20 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -22,35 +22,35 @@ public class EntityPinkWither extends EntityWither { public EntityPinkWither(World p_i1701_1_) { super(p_i1701_1_); } - + @Override public void onLivingUpdate() { super.onLivingUpdate(); - + if(Math.random() < 0.1) for(int j = 0; j < 3; ++j) { - double d10 = this.func_82214_u(j); - double d2 = this.func_82208_v(j); - double d4 = this.func_82213_w(j); - this.worldObj.spawnParticle("heart", d10 + this.rand.nextGaussian() * 0.30000001192092896D, d2 + this.rand.nextGaussian() * 0.30000001192092896D, d4 + this.rand.nextGaussian() * 0.30000001192092896D, 0.0D, 0.0D, 0.0D); + double d10 = func_82214_u(j); + double d2 = func_82208_v(j); + double d4 = func_82213_w(j); + worldObj.spawnParticle("heart", d10 + rand.nextGaussian() * 0.30000001192092896D, d2 + rand.nextGaussian() * 0.30000001192092896D, d4 + rand.nextGaussian() * 0.30000001192092896D, 0.0D, 0.0D, 0.0D); } } - + @Override public void setAttackTarget(EntityLivingBase p_70624_1_) { // NO-OP } - + @Override protected void attackEntity(Entity p_70785_1_, float p_70785_2_) { // NO-OP } - + @Override public boolean attackEntityAsMob(Entity p_70652_1_) { return false; } - + @Override protected boolean interact(EntityPlayer player) { player.mountEntity(this); @@ -61,40 +61,40 @@ public class EntityPinkWither extends EntityWither { protected boolean isAIEnabled() { return false; } - + // COPYPASTA - - - private double func_82214_u(int p_82214_1_) - { - if (p_82214_1_ <= 0) - { - return this.posX; - } - else - { - float f = (this.renderYawOffset + (float)(180 * (p_82214_1_ - 1))) / 180.0F * (float)Math.PI; - float f1 = MathHelper.cos(f); - return this.posX + (double)f1 * 1.3D; - } - } - private double func_82208_v(int p_82208_1_) - { - return p_82208_1_ <= 0 ? this.posY + 3.0D : this.posY + 2.2D; - } - private double func_82213_w(int p_82213_1_) - { - if (p_82213_1_ <= 0) - { - return this.posZ; - } - else - { - float f = (this.renderYawOffset + (float)(180 * (p_82213_1_ - 1))) / 180.0F * (float)Math.PI; - float f1 = MathHelper.sin(f); - return this.posZ + (double)f1 * 1.3D; - } - } + private double func_82214_u(int p_82214_1_) + { + if (p_82214_1_ <= 0) + { + return posX; + } + else + { + float f = (renderYawOffset + 180 * (p_82214_1_ - 1)) / 180.0F * (float)Math.PI; + float f1 = MathHelper.cos(f); + return posX + f1 * 1.3D; + } + } + + private double func_82208_v(int p_82208_1_) + { + return p_82208_1_ <= 0 ? posY + 3.0D : posY + 2.2D; + } + + private double func_82213_w(int p_82213_1_) + { + if (p_82213_1_ <= 0) + { + return posZ; + } + else + { + float f = (renderYawOffset + 180 * (p_82213_1_ - 1)) / 180.0F * (float)Math.PI; + float f1 = MathHelper.sin(f); + return posZ + f1 * 1.3D; + } + } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 82f3111a4..b1c5b149c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -85,7 +85,7 @@ public class EntityPoolMinecart extends EntityMinecart { ForgeDirection pumpDir = ForgeDirection.getOrientation(meta); boolean did = false; boolean can = false; - + if(pumpDir == dir) { // Pool -> Cart can = true; int cartMana = getMana(); @@ -106,7 +106,7 @@ public class EntityPoolMinecart extends EntityMinecart { pool.recieveMana(transfer); setMana(cartMana - transfer); did = true; - } + } } } @@ -116,12 +116,12 @@ public class EntityPoolMinecart extends EntityMinecart { if(!pump.active) pump.setActive(true); } - + if(can) { pump.hasCartOnTop = true; - pump.comparator = (int) (((double) getMana() / (double) TilePool.MAX_MANA) * 15); + pump.comparator = (int) ((double) getMana() / (double) TilePool.MAX_MANA * 15); } - + } } } diff --git a/src/main/java/vazkii/botania/common/entity/ModEntities.java b/src/main/java/vazkii/botania/common/entity/ModEntities.java index f6eb91e02..bb59483b0 100644 --- a/src/main/java/vazkii/botania/common/entity/ModEntities.java +++ b/src/main/java/vazkii/botania/common/entity/ModEntities.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.entity; -import net.minecraft.entity.boss.EntityWither; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibEntityNames; import cpw.mods.fml.common.registry.EntityRegistry; diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 2d1396679..d90d602ce 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -16,7 +16,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; @@ -36,206 +35,206 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBlackHoleTalisman extends ItemMod { - private static final String TAG_BLOCK_NAME = "blockName"; - private static final String TAG_BLOCK_META = "blockMeta"; - private static final String TAG_BLOCK_COUNT = "blockCount"; + private static final String TAG_BLOCK_NAME = "blockName"; + private static final String TAG_BLOCK_META = "blockMeta"; + private static final String TAG_BLOCK_COUNT = "blockCount"; - IIcon enabledIcon; + IIcon enabledIcon; - public ItemBlackHoleTalisman() { - setUnlocalizedName(LibItemNames.BLACK_HOLE_TALISMAN); - setMaxStackSize(1); - setHasSubtypes(true); - } + public ItemBlackHoleTalisman() { + setUnlocalizedName(LibItemNames.BLACK_HOLE_TALISMAN); + setMaxStackSize(1); + setHasSubtypes(true); + } - private static void setCount(ItemStack stack, int count) { - ItemNBTHelper.setInt(stack, TAG_BLOCK_COUNT, count); - } + private static void setCount(ItemStack stack, int count) { + ItemNBTHelper.setInt(stack, TAG_BLOCK_COUNT, count); + } - public static int remove(ItemStack stack, int count) { - int current = getBlockCount(stack); - setCount(stack, Math.max(current - count, 0)); + public static int remove(ItemStack stack, int count) { + int current = getBlockCount(stack); + setCount(stack, Math.max(current - count, 0)); - return Math.min(current, count); - } + return Math.min(current, count); + } - public static String getBlockName(ItemStack stack) { - return ItemNBTHelper.getString(stack, TAG_BLOCK_NAME, ""); - } + public static String getBlockName(ItemStack stack) { + return ItemNBTHelper.getString(stack, TAG_BLOCK_NAME, ""); + } - public static Block getBlock(ItemStack stack) { - Block block = Block.getBlockFromName(getBlockName(stack)); - return block; - } + public static Block getBlock(ItemStack stack) { + Block block = Block.getBlockFromName(getBlockName(stack)); + return block; + } - public static int getBlockMeta(ItemStack stack) { - return ItemNBTHelper.getInt(stack, TAG_BLOCK_META, 0); - } + public static int getBlockMeta(ItemStack stack) { + return ItemNBTHelper.getInt(stack, TAG_BLOCK_META, 0); + } - public static int getBlockCount(ItemStack stack) { - return ItemNBTHelper.getInt(stack, TAG_BLOCK_COUNT, 0); - } + public static int getBlockCount(ItemStack stack) { + return ItemNBTHelper.getInt(stack, TAG_BLOCK_COUNT, 0); + } - @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { - if(getBlock(par1ItemStack) != Blocks.air && par3EntityPlayer.isSneaking()) { - int dmg = par1ItemStack.getItemDamage(); - par1ItemStack.setItemDamage(~dmg & 1); - par2World.playSoundAtEntity(par3EntityPlayer, "random.orb", 0.3F, 0.1F); - } - - return par1ItemStack; - } + @Override + public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) { + if(getBlock(par1ItemStack) != Blocks.air && par3EntityPlayer.isSneaking()) { + int dmg = par1ItemStack.getItemDamage(); + par1ItemStack.setItemDamage(~dmg & 1); + par2World.playSoundAtEntity(par3EntityPlayer, "random.orb", 0.3F, 0.1F); + } - @Override - public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - Block block = par3World.getBlock(par4, par5, par6); - int meta = par3World.getBlockMetadata(par4, par5, par6); - boolean set = setBlock(par1ItemStack, block, meta); + return par1ItemStack; + } - if(!set) { - Block bBlock = getBlock(par1ItemStack); - int bmeta = getBlockMeta(par1ItemStack); + @Override + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { + Block block = par3World.getBlock(par4, par5, par6); + int meta = par3World.getBlockMetadata(par4, par5, par6); + boolean set = setBlock(par1ItemStack, block, meta); - TileEntity tile = par3World.getTileEntity(par4, par5, par6); - if(tile != null && tile instanceof IInventory) { - IInventory inv = (IInventory) tile; - int[] slots = inv instanceof ISidedInventory ? ((ISidedInventory) inv).getAccessibleSlotsFromSide(par7) : InventoryHelper.buildSlotsForLinearInventory(inv); - for(int slot : slots) { - ItemStack stackInSlot = inv.getStackInSlot(slot); - if(stackInSlot == null) { - ItemStack stack = new ItemStack(bBlock, 1, bmeta); - int maxSize = stack.getMaxStackSize(); - stack.stackSize = remove(par1ItemStack, maxSize); - if(stack.stackSize != 0) { - if(inv.isItemValidForSlot(slot, stack) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stack, par7))) { - inv.setInventorySlotContents(slot, stack); - inv.markDirty(); - set = true; - } - } - } else if(stackInSlot.getItem() == Item.getItemFromBlock(bBlock) && stackInSlot.getItemDamage() == bmeta) { - int maxSize = stackInSlot.getMaxStackSize(); - int missing = maxSize - stackInSlot.stackSize; - if(inv.isItemValidForSlot(slot, stackInSlot) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stackInSlot, par7))) { - stackInSlot.stackSize += remove(par1ItemStack, missing); - inv.markDirty(); - set = true; - } - } - } - } else { - int remove = remove(par1ItemStack, 1); - if(remove > 0) { - Item.getItemFromBlock(bBlock).onItemUse(new ItemStack(bBlock, 1, bmeta), par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10); - set = true; - } - } - } + if(!set) { + Block bBlock = getBlock(par1ItemStack); + int bmeta = getBlockMeta(par1ItemStack); - par2EntityPlayer.setCurrentItemOrArmor(0, par1ItemStack); - return set; - } - - @Override - public void onUpdate(ItemStack itemstack, World p_77663_2_, Entity entity, int p_77663_4_, boolean p_77663_5_) { - Block block = getBlock(itemstack); - if(!entity.worldObj.isRemote && itemstack.getItemDamage() == 1 && block != Blocks.air && entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) entity; - int meta = getBlockMeta(itemstack); + TileEntity tile = par3World.getTileEntity(par4, par5, par6); + if(tile != null && tile instanceof IInventory) { + IInventory inv = (IInventory) tile; + int[] slots = inv instanceof ISidedInventory ? ((ISidedInventory) inv).getAccessibleSlotsFromSide(par7) : InventoryHelper.buildSlotsForLinearInventory(inv); + for(int slot : slots) { + ItemStack stackInSlot = inv.getStackInSlot(slot); + if(stackInSlot == null) { + ItemStack stack = new ItemStack(bBlock, 1, bmeta); + int maxSize = stack.getMaxStackSize(); + stack.stackSize = remove(par1ItemStack, maxSize); + if(stack.stackSize != 0) { + if(inv.isItemValidForSlot(slot, stack) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stack, par7))) { + inv.setInventorySlotContents(slot, stack); + inv.markDirty(); + set = true; + } + } + } else if(stackInSlot.getItem() == Item.getItemFromBlock(bBlock) && stackInSlot.getItemDamage() == bmeta) { + int maxSize = stackInSlot.getMaxStackSize(); + int missing = maxSize - stackInSlot.stackSize; + if(inv.isItemValidForSlot(slot, stackInSlot) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stackInSlot, par7))) { + stackInSlot.stackSize += remove(par1ItemStack, missing); + inv.markDirty(); + set = true; + } + } + } + } else { + int remove = remove(par1ItemStack, 1); + if(remove > 0) { + Item.getItemFromBlock(bBlock).onItemUse(new ItemStack(bBlock, 1, bmeta), par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10); + set = true; + } + } + } - int highest = -1; - boolean hasFreeSlot = false; - int[] counts = new int[player.inventory.getSizeInventory() - player.inventory.armorInventory.length]; - Arrays.fill(counts, 0); + par2EntityPlayer.setCurrentItemOrArmor(0, par1ItemStack); + return set; + } - for(int i = 0; i < counts.length; i++) { - ItemStack stack = player.inventory.getStackInSlot(i); - if(stack == null) { - hasFreeSlot = true; - continue; - } + @Override + public void onUpdate(ItemStack itemstack, World p_77663_2_, Entity entity, int p_77663_4_, boolean p_77663_5_) { + Block block = getBlock(itemstack); + if(!entity.worldObj.isRemote && itemstack.getItemDamage() == 1 && block != Blocks.air && entity instanceof EntityPlayer) { + EntityPlayer player = (EntityPlayer) entity; + int meta = getBlockMeta(itemstack); - if(Item.getItemFromBlock(block) == stack.getItem() && stack.getItemDamage() == meta) { - counts[i] = stack.stackSize; - if(highest == -1) - highest = i; - else highest = counts[i] > counts[highest] && highest > 8 ? i : highest; - } - } + int highest = -1; + boolean hasFreeSlot = false; + int[] counts = new int[player.inventory.getSizeInventory() - player.inventory.armorInventory.length]; + Arrays.fill(counts, 0); - if(highest == -1) { - ItemStack heldItem = player.inventory.getItemStack(); - if(hasFreeSlot && (heldItem == null || Item.getItemFromBlock(block) == heldItem.getItem() || heldItem.getItemDamage() != meta)) { - ItemStack stack = new ItemStack(block, remove(itemstack, 64), meta); - if(stack.stackSize != 0) - player.inventory.addItemStackToInventory(stack); - } - } else { - for(int i = 0; i < counts.length; i++) { - int count = counts[i]; + for(int i = 0; i < counts.length; i++) { + ItemStack stack = player.inventory.getStackInSlot(i); + if(stack == null) { + hasFreeSlot = true; + continue; + } - if(i == highest || count == 0) - continue; + if(Item.getItemFromBlock(block) == stack.getItem() && stack.getItemDamage() == meta) { + counts[i] = stack.stackSize; + if(highest == -1) + highest = i; + else highest = counts[i] > counts[highest] && highest > 8 ? i : highest; + } + } - add(itemstack, count); - player.inventory.setInventorySlotContents(i, null); - } + if(highest == -1) { + ItemStack heldItem = player.inventory.getItemStack(); + if(hasFreeSlot && (heldItem == null || Item.getItemFromBlock(block) == heldItem.getItem() || heldItem.getItemDamage() != meta)) { + ItemStack stack = new ItemStack(block, remove(itemstack, 64), meta); + if(stack.stackSize != 0) + player.inventory.addItemStackToInventory(stack); + } + } else { + for(int i = 0; i < counts.length; i++) { + int count = counts[i]; - int countInHighest = counts[highest]; - int maxSize = new ItemStack(block, 1, meta).getMaxStackSize(); - if(countInHighest < maxSize) { - int missing = maxSize - countInHighest; - ItemStack stackInHighest = player.inventory.getStackInSlot(highest); - stackInHighest.stackSize += remove(itemstack, missing); - } - } - } - } - - private boolean setBlock(ItemStack stack, Block block, int meta) { - if(getBlock(stack) == Blocks.air || getBlockCount(stack) == 0) { - ItemNBTHelper.setString(stack, TAG_BLOCK_NAME, Block.blockRegistry.getNameForObject(block)); - ItemNBTHelper.setInt(stack, TAG_BLOCK_META, meta); - return true; - } - return false; - } + if(i == highest || count == 0) + continue; - private void add(ItemStack stack, int count) { - int current = getBlockCount(stack); - setCount(stack, current + count); - } + add(itemstack, count); + player.inventory.setInventorySlotContents(i, null); + } - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - itemIcon = IconHelper.forItem(par1IconRegister, this, 0); - enabledIcon = IconHelper.forItem(par1IconRegister, this, 1); - } + int countInHighest = counts[highest]; + int maxSize = new ItemStack(block, 1, meta).getMaxStackSize(); + if(countInHighest < maxSize) { + int missing = maxSize - countInHighest; + ItemStack stackInHighest = player.inventory.getStackInSlot(highest); + stackInHighest.stackSize += remove(itemstack, missing); + } + } + } + } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int par1) { - return par1 == 1 ? enabledIcon : itemIcon; - } + private boolean setBlock(ItemStack stack, Block block, int meta) { + if(getBlock(stack) == Blocks.air || getBlockCount(stack) == 0) { + ItemNBTHelper.setString(stack, TAG_BLOCK_NAME, Block.blockRegistry.getNameForObject(block)); + ItemNBTHelper.setInt(stack, TAG_BLOCK_META, meta); + return true; + } + return false; + } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - Block block = getBlock(par1ItemStack); - if(block != null && block != Blocks.air) { - int count = getBlockCount(par1ItemStack); - par3List.add(StatCollector.translateToLocal(new ItemStack(block, 1, getBlockMeta(par1ItemStack)).getUnlocalizedName() + ".name") + " (x" + count + ")"); - } + private void add(ItemStack stack, int count) { + int current = getBlockCount(stack); + setCount(stack, current + count); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister par1IconRegister) { + itemIcon = IconHelper.forItem(par1IconRegister, this, 0); + enabledIcon = IconHelper.forItem(par1IconRegister, this, 1); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int par1) { + return par1 == 1 ? enabledIcon : itemIcon; + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + Block block = getBlock(par1ItemStack); + if(block != null && block != Blocks.air) { + int count = getBlockCount(par1ItemStack); + par3List.add(StatCollector.translateToLocal(new ItemStack(block, 1, getBlockMeta(par1ItemStack)).getUnlocalizedName() + ".name") + " (x" + count + ")"); + } + + if(par1ItemStack.getItemDamage() == 1) + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.active"), par3List); + else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.inactive"), par3List); + } - if(par1ItemStack.getItemDamage() == 1) - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.active"), par3List); - else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.inactive"), par3List); - } - void addStringToTooltip(String s, List tooltip) { tooltip.add(s.replaceAll("&", "\u00a7")); } - + } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 47c422842..35985a50a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -44,7 +44,7 @@ public class ItemGrassSeeds extends ItemMod { private static final IslandType[] ISLAND_TYPES = { IslandType.GRASS, IslandType.PODZOL, IslandType.MYCEL }; - + private static final int types = 3; IIcon[] icons; @@ -207,7 +207,7 @@ public class ItemGrassSeeds extends ItemMod { list.remove(this); } } - + public static IslandType getIslandType(ItemStack stack) { return ISLAND_TYPES[Math.min(stack.getItemDamage(), ISLAND_TYPES.length - 1)]; } diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index b45633953..663dd323a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -32,11 +32,11 @@ import cpw.mods.fml.common.registry.GameRegistry; public class ItemKeepIvy extends ItemMod { public static final String TAG_KEEP = "Botania_keepIvy"; - + private static final String TAG_PLAYER_KEPT_DROPS = "Botania_playerKeptDrops"; private static final String TAG_DROP_COUNT = "dropCount"; private static final String TAG_DROP_PREFIX = "dropPrefix"; - + public ItemKeepIvy() { setUnlocalizedName(LibItemNames.KEEP_IVY); GameRegistry.addRecipe(new KeepIvyRecipe()); @@ -44,7 +44,7 @@ public class ItemKeepIvy extends ItemMod { MinecraftForge.EVENT_BUS.register(this); FMLCommonHandler.instance().bus().register(this); } - + @SubscribeEvent public void onPlayerDrops(PlayerDropsEvent event) { List keeps = new ArrayList(); @@ -53,14 +53,14 @@ public class ItemKeepIvy extends ItemMod { if(stack != null && ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, TAG_KEEP, false)) keeps.add(item); } - + if(keeps.size() > 0) { event.drops.removeAll(keeps); - + NBTTagCompound cmp = new NBTTagCompound(); cmp.setInteger(TAG_DROP_COUNT, keeps.size()); - + int i = 0; for(EntityItem keep : keeps) { ItemStack stack = keep.getEntityItem(); @@ -69,23 +69,23 @@ public class ItemKeepIvy extends ItemMod { cmp.setTag(TAG_DROP_PREFIX + i, cmp1); i++; } - + NBTTagCompound data = event.entityPlayer.getEntityData(); if(!data.hasKey(EntityPlayer.PERSISTED_NBT_TAG)) data.setTag(EntityPlayer.PERSISTED_NBT_TAG, new NBTTagCompound()); - + NBTTagCompound persist = data.getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG); persist.setTag(TAG_PLAYER_KEPT_DROPS, cmp); } } - + @SubscribeEvent public void onPlayerRespawn(PlayerRespawnEvent event) { NBTTagCompound data = event.player.getEntityData(); if(data.hasKey(EntityPlayer.PERSISTED_NBT_TAG)) { NBTTagCompound cmp = data.getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG); NBTTagCompound cmp1 = cmp.getCompoundTag(TAG_PLAYER_KEPT_DROPS); - + int count = cmp1.getInteger(TAG_DROP_COUNT); for(int i = 0; i < count; i++) { NBTTagCompound cmp2 = cmp1.getCompoundTag(TAG_DROP_PREFIX + i); @@ -96,9 +96,9 @@ public class ItemKeepIvy extends ItemMod { event.player.inventory.addItemStackToInventory(copy); } } - + cmp.setTag(TAG_PLAYER_KEPT_DROPS, new NBTTagCompound()); } } - + } diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index b551ed000..d684432db 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -18,7 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.lib.LibItemNames; @@ -45,12 +44,12 @@ public class ItemPinkinator extends ItemMod { world.playSoundAtEntity(wither, "random.explode", 4F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); } player.addStat(ModAchievements.pinkinator, 1); - + world.spawnParticle("hugeexplosion", wither.posX, wither.posY, wither.posZ, 1D, 0D, 0D); stack.stackSize--; return stack; } - + return stack; } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index ffed85b0e..37fe8336a 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -360,7 +360,7 @@ public final class ModItems { dice = new ItemDice(); keepIvy = new ItemKeepIvy(); blackHoleTalisman = new ItemBlackHoleTalisman(); - + OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/block/IRarityBlock.java b/src/main/java/vazkii/botania/common/item/block/IRarityBlock.java index c580b9289..d404d084d 100644 --- a/src/main/java/vazkii/botania/common/item/block/IRarityBlock.java +++ b/src/main/java/vazkii/botania/common/item/block/IRarityBlock.java @@ -16,5 +16,5 @@ import net.minecraft.item.ItemStack; public interface IRarityBlock { public EnumRarity getRarity(ItemStack stack); - + } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index f5701cc15..f7068cd00 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -73,7 +73,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt return par1ItemStack; } - + @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index e0c279196..314d0fa62 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -130,7 +130,7 @@ public class ItemMagnetRing extends ItemBauble { public static void setCooldown(ItemStack stack, int cooldown) { ItemNBTHelper.setInt(stack, TAG_COOLDOWN, cooldown); } - + public static void addItemToBlackList(String item) { BLACKLIST.add(item); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java index 86e9a34cf..33e2f0a88 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java @@ -128,10 +128,10 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ ItemLokiRing.breakOnAllCursors(player, this, stack, x, y, z, raycast.sideHit); // ^ Doable with API access through the IInternalMethodHandler. } - + return false; } - + @Override public void breakOtherBlock(EntityPlayer player, ItemStack stack, int x, int y, int z, int originX, int originY, int originZ, int side) { if(!isEnabled(stack)) diff --git a/src/main/java/vazkii/botania/common/item/material/ItemDye.java b/src/main/java/vazkii/botania/common/item/material/ItemDye.java index 3c57574ad..6e444284b 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -11,7 +11,6 @@ package vazkii.botania.common.item.material; import net.minecraft.block.Block; -import net.minecraft.block.BlockColored; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntitySheep; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 50e022473..91d4a03cf 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -13,10 +13,6 @@ package vazkii.botania.common.item.relic; import java.util.List; import java.util.UUID; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -25,29 +21,32 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.ChunkCoordinates; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; -import baubles.api.BaubleType; import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.crafting.recipe.AesirRingRecipe; -import vazkii.botania.common.crafting.recipe.KeepIvyRecipe; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import baubles.api.BaubleType; + +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; + +import cpw.mods.fml.common.registry.GameRegistry; public class ItemAesirRing extends ItemRelicBauble implements IWireframeCoordinateListProvider, ICraftAchievement { Multimap attributes = HashMultimap.create(); - + public ItemAesirRing() { super(LibItemNames.AESIR_RING); fillModifiers(attributes); GameRegistry.addRecipe(new AesirRingRecipe()); RecipeSorter.register("botania:aesirRing", AesirRingRecipe.class, Category.SHAPELESS, ""); } - + @Override public void onValidPlayerWornTick(ItemStack stack, EntityPlayer player) { ((ItemOdinRing) ModItems.odinRing).onValidPlayerWornTick(stack, player); @@ -62,7 +61,7 @@ public class ItemAesirRing extends ItemRelicBauble implements IWireframeCoordina public List getWireframesToDraw(EntityPlayer player, ItemStack stack) { return ((IWireframeCoordinateListProvider) ModItems.lokiRing).getWireframesToDraw(player, stack); } - + @Override public void onEquippedOrLoadedIntoWorld(ItemStack stack, EntityLivingBase player) { player.getAttributeMap().applyAttributeModifiers(attributes); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java index 70a417ffe..8318071ea 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -10,12 +10,8 @@ */ package vazkii.botania.common.item.relic; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; @@ -32,12 +28,12 @@ public class ItemDice extends ItemRelic { private static final int[] SIDES_FOR_MOON_PHASES = new int[] { -1, 0, 1, 2, -1, 2, 3, 4 }; - + final ItemStack[] relicStacks; - + public ItemDice() { super(LibItemNames.DICE); - + relicStacks = new ItemStack[] { new ItemStack(ModItems.infiniteFruit), new ItemStack(ModItems.excaliber), @@ -58,29 +54,29 @@ public class ItemDice extends ItemRelic { relic = world.rand.nextInt(6); world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (world.rand.nextFloat() * 0.4F + 0.8F)); - + if(hasRelicAlready(player, relic)) { - player.addChatMessage(new ChatComponentTranslation("botaniamisc.dudDiceRoll", (relic + 1)).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.DARK_GREEN))); + player.addChatMessage(new ChatComponentTranslation("botaniamisc.dudDiceRoll", relic + 1).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.DARK_GREEN))); stack.stackSize--; return stack; } - - player.addChatMessage(new ChatComponentTranslation("botaniamisc.diceRoll", (relic + 1)).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.DARK_GREEN))); + + player.addChatMessage(new ChatComponentTranslation("botaniamisc.diceRoll", relic + 1).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.DARK_GREEN))); return relicStacks[relic].copy(); } - + return stack; } - + boolean hasRelicAlready(EntityPlayer player, int relic) { if(relic < 0 || relic > 5 || !(player instanceof EntityPlayerMP)) return true; - + EntityPlayerMP mpPlayer = (EntityPlayerMP) player; Item item = relicStacks[relic].getItem(); IRelic irelic = (IRelic) item; Achievement achievement = irelic.getBindAchievement(); return mpPlayer.func_147099_x().hasAchievementUnlocked(achievement); } - + } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java index baf0aa420..48bbe13b2 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java @@ -45,17 +45,17 @@ import com.google.common.collect.Multimap; public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEffect { - private static final String TAG_ATTACKER_USERNAME = "attackerUsername"; - private static final String TAG_HOME_ID = "homeID"; + private static final String TAG_ATTACKER_USERNAME = "attackerUsername"; + private static final String TAG_HOME_ID = "homeID"; public static ToolMaterial toolMaterial = EnumHelper.addToolMaterial("B_EXCALIBER", 3, -1, 6.2F, 6F, 40); - + Achievement achievement; - + public ItemExcaliber() { super(toolMaterial, LibItemNames.EXCALIBER); } - + @Override public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { if(par3Entity instanceof EntityPlayer) { @@ -73,12 +73,12 @@ public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEf } } } - + @Override public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { ItemRelic.addBindInfo(p_77624_3_, p_77624_1_, p_77624_2_); } - + @Override public void bindToUsername(String playerName, ItemStack stack) { ItemRelic.bindToUsernameS(playerName, stack); @@ -98,21 +98,21 @@ public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEf public void setBindAchievement(Achievement achievement) { this.achievement = achievement; } - + @Override public boolean usesMana(ItemStack stack) { return false; } - - @Override - public Multimap getItemAttributeModifiers() { - Multimap multimap = HashMultimap.create(); - multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", 10, 0)); - multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", 0.3, 1)); - return multimap; - } - public EntityManaBurst getBurst(EntityPlayer player, ItemStack stack) { + @Override + public Multimap getItemAttributeModifiers() { + Multimap multimap = HashMultimap.create(); + multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", 10, 0)); + multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", 0.3, 1)); + return multimap; + } + + public EntityManaBurst getBurst(EntityPlayer player, ItemStack stack) { EntityManaBurst burst = new EntityManaBurst(player); float motionModifier = 7F; @@ -145,7 +145,7 @@ public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEf public void updateBurst(IManaBurst burst, ItemStack stack) { EntityThrowable entity = (EntityThrowable) burst; AxisAlignedBB axis = AxisAlignedBB.getBoundingBox(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(1, 1, 1); - + String attacker = ItemNBTHelper.getString(burst.getSourceLens(), TAG_ATTACKER_USERNAME, ""); int homeID = ItemNBTHelper.getInt(stack, TAG_HOME_ID, -1); if(homeID == -1) { @@ -154,13 +154,13 @@ public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEf for(EntityLivingBase living : entities) { if(living instanceof EntityPlayer && (((EntityPlayer) living).getCommandSenderName().equals(attacker) || MinecraftServer.getServer() != null && !MinecraftServer.getServer().isPVPEnabled()) || living.hurtTime != 0) continue; - + homeID = living.getEntityId(); ItemNBTHelper.setInt(stack, TAG_HOME_ID, homeID); break; } } - + List entities = entity.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis); if(homeID != -1) { @@ -170,12 +170,12 @@ public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEf Vector3 vecThis = Vector3.fromEntityCenter(entity); Vector3 vecMotion = vecEntity.sub(vecThis); Vector3 vecCurrentMotion = new Vector3(entity.motionX, entity.motionY, entity.motionZ); - + vecMotion.normalize().multiply(vecCurrentMotion.mag()); burst.setMotion(vecMotion.x, vecMotion.y, vecMotion.z); } } - + for(EntityLivingBase living : entities) { if(living instanceof EntityPlayer && (((EntityPlayer) living).getCommandSenderName().equals(attacker) || MinecraftServer.getServer() != null && !MinecraftServer.getServer().isPVPEnabled())) continue; @@ -201,7 +201,7 @@ public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEf public boolean doParticles(IManaBurst burst, ItemStack stack) { return true; } - + @Override public EnumRarity getRarity(ItemStack p_77613_1_) { return BotaniaAPI.rarityRelic; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java index 4ead441df..4b30125ca 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -59,12 +59,12 @@ public class ItemFlugelEye extends ItemRelic { private static final String TAG_DIMENSION = "dim"; IIcon[] signs; - + public ItemFlugelEye() { super(LibItemNames.FLUGEL_EYE); MinecraftForge.EVENT_BUS.register(this); } - + @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { @@ -84,7 +84,7 @@ public class ItemFlugelEye extends ItemRelic { world.playSoundAtEntity(player, "mob.endermen.portal", 1F, 1F); } } else setWarpPoint(stack, segment, player.posX, player.posY, player.posZ, world.provider.dimensionId); - + return stack; } @@ -98,7 +98,7 @@ public class ItemFlugelEye extends ItemRelic { return true; } } - + return false; } @@ -168,7 +168,7 @@ public class ItemFlugelEye extends ItemRelic { public static void setRotationBase(ItemStack stack, float rotation) { ItemNBTHelper.setFloat(stack, TAG_ROTATION_BASE, rotation); } - + public static void setWarpPoint(ItemStack stack, int warp, double x, double y, double z, int dim) { NBTTagCompound cmp = new NBTTagCompound(); cmp.setDouble(TAG_POS_X, x); @@ -177,12 +177,12 @@ public class ItemFlugelEye extends ItemRelic { cmp.setInteger(TAG_DIMENSION, dim); ItemNBTHelper.setCompound(stack, TAG_WARP_PREFIX + warp, cmp); } - + public static MultiversePosition getWarpPoint(ItemStack stack, int warp) { NBTTagCompound cmp = ItemNBTHelper.getCompound(stack, TAG_WARP_PREFIX + warp, true); if(cmp == null) return FALLBACK_POSITION; - + double x = cmp.getDouble(TAG_POS_X); double y = cmp.getDouble(TAG_POS_Y); double z = cmp.getDouble(TAG_POS_Z); @@ -240,11 +240,10 @@ public class ItemFlugelEye extends ItemRelic { GL11.glPushMatrix(); GL11.glRotatef(rotationAngle, 0F, 1F, 0F); GL11.glTranslatef(s * m, -0.75F, 0F); - + mc.renderEngine.bindTexture(TextureMap.locationItemsTexture); GL11.glScalef(0.75F, 0.75F, 0.75F); GL11.glTranslatef(0F, 0F, 0.5F); - int renderPass = 0; IIcon icon = signs[seg]; GL11.glRotatef(90F, 0F, 1F, 0F); GL11.glColor4f(1F, 1F, 1F, getWarpPoint(stack, seg).isValid() ? 1F : 0.2F); @@ -253,7 +252,7 @@ public class ItemFlugelEye extends ItemRelic { float f2 = icon.getMinV(); float f3 = icon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - + GL11.glColor3f(1F, 1F, 1F); GL11.glPopMatrix(); @@ -295,17 +294,17 @@ public class ItemFlugelEye extends ItemRelic { @SideOnly(Side.CLIENT) public static void renderHUD(ScaledResolution resolution, EntityPlayer player, ItemStack stack) { - Minecraft mc = Minecraft.getMinecraft(); + Minecraft.getMinecraft(); int slot = getSegmentLookedAt(stack, player); MultiversePosition pos = getWarpPoint(stack, slot); - + FontRenderer font = Minecraft.getMinecraft().fontRenderer; String s = StatCollector.translateToLocal("botania.sign" + slot); font.drawStringWithShadow(s, resolution.getScaledWidth() / 2 - font.getStringWidth(s) / 2, resolution.getScaledHeight() / 2 - 55, 0xFFD409); - + if(pos.isValid()) { int dist = (int) vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(pos.x, pos.y, pos.z, player.posX, player.posY - 1.6, player.posZ); - + s = dist == 1 ? StatCollector.translateToLocal("botaniamisc.blockAway") : String.format(StatCollector.translateToLocal("botaniamisc.blocksAway"), dist); font.drawStringWithShadow(s, resolution.getScaledWidth() / 2 - font.getStringWidth(s) / 2, resolution.getScaledHeight() / 2 - 40, 0x9999FF); s = StatCollector.translateToLocal("botaniamisc.clickToTeleport"); @@ -319,23 +318,23 @@ public class ItemFlugelEye extends ItemRelic { font.drawStringWithShadow(s, resolution.getScaledWidth() / 2 - font.getStringWidth(s) / 2, resolution.getScaledHeight() / 2 - 30, 0xFFFFFF); } } - + private static class MultiversePosition { - + public final double x, y, z; public final int dim; - + public MultiversePosition(double x, double y, double z, int dim) { this.x = x; this.y = y; this.z = z; this.dim = dim; } - + boolean isValid() { return y > 0; } - + } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index 3f8113e28..f326f861b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -10,20 +10,20 @@ */ package vazkii.botania.common.item.relic; -import cpw.mods.fml.relauncher.ReflectionHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; +import cpw.mods.fml.relauncher.ReflectionHelper; public class ItemInfiniteFruit extends ItemRelic { public ItemInfiniteFruit() { super(LibItemNames.INFINITE_FRUIT); } - + @Override public int getMaxItemUseDuration(ItemStack p_77626_1_) { return 32; @@ -40,17 +40,17 @@ public class ItemInfiniteFruit extends ItemRelic { p_77659_3_.setItemInUse(p_77659_1_, getMaxItemUseDuration(p_77659_1_)); return p_77659_1_; } - + @Override public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { super.onUsingTick(stack, player, count); if(count % 5 == 0) player.getFoodStats().addStats(1, 0.1F); - + if(count == 5) if(player.canEat(false)) ReflectionHelper.setPrivateValue(EntityPlayer.class, player, 20, LibObfuscation.ITEM_IN_USE_COUNT); } - + } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index a44a34ca2..d7009fb77 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -58,18 +58,18 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat super(LibItemNames.LOKI_RING); MinecraftForge.EVENT_BUS.register(this); } - + @SubscribeEvent public void onPlayerInteract(PlayerInteractEvent event) { EntityPlayer player = event.entityPlayer; ItemStack lokiRing = getLokiRing(player); if(lokiRing == null || player.worldObj.isRemote) return; - + ItemStack heldItemStack = player.getCurrentEquippedItem(); ChunkCoordinates originCoords = getOriginPos(lokiRing); MovingObjectPosition lookPos = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 4.5F); - + if(heldItemStack == null && event.action == Action.RIGHT_CLICK_BLOCK && player.isSneaking()) { if(originCoords.posY == -1 && lookPos != null) { setOriginPos(lokiRing, lookPos.blockX, lookPos.blockY, lookPos.blockZ); @@ -83,7 +83,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat for(ChunkCoordinates cursor : cursors) if(cursor.posX == lookPos.blockX && cursor.posY == lookPos.blockY && cursor.posZ == lookPos.blockZ) break addCursor; - + addCursor(lokiRing, lookPos.blockX - originCoords.posX, lookPos.blockY - originCoords.posY, lookPos.blockZ - originCoords.posZ); } } @@ -100,19 +100,19 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat } } } - + public static void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, int x, int y, int z, int side) { ItemStack lokiRing = getLokiRing(player); if(lokiRing == null || player.worldObj.isRemote || !(item instanceof ISequentialBreaker)) return; - + List cursors = getCursorList(lokiRing); ISequentialBreaker breaker = (ISequentialBreaker) item; World world = player.worldObj; boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantment.silkTouch.effectId, stack) > 0; int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack); boolean dispose = breaker.disposeOfTrashBlocks(stack); - + for(int i = 0; i < cursors.size(); i++) { ChunkCoordinates coords = cursors.get(i); int xp = x + coords.posX; @@ -123,7 +123,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat ToolCommons.removeBlockWithDrops(player, stack, player.worldObj, xp, yp, zp, x, y, z, block, new Material[] { block.getMaterial() }, silk, fortune, block.getBlockHardness(world, xp, yp, zp), dispose); } } - + @Override public BaubleType getBaubleType(ItemStack arg0) { return BaubleType.RING; @@ -133,7 +133,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat public void onUnequipped(ItemStack stack, EntityLivingBase player) { setCursorList(stack, null); } - + @Override @SideOnly(Side.CLIENT) public List getWireframesToDraw(EntityPlayer player, ItemStack stack) { @@ -142,7 +142,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat if(lookPos != null && !player.worldObj.isAirBlock(lookPos.blockX, lookPos.blockY, lookPos.blockZ) && lookPos.entityHit == null) { List list = getCursorList(stack); ChunkCoordinates origin = getOriginPos(stack); - + if(origin.posY != -1) { for(ChunkCoordinates coords : list) { coords.posX += origin.posX; @@ -155,41 +155,41 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat coords.posY += lookPos.blockY; coords.posZ += lookPos.blockZ; } - + return list; } - + return null; } - + private static ItemStack getLokiRing(EntityPlayer player) { InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); ItemStack stack1 = baubles.getStackInSlot(1); ItemStack stack2 = baubles.getStackInSlot(2); return isLokiRing(stack1) ? stack1 : isLokiRing(stack2) ? stack2 : null; } - + private static boolean isLokiRing(ItemStack stack) { return stack != null && (stack.getItem() == ModItems.lokiRing || stack.getItem() == ModItems.aesirRing); } - + private static ChunkCoordinates getOriginPos(ItemStack stack) { int x = ItemNBTHelper.getInt(stack, TAG_X_ORIGIN, 0); int y = ItemNBTHelper.getInt(stack, TAG_Y_ORIGIN, -1); int z = ItemNBTHelper.getInt(stack, TAG_Z_ORIGIN, 0); return new ChunkCoordinates(x, y, z); } - + private static void setOriginPos(ItemStack stack, int x, int y, int z) { ItemNBTHelper.setInt(stack, TAG_X_ORIGIN, x); ItemNBTHelper.setInt(stack, TAG_Y_ORIGIN, y); ItemNBTHelper.setInt(stack, TAG_Z_ORIGIN, z); } - + private static List getCursorList(ItemStack stack) { NBTTagCompound cmp = ItemNBTHelper.getCompound(stack, TAG_CURSOR_LIST, false); List cursors = new ArrayList(); - + int count = cmp.getInteger(TAG_CURSOR_COUNT); for(int i = 0; i < count; i++) { NBTTagCompound cursorCmp = cmp.getCompoundTag(TAG_CURSOR_PREFIX + i); @@ -198,7 +198,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat int z = cursorCmp.getInteger(TAG_Z_OFFSET); cursors.add(new ChunkCoordinates(x, y, z)); } - + return cursors; } @@ -213,10 +213,10 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat } cmp.setInteger(TAG_CURSOR_COUNT, i); } - + ItemNBTHelper.setCompound(stack, TAG_CURSOR_LIST, cmp); } - + private static NBTTagCompound cursorToCmp(int x, int y, int z) { NBTTagCompound cmp = new NBTTagCompound(); cmp.setInteger(TAG_X_OFFSET, x); @@ -224,7 +224,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat cmp.setInteger(TAG_Z_OFFSET, z); return cmp; } - + private static void addCursor(ItemStack stack, int x, int y, int z) { NBTTagCompound cmp = ItemNBTHelper.getCompound(stack, TAG_CURSOR_LIST, false); int count = cmp.getInteger(TAG_CURSOR_COUNT); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 6a5134578..4a19fc3a6 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -36,7 +36,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ItemOdinRing extends ItemRelicBauble { public static List damageNegations = new ArrayList(); - + static { damageNegations.add(DamageSource.drown.damageType); damageNegations.add(DamageSource.fall.damageType); @@ -46,15 +46,15 @@ public class ItemOdinRing extends ItemRelicBauble { damageNegations.add(DamageSource.inWall.damageType); damageNegations.add(DamageSource.starve.damageType); } - + Multimap attributes = HashMultimap.create(); - + public ItemOdinRing() { super(LibItemNames.ODIN_RING); fillModifiers(attributes); MinecraftForge.EVENT_BUS.register(this); } - + @Override public void onValidPlayerWornTick(ItemStack stack, EntityPlayer player) { if(player.ticksExisted % 10 == 0) @@ -62,7 +62,7 @@ public class ItemOdinRing extends ItemRelicBauble { if(player.isBurning()) player.extinguish(); } - + @SubscribeEvent public void onPlayerAttacked(LivingAttackEvent event) { if(event.entityLiving instanceof EntityPlayer) { @@ -71,23 +71,23 @@ public class ItemOdinRing extends ItemRelicBauble { event.setCanceled(true); } } - + @Override public BaubleType getBaubleType(ItemStack arg0) { return BaubleType.RING; } - + public static ItemStack getOdinRing(EntityPlayer player) { InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); ItemStack stack1 = baubles.getStackInSlot(1); ItemStack stack2 = baubles.getStackInSlot(2); return isOdinRing(stack1) ? stack1 : isOdinRing(stack2) ? stack2 : null; } - + private static boolean isOdinRing(ItemStack stack) { return stack != null && (stack.getItem() == ModItems.odinRing || stack.getItem() == ModItems.aesirRing); } - + @Override public void onEquippedOrLoadedIntoWorld(ItemStack stack, EntityLivingBase player) { player.getAttributeMap().applyAttributeModifiers(attributes); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index bcbe2d7a3..f84030b96 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -30,25 +30,25 @@ import vazkii.botania.common.item.ItemMod; public class ItemRelic extends ItemMod implements IRelic { private static final String TAG_SOULBIND = "soulbind"; - + Achievement achievement; - + public ItemRelic(String name) { setUnlocalizedName(name); setMaxStackSize(1); } - + @Override public void onUpdate(ItemStack p_77663_1_, World p_77663_2_, Entity p_77663_3_, int p_77663_4_, boolean p_77663_5_) { if(p_77663_3_ instanceof EntityPlayer) updateRelic(p_77663_1_, (EntityPlayer) p_77663_3_); } - + @Override public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { addBindInfo(p_77624_3_, p_77624_1_, p_77624_2_); } - + public static void addBindInfo(List list, ItemStack stack, EntityPlayer player) { if(GuiScreen.isShiftKeyDown()) { String bind = getSoulbindUsernameS(stack); @@ -59,33 +59,33 @@ public class ItemRelic extends ItemMod implements IRelic { if(!isRightPlayer(player, stack)) addStringToTooltip(String.format(StatCollector.translateToLocal("botaniamisc.notYourSagittarius"), bind), list); } - + addStringToTooltip("", list); String name = stack.getUnlocalizedName() + ".poem"; for(int i = 0; i < 4; i++) addStringToTooltip(EnumChatFormatting.ITALIC + StatCollector.translateToLocal(name + i), list); } else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), list); } - + static void addStringToTooltip(String s, List tooltip) { tooltip.add(s.replaceAll("&", "\u00a7")); } - + public static String getSoulbindUsernameS(ItemStack stack) { return ItemNBTHelper.getString(stack, TAG_SOULBIND, ""); } - + public static void updateRelic(ItemStack stack, EntityPlayer player) { if(stack == null || !(stack.getItem() instanceof IRelic)) return; - + String soulbind = getSoulbindUsernameS(stack); if(soulbind.isEmpty()) { player.addStat(((IRelic) stack.getItem()).getBindAchievement(), 1); bindToPlayer(player, stack); soulbind = getSoulbindUsernameS(stack); } - + if(!isRightPlayer(player, stack) && player.ticksExisted % 10 == 0) player.attackEntityFrom(damageSource(), 6); } @@ -93,28 +93,28 @@ public class ItemRelic extends ItemMod implements IRelic { public static void bindToPlayer(EntityPlayer player, ItemStack stack) { bindToUsernameS(player.getCommandSenderName(), stack); } - + public static void bindToUsernameS(String username, ItemStack stack) { ItemNBTHelper.setString(stack, TAG_SOULBIND, username); } - + public static boolean isRightPlayer(EntityPlayer player, ItemStack stack) { return isRightPlayer(player.getCommandSenderName(), stack); } - + public static boolean isRightPlayer(String player, ItemStack stack) { return getSoulbindUsernameS(stack).equals(player); } - + public static DamageSource damageSource() { return new DamageSource("botania-relic"); } - + @Override public void bindToUsername(String playerName, ItemStack stack) { bindToUsernameS(playerName, stack); } - + @Override public String getSoulbindUsername(ItemStack stack) { return getSoulbindUsernameS(stack); @@ -129,7 +129,7 @@ public class ItemRelic extends ItemMod implements IRelic { public void setBindAchievement(Achievement achievement) { this.achievement = achievement; } - + @Override public EnumRarity getRarity(ItemStack p_77613_1_) { return BotaniaAPI.rarityRelic; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index b7a00609a..66ca23cac 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -26,7 +26,7 @@ import vazkii.botania.common.item.equipment.bauble.ItemBauble; public abstract class ItemRelicBauble extends ItemBauble implements IRelic { Achievement achievement; - + public ItemRelicBauble(String name) { super(name); } @@ -36,7 +36,7 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { if(p_77663_3_ instanceof EntityPlayer) ItemRelic.updateRelic(p_77663_1_, (EntityPlayer) p_77663_3_); } - + @Override public void onWornTick(ItemStack stack, EntityLivingBase player) { super.onWornTick(stack, player); @@ -47,17 +47,17 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { onValidPlayerWornTick(stack, ePlayer); } } - + @Override public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); ItemRelic.addBindInfo(par3List, par1ItemStack, par2EntityPlayer); } - + public void onValidPlayerWornTick(ItemStack stack, EntityPlayer player) { // NO-OP } - + @Override public boolean canEquip(ItemStack stack, EntityLivingBase player) { return player instanceof EntityPlayer && ItemRelic.isRightPlayer((EntityPlayer) player, stack); @@ -67,7 +67,7 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { public void bindToUsername(String playerName, ItemStack stack) { ItemRelic.bindToUsernameS(playerName, stack); } - + @Override public String getSoulbindUsername(ItemStack stack) { return ItemRelic.getSoulbindUsernameS(stack); @@ -82,10 +82,10 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { public void setBindAchievement(Achievement achievement) { this.achievement = achievement; } - + @Override public EnumRarity getRarity(ItemStack p_77613_1_) { return BotaniaAPI.rarityRelic; } - + } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java index 332d6f093..78dd94da2 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java @@ -12,30 +12,30 @@ package vazkii.botania.common.item.relic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibItemNames; public class ItemThorRing extends ItemRelicBauble { public ItemThorRing() { super(LibItemNames.THOR_RING); } - + @Override public BaubleType getBaubleType(ItemStack arg0) { return BaubleType.RING; } - + public static ItemStack getThorRing(EntityPlayer player) { InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player); ItemStack stack1 = baubles.getStackInSlot(1); ItemStack stack2 = baubles.getStackInSlot(2); return isThorRing(stack1) ? stack1 : isThorRing(stack2) ? stack2 : null; } - + private static boolean isThorRing(ItemStack stack) { return stack != null && (stack.getItem() == ModItems.thorRing || stack.getItem() == ModItems.aesirRing); } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index d18bbceb6..c3967cdce 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -665,7 +665,7 @@ public final class LexiconData { crystalBow = new ALexiconEntry(LibLexicon.TOOL_CRYSTAL_BOW, categoryTools); crystalBow.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeCrystalBow)); - + // ENDER ENTRIES enderAir = new BLexiconEntry(LibLexicon.ENDER_AIR, categoryEnder); enderAir.setPriority().setLexiconPages(new PageText("0")); @@ -714,10 +714,10 @@ public final class LexiconData { keepIvy = new ALexiconEntry(LibLexicon.ENDER_KEEP_IVY, categoryEnder); keepIvy.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeKeepIvy)); - + blackHoleTalisman = new ALexiconEntry(LibLexicon.ENDER_BLACK_HOLE_TALISMAN, categoryEnder); blackHoleTalisman.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeBlackHoleTalisman)); - + // BAUBLES ENTRIES baublesIntro = new BLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles); baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2")); @@ -816,10 +816,10 @@ public final class LexiconData { elvenLore = new ALexiconEntry(LibLexicon.ALF_LORE, categoryAlfhomancy); elvenLore.setLexiconPages(new PageText("0"), new PageLoreText("1"), new PageLoreText("2"), new PageLoreText("3"), new PageLoreText("4"), new PageLoreText("5"), new PageLoreText("6"), new PageLoreText("7")).setIcon(new ItemStack(Items.writable_book)); - + relics = new ALexiconEntry(LibLexicon.ALF_RELICS, categoryAlfhomancy); relics.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.dice)); - + // MISCLENAEOUS ENTRIES unstableBlocks = new BLexiconEntry(LibLexicon.MISC_UNSTABLE_BLOCKS, categoryMisc); unstableBlocks.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_UNSTABLE_BLOCK), new PageCraftingRecipe("2", ModCraftingRecipes.recipesUnstableBlocks), new PageText("3"), new PageImage("4", LibResources.ENTRY_UNSTABLE_BEACON), new PageCraftingRecipe("5", ModCraftingRecipes.recipesManaBeacons), new PageText("6"), new PageCraftingRecipe("7", ModCraftingRecipes.recipesSignalFlares)); diff --git a/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java b/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java index b2ba69b5a..9125fbd5d 100644 --- a/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibAchievementNames.java @@ -49,7 +49,7 @@ public final class LibAchievementNames { public static final String RELIC_ODIN_RING = "odinRing"; public static final String RELIC_LOKI_RING = "lokiRing"; public static final String RELIC_AESIR_RING = "aesirRing"; - + public static final String DESU_GUN = "desuGun"; } diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 850f8e242..75d1a3328 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -139,7 +139,7 @@ public final class LibItemNames { public static final String DICE = "dice"; public static final String KEEP_IVY = "keepIvy"; public static final String BLACK_HOLE_TALISMAN = "blackHoleTalisman"; - + public static final String[] LENS_NAMES = new String[] { "lensNormal", "lensSpeed", diff --git a/src/main/java/vazkii/botania/common/lib/LibOreDict.java b/src/main/java/vazkii/botania/common/lib/LibOreDict.java index 05dd74ea1..3574e9a7c 100644 --- a/src/main/java/vazkii/botania/common/lib/LibOreDict.java +++ b/src/main/java/vazkii/botania/common/lib/LibOreDict.java @@ -45,15 +45,15 @@ public final class LibOreDict { "mysticFlowerPink", "mysticFlowerGray", "mysticFlowerLightGray", "mysticFlowerCyan", "mysticFlowerPurple", "mysticFlowerBlue", "mysticFlowerBrown", "mysticFlowerGreen", "mysticFlowerRed", - "mysticFlowerBlack" }; - + "mysticFlowerBlack" }; + public static final String[] DOUBLE_FLOWER = new String[] { "mysticFlowerWhiteDouble", "mysticFlowerOrangeDouble", "mysticFlowerMagentaDouble", "mysticFlowerLightBlueDouble", "mysticFlowerYellowDouble", "mysticFlowerLimeDouble", "mysticFlowerPinkDouble", "mysticFlowerGrayDouble", "mysticFlowerLightGrayDouble", "mysticFlowerCyanDouble", "mysticFlowerPurpleDouble", "mysticFlowerBlueDouble", "mysticFlowerBrownDouble", "mysticFlowerGreenDouble", "mysticFlowerRedDouble", - "mysticFlowerBlackDouble" }; + "mysticFlowerBlackDouble" }; public static final String[] PETAL = new String[] { "petalWhite", "petalOrange", "petalMagenta", "petalLightBlue", "petalYellow", diff --git a/web/css/botania.css b/web/css/botania.css index f2aae8ace..79be3247f 100644 --- a/web/css/botania.css +++ b/web/css/botania.css @@ -276,6 +276,16 @@ iframe { margin-left: 4px; } +/*.april-fools { + color: #ccc; +} + +.april-fools::after { + content: " APRIL FOOLS"; + font-weight: bold; + color: #F00; +}*/ + .footer { text-align: center; padding-top: 5px;