From d4b0d0aec9eb022ee480e0fa978f56c98d58fd0c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 20 Jun 2016 19:54:33 -0500 Subject: [PATCH] Cleanup --- .../api/internal/DummyManaNetwork.java | 4 +- .../api/internal/DummyMethodHandler.java | 24 +-- .../botania/api/internal/DummyPage.java | 4 +- .../botania/api/lexicon/LexiconPage.java | 24 +-- .../botania/api/subtile/SubTileEntity.java | 16 +- .../subtile/signature/SubTileSignature.java | 4 +- .../botania/client/core/proxy/GuiFactory.java | 4 +- .../client/gui/lexicon/GuiLexicon.java | 4 +- .../client/gui/lexicon/GuiLexiconHistory.java | 4 +- .../botania/client/model/ModelPylonOld.java | 4 +- .../client/render/entity/RenderSparkBase.java | 8 +- .../block/BlockFloatingSpecialFlower.java | 8 +- .../botania/common/block/BlockSolidVines.java | 4 +- .../block/decor/BlockFloatingFlower.java | 2 + .../common/block/decor/BlockModMushroom.java | 12 +- .../common/block/decor/BlockShinyFlower.java | 4 +- .../common/block/tile/TileEnchanter.java | 4 +- .../common/block/tile/TileTerraPlate.java | 4 +- .../corporea/TileCorporeaInterceptor.java | 4 +- .../common/block/tile/mana/TilePool.java | 4 +- .../common/block/tile/mana/TileSpreader.java | 4 +- .../block/tile/string/TileRedString.java | 4 +- .../common/core/proxy/CommonProxy.java | 60 ++---- .../common/entity/EntityFlameRing.java | 11 +- .../common/entity/EntityFlyingCreature.java | 8 +- .../common/entity/EntityManaStorm.java | 6 +- .../common/entity/EntityPinkWither.java | 9 +- .../botania/common/item/ItemLaputaShard.java | 4 +- .../botania/common/item/ItemManaMirror.java | 4 +- .../item/equipment/bauble/ItemBauble.java | 8 +- .../item/equipment/bauble/ItemTravelBelt.java | 8 +- .../tool/terrasteel/ItemTerraSword.java | 4 +- .../vazkii/botania/common/item/lens/Lens.java | 16 +- .../common/item/relic/ItemExcaliber.java | 189 ------------------ .../common/item/relic/ItemRelicBauble.java | 4 +- .../common/lexicon/page/PageRecipe.java | 4 +- 36 files changed, 83 insertions(+), 406 deletions(-) delete mode 100644 src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java diff --git a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java index 899801be5..f28a7c9b2 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java @@ -23,9 +23,7 @@ public class DummyManaNetwork implements IManaNetwork { public static final DummyManaNetwork instance = new DummyManaNetwork(); @Override - public void clear() { - // NO-OP - } + public void clear() {} @Override public TileEntity getClosestPool(BlockPos pos, World world, int limit) { diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 48ab9be15..b1f724be2 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -150,14 +150,10 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public void drawSimpleManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res) { - // NO-OP - } + public void drawSimpleManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res) {} @Override - public void drawComplexManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res, ItemStack bindDisplay, boolean properlyBound) { - // NO-OP - } + public void drawComplexManaHUD(int color, int mana, int maxMana, String name, ScaledResolution res, ItemStack bindDisplay, boolean properlyBound) {} @Override public ItemStack getBindDisplayForFlowerType(SubTileEntity e) { @@ -165,14 +161,10 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public void renderLexiconText(int x, int y, int width, int height, String unlocalizedText) { - // NO-OP - } + public void renderLexiconText(int x, int y, int width, int height, String unlocalizedText) {} @Override - public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) { - // NO-OP - } + public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) {} @Override public IInventory getBaublesInventory(EntityPlayer player) { @@ -205,9 +197,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, BlockPos pos, EnumFacing side) { - // NO-OP - } + public void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, BlockPos pos, EnumFacing side) {} @Override public boolean hasSolegnoliaAround(Entity e) { @@ -225,9 +215,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { } @Override - public void sendBaubleUpdatePacket(EntityPlayer player, int slot) { - // NO-OP - } + public void sendBaubleUpdatePacket(EntityPlayer player, int slot) {} @Override public List wrapInventory(List inventories) { diff --git a/src/main/java/vazkii/botania/api/internal/DummyPage.java b/src/main/java/vazkii/botania/api/internal/DummyPage.java index 6b8d7be91..3c5db7166 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyPage.java +++ b/src/main/java/vazkii/botania/api/internal/DummyPage.java @@ -27,8 +27,6 @@ public class DummyPage extends LexiconPage { @Override @SideOnly(Side.CLIENT) - public void renderScreen(IGuiLexiconEntry gui, int x, int y) { - // NO-OP - } + public void renderScreen(IGuiLexiconEntry gui, int x, int y) {} } diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java index a19fd9dc7..9fa6fbe49 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java @@ -40,9 +40,7 @@ public abstract class LexiconPage { * Called per update tick. Non gui-sensitive version, kept for backwards compatibility only. */ @SideOnly(Side.CLIENT) - public void updateScreen() { - // NO-OP - } + public void updateScreen() {} /** * Called per update tick. Feel free to override fully, the @@ -58,41 +56,31 @@ public abstract class LexiconPage { * You can add buttons and whatever you'd do on initGui() here. */ @SideOnly(Side.CLIENT) - public void onOpened(IGuiLexiconEntry gui) { - // NO-OP - } + public void onOpened(IGuiLexiconEntry gui) {} /** * Called when this page is opened, be it via closing the gui or when the player changes page. * Make sure to dispose of anything you don't use any more, such as buttons in the gui's buttonList. */ @SideOnly(Side.CLIENT) - public void onClosed(IGuiLexiconEntry gui) { - // NO-OP - } + public void onClosed(IGuiLexiconEntry gui) {} /** * Called when a button is pressed, equivalent to GuiScreen.actionPerformed. */ @SideOnly(Side.CLIENT) - public void onActionPerformed(IGuiLexiconEntry gui, GuiButton button) { - // NO-OP - } + public void onActionPerformed(IGuiLexiconEntry gui, GuiButton button) {} /** * Called when a key is pressed. */ @SideOnly(Side.CLIENT) - public void onKeyPressed(char c, int key) { - // NO-OP - } + public void onKeyPressed(char c, int key) {} /** * Called when {@link LexiconEntry#setLexiconPages(LexiconPage...)} is called. */ - public void onPageAdded(LexiconEntry entry, int index) { - // NO-OP - } + public void onPageAdded(LexiconEntry entry, int index) {} /** * Shows the list of recipes present in this page for display in the category diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index 05e310e80..b785a0250 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -120,9 +120,7 @@ public class SubTileEntity { /** * Called when this sub tile is placed in the world (by an entity). */ - public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) { - // NO-OP - } + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase entity, ItemStack stack) {} /** * Called when a player right clicks this sub tile. @@ -132,16 +130,12 @@ public class SubTileEntity { /** * Called when this sub tile is added to the world. */ - public void onBlockAdded(World world, BlockPos pos, IBlockState state) { - //NO-OP - } + public void onBlockAdded(World world, BlockPos pos, IBlockState state) {} /** * Called when this sub tile is harvested */ - public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) { - //NO-OP - } + public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player) {} /** * Allows additional processing of sub tile drops @@ -201,9 +195,7 @@ public class SubTileEntity { * Used to render a HUD portraying some data from this sub tile. */ @SideOnly(Side.CLIENT) - public void renderHUD(Minecraft mc, ScaledResolution res) { - // NO-OP - } + public void renderHUD(Minecraft mc, ScaledResolution res) {} /** * Gets the light value for this SubTileEntity, this is a int (-1 to default to the flower) diff --git a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java index 9db646582..31b8c75b6 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java @@ -37,8 +37,6 @@ public abstract class SubTileSignature { /** * Adds additional text to the tooltip. This text is added after getUnlocalizedLoreTextForStack. */ - public void addTooltip(ItemStack stack, EntityPlayer player, List tooltip) { - // NO-OP - } + public void addTooltip(ItemStack stack, EntityPlayer player, List tooltip) {} } diff --git a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java index 66ea8640d..09ee76c03 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java +++ b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java @@ -20,9 +20,7 @@ import java.util.Set; public class GuiFactory implements IModGuiFactory { @Override - public void initialize(Minecraft minecraftInstance) { - // NO-OP - } + public void initialize(Minecraft minecraftInstance) {} @Override public Class mainConfigGuiClass() { 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 5e0d32170..e14132b96 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -638,9 +638,7 @@ public class GuiLexicon extends GuiScreen { return "index"; } - public void load(NBTTagCompound cmp) { - // NO-OP - } + public void load(NBTTagCompound cmp) {} public GuiLexicon copy() { return new GuiLexicon(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java index 8b1b1d05d..31e1e84e7 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java @@ -50,9 +50,7 @@ public class GuiLexiconHistory extends GuiLexiconIndex { } @Override - public void load(NBTTagCompound cmp) { - // NO-OP - } + public void load(NBTTagCompound cmp) {} @Override public String getNotesKey() { diff --git a/src/main/java/vazkii/botania/client/model/ModelPylonOld.java b/src/main/java/vazkii/botania/client/model/ModelPylonOld.java index 3c55c446e..ad615f98d 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylonOld.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylonOld.java @@ -152,8 +152,6 @@ public class ModelPylonOld extends ModelBase implements IPylonModel { } @Override - public void renderGems(PylonVariant variant) { - // NO-OP - } + public void renderGems(PylonVariant variant) {} } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index de1fbafa5..78dd27620 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -84,17 +84,13 @@ public abstract class RenderSparkBase extends Render { return MiscellaneousIcons.INSTANCE.sparkWorldIcon; } - protected void colorSpinningIcon(T entity, float a) { - // NO-OP - } + protected void colorSpinningIcon(T entity, float a) {} protected TextureAtlasSprite getSpinningIcon(T entity) { return null; } - protected void renderCallback(T entity, float pticks) { - // NO-OP - } + protected void renderCallback(T entity, float pticks) {} @Nonnull @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 5d7f16475..cbf48db81 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -32,6 +32,8 @@ import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.BotaniaAPI; @@ -119,11 +121,11 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I return true; } + @SideOnly(Side.CLIENT) @Override - public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { - // NO-OP - } + public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) {} + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 96801691f..51912a242 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -48,9 +48,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { } @Override - public void updateTick(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nonnull Random rand) { - // NO-OP - } + public void updateTick(World world, @Nonnull BlockPos pos, @Nonnull IBlockState state, @Nonnull Random rand) {} @Override public boolean isShearable(ItemStack item, IBlockAccess world, BlockPos pos) { 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 a1d9de8dc..d11ebabfd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -168,6 +168,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName()); } + @SideOnly(Side.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; @@ -179,6 +180,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu Botania.proxy.sparkleFX(world, pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index 71616ce37..70cc14779 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -30,6 +30,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.ILexiconable; @@ -91,9 +93,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public void updateTick(@Nonnull World world, @Nonnull BlockPos pos, IBlockState state, Random rand) { - // NO-OP, to prevent spreading - } + public void updateTick(@Nonnull World world, @Nonnull BlockPos pos, IBlockState state, Random rand) {} // Prevent spreading @Override public boolean canPlaceBlockAt(World world, BlockPos pos) { @@ -106,6 +106,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis return false; } + @SideOnly(Side.CLIENT) @Override public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) @@ -117,6 +118,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis return getMetaFromState(state); } + @SideOnly(Side.CLIENT) @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; @@ -149,8 +151,6 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) { - // NO-OP - } + public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) {} } 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 07174cff1..66829a04a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -61,8 +61,6 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili } @Override - public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) { - // NO-OP - } + public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) {} } 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 23b1b849b..e2c075407 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -401,9 +401,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } @Override - public void attachSpark(ISparkEntity entity) { - // NO-OP - } + public void attachSpark(ISparkEntity entity) {} @Override public ISparkEntity getAttachedSpark() { 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 4d1eae1f8..5f5c18969 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -223,9 +223,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { } @Override - public void attachSpark(ISparkEntity entity) { - // NO-OP - } + public void attachSpark(ISparkEntity entity) {} @Override public ISparkEntity getAttachedSpark() { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index 82e544f19..743826e9b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -37,9 +37,7 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor } @Override - public void interceptRequest(Object request, int count, ICorporeaSpark spark, ICorporeaSpark source, List stacks, List inventories, boolean doit) { - // NO-OP - } + public void interceptRequest(Object request, int count, ICorporeaSpark spark, ICorporeaSpark source, List stacks, List inventories, boolean doit) {} @Override public void interceptRequestLast(Object request, int count, ICorporeaSpark spark, ICorporeaSpark source, List stacks, List inventories, boolean doit) { 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 67566cd31..b6a7d04f5 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 @@ -423,9 +423,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt } @Override - public void attachSpark(ISparkEntity entity) { - // NO-OP - } + public void attachSpark(ISparkEntity entity) {} @Override public ISparkEntity getAttachedSpark() { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index ba7d8bf6c..2e0fbd19a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -711,9 +711,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public void markDispatchable() { - // NO-OP - } + public void markDispatchable() {} @Override public float getRotationX() { 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 84a46f19e..7b3f869ce 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 @@ -59,9 +59,7 @@ public abstract class TileRedString extends TileMod implements ITileBound { public abstract boolean acceptBlock(BlockPos pos); - public void onBound(BlockPos pos) { - // NO-OP - } + public void onBound(BlockPos pos) {} @Nonnull @Override 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 a1932383b..3f8324694 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -221,17 +221,11 @@ public class CommonProxy { event.registerServerCommand(new CommandSkyblockSpread()); } - public void setEntryToOpen(LexiconEntry entry) { - // NO-OP - } + public void setEntryToOpen(LexiconEntry entry) {} - public void setToTutorialIfFirstLaunch() { - // NO-OP - } + public void setToTutorialIfFirstLaunch() {} - public void setLexiconStack(ItemStack stack) { - // NO-OP - } + public void setLexiconStack(ItemStack stack) {} public boolean isTheClientPlayer(EntityLivingBase entity) { return false; @@ -258,45 +252,29 @@ public class CommonProxy { return false; } - public void playRecordClientSided(World world, BlockPos pos, ItemRecord record) { - // NO-OP - } + public void playRecordClientSided(World world, BlockPos pos, ItemRecord record) {} - public void setMultiblock(World world, int x, int y, int z, double radius, Block block) { - // NO-OP - } + public void setMultiblock(World world, int x, int y, int z, double radius, Block block) {} - public void removeSextantMultiblock() { - // NO-OP - } + public void removeSextantMultiblock() {} public long getWorldElapsedTicks() { return FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0].getTotalWorldTime(); } - public void setSparkleFXNoClip(boolean noclip) { - // NO-OP - } + public void setSparkleFXNoClip(boolean noclip) {} - public void setSparkleFXCorrupt(boolean corrupt) { - // NO-OP - } + public void setSparkleFXCorrupt(boolean corrupt) {} public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m) { sparkleFX(world, x, y, z, r, g, b, size, m, false); } - public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m, boolean fake) { - // NO-OP - } + public void sparkleFX(World world, double x, double y, double z, float r, float g, float b, float size, int m, boolean fake) {} - public void setWispFXDistanceLimit(boolean limit) { - // NO-OP - } + public void setWispFXDistanceLimit(boolean limit) {} - public void setWispFXDepthTest(boolean depth) { - // NO-OP - } + public void setWispFXDepthTest(boolean depth) {} public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size) { wispFX(world, x, y, z, r, g, b, size, 0F); @@ -314,25 +292,17 @@ public class CommonProxy { wispFX(world, x, y, z, r, g, b, size, motionx, motiony, motionz, 1F); } - public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul) { - // NO-OP - } + public void wispFX(World world, double x, double y, double z, float r, float g, float b, float size, float motionx, float motiony, float motionz, float maxAgeMul) {} public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, int colorOuter, int colorInner) { lightningFX(world, vectorStart, vectorEnd, ticksPerMeter, System.nanoTime(), colorOuter, colorInner); } - public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) { - // NO-OP - } + public void lightningFX(World world, Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) {} - public void addBoss(IBotaniaBoss boss) { - // NO-OP - } + public void addBoss(IBotaniaBoss boss) {} - public void removeBoss(IBotaniaBoss boss) { - // NO-OP - } + public void removeBoss(IBotaniaBoss boss) {} public int getClientRenderDistance() { return 0; diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index 8806bbdbc..bea9c8c12 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -65,7 +65,7 @@ public class EntityFlameRing extends Entity { } if(worldObj.rand.nextInt(20) == 0) - worldObj.playSound(null, posX, posY, posZ, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.BLOCKS, 1F, 1F); + worldObj.playSound(posX, posY, posZ, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.BLOCKS, 1F, 1F, false); if(worldObj.isRemote) return; @@ -98,13 +98,8 @@ public class EntityFlameRing extends Entity { @Override - protected void readEntityFromNBT(@Nonnull NBTTagCompound var1) { - // NO-OP - } - + protected void readEntityFromNBT(@Nonnull NBTTagCompound var1) {} @Override - protected void writeEntityToNBT(@Nonnull NBTTagCompound var1) { - // NO-OP - } + protected void writeEntityToNBT(@Nonnull NBTTagCompound var1) {} } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java index 2699c292a..7da3b679d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlyingCreature.java @@ -26,14 +26,10 @@ public class EntityFlyingCreature extends EntityAmbientCreature { } @Override - public void fall(float dist, float damageMult) { - // NO-OP - } + public void fall(float dist, float damageMult) {} @Override - protected void updateFallState(double y, boolean onGround, @Nonnull IBlockState state, @Nonnull BlockPos pos) { - // NO-OP - } + protected void updateFallState(double y, boolean onGround, @Nonnull IBlockState state, @Nonnull BlockPos pos) {} @Override public void moveEntityWithHeading(float par1, float par2) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java index 5b9b0abe4..4049ae21e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java @@ -38,9 +38,7 @@ public class EntityManaStorm extends Entity { } @Override - protected void entityInit() { - // NO-OP - } + protected void entityInit() {} @Override public void onUpdate() { @@ -63,7 +61,7 @@ public class EntityManaStorm extends Entity { } } - public void spawnBurst() { + private void spawnBurst() { EntityManaBurst burst = new EntityManaBurst(worldObj); burst.setPosition(posX, posY, posZ); diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 54cbe1b57..fd10c6256 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -66,15 +66,10 @@ public class EntityPinkWither extends EntityWither { } @Override - protected void dropFewItems(boolean wasRecentlyHit, int lootingModifier) { - // NO-OP - } + protected void dropFewItems(boolean wasRecentlyHit, int lootingModifier) {} @Override - public void addTrackingPlayer(@Nonnull EntityPlayerMP player) - { - // NO-OP - } + public void addTrackingPlayer(@Nonnull EntityPlayerMP player) {} // COPYPASTA diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 56479bc42..ab03c2bd8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -200,9 +200,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet } @Override - public void apply(ItemStack stack, BurstProperties props) { - // NO-OP - } + public void apply(ItemStack stack, BurstProperties props) {} @Override public boolean collideBurst(IManaBurst burst, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index d81c544fc..c5c847677 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -212,9 +212,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte } @Override - public void recieveMana(int mana) { - // NO-OP - } + public void recieveMana(int mana) {} @Override public boolean canRecieveManaFromBursts() { 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 f4ab4bd26..f8be37bb8 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 @@ -148,14 +148,10 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt } } - public void onEquippedOrLoadedIntoWorld(ItemStack stack, EntityLivingBase player) { - // NO-OP - } + public void onEquippedOrLoadedIntoWorld(ItemStack stack, EntityLivingBase player) {} @Override - public void onUnequipped(ItemStack stack, EntityLivingBase player) { - // NO-OP - } + public void onUnequipped(ItemStack stack, EntityLivingBase player) {} @Override public ItemStack getCosmeticItem(ItemStack stack) { 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 a871f2229..34d9c668b 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 @@ -108,13 +108,9 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs return speed; } - public void onMovedTick(ItemStack stack, EntityPlayer player) { - // NO-OP - } + public void onMovedTick(ItemStack stack, EntityPlayer player) {} - public void onNotMovingTick(ItemStack stack, EntityPlayer player) { - // NO-OP - } + public void onNotMovingTick(ItemStack stack, EntityPlayer player) {} @SubscribeEvent public void onPlayerJump(LivingJumpEvent event) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java index fa1e5ec27..f19ee6299 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java @@ -106,9 +106,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I } @Override - public void apply(ItemStack stack, BurstProperties props) { - // NO-OP - } + public void apply(ItemStack stack, BurstProperties props) {} @Override public boolean collideBurst(IManaBurst burst, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/lens/Lens.java b/src/main/java/vazkii/botania/common/item/lens/Lens.java index 2f66541c9..544ea8450 100644 --- a/src/main/java/vazkii/botania/common/item/lens/Lens.java +++ b/src/main/java/vazkii/botania/common/item/lens/Lens.java @@ -19,29 +19,21 @@ import vazkii.botania.api.mana.IManaSpreader; public class Lens { - public void apply(ItemStack stack, BurstProperties props) { - // NO-OP - } + public void apply(ItemStack stack, BurstProperties props) {} public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { return dead; } - public void updateBurst(IManaBurst burst, EntityThrowable entity, ItemStack stack) { - // NO-OP - } + public void updateBurst(IManaBurst burst, EntityThrowable entity, ItemStack stack) {} public boolean allowBurstShooting(ItemStack stack, IManaSpreader spreader, boolean redstone) { return true; } - public void onControlledSpreaderTick(ItemStack stack, IManaSpreader spreader, boolean redstone) { - // NO-OP - } + public void onControlledSpreaderTick(ItemStack stack, IManaSpreader spreader, boolean redstone) {} - public void onControlledSpreaderPulse(ItemStack stack, IManaSpreader spreader, boolean redstone) { - // NO-OP - } + public void onControlledSpreaderPulse(ItemStack stack, IManaSpreader spreader, boolean redstone) {} } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java deleted file mode 100644 index 3a235b3c0..000000000 --- a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java +++ /dev/null @@ -1,189 +0,0 @@ -/** - * 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 the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Mar 29, 2015, 10:12:50 PM (GMT)] - */ -package vazkii.botania.common.item.relic; - -/* -public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEffect { - - private static final String TAG_ATTACKER_USERNAME = "attackerUsername"; - private static final String TAG_HOME_ID = "homeID"; - - public static ToolMaterial toolMaterial = EnumHelper.addToolMaterial("B_EXCALIBER", 3, -1, 6.2F, 6F, 40); - - Achievement achievement; - - public ItemExcaliber() { - super(toolMaterial, LibItemNames.EXCALIBER); - } - - @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) { - if(par3Entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) par3Entity; - ItemRelic.updateRelic(par1ItemStack, player); - if(ItemRelic.isRightPlayer(player, par1ItemStack)) { - PotionEffect haste = player.getActivePotionEffect(Potion.digSpeed); - float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F; - - if(player.getCurrentEquippedItem() == par1ItemStack && player.swingProgress == check && !par2World.isRemote) { - EntityManaBurst burst = getBurst(player, par1ItemStack); - par2World.spawnEntityInWorld(burst); - par2World.playSoundAtEntity(player, "botania:terraBlade", 0.4F, 1.4F); - } - } - } - } - - @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { - ItemRelic.addBindInfo(p_77624_3_, p_77624_1_, p_77624_2_); - } - - @Override - public void bindToUsername(String playerName, ItemStack stack) { - ItemRelic.bindToUsernameS(playerName, stack); - } - - @Override - public String getSoulbindUsername(ItemStack stack) { - return ItemRelic.getSoulbindUsernameS(stack); - } - - @Override - public Achievement getBindAchievement() { - return achievement; - } - - @Override - public void setBindAchievement(Achievement achievement) { - this.achievement = achievement; - } - - @Override - public boolean usesMana(ItemStack stack) { - return false; - } - - @Override - public boolean isItemTool(ItemStack p_77616_1_) { - return true; - } - - @Override - public int getEntityLifespan(ItemStack itemStack, World world) { - return Integer.MAX_VALUE; - } - - @Override - public Multimap getItemAttributeModifiers() { - Multimap multimap = HashMultimap.create(); - multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(itemModifierUUID, "Weapon modifier", 10, 0)); - multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(itemModifierUUID, "Weapon modifier", 0.3, 1)); - return multimap; - } - - public EntityManaBurst getBurst(EntityPlayer player, ItemStack stack) { - EntityManaBurst burst = new EntityManaBurst(player); - - float motionModifier = 7F; - - burst.setColor(0xFFFF20); - burst.setMana(1); - burst.setStartingMana(1); - burst.setMinManaLoss(200); - burst.setManaLossPerTick(1F); - burst.setGravity(0F); - burst.setMotion(burst.motionX * motionModifier, burst.motionY * motionModifier, burst.motionZ * motionModifier); - - ItemStack lens = stack.copy(); - ItemNBTHelper.setString(lens, TAG_ATTACKER_USERNAME, player.getName()); - burst.setSourceLens(lens); - return burst; - } - - @Override - public void apply(ItemStack stack, BurstProperties props) { - // NO-OP - } - - @Override - public boolean collideBurst(IManaBurst burst, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { - return dead; - } - - @Override - public void updateBurst(IManaBurst burst, ItemStack stack) { - EntityThrowable entity = (EntityThrowable) burst; - AxisAlignedBB axis = new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(1, 1, 1); - - String attacker = ItemNBTHelper.getString(burst.getSourceLens(), TAG_ATTACKER_USERNAME, ""); - int homeID = ItemNBTHelper.getInt(stack, TAG_HOME_ID, -1); - if(homeID == -1) { - AxisAlignedBB axis1 = new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(5, 5, 5); - List entities = entity.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis1); - for(EntityLivingBase living : entities) { - if(living instanceof EntityPlayer || living instanceof IBossDisplayData || !(living instanceof IMob) || living.hurtTime != 0) - continue; - - homeID = living.getEntityId(); - ItemNBTHelper.setInt(stack, TAG_HOME_ID, homeID); - break; - } - } - - List entities = entity.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis); - - if(homeID != -1) { - Entity home = entity.worldObj.getEntityByID(homeID); - if(home != null) { - Vector3 vecEntity = Vector3.fromEntityCenter(home); - Vector3 vecThis = Vector3.fromEntityCenter(entity); - Vector3 vecMotion = vecEntity.sub(vecThis); - Vector3 vecCurrentMotion = new Vector3(entity.motionX, entity.motionY, entity.motionZ); - - vecMotion.normalize().multiply(vecCurrentMotion.mag()); - burst.setMotion(vecMotion.x, vecMotion.y, vecMotion.z); - } - } - - for(EntityLivingBase living : entities) { - if(living instanceof EntityPlayer && (((EntityPlayer) living).getName().equals(attacker) || MinecraftServer.getServer() != null && !MinecraftServer.getServer().isPVPEnabled())) - continue; - - if(living.hurtTime == 0) { - int cost = 1; - int mana = burst.getMana(); - if(mana >= cost) { - burst.setMana(mana - cost); - float damage = 4F + toolMaterial.getDamageVsEntity(); - if(!burst.isFake() && !entity.worldObj.isRemote) { - EntityPlayer player = living.worldObj.getPlayerEntityByName(attacker); - living.attackEntityFrom(player == null ? DamageSource.magic : DamageSource.causePlayerDamage(player), damage); - entity.setDead(); - break; - } - } - } - } - } - - @Override - public boolean doParticles(IManaBurst burst, ItemStack stack) { - return true; - } - - @Override - public EnumRarity getRarity(ItemStack p_77613_1_) { - return BotaniaAPI.rarityRelic; - } - -} -*/ diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 20a7e4f4e..9e4690736 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -65,9 +65,7 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { dummy.addBindInfo(stacks, par1ItemStack, player); } - public void onValidPlayerWornTick(ItemStack stack, EntityPlayer player) { - // NO-OP - } + public void onValidPlayerWornTick(ItemStack stack, EntityPlayer player) {} @Override public boolean canEquip(ItemStack stack, EntityLivingBase player) { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index 5966ea453..d0ef3ae09 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -94,9 +94,7 @@ public class PageRecipe extends LexiconPage { } @SideOnly(Side.CLIENT) - public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { - // NO-OP - } + public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) {} @SideOnly(Side.CLIENT) public void renderItemAtAngle(IGuiLexiconEntry gui, float angle, ItemStack stack) {