From 269bdbaf8f65eed50c8733b619564fff36da7ca0 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 3 Apr 2015 18:14:29 +0100 Subject: [PATCH] Clean clean~ --- .../vazkii/botania/client/gui/GuiAchievementsHacky.java | 9 +++------ .../vazkii/botania/client/gui/lexicon/GuiLexicon.java | 1 - .../botania/common/achievement/ModAchievements.java | 2 +- .../botania/common/block/BlockModDoubleFlower.java | 2 +- .../vazkii/botania/common/item/relic/ItemExcaliber.java | 4 ++-- .../vazkii/botania/common/item/relic/ItemFlugelEye.java | 2 +- .../vazkii/botania/common/item/relic/ItemLokiRing.java | 2 +- .../java/vazkii/botania/common/item/relic/ItemRelic.java | 2 +- .../botania/common/item/relic/ItemRelicBauble.java | 2 +- 9 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java index f21d0fff7..3be7f4525 100644 --- a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java +++ b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java @@ -10,22 +10,19 @@ */ package vazkii.botania.client.gui; -import cpw.mods.fml.relauncher.ReflectionHelper; -import vazkii.botania.common.achievement.ModAchievements; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiOptionButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.achievement.GuiAchievements; -import net.minecraft.client.resources.I18n; import net.minecraft.stats.StatFileWriter; -import net.minecraftforge.common.AchievementPage; +import vazkii.botania.common.achievement.ModAchievements; +import cpw.mods.fml.relauncher.ReflectionHelper; public class GuiAchievementsHacky extends GuiAchievements { public GuiAchievementsHacky(GuiScreen p_i45026_1_, StatFileWriter p_i45026_2_) { super(p_i45026_1_, p_i45026_2_); } - + @Override public void initGui() { super.initGui(); 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 34ddcb999..55a76bb0d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -22,7 +22,6 @@ import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.achievement.GuiAchievements; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java index 6db2cbad8..6779f8e89 100644 --- a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java +++ b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java @@ -26,7 +26,7 @@ public final class ModAchievements { public static AchievementPage botaniaPage; public static int pageIndex; - + public static Achievement flowerPickup; public static Achievement lexiconUse; public static Achievement daybloomPickup; diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index f164d2dc9..428a17c2d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -129,7 +129,7 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab doublePlantBottomIcons[i] = IconHelper.forName(register, "flower" + off + "Tall1"); } } - + @Override public int colorMultiplier(IBlockAccess blockAccess, int x, int y, int z) { return 16777215; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java index 4c57b7df5..720f9053b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java @@ -103,7 +103,7 @@ public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEf public boolean usesMana(ItemStack stack) { return false; } - + @Override public boolean isItemTool(ItemStack p_77616_1_) { return true; @@ -113,7 +113,7 @@ public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEf public int getEntityLifespan(ItemStack itemStack, World world) { return Integer.MAX_VALUE; } - + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = HashMultimap.create(); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java index 7034735af..91c303c3c 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -86,7 +86,7 @@ public class ItemFlugelEye extends ItemRelic { } } else setWarpPoint(stack, segment, player.posX, player.posY, player.posZ, world.provider.dimensionId); } - + return stack; } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 6be678c8b..7d624353f 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -83,7 +83,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat int relX = lookPos.blockX - originCoords.posX; int relY = lookPos.blockY - originCoords.posY; int relZ = lookPos.blockZ - originCoords.posZ; - + for(ChunkCoordinates cursor : cursors) if(cursor.posX == relX && cursor.posY == relY && cursor.posZ == relZ) { cursors.remove(cursor); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 79e6361c1..78e4f55b4 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -66,7 +66,7 @@ public class ItemRelic extends ItemMod implements IRelic { addStringToTooltip(EnumChatFormatting.ITALIC + StatCollector.translateToLocal(name + i), list); } else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), list); } - + @Override public int getEntityLifespan(ItemStack itemStack, World world) { return Integer.MAX_VALUE; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 1d734f2d9..6d735743b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -92,5 +92,5 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { public int getEntityLifespan(ItemStack itemStack, World world) { return Integer.MAX_VALUE; } - + }