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 008b20a7d..037f0a538 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -31,13 +31,15 @@ import java.util.WeakHashMap; public final class BossBarHandler { + private BossBarHandler() {} + // Only access on the client thread! public static final Set bosses = Collections.newSetFromMap(new WeakHashMap<>()); public static final ResourceLocation defaultBossBar = new ResourceLocation(LibResources.GUI_BOSS_BAR); private static final BarCallback barUniformCallback = new BarCallback(); @SubscribeEvent - public void onBarRender(RenderGameOverlayEvent.BossInfo evt) { + public static void onBarRender(RenderGameOverlayEvent.BossInfo evt) { UUID infoUuid = evt.getBossInfo().getUniqueId(); for(IBotaniaBoss currentBoss : bosses) { if(currentBoss.getBossInfoUuid().equals(infoUuid)) { diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 10f442d30..db585084f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -39,8 +39,10 @@ import java.util.List; public final class BoundTileRenderer { + private BoundTileRenderer() {} + @SubscribeEvent - public void onWorldRenderLast(RenderWorldLastEvent event) { + public static void onWorldRenderLast(RenderWorldLastEvent event) { GlStateManager.pushMatrix(); GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); GlStateManager.disableDepth(); @@ -89,11 +91,11 @@ public final class BoundTileRenderer { GlStateManager.popMatrix(); } - private void renderBlockOutlineAt(BlockPos pos, int color) { + private static void renderBlockOutlineAt(BlockPos pos, int color) { renderBlockOutlineAt(pos, color, 1F); } - private void renderBlockOutlineAt(BlockPos pos, int color, float thickness) { + private static void renderBlockOutlineAt(BlockPos pos, int color, float thickness) { double renderPosX, renderPosY, renderPosZ; try { @@ -140,7 +142,7 @@ public final class BoundTileRenderer { GlStateManager.popMatrix(); } - private void renderBlockOutline(AxisAlignedBB aabb) { + private static void renderBlockOutline(AxisAlignedBB aabb) { Tessellator tessellator = Tessellator.getInstance(); double ix = aabb.minX; diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 3807efc2c..8d2f897cd 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -28,7 +28,9 @@ import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ModItems; -public class ClientTickHandler { +public final class ClientTickHandler { + + private ClientTickHandler() {} public static int ticksWithLexicaOpen = 0; public static int pageFlipTicks = 0; @@ -37,14 +39,14 @@ public class ClientTickHandler { public static float delta = 0; public static float total = 0; - private void calcDelta() { + private static void calcDelta() { float oldTotal = total; total = ticksInGame + partialTicks; delta = total - oldTotal; } @SubscribeEvent - public void renderTick(RenderTickEvent event) { + public static void renderTick(RenderTickEvent event) { if(event.phase == Phase.START) partialTicks = event.renderTickTime; else { @@ -54,7 +56,7 @@ public class ClientTickHandler { } @SubscribeEvent - public void clientTickEnd(ClientTickEvent event) { + public static void clientTickEnd(ClientTickEvent event) { if(event.phase == Phase.END) { RedStringRenderer.tick(); ItemsRemainingRenderHandler.tick(); diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index ab62a71ce..210341701 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -31,10 +31,12 @@ import java.util.UUID; public final class DebugHandler { + private DebugHandler() {} + private static final String PREFIX = TextFormatting.GREEN + "[Botania] " + TextFormatting.RESET; @SubscribeEvent - public void onDrawDebugText(RenderGameOverlayEvent.Text event) { + public static void onDrawDebugText(RenderGameOverlayEvent.Text event) { World world = Minecraft.getMinecraft().theWorld; if(Minecraft.getMinecraft().gameSettings.showDebugInfo) { event.getLeft().add(null); 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 cc0ca7e53..c6c1c83c4 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -70,10 +70,12 @@ import java.awt.*; public final class HUDHandler { + private HUDHandler() {} + public static final ResourceLocation manaBar = new ResourceLocation(LibResources.GUI_MANA_HUD); @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onDrawScreenPre(RenderGameOverlayEvent.Pre event) { + public static void onDrawScreenPre(RenderGameOverlayEvent.Pre event) { Minecraft mc = Minecraft.getMinecraft(); Profiler profiler = mc.mcProfiler; @@ -90,7 +92,7 @@ public final class HUDHandler { } @SubscribeEvent - public void onDrawScreenPost(RenderGameOverlayEvent.Post event) { + public static void onDrawScreenPost(RenderGameOverlayEvent.Post event) { Minecraft mc = Minecraft.getMinecraft(); Profiler profiler = mc.mcProfiler; ItemStack main = mc.thePlayer.getHeldItemMainhand(); @@ -221,7 +223,7 @@ public final class HUDHandler { } } - private void renderWandModeDisplay(ItemStack stack, ScaledResolution res) { + private static void renderWandModeDisplay(ItemStack stack, ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); Profiler profiler = mc.mcProfiler; @@ -244,7 +246,7 @@ public final class HUDHandler { profiler.endSection(); } - private void renderManaInvBar(ScaledResolution res, boolean hasCreative, int totalMana, int totalMaxMana) { + private static void renderManaInvBar(ScaledResolution res, boolean hasCreative, int totalMana, int totalMaxMana) { Minecraft mc = Minecraft.getMinecraft(); int width = 182; int x = res.getScaledWidth() / 2 - width / 2; @@ -273,7 +275,7 @@ public final class HUDHandler { GL11.glColor4ub(((byte) 255), ((byte) 255), ((byte) 255), ((byte) 255)); } - private void renderPoolRecipeHUD(ScaledResolution res, TilePool tile, ItemStack stack) { + private static void renderPoolRecipeHUD(ScaledResolution res, TilePool tile, ItemStack stack) { Minecraft mc = Minecraft.getMinecraft(); Profiler profiler = mc.mcProfiler; @@ -305,7 +307,7 @@ public final class HUDHandler { profiler.endSection(); } - private void renderCrystalCubeHUD(ScaledResolution res, TileCorporeaCrystalCube tile) { + private static void renderCrystalCubeHUD(ScaledResolution res, TileCorporeaCrystalCube tile) { Minecraft mc = Minecraft.getMinecraft(); Profiler profiler = mc.mcProfiler; @@ -331,7 +333,7 @@ public final class HUDHandler { profiler.endSection(); } - private void drawLexiconHUD(ItemStack stack, IBlockState state, RayTraceResult pos, ScaledResolution res) { + private static void drawLexiconHUD(ItemStack stack, IBlockState state, RayTraceResult pos, ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); Block block = state.getBlock(); Profiler profiler = mc.mcProfiler; @@ -398,7 +400,7 @@ public final class HUDHandler { profiler.endSection(); } - private void renderNearIndexDisplay(ScaledResolution res) { + private static void renderNearIndexDisplay(ScaledResolution res) { Minecraft mc = Minecraft.getMinecraft(); String txt0 = I18n.format("botaniamisc.nearIndex0"); String txt1 = TextFormatting.GRAY + I18n.format("botaniamisc.nearIndex1"); 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 1bba39526..a14cb4bd9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -30,13 +30,15 @@ import java.util.Deque; public class LightningHandler { + private LightningHandler() {} + private static final int BATCH_THRESHOLD = 200; private static final ResourceLocation outsideResource = new ResourceLocation(LibResources.MISC_WISP_LARGE); private static final ResourceLocation insideResource = new ResourceLocation(LibResources.MISC_WISP_SMALL); public static final Deque queuedLightningBolts = new ArrayDeque<>(); @SubscribeEvent - public void onRenderWorldLast(RenderWorldLastEvent event) { + public static void onRenderWorldLast(RenderWorldLastEvent event) { Profiler profiler = Minecraft.getMinecraft().mcProfiler; profiler.startSection("botania-particles"); diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index 9c9c2f74b..47c8add7f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -40,6 +40,8 @@ import vazkii.botania.common.block.ModBlocks; public final class MultiblockRenderHandler { + private MultiblockRenderHandler() {} + private static final MultiblockBlockAccess blockAccess = new MultiblockBlockAccess(); private static int dimension; @@ -79,7 +81,7 @@ public final class MultiblockRenderHandler { } @SubscribeEvent - public void onWorldRenderLast(RenderWorldLastEvent event) { + public static void onWorldRenderLast(RenderWorldLastEvent event) { Minecraft mc = Minecraft.getMinecraft(); if(mc.thePlayer != null && mc.objectMouseOver != null && mc.objectMouseOver.getBlockPos() != null && (!mc.thePlayer.isSneaking() || anchor != null)) { renderPlayerLook(mc.thePlayer, mc.objectMouseOver); @@ -87,7 +89,7 @@ public final class MultiblockRenderHandler { } @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { + public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { if(currentMultiblock != null && anchor == null && event.getEntityPlayer() == Minecraft.getMinecraft().thePlayer) { anchor = event.getPos(); angle = event.getEntityPlayer().getHorizontalFacing(); @@ -95,7 +97,7 @@ public final class MultiblockRenderHandler { } } - private void renderPlayerLook(EntityPlayer player, RayTraceResult src) { + private static void renderPlayerLook(EntityPlayer player, RayTraceResult src) { if(currentMultiblock != null && dimension == player.worldObj.provider.getDimension()) { BlockPos anchorPos = anchor != null ? anchor : src.getBlockPos(); @@ -133,7 +135,7 @@ public final class MultiblockRenderHandler { } } - private boolean renderComponentInWorld(World world, Multiblock mb, MultiblockComponent comp, BlockPos anchorPos) { + private static boolean renderComponentInWorld(World world, Multiblock mb, MultiblockComponent comp, BlockPos anchorPos) { double renderPosX, renderPosY, renderPosZ; try { diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index ea9402843..914c2ade6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -34,8 +34,10 @@ import java.awt.*; public final class SubTileRadiusRenderHandler { + private SubTileRadiusRenderHandler() {} + @SubscribeEvent - public void onWorldRenderLast(RenderWorldLastEvent event) { + public static void onWorldRenderLast(RenderWorldLastEvent event) { Minecraft mc = Minecraft.getMinecraft(); RayTraceResult pos = mc.objectMouseOver; @@ -79,7 +81,7 @@ public final class SubTileRadiusRenderHandler { GlStateManager.popMatrix(); } - private void renderRectangle(AxisAlignedBB aabb) { + private static void renderRectangle(AxisAlignedBB aabb) { double renderPosX, renderPosY, renderPosZ; try { @@ -124,7 +126,7 @@ public final class SubTileRadiusRenderHandler { GlStateManager.popMatrix(); } - private void renderCircle(BlockPos center, double radius) { + private static void renderCircle(BlockPos center, double radius) { double renderPosX, renderPosY, renderPosZ; try { diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java index e0011b70d..57199cec6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -23,7 +23,7 @@ import vazkii.botania.common.item.ItemRegenIvy; public final class TooltipHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onTooltipEvent(ItemTooltipEvent event) { + public static void onTooltipEvent(ItemTooltipEvent event) { if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.DIRT) && event.getItemStack().getItemDamage() == 1) { event.getToolTip().add(I18n.format("botaniamisc.coarseDirt0")); event.getToolTip().add(I18n.format("botaniamisc.coarseDirt1")); 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 b36b10528..e9d82f2bc 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -199,24 +199,24 @@ public class ClientProxy extends CommonProxy { ModChallenges.init(); - MinecraftForge.EVENT_BUS.register(new ClientTickHandler()); - MinecraftForge.EVENT_BUS.register(new HUDHandler()); - MinecraftForge.EVENT_BUS.register(new LightningHandler()); + MinecraftForge.EVENT_BUS.register(ClientTickHandler.class); + MinecraftForge.EVENT_BUS.register(HUDHandler.class); + MinecraftForge.EVENT_BUS.register(LightningHandler.class); if(ConfigHandler.boundBlockWireframe) - MinecraftForge.EVENT_BUS.register(new BoundTileRenderer()); - MinecraftForge.EVENT_BUS.register(new TooltipHandler()); - MinecraftForge.EVENT_BUS.register(new DebugHandler()); - MinecraftForge.EVENT_BUS.register(new SubTileRadiusRenderHandler()); - MinecraftForge.EVENT_BUS.register(new MultiblockRenderHandler()); - MinecraftForge.EVENT_BUS.register(new SkyblockRenderEvents()); + MinecraftForge.EVENT_BUS.register(BoundTileRenderer.class); + MinecraftForge.EVENT_BUS.register(TooltipHandler.class); + MinecraftForge.EVENT_BUS.register(DebugHandler.class); + MinecraftForge.EVENT_BUS.register(SubTileRadiusRenderHandler.class); + MinecraftForge.EVENT_BUS.register(MultiblockRenderHandler.class); + MinecraftForge.EVENT_BUS.register(SkyblockRenderEvents.class); MinecraftForge.EVENT_BUS.register(new RenderLexicon()); - MinecraftForge.EVENT_BUS.register(new BossBarHandler()); - MinecraftForge.EVENT_BUS.register(new BergamuteEventHandler()); + MinecraftForge.EVENT_BUS.register(BossBarHandler.class); + MinecraftForge.EVENT_BUS.register(BergamuteEventHandler.class); if(ConfigHandler.useAdaptativeConfig) - MinecraftForge.EVENT_BUS.register(new AdaptorNotifier()); + MinecraftForge.EVENT_BUS.register(AdaptorNotifier.class); if(ConfigHandler.versionCheckEnabled) - new VersionChecker().init(); + VersionChecker.init(); if(ConfigHandler.enableSeasonalFeatures) { LocalDateTime now = LocalDateTime.now(); diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java index 639dbfd6e..983fe27cb 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java @@ -20,7 +20,7 @@ import vazkii.botania.common.world.WorldTypeSkyblock; public final class SkyblockRenderEvents { @SubscribeEvent - public void onRender(RenderWorldLastEvent event) { + public static void onRender(RenderWorldLastEvent event) { World world = Minecraft.getMinecraft().theWorld; if(ConfigHandler.enableFancySkybox && world.provider.getDimension() == 0 && (ConfigHandler.enableFancySkyboxInNormalWorlds || WorldTypeSkyblock.isWorldSkyblock(Minecraft.getMinecraft().theWorld))) { if(!(world.provider.getSkyRenderer() instanceof SkyblockSkyRenderer)) diff --git a/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java b/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java index e5c32613e..3605f7159 100644 --- a/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java +++ b/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java @@ -18,8 +18,10 @@ import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemPickupEvent; public final class AchievementTriggerer { + private AchievementTriggerer() {} + @SubscribeEvent - public void onItemPickedUp(ItemPickupEvent event) { + public static void onItemPickedUp(ItemPickupEvent event) { ItemStack stack = event.pickedUp.getEntityItem(); if(stack != null && stack.getItem() instanceof IPickupAchievement) { Achievement achievement = ((IPickupAchievement) stack.getItem()).getAchievementOnPickup(stack, event.player, event.pickedUp); @@ -29,7 +31,7 @@ public final class AchievementTriggerer { } @SubscribeEvent - public void onItemCrafted(ItemCraftedEvent event) { + public static void onItemCrafted(ItemCraftedEvent event) { if(event.crafting != null && event.crafting.getItem() instanceof ICraftAchievement) { Achievement achievement = ((ICraftAchievement) event.crafting.getItem()).getAchievementOnCraft(event.crafting, event.player, event.craftMatrix); if(achievement != null) diff --git a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java index 40cdd5f06..82606ae69 100644 --- a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java +++ b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java @@ -157,7 +157,7 @@ public final class ModAchievements { botaniaPage = new AchievementPage(LibMisc.MOD_NAME, AchievementMod.achievements.toArray(new Achievement[AchievementMod.achievements.size()])); AchievementPage.registerAchievementPage(botaniaPage); - MinecraftForge.EVENT_BUS.register(new AchievementTriggerer()); + MinecraftForge.EVENT_BUS.register(AchievementTriggerer.class); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index e2827a337..9c600aaa4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -42,7 +42,6 @@ public class BlockBifrost extends BlockMod implements ILexiconable { setLightLevel(1F); setBlockUnbreakable(); setSoundType(SoundType.GLASS); - MinecraftForge.EVENT_BUS.register(this); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index f6ab2b843..4fcb1771f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -43,7 +43,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { super(Material.GOURD, LibBlockNames.FEL_PUMPKIN); setHardness(1F); setSoundType(SoundType.WOOD); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(BlockFelPumpkin.class); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @@ -88,7 +88,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { } @SubscribeEvent - public void onDrops(LivingDropsEvent event) { + public static void onDrops(LivingDropsEvent event) { if(event.getEntityLiving() instanceof EntityBlaze && event.getEntityLiving().getEntityData().getBoolean(TAG_FEL_SPAWNED)) if(event.getDrops().isEmpty()) event.getDrops().add(new EntityItem(event.getEntityLiving().worldObj, event.getEntityLiving().posX, event.getEntityLiving().posY, event.getEntityLiving().posZ, new ItemStack(Items.BLAZE_POWDER, 6))); diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index e8ea87f9c..690eebdbb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -46,7 +46,7 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { GameRegistry.register(this, new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GHOST_RAIL)); GameRegistry.register(new ItemBlockMod(this), getRegistryName()); setUnlocalizedName(LibBlockNames.GHOST_RAIL); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(BlockGhostRail.class); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.NORTH_SOUTH)); } @@ -68,14 +68,14 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable { } @SubscribeEvent - public void onMinecartUpdate(MinecartUpdateEvent event) { + public static void onMinecartUpdate(MinecartUpdateEvent event) { BlockPos entPos = new BlockPos(event.getEntity()); IBlockState state = event.getEntity().worldObj.getBlockState(entPos); Block block = state.getBlock(); boolean air = block.isAir(state, event.getEntity().worldObj, entPos); int floatTicks = event.getEntity().getEntityData().getInteger(TAG_FLOAT_TICKS); - if(block == this) + if(block == ModBlocks.ghostRail) event.getEntity().getEntityData().setInteger(TAG_FLOAT_TICKS, 20); else if(block instanceof BlockRailBase || block == ModBlocks.dreamwood) { event.getEntity().getEntityData().setInteger(TAG_FLOAT_TICKS, 0); 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 64b843dc5..0a9d79e2c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java @@ -35,6 +35,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -53,7 +54,7 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { setHardness(0.6F); setSoundType(SoundType.GROUND); useNeighborBrightness = true; - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(BlockDirtPath.class); } @Override @@ -113,11 +114,11 @@ public class BlockDirtPath extends BlockMod implements ILexiconable { } @SubscribeEvent - public void onTickEnd(TickEvent.WorldTickEvent event) { + public static void onTickEnd(TickEvent.WorldTickEvent event) { if(event.world.isRemote || event.phase != TickEvent.Phase.END) return; for(EntityPlayerMP player : event.world.getPlayers(EntityPlayerMP.class, p -> p.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).hasModifier(speedBoost))) { - if (event.world.getBlockState(new BlockPos(player).down()).getBlock() != this) { + if (event.world.getBlockState(new BlockPos(player).down()).getBlock() != ModBlocks.dirtPath) { player.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).removeModifier(speedBoost); } } // todo 1.8 there's probably a better way to do this. diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 6bd123d34..682984cfb 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -31,7 +31,7 @@ public class BlockRedStringInterceptor extends BlockRedString { public BlockRedStringInterceptor() { super(LibBlockNames.RED_STRING_INTERCEPTOR); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(BlockRedStringInterceptor.class); setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false)); } @@ -62,7 +62,7 @@ public class BlockRedStringInterceptor extends BlockRedString { } @SubscribeEvent - public void onInteract(PlayerInteractEvent.RightClickBlock event) { + public static void onInteract(PlayerInteractEvent.RightClickBlock event) { TileRedStringInterceptor.onInteract(event.getEntityPlayer(), event.getWorld(), event.getPos(), event.getHand()); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java index c18dee15f..2c290ee59 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java @@ -21,11 +21,14 @@ import java.util.Random; @SideOnly(Side.CLIENT) public class BergamuteEventHandler { + + private BergamuteEventHandler() {} + private static final Random RAND = new Random(); private static final float MULTIPLIER = 0.15F; @SubscribeEvent(priority = EventPriority.LOWEST) - public void onSoundEvent(PlaySoundEvent evt) { + public static void onSoundEvent(PlaySoundEvent evt) { ISound sound = evt.getResultSound(); if (sound != null && shouldSilence(sound.getCategory())) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index b56f64e30..a622e8b96 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -39,7 +39,7 @@ public class SubTileVinculotus extends SubTileFunctional { if(!supertile.getWorld().isRemote && !existingFlowers.contains(this)) { existingFlowers.add(this); if(!registered) { - MinecraftForge.EVENT_BUS.register(new EndermanIntercepter()); + MinecraftForge.EVENT_BUS.register(EndermanIntercepter.class); registered = true; } } @@ -73,7 +73,7 @@ public class SubTileVinculotus extends SubTileFunctional { public static class EndermanIntercepter { @SubscribeEvent - public void onEndermanTeleport(EnderTeleportEvent event) { + public static void onEndermanTeleport(EnderTeleportEvent event) { int cost = 50; if(event.getEntityLiving() instanceof EntityEnderman) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java index 4c0a6a77c..b7d4f18d7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java @@ -89,7 +89,7 @@ public class SubTileNarslimmus extends SubTileGenerating { public static class SpawnIntercepter { @SubscribeEvent - public void onSpawn(LivingSpawnEvent.CheckSpawn event) { + public static void onSpawn(LivingSpawnEvent.CheckSpawn event) { if(event.getEntityLiving() instanceof EntitySlime && event.getResult() != Result.DENY && isSlimeChunk(event.getEntityLiving().worldObj, MathHelper.floor_double(event.getX()), MathHelper.floor_double(event.getZ()))) event.getEntityLiving().getEntityData().setBoolean(TAG_WORLD_SPAWNED, true); } 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 b1760de21..7e420810c 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -26,10 +26,12 @@ import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; -public class BiomeDecorationHandler { +public final class BiomeDecorationHandler { + + private BiomeDecorationHandler() {} @SubscribeEvent(priority = EventPriority.LOWEST) - public void onWorldDecoration(DecorateBiomeEvent.Decorate event) { + public static void onWorldDecoration(DecorateBiomeEvent.Decorate event) { if((event.getResult() == Result.ALLOW || event.getResult() == Result.DEFAULT) && event.getType() == EventType.FLOWERS) { boolean flowers = true; if(event.getWorld().provider instanceof IFlowerlessWorld) diff --git a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java index 2bb5c6e91..f816b37f8 100644 --- a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java @@ -17,8 +17,10 @@ import vazkii.botania.api.corporea.CorporeaHelper; public final class CommonTickHandler { + private CommonTickHandler() {} + @SubscribeEvent - public void onTick(WorldTickEvent event) { + public static void onTick(WorldTickEvent event) { if(event.phase == Phase.END) { CorporeaHelper.clearCache(); } 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 16d5ccb6d..cce9c2bb1 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -102,7 +102,7 @@ public final class ConfigHandler { config.load(); load(); - MinecraftForge.EVENT_BUS.register(new ChangeListener()); + MinecraftForge.EVENT_BUS.register(ChangeListener.class); } public static void load() { @@ -436,7 +436,7 @@ public final class ConfigHandler { public static class ChangeListener { @SubscribeEvent - public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent eventArgs) { + public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent eventArgs) { if(eventArgs.getModID().equals(LibMisc.MOD_ID)) load(); } diff --git a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java index a4b91cc80..c46996666 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -16,7 +16,9 @@ import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; -public class PixieHandler { +public final class PixieHandler { + + private PixieHandler() {} private static final Potion[] potions = { MobEffects.BLINDNESS, @@ -26,7 +28,7 @@ public class PixieHandler { }; @SubscribeEvent - public void onDamageTaken(LivingHurtEvent event) { + public static void onDamageTaken(LivingHurtEvent event) { if(!event.getEntityLiving().worldObj.isRemote && event.getEntityLiving() instanceof EntityPlayer && event.getSource().getEntity() != null && event.getSource().getEntity() instanceof EntityLivingBase) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); ItemStack stack = PlayerHelper.getFirstHeldItemClass(player, IPixieSpawner.class); @@ -57,7 +59,7 @@ public class PixieHandler { } } - private float getChance(ItemStack stack) { + private static float getChance(ItemStack stack) { if(stack == null || !(stack.getItem() instanceof IPixieSpawner)) return 0F; else return ((IPixieSpawner) stack.getItem()).getPixieChance(stack); diff --git a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java index 017f45a73..c62c3c78b 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -38,11 +38,13 @@ import java.util.Map.Entry; public final class SheddingHandler { + private SheddingHandler() {} + private static final List patterns = new ArrayList<>(); private static final List defaultPatterns = new ArrayList<>(); @SubscribeEvent - public void onLivingUpdate(LivingUpdateEvent event) { + public static void onLivingUpdate(LivingUpdateEvent event) { if(event.getEntityLiving().worldObj.isRemote) return; 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 9b3e9019e..f69406110 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -131,18 +131,18 @@ public class CommonProxy { NetworkRegistry.INSTANCE.registerGuiHandler(Botania.instance, new GuiHandler()); - MinecraftForge.TERRAIN_GEN_BUS.register(new BiomeDecorationHandler()); + MinecraftForge.TERRAIN_GEN_BUS.register(BiomeDecorationHandler.class); MinecraftForge.EVENT_BUS.register(ManaNetworkHandler.instance); - MinecraftForge.EVENT_BUS.register(new PixieHandler()); - MinecraftForge.EVENT_BUS.register(new SheddingHandler()); - MinecraftForge.EVENT_BUS.register(new SubTileNarslimmus.SpawnIntercepter()); + MinecraftForge.EVENT_BUS.register(PixieHandler.class); + MinecraftForge.EVENT_BUS.register(SheddingHandler.class); + MinecraftForge.EVENT_BUS.register(SubTileNarslimmus.SpawnIntercepter.class); MinecraftForge.EVENT_BUS.register(TileCorporeaIndex.getInputHandler()); MinecraftForge.EVENT_BUS.register(new LootHandler()); if(Botania.gardenOfGlassLoaded) - MinecraftForge.EVENT_BUS.register(new SkyblockWorldEvents()); + MinecraftForge.EVENT_BUS.register(SkyblockWorldEvents.class); - MinecraftForge.EVENT_BUS.register(new CommonTickHandler()); + MinecraftForge.EVENT_BUS.register(CommonTickHandler.class); FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName()); diff --git a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java b/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java index 8bb8af6e6..ca406f7f7 100644 --- a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java +++ b/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java @@ -18,10 +18,12 @@ import vazkii.botania.common.core.handler.ConfigHandler; public final class AdaptorNotifier { - private boolean triedToWarnPlayer; + private AdaptorNotifier() {} + + private static boolean triedToWarnPlayer; @SubscribeEvent - public void onTick(ClientTickEvent event) { + public static void onTick(ClientTickEvent event) { if(!triedToWarnPlayer && Minecraft.getMinecraft().thePlayer != null) { EntityPlayer player = Minecraft.getMinecraft().thePlayer; ConfigHandler.adaptor.tellChanges(player); diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index 6593d2665..d3c5f90cb 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -25,6 +25,8 @@ import vazkii.botania.common.lib.LibMisc; public final class VersionChecker { + private VersionChecker() {} + private static final int FLAVOUR_MESSAGES = 65; public static boolean doneChecking = false; @@ -34,13 +36,13 @@ public final class VersionChecker { public static boolean startedDownload = false; public static boolean downloadedFile = false; - public void init() { + public static void init() { new ThreadVersionChecker(); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(VersionChecker.class); } @SubscribeEvent - public void onTick(ClientTickEvent event) { + public static void onTick(ClientTickEvent event) { if(doneChecking && event.phase == Phase.END && Minecraft.getMinecraft().thePlayer != null && !triedToWarnPlayer) { if(!onlineVersion.isEmpty()) { EntityPlayer player = Minecraft.getMinecraft().thePlayer; diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index 7b558b071..5182b7741 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -40,7 +40,7 @@ public class ItemKeepIvy extends ItemMod { super(LibItemNames.KEEP_IVY); GameRegistry.addRecipe(new KeepIvyRecipe()); RecipeSorter.register("botania:keepIvy", KeepIvyRecipe.class, Category.SHAPELESS, ""); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(ItemKeepIvy.class); } @SubscribeEvent @@ -78,7 +78,7 @@ public class ItemKeepIvy extends ItemMod { } @SubscribeEvent - public void onPlayerRespawn(PlayerRespawnEvent event) { + public static void onPlayerRespawn(PlayerRespawnEvent event) { NBTTagCompound data = event.player.getEntityData(); if(data.hasKey(EntityPlayer.PERSISTED_NBT_TAG)) { NBTTagCompound cmp = data.getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG); diff --git a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java index c71203ed3..a3de78fe2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemRegenIvy.java @@ -33,11 +33,11 @@ public class ItemRegenIvy extends ItemMod { super(LibItemNames.REGEN_IVY); GameRegistry.addRecipe(new RegenIvyRecipe()); RecipeSorter.register("botania:regenIvy", RegenIvyRecipe.class, Category.SHAPELESS, ""); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(ItemRegenIvy.class); } @SubscribeEvent(priority = EventPriority.LOWEST) - public void onTick(PlayerTickEvent event) { + public static void onTick(PlayerTickEvent event) { if(event.phase == Phase.END && !event.player.worldObj.isRemote) for(int i = 0; i < event.player.inventory.getSizeInventory(); i++) { ItemStack stack = event.player.inventory.getStackInSlot(i); diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 2fec7b3d6..b7faf644f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -48,7 +48,7 @@ public class ItemVirus extends ItemMod { public ItemVirus() { super(LibItemNames.VIRUS); setHasSubtypes(true); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(ItemVirus.class); } @Override @@ -96,7 +96,7 @@ public class ItemVirus extends ItemMod { } @SubscribeEvent - public void onLivingHurt(LivingHurtEvent event) { + public static void onLivingHurt(LivingHurtEvent event) { EntityLivingBase entity = event.getEntityLiving(); if(entity.isRiding() && entity.getRidingEntity() instanceof EntityLivingBase) entity = (EntityLivingBase) entity.getRidingEntity(); 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 8d703eccf..c0a4d38c0 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -62,11 +62,11 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat public ItemLokiRing() { super(LibItemNames.LOKI_RING); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(ItemLokiRing.class); } @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { + public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { EntityPlayer player = event.getEntityPlayer(); ItemStack lokiRing = getLokiRing(player); if(lokiRing == null || player.worldObj.isRemote) diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index ad7e66e41..700a6d181 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -39,7 +39,7 @@ public class ItemOdinRing extends ItemRelicBauble { public ItemOdinRing() { super(LibItemNames.ODIN_RING); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(ItemOdinRing.class); damageNegations.add(DamageSource.drown.damageType); damageNegations.add(DamageSource.fall.damageType); @@ -60,7 +60,7 @@ public class ItemOdinRing extends ItemRelicBauble { } @SubscribeEvent - public void onPlayerAttacked(LivingAttackEvent event) { + public static void onPlayerAttacked(LivingAttackEvent event) { if(event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); if(getOdinRing(player) != null && damageNegations.contains(event.getSource().damageType)) diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 66c433eff..57452544e 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -37,6 +37,8 @@ import java.awt.*; public final class SkyblockWorldEvents { + private SkyblockWorldEvents() {} + private static final String TAG_MADE_ISLAND = "Botania-MadeIsland"; private static final String TAG_HAS_OWN_ISLAND = "Botania-HasOwnIsland"; private static final String TAG_ISLAND_X = "Botania-IslandX"; @@ -44,7 +46,7 @@ public final class SkyblockWorldEvents { private static final String TAG_ISLAND_Z = "Botania-IslandZ"; @SubscribeEvent - public void onPlayerUpdate(LivingUpdateEvent event) { + public static void onPlayerUpdate(LivingUpdateEvent event) { if(event.getEntityLiving() instanceof EntityPlayer && !event.getEntityLiving().worldObj.isRemote) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); NBTTagCompound data = player.getEntityData(); @@ -67,7 +69,7 @@ public final class SkyblockWorldEvents { } @SubscribeEvent - public void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { + public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { if(WorldTypeSkyblock.isWorldSkyblock(event.getWorld())) { ItemStack equipped = event.getItemStack(); if(equipped == null && event.getEntityPlayer().isSneaking()) { @@ -103,7 +105,7 @@ public final class SkyblockWorldEvents { } @SubscribeEvent - public void onDrops(BlockEvent.HarvestDropsEvent event) { + public static void onDrops(BlockEvent.HarvestDropsEvent event) { if(WorldTypeSkyblock.isWorldSkyblock(event.getWorld()) && event.getState().getBlock() == Blocks.TALLGRASS) { ItemStack stackToRemove = null; for(ItemStack stack : event.getDrops())