Cleanup: switch bunch of things to @EventBusSubscriber

This commit is contained in:
Vincent Lee committed 2017-07-05 20:08:50 -05:00
1 parent 1ec96fc475
commit 7c008784d8
30 files changed
+78 -95

No files matched your search

@@ -22,7 +22,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import org.lwjgl.opengl.ARBShaderObjects;
import org.lwjgl.opengl.GL11;
import vazkii.botania.client.core.helper.ShaderHelper;
@@ -30,6 +32,7 @@ import vazkii.botania.common.item.ItemAstrolabe;
import java.util.List;
@Mod.EventBusSubscriber(Side.CLIENT)
public final class AstrolabePreviewHandler {
@SubscribeEvent
@@ -21,7 +21,9 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.subtile.ISubTileContainer;
import vazkii.botania.api.subtile.RadiusDescriptor;
@@ -34,6 +36,7 @@ import vazkii.botania.common.item.ModItems;
import java.awt.Color;
@Mod.EventBusSubscriber(Side.CLIENT)
public final class BlockHighlightRenderHandler {
private BlockHighlightRenderHandler() {}
@@ -14,7 +14,9 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import org.lwjgl.opengl.ARBShaderObjects;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.boss.IBotaniaBoss;
@@ -29,6 +31,7 @@ import java.util.Set;
import java.util.UUID;
import java.util.WeakHashMap;
@Mod.EventBusSubscriber(Side.CLIENT)
public final class BossBarHandler {
private BossBarHandler() {}
@@ -15,10 +15,12 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.Phase;
import net.minecraftforge.fml.common.gameevent.TickEvent.RenderTickEvent;
import net.minecraftforge.fml.relauncher.Side;
import vazkii.botania.api.mana.IManaCollector;
import vazkii.botania.api.mana.TileSignature;
import vazkii.botania.client.gui.lexicon.GuiLexicon;
@@ -28,6 +30,7 @@ import vazkii.botania.common.core.handler.ManaNetworkHandler;
import vazkii.botania.common.core.helper.PlayerHelper;
import vazkii.botania.common.item.ModItems;
@Mod.EventBusSubscriber(Side.CLIENT)
public final class ClientTickHandler {
private ClientTickHandler() {}
@@ -20,7 +20,9 @@ import net.minecraft.world.World;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import org.lwjgl.opengl.ARBFragmentShader;
import org.lwjgl.opengl.ContextCapabilities;
import org.lwjgl.opengl.GL11;
@@ -35,6 +37,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.UUID;
@Mod.EventBusSubscriber(Side.CLIENT)
public final class DebugHandler {
private DebugHandler() {}
@@ -32,9 +32,11 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import org.lwjgl.opengl.GL11;
@@ -75,6 +77,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@Mod.EventBusSubscriber(Side.CLIENT)
public final class HUDHandler {
private HUDHandler() {}
@@ -19,7 +19,9 @@ import net.minecraft.entity.Entity;
import net.minecraft.profiler.Profiler;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import org.lwjgl.opengl.GL11;
import vazkii.botania.client.fx.FXLightning;
import vazkii.botania.client.fx.ParticleRenderDispatcher;
@@ -28,6 +30,7 @@ import vazkii.botania.client.lib.LibResources;
import java.util.ArrayDeque;
import java.util.Deque;
@Mod.EventBusSubscriber(Side.CLIENT)
public class LightningHandler {
private LightningHandler() {}
@@ -170,49 +170,5 @@ public class MiscellaneousIcons {
nimbusGem = IconHelper.forName(evt.getMap(), "superCloudPendantGem", "items");
}
@SubscribeEvent
public void dumpAtlas(ArrowLooseEvent evt) {
if (!evt.getEntityPlayer().world.isRemote || !((Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"))
|| !evt.getEntityPlayer().isSneaking())
return;
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
int width = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_WIDTH);
int height = GL11.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_HEIGHT);
Botania.LOGGER.debug("Dumped atlas %d wide by %d tall%n", width, height);
int pixels = width * height;
IntBuffer buffer = BufferUtils.createIntBuffer(pixels);
int[] pixelValues = new int[pixels];
GL11.glPixelStorei(GL11.GL_PACK_ALIGNMENT, 1);
GL11.glPixelStorei(GL11.GL_UNPACK_ALIGNMENT, 1);
GL11.glGetTexImage(GL11.GL_TEXTURE_2D, 0, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, buffer);
buffer.get(pixelValues);
BufferedImage bufferedimage = new BufferedImage(width, height, 2);
for (int k = 0; k < height; ++k)
{
for (int l = 0; l < width; ++l)
{
bufferedimage.setRGB(l, k, pixelValues[k * width + l]);
}
}
File mcFolder = Minecraft.getMinecraft().mcDataDir;
File result = new File(mcFolder, "atlas.png");
try {
ImageIO.write(bufferedimage, "png", result);
} catch (IOException e) {
Botania.LOGGER.warn("Failed to dump debug atlas");
}
}
private MiscellaneousIcons() {}
}
@@ -29,7 +29,9 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import org.lwjgl.opengl.ARBShaderObjects;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook;
@@ -39,6 +41,7 @@ import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent;
import vazkii.botania.client.core.helper.ShaderHelper;
import vazkii.botania.common.block.ModBlocks;
@Mod.EventBusSubscriber(Side.CLIENT)
public final class MultiblockRenderHandler {
private MultiblockRenderHandler() {}
@@ -13,7 +13,9 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.client.event.RenderSpecificHandEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import vazkii.botania.client.gui.lexicon.GuiLexicon;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.Botania;
@@ -23,12 +25,12 @@ import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lexicon.page.PageText;
// Hacky way to render 3D lexicon, will be reevaluated in the future.
@Mod.EventBusSubscriber(Side.CLIENT)
public class RenderLexicon {
private static final ModelBook model = new ModelBook();
private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA);
private final ModelBook model = new ModelBook();
private final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA);
private final String[] QUOTES = new String[] {
private static final String[] QUOTES = new String[] {
"\"Neat!\" - Direwolf20",
"\"It's pretty ledge.\" - Haighyorkie",
"\"I don't really like it.\" - CrustyMustard",
@@ -37,10 +39,10 @@ public class RenderLexicon {
"\"Vazkii did a thing.\" - cpw"
};
int quote = -1;
static int quote = -1;
@SubscribeEvent
public void renderItem(RenderSpecificHandEvent evt) {
public static void renderItem(RenderSpecificHandEvent evt) {
Minecraft mc = Minecraft.getMinecraft();
if(!ConfigHandler.lexicon3dModel
|| mc.gameSettings.thirdPersonView != 0
@@ -55,7 +57,7 @@ public class RenderLexicon {
}
}
private void renderItemInFirstPerson(AbstractClientPlayer player, float partialTicks, float interpPitch, EnumHand hand, float swingProgress, ItemStack stack, float equipProgress) throws Throwable {
private static void renderItemInFirstPerson(AbstractClientPlayer player, float partialTicks, float interpPitch, EnumHand hand, float swingProgress, ItemStack stack, float equipProgress) throws Throwable {
// Cherry picked from ItemRenderer.renderItemInFirstPerson
boolean flag = hand == EnumHand.MAIN_HAND;
EnumHandSide enumhandside = flag ? player.getPrimaryHand() : player.getPrimaryHand().opposite();
@@ -72,7 +74,7 @@ public class RenderLexicon {
GlStateManager.popMatrix();
}
private void doRender(EnumHandSide side, float partialTicks, ItemStack stack) {
private static void doRender(EnumHandSide side, float partialTicks, ItemStack stack) {
Minecraft mc = Minecraft.getMinecraft();
GlStateManager.pushMatrix();
@@ -141,7 +143,7 @@ public class RenderLexicon {
// Copy - ItemRenderer.transformSideFirstPerson
// Arg - Side, EquipProgress
private void transformSideFirstPerson(EnumHandSide p_187459_1_, float p_187459_2_)
private static void transformSideFirstPerson(EnumHandSide p_187459_1_, float p_187459_2_)
{
int i = p_187459_1_ == EnumHandSide.RIGHT ? 1 : -1;
GlStateManager.translate(i * 0.56F, -0.52F + p_187459_2_ * -0.6F, -0.72F);
@@ -149,7 +151,7 @@ public class RenderLexicon {
// Copy with modification - ItemRenderer.transformFirstPerson
// Arg - Side, SwingProgress
private void transformFirstPerson(EnumHandSide p_187453_1_, float p_187453_2_)
private static void transformFirstPerson(EnumHandSide p_187453_1_, float p_187453_2_)
{
int i = p_187453_1_ == EnumHandSide.RIGHT ? 1 : -1;
// Botania - added
@@ -23,7 +23,9 @@ import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.client.event.RenderTooltipEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.lexicon.ILexicon;
import vazkii.botania.api.lexicon.LexiconRecipeMappings;
@@ -37,6 +39,7 @@ import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick;
import java.awt.Color;
@Mod.EventBusSubscriber(Side.CLIENT)
public final class TooltipAdditionDisplayHandler {
private static float lexiconLookupTime = 0F;
@@ -12,11 +12,14 @@ package vazkii.botania.client.core.handler;
import net.minecraft.client.resources.I18n;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.EventPriority;
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;
@Mod.EventBusSubscriber(Side.CLIENT)
public final class TooltipHandler {
@SubscribeEvent(priority = EventPriority.HIGHEST)
@@ -168,21 +168,8 @@ public class ClientProxy implements IProxy {
ModChallenges.init();
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(BoundTileRenderer.class);
MinecraftForge.EVENT_BUS.register(TooltipHandler.class);
MinecraftForge.EVENT_BUS.register(TooltipAdditionDisplayHandler.class);
MinecraftForge.EVENT_BUS.register(DebugHandler.class);
MinecraftForge.EVENT_BUS.register(BlockHighlightRenderHandler.class);
MinecraftForge.EVENT_BUS.register(MultiblockRenderHandler.class);
MinecraftForge.EVENT_BUS.register(SkyblockRenderEvents.class);
MinecraftForge.EVENT_BUS.register(new RenderLexicon());
MinecraftForge.EVENT_BUS.register(BossBarHandler.class);
MinecraftForge.EVENT_BUS.register(BergamuteEventHandler.class);
MinecraftForge.EVENT_BUS.register(AstrolabePreviewHandler.class);
if(ConfigHandler.useAdaptativeConfig)
MinecraftForge.EVENT_BUS.register(AdaptorNotifier.class);
@@ -13,10 +13,13 @@ package vazkii.botania.client.render.world;
import net.minecraft.client.Minecraft;
import net.minecraft.world.World;
import net.minecraftforge.client.event.RenderWorldLastEvent;
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.world.WorldTypeSkyblock;
@Mod.EventBusSubscriber(Side.CLIENT)
public final class SkyblockRenderEvents {
@SubscribeEvent
@@ -153,17 +153,12 @@ public class Botania {
MinecraftForge.TERRAIN_GEN_BUS.register(BiomeDecorationHandler.class);
MinecraftForge.EVENT_BUS.register(ManaNetworkHandler.instance);
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(SkyblockWorldEvents.class);
MinecraftForge.EVENT_BUS.register(CommonTickHandler.class);
FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName());
/*if(Botania.bcTriggersLoaded) todo buildcraft
@@ -26,6 +26,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -38,6 +39,7 @@ import vazkii.botania.common.lib.LibBlockNames;
import javax.annotation.Nonnull;
@Mod.EventBusSubscriber
public class BlockFelPumpkin extends BlockMod implements ILexiconable {
private static final String TAG_FEL_SPAWNED = "Botania-FelSpawned";
@@ -46,7 +48,6 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable {
super(Material.GOURD, LibBlockNames.FEL_PUMPKIN);
setHardness(1F);
setSoundType(SoundType.WOOD);
MinecraftForge.EVENT_BUS.register(BlockFelPumpkin.class);
}
@Nonnull
@@ -23,6 +23,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.minecart.MinecartUpdateEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -38,6 +39,7 @@ import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
@Mod.EventBusSubscriber
public class BlockGhostRail extends BlockRailBase implements ILexiconable, IModelRegister {
private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks";
@@ -48,7 +50,6 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable, IMode
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.RAIL_DIRECTION, EnumRailDirection.NORTH_SOUTH));
setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GHOST_RAIL));
setUnlocalizedName(LibBlockNames.GHOST_RAIL);
MinecraftForge.EVENT_BUS.register(BlockGhostRail.class);
}
@Nonnull
@@ -20,6 +20,7 @@ import net.minecraft.world.World;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -31,11 +32,11 @@ import vazkii.botania.common.lib.LibBlockNames;
import javax.annotation.Nonnull;
import java.util.Random;
@Mod.EventBusSubscriber
public class BlockRedStringInterceptor extends BlockRedString {
public BlockRedStringInterceptor() {
super(LibBlockNames.RED_STRING_INTERCEPTOR);
MinecraftForge.EVENT_BUS.register(BlockRedStringInterceptor.class);
}
@Nonnull
@@ -9,6 +9,7 @@ import net.minecraft.client.audio.SoundHandler;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraftforge.client.event.sound.PlaySoundEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
@@ -21,7 +22,7 @@ import javax.annotation.Nullable;
import java.awt.Color;
import java.util.Random;
@SideOnly(Side.CLIENT)
@Mod.EventBusSubscriber(Side.CLIENT)
public class BergamuteEventHandler {
private BergamuteEventHandler() {}
@@ -36,6 +36,7 @@ import net.minecraft.world.WorldServer;
import net.minecraft.world.storage.loot.LootContext;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import vazkii.botania.api.BotaniaAPI;
@@ -55,16 +56,10 @@ public class SubTileLoonuim extends SubTileFunctional {
private static final String TAG_ITEMSTACK_TO_DROP = "botania:looniumItemStackToDrop";
private ResourceLocation lootTable = new ResourceLocation("minecraft", "chests/simple_dungeon");
private static boolean registered = false;
@Override
public void onUpdate() {
super.onUpdate();
if(!registered) {
MinecraftForge.EVENT_BUS.register(DropHandler.class);
registered = true;
}
World world = supertile.getWorld();
if(!world.isRemote && redstoneSignal == 0 && ticksExisted % 100 == 0 && mana >= COST) {
@@ -181,7 +176,8 @@ public class SubTileLoonuim extends SubTileFunctional {
super.writeToPacketNBT(cmp);
cmp.setString(TAG_LOOT_TABLE, lootTable.toString());
}
@Mod.EventBusSubscriber
public static class DropHandler {
@SubscribeEvent(priority = EventPriority.LOWEST)
@@ -13,6 +13,7 @@ package vazkii.botania.common.block.subtile.functional;
import net.minecraft.entity.monster.EntityEnderman;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.EnderTeleportEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.subtile.RadiusDescriptor;
@@ -29,7 +30,6 @@ import java.util.WeakHashMap;
public class SubTileVinculotus extends SubTileFunctional {
public static final Set<SubTileVinculotus> existingFlowers = Collections.newSetFromMap(new WeakHashMap<>());
private static boolean registered = false;
private static final int RANGE = 64;
@Override
@@ -38,10 +38,6 @@ public class SubTileVinculotus extends SubTileFunctional {
if(!supertile.getWorld().isRemote && !existingFlowers.contains(this)) {
existingFlowers.add(this);
if(!registered) {
MinecraftForge.EVENT_BUS.register(EndermanIntercepter.class);
registered = true;
}
}
}
@@ -70,6 +66,7 @@ public class SubTileVinculotus extends SubTileFunctional {
return LexiconData.vinculotus;
}
@Mod.EventBusSubscriber
public static class EndermanIntercepter {
@SubscribeEvent
@@ -19,6 +19,7 @@ import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.event.entity.living.LivingSpawnEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.Event.Result;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import vazkii.botania.api.lexicon.LexiconEntry;
@@ -86,6 +87,7 @@ public class SubTileNarslimmus extends SubTileGenerating {
return LexiconData.narslimmus;
}
@Mod.EventBusSubscriber
public static class SpawnIntercepter {
@SubscribeEvent
@@ -10,11 +10,13 @@
*/
package vazkii.botania.common.core.handler;
import net.minecraftforge.fml.common.Mod;
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;
@Mod.EventBusSubscriber
public final class CommonTickHandler {
private CommonTickHandler() {}
@@ -19,6 +19,7 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.fml.client.event.ConfigChangedEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import vazkii.botania.common.Botania;
import vazkii.botania.common.lib.LibMisc;
@@ -99,8 +100,6 @@ public final class ConfigHandler {
config.load();
load();
MinecraftForge.EVENT_BUS.register(ChangeListener.class);
}
public static void load() {
@@ -429,6 +428,7 @@ public final class ConfigHandler {
}
@Mod.EventBusSubscriber
public static class ChangeListener {
@SubscribeEvent
@@ -9,6 +9,7 @@ import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.event.entity.living.LivingHurtEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.items.IItemHandler;
import vazkii.botania.api.item.IPixieSpawner;
@@ -17,6 +18,7 @@ import vazkii.botania.common.entity.EntityPixie;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm;
@Mod.EventBusSubscriber
public final class PixieHandler {
private PixieHandler() {}
@@ -19,6 +19,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.registry.EntityEntry;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
@@ -30,6 +31,7 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Objects;
@Mod.EventBusSubscriber
public final class SheddingHandler {
private SheddingHandler() {}
@@ -18,11 +18,14 @@ import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.translation.I18n;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.Phase;
import net.minecraftforge.fml.relauncher.Side;
import vazkii.botania.common.lib.LibMisc;
@Mod.EventBusSubscriber(Side.CLIENT)
public final class VersionChecker {
private VersionChecker() {}
@@ -38,7 +41,6 @@ public final class VersionChecker {
public static void init() {
new ThreadVersionChecker();
MinecraftForge.EVENT_BUS.register(VersionChecker.class);
}
@SubscribeEvent
@@ -22,6 +22,7 @@ import net.minecraft.util.math.Vec3d;
import net.minecraft.world.Explosion;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.world.ExplosionEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -32,13 +33,13 @@ import vazkii.botania.common.lib.LibItemNames;
import java.util.List;
@Mod.EventBusSubscriber
public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem, IBaubleRender {
public static final int COST = 1000;
public ItemGoddessCharm() {
super(LibItemNames.GODDESS_CHARM);
MinecraftForge.EVENT_BUS.register(ItemGoddessCharm.class);
}
@SubscribeEvent
@@ -29,6 +29,7 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -47,6 +48,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@Mod.EventBusSubscriber
public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinateListProvider, IManaUsingItem {
private static final String TAG_CURSOR_LIST = "cursorList";
@@ -61,7 +63,6 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat
public ItemLokiRing() {
super(LibItemNames.LOKI_RING);
MinecraftForge.EVENT_BUS.register(ItemLokiRing.class);
}
@SubscribeEvent
@@ -22,6 +22,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.LivingAttackEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.items.IItemHandler;
import vazkii.botania.common.core.handler.ConfigHandler;
@@ -31,6 +32,7 @@ import vazkii.botania.common.lib.LibItemNames;
import java.util.ArrayList;
import java.util.List;
@Mod.EventBusSubscriber
public class ItemOdinRing extends ItemRelicBauble {
private static final List<String> damageNegations = new ArrayList<>();
@@ -39,7 +41,6 @@ public class ItemOdinRing extends ItemRelicBauble {
public ItemOdinRing() {
super(LibItemNames.ODIN_RING);
MinecraftForge.EVENT_BUS.register(ItemOdinRing.class);
damageNegations.add(DamageSource.DROWN.damageType);
damageNegations.add(DamageSource.FALL.damageType);