From d5732131d108fd846db1114c32b3de01e9bd9463 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 10 Dec 2017 20:11:28 -0600 Subject: [PATCH] Pass mod id to EventBusSubscriber. Apparently you're supposed to do this. --- .../core/handler/AstrolabePreviewHandler.java | 3 +- .../handler/BlockHighlightRenderHandler.java | 3 +- .../client/core/handler/BossBarHandler.java | 3 +- .../core/handler/ClientTickHandler.java | 3 +- .../client/core/handler/DebugHandler.java | 2 +- .../client/core/handler/HUDHandler.java | 3 +- .../client/core/handler/LightningHandler.java | 3 +- .../client/core/handler/ModelHandler.java | 2 +- .../core/handler/MultiblockRenderHandler.java | 3 +- .../client/core/handler/RenderLexicon.java | 3 +- .../TooltipAdditionDisplayHandler.java | 3 +- .../client/core/handler/TooltipHandler.java | 3 +- .../render/world/SkyblockRenderEvents.java | 3 +- .../botania/common/block/BlockFelPumpkin.java | 3 +- .../botania/common/block/BlockGhostRail.java | 2 +- .../botania/common/block/ModBlocks.java | 3 +- .../botania/common/block/ModFluffBlocks.java | 3 +- .../string/BlockRedStringInterceptor.java | 3 +- .../functional/BergamuteEventHandler.java | 3 +- .../subtile/functional/SubTileLoonuim.java | 24 ++++---- .../subtile/functional/SubTileVinculotus.java | 56 +++++++++---------- .../subtile/generating/SubTileNarslimmus.java | 23 ++++---- .../botania/common/brew/ModPotions.java | 3 +- .../core/handler/CommonTickHandler.java | 3 +- .../common/core/handler/ConfigHandler.java | 2 +- .../common/core/handler/ModSounds.java | 2 +- .../common/core/handler/PixieHandler.java | 3 +- .../common/core/handler/SheddingHandler.java | 3 +- .../common/core/version/VersionChecker.java | 2 +- .../common/crafting/ModCraftingRecipes.java | 2 +- .../vazkii/botania/common/item/ModItems.java | 3 +- .../item/block/ItemBlockSpecialFlower.java | 2 +- .../item/equipment/bauble/ItemDodgeRing.java | 3 +- .../equipment/bauble/ItemGoddessCharm.java | 3 +- .../common/item/relic/ItemLokiRing.java | 2 +- .../common/item/relic/ItemOdinRing.java | 2 +- 36 files changed, 102 insertions(+), 90 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java b/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java index d18449b09..b932e9541 100644 --- a/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java @@ -29,10 +29,11 @@ import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.item.ItemAstrolabe; +import vazkii.botania.common.lib.LibMisc; import java.util.List; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class AstrolabePreviewHandler { @SubscribeEvent diff --git a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java index 5b851eba6..ada5ba786 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java @@ -33,10 +33,11 @@ import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityMagicLandmine; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibMisc; import java.awt.Color; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class BlockHighlightRenderHandler { private BlockHighlightRenderHandler() {} 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 68292cf4c..6016d9690 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -24,6 +24,7 @@ import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.lib.LibMisc; import java.awt.Rectangle; import java.util.Collections; @@ -31,7 +32,7 @@ import java.util.Set; import java.util.UUID; import java.util.WeakHashMap; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class BossBarHandler { private BossBarHandler() {} 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 befd7ab2b..fb28c3c8b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -29,8 +29,9 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class ClientTickHandler { private ClientTickHandler() {} 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 4a96cc014..9dfc1e698 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -37,7 +37,7 @@ import java.util.Map; import java.util.Optional; import java.util.UUID; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class DebugHandler { private DebugHandler() {} 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 3c003a16e..9500d09d3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -70,6 +70,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemDodgeRing; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.equipment.bauble.ItemMonocle; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibObfuscation; import java.awt.Color; @@ -77,7 +78,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class HUDHandler { private HUDHandler() {} 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 02a72841c..14a092660 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -26,11 +26,12 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.fx.FXLightning; import vazkii.botania.client.fx.ParticleRenderDispatcher; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayDeque; import java.util.Deque; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public class LightningHandler { private LightningHandler() {} diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index b4dc14db2..56339af54 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -50,7 +50,7 @@ import java.util.Locale; import java.util.Map; import java.util.function.IntFunction; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class ModelHandler { @SubscribeEvent public static void registerModels(ModelRegistryEvent evt) { 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 056fd96f6..f4aa98edf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -40,8 +40,9 @@ import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class MultiblockRenderHandler { private MultiblockRenderHandler() {} diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index f94165c8d..5cda7ad7b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -23,9 +23,10 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.page.PageText; +import vazkii.botania.common.lib.LibMisc; // Hacky way to render 3D lexicon, will be reevaluated in the future. -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public class RenderLexicon { private static final ModelBook model = new ModelBook(); // todo 1.12 improve diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index 38af93ae8..93fe8de91 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -36,10 +36,11 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; +import vazkii.botania.common.lib.LibMisc; import java.awt.Color; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class TooltipAdditionDisplayHandler { private static float lexiconLookupTime = 0F; 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 236c82101..896959e9e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -18,8 +18,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; +import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class TooltipHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) 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 eb9135846..d14449785 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java @@ -17,9 +17,10 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.world.WorldTypeSkyblock; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class SkyblockRenderEvents { @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 5d188a5a0..17d77a61d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -36,10 +36,11 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class BlockFelPumpkin extends BlockMod implements ILexiconable { private static final String TAG_FEL_SPAWNED = "Botania-FelSpawned"; diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index d1c307043..f4d46e476 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -39,7 +39,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class BlockGhostRail extends BlockRailBase implements ILexiconable, IModelRegister { private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks"; diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index cc0f5bea8..d8de0131e 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -122,9 +122,10 @@ import vazkii.botania.common.item.block.ItemBlockStorage; import vazkii.botania.common.item.block.ItemBlockTinyPotato; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibOreDict; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class ModBlocks { public static final Block flower = new BlockModFlower(); public static final Block altar = new BlockAltar(); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index f2708309e..ec9ffc95d 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -60,12 +60,13 @@ import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; import java.util.Locale; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class ModFluffBlocks { public static List slabsToRegister = new ArrayList<>(); 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 eba6ff8d0..cb5f965d0 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -28,11 +28,12 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; import vazkii.botania.common.lib.LibBlockNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.Random; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class BlockRedStringInterceptor extends BlockRedString { public BlockRedStringInterceptor() { 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 2e46d292b..ab81b27dd 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 @@ -16,13 +16,14 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.block.tile.mana.TilePool; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.awt.Color; import java.util.Random; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public class BergamuteEventHandler { private BergamuteEventHandler() {} diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index a55782482..9fec08075 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -44,11 +44,13 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; import java.util.Collections; import java.util.List; import java.util.Random; +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class SubTileLoonuim extends SubTileFunctional { private static final int COST = 35000; @@ -181,20 +183,14 @@ public class SubTileLoonuim extends SubTileFunctional { cmp.setString(TAG_LOOT_TABLE, lootTable.toString()); } - @Mod.EventBusSubscriber - public static class DropHandler { - - @SubscribeEvent(priority = EventPriority.LOWEST) - public static void onDrops(LivingDropsEvent event) { - EntityLivingBase e = event.getEntityLiving(); - if(e.getEntityData().hasKey(TAG_ITEMSTACK_TO_DROP)) { - NBTTagCompound cmp = e.getEntityData().getCompoundTag(TAG_ITEMSTACK_TO_DROP); - ItemStack stack = new ItemStack(cmp); - event.getDrops().clear(); - event.getDrops().add(new EntityItem(e.world, e.posX, e.posY, e.posZ, stack)); - } + @SubscribeEvent(priority = EventPriority.LOWEST) + public static void onDrops(LivingDropsEvent event) { + EntityLivingBase e = event.getEntityLiving(); + if(e.getEntityData().hasKey(TAG_ITEMSTACK_TO_DROP)) { + NBTTagCompound cmp = e.getEntityData().getCompoundTag(TAG_ITEMSTACK_TO_DROP); + ItemStack stack = new ItemStack(cmp); + event.getDrops().clear(); + event.getDrops().add(new EntityItem(e.world, e.posX, e.posY, e.posZ, stack)); } - } - } 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 18f2f9248..521862367 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 @@ -20,6 +20,7 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.Collections; @@ -27,6 +28,7 @@ import java.util.List; import java.util.Set; import java.util.WeakHashMap; +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class SubTileVinculotus extends SubTileFunctional { public static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); @@ -66,43 +68,37 @@ public class SubTileVinculotus extends SubTileFunctional { return LexiconData.vinculotus; } - @Mod.EventBusSubscriber - public static class EndermanIntercepter { + @SubscribeEvent + public static void onEndermanTeleport(EnderTeleportEvent event) { + int cost = 50; - @SubscribeEvent - public static void onEndermanTeleport(EnderTeleportEvent event) { - int cost = 50; + if(event.getEntityLiving() instanceof EntityEnderman) { + List possibleFlowers = new ArrayList<>(); + for(SubTileVinculotus flower : existingFlowers) { + if(flower.redstoneSignal > 0 || flower.mana <= cost || flower.supertile.getWorld() != event.getEntityLiving().world || flower.supertile.getWorld().getTileEntity(flower.supertile.getPos()) != flower.supertile) + continue; - if(event.getEntityLiving() instanceof EntityEnderman) { - List possibleFlowers = new ArrayList<>(); - for(SubTileVinculotus flower : existingFlowers) { - if(flower.redstoneSignal > 0 || flower.mana <= cost || flower.supertile.getWorld() != event.getEntityLiving().world || flower.supertile.getWorld().getTileEntity(flower.supertile.getPos()) != flower.supertile) - continue; + double x = flower.supertile.getPos().getX() + 0.5; + double y = flower.supertile.getPos().getY() + 1.5; + double z = flower.supertile.getPos().getZ() + 0.5; - double x = flower.supertile.getPos().getX() + 0.5; - double y = flower.supertile.getPos().getY() + 1.5; - double z = flower.supertile.getPos().getZ() + 0.5; + if(MathHelper.pointDistanceSpace(x, y, z, event.getTargetX(), event.getTargetY(), event.getTargetZ()) < RANGE) + possibleFlowers.add(flower); + } - if(MathHelper.pointDistanceSpace(x, y, z, event.getTargetX(), event.getTargetY(), event.getTargetZ()) < RANGE) - possibleFlowers.add(flower); - } + if(!possibleFlowers.isEmpty()) { + SubTileVinculotus flower = possibleFlowers.get(event.getEntityLiving().world.rand.nextInt(possibleFlowers.size())); - if(!possibleFlowers.isEmpty()) { - SubTileVinculotus flower = possibleFlowers.get(event.getEntityLiving().world.rand.nextInt(possibleFlowers.size())); + double x = flower.supertile.getPos().getX() + 0.5; + double y = flower.supertile.getPos().getY() + 1.5; + double z = flower.supertile.getPos().getZ() + 0.5; - double x = flower.supertile.getPos().getX() + 0.5; - double y = flower.supertile.getPos().getY() + 1.5; - double z = flower.supertile.getPos().getZ() + 0.5; - - event.setTargetX(x + Math.random() * 3 - 1); - event.setTargetY(y); - event.setTargetZ(z + Math.random() * 3 - 1); - flower.mana -= cost; - flower.sync(); - } + event.setTargetX(x + Math.random() * 3 - 1); + event.setTargetY(y); + event.setTargetZ(z + Math.random() * 3 - 1); + flower.mana -= cost; + flower.sync(); } } - } - } 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 ab4bae954..415a2fd98 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 @@ -26,9 +26,11 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.lib.LibMisc; import java.util.List; +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class SubTileNarslimmus extends SubTileGenerating { public static final String TAG_WORLD_SPAWNED = "Botania:WorldSpawned"; @@ -87,20 +89,15 @@ public class SubTileNarslimmus extends SubTileGenerating { return LexiconData.narslimmus; } - @Mod.EventBusSubscriber - public static class SpawnIntercepter { - - @SubscribeEvent - public static void onSpawn(LivingSpawnEvent.CheckSpawn event) { - if(event.getEntityLiving() instanceof EntitySlime && event.getResult() != Result.DENY && isSlimeChunk(event.getEntityLiving().world, MathHelper.floor(event.getX()), MathHelper.floor(event.getZ()))) - event.getEntityLiving().getEntityData().setBoolean(TAG_WORLD_SPAWNED, true); - } - - public static boolean isSlimeChunk(World world, int x, int z) { - Chunk chunk = world.getChunkFromBlockCoords(new BlockPos(x, 0, z)); - return chunk.getRandomWithSeed(987234911L).nextInt(10) == 0; - } + @SubscribeEvent + public static void onSpawn(LivingSpawnEvent.CheckSpawn event) { + if(event.getEntityLiving() instanceof EntitySlime && event.getResult() != Result.DENY && isSlimeChunk(event.getEntityLiving().world, MathHelper.floor(event.getX()), MathHelper.floor(event.getZ()))) + event.getEntityLiving().getEntityData().setBoolean(TAG_WORLD_SPAWNED, true); + } + private static boolean isSlimeChunk(World world, int x, int z) { + Chunk chunk = world.getChunkFromBlockCoords(new BlockPos(x, 0, z)); + return chunk.getRandomWithSeed(987234911L).nextInt(10) == 0; } } diff --git a/src/main/java/vazkii/botania/common/brew/ModPotions.java b/src/main/java/vazkii/botania/common/brew/ModPotions.java index 12b2ed26b..05d706fa2 100644 --- a/src/main/java/vazkii/botania/common/brew/ModPotions.java +++ b/src/main/java/vazkii/botania/common/brew/ModPotions.java @@ -20,8 +20,9 @@ import vazkii.botania.common.brew.potion.PotionClear; import vazkii.botania.common.brew.potion.PotionEmptiness; import vazkii.botania.common.brew.potion.PotionFeatherfeet; import vazkii.botania.common.brew.potion.PotionSoulCross; +import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ModPotions { public static final Potion soulCross = new PotionSoulCross(); 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 f41af57d6..d1155e40b 100644 --- a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java @@ -15,8 +15,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.common.gameevent.TickEvent.WorldTickEvent; import vazkii.botania.api.corporea.CorporeaHelper; +import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class CommonTickHandler { private CommonTickHandler() {} 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 f20842816..b0ca16298 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -424,7 +424,7 @@ public final class ConfigHandler { } - @Mod.EventBusSubscriber + @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public static class ChangeListener { @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java index 68c4d27ac..452f55a49 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java +++ b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java @@ -8,7 +8,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.registries.IForgeRegistry; import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class ModSounds { public static final SoundEvent airRod = makeSoundEvent("airrod"); public static final SoundEvent agricarnation = makeSoundEvent("agricarnation"); 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 62a06fcda..d7a5bedb9 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -17,8 +17,9 @@ import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; +import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class PixieHandler { private PixieHandler() {} 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 f93e787fe..57861fe50 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -25,13 +25,14 @@ import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.fml.common.registry.ForgeRegistries; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lexicon.page.PageShedding; +import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; import java.util.Objects; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class SheddingHandler { private SheddingHandler() {} 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 92de06d7d..8e580b1d6 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -25,7 +25,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public final class VersionChecker { private VersionChecker() {} diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 0e0cd2782..9500f753b 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -50,7 +50,7 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.IntStream; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class ModCraftingRecipes { public static ResourceLocation recipeLexicon; diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 09d98ae2e..7c17cb9cf 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -92,9 +92,10 @@ import vazkii.botania.common.item.rod.ItemSmeltRod; import vazkii.botania.common.item.rod.ItemTerraformRod; import vazkii.botania.common.item.rod.ItemTornadoRod; import vazkii.botania.common.item.rod.ItemWaterRod; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibOreDict; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class ModItems { public static final Item lexicon = new ItemLexicon(); public static final Item petal = new ItemPetal(); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index e7f5b3f55..f0eadff9c 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -51,7 +51,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyProvider { public ItemBlockSpecialFlower(Block block1) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java index 60cd2a463..4f81b8483 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java @@ -32,10 +32,11 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketDodge; import vazkii.botania.common.network.PacketHandler; -@Mod.EventBusSubscriber(Side.CLIENT) +@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) public class ItemDodgeRing extends ItemBauble { public static final String TAG_DODGE_COOLDOWN = "dodgeCooldown"; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java index 364e18b33..982e449dc 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java @@ -30,10 +30,11 @@ import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import java.util.List; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem, IBaubleRender { public static final int COST = 1000; 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 9389a0505..7ae97a5f9 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -50,7 +50,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinateListProvider, IManaUsingItem { private static final String TAG_CURSOR_LIST = "cursorList"; 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 5e9b5b82b..7e7fe9eca 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -34,7 +34,7 @@ import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; -@Mod.EventBusSubscriber +@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ItemOdinRing extends ItemRelicBauble { private static final List damageNegations = new ArrayList<>();