From 9508b8889bfc44a2cc7228b5fdb6df29ccfdbadb Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sun, 18 Jan 2015 17:16:58 +0000 Subject: [PATCH] Cleanup. --- .../java/vazkii/botania/api/BotaniaAPI.java | 12 +-- .../vazkii/botania/api/boss/IBotaniaBoss.java | 13 ++- .../api/boss/IBotaniaBossWithShader.java | 6 +- .../java/vazkii/botania/api/brew/Brew.java | 28 +++---- .../botania/api/brew/IBrewContainer.java | 4 +- .../vazkii/botania/api/brew/IBrewItem.java | 2 +- .../api/internal/DummyMethodHandler.java | 6 +- .../api/internal/IInternalMethodHandler.java | 12 +-- .../botania/api/internal/ShaderCallback.java | 4 +- .../botania/api/item/IBaubleRender.java | 4 +- .../vazkii/botania/api/item/IDyablePool.java | 7 +- .../botania/api/item/IFlowerlessBiome.java | 28 +++---- .../botania/api/item/IGrassHornExcempt.java | 4 +- .../botania/api/item/IManaDissolvable.java | 2 +- .../botania/api/lexicon/ITwoNamedPage.java | 2 +- .../botania/api/lexicon/LexiconCategory.java | 8 +- .../api/mana/spark/ISparkAttachable.java | 2 +- .../vazkii/botania/api/recipe/RecipeBrew.java | 10 +-- .../api/recipe/RecipeManaInfusion.java | 6 +- .../botania/api/subtile/SubTileEntity.java | 8 +- .../core/handler/BaubleRenderHandler.java | 16 +--- .../client/core/handler/BossBarHandler.java | 36 ++++----- .../client/core/handler/HUDHandler.java | 6 +- .../client/core/handler/LightningHandler.java | 2 +- .../core/handler/RedStringRenderer.java | 22 ++--- .../client/core/helper/RenderHelper.java | 6 +- .../client/core/proxy/ClientProxy.java | 18 ++--- .../gui/crafting/ContainerCraftingHalo.java | 48 +++++------ .../client/gui/crafting/GuiCraftingHalo.java | 36 ++++----- .../client/gui/lexicon/GuiLexicon.java | 20 ++--- .../client/integration/nei/NEIGuiHooks.java | 3 +- .../integration/nei/RecipeHandlerBrewery.java | 10 +-- .../nei/RecipeHandlerElvenTrade.java | 2 +- .../nei/RecipeHandlerPetalApothecary.java | 2 +- .../botania/client/lib/LibResources.java | 4 +- .../botania/client/model/ModelBrewery.java | 12 +-- .../client/model/ModelSpinningCubes.java | 4 +- .../client/render/block/RenderBrewery.java | 6 +- .../render/block/RenderFloatingFlower.java | 6 -- .../render/block/RenderSpecialFlower.java | 11 ++- .../render/entity/RenderDoppleganger.java | 1 - .../render/item/RenderFloatingFlowerItem.java | 2 +- .../client/render/tile/RenderTileAltar.java | 5 +- .../client/render/tile/RenderTileBrewery.java | 27 +++---- .../render/tile/RenderTileFloatingFlower.java | 4 +- .../client/render/tile/RenderTilePrism.java | 16 ++-- .../render/tile/RenderTileRedString.java | 7 +- .../render/tile/RenderTileTerraPlate.java | 8 +- .../java/vazkii/botania/common/Botania.java | 6 +- .../botania/common/block/BlockAltar.java | 4 +- .../botania/common/block/BlockDreamwood.java | 2 +- .../block/BlockFloatingSpecialFlower.java | 27 +++---- .../vazkii/botania/common/block/BlockMod.java | 4 +- .../common/block/BlockModContainer.java | 4 +- .../botania/common/block/BlockModFlower.java | 4 +- .../common/block/BlockSpecialFlower.java | 2 +- .../common/block/decor/BlockBuriedPetals.java | 8 +- .../common/block/decor/BlockDirtPath.java | 18 ++--- .../common/block/decor/BlockElfGlass.java | 3 - .../block/decor/BlockFloatingFlower.java | 12 +-- .../common/block/decor/BlockManaFlame.java | 25 +++--- .../common/block/decor/BlockManaGlass.java | 7 +- .../common/block/decor/BlockSeaLamp.java | 10 +-- .../common/block/decor/BlockShinyFlower.java | 9 +-- .../common/block/decor/IFloatingFlower.java | 2 +- .../common/block/mana/BlockBrewery.java | 3 +- .../common/block/mana/BlockEnchanter.java | 3 +- .../common/block/mana/BlockForestDrum.java | 2 +- .../botania/common/block/mana/BlockPrism.java | 16 ++-- .../common/block/mana/BlockRuneAltar.java | 3 +- .../common/block/mana/BlockTerraPlate.java | 24 +++--- .../common/block/string/BlockRedString.java | 13 ++- .../string/BlockRedStringComparator.java | 4 +- .../block/string/BlockRedStringDispenser.java | 1 - .../block/string/BlockRedStringRelay.java | 5 +- .../common/block/subtile/SubTileManastar.java | 2 +- .../block/subtile/SubTilePureDaisy.java | 2 +- .../subtile/functional/SubTileExoflame.java | 2 +- .../botania/common/block/tile/TileAltar.java | 10 +-- .../common/block/tile/TileBrewery.java | 25 +++--- .../common/block/tile/TileEnchanter.java | 12 ++- .../common/block/tile/TileFloatingFlower.java | 6 +- .../block/tile/TileFloatingSpecialFlower.java | 4 +- .../common/block/tile/TileManaFlame.java | 38 ++++----- .../common/block/tile/TileRuneAltar.java | 15 +--- .../common/block/tile/TileSpecialFlower.java | 8 +- .../common/block/tile/TileTerraPlate.java | 56 ++++++------- .../common/block/tile/mana/TilePool.java | 5 +- .../common/block/tile/mana/TilePrism.java | 13 ++- .../block/tile/string/TileRedString.java | 18 ++--- .../tile/string/TileRedStringComparator.java | 12 +-- .../tile/string/TileRedStringContainer.java | 12 +-- .../tile/string/TileRedStringDispenser.java | 5 +- .../tile/string/TileRedStringFertilizer.java | 5 +- .../block/tile/string/TileRedStringRelay.java | 2 +- .../vazkii/botania/common/brew/BrewMod.java | 2 +- .../vazkii/botania/common/brew/ModBrews.java | 1 - .../botania/common/brew/ModPotions.java | 38 +-------- .../botania/common/brew/potion/PotionMod.java | 10 +-- .../common/core/BotaniaCreativeTab.java | 6 +- .../core/handler/BiomeDecorationHandler.java | 2 +- .../common/core/handler/ChestGenHandler.java | 10 +-- .../common/core/handler/ConfigHandler.java | 2 +- .../core/handler/InternalMethodHandler.java | 10 +-- .../common/core/helper/InventoryHelper.java | 16 ++-- .../common/core/proxy/CommonProxy.java | 17 ++-- .../common/crafting/ModBrewRecipes.java | 6 +- .../common/crafting/ModCraftingRecipes.java | 41 +++++----- .../common/crafting/ModElvenTradeRecipes.java | 1 - .../crafting/ModManaAlchemyRecipes.java | 4 +- .../crafting/ModManaInfusionRecipes.java | 2 +- .../common/crafting/ModPetalRecipes.java | 2 +- .../recipe/SpecialFloatingFlowerRecipe.java | 6 +- .../common/entity/EntityDoppleganger.java | 24 +++--- .../common/entity/EntityMagicMissile.java | 36 ++++----- .../common/entity/EntityManaBurst.java | 8 +- .../botania/common/entity/EntitySpark.java | 2 +- .../botania/common/entity/ModEntities.java | 2 +- .../buildcraft/StatementAPIPlugin.java | 14 ++-- .../integration/buildcraft/StatementBase.java | 3 +- .../buildcraft/TriggerManaDetector.java | 16 ++-- .../buildcraft/TriggerManaLevel.java | 18 ++--- .../buildcraft/TriggerRuneAltarCanCraft.java | 8 +- .../coloredlights/ColoredLightHelper.java | 80 +++++++++---------- .../botania/common/item/ItemBlackLotus.java | 6 +- .../botania/common/item/ItemCraftingHalo.java | 35 ++++---- .../botania/common/item/ItemGrassHorn.java | 2 +- .../vazkii/botania/common/item/ItemLens.java | 4 +- .../botania/common/item/ItemManaMirror.java | 4 +- .../botania/common/item/ItemSignalFlare.java | 2 +- .../vazkii/botania/common/item/ModItems.java | 4 +- .../block/ItemBlockFloatingSpecialFlower.java | 1 - .../item/block/ItemBlockSpecialFlower.java | 2 +- .../common/item/brew/ItemBrewBase.java | 26 +++--- .../common/item/brew/ItemBrewFlask.java | 2 +- .../common/item/brew/ItemBrewVial.java | 2 +- .../botania/common/item/brew/ItemVial.java | 12 +-- .../item/equipment/bauble/ItemBauble.java | 2 +- .../equipment/bauble/ItemBloodPendant.java | 49 ++++++------ .../item/equipment/bauble/ItemDivaCharm.java | 13 ++- .../equipment/bauble/ItemFlightTiara.java | 13 +-- .../equipment/bauble/ItemGoldenLaurel.java | 13 ++- .../item/equipment/bauble/ItemHolyCloak.java | 9 +-- .../item/equipment/bauble/ItemIcePendant.java | 11 +-- .../item/equipment/bauble/ItemItemFinder.java | 9 ++- .../equipment/bauble/ItemKnockbackBelt.java | 13 ++- .../equipment/bauble/ItemLavaPendant.java | 2 +- .../item/equipment/bauble/ItemMagnetRing.java | 10 +-- .../bauble/ItemSuperLavaPendant.java | 13 ++- .../equipment/bauble/ItemSuperTravelBelt.java | 4 +- .../item/equipment/bauble/ItemTinyPlanet.java | 5 +- .../item/equipment/bauble/ItemTravelBelt.java | 13 +-- .../equipment/bauble/ItemUnholyCloak.java | 15 ++-- .../item/equipment/tool/ToolCommons.java | 9 +-- .../tool/elementium/ItemElementiumShovel.java | 2 +- .../tool/manasteel/ItemManasteelAxe.java | 2 +- .../tool/manasteel/ItemManasteelPick.java | 2 +- .../tool/manasteel/ItemManasteelShears.java | 2 +- .../tool/manasteel/ItemManasteelShovel.java | 2 +- .../tool/manasteel/ItemManasteelSword.java | 2 +- .../common/item/rod/ItemMissileRod.java | 12 --- .../common/item/rod/ItemTerraformRod.java | 12 +-- .../botania/common/lexicon/BLexiconEntry.java | 2 +- .../botania/common/lexicon/LexiconData.java | 34 ++++---- .../botania/common/lexicon/page/PageBrew.java | 12 +-- .../common/lexicon/page/PageEntity.java | 2 +- .../common/lexicon/page/PageLoreText.java | 4 +- .../botania/common/lib/LibBrewNames.java | 2 +- .../vazkii/botania/common/lib/LibLexicon.java | 4 +- .../botania/common/lib/LibObfuscation.java | 2 +- .../vazkii/botania/common/lib/LibOreDict.java | 2 +- .../botania/common/lib/LibPotionNames.java | 2 +- .../botania/common/lib/LibTriggerNames.java | 3 +- .../botania/common/network/GuiHandler.java | 2 +- 174 files changed, 808 insertions(+), 972 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 40de6ecf2..c9c51ba7f 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -60,7 +60,7 @@ public final class BotaniaAPI { public static Map knowledgeTypes = new HashMap(); public static Map brewMap = new LinkedHashMap(); - + public static List petalRecipes = new ArrayList(); public static List runeAltarRecipes = new ArrayList(); public static List manaInfusionRecipes = new ArrayList(); @@ -96,9 +96,9 @@ public final class BotaniaAPI { public static LexiconCategory categoryBaubles; public static LexiconCategory categoryAlfhomancy; public static LexiconCategory categoryMisc; - + public static Brew fallbackBrew = new Brew("fallback", "botania.brew.fallback", 0, 0); - + static { registerSubTile("", DummySubTile.class); @@ -202,7 +202,7 @@ public final class BotaniaAPI { knowledgeTypes.put(id, type); return type; } - + /** * Registers a Brew and returns it. */ @@ -220,7 +220,7 @@ public final class BotaniaAPI { return brewMap.get(key); return fallbackBrew; } - + /** * Registers a Petal Recipe. * @param output The ItemStack to craft. @@ -294,7 +294,7 @@ public final class BotaniaAPI { elvenTradeRecipes.add(recipe); return recipe; } - + /** * Registers a Brew Recipe (for the Botanical Brewery). * @param brew The brew in to be set in this recipe. diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index 4839b0871..1b7a1c78b 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -13,7 +13,6 @@ package vazkii.botania.api.boss; import java.awt.Rectangle; -import net.minecraft.entity.boss.BossStatus; import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.util.ResourceLocation; import cpw.mods.fml.relauncher.Side; @@ -28,7 +27,7 @@ import cpw.mods.fml.relauncher.SideOnly; * if that's not the case. */ public interface IBotaniaBoss extends IBossDisplayData { - + /** * The ResourceLocation to bind for this boss's boss bar. * You can use BotaniaAPI.internalMethodHandler.getDefaultBossBarTexture() to get @@ -36,7 +35,7 @@ public interface IBotaniaBoss extends IBossDisplayData { */ @SideOnly(Side.CLIENT) public ResourceLocation getBossBarTexture(); - + /** * A Rectangle instance delimiting the uv, width and height of this boss's * boss bar texture. This is for the background, not the bar that shows @@ -44,19 +43,19 @@ public interface IBotaniaBoss extends IBossDisplayData { */ @SideOnly(Side.CLIENT) public Rectangle getBossBarTextureRect(); - + /** * A Rectangle instance delimiting the uv, width and height of this boss's * boss bar HP texture. This is for the foreground that shows how much - * HP the boss has. The width of the rectangle will be multiplied by the + * HP the boss has. The width of the rectangle will be multiplied by the * faction of the boss's current HP by max HP. */ @SideOnly(Side.CLIENT) public Rectangle getBossBarHPTextureRect(); - + /** * A callback for when this boss's boss bar renders, you can do aditional rendering - * here if needed. + * here if needed. */ @SideOnly(Side.CLIENT) public void bossBarRenderCallback(); diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java index 1bffebb78..408538c8c 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java @@ -29,15 +29,15 @@ public interface IBotaniaBossWithShader extends IBotaniaBoss { * you don't want a shader to be used. You can use separate shaders * for the background and foreground. * @param background True if rendering the background of the boss bar, - * false if rendering the bar itself that shows the HP. + * false if rendering the bar itself that shows the HP. */ @SideOnly(Side.CLIENT) public int getBossBarShaderProgram(boolean background); - + /** * A callback for the shader, used to pass in uniforms. Return null for no callback. */ @SideOnly(Side.CLIENT) public ShaderCallback getBossBarShaderCallback(boolean background, int shader); - + } diff --git a/src/main/java/vazkii/botania/api/brew/Brew.java b/src/main/java/vazkii/botania/api/brew/Brew.java index c2e3f21b0..d8d9db4ba 100644 --- a/src/main/java/vazkii/botania/api/brew/Brew.java +++ b/src/main/java/vazkii/botania/api/brew/Brew.java @@ -29,7 +29,7 @@ public class Brew { int cost; List effects; boolean canInfuseBloodPendant = true; - + /** * @param name The unlocalized name of this potion. * @param color The color for the potion to be rendered in the bottle, note that it will get @@ -44,7 +44,7 @@ public class Brew { this.cost = cost; this.effects = new ArrayList(Arrays.asList(effects)); } - + /** * Sets this brew to not be able to be infused onto the Tainted Blood Pendant. */ @@ -52,11 +52,11 @@ public class Brew { canInfuseBloodPendant = false; return this; } - + public boolean canInfuseBloodPendant() { return canInfuseBloodPendant; } - + /** * Returns the key for this brew, for it to be found in the map in the API. * This should ALWAYS return the same result. @@ -64,51 +64,51 @@ public class Brew { public String getKey() { return key; } - + /** * Gets the insensitive unlocalized name. This is used for the lexicon. */ public String getUnlocalizedName() { return name; } - + /** * Gets the unlocalized name for the ItemStack passed in. */ public String getUnlocalizedName(ItemStack stack) { return getUnlocalizedName(); } - + /** - * Gets the display color for the ItemStack passed in. Note that for - * the lexicon, this passes in a botania Managlass Vial or an + * Gets the display color for the ItemStack passed in. Note that for + * the lexicon, this passes in a botania Managlass Vial or an * Alfglass Flask at all times. */ public int getColor(ItemStack stack) { return color; } - + /** * Gets the insensitive unlocalized mana cost. This is used for the lexicon. */ public int getManaCost() { return cost; } - + /** * Gets the mana cost for the ItemStack passed in. */ public int getManaCost(ItemStack stack) { return getManaCost(); } - + /** * Gets the list of potion effects for the ItemStack passed in. - * Note that for the lexicon, this passes in a botania Managlass + * Note that for the lexicon, this passes in a botania Managlass * Vial or an Alfglass Flask at all times. */ public List getPotionEffects(ItemStack stack) { return effects; } - + } diff --git a/src/main/java/vazkii/botania/api/brew/IBrewContainer.java b/src/main/java/vazkii/botania/api/brew/IBrewContainer.java index e3a364ad4..3284bb589 100644 --- a/src/main/java/vazkii/botania/api/brew/IBrewContainer.java +++ b/src/main/java/vazkii/botania/api/brew/IBrewContainer.java @@ -25,12 +25,12 @@ public interface IBrewContainer { * passed in. */ public ItemStack getItemForBrew(Brew brew, ItemStack stack); - + /** * Gets the cost to add this brew onto this container. Return -1 * to not allow for the brew to be added. Normally you'd * use brew.getManaCost(stack); */ public int getManaCost(Brew brew, ItemStack stack); - + } diff --git a/src/main/java/vazkii/botania/api/brew/IBrewItem.java b/src/main/java/vazkii/botania/api/brew/IBrewItem.java index e95386510..740862204 100644 --- a/src/main/java/vazkii/botania/api/brew/IBrewItem.java +++ b/src/main/java/vazkii/botania/api/brew/IBrewItem.java @@ -19,7 +19,7 @@ import net.minecraft.item.ItemStack; * from going back into the brewery but other mods might use it for whatever. */ public interface IBrewItem { - + public Brew getBrew(ItemStack brew); } diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index bc13b32eb..86977075d 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -43,7 +43,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { public LexiconPage elfPaperTextPage(String key) { return dummyPage(key); } - + @Override public LexiconPage imagePage(String key, String resource) { return dummyPage(key); @@ -98,7 +98,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { public LexiconPage elvenTradesPage(String key, RecipeElvenTrade recipe) { return dummyPage(key); } - + @Override public LexiconPage brewPage(String key, String bottomText, RecipeBrew recipe) { return dummyPage(key); @@ -112,7 +112,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { public ItemStack getSubTileAsStack(String subTile) { return new ItemStack(Blocks.stone, 0, 0); } - + @Override public ItemStack getSubTileAsFloatingFlowerStack(String subTile) { return getSubTileAsStack(subTile); diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index f724fcaaf..979071552 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -43,7 +43,7 @@ import cpw.mods.fml.relauncher.SideOnly; public interface IInternalMethodHandler { public LexiconPage textPage(String key); - + public LexiconPage elfPaperTextPage(String key); public LexiconPage imagePage(String key, String resource); @@ -67,13 +67,13 @@ public interface IInternalMethodHandler { public LexiconPage elvenTradePage(String key, List recipes); public LexiconPage elvenTradesPage(String key, RecipeElvenTrade recipe); - + public LexiconPage brewPage(String key, String bottomText, RecipeBrew recipe); public IManaNetwork getManaNetworkInstance(); public ItemStack getSubTileAsStack(String subTile); - + public ItemStack getSubTileAsFloatingFlowerStack(String subTile); public IIcon getSubTileIconForName(String name); @@ -94,12 +94,12 @@ public interface IInternalMethodHandler { @SideOnly(Side.CLIENT) public ResourceLocation getDefaultBossBarTexture(); - + @SideOnly(Side.CLIENT) public void setBossStatus(IBotaniaBoss status); - + public boolean isBuildcraftPipe(TileEntity tile); - + public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m); } diff --git a/src/main/java/vazkii/botania/api/internal/ShaderCallback.java b/src/main/java/vazkii/botania/api/internal/ShaderCallback.java index 095b673c3..7cd174759 100644 --- a/src/main/java/vazkii/botania/api/internal/ShaderCallback.java +++ b/src/main/java/vazkii/botania/api/internal/ShaderCallback.java @@ -15,7 +15,7 @@ package vazkii.botania.api.internal; * A Callback for when a shader is called. Used to define shader uniforms. */ public abstract class ShaderCallback { - + public abstract void call(int shader); - + } diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index c8d9c9ac1..5857f9ead 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -33,7 +33,7 @@ public interface IBaubleRender { * Called for the rendering of the bauble on the player. The player instance can be * acquired through the event parameter. Transformations are already applied for * the RenderType passed in. Make sure to check against the type parameter for - * rendering. + * rendering. */ @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type); @@ -51,7 +51,7 @@ public interface IBaubleRender { public static void applySneakingRotation() { GL11.glRotatef(28.64789F, 1.0F, 0.0F, 0.0F); } - + public static void translateToHeadLevel(EntityPlayer player) { GL11.glTranslated(0, (player != Minecraft.getMinecraft().thePlayer ? 1.62F : 0F) - player.getDefaultEyeHeight() + (player.isSneaking() ? 0.0625 : 0), 0); } diff --git a/src/main/java/vazkii/botania/api/item/IDyablePool.java b/src/main/java/vazkii/botania/api/item/IDyablePool.java index 8798f204a..07c80afa0 100644 --- a/src/main/java/vazkii/botania/api/item/IDyablePool.java +++ b/src/main/java/vazkii/botania/api/item/IDyablePool.java @@ -11,7 +11,6 @@ */ package vazkii.botania.api.item; -import vazkii.botania.api.mana.IManaPool; /** * Used to define a Mana Pool that can be dyed through floral powder. @@ -19,8 +18,8 @@ import vazkii.botania.api.mana.IManaPool; public interface IDyablePool { public int getColor(); - + public void setColor(int color); - - + + } diff --git a/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java b/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java index e48e10eec..79514f776 100644 --- a/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java +++ b/src/main/java/vazkii/botania/api/item/IFlowerlessBiome.java @@ -1,22 +1,22 @@ /** -* This class was created by . It's distributed as -* part of the Botania Mod. Get the Source Code in github: -* https://github.com/Vazkii/Botania -* -* Botania is Open Source and distributed under a -* Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License -* (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) -* -* File Created @ [? (GMT)] -*/ + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [? (GMT)] + */ package vazkii.botania.api.item; import net.minecraft.world.World; /** -* A BiomeGenBase that implements this will not have Botania flowers generated. -*/ + * A BiomeGenBase that implements this will not have Botania flowers generated. + */ public interface IFlowerlessBiome { /** - * @return Should this world be allowed to generate flowers? - */ + * @return Should this world be allowed to generate flowers? + */ public boolean canGenerateFlowers(World world, int x, int z); } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java b/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java index 6948ffa49..b9b8a0e07 100644 --- a/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java +++ b/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java @@ -14,11 +14,11 @@ package vazkii.botania.api.item; import net.minecraft.world.World; /** - * A BlockBush can implement this to check if it can be broken + * A BlockBush can implement this to check if it can be broken * by a Horn/Drum of the Wild or not. */ public interface IGrassHornExcempt { public boolean canUproot(World world, int x, int y, int z); - + } diff --git a/src/main/java/vazkii/botania/api/item/IManaDissolvable.java b/src/main/java/vazkii/botania/api/item/IManaDissolvable.java index 84de24a3c..526d8ef84 100644 --- a/src/main/java/vazkii/botania/api/item/IManaDissolvable.java +++ b/src/main/java/vazkii/botania/api/item/IManaDissolvable.java @@ -26,5 +26,5 @@ public interface IManaDissolvable { * size 0 the item is killed. This is called in both the server and client. */ public void onDissolveTick(IManaPool pool, ItemStack stack, EntityItem item); - + } diff --git a/src/main/java/vazkii/botania/api/lexicon/ITwoNamedPage.java b/src/main/java/vazkii/botania/api/lexicon/ITwoNamedPage.java index 8379f5ebc..1bb9b19a7 100644 --- a/src/main/java/vazkii/botania/api/lexicon/ITwoNamedPage.java +++ b/src/main/java/vazkii/botania/api/lexicon/ITwoNamedPage.java @@ -18,7 +18,7 @@ package vazkii.botania.api.lexicon; public interface ITwoNamedPage { public void setSecondUnlocalizedName(String name); - + public String getSecondUnlocalizedName(); } diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java index e2c9030c2..fa883dd72 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java @@ -19,7 +19,7 @@ import net.minecraft.util.ResourceLocation; public class LexiconCategory implements Comparable { private static int count = 0; - + public final String unlocalizedName; public final List entries = new ArrayList(); private final int sortingId; @@ -38,7 +38,7 @@ public class LexiconCategory implements Comparable { public String getUnlocalizedName() { return unlocalizedName; } - + /** * Sets the priority for this category for sorting. Higher numbers * means they'll appear first in the book. The basics category @@ -52,11 +52,11 @@ public class LexiconCategory implements Comparable { this.priority = priority; return this; } - + public int getSortingPriority() { return priority; } - + public final int getSortingId() { return sortingId; } diff --git a/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java b/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java index 087c9b677..f7b4348db 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java +++ b/src/main/java/vazkii/botania/api/mana/spark/ISparkAttachable.java @@ -36,7 +36,7 @@ public interface ISparkAttachable extends IManaReceiver { * Should NEVER return negative values. Make sure to check against that. */ public int getAvailableSpaceForMana(); - + /** * Gets the Spark that is attached to this block. A common implementation is * to check for Spark entities above: diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java index 3a5504f1b..9146b1659 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java @@ -28,7 +28,7 @@ public class RecipeBrew { public RecipeBrew(Brew brew, Object... inputs) { this.brew = brew; - + List inputsToSet = new ArrayList(); for(Object obj : inputs) { if(obj instanceof String || obj instanceof ItemStack) @@ -49,7 +49,7 @@ public class RecipeBrew { if(stack.getItem() instanceof IBrewContainer) continue; - + int stackIndex = -1, oredictIndex = -1; for(int j = 0; j < inputsMissing.size(); j++) { @@ -95,11 +95,11 @@ public class RecipeBrew { public List getInputs() { return new ArrayList(inputs); } - + public Brew getBrew() { return brew; } - + public int getManaUsage() { return brew.getManaCost(); } @@ -108,7 +108,7 @@ public class RecipeBrew { if(stack == null || !(stack.getItem() instanceof IBrewContainer)) return new ItemStack(Items.glass_bottle); // Fallback... IBrewContainer container = (IBrewContainer) stack.getItem(); - + return container.getItemForBrew(brew, stack); } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java index b7060e02f..369580cf7 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java @@ -31,13 +31,13 @@ public class RecipeManaInfusion { } public boolean matches(ItemStack stack) { - + if(input instanceof ItemStack) { ItemStack inputCopy = ((ItemStack) input).copy(); if(inputCopy.getItemDamage() == Short.MAX_VALUE) inputCopy.setItemDamage(stack.getItemDamage()); - - return stack.isItemEqual((ItemStack) inputCopy); + + return stack.isItemEqual(inputCopy); } if(input instanceof String) { diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index 853b5a7b5..e6fbd28c5 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -11,8 +11,8 @@ */ package vazkii.botania.api.subtile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.EntityLivingBase; @@ -26,8 +26,8 @@ import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandBindable; - -import java.util.ArrayList; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * A Sub-TileEntity, this is used for the flower system. Make sure to map subclasses diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index 92d31b043..40e093317 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -11,25 +11,15 @@ */ package vazkii.botania.client.core.handler; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderPlayerEvent; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.item.IBaubleRender.RenderType; -import vazkii.botania.client.core.helper.ShaderHelper; -import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -40,12 +30,12 @@ public final class BaubleRenderHandler { public void onPlayerRender(RenderPlayerEvent.Specials.Post event) { if(!ConfigHandler.renderBaubles) return; - + EntityPlayer player = event.entityPlayer; InventoryBaubles inv = PlayerHandler.getPlayerBaubles(player); dispatchRenders(inv, event, RenderType.BODY); - + float yaw = player.prevRotationYawHead + (player.rotationYawHead - player.prevRotationYawHead) * event.partialRenderTick; float yawOffset = player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * event.partialRenderTick; float pitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * event.partialRenderTick; @@ -69,5 +59,5 @@ public final class BaubleRenderHandler { } } } - + } diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index 0df549a7e..883c9a3f9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -34,17 +34,17 @@ public final class BossBarHandler { public static final ResourceLocation defaultBossBar = new ResourceLocation(LibResources.GUI_BOSS_BAR); static IBotaniaBoss currentBoss; - + private static final BarCallback barUniformCallback = new BarCallback(); - + public static void setCurrentBoss(IBotaniaBoss status) { currentBoss = status; } - + public static void render(ScaledResolution res) { if(currentBoss == null) return; - + Minecraft mc = Minecraft.getMinecraft(); Rectangle bgRect = currentBoss.getBossBarTextureRect(); Rectangle fgRect = currentBoss.getBossBarHPTextureRect(); @@ -56,7 +56,7 @@ public final class BossBarHandler { int yf = y + (bgRect.height - fgRect.height) / 2; int fw = (int) ((double) fgRect.width * (currentBoss.getHealth() / currentBoss.getMaxHealth())); int tx = c - mc.fontRenderer.getStringWidth(name) / 2; - + GL11.glColor4f(1F, 1F, 1F, 1F); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -66,52 +66,52 @@ public final class BossBarHandler { drawBar(xf, yf, fgRect.x, fgRect.y, fw, fgRect.height, false); mc.fontRenderer.drawStringWithShadow(name, tx, y - 10, 0xA2018C); GL11.glDisable(GL11.GL_BLEND); - + Entity e = (Entity) currentBoss; EntityPlayer p = mc.thePlayer; if(e.isDead || !p.worldObj.loadedEntityList.contains(e) || MathHelper.pointDistanceSpace(e.posX, e.posY, e.posZ, p.posX, p.posY, p.posZ) > 32) currentBoss = null; } - + public static void drawBar(int x, int y, int u, int v, int w, int h, boolean bg) { - boolean useShader = currentBoss instanceof IBotaniaBossWithShader; + boolean useShader = currentBoss instanceof IBotaniaBossWithShader; if(useShader) { IBotaniaBossWithShader shader = (IBotaniaBossWithShader) currentBoss; int program = shader.getBossBarShaderProgram(bg); ShaderCallback callback = program == 0 ? null : shader.getBossBarShaderCallback(bg, program); barUniformCallback.set(u, v, callback); - + ShaderHelper.useShader(program, barUniformCallback); } - + RenderHelper.drawTexturedModalRect(x, y, 0, u, v, w, h); - + if(useShader) ShaderHelper.releaseShader(); } - + static class BarCallback extends ShaderCallback { int x, y; ShaderCallback callback; - + @Override public void call(int shader) { int startXUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "startX"); int startYUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "startY"); - - + + ARBShaderObjects.glUniform1iARB(startXUniform, x); ARBShaderObjects.glUniform1iARB(startYUniform, y); - + if(callback != null) callback.call(shader); } - + void set(int x, int y, ShaderCallback callback) { this.x = x; this.y = y; this.callback = callback; } } - + } 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 7991d45c1..a8289c754 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -70,7 +70,7 @@ public final class HUDHandler { if(event.type == ElementType.ALL) { profiler.startSection("botania-hud"); MovingObjectPosition pos = mc.objectMouseOver; - + if(pos != null) { Block block = mc.theWorld.getBlock(pos.blockX, pos.blockY, pos.blockZ); TileEntity tile = mc.theWorld.getTileEntity(pos.blockX, pos.blockY, pos.blockZ); @@ -97,7 +97,7 @@ public final class HUDHandler { ItemCraftingHalo.renderHUD(event.resolution, mc.thePlayer, equippedStack); profiler.endSection(); } - + profiler.startSection("manaBar"); EntityPlayer player = mc.thePlayer; int totalMana = 0; @@ -142,7 +142,7 @@ public final class HUDHandler { BossBarHandler.render(event.resolution); profiler.endSection(); profiler.endSection(); - + GL11.glColor4f(1F, 1F, 1F, 1F); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index 79fbaa62b..62defbe4e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -60,7 +60,7 @@ public class LightningHandler { @SubscribeEvent public void onRenderWorldLast(RenderWorldLastEvent event) { Profiler profiler = Minecraft.getMinecraft().mcProfiler; - + profiler.startSection("botania-particles"); ParticleRenderDispatcher.dispatch(); profiler.startSection("redString"); diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index 41c341744..73915e5f4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -32,7 +32,7 @@ public final class RedStringRenderer { public static final Queue redStringTiles = new ArrayDeque(); static float sizeAlpha = 0F; - + public static void renderAll() { if(!redStringTiles.isEmpty()) { GL11.glPushMatrix(); @@ -48,7 +48,7 @@ public final class RedStringRenderer { TileRedString tile; while((tile = redStringTiles.poll()) != null) renderTile(tile); - + if(lighting) GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_TEXTURE_2D); @@ -57,7 +57,7 @@ public final class RedStringRenderer { } } - + public static void tick() { EntityPlayer player = Minecraft.getMinecraft().thePlayer; boolean hasWand = player != null && player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == ModItems.twigWand; @@ -66,11 +66,11 @@ public final class RedStringRenderer { else if(sizeAlpha < 1F &&hasWand) sizeAlpha += 0.1F; } - + private static void renderTile(TileRedString tile) { ForgeDirection dir = ForgeDirection.getOrientation(tile.getBlockMetadata()); ChunkCoordinates bind = tile.getBinding(); - + if(bind != null) { GL11.glPushMatrix(); GL11.glTranslated(tile.xCoord + 0.5 - RenderManager.renderPosX, tile.yCoord + 0.5 - RenderManager.renderPosY, tile.zCoord + 0.5 - RenderManager.renderPosZ); @@ -80,11 +80,11 @@ public final class RedStringRenderer { Vector3 vecApply = vecMag.copy(); int stages = (int) (vecOrig.mag() / vecMag.mag()); - + Tessellator tessellator = Tessellator.instance; GL11.glLineWidth(1F); tessellator.startDrawing(GL11.GL_LINES); - + double len = (double) -ClientTickHandler.ticksInGame / 100F + new Random(dir.ordinal() ^ tile.xCoord ^ tile.yCoord ^ tile.zCoord).nextInt(10000); double add = vecMag.mag(); double rand = Math.random() - 0.5; @@ -97,11 +97,11 @@ public final class RedStringRenderer { } tessellator.draw(); - + GL11.glPopMatrix(); } } - + private static void addVertexAtWithTranslation(Tessellator tess, ForgeDirection dir, double xpos, double ypos, double zpos, double rand, double l) { double freq = 20; double ampl = (0.15 * (Math.sin(l * 2F) * 0.5 + 0.5) + 0.1) * sizeAlpha; @@ -109,8 +109,8 @@ public final class RedStringRenderer { double x = xpos + Math.sin(l * freq) * ampl * Math.abs(Math.abs(dir.offsetX) - 1) + rand * randMul; double y = ypos + Math.cos(l * freq) * ampl * Math.abs(Math.abs(dir.offsetY) - 1) + rand * randMul; double z = zpos + (dir.offsetY == 0 ? Math.sin(l * freq) : Math.cos(l * freq)) * ampl * Math.abs(Math.abs(dir.offsetZ) - 1) + rand * randMul; - + tess.addVertex(x, y, z); } - + } diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index cab683152..c9fd56411 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -194,7 +194,7 @@ public final class RenderHelper { GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glPopMatrix(); } - + public static void renderProgressPie(int x, int y, float progress, ItemStack stack) { Minecraft mc = Minecraft.getMinecraft(); RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, x, y); @@ -207,14 +207,14 @@ public final class RenderHelper { GL11.glStencilOp(GL11.GL_REPLACE, GL11.GL_KEEP, GL11.GL_KEEP); GL11.glStencilMask(0xFF); RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, x, y); - + mc.renderEngine.bindTexture(new ResourceLocation(LibResources.GUI_MANA_HUD)); int r = 10; int centerX = x + 8; int centerY = y + 8; int degs = (int) (360 * progress); float a = 0.5F + 0.2F * ((float) Math.cos((double) ClientTickHandler.ticksInGame / 10) * 0.5F + 0.5F); - + GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_TEXTURE_2D); GL11.glShadeModel(GL11.GL_SMOOTH); diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index b945f97e5..da118cb5a 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -33,13 +33,13 @@ import vazkii.botania.api.item.IExtendedPlayerController; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wiki.IWikiProvider; import vazkii.botania.api.wiki.WikiHooks; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.BotaniaPlayerController; import vazkii.botania.client.core.handler.BoundTileRenderer; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.DebugHandler; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.handler.LightningHandler; -import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.fx.FXSparkle; @@ -119,7 +119,7 @@ import cpw.mods.fml.relauncher.ReflectionHelper; public class ClientProxy extends CommonProxy { public static boolean singAnnoyingChristmasSongsTillVazkiisHeadExplodesFromAllTheDamnJingle = false; - + @Override public void init(FMLInitializationEvent event) { super.init(event); @@ -138,13 +138,13 @@ public class ClientProxy extends CommonProxy { // Jingle bells jingle bells - Calendar calendar = Calendar.getInstance(); - if((calendar.get(2) == 11 && calendar.get(5) >= 24 && calendar.get(5) <= 26) || (calendar.get(2) == 0 && calendar.get(5) <= 6)) - singAnnoyingChristmasSongsTillVazkiisHeadExplodesFromAllTheDamnJingle = true; - + Calendar calendar = Calendar.getInstance(); + if(calendar.get(2) == 11 && calendar.get(5) >= 24 && calendar.get(5) <= 26 || calendar.get(2) == 0 && calendar.get(5) <= 6) + singAnnoyingChristmasSongsTillVazkiisHeadExplodesFromAllTheDamnJingle = true; + initRenderers(); } - + private void initRenderers() { LibRenderIDs.idAltar = RenderingRegistry.getNextAvailableRenderId(); LibRenderIDs.idSpecialFlower = RenderingRegistry.getNextAvailableRenderId(); @@ -168,7 +168,7 @@ public class ClientProxy extends CommonProxy { RenderTransparentItem renderTransparentItem = new RenderTransparentItem(); RenderFloatingFlowerItem renderFloatingFlower = new RenderFloatingFlowerItem(); - + MinecraftForgeClient.registerItemRenderer(ModItems.lens, new RenderLens()); if(ConfigHandler.lexicon3dModel) MinecraftForgeClient.registerItemRenderer(ModItems.lexicon, new RenderLexicon()); @@ -205,7 +205,7 @@ public class ClientProxy extends CommonProxy { ShaderHelper.initShaders(); } - + @Override @Optional.Method(modid = "NotEnoughItems") public void registerNEIStuff() { diff --git a/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java b/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java index cbe4803aa..7cc72b616 100644 --- a/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java +++ b/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java @@ -24,37 +24,37 @@ public class ContainerCraftingHalo extends ContainerWorkbench { super(p_i1808_1_, p_i1808_2_, 0, 0, 0); craftMatrix = new InventoryCraftingHalo(this, 3, 3); - + inventorySlots.clear(); inventoryItemStacks.clear(); - + // Le copypasta - this.addSlotToContainer(new SlotCrafting(p_i1808_1_.player, this.craftMatrix, this.craftResult, 0, 124, 35)); - int l; - int i1; + addSlotToContainer(new SlotCrafting(p_i1808_1_.player, craftMatrix, craftResult, 0, 124, 35)); + int l; + int i1; - for (l = 0; l < 3; ++l) - { - for (i1 = 0; i1 < 3; ++i1) - { - this.addSlotToContainer(new Slot(this.craftMatrix, i1 + l * 3, 30 + i1 * 18, 17 + l * 18)); - } - } + for (l = 0; l < 3; ++l) + { + for (i1 = 0; i1 < 3; ++i1) + { + addSlotToContainer(new Slot(craftMatrix, i1 + l * 3, 30 + i1 * 18, 17 + l * 18)); + } + } - for (l = 0; l < 3; ++l) - { - for (i1 = 0; i1 < 9; ++i1) - { - this.addSlotToContainer(new Slot(p_i1808_1_, i1 + l * 9 + 9, 8 + i1 * 18, 84 + l * 18)); - } - } + for (l = 0; l < 3; ++l) + { + for (i1 = 0; i1 < 9; ++i1) + { + addSlotToContainer(new Slot(p_i1808_1_, i1 + l * 9 + 9, 8 + i1 * 18, 84 + l * 18)); + } + } - for (l = 0; l < 9; ++l) - { - this.addSlotToContainer(new Slot(p_i1808_1_, l, 8 + l * 18, 142)); - } + for (l = 0; l < 9; ++l) + { + addSlotToContainer(new Slot(p_i1808_1_, l, 8 + l * 18, 142)); + } - this.onCraftMatrixChanged(this.craftMatrix); + onCraftMatrixChanged(craftMatrix); } @Override diff --git a/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java b/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java index 2d9cbf97f..4a7bb74dc 100644 --- a/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java +++ b/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java @@ -24,23 +24,23 @@ public class GuiCraftingHalo extends GuiContainer { private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation("textures/gui/container/crafting_table.png"); - public GuiCraftingHalo(InventoryPlayer p_i1084_1_, World p_i1084_2_) { - super(new ContainerCraftingHalo(p_i1084_1_, p_i1084_2_)); - } - - @Override - protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - this.fontRendererObj.drawString(I18n.format("container.crafting", new Object[0]), 28, 6, 4210752); - this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); - } + public GuiCraftingHalo(InventoryPlayer p_i1084_1_, World p_i1084_2_) { + super(new ContainerCraftingHalo(p_i1084_1_, p_i1084_2_)); + } + + @Override + protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { + fontRendererObj.drawString(I18n.format("container.crafting", new Object[0]), 28, 6, 4210752); + fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, ySize - 96 + 2, 4210752); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.getTextureManager().bindTexture(craftingTableGuiTextures); + int k = (width - xSize) / 2; + int l = (height - ySize) / 2; + drawTexturedModalRect(k, l, 0, 0, xSize, ySize); + } - @Override - protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(craftingTableGuiTextures); - int k = (this.width - this.xSize) / 2; - int l = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); - } - } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 89e548ad4..f19689616 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -53,7 +53,7 @@ public class GuiLexicon extends GuiScreen { public float lastTime = 0F; public float partialTicks = 0F; public float timeDelta = 0F; - + List allCategories; String title; @@ -64,10 +64,10 @@ public class GuiLexicon extends GuiScreen { @Override public void initGui() { super.initGui(); - + allCategories = new ArrayList(BotaniaAPI.getAllCategories()); Collections.sort(allCategories); - + lastTime = ClientTickHandler.ticksInGame; title = Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem().getDisplayName(); @@ -110,10 +110,10 @@ public class GuiLexicon extends GuiScreen { GL11.glColor4f(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(texture); drawTexturedModalRect(left, top, 0, 0, guiWidth, guiHeight); - + if(ClientProxy.singAnnoyingChristmasSongsTillVazkiisHeadExplodesFromAllTheDamnJingle) drawTexturedModalRect(left + 3, top + 1, 0, 212, 138, 6); - + drawBookmark(left + guiWidth / 2, top - getTitleHeight(), getTitle(), true); String subtitle = getSubtitle(); if(subtitle != null) { @@ -128,7 +128,7 @@ public class GuiLexicon extends GuiScreen { populateBookmarks(); bookmarksNeedPopulation = false; } - + if(mc.thePlayer.getCommandSenderName().equals("haighyorkie")) { GL11.glColor4f(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(texture); @@ -140,16 +140,16 @@ public class GuiLexicon extends GuiScreen { GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glTranslatef(0F, 0F, 2F); - + int w = 256; int h = 152; int x = (int) ((ClientTickHandler.ticksInGame + par3) * 6) % (width + w) - w; int y = (int) (top + guiHeight / 2 - h / 4 + Math.sin((ClientTickHandler.ticksInGame + par3) / 6.0) * 40); - + drawTexturedModalRect(x * 2, y * 2, 0, 0, w, h); - GL11.glDisable(GL11.GL_BLEND); + GL11.glDisable(GL11.GL_BLEND); GL11.glPopMatrix(); - + RenderHelper.renderTooltip(par1, par2, Arrays.asList(EnumChatFormatting.GOLD + "#goldfishchris", EnumChatFormatting.RED + "INTENSIFY HIM")); } } diff --git a/src/main/java/vazkii/botania/client/integration/nei/NEIGuiHooks.java b/src/main/java/vazkii/botania/client/integration/nei/NEIGuiHooks.java index e0c73d01c..305ffbc2d 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/NEIGuiHooks.java +++ b/src/main/java/vazkii/botania/client/integration/nei/NEIGuiHooks.java @@ -12,7 +12,6 @@ package vazkii.botania.client.integration.nei; import vazkii.botania.client.gui.crafting.GuiCraftingHalo; -import net.minecraft.client.gui.inventory.GuiCrafting; import codechicken.nei.api.API; import codechicken.nei.recipe.DefaultOverlayHandler; @@ -22,5 +21,5 @@ public class NEIGuiHooks { API.registerGuiOverlay(GuiCraftingHalo.class, "crafting"); API.registerGuiOverlayHandler(GuiCraftingHalo.class, new DefaultOverlayHandler(), "crafting"); } - + } diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java index b6174af27..7ed590871 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java @@ -46,7 +46,7 @@ public class RecipeHandlerBrewery extends TemplateRecipeHandler { } public void setIngredients(List inputs) { - int left = 96 - (inputs.size() * 18 / 2); + int left = 96 - inputs.size() * 18 / 2; int i = 0; for (Object o : inputs) { @@ -97,7 +97,7 @@ public class RecipeHandlerBrewery extends TemplateRecipeHandler { public void loadCraftingRecipes(String outputId, Object... results) { if (outputId.equals("botania.brewery")) for (RecipeBrew recipe : BotaniaAPI.brewRecipes) - this.arecipes.add(new CachedBreweryRecipe(recipe)); + arecipes.add(new CachedBreweryRecipe(recipe)); else super.loadCraftingRecipes(outputId, results); } @@ -107,7 +107,7 @@ public class RecipeHandlerBrewery extends TemplateRecipeHandler { if (result.getItem() instanceof IBrewItem) for (RecipeBrew recipe : BotaniaAPI.brewRecipes) if (((IBrewItem) result.getItem()).getBrew(result) == recipe.getBrew()) - this.arecipes.add(new CachedBreweryRecipe(recipe)); + arecipes.add(new CachedBreweryRecipe(recipe)); } @Override @@ -115,13 +115,13 @@ public class RecipeHandlerBrewery extends TemplateRecipeHandler { if (ingredient.getItem() instanceof IBrewContainer) { for(RecipeBrew recipe : BotaniaAPI.brewRecipes) { if(recipe.getOutput(ingredient) != null) - this.arecipes.add(new CachedBreweryRecipe(recipe, ingredient)); + arecipes.add(new CachedBreweryRecipe(recipe, ingredient)); } } else for (RecipeBrew recipe : BotaniaAPI.brewRecipes) { CachedBreweryRecipe crecipe = new CachedBreweryRecipe(recipe); if (crecipe.contains(crecipe.inputs, ingredient)) - this.arecipes.add(crecipe); + arecipes.add(crecipe); } } diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java index 635835daa..480917225 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java @@ -42,7 +42,7 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { if(o instanceof String) this.inputs.add(new PositionedStack(OreDictionary.getOres((String) o), 60 + i * 18, 6)); else this.inputs.add(new PositionedStack(o, 60 + i * 18, 6)); - + i++; } } diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java index e333a207e..c17367010 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java @@ -130,6 +130,6 @@ public class RecipeHandlerPetalApothecary extends TemplateRecipeHandler { arecipes.add(crecipe); } } - + } diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 840e3909b..5a89375d0 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -42,7 +42,7 @@ public final class LibResources { public static final String GUI_POTIONS = PREFIX_GUI + "potions.png"; public static final String GUI_NEI_BLANK = PREFIX_GUI + "neiBlank.png"; public static final String GUI_NEI_BREWERY = PREFIX_GUI + "neiBrewery.png"; - + public static final String ENTRY_FLOWERS = PREFIX_ENTRIES + "flowers.png"; public static final String ENTRY_APOTHECARY = PREFIX_ENTRIES + "apothecary.png"; public static final String ENTRY_PURE_DAISY = PREFIX_ENTRIES + "pureDaisy.png"; @@ -100,7 +100,7 @@ public final class LibResources { public static final String MODEL_KNOCKBACK_BELT = PREFIX_MODEL + "knockbackBelt.png"; public static final String MODEL_HOLY_CLOAK = PREFIX_MODEL + "holyCloak.png"; public static final String MODEL_UNHOLY_CLOAK = PREFIX_MODEL + "unholyCloak.png"; - + public static final String MODEL_CAPE = "/assets/botania/textures/model/cape.png"; public static final String MISC_PARTICLES = PREFIX_MISC + "particles.png"; diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index 9e6400004..28b86b58c 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -49,12 +49,12 @@ public class ModelBrewery extends ModelBase { public void render(RenderTileBrewery render, double time) { float f = 1F / 16F; - + float offset = (float) Math.sin(time / 40) * 0.1F + 0.05F; int plates = render.brewery.getSizeInventory() - 1; float deg = (float) time / 16F; float polerot = -deg * 25F; - + GL11.glTranslatef(0F, offset, 0F); GL11.glRotatef(polerot, 0F, 1F, 0F); if(render.brewery.getStackInSlot(0) != null) { @@ -69,14 +69,14 @@ public class ModelBrewery extends ModelBase { Top.render(f); Bottom.render(f); GL11.glRotatef(-polerot, 0F, 1F, 0F); - + float degper = (float) (2F * Math.PI) / plates; for(int i = 0; i < plates; i++) { Plate.rotateAngleY = deg; float offset1 = (float) Math.sin(time / 20 + i * 40F) * 0.2F - 0.2F; if(time == -1) offset1 = 0F; - + GL11.glTranslatef(0F, offset1, 0F); if(render.brewery.getStackInSlot(i + 1) != null) { float rot = Plate.rotateAngleY * 180F / (float) Math.PI; @@ -91,10 +91,10 @@ public class ModelBrewery extends ModelBase { GL11.glTranslatef(-transX, -transY, -transZ); GL11.glRotatef(-rot, 0F, 1F, 0F); } - + Plate.render(f); GL11.glTranslatef(0F, -offset1, 0F); - + deg += degper; } GL11.glTranslatef(0F, -offset, 0F); diff --git a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java index 3f643e8a0..67fa7e8b4 100644 --- a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java +++ b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java @@ -60,7 +60,7 @@ public class ModelSpinningCubes extends ModelBase { GL11.glRotatef(deg, xRotate, yRotate, zRotate); if(repeat < origRepeat) { - GL11.glColor4f(1F, 1F, 1F, ((float) repeat / (float) origRepeat) * 0.4F); + GL11.glColor4f(1F, 1F, 1F, (float) repeat / (float) origRepeat * 0.4F); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glDisable(GL11.GL_ALPHA_TEST); @@ -82,7 +82,7 @@ public class ModelSpinningCubes extends ModelBase { } GL11.glPopMatrix(); GL11.glEnable(GL11.GL_TEXTURE_2D); - + if(repeat != 0) renderSpinningCubes(cubes, repeat - 1, origRepeat); } diff --git a/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java b/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java index 182a3b40d..9c709ddb2 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderBrewery.java @@ -18,12 +18,10 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.client.render.tile.RenderTileBrewery; -import vazkii.botania.common.block.tile.TileAltar; import vazkii.botania.common.block.tile.TileBrewery; -import vazkii.botania.common.block.tile.TileSpawnerClaw; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderBrewery implements ISimpleBlockRenderingHandler { @@ -52,5 +50,5 @@ public class RenderBrewery implements ISimpleBlockRenderingHandler { public int getRenderId() { return LibRenderIDs.idBrewery; } - + } diff --git a/src/main/java/vazkii/botania/client/render/block/RenderFloatingFlower.java b/src/main/java/vazkii/botania/client/render/block/RenderFloatingFlower.java index 5c1686fd0..317cbe34c 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderFloatingFlower.java @@ -13,14 +13,8 @@ package vazkii.botania.client.render.block; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.common.block.tile.TileFloatingFlower; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderFloatingFlower implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java b/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java index 30606b430..1c20ac3c4 100644 --- a/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java +++ b/src/main/java/vazkii/botania/client/render/block/RenderSpecialFlower.java @@ -15,7 +15,6 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; @@ -61,13 +60,13 @@ public class RenderSpecialFlower implements ISimpleBlockRenderingHandler { double d1 = par2; double d2 = par3; double d0 = par4; - long sh; + long sh; - sh = (long)(par2 * 3129871) ^ (long) par4 * 116129781L ^ (long) par3; + sh = par2 * 3129871 ^ par4 * 116129781L ^ par3; sh = sh * sh * 42317861L + sh * 11L; - d1 += ((double)((float)(sh >> 16 & 15L) / 15.0F) - 0.5D) * 0.3D; - d2 += (double)((float)(sh >> 32 & 15L) / 15.0F) * -0.15D; - d0 += ((double)((float)(sh >> 24 & 15L) / 15.0F) - 0.5D) * 0.3D; + d1 += ((sh >> 16 & 15L) / 15.0F - 0.5D) * 0.3D; + d2 += (sh >> 32 & 15L) / 15.0F * -0.15D; + d0 += ((sh >> 24 & 15L) / 15.0F - 0.5D) * 0.3D; drawCrossedSquares(blockAccess, par1Block, par2, par3, par4, d1, d2, d0, 1.0F, render); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index 19fb07f75..761ec8c65 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -15,7 +15,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.entity.Entity; -import net.minecraft.entity.boss.BossStatus; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.ARBShaderObjects; diff --git a/src/main/java/vazkii/botania/client/render/item/RenderFloatingFlowerItem.java b/src/main/java/vazkii/botania/client/render/item/RenderFloatingFlowerItem.java index f6ba243cb..3f399fcca 100644 --- a/src/main/java/vazkii/botania/client/render/item/RenderFloatingFlowerItem.java +++ b/src/main/java/vazkii/botania/client/render/item/RenderFloatingFlowerItem.java @@ -46,7 +46,7 @@ public class RenderFloatingFlowerItem implements IItemRenderer { GL11.glRotatef(-5F, 1F, 0F, 0F); Item item = stack.getItem(); TileFloatingFlower.forcedStack = item instanceof ItemBlockFloatingSpecialFlower ? ItemBlockSpecialFlower.ofType(ItemBlockSpecialFlower.getType(stack)) : new ItemStack(ModBlocks.flower, 1, stack.getItemDamage()); - + TileEntityRendererDispatcher.instance.renderTileEntityAt(new TileFloatingFlower(), 0.0D, 0.0D, 0.0D, 0.0F); GL11.glDisable(GL11.GL_BLEND); GL11.glPopMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 9535a05e9..f0ba9d808 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -16,7 +16,6 @@ import java.awt.Color; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureMap; @@ -134,7 +133,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { Block block = lava ? Blocks.lava : Blocks.water; int brightness = lava ? 240 : -1; float alpha = lava ? 1F : 0.7F; - + GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glDisable(GL11.GL_ALPHA_TEST); @@ -154,7 +153,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer { } GL11.glPopMatrix(); } - + public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index fe2470baa..fde016922 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -12,18 +12,7 @@ package vazkii.botania.client.render.tile; import java.awt.Color; -import java.util.Random; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import vazkii.botania.api.mana.ILens; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.client.model.ModelBrewery; -import vazkii.botania.client.render.item.RenderLens; -import vazkii.botania.common.block.tile.TileBrewery; -import vazkii.botania.common.block.tile.mana.TileSpreader; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; @@ -39,13 +28,21 @@ import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.ForgeHooksClient; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.client.model.ModelBrewery; +import vazkii.botania.common.block.tile.TileBrewery; + public class RenderTileBrewery extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BREWERY); ModelBrewery model = new ModelBrewery(); public TileBrewery brewery; public static boolean rotate = true; - + @Override public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f) { brewery = (TileBrewery) tileentity; @@ -61,12 +58,12 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { double time = ClientTickHandler.ticksInGame + f; if(!rotate) time = -1; - + model.render(this, time); GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glPopMatrix(); } - + public void renderItemStack(ItemStack stack) { if(stack != null) { Minecraft mc = Minecraft.getMinecraft(); @@ -105,7 +102,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { } } GL11.glScalef(1F / s, 1F / s, 1F / s); - + Minecraft.getMinecraft().renderEngine.bindTexture(texture); } } 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 203ba1110..874d4773c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -28,9 +28,7 @@ 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.BlockModFlower; import vazkii.botania.common.block.decor.IFloatingFlower; -import vazkii.botania.common.block.tile.TileFloatingFlower; public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { @@ -66,7 +64,7 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { ItemStack stack = flower.getDisplayStack(); IIcon icon = stack.getIconIndex(); - + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); float f = icon.getMinU(); float f1 = icon.getMaxU(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java index 8b5857a91..f9173e893 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -11,18 +11,18 @@ */ package vazkii.botania.client.render.tile; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.render.item.RenderLens; import vazkii.botania.common.block.tile.mana.TilePrism; -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; public class RenderTilePrism extends TileEntitySpecialRenderer { @@ -31,8 +31,8 @@ public class RenderTilePrism extends TileEntitySpecialRenderer { TilePrism prism = (TilePrism) tile; GL11.glPushMatrix(); GL11.glTranslated(x, y, z); - float pos = (float) Math.sin((float) (ClientTickHandler.ticksInGame + partTicks) * 0.05F) * 0.5F * (1F - 1F / 16F) - 0.5F; - + float pos = (float) Math.sin((ClientTickHandler.ticksInGame + partTicks) * 0.05F) * 0.5F * (1F - 1F / 16F) - 0.5F; + ItemStack stack = prism.getStackInSlot(0); if(stack != null) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java index 2118cbedd..3a15bbf84 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java @@ -11,13 +11,10 @@ */ package vazkii.botania.client.render.tile; -import org.lwjgl.opengl.GL11; - -import vazkii.botania.client.core.handler.RedStringRenderer; -import vazkii.botania.common.block.tile.string.TileRedString; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; +import vazkii.botania.client.core.handler.RedStringRenderer; +import vazkii.botania.common.block.tile.string.TileRedString; public class RenderTileRedString extends TileEntitySpecialRenderer { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java index e2edba5ce..4ca5a05bf 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -14,11 +14,8 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -26,7 +23,6 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.helper.ShaderHelper; -import vazkii.botania.common.block.mana.BlockEnchanter; import vazkii.botania.common.block.mana.BlockTerraPlate; import vazkii.botania.common.block.tile.TileTerraPlate; @@ -36,8 +32,8 @@ public class RenderTileTerraPlate extends TileEntitySpecialRenderer { public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f) { TileTerraPlate plate = (TileTerraPlate) tileentity; - float max = (float) TileTerraPlate.MAX_MANA / 10F; - float alphaMod = (float) Math.min(max, plate.getCurrentMana()) / max; + float max = TileTerraPlate.MAX_MANA / 10F; + float alphaMod = Math.min(max, plate.getCurrentMana()) / max; GL11.glPushMatrix(); GL11.glTranslated(d0, d1, d2); diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 9655507e1..0bf996d61 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -17,9 +17,9 @@ import vazkii.botania.common.core.proxy.CommonProxy; import vazkii.botania.common.lib.LibMisc; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLMissingMappingsEvent; @@ -33,7 +33,7 @@ public class Botania { public static boolean thaumcraftLoaded = false; public static boolean bcTriggersLoaded = false; - + @Instance(LibMisc.MOD_ID) public static Botania instance; @@ -44,7 +44,7 @@ public class Botania { public void preInit(FMLPreInitializationEvent event) { thaumcraftLoaded = Loader.isModLoaded("Thaumcraft"); bcTriggersLoaded = ModAPIManager.INSTANCE.hasAPI("BuildCraftAPI|statements"); - + proxy.preInit(event); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 46a8cb818..aba5e0234 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -103,10 +103,10 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { } else if(stack != null && stack.getItem() == Items.lava_bucket) { if(!par5EntityPlayer.capabilities.isCreativeMode) par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, getContainer(stack)); - + tile.setLava(true); par1World.func_147453_f(par2, par3, par4, this); - + return true; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java index 3f552d7a6..5ed43a155 100644 --- a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java @@ -19,7 +19,7 @@ public class BlockDreamwood extends BlockLivingwood { void register(String name) { GameRegistry.registerBlock(this, ItemBlockDreamwood.class, name); } - + @Override public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { return LexiconData.elvenResources; diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 2de6a33f4..7c6d6d401 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -19,7 +19,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; 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.item.Item; import net.minecraft.item.ItemStack; @@ -33,11 +32,9 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.common.Botania; import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; import vazkii.botania.common.block.tile.TileSpecialFlower; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe; import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @@ -45,31 +42,31 @@ import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { - + public BlockFloatingSpecialFlower() { super(LibBlockNames.FLOATING_SPECIAL_FLOWER); - + GameRegistry.addRecipe(new SpecialFloatingFlowerRecipe()); RecipeSorter.register("botania:floatingSpecialFlower", SpecialFloatingFlowerRecipe.class, Category.SHAPELESS, ""); } - + @Override public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { // NO-OP } - + @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(String s : BotaniaAPI.subtilesForCreativeMenu) par3List.add(ItemBlockSpecialFlower.ofType(new ItemStack(par1), s)); } - + @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { String name = ((TileSpecialFlower) world.getTileEntity(x, y, z)).subTileName; return ItemBlockSpecialFlower.ofType(new ItemStack(world.getBlock(x, y, z)), name); } - + @Override public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) { if(!par6EntityPlayer.capabilities.isCreativeMode) { @@ -77,7 +74,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I ((TileSpecialFlower) par1World.getTileEntity(par2, par3, par4)).onBlockHarvested(par1World, par2, par3, par4, par5, par6EntityPlayer); } } - + @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { ArrayList list = new ArrayList(); @@ -91,14 +88,14 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I return list; } - + @Override public boolean onBlockEventReceived(World par1World, int par2, int par3, int par4, int par5, int par6) { super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6); TileEntity tileentity = par1World.getTileEntity(par2, par3, par4); return tileentity != null ? tileentity.receiveClientEvent(par5, par6) : false; } - + @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, int x, int y, int z, int side) { return ((TileSpecialFlower) world.getTileEntity(x, y, z)).onWanded(stack, player); @@ -123,12 +120,12 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { ((TileSpecialFlower) world.getTileEntity(x, y, z)).renderHUD(mc, res); } - + @Override protected void register(String name) { - GameRegistry.registerBlock(this, ItemBlockFloatingSpecialFlower.class, name); + GameRegistry.registerBlock(this, ItemBlockFloatingSpecialFlower.class, name); } - + @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileFloatingSpecialFlower(); diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 34e6e7b37..63862285a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -26,7 +26,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockMod extends Block { public int originalLight; - + public BlockMod(Material par2Material) { super(par2Material); if(registerInCreative()) @@ -49,7 +49,7 @@ public class BlockMod extends Block { originalLight = (int) (p_149715_1_ * 15); return super.setLightLevel(p_149715_1_); } - + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister par1IconRegister) { diff --git a/src/main/java/vazkii/botania/common/block/BlockModContainer.java b/src/main/java/vazkii/botania/common/block/BlockModContainer.java index cdb95ea84..7e6bef8a5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModContainer.java +++ b/src/main/java/vazkii/botania/common/block/BlockModContainer.java @@ -27,7 +27,7 @@ import cpw.mods.fml.relauncher.SideOnly; public abstract class BlockModContainer extends BlockContainer { public int originalLight; - + protected BlockModContainer(Material par2Material) { super(par2Material); if(registerInCreative()) @@ -44,7 +44,7 @@ public abstract class BlockModContainer extends BlockConta protected boolean shouldRegisterInNameSet() { return true; } - + @Override public Block setLightLevel(float p_149715_1_) { originalLight = (int) (p_149715_1_ * 15); diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 219f387a0..89df43527 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -44,7 +44,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable { public static IIcon[] iconsAlt; public int originalLight; - + public static final String ALT_DIR = "alt"; protected BlockModFlower() { @@ -88,7 +88,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable { iconsAlt[i] = IconHelper.forBlock(par1IconRegister, this, i, ALT_DIR); } } - + @Override public Block setLightLevel(float p_149715_1_) { originalLight = (int) (p_149715_1_ * 15); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index c37301165..a0755ad70 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -145,7 +145,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid protected boolean canPlaceBlockOn(Block block) { return super.canPlaceBlockOn(block) || block == ModBlocks.redStringRelay; } - + @Override public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) { if(!par6EntityPlayer.capabilities.isCreativeMode) { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index cdd6e49b9..f27b2d380 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.decor; import java.util.Random; -import cpw.mods.fml.common.Optional; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.Item; @@ -26,6 +25,7 @@ import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; +import cpw.mods.fml.common.Optional; public class BlockBuriedPetals extends BlockModFlower { @@ -34,12 +34,12 @@ public class BlockBuriedPetals extends BlockModFlower { setBlockBounds(0F, 0F, 0F, 1F, 0.1F, 1F); setLightLevel(0.25F); } - + @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, int x, int y, int z) { + public int getLightValue(IBlockAccess world, int x, int y, int z) { return ColoredLightHelper.getPackedColor(world.getBlockMetadata(x, y, z), originalLight); - } + } @Override public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java index 3059cdabb..c45204250 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -45,28 +45,28 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { float max = 0.4F; double motionX = Math.abs(entity.motionX); - double motionZ = Math.abs(entity.motionZ); - if(motionX < max) - entity.motionX *= speed; - if(motionZ < max) - entity.motionZ *= speed; + double motionZ = Math.abs(entity.motionZ); + if(motionX < max) + entity.motionX *= speed; + if(motionZ < max) + entity.motionZ *= speed; } @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1); } - + @Override public boolean isOpaqueCube() { return false; } - + @Override public boolean renderAsNormalBlock() { return false; } - + @Override public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plantable) { return plantable.getPlantType(world, x, y - 1, z) == EnumPlantType.Plains; @@ -76,5 +76,5 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { return LexiconData.dirtPath; } - + } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java index ecee759ca..0c116d9f2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java @@ -13,8 +13,6 @@ package vazkii.botania.common.block.decor; import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -25,7 +23,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 016d6e12e..7de270aae 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -48,7 +48,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab public BlockFloatingFlower() { this(LibBlockNames.MINI_ISLAND); } - + public BlockFloatingFlower(String name) { super(Material.ground); setBlockName(name); @@ -59,12 +59,12 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab float f = 0.1F; setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); } - + @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, int x, int y, int z) { + public int getLightValue(IBlockAccess world, int x, int y, int z) { return ColoredLightHelper.getPackedColor(world.getBlockMetadata(x, y, z), originalLight); - } + } @Override protected boolean shouldRegisterInNameSet() { @@ -76,9 +76,9 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab register(par1Str); return super.setBlockName(par1Str); } - + protected void register(String name) { - GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); + GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name); } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 142e1eb37..54d228689 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.decor; import java.util.ArrayList; -import cpw.mods.fml.common.Optional; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; @@ -25,8 +24,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileManaFlame; -import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.lib.LibBlockNames; +import cpw.mods.fml.common.Optional; public class BlockManaFlame extends BlockModContainer { @@ -38,23 +37,23 @@ public class BlockManaFlame extends BlockModContainer { setBlockBounds(f, f, f, 1F - f, 1F - f, 1F - f); setLightLevel(1F); } - + @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, int x, int y, int z) { + public int getLightValue(IBlockAccess world, int x, int y, int z) { return ((TileManaFlame) world.getTileEntity(x, y, z)).getLightColor(); - } - + } + @Override public void registerBlockIcons(IIconRegister par1IconRegister) { // NO-OP } - + @Override public int getRenderType() { return -1; } - + @Override public boolean isOpaqueCube() { return false; @@ -64,27 +63,27 @@ public class BlockManaFlame extends BlockModContainer { public boolean renderAsNormalBlock() { return false; } - + @Override public boolean getBlocksMovement(IBlockAccess p_149655_1_, int p_149655_2_, int p_149655_3_, int p_149655_4_) { return true; } - + @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) { return null; } - + @Override public IIcon getIcon(int side, int meta) { return Blocks.fire.getIcon(side, meta); } - + @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { return new ArrayList(); } - + @Override public TileEntity createNewTileEntity(World world, int meta) { return new TileManaFlame(); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java index 276833d53..2f3b5bf29 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -11,19 +11,14 @@ */ package vazkii.botania.common.block.decor; -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -33,7 +28,7 @@ public class BlockManaGlass extends BlockMod implements ILexiconable { public BlockManaGlass() { this(LibBlockNames.MANA_GLASS); } - + public BlockManaGlass(String name) { super(Material.glass); setHardness(0.3F); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java index 919ac9b6b..56b55ae24 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockSeaLamp.java @@ -11,7 +11,6 @@ */ package vazkii.botania.common.block.decor; -import cpw.mods.fml.common.Optional; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -23,6 +22,7 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import cpw.mods.fml.common.Optional; public class BlockSeaLamp extends BlockMod implements ILexiconable { @@ -33,14 +33,14 @@ public class BlockSeaLamp extends BlockMod implements ILexiconable { setLightLevel(1.0F); setBlockName(LibBlockNames.SEA_LAMP); } - + int coloredLight = -1; - + @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, int x, int y, int z) { + public int getLightValue(IBlockAccess world, int x, int y, int z) { return coloredLight == -1 ? (coloredLight = ColoredLightHelper.makeRGBLightValue(85, 136, 125, originalLight)) : coloredLight; - } + } @Override public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index 62e69a1d7..06ea73359 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block.decor; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -35,13 +34,13 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili super(LibBlockNames.SHINY_FLOWER); setLightLevel(1F); } - + @Override @Optional.Method(modid = "easycoloredlights") - public int getLightValue(IBlockAccess world, int x, int y, int z) { + public int getLightValue(IBlockAccess world, int x, int y, int z) { return ColoredLightHelper.getPackedColor(world.getBlockMetadata(x, y, z), originalLight); - } - + } + @Override public void registerBlockIcons(IIconRegister par1IconRegister) { // NO-OP diff --git a/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java index 936a7bb15..03f8b34d2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java @@ -16,5 +16,5 @@ import net.minecraft.item.ItemStack; public interface IFloatingFlower { public ItemStack getDisplayStack(); - + } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index ff256f8ec..066e0f195 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -32,7 +32,6 @@ import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileBrewery; -import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -165,6 +164,6 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa @Override public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { ((TileBrewery) world.getTileEntity(x, y, z)).renderHUD(mc, res); - } + } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index c4d3d2fbd..5867d1f1b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -34,7 +34,6 @@ import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; -import vazkii.botania.common.block.tile.TileBrewery; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; @@ -151,5 +150,5 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex public void renderHUD(Minecraft mc, ScaledResolution res, World world, int x, int y, int z) { ((TileEnchanter) world.getTileEntity(x, y, z)).renderHUD(mc, res); } - + } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index fd6a5c92f..b6c5cc08b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -107,7 +107,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona public void onBurstCollision(IManaBurst burst, World world, int x, int y, int z) { if(burst.isFake()) return; - + if(world.getBlockMetadata(x, y, z) == 0) ItemGrassHorn.breakGrass(world, 0, x, y, z); else { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index 06a8a4279..9c1fbfbb9 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -40,7 +40,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi Random random; IIcon[] icons; - + public BlockPrism() { super(Material.glass); setHardness(0.3F); @@ -49,10 +49,10 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi setBlockName(LibBlockNames.PRISM); float f = 0.25F; setBlockBounds(f, 0F, f, 1F - f, 1F, 1F - f); - + random = new Random(); } - + @Override public void registerBlockIcons(IIconRegister par1IconRegister) { icons = new IIcon[2]; @@ -69,17 +69,17 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi public int getRenderBlockPass() { return 1; } - + @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) { return null; } - + @Override public boolean isOpaqueCube() { return false; } - + @Override public boolean renderAsNormalBlock() { return false; @@ -112,7 +112,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi return true; } - + @Override public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { TileEntity tile = par1World.getTileEntity(par2, par3, par4); @@ -154,7 +154,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi super.breakBlock(par1World, par2, par3, par4, par5, par6); } - + @Override public TileEntity createNewTileEntity(World world, int meta) { return new TilePrism(); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 7661ab60d..99cca7867 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -33,7 +33,6 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.block.tile.TileSimpleInventory; -import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -74,7 +73,7 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, IWan public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { TileRuneAltar altar = (TileRuneAltar) par1World.getTileEntity(par2, par3, par4); - + if(par5EntityPlayer.isSneaking()) { if(altar.manaToGet == 0) for(int i = altar.getSizeInventory() - 1; i >= 0; i--) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index 52a422dcb..5f6cffd82 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -11,13 +11,6 @@ */ package vazkii.botania.common.block.mana; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.common.block.BlockModContainer; -import vazkii.botania.common.block.tile.TileTerraPlate; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -25,12 +18,19 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.block.BlockModContainer; +import vazkii.botania.common.block.tile.TileTerraPlate; +import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibBlockNames; public class BlockTerraPlate extends BlockModContainer implements ILexiconable { - + public static IIcon overlay; IIcon[] icons; - + public BlockTerraPlate() { super(Material.iron); setBlockBounds(0F, 0F, 0F, 1F, 3F / 16F, 1F); @@ -39,17 +39,17 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable { setStepSound(soundTypeMetal); setBlockName(LibBlockNames.TERRA_PLATE); } - + @Override public boolean renderAsNormalBlock() { return false; } - + @Override public boolean isOpaqueCube() { return false; } - + @Override public void registerBlockIcons(IIconRegister par1IconRegister) { icons = new IIcon[3]; diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java index c960405e4..caf7628d6 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -23,7 +23,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; -import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.lexicon.LexiconData; @@ -31,7 +30,7 @@ public abstract class BlockRedString extends BlockModContainer im IIcon senderIcon; IIcon sideIcon; - + public BlockRedString(String name) { super(Material.rock); setHardness(2.0F); @@ -39,7 +38,7 @@ public abstract class BlockRedString extends BlockModContainer im setStepSound(soundTypeStone); setBlockName(name); } - + @Override public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { int orientation = BlockPistonBase.determineOrientation(par1World, par2, par3, par4, par5EntityLivingBase); @@ -51,19 +50,19 @@ public abstract class BlockRedString extends BlockModContainer im senderIcon = IconHelper.forName(par1IconRegister, "redStringSender"); sideIcon = registerSideIcon(par1IconRegister); } - + public IIcon registerSideIcon(IIconRegister register) { return IconHelper.forBlock(register, this); } - + @Override public IIcon getIcon(int side, int meta) { return side == meta ? senderIcon : sideIcon; } - + @Override public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { return LexiconData.redString; } - + } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java index 0a582e04d..66b41de0d 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java @@ -26,12 +26,12 @@ public class BlockRedStringComparator extends BlockRedString { public boolean hasComparatorInputOverride() { return true; } - + @Override public int getComparatorInputOverride(World world, int x, int y, int z, int side) { return ((TileRedStringComparator) world.getTileEntity(x, y, z)).getComparatorValue(); } - + @Override public TileRedString createNewTileEntity(World world, int meta) { return new TileRedStringComparator(); diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java index 42723f47a..79f57b416 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -14,7 +14,6 @@ package vazkii.botania.common.block.string; import net.minecraft.block.Block; import net.minecraft.world.World; import vazkii.botania.common.block.tile.string.TileRedString; -import vazkii.botania.common.block.tile.string.TileRedStringContainer; import vazkii.botania.common.block.tile.string.TileRedStringDispenser; import vazkii.botania.common.lib.LibBlockNames; diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java index 83ced69de..c956370a7 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java @@ -11,10 +11,7 @@ */ package vazkii.botania.common.block.string; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.IPlantable; -import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringRelay; import vazkii.botania.common.lib.LibBlockNames; @@ -24,7 +21,7 @@ public class BlockRedStringRelay extends BlockRedString { public BlockRedStringRelay() { super(LibBlockNames.RED_STRING_RELAY); } - + @Override public TileRedString createNewTileEntity(World world, int meta) { return new TileRedStringRelay(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java index 60d488072..82a284516 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java @@ -27,7 +27,7 @@ public class SubTileManastar extends SubTileEntity { @Override public void onUpdate() { super.onUpdate(); - + int mana = 0; for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { TileEntity tile = supertile.getWorldObj().getTileEntity(supertile.xCoord + dir.offsetX, supertile.yCoord, supertile.zCoord + dir.offsetZ); diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java index cc2e0d85e..cd214322f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -47,7 +47,7 @@ public class SubTilePureDaisy extends SubTileEntity { @Override public void onUpdate() { super.onUpdate(); - + positionAt++; if(positionAt == POSITIONS.length) positionAt = 0; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java index 99d1e0401..94941aef6 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java @@ -53,7 +53,7 @@ public class SubTileExoflame extends SubTileFunctional { mana -= 2; did = true; - + if(mana == 0) break fireFurnaces; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index 2f42b0aab..0d4b5783e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -69,13 +69,13 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); stack.func_150996_a(Items.bucket); // Set item } else return false; - } + } if(hasLava()) { item.setFire(100); return true; } - + boolean didChange = false; if(stack.getItem() instanceof IFlowerComponent) { @@ -162,7 +162,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I Botania.proxy.sparkleFX(worldObj, xCoord + 0.5 + Math.random() * 0.4 - 0.2, yCoord + 1, zCoord + 0.5 + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); } } - + if(hasLava()) { isMossy = false; worldObj.spawnParticle("smoke", xCoord + 0.5 + Math.random() * 0.4 - 0.2, yCoord + 1, zCoord + 0.5 + Math.random() * 0.4 - 0.2, 0, 0.05, 0); @@ -229,7 +229,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I hasWater = water; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } - + public void setLava(boolean lava) { hasLava = lava; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); @@ -239,7 +239,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I public boolean hasWater() { return hasWater; } - + public boolean hasLava() { return hasLava; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index d03f2d7c4..16968ad0f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -27,7 +27,6 @@ import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.api.recipe.RecipeBrew; -import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibBlockNames; @@ -43,7 +42,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, public int signal = 0; public boolean addItem(EntityPlayer player, ItemStack stack) { - if(recipe != null || stack == null || (stack.getItem() instanceof IBrewItem && (((IBrewItem) stack.getItem()).getBrew(stack) != null && ((IBrewItem) stack.getItem()).getBrew(stack) != BotaniaAPI.fallbackBrew)) || ((getStackInSlot(0) == null) != stack.getItem() instanceof IBrewContainer)) + if(recipe != null || stack == null || stack.getItem() instanceof IBrewItem && ((IBrewItem) stack.getItem()).getBrew(stack) != null && ((IBrewItem) stack.getItem()).getBrew(stack) != BotaniaAPI.fallbackBrew || getStackInSlot(0) == null != stack.getItem() instanceof IBrewContainer) return false; boolean did = false; @@ -93,7 +92,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, // Update every tick. recieveMana(0); - + if(!worldObj.isRemote && recipe == null) { List items = worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); for(EntityItem item : items) @@ -113,9 +112,9 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, if(recipe != null) { if(mana != manaLastTick) { Color color = new Color(recipe.getBrew().getColor(getStackInSlot(0))); - float r = (float) color.getRed() / 255F; - float g = (float) color.getGreen() / 255F; - float b = (float) color.getBlue() / 255F; + float r = color.getRed() / 255F; + float g = color.getGreen() / 255F; + float b = color.getBlue() / 255F; for(int i = 0; i < 5; i++) { Botania.proxy.wispFX(worldObj, xCoord + 0.7 - Math.random() * 0.4, yCoord + 0.9 - Math.random() * 0.2, zCoord + 0.7 - Math.random() * 0.4, r, g, b, 0.1F + (float) Math.random() * 0.05F, 0.03F - (float) Math.random() * 0.06F, 0.03F + (float) Math.random() * 0.015F, 0.03F - (float) Math.random() * 0.06F); for(int j = 0; j < 2; j++) @@ -159,17 +158,17 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, IBrewContainer container = (IBrewContainer) stack.getItem(); return container.getManaCost(recipe.getBrew(), stack); } - + public void craftingFanciness() { worldObj.playSoundEffect(xCoord, yCoord, zCoord, "botania:potionCreate", 1F, 1.5F + (float) Math.random() * 0.25F); for(int i = 0; i < 25; i++) { Color color = new Color(recipe.getBrew().getColor(getStackInSlot(0))); - float r = (float) color.getRed() / 255F; - float g = (float) color.getGreen() / 255F; - float b = (float) color.getBlue() / 255F; + float r = color.getRed() / 255F; + float g = color.getGreen() / 255F; + float b = color.getBlue() / 255F; Botania.proxy.sparkleFX(worldObj, xCoord + 0.5 + Math.random() * 0.4 - 0.2, yCoord + 1, zCoord + 0.5 + Math.random() * 0.4 - 0.2, r, g, b, (float) Math.random() * 2F + 0.5F, 10); for(int j = 0; j < 2; j++) - Botania.proxy.wispFX(worldObj, xCoord + 0.7 - Math.random() * 0.4, yCoord + 0.9 - Math.random() * 0.2, zCoord + 0.7 - Math.random() * 0.4, 0.2F, 0.2F, 0.2F, 0.1F + (float) Math.random() * 0.2F, 0.05F - (float) Math.random() * 0.1F, 0.05F + (float) Math.random() * 0.03F, 0.05F - (float) Math.random() * 0.1F); + Botania.proxy.wispFX(worldObj, xCoord + 0.7 - Math.random() * 0.4, yCoord + 0.9 - Math.random() * 0.2, zCoord + 0.7 - Math.random() * 0.4, 0.2F, 0.2F, 0.2F, 0.1F + (float) Math.random() * 0.2F, 0.05F - (float) Math.random() * 0.1F, 0.05F + (float) Math.random() * 0.03F, 0.05F - (float) Math.random() * 0.1F); } } @@ -246,7 +245,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, public boolean canRecieveManaFromBursts() { return !isFull(); } - + public void renderHUD(Minecraft mc, ScaledResolution res) { int manaToGet = getManaCost(); if(manaToGet > 0) { @@ -256,7 +255,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory, if(recipe == null) return; - RenderHelper.renderProgressPie(x, y, (float) mana / (float) manaToGet, recipe.getOutput(getStackInSlot(0))); + RenderHelper.renderProgressPie(x, y, (float) mana / (float) manaToGet, recipe.getOutput(getStackInSlot(0))); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 25a7d3e5a..c5d40cfd8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -1,5 +1,5 @@ /** - * This class was created by . It's distributed as + * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania * @@ -29,12 +29,10 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.mana.spark.SparkHelper; -import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -111,7 +109,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { if(tile != null && tile instanceof TilePylon) ((TilePylon) tile).activated = false; } - + if(!canEnchanterExist(worldObj, xCoord, yCoord, zCoord, getBlockMetadata())) { worldObj.setBlock(xCoord, yCoord, zCoord, Blocks.lapis_block, 0, 1 | 2); @@ -392,16 +390,16 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { public int getAvailableSpaceForMana() { return Math.max(0, manaRequired - getCurrentMana()); } - + public void renderHUD(Minecraft mc, ScaledResolution res) { if(manaRequired > 0 && itemToEnchant != null) { int x = res.getScaledWidth() / 2 + 20; int y = res.getScaledHeight() / 2 - 8; - RenderHelper.renderProgressPie(x, y, (float) mana / (float) manaRequired, itemToEnchant); + RenderHelper.renderProgressPie(x, y, (float) mana / (float) manaRequired, itemToEnchant); } } - + private static class EnchantmentData { public int enchant, level; 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 a2849218f..e1017bb3c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -19,7 +19,7 @@ import vazkii.botania.common.block.decor.IFloatingFlower; public class TileFloatingFlower extends TileEntity implements IFloatingFlower { public static ItemStack forcedStack = null; - + @Override public ItemStack getDisplayStack() { if(forcedStack != null) { @@ -27,10 +27,10 @@ public class TileFloatingFlower extends TileEntity implements IFloatingFlower { forcedStack = null; return retStack; } - + return new ItemStack(ModBlocks.flower, 1, getBlockMetadata()); } - + @Override public boolean canUpdate() { return false; 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 ea9ebeadc..2e052fbd6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java @@ -21,6 +21,6 @@ public class TileFloatingSpecialFlower extends TileSpecialFlower implements IFlo public ItemStack getDisplayStack() { return ItemBlockSpecialFlower.ofType(subTileName); } - - + + } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index a91032c48..9069ffd78 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -11,35 +11,35 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.nbt.NBTTagCompound; import vazkii.botania.common.Botania; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; -import net.minecraft.nbt.NBTTagCompound; public class TileManaFlame extends TileMod { private static final String TAG_COLOR = "color"; - + int color = 0x20FF20; - + int lightColor = -1; - + public void setColor(int color) { this.color = color; } - + public int getColor() { return color; } - + @Override public void updateEntity() { float c = 0.3F; - + if(Math.random() < c) { float v = 0.1F; - - float r = (float) ((color >> 16) & 0xFF) / 0xFF + (float) (Math.random() - 0.5) * v; - float g = (float) ((color >> 8) & 0xFF) / 0xFF + (float) (Math.random() - 0.5) * v; + + float r = (float) (color >> 16 & 0xFF) / 0xFF + (float) (Math.random() - 0.5) * v; + float g = (float) (color >> 8 & 0xFF) / 0xFF + (float) (Math.random() - 0.5) * v; float b = (float) (color & 0xFF) / 0xFF + (float) (Math.random() - 0.5) * v; float w = 0.15F; @@ -47,33 +47,33 @@ public class TileManaFlame extends TileMod { double x = xCoord + 0.5 + (Math.random() - 0.5) * w; double y = yCoord + 0.25 + (Math.random() - 0.5) * h; double z = zCoord + 0.5 + (Math.random() - 0.5) * w; - + float s = 0.2F + (float) Math.random() * 0.1F; float m = 0.03F + (float) Math.random() * 0.015F; - + Botania.proxy.wispFX(worldObj, x, y, z, r, g, b, s, -m); } } - + public int getLightColor() { if(lightColor == -1) { - float r = (float) ((color >> 16) & 0xFF) / 0xFF; - float g = (float) ((color >> 8) & 0xFF) / 0xFF; + float r = (float) (color >> 16 & 0xFF) / 0xFF; + float g = (float) (color >> 8 & 0xFF) / 0xFF; float b = (float) (color & 0xFF) / 0xFF; lightColor = ColoredLightHelper.makeRGBLightValue(r, g, b, 1F); } - + return lightColor; } - + @Override public void writeCustomNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_COLOR, color); } - + @Override public void readCustomNBT(NBTTagCompound cmp) { color = cmp.getInteger(TAG_COLOR); } - + } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 8e8c7c9e0..0037c7a30 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -13,13 +13,8 @@ package vazkii.botania.common.block.tile; import java.util.List; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; @@ -27,16 +22,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ResourceLocation; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.api.recipe.RecipeRuneAltar; -import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; @@ -140,11 +131,11 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } } - + public boolean hasValidRecipe() { for(RecipeRuneAltar recipe : BotaniaAPI.runeAltarRecipes) if(recipe.matches(this)) return true; - + return false; } @@ -296,7 +287,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor if(recipe == null) return; - RenderHelper.renderProgressPie(x, y, (float) mana / (float) manaToGet, recipe.getOutput()); + RenderHelper.renderProgressPie(x, y, (float) mana / (float) manaToGet, recipe.getOutput()); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java index 07df6d804..fdd4bf7eb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -11,6 +11,8 @@ */ package vazkii.botania.common.block.tile; +import java.util.ArrayList; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.EntityLivingBase; @@ -29,8 +31,6 @@ import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.block.tile.string.TileRedStringRelay; -import java.util.ArrayList; - public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileContainer { private static final String TAG_SUBTILE_NAME = "subTileName"; @@ -84,11 +84,11 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil xCoord = currX; yCoord = currY; zCoord = currZ; - + return; } } - + subTile.onUpdate(); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index 8f725944e..2e421859d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -33,21 +33,21 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { public static final int MAX_MANA = TilePool.MAX_MANA / 2; private static final int[][] LAPIS_BLOCKS = { - { 1, 0, }, { -1, 0 }, { 0, 1 }, { 0, -1 } + { 1, 0, }, { -1, 0 }, { 0, 1 }, { 0, -1 } }; - + private static final int[][] LIVINGROCK_BLOCKS = { { 0, 0 }, { 1, 1 }, { 1, -1 }, { -1, 1 }, { -1, -1 } }; - + private static final String TAG_MANA = "mana"; - + int mana; - + @Override public void updateEntity() { boolean removeMana = true; - + if(hasValidPlatform()) { List items = getItems(); if(areItemsValid(items)) { @@ -65,7 +65,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { } if(mana > 0) doParticles(); - + if(mana >= MAX_MANA) { EntityItem item = items.get(0); for(EntityItem otherItem : items) @@ -78,15 +78,15 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { } } } - + if(removeMana) recieveMana(-1000); } - + void doParticles() { if(worldObj.isRemote) { int ticks = (int) (100.0 * ((double) getCurrentMana() / (double) MAX_MANA)); - + int totalSpiritCount = 3; double tickIncrement = 360D / totalSpiritCount; @@ -97,9 +97,9 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { double g = Math.sin(wticks * Math.PI / 180 * 0.55); for(int i = 0; i < totalSpiritCount; i++) { - double x = (int) xCoord + Math.sin(wticks * Math.PI / 180) * r + 0.5; - double y = (int) yCoord + 0.25 + Math.abs(r) * 0.7; - double z = (int) zCoord + Math.cos(wticks * Math.PI / 180) * r + 0.5; + double x = xCoord + Math.sin(wticks * Math.PI / 180) * r + 0.5; + double y = yCoord + 0.25 + Math.abs(r) * 0.7; + double z = zCoord + Math.cos(wticks * Math.PI / 180) * r + 0.5; wticks += tickIncrement; float[] colorsfx = new float[] { @@ -114,15 +114,15 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { } } } - + List getItems() { return worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); } - + boolean areItemsValid(List items) { if(items.size() != 3) return false; - + ItemStack ingot = null; ItemStack pearl = null; ItemStack diamond = null; @@ -130,7 +130,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { ItemStack stack = item.getEntityItem(); if(stack.getItem() != ModItems.manaResource || stack.stackSize != 1) return false; - + int meta = stack.getItemDamage(); if(meta == 0) ingot = stack; @@ -140,24 +140,24 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { diamond = stack; else return false; } - + return ingot != null && pearl != null && diamond != null; } - + boolean hasValidPlatform() { return checkAll(LAPIS_BLOCKS, Blocks.lapis_block) && checkAll(LIVINGROCK_BLOCKS, ModBlocks.livingrock); } - + boolean checkAll(int[][] positions, Block block) { - for(int i = 0; i < positions.length; i++) { - int[] positions_ = positions[i]; + for (int[] position : positions) { + int[] positions_ = position; if(!checkPlatform(positions_[0], positions_[1], block)) return false; } - + return true; } - + boolean checkPlatform(int xOff, int zOff, Block block) { return worldObj.getBlock(xCoord + xOff, yCoord - 1, zOff + zCoord) == block; } @@ -166,12 +166,12 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { public void writeCustomNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_MANA, mana); } - + @Override public void readCustomNBT(NBTTagCompound cmp) { mana = cmp.getInteger(TAG_MANA); } - + @Override public int getCurrentMana() { return mana; @@ -217,10 +217,10 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { public boolean areIncomingTranfersDone() { return !areItemsValid(getItems()); } - + @Override public int getAvailableSpaceForMana() { return Math.max(0, MAX_MANA - getCurrentMana()); } - + } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 27ab8eab3..a94f1a594 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -49,7 +49,6 @@ import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.item.ModItems; public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLocked, ISparkAttachable { @@ -127,9 +126,9 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc item.setDead(); } - if((item.age > 100 && item.age < 130) || !catalystsRegistered) + if(item.age > 100 && item.age < 130 || !catalystsRegistered) return false; - + for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) { if(recipe.matches(stack) && (!recipe.isAlchemy() || alchemy) && (!recipe.isConjuration() || conjuration) && (getBlockMetadata() != 2 || recipe.getOutput().getItem() == Item.getItemFromBlock(getBlockType()))) { int mana = recipe.getManaToConsume(); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index 2892ededa..382ca829a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -19,24 +19,23 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lib.LibBlockNames; -import codechicken.lib.vec.Vector3; public class TilePrism extends TileSimpleInventory implements IManaCollisionGhost { public void onBurstCollision(IManaBurst burst) { ItemStack lens = getStackInSlot(0); - boolean valid = lens != null && lens.getItem() instanceof ILens; - + boolean valid = lens != null && lens.getItem() instanceof ILens; + burst.setSourceLens(valid ? lens.copy() : null); burst.setColor(0xFFFFFF); burst.setGravity(0F); - + if(valid) { Entity burstEntity = (Entity) burst; BurstProperties properties = new BurstProperties(burst.getStartingMana(), burst.getMinManaLoss(), burst.getManaLossPerTick(), burst.getGravity(), 1F, burst.getColor()); - + ((ILens) lens.getItem()).apply(lens, properties); - + burst.setColor(properties.color); burst.setStartingMana(properties.maxMana); burst.setMinManaLoss(properties.ticksBeforeManaLoss); @@ -45,7 +44,7 @@ public class TilePrism extends TileSimpleInventory implements IManaCollisionGhos burst.setMotion(burstEntity.motionX * properties.motionModifier, burstEntity.motionY * properties.motionModifier,burstEntity.motionZ * properties.motionModifier); } } - + @Override public boolean isGhost() { return true; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java index 0ee9a1b82..1898e016a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java @@ -33,21 +33,21 @@ public abstract class TileRedString extends TileMod implements ITileBound { int range = getRange(); ChunkCoordinates currBinding = getBinding(); setBinding(null); - + for(int i = 0; i < range; i++) { x += dir.offsetX; y += dir.offsetY; z += dir.offsetZ; if(worldObj.isAirBlock(x, y, z)) continue; - + TileEntity tile = worldObj.getTileEntity(x, y, z); if(tile instanceof TileRedString) continue; - + if(acceptBlock(x, y, z)) { setBinding(new ChunkCoordinates(x, y, z)); - if((currBinding == null || currBinding.posX != x || currBinding.posY != y || currBinding.posZ != z)) + if(currBinding == null || currBinding.posX != x || currBinding.posY != y || currBinding.posZ != z) onBound(x, y, z); break; } @@ -63,7 +63,7 @@ public abstract class TileRedString extends TileMod implements ITileBound { public void onBound(int x, int y, int z) { // NO-OP } - + @Override public AxisAlignedBB getRenderBoundingBox() { return INFINITE_EXTENT_AABB; @@ -73,20 +73,20 @@ public abstract class TileRedString extends TileMod implements ITileBound { public ChunkCoordinates getBinding() { return binding; } - + public void setBinding(ChunkCoordinates binding) { this.binding = binding; } - + public ForgeDirection getOrientation() { return ForgeDirection.getOrientation(getBlockMetadata()); } - + public TileEntity getTileAtBinding() { ChunkCoordinates binding = getBinding(); return binding == null ? null : worldObj.getTileEntity(binding.posX, binding.posY, binding.posZ); } - + public Block getBlockAtBinding() { ChunkCoordinates binding = getBinding(); return binding == null ? Blocks.air : worldObj.getBlock(binding.posX, binding.posY, binding.posZ); diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java index c61df4c8a..f7f6ff862 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java @@ -18,29 +18,29 @@ import net.minecraftforge.common.util.ForgeDirection; public class TileRedStringComparator extends TileRedString { int comparatorValue = 0; - + @Override public void updateEntity() { super.updateEntity(); - + ChunkCoordinates binding = getBinding(); ForgeDirection dir = getOrientation(); Block block = getBlockAtBinding(); int origVal = comparatorValue; - + if(block.hasComparatorInputOverride()) { int val = block.getComparatorInputOverride(worldObj, binding.posX, binding.posY, binding.posZ, dir.getOpposite().ordinal()); comparatorValue = val; } else comparatorValue = 0; - + if(origVal != comparatorValue) worldObj.func_147453_f(xCoord, yCoord, zCoord, worldObj.getBlock(xCoord, yCoord, zCoord)); } - + public int getComparatorValue() { return comparatorValue; } - + @Override public boolean acceptBlock(int x, int y, int z) { Block block = worldObj.getBlock(x, y, z); diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index d25dcb7a1..8d1dc287a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -11,13 +11,13 @@ */ package vazkii.botania.common.block.tile.string; -import vazkii.botania.common.core.helper.InventoryHelper; -import vazkii.botania.common.lib.LibBlockNames; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import vazkii.botania.common.core.helper.InventoryHelper; +import vazkii.botania.common.lib.LibBlockNames; public class TileRedStringContainer extends TileRedString implements ISidedInventory { @@ -86,14 +86,14 @@ public class TileRedStringContainer extends TileRedString implements ISidedInven public void openInventory() { TileEntity tile = getTileAtBinding(); if(tile instanceof IInventory) - ((IInventory) tile).openInventory(); + ((IInventory) tile).openInventory(); } @Override public void closeInventory() { TileEntity tile = getTileAtBinding(); if(tile instanceof IInventory) - ((IInventory) tile).closeInventory(); + ((IInventory) tile).closeInventory(); } @Override @@ -111,13 +111,13 @@ public class TileRedStringContainer extends TileRedString implements ISidedInven @Override public boolean canInsertItem(int slot, ItemStack stack, int side) { TileEntity tile = getTileAtBinding(); - return tile instanceof ISidedInventory ? ((ISidedInventory) tile).canInsertItem(slot, stack, side) : true; + return tile instanceof ISidedInventory ? ((ISidedInventory) tile).canInsertItem(slot, stack, side) : true; } @Override public boolean canExtractItem(int slot, ItemStack stack, int side) { TileEntity tile = getTileAtBinding(); - return tile instanceof ISidedInventory ? ((ISidedInventory) tile).canExtractItem(slot, stack, side) : true; + return tile instanceof ISidedInventory ? ((ISidedInventory) tile).canExtractItem(slot, stack, side) : true; } } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java index e0e54ae55..80729dd0f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java @@ -11,7 +11,6 @@ */ package vazkii.botania.common.block.tile.string; -import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityDispenser; import net.minecraft.util.ChunkCoordinates; @@ -23,7 +22,7 @@ public class TileRedStringDispenser extends TileRedStringContainer { TileEntity tile = worldObj.getTileEntity(x, y, z); return tile != null && tile instanceof TileEntityDispenser; } - + public void tickDispenser() { ChunkCoordinates bind = getBinding(); if(bind != null) { @@ -32,5 +31,5 @@ public class TileRedStringDispenser extends TileRedStringContainer { worldObj.scheduleBlockUpdate(bind.posX, bind.posY, bind.posZ, tile.getBlockType(), tile.getBlockType().tickRate(worldObj)); } } - + } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java index 8a968dd6f..03f2fdf8f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java @@ -15,7 +15,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; -import net.minecraft.init.Blocks; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; @@ -24,7 +23,7 @@ public class TileRedStringFertilizer extends TileRedString { public boolean func_149851_a(World p_149851_1_, boolean p_149851_5_) { ChunkCoordinates binding = getBinding(); Block block = getBlockAtBinding(); - + return block instanceof IGrowable ? ((IGrowable) block).func_149851_a(p_149851_1_, binding.posX, binding.posY, binding.posZ, p_149851_5_) : false; } @@ -40,7 +39,7 @@ public class TileRedStringFertilizer extends TileRedString { if(block instanceof IGrowable) ((IGrowable) block).func_149853_b(p_149853_1_, p_149853_2_, binding.posX, binding.posY, binding.posZ); } - + @Override public boolean acceptBlock(int x, int y, int z) { return worldObj.getBlock(x, y, z) instanceof IGrowable; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java index 4e5423110..0ce47b9b7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java @@ -21,7 +21,7 @@ public class TileRedStringRelay extends TileRedString { public boolean acceptBlock(int x, int y, int z) { if(x == xCoord && y == yCoord + 1 && z == zCoord) return false; - + Block block = worldObj.getBlock(x, y, z); return block instanceof BlockFlower || block instanceof BlockMushroom; } diff --git a/src/main/java/vazkii/botania/common/brew/BrewMod.java b/src/main/java/vazkii/botania/common/brew/BrewMod.java index 0f567dbfa..3e796ec9a 100644 --- a/src/main/java/vazkii/botania/common/brew/BrewMod.java +++ b/src/main/java/vazkii/botania/common/brew/BrewMod.java @@ -21,7 +21,7 @@ public class BrewMod extends Brew { super(key, key, color, cost, effects); BotaniaAPI.registerBrew(this); } - + @Override public String getUnlocalizedName() { return "botania.brew." + super.getUnlocalizedName(); diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index a09862e65..5de6ca976 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -14,7 +14,6 @@ package vazkii.botania.common.brew; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import vazkii.botania.api.brew.Brew; -import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibBrewNames; public class ModBrews { diff --git a/src/main/java/vazkii/botania/common/brew/ModPotions.java b/src/main/java/vazkii/botania/common/brew/ModPotions.java index ede24bb6e..9e5c758ee 100644 --- a/src/main/java/vazkii/botania/common/brew/ModPotions.java +++ b/src/main/java/vazkii/botania/common/brew/ModPotions.java @@ -11,18 +11,7 @@ */ package vazkii.botania.common.brew; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; - import net.minecraft.potion.Potion; -import vazkii.botania.common.brew.potion.PotionCleansing; -import vazkii.botania.common.brew.potion.PotionEmptiness; -import vazkii.botania.common.brew.potion.PotionFeatherfeet; -import vazkii.botania.common.brew.potion.PotionFulfilment; -import vazkii.botania.common.brew.potion.PotionGravitation; -import vazkii.botania.common.brew.potion.PotionLivingReactor; -import vazkii.botania.common.brew.potion.PotionManashock; -import vazkii.botania.common.brew.potion.PotionSoulCross; public class ModPotions { @@ -38,7 +27,7 @@ public class ModPotions { public static void init() { /*if(Potion.potionTypes.length < 256) extendPotionArray(); - + soulCross = new PotionSoulCross(); featherfeet = new PotionFeatherfeet(); emptiness = new PotionEmptiness(); @@ -49,29 +38,4 @@ public class ModPotions { cleansing = new PotionCleansing();*/ } - // This is the method that everyone and their mom uses right? - // Source: http://www.minecraftforge.net/wiki/Potion_Tutorial - private static void extendPotionArray() { - Potion[] potionTypes = null; - - for(Field f : Potion.class.getDeclaredFields()) { - f.setAccessible(true); - try { - if(f.getName().equals("potionTypes") || f.getName().equals("field_76425_a")) { - Field modfield = Field.class.getDeclaredField("modifiers"); - modfield.setAccessible(true); - modfield.setInt(f, f.getModifiers() & ~Modifier.FINAL); - - potionTypes = (Potion[]) f.get(null); - Potion[] newPotionTypes = new Potion[256]; - System.arraycopy(potionTypes, 0, newPotionTypes, 0, potionTypes.length); - f.set(null, newPotionTypes); - } - } catch (Exception e) { - System.err.println("Botania done goofed:"); - System.err.println(e); - } - } - } - } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java index 49339b816..83cae540a 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java @@ -21,26 +21,26 @@ import cpw.mods.fml.relauncher.SideOnly; public class PotionMod extends Potion { private static final ResourceLocation resource = new ResourceLocation(LibResources.GUI_POTIONS); - + public PotionMod(String name, boolean badEffect, int color, int iconIndex) { super(findFreeID(), badEffect, color); setPotionName("botania.potion." + name); setIconIndex(iconIndex % 8, iconIndex / 8); } - + static int findFreeID() { for(int i = 0; i < potionTypes.length; i++) if(potionTypes[i] == null) return i; - + return -1; } - + @Override @SideOnly(Side.CLIENT) public int getStatusIconIndex() { Minecraft.getMinecraft().renderEngine.bindTexture(resource); - + return super.getStatusIconIndex(); } diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 66f51eab5..f4fd467bd 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -113,7 +113,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.bloodPendant); addBlock(ModBlocks.pylon); addBlock(ModBlocks.pistonRelay); - + addBlock(ModBlocks.redStringContainer); addBlock(ModBlocks.redStringDispenser); addBlock(ModBlocks.redStringFertilizer); @@ -130,11 +130,11 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.signalFlare); addBlock(ModBlocks.dirtPath); - + addBlock(ModBlocks.dreamwood); addBlock(ModBlocks.manaGlass); addBlock(ModBlocks.elfGlass); - + addBlock(ModBlocks.prismarine); addBlock(ModBlocks.seaLamp); addBlock(ModBlocks.prismarineStairs); diff --git a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index f4d678e9d..09aafeb27 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -13,8 +13,8 @@ package vazkii.botania.common.core.handler; import net.minecraftforge.event.terraingen.DecorateBiomeEvent; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType; -import vazkii.botania.api.item.IFlowerlessWorld; import vazkii.botania.api.item.IFlowerlessBiome; +import vazkii.botania.api.item.IFlowerlessWorld; import vazkii.botania.common.block.ModBlocks; import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.EventPriority; diff --git a/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java b/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java index 5fdce2775..4da807c6e 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ChestGenHandler.java @@ -26,22 +26,22 @@ public final class ChestGenHandler { ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.manaResource, 1, 1), 1, 1, 8)); ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.manaResource, 1, 1), 1, 3, 2)); ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 6)); - + c = ChestGenHooks.DUNGEON_CHEST; ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.manaResource, 1, 0), 1, 5, 9)); ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.lexicon), 1, 1, 6)); ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.manaBottle), 1, 1, 5)); ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 6)); - + c = ChestGenHooks.PYRAMID_DESERT_CHEST; ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 6)); - + c = ChestGenHooks.MINESHAFT_CORRIDOR; ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 6)); - + c = ChestGenHooks.PYRAMID_JUNGLE_DISPENSER; ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 6)); - + c = ChestGenHooks.VILLAGE_BLACKSMITH; ChestGenHooks.addItem(c, new WeightedRandomChestContent(new ItemStack(ModItems.blackLotus), 1, 1, 6)); } 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 3f7d2b767..0029b4b10 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -114,7 +114,7 @@ public final class ConfigHandler { desc = "Set to false to disable rendering of baubles in the player."; renderBaubles = loadPropBool("baubleRender.enabled", desc, renderBaubles); - + desc = "Set to true to use alternate flower textures by Futureazoo, not all flowers are textured. http://redd.it/2b3o3f"; altFlowerTextures = loadPropBool("flowerTextures.alt", desc, altFlowerTextures); 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 12d060671..373f2340e 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -60,7 +60,7 @@ public class InternalMethodHandler extends DummyMethodHandler { public LexiconPage textPage(String key) { return new PageText(key); } - + @Override public LexiconPage elfPaperTextPage(String key) { return new PageLoreText(key); @@ -134,7 +134,7 @@ public class InternalMethodHandler extends DummyMethodHandler { public LexiconPage elvenTradesPage(String key, RecipeElvenTrade recipe) { return new PageElvenRecipe(key, recipe); } - + @Override public LexiconPage brewPage(String key, String bottomText, RecipeBrew recipe) { return new PageBrew(recipe, key, bottomText); @@ -144,7 +144,7 @@ public class InternalMethodHandler extends DummyMethodHandler { public ItemStack getSubTileAsStack(String subTile) { return ItemBlockSpecialFlower.ofType(subTile); } - + @Override public ItemStack getSubTileAsFloatingFlowerStack(String subTile) { return ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), subTile); @@ -174,12 +174,12 @@ public class InternalMethodHandler extends DummyMethodHandler { public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) { Botania.proxy.sparkleFX(world, x, y, z, r, g, b, size, m); } - + @Override public ResourceLocation getDefaultBossBarTexture() { return BossBarHandler.defaultBossBar; } - + @Override public void setBossStatus(IBotaniaBoss status) { BossBarHandler.setCurrentBoss(status); diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index cdcc65635..3586073fa 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -125,7 +125,7 @@ public class InventoryHelper { if(inventory == null) return 0; - int slotCount = inventory.getSizeInventory(); + inventory.getSizeInventory(); int itemSizeCounter = item.stackSize; int[] availableSlots = new int[0]; @@ -198,14 +198,14 @@ public class InventoryHelper { return inventory; } - public static int[] buildSlotsForLinearInventory(IInventory inv) { - int[] slots = new int[inv.getSizeInventory()]; - for (int i = 0; i < slots.length; i++) - slots[i] = i; + public static int[] buildSlotsForLinearInventory(IInventory inv) { + int[] slots = new int[inv.getSizeInventory()]; + for (int i = 0; i < slots.length; i++) + slots[i] = i; + + return slots; + } - return slots; - } - public static class GenericInventory implements IInventory { protected String inventoryTitle; diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index aade89a9f..d4e143466 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -11,12 +11,10 @@ */ package vazkii.botania.common.core.proxy; -import buildcraft.api.transport.IPipeTile; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -31,7 +29,6 @@ import vazkii.botania.common.core.command.CommandOpen; import vazkii.botania.common.core.command.CommandShare; import vazkii.botania.common.core.handler.BiomeDecorationHandler; import vazkii.botania.common.core.handler.ChestGenHandler; -import vazkii.botania.common.core.handler.CommonTickHandler; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.InternalMethodHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; @@ -53,8 +50,6 @@ import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.network.GuiHandler; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLPostInitializationEvent; @@ -83,7 +78,7 @@ public class CommonProxy { ModManaInfusionRecipes.init(); ModElvenTradeRecipes.init(); ModBrewRecipes.init(); - + ChestGenHandler.init(); LexiconData.init(); @@ -99,8 +94,8 @@ public class CommonProxy { MinecraftForge.EVENT_BUS.register(new SpawnerChangingHandler()); FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName()); - - if(Botania.bcTriggersLoaded) + + if(Botania.bcTriggersLoaded) new StatementAPIPlugin(); } @@ -109,11 +104,11 @@ public class CommonProxy { ModBrews.initTC(); ModBrewRecipes.initTC(); } - + ModBlocks.addDispenserBehaviours(); ConfigHandler.loadPostInit(); LexiconData.postInit(); - + registerNEIStuff(); } @@ -126,7 +121,7 @@ public class CommonProxy { public void registerNEIStuff() { // NO-OP } - + public void setEntryToOpen(LexiconEntry entry) { // NO-OP } diff --git a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java index e2e50bd4d..44d5cd50f 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java @@ -21,7 +21,7 @@ import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.item.ModItems; public class ModBrewRecipes { - + public static RecipeBrew speedBrew; public static RecipeBrew strengthBrew; public static RecipeBrew hasteBrew; @@ -35,7 +35,7 @@ public class ModBrewRecipes { public static RecipeBrew invisibilityBrew; public static RecipeBrew nightVisionBrew; public static RecipeBrew absorptionBrew; - + public static RecipeBrew warpWardBrew; public static void init() { @@ -53,7 +53,7 @@ public class ModBrewRecipes { nightVisionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.nightVision, new ItemStack(Items.nether_wart), new ItemStack(Items.spider_eye), new ItemStack(Items.golden_carrot)); absorptionBrew = BotaniaAPI.registerBrewRecipe(ModBrews.absorption, new ItemStack(Items.nether_wart), new ItemStack(Items.golden_apple), new ItemStack(Items.potato)); } - + public static void initTC() { Item resource = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemResource"); Item bathSalts = (Item) Item.itemRegistry.getObject("Thaumcraft:ItemBathSalts"); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 2a45a82e2..4c914612c 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -30,7 +30,6 @@ import vazkii.botania.common.item.ItemLens; import vazkii.botania.common.item.ItemSignalFlare; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibOreDict; import cpw.mods.fml.common.registry.GameRegistry; @@ -216,7 +215,7 @@ public final class ModCraftingRecipes { public static List recipesLensFlash; public static IRecipe recipePrism; public static IRecipe recipeDirtPath; - + public static void init() { // Lexicon Recipe addShapelessOreDictRecipe(new ItemStack(ModItems.lexicon), "treeSapling", Items.book); @@ -1261,19 +1260,19 @@ public final class ModCraftingRecipes { recipeRFGenerator = BotaniaAPI.getLatestAddedRecipe(); // Vial Recipe - GameRegistry.addRecipe(new ItemStack(ModItems.vial, 3, 0), + GameRegistry.addRecipe(new ItemStack(ModItems.vial, 3, 0), "G G", " G ", 'G', new ItemStack(ModBlocks.manaGlass)); recipeVial = BotaniaAPI.getLatestAddedRecipe(); // Flask Recipe - GameRegistry.addRecipe(new ItemStack(ModItems.vial, 3, 1), + GameRegistry.addRecipe(new ItemStack(ModItems.vial, 3, 1), "G G", " G ", 'G', new ItemStack(ModBlocks.elfGlass)); recipeFlask = BotaniaAPI.getLatestAddedRecipe(); // Botanical Brewery Recipe - addOreDictRecipe(new ItemStack(ModBlocks.brewery), + addOreDictRecipe(new ItemStack(ModBlocks.brewery), "RSR", "RAR", "RMR", 'R', LibOreDict.LIVING_ROCK, 'S', new ItemStack(Items.brewing_stand), @@ -1282,7 +1281,7 @@ public final class ModCraftingRecipes { recipeBrewery = BotaniaAPI.getLatestAddedRecipe(); // Tainted Blood Pendant Recipe - addOreDictRecipe(new ItemStack(ModItems.bloodPendant), + addOreDictRecipe(new ItemStack(ModItems.bloodPendant), " P ", "PGP", "DP ", 'P', LibOreDict.PRISMARINE_SHARD, 'G', new ItemStack(Items.ghast_tear), @@ -1290,7 +1289,7 @@ public final class ModCraftingRecipes { recipeBloodPendant = BotaniaAPI.getLatestAddedRecipe(); // Terrestrial Agglomeration Plate Recipe - addOreDictRecipe(new ItemStack(ModBlocks.terraPlate), + addOreDictRecipe(new ItemStack(ModBlocks.terraPlate), "LLL", "0M1", "283", 'L', new ItemStack(Blocks.lapis_block), 'M', new ItemStack(ModBlocks.storage), @@ -1316,7 +1315,7 @@ public final class ModCraftingRecipes { recipeRedStringContainer = BotaniaAPI.getLatestAddedRecipe(); // Red String Dispenser Recipe - addOreDictRecipe(new ItemStack(ModBlocks.redStringDispenser), + addOreDictRecipe(new ItemStack(ModBlocks.redStringDispenser), "RRR", "RDS", "RRR", 'R', LibOreDict.LIVING_ROCK, 'S', LibOreDict.RED_STRING, @@ -1324,7 +1323,7 @@ public final class ModCraftingRecipes { recipeRedStringDispenser = BotaniaAPI.getLatestAddedRecipe(); // Red String Fertilizer Recipe - addOreDictRecipe(new ItemStack(ModBlocks.redStringFertilizer), + addOreDictRecipe(new ItemStack(ModBlocks.redStringFertilizer), "RRR", "RBS", "RRR", 'R', LibOreDict.LIVING_ROCK, 'S', LibOreDict.RED_STRING, @@ -1332,7 +1331,7 @@ public final class ModCraftingRecipes { recipeRedStringFertilizer = BotaniaAPI.getLatestAddedRecipe(); // Red String Comparator Recipe - addOreDictRecipe(new ItemStack(ModBlocks.redStringComparator), + addOreDictRecipe(new ItemStack(ModBlocks.redStringComparator), "RRR", "RCS", "RRR", 'R', LibOreDict.LIVING_ROCK, 'S', LibOreDict.RED_STRING, @@ -1340,7 +1339,7 @@ public final class ModCraftingRecipes { recipeRedStringComparator = BotaniaAPI.getLatestAddedRecipe(); // Red String Spoofer Recipe - addOreDictRecipe(new ItemStack(ModBlocks.redStringRelay), + addOreDictRecipe(new ItemStack(ModBlocks.redStringRelay), "RRR", "RMS", "RRR", 'R', LibOreDict.LIVING_ROCK, 'S', LibOreDict.RED_STRING, @@ -1348,7 +1347,7 @@ public final class ModCraftingRecipes { recipeRedStringRelay = BotaniaAPI.getLatestAddedRecipe(); // Rod of the Arcane Barrage Recipe - addOreDictRecipe(new ItemStack(ModItems.missileRod), + addOreDictRecipe(new ItemStack(ModItems.missileRod), "GDD", " TD", "T G", 'G', LibOreDict.LIFE_ESSENCE, 'D', LibOreDict.DRAGONSTONE, @@ -1356,7 +1355,7 @@ public final class ModCraftingRecipes { recipeMissileRod = BotaniaAPI.getLatestAddedRecipe(); // Cloak of Virtue Recipe - addOreDictRecipe(new ItemStack(ModItems.holyCloak), + addOreDictRecipe(new ItemStack(ModItems.holyCloak), "WWW", "GWG", "GSG", 'W', new ItemStack(Blocks.wool), 'G', new ItemStack(Items.glowstone_dust), @@ -1364,7 +1363,7 @@ public final class ModCraftingRecipes { recipeHolyCloak = BotaniaAPI.getLatestAddedRecipe(); // Cloak of Sin Recipe - addOreDictRecipe(new ItemStack(ModItems.unholyCloak), + addOreDictRecipe(new ItemStack(ModItems.unholyCloak), "WWW", "RWR", "RSR", 'W', new ItemStack(Blocks.wool, 1, 15), 'R', new ItemStack(Items.redstone), @@ -1372,26 +1371,26 @@ public final class ModCraftingRecipes { recipeUnholyCloak = BotaniaAPI.getLatestAddedRecipe(); // Assembly Halo Recipe - addOreDictRecipe(new ItemStack(ModItems.craftingHalo), + addOreDictRecipe(new ItemStack(ModItems.craftingHalo), " P ", "ICI", " I ", 'P', LibOreDict.MANA_PEARL, 'I', LibOreDict.MANA_STEEL, 'C', new ItemStack(Blocks.crafting_table)); recipeCraftingHalo = BotaniaAPI.getLatestAddedRecipe(); - + // Mana Lens: Flash Recipe - GameRegistry.addRecipe(new ItemStack(ModItems.lens, 1, 17), + GameRegistry.addRecipe(new ItemStack(ModItems.lens, 1, 17), "GFG", "FLF", "GFG", 'G', new ItemStack(Blocks.glowstone), 'F', new ItemStack(Items.fire_charge), 'L', new ItemStack(ModItems.lens)); - GameRegistry.addRecipe(new ItemStack(ModItems.lens, 1, 17), + GameRegistry.addRecipe(new ItemStack(ModItems.lens, 1, 17), "FGF", "GLG", "FGF", 'G', new ItemStack(Blocks.glowstone), 'F', new ItemStack(Items.fire_charge), 'L', new ItemStack(ModItems.lens)); recipesLensFlash = BotaniaAPI.getLatestAddedRecipes(2); - + // Mana Prism Recipe addOreDictRecipe(new ItemStack(ModBlocks.prism), "GPG", "GSG", "GPG", @@ -1399,11 +1398,11 @@ public final class ModCraftingRecipes { 'P', LibOreDict.PRISMARINE_SHARD, 'S', new ItemStack(ModBlocks.platform, 1, 1)); recipePrism = BotaniaAPI.getLatestAddedRecipe(); - + // Trodden Dirt Recipe GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.dirtPath, 4), new ItemStack(Blocks.dirt, 1, 1), new ItemStack(Blocks.dirt, 1, 1), new ItemStack(Blocks.dirt, 1, 1), new ItemStack(Blocks.gravel)); recipeDirtPath = BotaniaAPI.getLatestAddedRecipe(); - + // Mana and Terrasteel Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java index ada751151..7bf2379e8 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java @@ -3,7 +3,6 @@ package vazkii.botania.common.crafting; import java.util.ArrayList; import java.util.List; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 9f4a090fd..6c522ed7a 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -120,11 +120,11 @@ public final class ModManaAlchemyRecipes { sandRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Block.getBlockFromName("sand")), new ItemStack(Blocks.cobblestone), 50); redSandRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Block.getBlockFromName("sand"), 1, 1), new ItemStack(Blocks.hardened_clay), 50); - + clayBreakdownRecipes = new ArrayList(); clayBreakdownRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.clay_ball, 4), new ItemStack(Blocks.clay), 25)); clayBreakdownRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.brick, 4), new ItemStack(Blocks.brick_block), 25)); - + coarseDirtRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.dirt, 1, 1), new ItemStack(Blocks.dirt), 120); prismarineRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.manaResource, 1, 10), new ItemStack(Items.quartz), 200); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 557aebf45..4f119f7d5 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -74,7 +74,7 @@ public final class ModManaInfusionRecipes { } managlassRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.manaGlass), new ItemStack(Blocks.glass), 150); - + BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaBottle), new ItemStack(Items.glass_bottle), 5000); } diff --git a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java index 091db7f89..86266404d 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -30,7 +30,7 @@ public final class ModPetalRecipes { public static final String runeWater = LibOreDict.RUNE[0], runeFire = LibOreDict.RUNE[1], runeEarth = LibOreDict.RUNE[2], runeAir = LibOreDict.RUNE[3], runeSpring = LibOreDict.RUNE[4], runeSummer = LibOreDict.RUNE[5], runeAutumn = LibOreDict.RUNE[6], runeWinter = LibOreDict.RUNE[7], runeMana = LibOreDict.RUNE[8], runeLust = LibOreDict.RUNE[9], runeGluttony = LibOreDict.RUNE[10], runeGreed = LibOreDict.RUNE[11], runeSloth = LibOreDict.RUNE[12], runeWrath = LibOreDict.RUNE[13], runeEnvy = LibOreDict.RUNE[14], runePride = LibOreDict.RUNE[15]; public static final String redstoneRoot = LibOreDict.REDSTONE_ROOT; public static final String pixieDust = LibOreDict.PIXIE_DUST; - + public static RecipePetals pureDaisyRecipe; public static RecipePetals manastarRecipe; diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java index dcebe8580..d1350cec1 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java @@ -11,15 +11,13 @@ */ package vazkii.botania.common.crafting.recipe; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.item.equipment.tool.ItemTerraPick; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.item.block.ItemBlockSpecialFlower; public class SpecialFloatingFlowerRecipe implements IRecipe { diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 4a2a7e0f4..36cea846e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -23,9 +23,7 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAISwimming; import net.minecraft.entity.ai.EntityAIWatchClosest; -import net.minecraft.entity.monster.EntityCaveSpider; import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.monster.EntitySpider; import net.minecraft.entity.monster.EntityWitch; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; @@ -65,7 +63,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWithShader { public static final int SPAWN_TICKS = 100; - + public static final int MOB_SPAWN_START_TICKS = 20; public static final int MOB_SPAWN_END_TICKS = 80; public static final int MOB_SPAWN_BASE_TICKS = 800; @@ -282,7 +280,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi setDead(); ChunkCoordinates source = getSource(); - + float range = 32F; List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(source.posX + 0.5 - range, source.posY + 0.5 - range, source.posZ + 0.5 - range, source.posX + 0.5 + range, source.posY + 0.5 + range, source.posZ + 0.5 + range)); @@ -294,15 +292,15 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi float m = 0.15F; float mv = 0.35F; - float rad = (float) i * (float) Math.PI / 180F; + float rad = i * (float) Math.PI / 180F; double x = source.posX - 0.5 - Math.cos(rad) * range; double y = source.posY - 0.5; double z = source.posZ - 0.5 - Math.sin(rad) * range; - + Botania.proxy.wispFX(worldObj, x, y, z, r, g, b, 0.5F, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * mv, (float) (Math.random() - 0.5F) * m); } - + if(players.isEmpty() && !worldObj.playerEntities.isEmpty()) setDead(); else for(EntityPlayer player : players) { @@ -343,13 +341,13 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi motionY = 0; } else { if(isAggored()) { - boolean dying = getHealth() / getMaxHealth() < 0.2; + boolean dying = getHealth() / getMaxHealth() < 0.2; if(dying && mobTicks > 0) { motionX = 0; motionY = 0; motionZ = 0; - int reverseTicks = MOB_SPAWN_TICKS - mobTicks; + int reverseTicks = MOB_SPAWN_TICKS - mobTicks; if(reverseTicks < MOB_SPAWN_START_TICKS) { motionY = 0.2; setInvulTime(invul + 1); @@ -363,7 +361,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi entity = new EntityZombie(worldObj); if(worldObj.rand.nextInt(12) == 0) entity = new EntityWitch(worldObj); - + break; } case 1 : { @@ -384,7 +382,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } } } - + if(entity != null) { range = 6F; entity.setPosition(posX + 0.5 + Math.random() * range - range / 2, posY - 1, posZ + 0.5 + Math.random() * range - range / 2); @@ -398,7 +396,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi } else if(getTPDelay() > 0 && !worldObj.isRemote) { if(invul > 0) setInvulTime(invul - 1); - + setTPDelay(getTPDelay() - 1); if(getTPDelay() == 0 && getHealth() > 0) { int tries = 0; @@ -568,7 +566,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi float grainIntensity = time > 20 ? 1F : time / 20F; ARBShaderObjects.glUniform1fARB(grainIntensityUniform, grainIntensity); - ARBShaderObjects.glUniform1fARB(hpFractUniform, (float) getHealth() / (float) getMaxHealth()); + ARBShaderObjects.glUniform1fARB(hpFractUniform, getHealth() / getMaxHealth()); } }; diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index 65d7c951a..9d844bf4c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -13,17 +13,9 @@ package vazkii.botania.common.entity; import java.util.List; -import cpw.mods.fml.relauncher.ReflectionHelper; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.mana.IManaCollisionGhost; -import vazkii.botania.common.Botania; -import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.lib.LibObfuscation; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockLeaves; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; @@ -32,16 +24,20 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import vazkii.botania.common.Botania; +import vazkii.botania.common.core.helper.Vector3; +import vazkii.botania.common.lib.LibObfuscation; +import cpw.mods.fml.relauncher.ReflectionHelper; public class EntityMagicMissile extends EntityThrowable { EntityLivingBase target; - + public EntityMagicMissile(World world) { super(world); setSize(0F, 0F); } - + public EntityMagicMissile(EntityPlayer player) { this(player.worldObj); ReflectionHelper.setPrivateValue(EntityThrowable.class, this, player, LibObfuscation.THROWER); @@ -50,19 +46,19 @@ public class EntityMagicMissile extends EntityThrowable { @Override public void onUpdate() { super.onUpdate(); - + if(!worldObj.isRemote && !getTarget()) { setDead(); return; } - + Vector3 thisVec = Vector3.fromEntityCenter(this); Vector3 oldPos = new Vector3(lastTickPosX, lastTickPosY, lastTickPosZ); Vector3 diff = thisVec.copy().sub(oldPos); Vector3 step = diff.copy().normalize().multiply(0.05); int steps = (int) (diff.mag() / step.mag()); Vector3 particlePos = oldPos.copy(); - + for(int i = 0; i < steps; i++) { Botania.proxy.sparkleFX(worldObj, particlePos.x, particlePos.y, particlePos.z, 1F, 0.4F, 1F, 0.8F, 2); if(worldObj.rand.nextInt(steps) <= 1) @@ -70,7 +66,7 @@ public class EntityMagicMissile extends EntityThrowable { particlePos.add(step); } - + if(!worldObj.isRemote) { Vector3 targetVec = Vector3.fromEntityCenter(target); Vector3 motionVec = targetVec.copy().sub(thisVec).normalize().multiply(0.6); @@ -79,7 +75,7 @@ public class EntityMagicMissile extends EntityThrowable { if(ticksExisted < 10) motionY = Math.abs(motionY); motionZ = motionVec.z; - + List targetList = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(posX - 0.5, posY - 0.5, posZ - 0.5, posX + 0.5, posY + 0.5, posZ + 0.5)); if(targetList.contains(target) && target != null) { EntityLivingBase thrower = getThrower(); @@ -89,12 +85,12 @@ public class EntityMagicMissile extends EntityThrowable { } } } - + public boolean getTarget() { if(target != null && target.getHealth() > 0 && !target.isDead && worldObj.loadedEntityList.contains(target)) return true; target = null; - + double range = 12; List entities = worldObj.getEntitiesWithinAABB(IMob.class, AxisAlignedBB.getBoundingBox(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); while(entities.size() > 0) { @@ -103,14 +99,14 @@ public class EntityMagicMissile extends EntityThrowable { entities.remove(mob); continue; } - + target = (EntityLivingBase) mob; break; } - + return target != null; } - + @Override protected void onImpact(MovingObjectPosition pos) { Block block = worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index e5b4097ee..443ed8b4e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -16,8 +16,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import buildcraft.api.transport.IPipeTile; -import cpw.mods.fml.common.Loader; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockLeaves; @@ -547,12 +545,12 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { TileEntity tile = worldObj.getTileEntity(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ); Block block = worldObj.getBlock(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ); - if((tile instanceof IManaCollisionGhost && ((IManaCollisionGhost) tile).isGhost() && !(block instanceof IManaTrigger)) || block instanceof BlockBush || block instanceof BlockLeaves) + if(tile instanceof IManaCollisionGhost && ((IManaCollisionGhost) tile).isGhost() && !(block instanceof IManaTrigger) || block instanceof BlockBush || block instanceof BlockLeaves) return; if(BotaniaAPI.internalHandler.isBuildcraftPipe(tile)) return; - + ChunkCoordinates coords = getBurstSourceChunkCoordinates(); if(tile != null && (tile.xCoord != coords.posX || tile.yCoord != coords.posY || tile.zCoord != coords.posZ)) collidedTile = tile; @@ -570,7 +568,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(block instanceof IManaTrigger) ((IManaTrigger) block).onBurstCollision(this, worldObj, movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ); - boolean ghost = tile instanceof IManaCollisionGhost; + boolean ghost = tile instanceof IManaCollisionGhost; dead = !ghost; if(ghost) return; diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index c09a30257..79da47260 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -186,7 +186,7 @@ public class EntitySpark extends Entity implements ISparkEntity { int manaTotal = Math.min(TRANSFER_RATE * transfers.size(), tile.getCurrentMana()); int manaForEach = manaTotal / transfers.size(); int manaSpent = 0; - + if(manaForEach > transfers.size()) { for(ISparkEntity spark : transfers) { if(spark.getAttachedTile() == null || spark.getAttachedTile().isFull() || spark.areIncomingTransfersDone()) { diff --git a/src/main/java/vazkii/botania/common/entity/ModEntities.java b/src/main/java/vazkii/botania/common/entity/ModEntities.java index 1321e1495..4f752322e 100644 --- a/src/main/java/vazkii/botania/common/entity/ModEntities.java +++ b/src/main/java/vazkii/botania/common/entity/ModEntities.java @@ -19,7 +19,7 @@ public final class ModEntities { public static void init() { int id = 0; - + EntityRegistry.registerModEntity(EntityManaBurst.class, LibEntityNames.MANA_BURST, id++, Botania.instance, 64, 10, true); EntityRegistry.registerModEntity(EntitySignalFlare.class, LibEntityNames.SIGNAL_FLARE, id++, Botania.instance, 2048, 10, false); EntityRegistry.registerModEntity(EntityPixie.class, LibEntityNames.PIXIE, id++, Botania.instance, 16, 3, true); diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java index 160ca2808..49b424d97 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java @@ -3,11 +3,11 @@ package vazkii.botania.common.integration.buildcraft; import java.util.ArrayList; import java.util.Collection; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.mana.IManaBlock; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileRuneAltar; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.ITriggerExternal; import buildcraft.api.statements.ITriggerInternal; @@ -15,13 +15,13 @@ import buildcraft.api.statements.ITriggerProvider; import buildcraft.api.statements.StatementManager; public class StatementAPIPlugin implements ITriggerProvider { - + public static final ITriggerExternal triggerManaEmpty = new TriggerManaLevel(TriggerManaLevel.State.EMPTY); public static final ITriggerExternal triggerManaContains = new TriggerManaLevel(TriggerManaLevel.State.CONTAINS); public static final ITriggerExternal triggerManaSpace = new TriggerManaLevel(TriggerManaLevel.State.SPACE); public static final ITriggerExternal triggerManaFull = new TriggerManaLevel(TriggerManaLevel.State.FULL); public static final ITriggerInternal triggerManaDetector = new TriggerManaDetector(); - + public static final ITriggerExternal triggerRuneAltarCanCraft = new TriggerRuneAltarCanCraft(); public StatementAPIPlugin() { @@ -32,7 +32,7 @@ public class StatementAPIPlugin implements ITriggerProvider { StatementManager.registerStatement(triggerManaDetector); StatementManager.registerStatement(triggerRuneAltarCanCraft); - + StatementManager.registerTriggerProvider(this); } @@ -55,9 +55,9 @@ public class StatementAPIPlugin implements ITriggerProvider { list.add(triggerManaFull); } } - + if (tile instanceof TileRuneAltar) list.add(triggerRuneAltarCanCraft); - + return list; } } diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java index 2e5286f97..cbf799357 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java @@ -1,13 +1,12 @@ package vazkii.botania.common.integration.buildcraft; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementParameter; public abstract class StatementBase implements IStatement { protected IIcon icon; - + @Override public IIcon getIcon() { return icon; diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java index 85e93558d..4210c9da8 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java @@ -1,13 +1,13 @@ package vazkii.botania.common.integration.buildcraft; -import vazkii.botania.api.internal.IManaBurst; -import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.common.Botania; -import vazkii.botania.common.lib.LibTriggerNames; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import vazkii.botania.api.internal.IManaBurst; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.Botania; +import vazkii.botania.common.lib.LibTriggerNames; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerInternal; @@ -33,12 +33,12 @@ public class TriggerManaDetector extends StatementBase implements ITriggerIntern public boolean isTriggerActive(IStatementContainer source, IStatementParameter[] parameters) { World world = source.getTile().getWorldObj(); int x = source.getTile().xCoord, y = source.getTile().yCoord, z = source.getTile().zCoord; - + boolean output = world.getEntitiesWithinAABB(IManaBurst.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1)).size() != 0; - + if(output) for(int i = 0; i < 4; i++) - Botania.proxy.sparkleFX(world, x + Math.random(), y + Math.random(), z + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); - + Botania.proxy.sparkleFX(world, x + Math.random(), y + Math.random(), z + Math.random(), 1F, 0.2F, 0.2F, 0.7F + 0.5F * (float) Math.random(), 5); + return output; } diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java index 612e809b5..f655d56af 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java @@ -1,18 +1,16 @@ package vazkii.botania.common.integration.buildcraft; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.StatCollector; +import net.minecraftforge.common.util.ForgeDirection; + import org.apache.commons.lang3.text.WordUtils; import vazkii.botania.api.mana.IManaBlock; -import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibTriggerNames; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; -import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.statements.IStatement; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; @@ -26,11 +24,11 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal }; private State state; - + public TriggerManaLevel(State state) { this.state = state; } - + @Override public String getUniqueTag() { return "botania:mana" + state.name(); @@ -56,7 +54,7 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal else if(state == State.FULL) return ((IManaReceiver) target).isFull(); } } - + return false; } } diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java index b0dbe05e2..cbad8aa76 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java @@ -1,18 +1,18 @@ package vazkii.botania.common.integration.buildcraft; -import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.common.block.tile.TileRuneAltar; -import vazkii.botania.common.lib.LibTriggerNames; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.block.tile.TileRuneAltar; +import vazkii.botania.common.lib.LibTriggerNames; import buildcraft.api.statements.IStatementContainer; import buildcraft.api.statements.IStatementParameter; import buildcraft.api.statements.ITriggerExternal; public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerExternal { - + @Override public String getUniqueTag() { return "botania:runeAltarCanCraft"; diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java b/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java index 8499d5393..295aaf114 100644 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java @@ -20,50 +20,50 @@ public class ColoredLightHelper { // Begin API Copypasta // https://github.com/CptSpaceToaster/CptsModdingLight/blob/1.7.2/src/main/java/coloredlightscore/src/api/CLApi.java - - public static int r[] = new int[] { 0, 15, 0, 8, 0, 10, 0, 10, 5, 15, 8, 15, 0, 15, 15, 15 }; - public static int g[] = new int[] { 0, 0, 15, 3, 0, 0, 15, 10, 5, 10, 15, 15, 8, 0, 12, 15 }; - public static int b[] = new int[] { 0, 0, 0, 0, 15, 15, 15, 10, 5, 13, 0, 0, 15, 15, 10, 15 }; - - public static int makeRGBLightValue(float r, float g, float b, float currentLightValue) { - // Clamp color channels - if (r < 0.0f) - r = 0.0f; - else if (r > 1.0f) - r = 1.0f; - if (g < 0.0f) - g = 0.0f; - else if (g > 1.0f) - g = 1.0f; + public static int r[] = new int[] { 0, 15, 0, 8, 0, 10, 0, 10, 5, 15, 8, 15, 0, 15, 15, 15 }; + public static int g[] = new int[] { 0, 0, 15, 3, 0, 0, 15, 10, 5, 10, 15, 15, 8, 0, 12, 15 }; + public static int b[] = new int[] { 0, 0, 0, 0, 15, 15, 15, 10, 5, 13, 0, 0, 15, 15, 10, 15 }; - if (b < 0.0f) - b = 0.0f; - else if (b > 1.0f) - b = 1.0f; + public static int makeRGBLightValue(float r, float g, float b, float currentLightValue) { + // Clamp color channels + if (r < 0.0f) + r = 0.0f; + else if (r > 1.0f) + r = 1.0f; - int brightness = (int) (currentLightValue * 15.0f); - brightness &= 0xf; + if (g < 0.0f) + g = 0.0f; + else if (g > 1.0f) + g = 1.0f; - return brightness | ((((int) (15.0F * b)) << 15) + (((int) (15.0F * g)) << 10) + (((int) (15.0F * r)) << 5)); - } - - // End API Copypasta - - private static int packedColors[][] = null; + if (b < 0.0f) + b = 0.0f; + else if (b > 1.0f) + b = 1.0f; - public static int getPackedColor(int meta, int light) { - if(packedColors == null) - initPackedColors(); + int brightness = (int) (currentLightValue * 15.0f); + brightness &= 0xf; + + return brightness | ((int) (15.0F * b) << 15) + ((int) (15.0F * g) << 10) + ((int) (15.0F * r) << 5); + } + + // End API Copypasta + + private static int packedColors[][] = null; + + public static int getPackedColor(int meta, int light) { + if(packedColors == null) + initPackedColors(); + + return packedColors[meta][light]; + } + + private static void initPackedColors() { + packedColors = new int[16][16]; + for(int i = 0; i < 16; i++) + for(int j = 0; j < 16; j++) + packedColors[i][j] = makeRGBLightValue(r[15 - i], g[15 - i], b[15 - i], j / 16F); + } - return packedColors[meta][light]; - } - - private static void initPackedColors() { - packedColors = new int[16][16]; - for(int i = 0; i < 16; i++) - for(int j = 0; j < 16; j++) - packedColors[i][j] = makeRGBLightValue(r[15 - i], g[15 - i], b[15 - i], (float) j / 16F); - } - } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 1a3dfcd02..0a315ded5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -55,7 +55,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { public void onDissolveTick(IManaPool pool, ItemStack stack, EntityItem item) { if(pool.isFull() || pool.getCurrentMana() == 0) return; - + TileEntity tile = (TileEntity) pool; boolean t2 = stack.getItemDamage() > 0; @@ -64,7 +64,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { stack.stackSize--; item.worldObj.markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord); } - + for(int i = 0; i < 50; i++) { float r = (float) Math.random() * 0.25F; float g = 0F; @@ -80,7 +80,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { } item.worldObj.playSoundAtEntity(item, "botania:blackLotus", 0.5F, t2 ? 0.1F : 1F); } - + @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { list.add(StatCollector.translateToLocal("botaniamisc.lotusDesc")); diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 5d257a7b4..41817c75f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -108,7 +108,7 @@ public class ItemCraftingHalo extends ItemMod { if(!equipped && entity instanceof EntityLivingBase) { int angles = 360; int segAngles = angles / SEGMENTS; - float shift = segAngles / 2; + float shift = segAngles / 2; setRotationBase(stack, getCheckingAngle((EntityLivingBase) entity) - shift); } } @@ -119,30 +119,30 @@ public class ItemCraftingHalo extends ItemMod { if(canCraft(player, recipe)) doCraft(player, recipe); } - + private static ItemStack[] validateRecipe(EntityPlayer player, ItemStack stack, ItemStack[] recipe, int slot) { InventoryCrafting fakeInv = new InventoryCrafting(new ContainerWorkbench(player.inventory, player.worldObj, 0, 0, 0), 3, 3); for(int i = 0; i < 9; i++) - fakeInv.setInventorySlotContents(i, recipe[i]); - + fakeInv.setInventorySlotContents(i, recipe[i]); + ItemStack result = CraftingManager.getInstance().findMatchingRecipe(fakeInv, player.worldObj); if(result == null) { assignRecipe(stack, recipe[9], slot); return null; } - + if(!result.isItemEqual(recipe[9]) || result.stackSize != recipe[9].stackSize || !ItemStack.areItemStackTagsEqual(recipe[9], result)) { assignRecipe(stack, recipe[9], slot); return null; } - + return recipe; } private static boolean canCraft(EntityPlayer player, ItemStack[] recipe) { if(recipe == null) return false; - + GenericInventory tempInv = new GenericInventory("temp", false, player.inventory.getSizeInventory()); tempInv.copyFrom(player.inventory); return consumeRecipeIngredients(recipe, tempInv, null); @@ -208,15 +208,14 @@ public class ItemCraftingHalo extends ItemMod { } private static int getSegmentLookedAt(ItemStack stack, EntityLivingBase player) { - float base = getRotationBase(stack); + getRotationBase(stack); float yaw = getCheckingAngle(player, getRotationBase(stack)); int angles = 360; int segAngles = angles / SEGMENTS; - float shift = segAngles / 2; for(int seg = 0; seg < SEGMENTS; seg++) { float calcAngle = (float) seg * segAngles; - if(yaw >= calcAngle && yaw < (calcAngle + segAngles)) + if(yaw >= calcAngle && yaw < calcAngle + segAngles) return seg; } return -1; @@ -232,11 +231,11 @@ public class ItemCraftingHalo extends ItemMod { float yaw = MathHelper.wrapAngleTo180_float(player.rotationYaw) + 90F; int angles = 360; int segAngles = angles / SEGMENTS; - float shift = segAngles / 2; + float shift = segAngles / 2; if(yaw < 0) yaw = 180F + (180F + yaw); - yaw -= (360F - base); + yaw -= 360F - base; float angle = 360F - yaw + shift; if(angle < 0) @@ -371,7 +370,7 @@ public class ItemCraftingHalo extends ItemMod { public void render(ItemStack stack, EntityPlayer player, float partialTicks) { Minecraft mc = Minecraft.getMinecraft(); Tessellator tess = Tessellator.instance; - tess.renderingWorldRenderer = false; + Tessellator.renderingWorldRenderer = false; GL11.glPushMatrix(); GL11.glEnable(GL11.GL_BLEND); @@ -394,11 +393,8 @@ public class ItemCraftingHalo extends ItemMod { float v = 0.25F; float uper = u / angles; - float ucurr = 0F; - float s = 3F; float m = 0.8F; - float x = u * s; float y = v * s * 2; float y0 = 0; @@ -406,7 +402,7 @@ public class ItemCraftingHalo extends ItemMod { for(int seg = 0; seg < SEGMENTS; seg++) { boolean inside = false; - float rotationAngle = ((float) seg + 0.5F) * segAngles + shift; + float rotationAngle = (seg + 0.5F) * segAngles + shift; GL11.glPushMatrix(); GL11.glRotatef(rotationAngle, 0F, 1F, 0F); GL11.glTranslatef(s * m, -0.75F, 0F); @@ -470,7 +466,6 @@ public class ItemCraftingHalo extends ItemMod { tess.addVertexWithUV(xp * m, y, zp * m, u, v); tess.addVertexWithUV(xp, y0, zp, u, 0); - ucurr += uper; xp = Math.cos((ang + 1) * Math.PI / 180F) * s; zp = Math.sin((ang + 1) * Math.PI / 180F) * s; @@ -541,8 +536,8 @@ public class ItemCraftingHalo extends ItemMod { for(int i = 0; i < 9; i++) { ItemStack stack = recipe[i]; if(stack != null) { - int xpos = x + (i % 3) * 18; - int ypos = y + (i / 3) * 18; + int xpos = x + i % 3 * 18; + int ypos = y + i / 3 * 18; Gui.drawRect(xpos, ypos, xpos + 16, ypos + 16, 0x22000000); RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, xpos, ypos); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index be4b075ee..b771cbf96 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -113,7 +113,7 @@ public class ItemGrassHorn extends ItemMod { int z = srcz + j; Block block = world.getBlock(x, y, z); - if((stackDmg == 0 && block instanceof BlockBush && !(block instanceof ISpecialFlower) && (!(block instanceof IGrassHornExcempt) || ((IGrassHornExcempt) block).canUproot(world, x, y, z))) || (stackDmg == 1 && block instanceof BlockLeavesBase)) + if(stackDmg == 0 && block instanceof BlockBush && !(block instanceof ISpecialFlower) && (!(block instanceof IGrassHornExcempt) || ((IGrassHornExcempt) block).canUproot(world, x, y, z)) || stackDmg == 1 && block instanceof BlockLeavesBase) coords.add(new ChunkCoordinates(x, y, z)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemLens.java b/src/main/java/vazkii/botania/common/item/ItemLens.java index f22f93c48..3e0e36661 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/ItemLens.java @@ -445,12 +445,12 @@ public class ItemLens extends ItemMod implements ILens { else if(blockAt_.isAir(entity.worldObj, x, y, z)) { entity.worldObj.setBlock(x, y, z, ModBlocks.manaFlame); TileEntity tile = entity.worldObj.getTileEntity(x, y, z); - + if(tile instanceof TileManaFlame) ((TileManaFlame) tile).setColor(burst.getColor()); } } - + break; } } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 50436ad60..33c50bef0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -158,7 +158,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte pool.recieveMana(mana); TileEntity tile = (TileEntity) pool; tile.getWorldObj().func_147453_f(tile.xCoord, tile.yCoord, tile.zCoord, tile.getWorldObj().getBlock(tile.xCoord, tile.yCoord, tile.zCoord)); - } + } }*/ public void bindPool(ItemStack stack, TileEntity pool) { @@ -262,7 +262,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte @Override public ChunkCoordinates getBinding(ItemStack stack) { IManaPool pool = getManaPool(stack); - + return pool == null || pool instanceof DummyPool ? null : getPoolCoords(stack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 6a485f1d6..640388ee4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -104,7 +104,7 @@ public class ItemSignalFlare extends ItemMod { int colorv = getColor(par1ItemStack); if(colorv >= EntitySheep.fleeceColorTable.length || colorv < 0) return 0xFFFFFF; - + float[] color = EntitySheep.fleeceColorTable[getColor(par1ItemStack)]; return new Color(color[0], color[1], color[2]).getRGB(); } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 558068e58..ed921ca94 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -287,7 +287,7 @@ public final class ModItems { unholyCloak = new ItemUnholyCloak(); craftingHalo = new ItemCraftingHalo(); blackLotus = new ItemBlackLotus(); - + OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i)); @@ -309,7 +309,7 @@ public final class ModItems { OreDictionary.registerOre(LibOreDict.PRISMARINE_SHARD, new ItemStack(manaResource, 1, 10)); OreDictionary.registerOre(LibOreDict.PLACEHOLDER, new ItemStack(manaResource, 1, 11)); OreDictionary.registerOre(LibOreDict.RED_STRING, new ItemStack(manaResource, 1, 12)); - + OreDictionary.registerOre(LibOreDict.VIAL, new ItemStack(vial, 1, 0)); OreDictionary.registerOre(LibOreDict.FLASK, new ItemStack(vial, 1, 1)); } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java index 6db037328..bb39ca26c 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java @@ -11,7 +11,6 @@ */ package vazkii.botania.common.item.block; -import vazkii.botania.api.BotaniaAPI; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 4cd014942..8a58cfb4d 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -91,7 +91,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr public static ItemStack ofType(String type) { return ofType(new ItemStack(ModBlocks.specialFlower), type); } - + public static ItemStack ofType(ItemStack stack, String type) { ItemNBTHelper.setString(stack, SubTileEntity.TAG_TYPE, type); return stack; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index e3ab06a12..40840734d 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -70,21 +70,21 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem { @Override public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_)); + p_77659_3_.setItemInUse(p_77659_1_, getMaxItemUseDuration(p_77659_1_)); return p_77659_1_; } - + @Override - public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) { + public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) { if(!world.isRemote) { for(PotionEffect effect : getBrew(stack).getPotionEffects(stack)) { PotionEffect newEffect = new PotionEffect(effect.getPotionID(), effect.getDuration(), effect.getAmplifier(), true); player.addPotionEffect(newEffect); } - + if(world.rand.nextBoolean()) world.playSoundAtEntity(player, "random.burp", 1F, 1F); - + int swigs = getSwigsLeft(stack); if(!player.capabilities.isCreativeMode) { if(swigs == 1) { @@ -93,14 +93,14 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem { return baseItem.copy(); return null; } - - + + setSwigsLeft(stack, swigs - 1); } } return stack; - } + } @Override public void getSubItems(Item item, CreativeTabs tab, List list) { @@ -134,14 +134,14 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem { public int getColorFromItemStack(ItemStack stack, int pass) { if(pass == 0) return 0xFFFFFF; - + Color color = new Color(getBrew(stack).getColor(stack)); - int add = (int) (Math.sin((double) ClientTickHandler.ticksInGame * 0.1) * 16); - + int add = (int) (Math.sin(ClientTickHandler.ticksInGame * 0.1) * 16); + int r = Math.max(0, Math.min(255, color.getRed() + add)); int g = Math.max(0, Math.min(255, color.getGreen() + add)); int b = Math.max(0, Math.min(255, color.getBlue() + add)); - + return r << 16 | g << 8 | b; } @@ -156,7 +156,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem { for(PotionEffect effect : brew.getPotionEffects(stack)) { Potion potion = Potion.potionTypes[effect.getPotionID()]; EnumChatFormatting format = potion.isBadEffect() ? EnumChatFormatting.RED : EnumChatFormatting.GRAY; - list.add(format + StatCollector.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : (" " + StatCollector.translateToLocal("botania.roman" + (effect.getAmplifier() + 1)))) + EnumChatFormatting.GRAY + (potion.isInstant() ? "" : (" (" + Potion.getDurationString(effect) + ")"))); + list.add(format + StatCollector.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + StatCollector.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))) + EnumChatFormatting.GRAY + (potion.isInstant() ? "" : " (" + Potion.getDurationString(effect) + ")")); } } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewFlask.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewFlask.java index 149c00c8d..a81119769 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewFlask.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewFlask.java @@ -11,9 +11,9 @@ */ package vazkii.botania.common.item.brew; +import net.minecraft.item.ItemStack; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; -import net.minecraft.item.ItemStack; public class ItemBrewFlask extends ItemBrewBase { diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewVial.java index 5d3eccc59..098ea660d 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewVial.java @@ -11,9 +11,9 @@ */ package vazkii.botania.common.item.brew; +import net.minecraft.item.ItemStack; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; -import net.minecraft.item.ItemStack; public class ItemBrewVial extends ItemBrewBase { diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index 50b448f71..2ede523a7 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -28,16 +28,16 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemVial extends ItemMod implements IBrewContainer { public static IIcon flaskIcon, vialIcon; - + public ItemVial() { this(LibItemNames.VIAL); } - + public ItemVial(String name) { setHasSubtypes(true); setUnlocalizedName(name); } - + @Override public void registerIcons(IIconRegister par1IconRegister) { vialIcon = IconHelper.forName(par1IconRegister, LibItemNames.VIAL + "0"); @@ -48,13 +48,13 @@ public class ItemVial extends ItemMod implements IBrewContainer { public IIcon getIconFromDamage(int i) { return i == 0 ? vialIcon : flaskIcon; } - + @Override public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } - + @Override public String getUnlocalizedName(ItemStack par1ItemStack) { return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage(); @@ -71,5 +71,5 @@ public class ItemVial extends ItemMod implements IBrewContainer { public int getManaCost(Brew brew, ItemStack stack) { return brew.getManaCost() * (stack.getItemDamage() + 1); } - + } 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 688ef70e9..089bfbe06 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 @@ -70,7 +70,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble { addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), par3List); } - + public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { BaubleType type = getBaubleType(par1ItemStack); addStringToTooltip(StatCollector.translateToLocal("botania.baubletype." + type.name().toLowerCase()), par3List); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 3cf572401..66d42abb1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -14,8 +14,6 @@ package vazkii.botania.common.item.equipment.bauble; import java.awt.Color; import java.util.List; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; @@ -23,7 +21,6 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -33,35 +30,35 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; -import net.minecraft.world.World; import net.minecraftforge.client.event.RenderPlayerEvent; -import baubles.api.BaubleType; + +import org.lwjgl.opengl.GL11; + import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.api.item.IBaubleRender.Helper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemBrewBase; import vazkii.botania.common.lib.LibItemNames; +import baubles.api.BaubleType; public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBrewItem, IManaUsingItem, IBaubleRender { private static final String TAG_BREW_KEY = "brewKey"; - + IIcon[] icons; - + public ItemBloodPendant() { super(LibItemNames.BLOOD_PENDANT); setMaxStackSize(1); } - + @Override public void getSubItems(Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); @@ -71,7 +68,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre list.add(brewStack); } } - + @Override public void registerIcons(IIconRegister par1IconRegister) { icons = new IIcon[4]; @@ -93,39 +90,39 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre public int getColorFromItemStack(ItemStack stack, int pass) { if(pass == 0) return 0xFFFFFF; - + Brew brew = getBrew(stack); if(brew == BotaniaAPI.fallbackBrew) return 0xC6000E; - + Color color = new Color(brew.getColor(stack)); - int add = (int) (Math.sin((double) ClientTickHandler.ticksInGame * 0.2) * 24); - + int add = (int) (Math.sin(ClientTickHandler.ticksInGame * 0.2) * 24); + int r = Math.max(0, Math.min(255, color.getRed() + add)); int g = Math.max(0, Math.min(255, color.getGreen() + add)); int b = Math.max(0, Math.min(255, color.getBlue() + add)); - + return r << 16 | g << 8 | b; } - + @Override public void addHiddenTooltip(ItemStack stack, EntityPlayer player, List list, boolean adv) { super.addHiddenTooltip(stack, player, list, adv); - + Brew brew = getBrew(stack); if(brew == BotaniaAPI.fallbackBrew) { addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + StatCollector.translateToLocal("botaniamisc.notInfused"), list); return; } - + addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + String.format(StatCollector.translateToLocal("botaniamisc.brewOf"), StatCollector.translateToLocal(brew.getUnlocalizedName(stack))), list); for(PotionEffect effect : brew.getPotionEffects(stack)) { Potion potion = Potion.potionTypes[effect.getPotionID()]; EnumChatFormatting format = potion.isBadEffect() ? EnumChatFormatting.RED : EnumChatFormatting.GRAY; - addStringToTooltip(" " + format + StatCollector.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : (" " + StatCollector.translateToLocal("botania.roman" + (effect.getAmplifier() + 1)))), list); + addStringToTooltip(" " + format + StatCollector.translateToLocal(effect.getEffectName()) + (effect.getAmplifier() == 0 ? "" : " " + StatCollector.translateToLocal("botania.roman" + (effect.getAmplifier() + 1))), list); } } - + @Override public BaubleType getBaubleType(ItemStack arg0) { return BaubleType.AMULET; @@ -152,7 +149,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } } } - + @Override public Brew getBrew(ItemStack stack) { String key = ItemNBTHelper.getString(stack, TAG_BREW_KEY, ""); @@ -166,12 +163,12 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre public static void setBrew(ItemStack stack, String brew) { ItemNBTHelper.setString(stack, TAG_BREW_KEY, brew); } - + @Override public ItemStack getItemForBrew(Brew brew, ItemStack stack) { if(!brew.canInfuseBloodPendant() || brew.getPotionEffects(stack).size() != 1 || Potion.potionTypes[brew.getPotionEffects(stack).get(0).getPotionID()].isInstant()) return null; - + ItemStack brewStack = new ItemStack(this); ItemBrewBase.setBrew(brewStack, brew); return brewStack; @@ -196,7 +193,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre GL11.glRotatef(180F, 1F, 0F, 0F); GL11.glTranslatef(-0.26F, -0.4F, armor ? 0.2F : 0.15F); GL11.glScalef(0.5F, 0.5F, 0.5F); - + for(int i = 2; i < 4; i++) { IIcon icon = icons[i]; float f = icon.getMinU(); @@ -204,7 +201,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre float f2 = icon.getMinV(); float f3 = icon.getMaxV(); ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F); - + Color color = new Color(getColorFromItemStack(stack, 1)); GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); int light = 15728880; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index f5bb764a0..b00d0b627 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -13,8 +13,6 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; @@ -28,9 +26,10 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; + +import org.lwjgl.opengl.GL11; + import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.api.item.IBaubleRender.Helper; -import vazkii.botania.api.item.IBaubleRender.RenderType; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; @@ -95,11 +94,11 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble public boolean usesMana(ItemStack stack) { return true; } - + @Override @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { - if(type == RenderType.HEAD) { + if(type == RenderType.HEAD) { float f = itemIcon.getMinU(); float f1 = itemIcon.getMaxU(); float f2 = itemIcon.getMinV(); @@ -111,7 +110,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble GL11.glRotatef(180F, 1F, 0F, 0F); GL11.glTranslatef(-0.4F, 0.1F, armor ? -0.35F : -0.3F); GL11.glScalef(0.5F, 0.5F, 0.5F); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 16F); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index cfff28896..4f1eb28ff 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -14,8 +14,6 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.ArrayList; import java.util.List; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; @@ -32,6 +30,9 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; + +import org.lwjgl.opengl.GL11; + import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -51,7 +52,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaubleRender { private static ResourceLocation textureHalo = new ResourceLocation(LibResources.MISC_HALO); - + public static List playersWithFlight = new ArrayList(); private static final int COST = 35; @@ -292,11 +293,11 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub GL11.glColor3f(1F, 1F, 1F); GL11.glPopMatrix(); - } + } } else if(meta == 1) // Jibril's Halo - renderHalo(event.entityPlayer, event.partialRenderTick); + renderHalo(event.entityPlayer, event.partialRenderTick); } - + @SideOnly(Side.CLIENT) private void renderHalo(EntityPlayer player, float partialTicks) { GL11.glShadeModel(GL11.GL_SMOOTH); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java index 98b5d702b..7cfd72dfb 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java @@ -11,8 +11,6 @@ */ package vazkii.botania.common.item.equipment.bauble; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; @@ -25,9 +23,10 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; + +import org.lwjgl.opengl.GL11; + import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.api.item.IBaubleRender.Helper; -import vazkii.botania.api.item.IBaubleRender.RenderType; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.lib.PlayerHandler; @@ -64,11 +63,11 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { public BaubleType getBaubleType(ItemStack itemstack) { return BaubleType.AMULET; } - + @Override @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { - if(type == RenderType.HEAD) { + if(type == RenderType.HEAD) { float f = itemIcon.getMinU(); float f1 = itemIcon.getMaxU(); float f2 = itemIcon.getMinV(); @@ -84,7 +83,7 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { GL11.glScalef(1.1F, 1.1F, 1F); GL11.glTranslatef(-0.05F, -0.1F, 0F); } - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 32F); + ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, itemIcon.getIconWidth(), itemIcon.getIconHeight(), 1F / 32F); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 0d63faaf9..515b7b58d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -13,13 +13,10 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; @@ -69,14 +66,14 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { } } } - + @Override public void onWornTick(ItemStack stack, EntityLivingBase player) { int cooldown = getCooldown(stack); if(cooldown > 0) setCooldown(stack, cooldown - 1); } - + public boolean effectOnDamage(LivingHurtEvent event, EntityPlayer player, ItemStack stack) { if(!event.source.isMagicDamage()) { event.setCanceled(true); @@ -90,7 +87,7 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { } return true; } - + return false; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java index fa787f7dd..27c258408 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java @@ -11,20 +11,14 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.awt.Color; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; @@ -37,9 +31,10 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderPlayerEvent; + +import org.lwjgl.opengl.GL11; + import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.api.item.IBaubleRender.Helper; -import vazkii.botania.api.item.IBaubleRender.RenderType; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 0ed64f319..df131d36e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -14,8 +14,6 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.ArrayList; import java.util.List; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; @@ -37,6 +35,9 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.village.MerchantRecipe; import net.minecraftforge.client.event.RenderPlayerEvent; + +import org.lwjgl.opengl.GL11; + import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; @@ -217,7 +218,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { @Override @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { - if(type == RenderType.HEAD) { + if(type == RenderType.HEAD) { float f = gemIcon.getMinU(); float f1 = gemIcon.getMaxU(); float f2 = gemIcon.getMinV(); @@ -229,7 +230,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { GL11.glRotatef(180F, 1F, 0F, 0F); GL11.glTranslatef(-0.4F, 0.1F, armor ? -0.3F : -0.25F); GL11.glScalef(0.75F, 0.75F, 0.75F); - ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 16F); + ItemRenderer.renderItemIn2D(Tessellator.instance, f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 16F); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index 77720cf6d..1a20caa1f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -13,8 +13,6 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.UUID; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.entity.SharedMonsterAttributes; @@ -22,9 +20,10 @@ import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderPlayerEvent; + +import org.lwjgl.opengl.GL11; + import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.api.item.IBaubleRender.Helper; -import vazkii.botania.api.item.IBaubleRender.RenderType; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; @@ -38,7 +37,7 @@ public class ItemKnockbackBelt extends ItemBaubleModifier implements IBaubleRend private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_KNOCKBACK_BELT); private static ModelBiped model; - + public ItemKnockbackBelt() { super(LibItemNames.KNOCKBACK_BELT); } @@ -52,7 +51,7 @@ public class ItemKnockbackBelt extends ItemBaubleModifier implements IBaubleRend void fillModifiers(Multimap attributes) { attributes.put(SharedMonsterAttributes.knockbackResistance.getAttributeUnlocalizedName(), new AttributeModifier(new UUID(2745708 /** Random number **/, 43743), "Bauble modifier", 1, 0)); } - + @Override @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { @@ -64,7 +63,7 @@ public class ItemKnockbackBelt extends ItemBaubleModifier implements IBaubleRend float s = (armor ? 1.3F : 1.05F) / 16F; GL11.glScalef(s, s, s); - + if(model == null) model = new ModelBiped(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java index b55cb7467..fed5a266d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java @@ -31,7 +31,7 @@ import baubles.api.BaubleType; public class ItemLavaPendant extends ItemBauble implements IBaubleRender { IIcon gemIcon; - + public ItemLavaPendant() { super(LibItemNames.LAVA_PENDANT); } 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 916a66f63..fd9bb1369 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 @@ -57,7 +57,7 @@ public class ItemMagnetRing extends ItemBauble { "appliedenergistics2:ItemCrystalSeed.Fluix2", "appliedenergistics2:ItemCrystalSeed.Fluix3", }); - + public ItemMagnetRing() { super(LibItemNames.MAGNET_RING); MinecraftForge.EVENT_BUS.register(this); @@ -118,20 +118,20 @@ public class ItemMagnetRing extends ItemBauble { private boolean canPullItem(EntityItem item) { if(item.isDead) return false; - + ItemStack stack = item.getEntityItem(); if(stack == null || stack.getItem() instanceof IManaItem || BLACKLIST.contains(itemRegistry.getNameForObject(stack.getItem()))) return false; - + int x = net.minecraft.util.MathHelper.floor_double(item.posX); int y = net.minecraft.util.MathHelper.floor_double(item.posY); int z = net.minecraft.util.MathHelper.floor_double(item.posZ); if(item.worldObj.getBlock(x, y, z) == ModBlocks.terraPlate) return false; - + return true; } - + public static int getCooldown(ItemStack stack) { return ItemNBTHelper.getInt(stack, TAG_COOLDOWN, 0); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java index 79aec3e55..82a892f7e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java @@ -11,8 +11,6 @@ */ package vazkii.botania.common.item.equipment.bauble; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; @@ -23,9 +21,10 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.event.RenderPlayerEvent; + +import org.lwjgl.opengl.GL11; + import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.api.item.IBaubleRender.Helper; -import vazkii.botania.api.item.IBaubleRender.RenderType; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; @@ -35,7 +34,7 @@ import cpw.mods.fml.relauncher.ReflectionHelper; public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { IIcon gemIcon; - + public ItemSuperLavaPendant() { super(LibItemNames.SUPER_LAVA_PENDANT); } @@ -58,13 +57,13 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { public BaubleType getBaubleType(ItemStack itemstack) { return BaubleType.AMULET; } - + @Override public void registerIcons(IIconRegister par1IconRegister) { super.registerIcons(par1IconRegister); gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem"); } - + @Override public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { if(type == RenderType.BODY) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperTravelBelt.java index 8e1eb1fdb..3e3a17eae 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperTravelBelt.java @@ -18,11 +18,11 @@ import vazkii.botania.common.lib.LibItemNames; public class ItemSuperTravelBelt extends ItemTravelBelt { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_SUPER_TRAVEL_BELT); - + public ItemSuperTravelBelt() { super(LibItemNames.SUPER_TRAVEL_BELT, 0.085F, 0.3F, 4F); } - + @Override public ResourceLocation getRenderTexture() { return texture; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java index 23d8b0ce9..8c4356aac 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java @@ -13,8 +13,6 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.texture.TextureMap; @@ -25,6 +23,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderPlayerEvent; + +import org.lwjgl.opengl.GL11; + import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.ITinyPlanetExcempt; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index c6618a79c..df297f974 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -11,8 +11,6 @@ */ package vazkii.botania.common.item.equipment.bauble; -import org.lwjgl.opengl.GL11; - import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; @@ -23,6 +21,9 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; + +import org.lwjgl.opengl.GL11; + import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibItemNames; @@ -37,7 +38,7 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TRAVEL_BELT); @SideOnly(Side.CLIENT) private static ModelBiped model; - + final float speed; final float jump; final float fallBuffer; @@ -102,7 +103,7 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender { ResourceLocation getRenderTexture() { return texture; } - + @Override @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, RenderPlayerEvent event, RenderType type) { @@ -115,8 +116,8 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender { float s = (armor ? 1.3F : 1.05F) / 16F; GL11.glScalef(s, s, s); if(model == null) - model = new ModelBiped(); - + model = new ModelBiped(); + model.bipedBody.render(1F); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java index fd3fa7c16..5b6d0e2bd 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java @@ -13,7 +13,6 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; @@ -33,7 +32,7 @@ public class ItemUnholyCloak extends ItemHolyCloak { public ItemUnholyCloak() { super(LibItemNames.UNHOLY_CLOAK); } - + @Override public boolean effectOnDamage(LivingHurtEvent event, EntityPlayer player, ItemStack stack) { if(!event.source.isUnblockable()) { @@ -44,24 +43,24 @@ public class ItemUnholyCloak extends ItemHolyCloak { EntityLivingBase entity = (EntityLivingBase) mob; entity.attackEntityFrom(DamageSource.causePlayerDamage(player), event.ammount); } - + player.worldObj.playSoundAtEntity(player, "botania:unholyCloak", 1F, 1F); for(int i = 0; i < 90; i++) { - float rad = (float) i * 4F * (float) Math.PI / 180F; + float rad = i * 4F * (float) Math.PI / 180F; float xMotion = (float) Math.cos(rad) * 0.2F; float zMotion = (float) Math.sin(rad) * 0.2F; Botania.proxy.wispFX(player.worldObj, player.posX, player.posY + 0.5, player.posZ, 0.4F + (float) Math.random() + 0.25F, 0F, 0F, 0.6F + (float) Math.random() * 0.2F, xMotion, 0F, zMotion); } - + return true; } - + return false; } - + @Override ResourceLocation getRenderTexture() { return texture; } - + } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index ee17e4dd6..ac3eec165 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -18,7 +18,6 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; @@ -76,14 +75,14 @@ public final class ToolCommons { if(!player.capabilities.isCreativeMode) { int localMeta = world.getBlockMetadata(x, y, z); blk.onBlockHarvested(world, x, y, z, localMeta, player); - - if(blk.removedByPlayer(world, player, x, y, z, true)) { + + if(blk.removedByPlayer(world, player, x, y, z, true)) { blk.onBlockDestroyedByPlayer(world, x, y, z, localMeta); - + if(!dispose || !ItemElementiumPick.isDisposable(blk)) blk.harvestBlock(world, player, x, y, z, localMeta); } - + damageItem(stack, 1, player, 80); } else world.setBlockToAir(x, y, z); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java index c955a3df5..1c2ca7df0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java @@ -28,7 +28,7 @@ public class ItemElementiumShovel extends ItemManasteelShovel { Material mat = world.getBlock(x, y, z).getMaterial(); if (!ToolCommons.isRightMaterial(mat, materialsShovel)) return false; - + MovingObjectPosition block = ToolCommons.raytraceFromEntity(world, player, true, 10); if (block == null) return false; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index 0a18cb0a8..ce822eedc 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -77,7 +77,7 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem { return true; } - + @Override public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java index 8d0053cf9..7d05f1c2f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java @@ -87,7 +87,7 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem { if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) stack.setItemDamage(stack.getItemDamage() - 1); } - + @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java index 124740cd5..dcb4e7115 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java @@ -133,7 +133,7 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem { if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) stack.setItemDamage(stack.getItemDamage() - 1); } - + @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index 56d923b94..596ae6eb3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -77,7 +77,7 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem { return true; } - + @Override public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) { if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index c10f5ad64..80c0ecc66 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -98,7 +98,7 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem { if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExact(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true)) stack.setItemDamage(stack.getItemDamage() - 1); } - + @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index 7f1c12ede..b3a2f7d2c 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -11,28 +11,16 @@ */ package vazkii.botania.common.item.rod; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockFlower; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.common.Botania; import vazkii.botania.common.entity.EntityMagicMissile; import vazkii.botania.common.item.ItemMod; -import vazkii.botania.common.item.rod.ItemTerraformRod.CoordsWithBlock; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibMisc; public class ItemMissileRod extends ItemMod implements IManaUsingItem { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index 4bb41d9ca..2c46af086 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -38,12 +38,12 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem { private static final int COST_PER = 55; static final List validBlocks = Arrays.asList(new String[] { - "stone", - "dirt", - "grass", - "sand", - "gravel", - "hardenedClay", + "stone", + "dirt", + "grass", + "sand", + "gravel", + "hardenedClay", "snowLayer", "mycelium", "podzol", diff --git a/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java index b791503d7..de9de17ee 100644 --- a/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/BLexiconEntry.java @@ -45,5 +45,5 @@ public class BLexiconEntry extends LexiconEntry { public String getLazyUnlocalizedName() { return super.getUnlocalizedName(); } - + } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 0975c2c67..f33ee9928 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -11,8 +11,6 @@ */ package vazkii.botania.common.lexicon; -import org.apache.logging.log4j.core.pattern.AbstractStyleNameConverter.Black; - import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconCategory; @@ -182,7 +180,7 @@ public final class LexiconData { public static LexiconEntry elvenResources; public static LexiconEntry gaiaRitual; public static LexiconEntry elvenLore; - + public static LexiconEntry unstableBlocks; public static LexiconEntry decorativeBlocks; public static LexiconEntry dispenserTweaks; @@ -217,7 +215,7 @@ public final class LexiconData { LexiconCategory categoryBaubles = BotaniaAPI.categoryBaubles; LexiconCategory categoryAlfhomancy = BotaniaAPI.categoryAlfhomancy; LexiconCategory categoryMisc = BotaniaAPI.categoryMisc; - + // BASICS ENTRIES introVideo = new BLexiconEntry(LibLexicon.BASICS_INTRO_VIDEO, categoryBasics); introVideo.setPriority().setLexiconPages(new PageGuide("0")); @@ -250,7 +248,7 @@ public final class LexiconData { blackLotus = new BLexiconEntry(LibLexicon.BASICS_BLACK_LOTUS, categoryBasics); blackLotus.setLexiconPages(new PageText("0")); - + if(Botania.thaumcraftLoaded) new BLexiconEntry("wrap", categoryBasics).setLexiconPages(new PageText("0")); // lel @@ -319,7 +317,7 @@ public final class LexiconData { prism = new ALexiconEntry(LibLexicon.MANA_PRISM, categoryMana); prism.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipePrism)); - + // FUNCTIONAL FLOWERS ENTRIES functionalIntro = new BLexiconEntry(LibLexicon.FFLOWER_INTRO, categoryFunctionalFlowers); functionalIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageCraftingRecipe("4", ModCraftingRecipes.recipeRedstoneRoot)); @@ -440,7 +438,7 @@ public final class LexiconData { new PageManaInfusionRecipe("6", ModManaAlchemyRecipes.quartzRecipes).setSkipRegistry(), new PageManaInfusionRecipe("7", ModManaAlchemyRecipes.chiseledBrickRecipe), new PageManaInfusionRecipe("8", ModManaAlchemyRecipes.iceRecipe), new PageManaInfusionRecipe("9", ModManaAlchemyRecipes.swampFolliageRecipes), new PageManaInfusionRecipe("10", ModManaAlchemyRecipes.fishRecipes), new PageManaInfusionRecipe("11", ModManaAlchemyRecipes.cropRecipes), new PageManaInfusionRecipe("12", ModManaAlchemyRecipes.potatoRecipe), new PageManaInfusionRecipe("13", ModManaAlchemyRecipes.netherWartRecipe), new PageManaInfusionRecipe("14", ModManaAlchemyRecipes.gunpowderAndFlintRecipes), new PageManaInfusionRecipe("15", ModManaAlchemyRecipes.nameTagRecipe), new PageManaInfusionRecipe("16", ModManaAlchemyRecipes.stringRecipes), new PageManaInfusionRecipe("17", ModManaAlchemyRecipes.slimeballCactusRecipes), - new PageManaInfusionRecipe("18", ModManaAlchemyRecipes.enderPearlRecipe), new PageManaInfusionRecipe("19", ModManaAlchemyRecipes.redstoneToGlowstoneRecipes), new PageManaInfusionRecipe("20", ModManaAlchemyRecipes.sandRecipe), new PageManaInfusionRecipe("21", ModManaAlchemyRecipes.redSandRecipe), + new PageManaInfusionRecipe("18", ModManaAlchemyRecipes.enderPearlRecipe), new PageManaInfusionRecipe("19", ModManaAlchemyRecipes.redstoneToGlowstoneRecipes), new PageManaInfusionRecipe("20", ModManaAlchemyRecipes.sandRecipe), new PageManaInfusionRecipe("21", ModManaAlchemyRecipes.redSandRecipe), new PageManaInfusionRecipe("22", ModManaAlchemyRecipes.clayBreakdownRecipes), new PageManaInfusionRecipe("23", ModManaAlchemyRecipes.coarseDirtRecipe)); openCrate = new BLexiconEntry(LibLexicon.DEVICE_OPEN_CRATE, categoryDevices); @@ -475,7 +473,7 @@ public final class LexiconData { enderEyeBlock.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeEnderEyeBlock)); brewery = new BLexiconEntry(LibLexicon.DEVICE_BREWERY, categoryDevices); - brewery.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeBrewery), new PageCraftingRecipe("3", ModCraftingRecipes.recipeVial), new PageText("4"), + brewery.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeBrewery), new PageCraftingRecipe("3", ModCraftingRecipes.recipeVial), new PageText("4"), new PageBrew(ModBrewRecipes.speedBrew, "5a", "5b"), new PageBrew(ModBrewRecipes.strengthBrew, "6a", "6b"), new PageBrew(ModBrewRecipes.hasteBrew, "7a", "7b"), new PageBrew(ModBrewRecipes.healingBrew, "8a", "8b"), new PageBrew(ModBrewRecipes.jumpBoostBrew, "9a", "9b"), new PageBrew(ModBrewRecipes.regenerationBrew, "10a", "10b"), @@ -483,10 +481,10 @@ public final class LexiconData { new PageBrew(ModBrewRecipes.resistanceBrew, "11a", "11b"), new PageBrew(ModBrewRecipes.fireResistanceBrew, "12a", "12b"), new PageBrew(ModBrewRecipes.waterBreathingBrew, "13a", "13b"), new PageBrew(ModBrewRecipes.invisibilityBrew, "14a", "14b"), new PageBrew(ModBrewRecipes.nightVisionBrew, "15a", "15b"), new PageBrew(ModBrewRecipes.absorptionBrew, "16a", "16b")); - + flasks = new ALexiconEntry(LibLexicon.DEVICE_FLASKS, categoryDevices); flasks.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeFlask)); - + redString = new ALexiconEntry(LibLexicon.DEVICE_RED_STRING, categoryDevices); redString.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeRedString), new PageText("3"), new PageCraftingRecipe("4", ModCraftingRecipes.recipeRedStringContainer), @@ -494,7 +492,7 @@ public final class LexiconData { new PageText("7"), new PageCraftingRecipe("8", ModCraftingRecipes.recipeRedStringFertilizer), new PageText("9"), new PageCraftingRecipe("10", ModCraftingRecipes.recipeRedStringComparator), new PageText("11"), new PageCraftingRecipe("12", ModCraftingRecipes.recipeRedStringRelay)); - + // TOOLS ENTRIES manaBlaster = new BLexiconEntry(LibLexicon.TOOL_MANA_BLASTER, categoryTools); manaBlaster.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeManaBlaster)); @@ -580,10 +578,10 @@ public final class LexiconData { missileRod = new ALexiconEntry(LibLexicon.TOOL_MISSILE_ROD, categoryTools); missileRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeMissileRod)); - + craftingHalo = new BLexiconEntry(LibLexicon.TOOL_CRAFTING_HALO, categoryTools); craftingHalo.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeCraftingHalo)); - + // BAUBLES ENTRIES baublesIntro = new BLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles); baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2")); @@ -644,10 +642,10 @@ public final class LexiconData { bloodPendant = new BLexiconEntry(LibLexicon.BAUBLE_BLOOD_PENDANT, categoryBaubles); bloodPendant.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeBloodPendant)); - + judgementCloaks = new ALexiconEntry(LibLexicon.BAUBLE_JUDGEMENT_CLOAKS, categoryBaubles); judgementCloaks.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHolyCloak), new PageCraftingRecipe("3", ModCraftingRecipes.recipeUnholyCloak)); - + // ALFHOMANCY ENTRIES alfhomancyIntro = new BLexiconEntry(LibLexicon.ALF_INTRO, categoryAlfhomancy); alfhomancyIntro.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeAlfPortal), new PageCraftingRecipe("3", ModCraftingRecipes.recipeNaturaPylon), @@ -666,7 +664,7 @@ 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")); - + // 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)); @@ -705,7 +703,7 @@ public final class LexiconData { dirtPath = new BLexiconEntry(LibLexicon.MISC_DIRT_PATH, categoryMisc); dirtPath.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeDirtPath)); - + if(Botania.bcTriggersLoaded) { bcIntegration = new BLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc); bcIntegration.setLexiconPages(new PageText("0")); @@ -718,7 +716,7 @@ public final class LexiconData { shedding.setLexiconPages(new PageText("0")); SheddingHandler.addToLexicon(); } - + if(Botania.thaumcraftLoaded) { tcIntegration = new BLexiconEntry(LibLexicon.MISC_TC_INTEGRATION, BotaniaAPI.categoryMisc); tcIntegration.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHelmetOfRevealing), new PageText("3"), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaInkwellRecipe), new PageText("5"), new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index 6caf7820f..31ce15185 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -34,11 +34,11 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { RecipeBrew recipe; String text; - + public PageBrew(RecipeBrew recipe, String unlocalizedName, String bottomText) { super(bottomText); this.recipe = recipe; - this.text = unlocalizedName; + text = unlocalizedName; } @Override @@ -47,7 +47,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { int height = gui.getHeight(); int x = gui.getLeft() + 16; int y = gui.getTop() + 12; - + Brew brew = recipe.getBrew(); FontRenderer renderer = Minecraft.getMinecraft().fontRenderer; boolean unicode = renderer.getUnicodeFlag(); @@ -56,7 +56,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { renderer.drawString(s, gui.getLeft() + gui.getWidth() / 2 - renderer.getStringWidth(s) / 2, y, 0x222222); renderer.setUnicodeFlag(unicode); PageText.renderText(x, y + 22, width, height, text); - + ItemStack book = Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem(); if(book != null && book.getItem() instanceof ILexicon && ((ILexicon) book.getItem()).isKnowledgeUnlocked(book, BotaniaAPI.elvenKnowledge)) { renderItemAtLinePos(gui, 20, 2, y + 12, recipe.getOutput(new ItemStack(ModItems.vial))); @@ -78,7 +78,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { super.renderRecipe(gui, mx, my); } - + @SideOnly(Side.CLIENT) public void renderItemAtLinePos(IGuiLexiconEntry gui, int offset, int pos, int yPos, ItemStack stack) { if(stack == null || stack.getItem() == null) @@ -106,5 +106,5 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { public String getSecondUnlocalizedName() { return text; } - + } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java index 67b2d529c..4f1b920ea 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -105,7 +105,7 @@ public class PageEntity extends LexiconPage{ if(relativeMouseX >= x - dummyEntity.width * scale / 2 - 10 && relativeMouseY >= y - dummyEntity.height * scale - 20 && relativeMouseX <= x + dummyEntity.width * scale / 2 + 10 && relativeMouseY <= y + 20) tooltipEntity = true; } - + public void prepDummy() { if(dummyEntity == null || dummyEntity.isDead) { try { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java index 9cab457d0..1ec6e392f 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java @@ -23,7 +23,7 @@ import vazkii.botania.client.lib.LibResources; public class PageLoreText extends PageText { private static final ResourceLocation paperOverlay = new ResourceLocation(LibResources.GUI_PAPER); - + public PageLoreText(String unlocalizedName) { super(unlocalizedName); } @@ -39,5 +39,5 @@ public class PageLoreText extends PageText { GL11.glDisable(GL11.GL_BLEND); super.renderScreen(gui, mx, my); } - + } diff --git a/src/main/java/vazkii/botania/common/lib/LibBrewNames.java b/src/main/java/vazkii/botania/common/lib/LibBrewNames.java index f99e34572..0cdf3df2a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBrewNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBrewNames.java @@ -36,7 +36,7 @@ public final class LibBrewNames { public static final String MANASHOCK = "manashock"; public static final String GRAVITATION = "gravitation"; public static final String CLEANSING = "cleansing"; - + public static final String WARP_WARD = "warpWard"; } diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 0f6c001fc..d94e4cc5d 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -34,7 +34,7 @@ public final class LibLexicon { public static final String BASICS_RUNE_ALTAR = "runeAltar"; public static final String BASICS_TERRASTEEL = "terrasteel"; public static final String BASICS_BLACK_LOTUS = "blackLotus"; - + public static final String MANA_INTRO = "mIntro"; public static final String MANA_SPREADER = "spreader"; public static final String MANA_POOL = "pool"; @@ -52,7 +52,7 @@ public final class LibLexicon { public static final String MANA_SPARKS = "sparks"; public static final String MANA_SPARK_UPGRADES = "sparkUpgrades"; public static final String MANA_PRISM = "prism"; - + public static final String FFLOWER_INTRO = "fIntro"; public static final String FFLOWER_JADED_AMARANTHUS = "jadedAmaranthus"; public static final String FFLOWER_BELLETHORNE = "bellethorne"; diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index eefe280df..8ff49e070 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -66,7 +66,7 @@ public final class LibObfuscation { // GuiIngame public static final String[] REMAINING_HIGHLIGHT_TICKS = new String[] { "remainingHighlightTicks", "field_92017_k", "r" }; - + // EntityThrowable public static final String[] THROWER = new String[] { "thrower", "field_70192_c", "g" }; } diff --git a/src/main/java/vazkii/botania/common/lib/LibOreDict.java b/src/main/java/vazkii/botania/common/lib/LibOreDict.java index 5f93d5541..99e23de2a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibOreDict.java +++ b/src/main/java/vazkii/botania/common/lib/LibOreDict.java @@ -35,7 +35,7 @@ public final class LibOreDict { public static final String VIAL = "bVial"; public static final String FLASK = "bFlask"; - + public static final String[] FLOWER = new String[] { "mysticFlowerWhite", "mysticFlowerOrange", "mysticFlowerMagenta", "mysticFlowerLightBlue", "mysticFlowerYellow", "mysticFlowerLime", "mysticFlowerPink", "mysticFlowerGray", "mysticFlowerLightGray", "mysticFlowerCyan", "mysticFlowerPurple", "mysticFlowerBlue", "mysticFlowerBrown", "mysticFlowerGreen", "mysticFlowerRed", "mysticFlowerBlack", }; diff --git a/src/main/java/vazkii/botania/common/lib/LibPotionNames.java b/src/main/java/vazkii/botania/common/lib/LibPotionNames.java index 6da4406d7..6883be343 100644 --- a/src/main/java/vazkii/botania/common/lib/LibPotionNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibPotionNames.java @@ -21,5 +21,5 @@ public final class LibPotionNames { public static final String MANASHOCK = "manashock"; public static final String GRAVITATION = "gravitation"; public static final String CLEANSING = "cleansing"; - + } diff --git a/src/main/java/vazkii/botania/common/lib/LibTriggerNames.java b/src/main/java/vazkii/botania/common/lib/LibTriggerNames.java index 58687d831..6fc99c6bb 100644 --- a/src/main/java/vazkii/botania/common/lib/LibTriggerNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibTriggerNames.java @@ -1,11 +1,10 @@ package vazkii.botania.common.lib; -import vazkii.botania.client.lib.LibResources; public class LibTriggerNames { public static final String TRIGGER_PREFIX = "botania.triggers."; - + public static final String TRIGGER_MANA_PREFIX = TRIGGER_PREFIX + "mana"; public static final String TRIGGER_MANA_DETECTOR = TRIGGER_PREFIX + "manaDetector"; public static final String TRIGGER_RUNE_ALTAR_CAN_CRAFT = TRIGGER_PREFIX + "runeAltarCanCraft"; diff --git a/src/main/java/vazkii/botania/common/network/GuiHandler.java b/src/main/java/vazkii/botania/common/network/GuiHandler.java index f352fdc8f..17faf9795 100644 --- a/src/main/java/vazkii/botania/common/network/GuiHandler.java +++ b/src/main/java/vazkii/botania/common/network/GuiHandler.java @@ -29,7 +29,7 @@ public class GuiHandler implements IGuiHandler { return new ContainerCraftingHalo(player.inventory, world); } } - + return null; }