diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index 23e071912..8fcc6cb33 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -12,7 +12,6 @@ import net.minecraft.network.play.server.SUpdateTileEntityPacket; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; -import net.minecraft.world.World; import net.minecraft.world.server.ServerChunkProvider; import net.minecraft.world.server.ServerWorld; diff --git a/src/main/java/vazkii/botania/api/recipe/IElvenTradeRecipe.java b/src/main/java/vazkii/botania/api/recipe/IElvenTradeRecipe.java index 978440a79..6c6578002 100644 --- a/src/main/java/vazkii/botania/api/recipe/IElvenTradeRecipe.java +++ b/src/main/java/vazkii/botania/api/recipe/IElvenTradeRecipe.java @@ -11,7 +11,6 @@ package vazkii.botania.api.recipe; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.NonNullList; diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 4893efae4..4563fc2f5 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -10,7 +10,6 @@ package vazkii.botania.api.state; import com.google.common.base.Predicates; -import net.minecraft.item.DyeColor; import net.minecraft.state.BooleanProperty; import net.minecraft.state.EnumProperty; import net.minecraft.util.Direction; diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java index d486293ee..d15ce76e3 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java @@ -16,13 +16,11 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; -import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.registry.Registry; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java index a8247fe86..15d610460 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java @@ -17,13 +17,11 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; -import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.util.registry.Registry; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index 9568f5563..3e83b402f 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -14,7 +14,6 @@ import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.NetworkManager; @@ -40,9 +39,7 @@ import net.minecraftforge.client.model.data.ModelDataMap; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.registries.ForgeRegistries; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.capability.FloatingFlowerImpl; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IFloatingFlower; 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 440fd2264..b5cda7541 100644 --- a/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java @@ -23,20 +23,14 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RenderWorldLastEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.item.ItemAstrolabe; -import vazkii.botania.common.lib.LibMisc; import java.util.List; -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public final class AstrolabePreviewHandler { - @SubscribeEvent public static void onWorldRenderLast(RenderWorldLastEvent event) { World world = Minecraft.getInstance().world; MatrixStack ms = event.getMatrixStack(); diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index 482282e5b..bdb96ab4c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -23,14 +23,12 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.potion.Effects; import top.theillusivec4.curios.api.CuriosAPI; import top.theillusivec4.curios.api.capability.CuriosCapability; import top.theillusivec4.curios.api.inventory.CurioStackHandler; -import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.common.core.handler.ConfigHandler; 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 8d999528b..c241c4084 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java @@ -19,15 +19,8 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceResult; -import net.minecraftforge.api.distmarker.Dist; +import net.minecraft.util.math.*; import net.minecraftforge.client.event.RenderWorldLastEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntitySpecialFlower; @@ -37,7 +30,6 @@ 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 javax.annotation.Nullable; @@ -45,12 +37,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public final class BlockHighlightRenderHandler { private BlockHighlightRenderHandler() {} - @SubscribeEvent public static void onWorldRenderLast(RenderWorldLastEvent event) { Minecraft mc = Minecraft.getInstance(); RayTraceResult pos = mc.objectMouseOver; 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 8af90e6e5..4b3662020 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -13,10 +13,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RenderGameOverlayEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import org.lwjgl.opengl.GL11; @@ -25,7 +22,6 @@ import vazkii.botania.client.core.helper.ShaderCallback; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.entity.EntityDoppleganger; -import vazkii.botania.common.lib.LibMisc; import java.awt.*; import java.util.Collections; @@ -33,7 +29,6 @@ import java.util.Set; import java.util.UUID; import java.util.WeakHashMap; -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public final class BossBarHandler { private BossBarHandler() {} @@ -43,7 +38,6 @@ public final class BossBarHandler { public static final ResourceLocation defaultBossBar = new ResourceLocation(LibResources.GUI_BOSS_BAR); private static final BarCallback barUniformCallback = new BarCallback(); - @SubscribeEvent public static void onBarRender(RenderGameOverlayEvent.BossInfo evt) { UUID infoUuid = evt.getBossInfo().getUniqueId(); for (EntityDoppleganger currentBoss : bosses) { 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 0b096991b..ae708815d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -15,11 +15,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Matrix4f; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; @@ -29,11 +25,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; @@ -45,14 +38,12 @@ import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.IWireframeAABBProvider; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lib.LibMisc; import java.util.IdentityHashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, value = Dist.CLIENT) public final class BoundTileRenderer { private static final IRenderTypeBuffer.Impl LINE_BUFFERS = IRenderTypeBuffer.getImpl(Util.make(() -> { Map ret = new IdentityHashMap<>(); @@ -65,7 +56,6 @@ public final class BoundTileRenderer { private BoundTileRenderer() {} - @SubscribeEvent public static void onWorldRenderLast(RenderWorldLastEvent event) { if (!ConfigHandler.CLIENT.boundBlockWireframe.get()) { return; 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 3689dd0a7..295229013 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -13,10 +13,7 @@ import com.google.common.collect.ImmutableList; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.mana.IManaCollector; @@ -26,11 +23,9 @@ import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibMisc; import java.lang.reflect.Field; -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public final class ClientTickHandler { private ClientTickHandler() {} @@ -49,7 +44,6 @@ public final class ClientTickHandler { delta = total - oldTotal; } - @SubscribeEvent public static void renderTick(TickEvent.RenderTickEvent event) { Minecraft mc = Minecraft.getInstance(); if (event.phase == TickEvent.Phase.START) { @@ -69,7 +63,6 @@ public final class ClientTickHandler { } } - @SubscribeEvent public static void clientTickEnd(TickEvent.ClientTickEvent event) { if (event.phase == TickEvent.Phase.END) { RenderTileRedString.tick(); diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index 23ebfef09..3ddeeaeab 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -35,12 +35,7 @@ import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.block.tile.TilePlatform; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.brew.ModBrews; -import vazkii.botania.common.item.Item16Colors; -import vazkii.botania.common.item.ItemManaGun; -import vazkii.botania.common.item.ItemManaMirror; -import vazkii.botania.common.item.ItemManaTablet; -import vazkii.botania.common.item.ItemTwigWand; -import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.*; import vazkii.botania.common.item.equipment.bauble.ItemBloodPendant; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.item.lens.ItemLens; diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index 6ffb5ec2e..7f7807d6e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -40,11 +40,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; import java.nio.charset.StandardCharsets; -import java.util.Collections; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; +import java.util.*; public final class ContributorFancinessHandler extends LayerRenderer> { diff --git a/src/main/java/vazkii/botania/client/core/handler/CorporeaInputHandler.java b/src/main/java/vazkii/botania/client/core/handler/CorporeaInputHandler.java index da4baa4d8..0ad38542c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaInputHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaInputHandler.java @@ -17,16 +17,12 @@ import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.client.gui.screen.inventory.InventoryScreen; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.GuiScreenEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; -import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibObfuscation; import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.network.PacketIndexKeybindRequest; @@ -34,7 +30,6 @@ import vazkii.botania.common.network.PacketIndexKeybindRequest; import java.util.function.Predicate; import java.util.function.Supplier; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, value = Dist.CLIENT) public class CorporeaInputHandler { /** Replaced in JEIBotaniaPlugin when JEI's loaded to provide stacks from the JEI item panel. */ @@ -43,7 +38,6 @@ public class CorporeaInputHandler { /** Filter for usable guis to handle requests. Added to in JEIBotaniaPlugin */ public static Predicate supportedGuiFilter = gui -> gui instanceof ContainerScreen; - @SubscribeEvent public static void buttonPressed(GuiScreenEvent.KeyboardKeyPressedEvent.Pre event) { Minecraft mc = Minecraft.getInstance(); 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 627882410..f74903f17 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -15,12 +15,9 @@ import net.minecraft.util.registry.Registry; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RenderGameOverlayEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.ModContainer; import net.minecraftforge.fml.ModList; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.server.ServerLifecycleHooks; import net.minecraftforge.forgespi.language.IModInfo; @@ -33,14 +30,12 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public final class DebugHandler { private DebugHandler() {} private static final String PREFIX = TextFormatting.GREEN + "[Botania] " + TextFormatting.RESET; - @SubscribeEvent public static void onDrawDebugText(RenderGameOverlayEvent.Text event) { World world = Minecraft.getInstance().world; if (ConfigHandler.CLIENT.debugInfo.get() && Minecraft.getInstance().gameSettings.showDebugInfo) { 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 d2d236588..645c2876f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -28,11 +28,8 @@ import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.EmptyHandler; @@ -65,18 +62,15 @@ 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 java.util.List; -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public final class HUDHandler { private HUDHandler() {} public static final ResourceLocation manaBar = new ResourceLocation(LibResources.GUI_MANA_HUD); - @SubscribeEvent public static void onDrawScreenPost(RenderGameOverlayEvent.Post event) { Minecraft mc = Minecraft.getInstance(); IProfiler profiler = mc.getProfiler(); diff --git a/src/main/java/vazkii/botania/client/core/handler/KonamiHandler.java b/src/main/java/vazkii/botania/client/core/handler/KonamiHandler.java index 448066fd4..645cf5f83 100644 --- a/src/main/java/vazkii/botania/client/core/handler/KonamiHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/KonamiHandler.java @@ -8,26 +8,20 @@ */ package vazkii.botania.client.core.handler; -import com.mojang.blaze3d.platform.GlStateManager; - import com.mojang.blaze3d.systems.RenderSystem; + import net.minecraft.client.Minecraft; import net.minecraft.client.audio.SimpleSound; import net.minecraft.client.resources.I18n; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.InputEvent; import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import org.lwjgl.glfw.GLFW; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.item.ItemLexicon; -import vazkii.botania.common.lib.LibMisc; import vazkii.patchouli.api.BookDrawScreenEvent; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, value = Dist.CLIENT) public class KonamiHandler { private static final int[] KONAMI_CODE = { GLFW.GLFW_KEY_UP, GLFW.GLFW_KEY_UP, @@ -39,7 +33,6 @@ public class KonamiHandler { private static int nextLetter = 0; private static int konamiTime = 0; - @SubscribeEvent public static void clientTick(TickEvent.ClientTickEvent evt) { if (konamiTime > 0) { konamiTime--; @@ -50,7 +43,6 @@ public class KonamiHandler { } } - @SubscribeEvent public static void handleInput(InputEvent.KeyInputEvent evt) { Minecraft mc = Minecraft.getInstance(); if (evt.getModifiers() == 0 && evt.getAction() == GLFW.GLFW_PRESS && ItemLexicon.isOpen()) { @@ -67,7 +59,6 @@ public class KonamiHandler { } } - @SubscribeEvent public static void renderBook(BookDrawScreenEvent evt) { if (konamiTime > 0) { String meme = I18n.format("botania.subtitle.way"); 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 a603658f5..e2e87d7a8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -17,21 +17,16 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.profiler.IProfiler; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RenderWorldLastEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import org.lwjgl.opengl.GL11; import vazkii.botania.client.fx.FXLightning; import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.lib.LibMisc; import java.util.ArrayDeque; import java.util.Deque; -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public class LightningHandler { private LightningHandler() {} @@ -41,7 +36,6 @@ public class LightningHandler { private static final ResourceLocation insideResource = new ResourceLocation(LibResources.MISC_WISP_SMALL); public static final Deque queuedLightningBolts = new ArrayDeque<>(); - @SubscribeEvent public static void onRenderWorldLast(RenderWorldLastEvent event) { IProfiler profiler = Minecraft.getInstance().getProfiler(); diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index 57f8d6c6b..ebe53c92c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -20,7 +20,6 @@ import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.eventbus.api.SubscribeEvent; import vazkii.botania.client.model.GunModel; import vazkii.botania.client.model.LexiconModel; @@ -86,9 +85,14 @@ public class MiscellaneousIcons { public final IBakedModel[] kingKeyWeaponModels = new IBakedModel[ItemKingKey.WEAPON_TYPES]; - @SubscribeEvent - public void onModelRegister(ModelRegistryEvent evt) throws Throwable { - Set materials = (Set) MATERIALS.invokeExact(); + public void onModelRegister(ModelRegistryEvent evt) { + Set materials; + try { + materials = (Set) MATERIALS.invokeExact(); + } catch (Throwable throwable) { + throw new RuntimeException(throwable); + } + materials.add(RenderLexicon.TEXTURE); materials.add(RenderLexicon.ELVEN_TEXTURE); for (BannerPattern pattern : BannerPattern.values()) { @@ -120,7 +124,6 @@ public class MiscellaneousIcons { } } - @SubscribeEvent public void onModelBake(ModelBakeEvent evt) { if (!ModelHandler.registeredModels) { Botania.LOGGER.error("Additional models failed to register! Aborting baking models to avoid early crashing."); @@ -187,7 +190,6 @@ public class MiscellaneousIcons { } } - @SubscribeEvent public void onTextureStitchPre(TextureStitchEvent.Pre evt) { if (!evt.getMap().getTextureLocation().equals(AtlasTexture.LOCATION_BLOCKS_TEXTURE)) { return; @@ -226,7 +228,6 @@ public class MiscellaneousIcons { */ } - @SubscribeEvent public void onTextureStitchPost(TextureStitchEvent.Post evt) { if (!evt.getMap().getTextureLocation().equals(AtlasTexture.LOCATION_BLOCKS_TEXTURE)) { return; 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 99bedb191..fe0df5cce 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -15,88 +15,31 @@ import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.client.renderer.entity.SpriteRenderer; import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.util.registry.Registry; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.RenderingRegistry; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.client.model.FloatingFlowerModel; -import vazkii.botania.client.render.entity.RenderBabylonWeapon; -import vazkii.botania.client.render.entity.RenderCorporeaSpark; -import vazkii.botania.client.render.entity.RenderDoppleganger; -import vazkii.botania.client.render.entity.RenderManaStorm; -import vazkii.botania.client.render.entity.RenderNoop; -import vazkii.botania.client.render.entity.RenderPinkWither; -import vazkii.botania.client.render.entity.RenderPixie; -import vazkii.botania.client.render.entity.RenderPoolMinecart; -import vazkii.botania.client.render.entity.RenderSpark; +import vazkii.botania.client.render.entity.*; import vazkii.botania.client.render.tile.*; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.block.tile.TileAlfPortal; -import vazkii.botania.common.block.tile.TileAltar; -import vazkii.botania.common.block.tile.TileAnimatedTorch; -import vazkii.botania.common.block.tile.TileAvatar; -import vazkii.botania.common.block.tile.TileBrewery; -import vazkii.botania.common.block.tile.TileCocoon; -import vazkii.botania.common.block.tile.TileEnchanter; -import vazkii.botania.common.block.tile.TileFloatingFlower; -import vazkii.botania.common.block.tile.TileGaiaHead; -import vazkii.botania.common.block.tile.TileHourglass; -import vazkii.botania.common.block.tile.TileIncensePlate; -import vazkii.botania.common.block.tile.TileLightRelay; -import vazkii.botania.common.block.tile.TilePylon; -import vazkii.botania.common.block.tile.TileRuneAltar; -import vazkii.botania.common.block.tile.TileSparkChanger; -import vazkii.botania.common.block.tile.TileStarfield; -import vazkii.botania.common.block.tile.TileTerraPlate; -import vazkii.botania.common.block.tile.TileTeruTeruBozu; -import vazkii.botania.common.block.tile.TileTinyPotato; +import vazkii.botania.common.block.tile.*; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; -import vazkii.botania.common.block.tile.mana.TileBellows; -import vazkii.botania.common.block.tile.mana.TilePool; -import vazkii.botania.common.block.tile.mana.TilePrism; -import vazkii.botania.common.block.tile.mana.TilePump; -import vazkii.botania.common.block.tile.mana.TileSpreader; -import vazkii.botania.common.block.tile.string.TileRedStringComparator; -import vazkii.botania.common.block.tile.string.TileRedStringContainer; -import vazkii.botania.common.block.tile.string.TileRedStringDispenser; -import vazkii.botania.common.block.tile.string.TileRedStringFertilizer; -import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; -import vazkii.botania.common.block.tile.string.TileRedStringRelay; -import vazkii.botania.common.entity.EntityBabylonWeapon; -import vazkii.botania.common.entity.EntityCorporeaSpark; -import vazkii.botania.common.entity.EntityDoppleganger; -import vazkii.botania.common.entity.EntityEnderAirBottle; -import vazkii.botania.common.entity.EntityFallingStar; -import vazkii.botania.common.entity.EntityFlameRing; -import vazkii.botania.common.entity.EntityMagicLandmine; -import vazkii.botania.common.entity.EntityMagicMissile; -import vazkii.botania.common.entity.EntityManaBurst; -import vazkii.botania.common.entity.EntityManaStorm; -import vazkii.botania.common.entity.EntityPinkWither; -import vazkii.botania.common.entity.EntityPixie; -import vazkii.botania.common.entity.EntityPoolMinecart; -import vazkii.botania.common.entity.EntitySignalFlare; -import vazkii.botania.common.entity.EntitySpark; -import vazkii.botania.common.entity.EntityThornChakram; -import vazkii.botania.common.entity.EntityThrownItem; -import vazkii.botania.common.entity.EntityVineBall; +import vazkii.botania.common.block.tile.mana.*; +import vazkii.botania.common.block.tile.string.*; +import vazkii.botania.common.entity.*; import vazkii.botania.common.lib.LibMisc; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class ModelHandler { static boolean registeredModels = false; - @SubscribeEvent public static void registerModels(ModelRegistryEvent evt) { registeredModels = true; 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 2b2e46246..84b2174c7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -8,18 +8,13 @@ */ package vazkii.botania.client.core.handler; -import com.google.common.base.Joiner; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.AbstractClientPlayerEntity; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.FirstPersonRenderer; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Matrix4f; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.entity.model.BookModel; import net.minecraft.client.renderer.model.Material; import net.minecraft.client.renderer.texture.AtlasTexture; @@ -31,10 +26,7 @@ import net.minecraft.util.HandSide; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RenderHandEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; @@ -49,7 +41,6 @@ import java.util.ArrayList; import java.util.List; // Hacky way to render 3D lexicon, will be reevaluated in the future. -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public class RenderLexicon { private static final MethodHandle APPLY_EQUIP_OFFSET = LibObfuscation.getMethod(FirstPersonRenderer.class, "func_228406_b_", MatrixStack.class, HandSide.class, float.class); private static final MethodHandle APPLY_SWING_OFFSET = LibObfuscation.getMethod(FirstPersonRenderer.class, "func_228399_a_", MatrixStack.class, HandSide.class, float.class); @@ -76,8 +67,7 @@ public class RenderLexicon { private static int quote = -1; private static int misspelling = -1; - @SubscribeEvent - public static void renderItem(RenderHandEvent evt) { + public static void renderHand(RenderHandEvent evt) { Minecraft mc = Minecraft.getInstance(); if (!ConfigHandler.CLIENT.lexicon3dModel.get() || mc.gameSettings.thirdPersonView != 0 diff --git a/src/main/java/vazkii/botania/client/core/handler/SplashHandler.java b/src/main/java/vazkii/botania/client/core/handler/SplashHandler.java index 0cc26a776..d1c0766e5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SplashHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SplashHandler.java @@ -15,25 +15,19 @@ import net.minecraft.profiler.IProfiler; import net.minecraft.resources.IResourceManager; import net.minecraft.resources.SimpleReloadableResourceManager; import net.minecraft.util.Unit; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.ParticleFactoryRegisterEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class SplashHandler { // This is probably the best spot to add a splash listener. It's an event fired after splash reload listener // is registered, but before resource reload happens. Doing the initial load ourselves is not effective, // as we would do it before the splashes are added, and the list is cleared when adding. - @SubscribeEvent public static void registerFactories(ParticleFactoryRegisterEvent event) { ((SimpleReloadableResourceManager) Minecraft.getInstance().getResourceManager()).addReloadListener(new SplashResourceListener()); } 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 0583994c6..e93bf7464 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -15,21 +15,15 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.math.MathHelper; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RenderTooltipEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; -import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public final class TooltipAdditionDisplayHandler { - @SubscribeEvent public static void onToolTipRender(RenderTooltipEvent.PostText evt) { if (evt.getStack().isEmpty()) { return; 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 7ad6f77ad..31f8411bb 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -13,23 +13,14 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.event.entity.player.ItemTooltipEvent; -import net.minecraftforge.eventbus.api.EventPriority; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; -import vazkii.botania.common.lib.LibMisc; import java.util.List; -import java.util.function.Consumer; -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public final class TooltipHandler { - @SubscribeEvent(priority = EventPriority.HIGHEST) public static void onTooltipEvent(ItemTooltipEvent event) { if (ItemKeepIvy.hasIvy(event.getItemStack())) { event.getToolTip().add(new TranslationTextComponent("botaniamisc.hasKeepIvy")); diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index ff1825af3..e2eb6f3c7 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -16,22 +16,13 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Matrix4f; -import net.minecraft.client.renderer.RenderState; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.RenderTypeLookup; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.settings.KeyBinding; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index df3e072df..94c281128 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -35,7 +35,6 @@ import java.io.InputStream; import java.nio.FloatBuffer; import java.util.EnumMap; import java.util.Map; -import java.util.OptionalInt; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; 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 8ba916a56..b7176e0c9 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -8,8 +8,6 @@ */ package vazkii.botania.client.core.proxy; -import com.google.common.collect.ImmutableList; - import net.minecraft.block.FlowerBlock; import net.minecraft.block.TallFlowerBlock; import net.minecraft.client.Minecraft; @@ -18,9 +16,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderTypeBuffers; import net.minecraft.client.renderer.RenderTypeLookup; import net.minecraft.client.renderer.entity.PlayerRenderer; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.renderer.vertex.VertexFormatElement; import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.util.InputMappings; import net.minecraft.entity.LivingEntity; @@ -32,6 +27,9 @@ import net.minecraft.util.registry.Registry; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; import net.minecraftforge.client.settings.KeyConflictContext; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.eventbus.api.EventPriority; +import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.DeferredWorkQueue; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; @@ -41,27 +39,24 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.lwjgl.glfw.GLFW; -import vazkii.botania.client.core.handler.BaubleRenderHandler; -import vazkii.botania.client.core.handler.BossBarHandler; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.handler.ColorHandler; -import vazkii.botania.client.core.handler.ContributorFancinessHandler; -import vazkii.botania.client.core.handler.LayerTerraHelmet; -import vazkii.botania.client.core.handler.MiscellaneousIcons; -import vazkii.botania.client.core.handler.PersistentVariableHelper; +import vazkii.botania.client.core.handler.*; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.fx.FXLightning; +import vazkii.botania.client.fx.ModParticles; +import vazkii.botania.client.render.world.SkyblockRenderEvents; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.decor.BlockModMushroom; +import vazkii.botania.common.block.subtile.functional.BergamuteEventHandler; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.core.proxy.IProxy; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.item.ItemSextant; +import vazkii.botania.common.item.equipment.bauble.ItemDodgeRing; import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.lib.LibMisc; import vazkii.patchouli.api.IMultiblock; @@ -83,12 +78,41 @@ public class ClientProxy implements IProxy { @Override public void registerHandlers() { - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::clientSetup); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::loadComplete); - FMLJavaModLoadingContext.get().getModEventBus().register(MiscellaneousIcons.INSTANCE); // This is the only place it works, but mods are constructed in parallel (brilliant idea) so this // *could* end up blowing up if it races with someone else. Let's pray that doesn't happen. ShaderHelper.initShaders(); + + IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus(); + modBus.addListener(this::clientSetup); + modBus.addListener(this::loadComplete); + modBus.addListener(MiscellaneousIcons.INSTANCE::onTextureStitchPre); + modBus.addListener(MiscellaneousIcons.INSTANCE::onTextureStitchPost); + modBus.addListener(MiscellaneousIcons.INSTANCE::onModelRegister); + modBus.addListener(MiscellaneousIcons.INSTANCE::onModelBake); + modBus.addListener(SplashHandler::registerFactories); + modBus.addListener(ModelHandler::registerModels); + modBus.addListener(ModParticles.FactoryHandler::registerFactories); + + IEventBus forgeBus = MinecraftForge.EVENT_BUS; + forgeBus.addListener(EventPriority.HIGHEST, TooltipHandler::onTooltipEvent); + forgeBus.addListener(TooltipAdditionDisplayHandler::onToolTipRender); + forgeBus.addListener(RenderLexicon::renderHand); + forgeBus.addListener(LightningHandler::onRenderWorldLast); + forgeBus.addListener(KonamiHandler::clientTick); + forgeBus.addListener(KonamiHandler::handleInput); + forgeBus.addListener(KonamiHandler::renderBook); + forgeBus.addListener(HUDHandler::onDrawScreenPost); + forgeBus.addListener(DebugHandler::onDrawDebugText); + forgeBus.addListener(CorporeaInputHandler::buttonPressed); + forgeBus.addListener(ClientTickHandler::clientTickEnd); + forgeBus.addListener(ClientTickHandler::renderTick); + forgeBus.addListener(BoundTileRenderer::onWorldRenderLast); + forgeBus.addListener(BossBarHandler::onBarRender); + forgeBus.addListener(BlockHighlightRenderHandler::onWorldRenderLast); + forgeBus.addListener(AstrolabePreviewHandler::onWorldRenderLast); + forgeBus.addListener(SkyblockRenderEvents::onRender); + forgeBus.addListener(ItemDodgeRing::onKeyDown); + forgeBus.addListener(EventPriority.LOWEST, BergamuteEventHandler::onSoundEvent); } private void clientSetup(FMLClientSetupEvent event) { diff --git a/src/main/java/vazkii/botania/client/fx/FXLightning.java b/src/main/java/vazkii/botania/client/fx/FXLightning.java index 83f93ce12..425dec553 100644 --- a/src/main/java/vazkii/botania/client/fx/FXLightning.java +++ b/src/main/java/vazkii/botania/client/fx/FXLightning.java @@ -29,12 +29,7 @@ import vazkii.botania.common.core.helper.Vector3; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Random; +import java.util.*; // Originally taken with permission from WRCBE - heavily modified public class FXLightning extends Particle { diff --git a/src/main/java/vazkii/botania/client/fx/ModParticles.java b/src/main/java/vazkii/botania/client/fx/ModParticles.java index 0a648bedb..9c82bef82 100644 --- a/src/main/java/vazkii/botania/client/fx/ModParticles.java +++ b/src/main/java/vazkii/botania/client/fx/ModParticles.java @@ -10,32 +10,25 @@ package vazkii.botania.client.fx; import net.minecraft.client.Minecraft; import net.minecraft.particles.ParticleType; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.ParticleFactoryRegisterEvent; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.lib.LibMisc; import static vazkii.botania.common.block.ModBlocks.register; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class ModParticles { @ObjectHolder(LibMisc.MOD_ID + ":wisp") public static ParticleType WISP; @ObjectHolder(LibMisc.MOD_ID + ":sparkle") public static ParticleType SPARKLE; - @SubscribeEvent public static void registerParticles(RegistryEvent.Register> evt) { register(evt.getRegistry(), new WispParticleType(), "wisp"); register(evt.getRegistry(), new SparkleParticleType(), "sparkle"); } - @Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public static class FactoryHandler { - @SubscribeEvent public static void registerFactories(ParticleFactoryRegisterEvent evt) { Minecraft.getInstance().particles.registerFactory(ModParticles.WISP, WispParticleType.Factory::new); Minecraft.getInstance().particles.registerFactory(ModParticles.SPARKLE, SparkleParticleType.Factory::new); diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 9a65db019..24fa2b155 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -13,12 +13,7 @@ import mezz.jei.api.JeiPlugin; import mezz.jei.api.constants.VanillaRecipeCategoryUid; import mezz.jei.api.gui.ingredient.IGuiIngredientGroup; import mezz.jei.api.recipe.IRecipeManager; -import mezz.jei.api.registration.IRecipeCatalystRegistration; -import mezz.jei.api.registration.IRecipeCategoryRegistration; -import mezz.jei.api.registration.IRecipeRegistration; -import mezz.jei.api.registration.IRecipeTransferRegistration; -import mezz.jei.api.registration.ISubtypeRegistration; -import mezz.jei.api.registration.IVanillaCategoryExtensionRegistration; +import mezz.jei.api.registration.*; import mezz.jei.api.runtime.IJeiRuntime; import mezz.jei.api.runtime.IRecipesGui; diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index e58c571fb..efc562d67 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -14,7 +14,6 @@ import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.drawable.IDrawable; import mezz.jei.api.gui.ingredient.IGuiIngredientGroup; -import mezz.jei.api.gui.ingredient.IGuiItemStackGroup; import mezz.jei.api.helpers.IGuiHelper; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.category.IRecipeCategory; @@ -22,8 +21,6 @@ import mezz.jei.api.recipe.category.IRecipeCategory; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.FlowingFluidBlock; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -38,7 +35,6 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.Collection; import java.util.Collections; import java.util.stream.Collectors; diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 8227cb436..f90e21b43 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -16,24 +16,12 @@ import com.mojang.datafixers.util.Pair; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.TransformationMatrix; import net.minecraft.client.renderer.Vector3f; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.BlockModel; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.Material; -import net.minecraft.client.renderer.model.ModelBakery; +import net.minecraft.client.renderer.model.*; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.resources.IResourceManager; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.BakedModelWrapper; -import net.minecraftforge.client.model.IModelConfiguration; -import net.minecraftforge.client.model.IModelLoader; -import net.minecraftforge.client.model.ModelTransformComposition; -import net.minecraftforge.client.model.SimpleModelTransform; +import net.minecraftforge.client.model.*; import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.client.model.geometry.IModelGeometry; @@ -45,15 +33,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.Set; +import java.util.*; import java.util.function.Function; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; diff --git a/src/main/java/vazkii/botania/client/model/GunModel.java b/src/main/java/vazkii/botania/client/model/GunModel.java index 2c04e4e43..de16db363 100644 --- a/src/main/java/vazkii/botania/client/model/GunModel.java +++ b/src/main/java/vazkii/botania/client/model/GunModel.java @@ -15,16 +15,7 @@ import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.TransformationMatrix; import net.minecraft.client.renderer.Vector3f; -import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.BlockModel; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IModelTransform; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.client.renderer.model.ItemModelGenerator; -import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.model.ModelBakery; -import net.minecraft.client.renderer.model.ModelResourceLocation; +import net.minecraft.client.renderer.model.*; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.LivingEntity; import net.minecraft.item.Item; @@ -45,12 +36,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; +import java.util.*; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index f8662446a..f7d044375 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -22,7 +22,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; -import vazkii.botania.client.render.tile.RenderTileBrewery; import vazkii.botania.common.block.tile.TileBrewery; import javax.annotation.Nullable; diff --git a/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java index eed7ee86f..dc2a2ea81 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/RotatingRecipeComponent.java @@ -12,13 +12,11 @@ import com.google.gson.annotations.SerializedName; import net.minecraft.client.Minecraft; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.IRecipeType; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; import vazkii.botania.common.crafting.ModRecipeTypes; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.function.Function; diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java index 4fa8e8336..1f2688c72 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java @@ -15,12 +15,10 @@ import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.KeybindTextComponent; import net.minecraft.util.text.TextFormatting; import vazkii.botania.api.recipe.IManaInfusionRecipe; -import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.patchouli.PatchouliUtils; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.mana.TilePool; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index 12d899d19..2e2d9b9b6 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -10,8 +10,8 @@ package vazkii.botania.client.render.entity; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; - import com.mojang.blaze3d.systems.RenderSystem; + import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.AbstractClientPlayerEntity; import net.minecraft.client.renderer.IRenderTypeBuffer; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java index 3eac4c467..ab47abdfa 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -9,8 +9,8 @@ package vazkii.botania.client.render.entity; import com.mojang.blaze3d.platform.GlStateManager; - import com.mojang.blaze3d.systems.RenderSystem; + import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraft.client.renderer.entity.MobRenderer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java index 08fcf7827..e16b72272 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -11,11 +11,7 @@ package vazkii.botania.client.render.tile; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; -import net.minecraft.client.renderer.Atlases; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Matrix3f; -import net.minecraft.client.renderer.Matrix4f; -import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index 9e85aff92..bceee0a96 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -10,14 +10,11 @@ package vazkii.botania.client.render.tile; import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.util.ResourceLocation; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelBrewery; import vazkii.botania.common.block.tile.TileBrewery; 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 9995d0cb7..609cae055 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java @@ -11,19 +11,13 @@ package vazkii.botania.client.render.world; import net.minecraft.client.Minecraft; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RenderWorldLastEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.world.WorldTypeSkyblock; -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public final class SkyblockRenderEvents { - @SubscribeEvent public static void onRender(RenderWorldLastEvent event) { World world = Minecraft.getInstance().world; if (ConfigHandler.CLIENT.enableFancySkybox.get() diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 7c88ef173..4e712f0f4 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -9,12 +9,29 @@ package vazkii.botania.common; import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.block.Block; import net.minecraft.block.Blocks; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.inventory.container.ContainerType; +import net.minecraft.item.Item; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.IRecipeType; +import net.minecraft.particles.ParticleType; +import net.minecraft.potion.Effect; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundEvent; +import net.minecraft.world.gen.ChunkGeneratorType; +import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.storage.loot.conditions.LootConditionManager; import net.minecraft.world.storage.loot.functions.LootFunctionManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.CapabilityManager; +import net.minecraftforge.common.loot.GlobalLootModifierSerializer; +import net.minecraftforge.eventbus.api.EventPriority; +import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.DeferredWorkQueue; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.ModList; @@ -32,47 +49,58 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.brew.Brew; import vazkii.botania.api.capability.FloatingFlowerImpl; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.item.IExoflameHeatable; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.client.core.proxy.ClientProxy; -import vazkii.botania.common.advancements.AlfPortalBreadTrigger; -import vazkii.botania.common.advancements.AlfPortalTrigger; -import vazkii.botania.common.advancements.CorporeaRequestTrigger; -import vazkii.botania.common.advancements.DopplegangerNoArmorTrigger; -import vazkii.botania.common.advancements.LokiPlaceTrigger; -import vazkii.botania.common.advancements.ManaGunTrigger; -import vazkii.botania.common.advancements.RelicBindTrigger; -import vazkii.botania.common.advancements.UseItemSuccessTrigger; +import vazkii.botania.client.fx.ModParticles; +import vazkii.botania.common.advancements.*; import vazkii.botania.common.block.ModBanners; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; +import vazkii.botania.common.block.ModSubtiles; +import vazkii.botania.common.block.string.BlockRedStringInterceptor; +import vazkii.botania.common.block.subtile.functional.SubTileDaffomill; +import vazkii.botania.common.block.subtile.functional.SubTileLoonuim; +import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; +import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.block.tile.TileTerraPlate; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; +import vazkii.botania.common.brew.ModBrews; +import vazkii.botania.common.brew.ModPotions; +import vazkii.botania.common.brew.potion.PotionBloodthirst; +import vazkii.botania.common.brew.potion.PotionEmptiness; +import vazkii.botania.common.brew.potion.PotionSoulCross; import vazkii.botania.common.capability.NoopCapStorage; import vazkii.botania.common.capability.NoopExoflameHeatable; import vazkii.botania.common.core.command.CommandSkyblockSpread; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.core.handler.EquipmentHandler; -import vazkii.botania.common.core.handler.IMCHandler; -import vazkii.botania.common.core.handler.IMCSender; -import vazkii.botania.common.core.handler.ManaNetworkHandler; +import vazkii.botania.common.core.handler.*; import vazkii.botania.common.core.helper.ColorHelper; -import vazkii.botania.common.core.loot.BindUuid; -import vazkii.botania.common.core.loot.EnableRelics; -import vazkii.botania.common.core.loot.LootHandler; -import vazkii.botania.common.core.loot.TrueGuardianKiller; +import vazkii.botania.common.core.loot.*; import vazkii.botania.common.core.proxy.IProxy; import vazkii.botania.common.core.proxy.ServerProxy; +import vazkii.botania.common.crafting.ModRecipeTypes; +import vazkii.botania.common.entity.ModEntities; import vazkii.botania.common.impl.corporea.CorporeaItemStackMatcher; import vazkii.botania.common.impl.corporea.CorporeaStringMatcher; +import vazkii.botania.common.item.ItemGrassSeeds; +import vazkii.botania.common.item.ItemKeepIvy; +import vazkii.botania.common.item.ItemVirus; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.equipment.bauble.ItemGoddessCharm; +import vazkii.botania.common.item.material.ItemEnderAir; +import vazkii.botania.common.item.relic.ItemLokiRing; +import vazkii.botania.common.item.relic.ItemOdinRing; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.world.ModFeatures; import vazkii.botania.common.world.SkyblockWorldEvents; import vazkii.botania.common.world.WorldTypeSkyblock; +import vazkii.botania.data.DataGenerators; import vazkii.patchouli.api.IMultiblock; import vazkii.patchouli.api.IStateMatcher; import vazkii.patchouli.api.PatchouliAPI; @@ -90,25 +118,73 @@ public class Botania { public static boolean coloredLightsLoaded = false; public static boolean curiosLoaded = false; - public static Botania instance; public static IProxy proxy; public static boolean finishedLoading = false; public static final Logger LOGGER = LogManager.getLogger(LibMisc.MOD_ID); public Botania() { - instance = this; proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> ServerProxy::new); proxy.registerHandlers(); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::commonSetup); - FMLJavaModLoadingContext.get().getModEventBus().addListener(IMCSender::enqueue); - FMLJavaModLoadingContext.get().getModEventBus().addListener(IMCHandler::handle); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::loadComplete); ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ConfigHandler.CLIENT_SPEC); ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ConfigHandler.COMMON_SPEC); - MinecraftForge.EVENT_BUS.addListener(this::serverAboutToStart); - MinecraftForge.EVENT_BUS.addListener(this::serverStarting); - MinecraftForge.EVENT_BUS.addListener(this::serverStopping); + + IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus(); + modBus.addListener(this::commonSetup); + modBus.addListener(IMCSender::enqueue); + modBus.addListener(IMCHandler::handle); + modBus.addListener(this::loadComplete); + modBus.addListener(DataGenerators::gatherData); + modBus.addGenericListener(ChunkGeneratorType.class, ModFeatures::registerChunkGenerators); + modBus.addGenericListener(Feature.class, ModFeatures::registerFeatures); + modBus.addGenericListener(Item.class, ModItems::registerItems); + modBus.addGenericListener(ContainerType.class, ModItems::registerContainers); + modBus.addGenericListener(IRecipeSerializer.class, ModItems::registerRecipeSerializers); + modBus.addGenericListener(EntityType.class, ModEntities::registerEntities); + modBus.addGenericListener(IRecipeSerializer.class, ModRecipeTypes::register); + modBus.addGenericListener(SoundEvent.class, ModSounds::registerSounds); + modBus.addGenericListener(Brew.class, ModBrews::register); + modBus.addListener(ModBrews::registerRegistry); + modBus.addGenericListener(Effect.class, ModPotions::registerPotions); + modBus.addGenericListener(Block.class, ModBlocks::registerBlocks); + modBus.addGenericListener(Item.class, ModBlocks::registerItemBlocks); + modBus.addGenericListener(TileEntityType.class, ModBlocks::initTileEntities); + modBus.addGenericListener(Block.class, ModFluffBlocks::registerBlocks); + modBus.addGenericListener(Item.class, ModFluffBlocks::registerItemBlocks); + modBus.addGenericListener(ParticleType.class, ModParticles::registerParticles); + modBus.addGenericListener(Block.class, ModSubtiles::registerBlocks); + modBus.addGenericListener(Item.class, ModSubtiles::registerItemBlocks); + modBus.addGenericListener(TileEntityType.class, ModSubtiles::registerTEs); + modBus.addGenericListener(GlobalLootModifierSerializer.class, DisposeModifier::register); + + IEventBus forgeBus = MinecraftForge.EVENT_BUS; + forgeBus.addListener(this::serverAboutToStart); + forgeBus.addListener(this::serverStarting); + forgeBus.addListener(this::serverStopping); + forgeBus.addListener(ItemLokiRing::onPlayerInteract); + forgeBus.addListener(ItemOdinRing::onPlayerAttacked); + forgeBus.addListener(ItemEnderAir::onPlayerInteract); + forgeBus.addListener(ItemGoddessCharm::onExplosion); + forgeBus.addListener(ItemGrassSeeds::onTickEnd); + forgeBus.addListener(ItemKeepIvy::onPlayerDrops); + forgeBus.addListener(ItemKeepIvy::onPlayerRespawn); + forgeBus.addListener(ItemVirus::onLivingHurt); + forgeBus.addListener(SleepingHandler::trySleep); + forgeBus.addListener(PixieHandler::onDamageTaken); + forgeBus.addGenericListener(Entity.class, PixieHandler::registerAttribute); + forgeBus.addGenericListener(TileEntity.class, ExoflameFurnaceHandler::attachFurnaceCapability); + forgeBus.addListener(CommonTickHandler::onTick); + forgeBus.addListener(PotionBloodthirst::onSpawn); + forgeBus.addListener(PotionEmptiness::onSpawn); + forgeBus.addListener(PotionSoulCross::onEntityKill); + forgeBus.addListener(SubTileNarslimmus::onSpawn); + forgeBus.addListener(SubTileDaffomill::onItemTrack); + forgeBus.addListener(SubTileVinculotus::onEndermanTeleport); + forgeBus.addListener(EventPriority.LOWEST, SubTileLoonuim::onDrops); + forgeBus.addListener(BlockRedStringInterceptor::onInteract); + forgeBus.addListener(ManaNetworkHandler.instance::onNetworkEvent); + forgeBus.addListener(EventPriority.HIGHEST, TileCorporeaIndex.getInputHandler()::onChatMessage); + forgeBus.addListener(LootHandler::lootLoad); } private void commonSetup(FMLCommonSetupEvent event) { @@ -130,16 +206,14 @@ public class Botania { } } - MinecraftForge.EVENT_BUS.register(ManaNetworkHandler.instance); - MinecraftForge.EVENT_BUS.register(TileCorporeaIndex.getInputHandler()); - MinecraftForge.EVENT_BUS.register(new LootHandler()); - EquipmentHandler.init(); CorporeaHelper.instance().registerRequestMatcher(prefix("string"), CorporeaStringMatcher.class, CorporeaStringMatcher::createFromNBT); CorporeaHelper.instance().registerRequestMatcher(prefix("item_stack"), CorporeaItemStackMatcher.class, CorporeaItemStackMatcher::createFromNBT); if (Botania.gardenOfGlassLoaded) { - MinecraftForge.EVENT_BUS.register(SkyblockWorldEvents.class); + MinecraftForge.EVENT_BUS.addListener(SkyblockWorldEvents::loadLoot); + MinecraftForge.EVENT_BUS.addListener(SkyblockWorldEvents::onPlayerUpdate); + MinecraftForge.EVENT_BUS.addListener(SkyblockWorldEvents::onPlayerInteract); } DeferredWorkQueue.runLater(() -> { diff --git a/src/main/java/vazkii/botania/common/advancements/AlfPortalBreadTrigger.java b/src/main/java/vazkii/botania/common/advancements/AlfPortalBreadTrigger.java index 5dc33c52e..cdcb2a8d5 100644 --- a/src/main/java/vazkii/botania/common/advancements/AlfPortalBreadTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/AlfPortalBreadTrigger.java @@ -24,12 +24,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; public class AlfPortalBreadTrigger implements ICriterionTrigger { public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "alf_portal_bread"); diff --git a/src/main/java/vazkii/botania/common/advancements/AlfPortalTrigger.java b/src/main/java/vazkii/botania/common/advancements/AlfPortalTrigger.java index 6d4399ed8..e0d033b48 100644 --- a/src/main/java/vazkii/botania/common/advancements/AlfPortalTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/AlfPortalTrigger.java @@ -26,12 +26,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; public class AlfPortalTrigger implements ICriterionTrigger { public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "open_elf_portal"); diff --git a/src/main/java/vazkii/botania/common/advancements/CorporeaRequestTrigger.java b/src/main/java/vazkii/botania/common/advancements/CorporeaRequestTrigger.java index d55970215..f00f19034 100644 --- a/src/main/java/vazkii/botania/common/advancements/CorporeaRequestTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/CorporeaRequestTrigger.java @@ -25,12 +25,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; public class CorporeaRequestTrigger implements ICriterionTrigger { public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "corporea_index_request"); diff --git a/src/main/java/vazkii/botania/common/advancements/DopplegangerNoArmorTrigger.java b/src/main/java/vazkii/botania/common/advancements/DopplegangerNoArmorTrigger.java index 5f67aea6c..b8e92aaa5 100644 --- a/src/main/java/vazkii/botania/common/advancements/DopplegangerNoArmorTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/DopplegangerNoArmorTrigger.java @@ -25,12 +25,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; public class DopplegangerNoArmorTrigger implements ICriterionTrigger { public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "gaia_guardian_no_armor"); diff --git a/src/main/java/vazkii/botania/common/advancements/LokiPlaceTrigger.java b/src/main/java/vazkii/botania/common/advancements/LokiPlaceTrigger.java index 8e8c7e15c..0dc95ef59 100644 --- a/src/main/java/vazkii/botania/common/advancements/LokiPlaceTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/LokiPlaceTrigger.java @@ -25,12 +25,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; public class LokiPlaceTrigger implements ICriterionTrigger { public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "loki_placed_blocks"); diff --git a/src/main/java/vazkii/botania/common/advancements/ManaGunTrigger.java b/src/main/java/vazkii/botania/common/advancements/ManaGunTrigger.java index e9389c98e..b29ed11f8 100644 --- a/src/main/java/vazkii/botania/common/advancements/ManaGunTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/ManaGunTrigger.java @@ -25,12 +25,7 @@ import vazkii.botania.common.item.ItemManaGun; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; diff --git a/src/main/java/vazkii/botania/common/advancements/RelicBindTrigger.java b/src/main/java/vazkii/botania/common/advancements/RelicBindTrigger.java index 86900960e..921942941 100644 --- a/src/main/java/vazkii/botania/common/advancements/RelicBindTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/RelicBindTrigger.java @@ -23,12 +23,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; public class RelicBindTrigger implements ICriterionTrigger { public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "relic_bind"); diff --git a/src/main/java/vazkii/botania/common/advancements/UseItemSuccessTrigger.java b/src/main/java/vazkii/botania/common/advancements/UseItemSuccessTrigger.java index 8801c3865..ea7c8c372 100644 --- a/src/main/java/vazkii/botania/common/advancements/UseItemSuccessTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/UseItemSuccessTrigger.java @@ -25,12 +25,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; // Catch-all "used an item and it succeeded" trigger for Botania items, because making a separate // trigger for each one is dumb. diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index 81f75622c..142f3ca6b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -21,7 +21,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.common.lib.LibMisc; diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index e7b0e9cb7..28ef84d4c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -25,18 +25,10 @@ import net.minecraft.world.dimension.DimensionType; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.entity.EntityJoinWorldEvent; -import net.minecraftforge.fml.common.Mod; - -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.WeakHashMap; +import java.util.*; public class BlockGhostRail extends AbstractRailBlock { diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 60389a50c..7459940d7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -8,11 +8,7 @@ */ package vazkii.botania.common.block; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.DoublePlantBlock; -import net.minecraft.block.FlowerBlock; -import net.minecraft.block.IGrowable; +import net.minecraft.block.*; import net.minecraft.item.DyeColor; import net.minecraft.potion.Effect; import net.minecraft.potion.Effects; diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 255fa2d5f..f968c4101 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -39,7 +39,6 @@ import net.minecraft.world.storage.WorldSavedData; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.Constants; import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.server.ServerLifecycleHooks; import vazkii.botania.api.wand.IWandable; @@ -51,11 +50,7 @@ import vazkii.botania.common.network.PacketHandler; import javax.annotation.Nonnull; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.UUID; +import java.util.*; public class BlockPistonRelay extends BlockMod implements IWandable { @@ -68,7 +63,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable { public BlockPistonRelay(Properties builder) { super(builder); - MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.addListener(this::tickEnd); } @Override @@ -192,7 +187,6 @@ public class BlockPistonRelay extends BlockMod implements IWandable { } } - @SubscribeEvent public void tickEnd(TickEvent.ServerTickEvent event) { if (event.type == TickEvent.Type.SERVER && event.phase == TickEvent.Phase.END) { MinecraftServer server = ServerLifecycleHooks.getCurrentServer(); diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 15fbdd420..691fc5de9 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.DispenserBlock; -import net.minecraft.block.GlassBlock; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.item.BlockItem; @@ -23,9 +22,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IForgeRegistryEntry; import net.minecraftforge.registries.ObjectHolder; @@ -33,62 +30,18 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.client.render.tile.RenderTilePylon; import vazkii.botania.client.render.tile.TEISR; -import vazkii.botania.common.block.corporea.BlockCorporeaCrystalCube; -import vazkii.botania.common.block.corporea.BlockCorporeaFunnel; -import vazkii.botania.common.block.corporea.BlockCorporeaIndex; -import vazkii.botania.common.block.corporea.BlockCorporeaInterceptor; -import vazkii.botania.common.block.corporea.BlockCorporeaRetainer; +import vazkii.botania.common.block.corporea.*; import vazkii.botania.common.block.decor.*; import vazkii.botania.common.block.dispenser.BehaviourFelPumpkin; import vazkii.botania.common.block.dispenser.BehaviourPoolMinecart; import vazkii.botania.common.block.dispenser.BehaviourWand; import vazkii.botania.common.block.dispenser.SeedBehaviours; -import vazkii.botania.common.block.mana.BlockAlchemyCatalyst; -import vazkii.botania.common.block.mana.BlockBellows; -import vazkii.botania.common.block.mana.BlockBrewery; -import vazkii.botania.common.block.mana.BlockConjurationCatalyst; -import vazkii.botania.common.block.mana.BlockDistributor; -import vazkii.botania.common.block.mana.BlockEnchanter; -import vazkii.botania.common.block.mana.BlockForestDrum; -import vazkii.botania.common.block.mana.BlockManaDetector; -import vazkii.botania.common.block.mana.BlockManaVoid; -import vazkii.botania.common.block.mana.BlockPool; -import vazkii.botania.common.block.mana.BlockPrism; -import vazkii.botania.common.block.mana.BlockPump; -import vazkii.botania.common.block.mana.BlockRFGenerator; -import vazkii.botania.common.block.mana.BlockRuneAltar; -import vazkii.botania.common.block.mana.BlockSpawnerClaw; -import vazkii.botania.common.block.mana.BlockSpreader; -import vazkii.botania.common.block.mana.BlockTerraPlate; -import vazkii.botania.common.block.mana.BlockTurntable; -import vazkii.botania.common.block.string.BlockRedStringComparator; -import vazkii.botania.common.block.string.BlockRedStringContainer; -import vazkii.botania.common.block.string.BlockRedStringDispenser; -import vazkii.botania.common.block.string.BlockRedStringFertilizer; -import vazkii.botania.common.block.string.BlockRedStringInterceptor; -import vazkii.botania.common.block.string.BlockRedStringRelay; +import vazkii.botania.common.block.mana.*; +import vazkii.botania.common.block.string.*; import vazkii.botania.common.block.tile.*; -import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; -import vazkii.botania.common.block.tile.corporea.TileCorporeaFunnel; -import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; -import vazkii.botania.common.block.tile.corporea.TileCorporeaInterceptor; -import vazkii.botania.common.block.tile.corporea.TileCorporeaRetainer; -import vazkii.botania.common.block.tile.mana.TileBellows; -import vazkii.botania.common.block.tile.mana.TileDistributor; -import vazkii.botania.common.block.tile.mana.TileManaDetector; -import vazkii.botania.common.block.tile.mana.TileManaVoid; -import vazkii.botania.common.block.tile.mana.TilePool; -import vazkii.botania.common.block.tile.mana.TilePrism; -import vazkii.botania.common.block.tile.mana.TilePump; -import vazkii.botania.common.block.tile.mana.TileRFGenerator; -import vazkii.botania.common.block.tile.mana.TileSpreader; -import vazkii.botania.common.block.tile.mana.TileTurntable; -import vazkii.botania.common.block.tile.string.TileRedStringComparator; -import vazkii.botania.common.block.tile.string.TileRedStringContainer; -import vazkii.botania.common.block.tile.string.TileRedStringDispenser; -import vazkii.botania.common.block.tile.string.TileRedStringFertilizer; -import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; -import vazkii.botania.common.block.tile.string.TileRedStringRelay; +import vazkii.botania.common.block.tile.corporea.*; +import vazkii.botania.common.block.tile.mana.*; +import vazkii.botania.common.block.tile.string.*; import vazkii.botania.common.item.ItemGaiaHead; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockDreamwood; @@ -101,7 +54,6 @@ import vazkii.botania.common.lib.LibMisc; import java.util.Arrays; import java.util.Locale; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) @ObjectHolder(LibMisc.MOD_ID) public final class ModBlocks { @ObjectHolder("white" + LibBlockNames.MYSTICAL_FLOWER_SUFFIX) public static Block whiteFlower; @@ -361,7 +313,6 @@ public final class ModBlocks { @ObjectHolder("mutated" + LibBlockNames.ALT_GRASS_SUFFIX) public static Block mutatedGrass; @ObjectHolder(LibBlockNames.ANIMATED_TORCH) public static Block animatedTorch; - @SubscribeEvent public static void registerBlocks(RegistryEvent.Register evt) { IForgeRegistry r = evt.getRegistry(); @@ -568,7 +519,6 @@ public final class ModBlocks { register(r, new BlockAnimatedTorch(Block.Properties.create(Material.MISCELLANEOUS).lightValue(7).notSolid()), LibBlockNames.ANIMATED_TORCH); } - @SubscribeEvent public static void registerItemBlocks(RegistryEvent.Register evt) { IForgeRegistry r = evt.getRegistry(); Item.Properties props = ModItems.defaultBuilder(); @@ -850,7 +800,6 @@ public final class ModBlocks { SeedBehaviours.init(); } - @SubscribeEvent public static void initTileEntities(RegistryEvent.Register> evt) { IForgeRegistry> r = evt.getRegistry(); register(r, TileEntityType.Builder.create(TileAltar::new, diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index a25c9b836..fa10c60da 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -8,21 +8,11 @@ */ package vazkii.botania.common.block; -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.block.FenceBlock; -import net.minecraft.block.FenceGateBlock; -import net.minecraft.block.RotatedPillarBlock; -import net.minecraft.block.SlabBlock; -import net.minecraft.block.SoundType; -import net.minecraft.block.WallBlock; +import net.minecraft.block.*; import net.minecraft.block.material.Material; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.EventPriority; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.ObjectHolder; @@ -33,14 +23,9 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; import static vazkii.botania.common.block.ModBlocks.register; -import static vazkii.botania.common.lib.LibBlockNames.FENCE_GATE_SUFFIX; -import static vazkii.botania.common.lib.LibBlockNames.FENCE_SUFFIX; -import static vazkii.botania.common.lib.LibBlockNames.SLAB_SUFFIX; -import static vazkii.botania.common.lib.LibBlockNames.STAIR_SUFFIX; -import static vazkii.botania.common.lib.LibBlockNames.WALL_SUFFIX; +import static vazkii.botania.common.lib.LibBlockNames.*; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) @ObjectHolder(LibMisc.MOD_ID) public final class ModFluffBlocks { @@ -232,7 +217,6 @@ public final class ModFluffBlocks { @ObjectHolder(LibBlockNames.ELF_GLASS + "_pane") public static Block alfglassPane; @ObjectHolder(LibBlockNames.BIFROST + "_pane") public static Block bifrostPane; - @SubscribeEvent(priority = EventPriority.LOW) // Run after ModBlocks public static void registerBlocks(RegistryEvent.Register evt) { IForgeRegistry r = evt.getRegistry(); @@ -324,7 +308,6 @@ public final class ModFluffBlocks { register(r, new BlockModPane(Block.Properties.from(base)), LibBlockNames.BIFROST + "_pane"); } - @SubscribeEvent public static void registerItemBlocks(RegistryEvent.Register evt) { IForgeRegistry r = evt.getRegistry(); Item.Properties props = ModItems.defaultBuilder(); diff --git a/src/main/java/vazkii/botania/common/block/ModSubtiles.java b/src/main/java/vazkii/botania/common/block/ModSubtiles.java index dccb6c681..8f897d55e 100644 --- a/src/main/java/vazkii/botania/common/block/ModSubtiles.java +++ b/src/main/java/vazkii/botania/common/block/ModSubtiles.java @@ -20,9 +20,6 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.ObjectHolder; @@ -30,19 +27,7 @@ import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.common.block.subtile.SubTileManastar; import vazkii.botania.common.block.subtile.SubTilePureDaisy; import vazkii.botania.common.block.subtile.functional.*; -import vazkii.botania.common.block.subtile.generating.SubTileArcaneRose; -import vazkii.botania.common.block.subtile.generating.SubTileDandelifeon; -import vazkii.botania.common.block.subtile.generating.SubTileEndoflame; -import vazkii.botania.common.block.subtile.generating.SubTileEntropinnyum; -import vazkii.botania.common.block.subtile.generating.SubTileGourmaryllis; -import vazkii.botania.common.block.subtile.generating.SubTileHydroangeas; -import vazkii.botania.common.block.subtile.generating.SubTileKekimurus; -import vazkii.botania.common.block.subtile.generating.SubTileMunchdew; -import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; -import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; -import vazkii.botania.common.block.subtile.generating.SubTileShulkMeNot; -import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; -import vazkii.botania.common.block.subtile.generating.SubTileThermalily; +import vazkii.botania.common.block.subtile.generating.*; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; @@ -53,7 +38,6 @@ import java.util.function.Supplier; import static vazkii.botania.common.block.ModBlocks.register; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) @ObjectHolder(LibMisc.MOD_ID) public class ModSubtiles { @ObjectHolder("pure_daisy") public static Block pureDaisy; @@ -218,7 +202,6 @@ public class ModSubtiles { ); } - @SubscribeEvent public static void registerBlocks(RegistryEvent.Register evt) { IForgeRegistry r = evt.getRegistry(); Block.Properties props = Block.Properties.from(Blocks.POPPY); @@ -230,7 +213,6 @@ public class ModSubtiles { } } - @SubscribeEvent public static void registerItemBlocks(RegistryEvent.Register evt) { Registry b = Registry.BLOCK; IForgeRegistry r = evt.getRegistry(); @@ -245,7 +227,6 @@ public class ModSubtiles { } } - @SubscribeEvent public static void registerTEs(RegistryEvent.Register> evt) { Registry b = Registry.BLOCK; IForgeRegistry> r = evt.getRegistry(); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index c5556283c..10fffd09d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -29,7 +29,6 @@ import net.minecraft.world.storage.loot.LootParameters; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.BlockModWaterloggable; 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 5988aa3d5..3b89ea575 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -18,18 +18,14 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.Random; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class BlockRedStringInterceptor extends BlockRedString { public BlockRedStringInterceptor(Block.Properties builder) { @@ -43,7 +39,6 @@ public class BlockRedStringInterceptor extends BlockRedString { builder.add(BlockStateProperties.POWERED); } - @SubscribeEvent public static void onInteract(PlayerInteractEvent.RightClickBlock event) { TileRedStringInterceptor.onInteract(event.getPlayer(), 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 1dc6eff80..0342f9b33 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 @@ -8,31 +8,21 @@ */ package vazkii.botania.common.block.subtile.functional; -import net.minecraft.client.audio.ISound; -import net.minecraft.client.audio.ITickableSound; -import net.minecraft.client.audio.Sound; -import net.minecraft.client.audio.SoundEventAccessor; -import net.minecraft.client.audio.SoundHandler; -import net.minecraft.client.audio.TickableSound; +import net.minecraft.client.audio.*; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.sound.PlaySoundEvent; -import net.minecraftforge.eventbus.api.EventPriority; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; 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.util.Random; -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public class BergamuteEventHandler { private BergamuteEventHandler() {} @@ -40,7 +30,6 @@ public class BergamuteEventHandler { private static final Random RAND = new Random(); private static final float MULTIPLIER = 0.15F; - @SubscribeEvent(priority = EventPriority.LOWEST) public static void onSoundEvent(PlaySoundEvent evt) { ISound sound = evt.getResultSound(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java index f7930b86f..d81573e90 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java @@ -10,14 +10,7 @@ package vazkii.botania.common.block.subtile.functional; import com.google.common.collect.ImmutableSet; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.BushBlock; -import net.minecraft.block.CropsBlock; -import net.minecraft.block.IGrowable; -import net.minecraft.block.SaplingBlock; -import net.minecraft.block.SweetBerryBushBlock; +import net.minecraft.block.*; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 3b1c69429..67ad654b4 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -21,7 +21,6 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -173,7 +172,6 @@ public class SubTileDaffomill extends TileEntityFunctionalFlower { } // Send item age to client to prevent client desync when an item is e.g. dropped by a powered open crate - @SubscribeEvent public static void onItemTrack(PlayerEvent.StartTracking evt) { if (evt.getTarget() instanceof ItemEntity) { int entityId = evt.getTarget().getEntityId(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java index 143abd147..78addb996 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java @@ -14,7 +14,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IExoflameHeatable; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; 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 1fcc631d1..598bb6dad 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 @@ -32,9 +32,6 @@ import net.minecraft.world.server.ServerWorld; import net.minecraft.world.storage.loot.LootContext; import net.minecraft.world.storage.loot.LootParameterSets; import net.minecraftforge.event.entity.living.LivingDropsEvent; -import net.minecraftforge.eventbus.api.EventPriority; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -46,7 +43,6 @@ import java.util.Collections; import java.util.List; import java.util.Random; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class SubTileLoonuim extends TileEntityFunctionalFlower { @ObjectHolder(LibMisc.MOD_ID + ":loonium") public static TileEntityType TYPE; @@ -198,7 +194,6 @@ public class SubTileLoonuim extends TileEntityFunctionalFlower { cmp.putString(TAG_LOOT_TABLE, lootTable.toString()); } - @SubscribeEvent(priority = EventPriority.LOWEST) public static void onDrops(LivingDropsEvent event) { LivingEntity e = event.getEntityLiving(); if (e.getPersistentData().contains(TAG_ITEMSTACK_TO_DROP)) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index 469d0b526..ce44a4311 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -8,7 +8,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import net.minecraft.entity.LivingEntity; import net.minecraft.entity.MobEntity; import net.minecraft.entity.ai.goal.AvoidEntityGoal; import net.minecraft.entity.ai.goal.NearestAttackableTargetGoal; 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 b578a7aac..f3590a6d8 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 @@ -12,8 +12,6 @@ import net.minecraft.entity.monster.EndermanEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraftforge.event.entity.living.EnderTeleportEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -21,13 +19,8 @@ import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibMisc; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.WeakHashMap; +import java.util.*; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class SubTileVinculotus extends TileEntityFunctionalFlower { @ObjectHolder(LibMisc.MOD_ID + ":vinculotus") public static TileEntityType TYPE; @@ -67,7 +60,6 @@ public class SubTileVinculotus extends TileEntityFunctionalFlower { return 500; } - @SubscribeEvent public static void onEndermanTeleport(EnderTeleportEvent event) { int cost = 50; 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 1825567f5..18a290fb9 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 @@ -21,8 +21,6 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -31,7 +29,6 @@ import vazkii.botania.common.lib.LibMisc; import java.util.List; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class SubTileNarslimmus extends TileEntityGeneratingFlower { @ObjectHolder(LibMisc.MOD_ID + ":narslimmus") public static TileEntityType TYPE; @@ -90,7 +87,6 @@ public class SubTileNarslimmus extends TileEntityGeneratingFlower { return 0x71C373; } - @SubscribeEvent public static void onSpawn(LivingSpawnEvent.CheckSpawn event) { if (event.getEntityLiving() instanceof SlimeEntity && event.getSpawnReason() == SpawnReason.NATURAL diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java index 50546e4e8..2dae7a72a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java @@ -15,7 +15,6 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; -import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index 4c9b0de25..6f4d184d6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -41,7 +41,6 @@ import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.RecipeWrapper; -import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.VanillaPacketDispatcher; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index a64368b02..1d322808b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -19,7 +19,6 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Hand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.items.wrapper.RecipeWrapper; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.brew.IBrewContainer; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 6aff0bf8a..760acd6eb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -25,19 +25,13 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraft.util.LazyValue; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.ResourceLocationException; -import net.minecraft.util.Rotation; -import net.minecraft.util.SoundCategory; +import net.minecraft.util.*; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.VanillaPacketDispatcher; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java index 236d0f2de..33eb97fc2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -22,7 +22,6 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.capability.FloatingFlowerImpl; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.state.BotaniaStateProps; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index 0c99ecbee..183ff7d98 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -18,7 +18,6 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.mana.spark.SparkUpgradeType; -import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.item.ItemSparkUpgrade; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java index 4a50f4912..643f3506f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -8,11 +8,7 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.ILivingEntityData; -import net.minecraft.entity.MobEntity; -import net.minecraft.entity.SpawnReason; +import net.minecraft.entity.*; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; import net.minecraft.tileentity.ITickableTileEntity; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index 7b4f83806..ec74a51c3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -14,11 +14,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.INameable; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundCategory; +import net.minecraft.util.*; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TranslationTextComponent; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index f9e6e70ae..fa5ad8a9b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -19,8 +19,6 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ServerChatEvent; -import net.minecraftforge.eventbus.api.EventPriority; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.corporea.*; @@ -29,12 +27,7 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.WeakHashMap; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -380,7 +373,6 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ } public static final class InputHandler { - @SubscribeEvent(priority = EventPriority.HIGHEST) public void onChatMessage(ServerChatEvent event) { if (event.getPlayer().isSpectator()) { return; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index 46a3e9264..849bb66ab 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -16,14 +16,11 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.corporea.*; import vazkii.botania.common.block.tile.TileMod; -import vazkii.botania.common.impl.corporea.CorporeaItemStackMatcher; -import vazkii.botania.common.impl.corporea.CorporeaStringMatcher; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nullable; -import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java index e3670c92f..cb296808e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java @@ -16,11 +16,7 @@ import net.minecraft.item.crafting.IRecipeType; import net.minecraft.nbt.CompoundNBT; import net.minecraft.particles.ParticleTypes; import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.tileentity.AbstractFurnaceTileEntity; -import net.minecraft.tileentity.FurnaceTileEntity; -import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; +import net.minecraft.tileentity.*; import net.minecraft.util.Direction; import net.minecraft.util.SoundCategory; import net.minecraftforge.registries.ObjectHolder; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index f697e1a4b..e43d42533 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -15,7 +15,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileMod; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index db738c2d8..51c0f3c3c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -35,11 +35,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IManaDissolvable; -import vazkii.botania.api.mana.IKeyLocked; -import vazkii.botania.api.mana.IManaItem; -import vazkii.botania.api.mana.IManaPool; -import vazkii.botania.api.mana.IThrottledPacket; -import vazkii.botania.api.mana.ManaNetworkEvent; +import vazkii.botania.api.mana.*; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.recipe.IManaInfusionRecipe; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 7971b2d14..28e11e6a0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -27,11 +27,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.Mirror; import net.minecraft.util.Rotation; import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.*; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -39,18 +35,7 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.mana.BurstProperties; -import vazkii.botania.api.mana.IDirectioned; -import vazkii.botania.api.mana.IKeyLocked; -import vazkii.botania.api.mana.ILens; -import vazkii.botania.api.mana.ILensControl; -import vazkii.botania.api.mana.ILensEffect; -import vazkii.botania.api.mana.IManaCollector; -import vazkii.botania.api.mana.IManaPool; -import vazkii.botania.api.mana.IManaReceiver; -import vazkii.botania.api.mana.IManaSpreader; -import vazkii.botania.api.mana.IThrottledPacket; -import vazkii.botania.api.mana.ManaNetworkEvent; +import vazkii.botania.api.mana.*; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.mana.BlockSpreader; diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index 317c3e13b..282d21e6c 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -14,20 +14,16 @@ import net.minecraft.potion.PotionUtils; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.RegistryBuilder; import vazkii.botania.api.brew.Brew; import vazkii.botania.common.lib.LibBrewNames; -import vazkii.botania.common.lib.LibMisc; import java.util.Arrays; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, modid = LibMisc.MOD_ID) public class ModBrews { public static IForgeRegistry registry; @@ -56,7 +52,6 @@ public class ModBrews { public static Brew warpWard; - @SubscribeEvent public static void registerRegistry(RegistryEvent.NewRegistry evt) { registry = new RegistryBuilder() .setName(prefix("brews")) @@ -66,7 +61,6 @@ public class ModBrews { .create(); } - @SubscribeEvent public static void register(RegistryEvent.Register evt) { evt.getRegistry().registerAll(fallbackBrew, speed, strength, haste, healing, jumpBoost, regen, regenWeak, resistance, fireResistance, waterBreathing, invisibility, nightVision, absorption, overload, soulCross, featherfeet, diff --git a/src/main/java/vazkii/botania/common/brew/ModPotions.java b/src/main/java/vazkii/botania/common/brew/ModPotions.java index b80c3e656..b2e90887f 100644 --- a/src/main/java/vazkii/botania/common/brew/ModPotions.java +++ b/src/main/java/vazkii/botania/common/brew/ModPotions.java @@ -10,19 +10,11 @@ package vazkii.botania.common.brew; import net.minecraft.potion.Effect; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import vazkii.botania.common.brew.potion.PotionAllure; -import vazkii.botania.common.brew.potion.PotionBloodthirst; -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.brew.potion.*; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibPotionNames; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class ModPotions { public static final Effect soulCross = new PotionSoulCross().setRegistryName(LibMisc.MOD_ID, LibPotionNames.SOUL_CROSS); @@ -32,7 +24,6 @@ public class ModPotions { public static final Effect allure = new PotionAllure().setRegistryName(LibMisc.MOD_ID, LibPotionNames.ALLURE); public static final Effect clear = new PotionClear().setRegistryName(LibMisc.MOD_ID, LibPotionNames.CLEAR); - @SubscribeEvent public static void registerPotions(RegistryEvent.Register evt) { evt.getRegistry().register(soulCross); evt.getRegistry().register(featherfeet); diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java index 8c9852feb..b2102f2d2 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -15,13 +15,9 @@ import net.minecraft.potion.EffectType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.common.brew.ModPotions; -import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class PotionBloodthirst extends Effect { private static final int RANGE = 64; @@ -30,7 +26,6 @@ public class PotionBloodthirst extends Effect { super(EffectType.BENEFICIAL, 0xC30000); } - @SubscribeEvent public static void onSpawn(LivingSpawnEvent.CheckSpawn event) { if (event.getResult() != Event.Result.ALLOW && event.getEntityLiving() instanceof IMob) { AxisAlignedBB aabb = new AxisAlignedBB(event.getX() - RANGE, event.getY() - RANGE, event.getZ() - RANGE, diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java index 7292a7398..db2b2d7dc 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -15,7 +15,6 @@ import net.minecraft.potion.EffectType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.eventbus.api.SubscribeEvent; import vazkii.botania.common.brew.ModPotions; @@ -27,7 +26,6 @@ public class PotionEmptiness extends Effect { super(EffectType.BENEFICIAL, 0xFACFFF); } - @SubscribeEvent public static void onSpawn(LivingSpawnEvent.CheckSpawn event) { if (event.getResult() != Event.Result.ALLOW && event.getEntityLiving() instanceof IMob) { AxisAlignedBB aabb = new AxisAlignedBB(event.getX() - RANGE, event.getY() - RANGE, event.getZ() - RANGE, diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java index 8b5512351..fa104133b 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java @@ -13,20 +13,15 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.potion.Effect; import net.minecraft.potion.EffectType; import net.minecraftforge.event.entity.living.LivingDeathEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.common.brew.ModPotions; -import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class PotionSoulCross extends Effect { public PotionSoulCross() { super(EffectType.BENEFICIAL, 0x47453d); } - @SubscribeEvent public static void onEntityKill(LivingDeathEvent event) { Entity killer = event.getSource().getTrueSource(); if (killer instanceof LivingEntity) { 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 8023dc779..1b2584224 100644 --- a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java @@ -9,19 +9,14 @@ package vazkii.botania.common.core.handler; import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.common.impl.corporea.CorporeaHelperImpl; -import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class CommonTickHandler { private CommonTickHandler() {} - @SubscribeEvent public static void onTick(TickEvent.WorldTickEvent event) { if (event.phase == TickEvent.Phase.END) { ((CorporeaHelperImpl) CorporeaHelper.instance()).clearCache(); diff --git a/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java b/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java index f8da02067..6747a251d 100644 --- a/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java @@ -38,8 +38,8 @@ public abstract class EquipmentHandler { public static void init() { if (Botania.curiosLoaded) { instance = new CurioIntegration(); - FMLJavaModLoadingContext.get().getModEventBus().register(CurioIntegration.class); - MinecraftForge.EVENT_BUS.register(CurioIntegration.class); + FMLJavaModLoadingContext.get().getModEventBus().addListener(CurioIntegration::sendImc); + MinecraftForge.EVENT_BUS.addListener(CurioIntegration::keepCurioDrops); } else { InventoryEquipmentHandler handler = new InventoryEquipmentHandler(); instance = handler; diff --git a/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java b/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java index b9937ec0a..1d5dcaaa0 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java @@ -20,10 +20,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; import net.minecraftforge.event.AttachCapabilitiesEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IExoflameHeatable; import vazkii.botania.common.Botania; import vazkii.botania.common.capability.SimpleCapProvider; @@ -32,7 +29,6 @@ import vazkii.botania.common.lib.LibObfuscation; import java.lang.invoke.MethodHandle; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ExoflameFurnaceHandler { @CapabilityInject(IExoflameHeatable.class) public static Capability CAPABILITY; @@ -41,7 +37,6 @@ public class ExoflameFurnaceHandler { private static final MethodHandle CAN_SMELT = LibObfuscation.getMethod(AbstractFurnaceTileEntity.class, "func_214008_b", IRecipe.class); private static final MethodHandle RECIPE_TYPE = LibObfuscation.getGetter(AbstractFurnaceTileEntity.class, "field_214014_c"); - @SubscribeEvent public static void attachFurnaceCapability(AttachCapabilitiesEvent event) { TileEntity te = event.getObject(); if (te instanceof AbstractFurnaceTileEntity) { diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index ac186b69b..98dc59785 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -11,18 +11,13 @@ package vazkii.botania.common.core.handler; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.eventbus.api.SubscribeEvent; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.ManaNetworkEvent; import vazkii.botania.api.mana.ManaNetworkEvent.Action; import vazkii.botania.api.mana.ManaNetworkEvent.ManaBlockType; -import java.util.Comparator; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.WeakHashMap; +import java.util.*; import java.util.function.BinaryOperator; public final class ManaNetworkHandler implements IManaNetwork { @@ -32,7 +27,6 @@ public final class ManaNetworkHandler implements IManaNetwork { private final WeakHashMap> manaPools = new WeakHashMap<>(); private final WeakHashMap> manaCollectors = new WeakHashMap<>(); - @SubscribeEvent public void onNetworkEvent(ManaNetworkEvent event) { Map> map = event.type == ManaBlockType.COLLECTOR ? manaCollectors : manaPools; if (event.action == Action.ADD) { 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 b7aab707a..53443ccfc 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java +++ b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java @@ -11,13 +11,10 @@ package vazkii.botania.common.core.handler; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.IForgeRegistry; import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class ModSounds { public static final SoundEvent airRod = makeSoundEvent("airrod"); public static final SoundEvent agricarnation = makeSoundEvent("agricarnation"); @@ -69,7 +66,6 @@ public final class ModSounds { return new SoundEvent(loc).setRegistryName(loc); } - @SubscribeEvent public static void registerSounds(RegistryEvent.Register evt) { IForgeRegistry r = evt.getRegistry(); r.register(airRod); 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 b676cd190..87666f810 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -24,22 +24,17 @@ import net.minecraft.potion.Effects; import net.minecraft.util.Util; import net.minecraft.util.math.BlockPos; import net.minecraftforge.event.AttachCapabilitiesEvent; -import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; 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; import java.util.EnumMap; import java.util.Map; import java.util.UUID; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class PixieHandler { private PixieHandler() {} @@ -66,7 +61,6 @@ public final class PixieHandler { } // Want to do this as early as possible -- doing it at entity join world means attribute modifiers are ignored when loading - @SubscribeEvent public static void registerAttribute(AttachCapabilitiesEvent evt) { if (evt.getObject() instanceof PlayerEntity) { AbstractAttributeMap attributes = ((PlayerEntity) evt.getObject()).getAttributes(); @@ -76,7 +70,6 @@ public final class PixieHandler { } } - @SubscribeEvent public static void onDamageTaken(LivingHurtEvent event) { if (!event.getEntityLiving().world.isRemote && event.getEntityLiving() instanceof PlayerEntity && event.getSource().getTrueSource() instanceof LivingEntity) { PlayerEntity player = (PlayerEntity) event.getEntityLiving(); diff --git a/src/main/java/vazkii/botania/common/core/handler/SleepingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SleepingHandler.java index 44fdd3046..fd3dc5666 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SleepingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SleepingHandler.java @@ -12,18 +12,13 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.common.entity.EntityDoppleganger; -import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class SleepingHandler { private SleepingHandler() {} - @SubscribeEvent public static void trySleep(PlayerSleepInBedEvent event) { World world = event.getPlayer().world; if (!world.isRemote()) { diff --git a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java index 8ba12dec4..e6530aa95 100644 --- a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java @@ -9,7 +9,6 @@ package vazkii.botania.common.core.helper; import net.minecraft.entity.Entity; -import net.minecraft.util.Direction; public final class MathHelper { diff --git a/src/main/java/vazkii/botania/common/core/loot/DisposeModifier.java b/src/main/java/vazkii/botania/common/core/loot/DisposeModifier.java index 9bb4737b4..35a0e3218 100644 --- a/src/main/java/vazkii/botania/common/core/loot/DisposeModifier.java +++ b/src/main/java/vazkii/botania/common/core/loot/DisposeModifier.java @@ -19,11 +19,8 @@ import net.minecraft.world.storage.loot.conditions.ILootCondition; import net.minecraftforge.common.loot.GlobalLootModifierSerializer; import net.minecraftforge.common.loot.LootModifier; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.common.item.equipment.tool.elementium.ItemElementiumPick; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -31,13 +28,11 @@ import java.util.List; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class DisposeModifier extends LootModifier { protected DisposeModifier(ILootCondition[] conditions) { super(conditions); } - @SubscribeEvent public static void register(RegistryEvent.Register> evt) { evt.getRegistry().register(new Serializer().setRegistryName(prefix("dispose"))); } diff --git a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java index 5f814acf7..39d50913e 100644 --- a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java +++ b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java @@ -13,15 +13,11 @@ import net.minecraft.world.storage.loot.LootEntry; import net.minecraft.world.storage.loot.LootPool; import net.minecraft.world.storage.loot.TableLootEntry; import net.minecraftforge.event.LootTableLoadEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public final class LootHandler { - @SubscribeEvent public static void lootLoad(LootTableLoadEvent evt) { String prefix = "minecraft:chests/"; String name = evt.getName().toString(); diff --git a/src/main/java/vazkii/botania/common/crafting/ModRecipeTypes.java b/src/main/java/vazkii/botania/common/crafting/ModRecipeTypes.java index f4e1e9523..7100755d7 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModRecipeTypes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModRecipeTypes.java @@ -15,16 +15,12 @@ import net.minecraft.item.crafting.SpecialRecipeSerializer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.api.recipe.*; import vazkii.botania.common.crafting.recipe.HeadRecipe; -import vazkii.botania.common.lib.LibMisc; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class ModRecipeTypes { public static final IRecipeType MANA_INFUSION_TYPE = new RecipeType<>(); public static final IRecipeSerializer MANA_INFUSION_SERIALIZER = new RecipeManaInfusion.Serializer(); @@ -46,7 +42,6 @@ public class ModRecipeTypes { public static final IRecipeSerializer RUNE_SERIALIZER = new RecipeRuneAltar.Serializer(); public static final IRecipeSerializer RUNE_HEAD_SERIALIZER = new HeadRecipe.Serializer(); - @SubscribeEvent public static void register(RegistryEvent.Register> evt) { ResourceLocation id = prefix("elven_trade"); Registry.register(Registry.RECIPE_TYPE, id, ELVEN_TRADE_TYPE); diff --git a/src/main/java/vazkii/botania/common/crafting/RecipeManaInfusion.java b/src/main/java/vazkii/botania/common/crafting/RecipeManaInfusion.java index 2dd53ba0d..6e8380317 100644 --- a/src/main/java/vazkii/botania/common/crafting/RecipeManaInfusion.java +++ b/src/main/java/vazkii/botania/common/crafting/RecipeManaInfusion.java @@ -23,7 +23,6 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; import net.minecraftforge.common.crafting.CraftingHelper; -import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ForgeRegistryEntry; import vazkii.botania.api.recipe.IManaInfusionRecipe; diff --git a/src/main/java/vazkii/botania/common/crafting/StateIngredientHelper.java b/src/main/java/vazkii/botania/common/crafting/StateIngredientHelper.java index 3140b5419..4526bb38f 100644 --- a/src/main/java/vazkii/botania/common/crafting/StateIngredientHelper.java +++ b/src/main/java/vazkii/botania/common/crafting/StateIngredientHelper.java @@ -32,8 +32,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import java.util.HashSet; import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; public class StateIngredientHelper { public static StateIngredient of(Block block) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index f3203dc39..c1494ca00 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -19,11 +19,7 @@ import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.util.DamageSource; import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.EntityRayTraceResult; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.*; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index bca60cbef..a53c1ecf3 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -16,12 +16,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.TickableSound; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.MobEntity; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.SpawnReason; +import net.minecraft.entity.*; import net.minecraft.entity.ai.goal.LookAtGoal; import net.minecraft.entity.ai.goal.SwimGoal; import net.minecraft.entity.monster.WitherSkeletonEntity; @@ -87,11 +82,8 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.awt.*; -import java.util.ArrayList; -import java.util.Arrays; +import java.util.*; import java.util.List; -import java.util.Random; -import java.util.UUID; import java.util.regex.Pattern; import java.util.stream.Collectors; diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index 029eacdfb..e0b5f1758 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -16,11 +16,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.IPacket; import net.minecraft.util.DamageSource; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.EntityRayTraceResult; -import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.*; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.registries.ObjectHolder; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 6a7f2fa8e..d3e2b3343 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -8,11 +8,7 @@ */ package vazkii.botania.common.entity; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.BushBlock; -import net.minecraft.block.LeavesBlock; +import net.minecraft.block.*; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; @@ -26,13 +22,7 @@ import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.particles.ParticleTypes; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.*; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -41,15 +31,7 @@ import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.mana.IClientManaHandler; -import vazkii.botania.api.mana.ILensEffect; -import vazkii.botania.api.mana.IManaCollector; -import vazkii.botania.api.mana.IManaCollisionGhost; -import vazkii.botania.api.mana.IManaReceiver; -import vazkii.botania.api.mana.IManaSpreader; -import vazkii.botania.api.mana.IManaTrigger; -import vazkii.botania.api.mana.IPingable; -import vazkii.botania.api.mana.IThrottledPacket; +import vazkii.botania.api.mana.*; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.Botania; @@ -61,13 +43,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Random; -import java.util.Set; -import java.util.UUID; +import java.util.*; public class EntityManaBurst extends ThrowableEntity implements IManaBurst { @ObjectHolder(LibMisc.MOD_ID + ":mana_burst") public static EntityType TYPE; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 9aa161ccc..2b7f113bc 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -29,7 +29,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.registries.ObjectHolder; -import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index a1b7addd0..3bbd84017 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -45,15 +45,7 @@ import vazkii.botania.common.network.PacketHandler; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.WeakHashMap; +import java.util.*; import java.util.stream.Collectors; public class EntitySpark extends EntitySparkBase implements ISparkEntity { diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 45e8a4265..c604d2b5f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -19,12 +19,7 @@ import net.minecraft.nbt.NBTUtil; import net.minecraft.network.IPacket; import net.minecraft.network.play.server.SSpawnObjectPacket; import net.minecraft.particles.ParticleTypes; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.*; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 5f7922dbe..553e3daba 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -15,12 +15,7 @@ import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.IPacket; import net.minecraft.util.DamageSource; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.EntityRayTraceResult; -import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.*; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.registries.ObjectHolder; diff --git a/src/main/java/vazkii/botania/common/entity/ModEntities.java b/src/main/java/vazkii/botania/common/entity/ModEntities.java index d5f1c02c5..f1e7db347 100644 --- a/src/main/java/vazkii/botania/common/entity/ModEntities.java +++ b/src/main/java/vazkii/botania/common/entity/ModEntities.java @@ -11,16 +11,11 @@ package vazkii.botania.common.entity; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.common.block.tile.TileLightRelay.EntityPlayerMover; import vazkii.botania.common.lib.LibEntityNames; -import vazkii.botania.common.lib.LibMisc; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class ModEntities { - @SubscribeEvent public static void registerEntities(RegistryEvent.Register> evt) { evt.getRegistry().register(EntityType.Builder.create( EntityManaBurst::new, EntityClassification.MISC) diff --git a/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java b/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java index 38d4029b9..2f882a0b8 100644 --- a/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java +++ b/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java @@ -18,7 +18,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.InterModComms; import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; import net.minecraftforge.items.IItemHandlerModifiable; @@ -44,7 +43,6 @@ import java.util.function.Predicate; // Classloading-safe way to attach curio behaviour to our items public class CurioIntegration extends EquipmentHandler { - @SubscribeEvent public static void sendImc(InterModEnqueueEvent evt) { InterModComms.sendTo("curios", CuriosAPI.IMC.REGISTER_TYPE, () -> new CurioIMCMessage("charm")); InterModComms.sendTo("curios", CuriosAPI.IMC.REGISTER_TYPE, () -> new CurioIMCMessage("ring").setSize(2)); @@ -54,7 +52,6 @@ public class CurioIntegration extends EquipmentHandler { InterModComms.sendTo("curios", CuriosAPI.IMC.REGISTER_TYPE, () -> new CurioIMCMessage("necklace")); } - @SubscribeEvent public static void keepCurioDrops(LivingCurioDropRulesEvent event) { event.addOverride(stack -> { if (ItemKeepIvy.hasIvy(stack)) { diff --git a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java index 78d435864..e22fa6ba4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java +++ b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java @@ -17,12 +17,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.nbt.NBTUtil; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; +import net.minecraft.util.*; import net.minecraft.util.Direction.Axis; -import net.minecraft.util.Hand; -import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 5d67c1723..bdd997a8e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -18,12 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.item.Items; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundEvents; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; import net.minecraft.util.text.ITextComponent; @@ -35,7 +30,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.ItemHandlerHelper; -import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 2a7b6c8f0..73dd32c45 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -20,7 +20,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IManaDissolvable; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.common.core.handler.ModSounds; diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 3b57c00cd..f20a9e0d3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -20,11 +20,7 @@ import net.minecraft.item.Items; import net.minecraft.item.UseAction; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; -import net.minecraft.util.ActionResult; -import net.minecraft.util.DamageSource; -import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundEvents; +import net.minecraft.util.*; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index aa38eec2c..289047ea5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -19,14 +19,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.ResourceLocationException; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvent; -import net.minecraft.util.SoundEvents; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; import net.minecraft.util.text.ITextComponent; @@ -35,7 +28,6 @@ import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index ba7ef4378..457f71ea8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -31,11 +31,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.IWorldPosCallable; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 50d186cc9..5d8fa4d0e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -21,12 +21,7 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.INBT; import net.minecraft.network.play.server.SCollectItemPacket; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -36,11 +31,7 @@ import net.minecraftforge.common.capabilities.ICapabilitySerializable; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.IItemHandlerModifiable; -import net.minecraftforge.items.ItemHandlerHelper; -import net.minecraftforge.items.ItemStackHandler; +import net.minecraftforge.items.*; import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.client.gui.bag.ContainerFlowerBag; diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index cc235c618..7f9db18da 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -21,26 +21,16 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.LogicalSide; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.api.item.IFloatingFlower.IslandType; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.Set; +import java.util.*; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ItemGrassSeeds extends Item implements IFloatingFlowerVariant { /** * Represents a map of dimension IDs to a set of all block swappers @@ -111,7 +101,6 @@ public class ItemGrassSeeds extends Item implements IFloatingFlowerVariant { return ActionResultType.PASS; } - @SubscribeEvent public static void onTickEnd(TickEvent.WorldTickEvent event) { if (event.side == LogicalSide.SERVER && event.phase == TickEvent.Phase.END) { DimensionType dim = event.world.getDimension().getType(); diff --git a/src/main/java/vazkii/botania/common/item/ItemHorn.java b/src/main/java/vazkii/botania/common/item/ItemHorn.java index 42806b9c6..5e03cb0cf 100644 --- a/src/main/java/vazkii/botania/common/item/ItemHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemHorn.java @@ -18,11 +18,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.UseAction; import net.minecraft.tags.BlockTags; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index e18d846dc..60081f86b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -15,16 +15,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.player.PlayerEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ItemKeepIvy extends Item { public static final String TAG_KEEP = "Botania_keepIvy"; @@ -42,7 +38,6 @@ public class ItemKeepIvy extends Item { } // Curios are handled in CurioIntegration#keepCurioDrops - @SubscribeEvent public static void onPlayerDrops(LivingDropsEvent event) { if (!(event.getEntityLiving() instanceof PlayerEntity)) { return; @@ -80,7 +75,6 @@ public class ItemKeepIvy extends Item { } } - @SubscribeEvent public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) { CompoundNBT data = event.getPlayer().getPersistentData(); if (data.contains(PlayerEntity.PERSISTED_NBT_TAG)) { diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 3476f8e63..124c7babc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -8,22 +8,16 @@ */ package vazkii.botania.common.item; -import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; +import net.minecraft.util.*; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index 2e82e4491..89b1d6fb8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -16,7 +16,6 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.common.entity.EntitySpark; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 641a3caeb..27285365e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -12,7 +12,6 @@ import com.mojang.datafixers.util.Pair; import net.minecraft.block.Blocks; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.Item; @@ -30,7 +29,6 @@ import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.client.fx.WispParticleData; diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index ffe7d0216..4d43fc5a3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -13,11 +13,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; +import net.minecraft.util.*; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index ea77ccb83..240a3e8c1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -23,20 +23,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.state.IProperty; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Rotation; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.GlobalPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; +import net.minecraft.util.*; +import net.minecraft.util.math.*; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; @@ -45,7 +33,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.ITileBound; diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index ff7d1b134..88a2c3e4f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -16,11 +16,7 @@ import net.minecraft.entity.SpawnReason; import net.minecraft.entity.ai.attributes.AbstractAttributeMap; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.ai.attributes.IAttributeInstance; -import net.minecraft.entity.passive.horse.AbstractChestedHorseEntity; -import net.minecraft.entity.passive.horse.AbstractHorseEntity; -import net.minecraft.entity.passive.horse.LlamaEntity; -import net.minecraft.entity.passive.horse.SkeletonHorseEntity; -import net.minecraft.entity.passive.horse.ZombieHorseEntity; +import net.minecraft.entity.passive.horse.*; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -30,14 +26,9 @@ import net.minecraft.util.Hand; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -import vazkii.botania.common.lib.LibMisc; - -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ItemVirus extends Item { public ItemVirus(Properties builder) { super(builder); @@ -111,7 +102,6 @@ public class ItemVirus extends Item { return false; } - @SubscribeEvent public static void onLivingHurt(LivingHurtEvent event) { LivingEntity entity = event.getEntityLiving(); if (entity.isPassenger() && entity.getRidingEntity() instanceof LivingEntity) { diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index 5abf87167..6815b00a6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -11,11 +11,7 @@ package vazkii.botania.common.item; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 49a2f93e0..79563caa4 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -22,9 +22,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.common.extensions.IForgeContainerType; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.ObjectHolder; @@ -62,16 +60,8 @@ import vazkii.botania.common.item.equipment.tool.ItemStarSword; import vazkii.botania.common.item.equipment.tool.ItemThunderSword; import vazkii.botania.common.item.equipment.tool.bow.ItemCrystalBow; import vazkii.botania.common.item.equipment.tool.bow.ItemLivingwoodBow; -import vazkii.botania.common.item.equipment.tool.elementium.ItemElementiumAxe; -import vazkii.botania.common.item.equipment.tool.elementium.ItemElementiumPick; -import vazkii.botania.common.item.equipment.tool.elementium.ItemElementiumShears; -import vazkii.botania.common.item.equipment.tool.elementium.ItemElementiumShovel; -import vazkii.botania.common.item.equipment.tool.elementium.ItemElementiumSword; -import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe; -import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; -import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShears; -import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShovel; -import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; +import vazkii.botania.common.item.equipment.tool.elementium.*; +import vazkii.botania.common.item.equipment.tool.manasteel.*; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraAxe; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraSword; @@ -80,33 +70,10 @@ import vazkii.botania.common.item.interaction.thaumcraft.ItemManaInkwell; import vazkii.botania.common.item.interaction.thaumcraft.ItemManasteelHelmRevealing; import vazkii.botania.common.item.interaction.thaumcraft.ItemTerrasteelHelmRevealing; import vazkii.botania.common.item.lens.*; -import vazkii.botania.common.item.material.ItemDye; -import vazkii.botania.common.item.material.ItemEnderAir; -import vazkii.botania.common.item.material.ItemManaResource; -import vazkii.botania.common.item.material.ItemPetal; -import vazkii.botania.common.item.material.ItemRune; -import vazkii.botania.common.item.material.ItemSelfReturning; +import vazkii.botania.common.item.material.*; import vazkii.botania.common.item.record.ItemModRecord; -import vazkii.botania.common.item.relic.ItemDice; -import vazkii.botania.common.item.relic.ItemFlugelEye; -import vazkii.botania.common.item.relic.ItemInfiniteFruit; -import vazkii.botania.common.item.relic.ItemKingKey; -import vazkii.botania.common.item.relic.ItemLokiRing; -import vazkii.botania.common.item.relic.ItemOdinRing; -import vazkii.botania.common.item.relic.ItemThorRing; -import vazkii.botania.common.item.rod.ItemCobbleRod; -import vazkii.botania.common.item.rod.ItemDirtRod; -import vazkii.botania.common.item.rod.ItemDiviningRod; -import vazkii.botania.common.item.rod.ItemExchangeRod; -import vazkii.botania.common.item.rod.ItemFireRod; -import vazkii.botania.common.item.rod.ItemGravityRod; -import vazkii.botania.common.item.rod.ItemMissileRod; -import vazkii.botania.common.item.rod.ItemRainbowRod; -import vazkii.botania.common.item.rod.ItemSkyDirtRod; -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.item.relic.*; +import vazkii.botania.common.item.rod.*; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; @@ -115,7 +82,6 @@ import java.util.Locale; import static vazkii.botania.common.block.ModBlocks.register; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) @ObjectHolder(LibMisc.MOD_ID) public final class ModItems { @ObjectHolder(LibItemNames.LEXICON) public static Item lexicon; @@ -447,7 +413,6 @@ public final class ModItems { return defaultBuilder().maxStackSize(1); } - @SubscribeEvent public static void registerItems(RegistryEvent.Register evt) { IForgeRegistry r = evt.getRegistry(); @@ -707,7 +672,6 @@ public final class ModItems { register(r, new ItemGoddessCharm(unstackable()), LibItemNames.GODDESS_CHARM); } - @SubscribeEvent public static void registerRecipeSerializers(RegistryEvent.Register> evt) { IForgeRegistry> r = evt.getRegistry(); register(r, AncientWillRecipe.SERIALIZER, "ancient_will_attach"); @@ -734,7 +698,6 @@ public final class ModItems { CraftingHelper.register(prefix("fuzzy_nbt"), FuzzyNBTIngredient.SERIALIZER); } - @SubscribeEvent public static void registerContainers(RegistryEvent.Register> evt) { IForgeRegistry> r = evt.getRegistry(); 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 0c1a37c6e..95e3e97a0 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -21,13 +21,11 @@ import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.ModTags; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index 5b4d0d7a0..249f9b124 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -22,13 +22,7 @@ import net.minecraft.item.UseAction; import net.minecraft.potion.Effect; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.EffectUtils; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.Tuple; +import net.minecraft.util.*; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index a586c1a85..d438c7030 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -9,7 +9,6 @@ package vazkii.botania.common.item.equipment.armor.manasteel; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.renderer.entity.model.BipedModel; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index 9659f1981..f3f8637e0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -8,17 +8,7 @@ */ package vazkii.botania.common.item.equipment.armor.terrasteel; -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.vertex.IVertexBuilder; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Atlases; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; -import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; @@ -33,12 +23,10 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.api.mana.IManaDiscountArmor; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.core.helper.ItemNBTHelper; import javax.annotation.Nullable; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 4c7171c41..09a2ac348 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -12,7 +12,6 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.LivingEntity; @@ -30,7 +29,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.capabilities.ICapabilityProvider; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.IPhantomInkable; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index 78345bc17..8fc3f7009 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; @@ -26,7 +25,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.api.item.ICosmeticBauble; import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.helper.RenderHelper; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java index 07ecb9e26..5790991bf 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java @@ -15,7 +15,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.entity.LivingEntity; @@ -25,7 +24,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; -import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.item.ModItems; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index 263ac2178..e1401cdaf 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -13,7 +13,6 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.entity.Entity; @@ -33,7 +32,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.server.ServerLifecycleHooks; -import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.BaubleRenderHandler; 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 ad716005a..ea42aacc0 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 @@ -20,19 +20,15 @@ import net.minecraft.util.math.MathHelper; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.InputEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketDodge; import vazkii.botania.common.network.PacketHandler; -@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public class ItemDodgeRing extends ItemBauble { public static final String TAG_DODGE_COOLDOWN = "dodgeCooldown"; @@ -45,7 +41,6 @@ public class ItemDodgeRing extends ItemBauble { super(props); } - @SubscribeEvent @OnlyIn(Dist.CLIENT) public static void onKeyDown(InputEvent.KeyInputEvent event) { Minecraft mc = Minecraft.getInstance(); 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 b4ccfd2e0..8191d0f5a 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 @@ -24,20 +24,15 @@ import net.minecraft.world.Explosion; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.event.world.ExplosionEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibMisc; import java.util.List; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem { public static final int COST = 1000; @@ -46,7 +41,6 @@ public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem { super(props); } - @SubscribeEvent public static void onExplosion(ExplosionEvent.Detonate event) { Explosion e = event.getExplosion(); Vec3d vec = e.getPosition(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java index d6f975e30..836243c70 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java @@ -16,7 +16,6 @@ import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.enchantment.FrostWalkerEnchantment; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 5521aa0c3..717e041d8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -16,14 +16,12 @@ import it.unimi.dsi.fastutil.ints.IntArrayList; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.merchant.villager.AbstractVillagerEntity; -import net.minecraft.entity.merchant.villager.VillagerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.inventory.IInventory; @@ -44,7 +42,6 @@ import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.InvWrapper; -import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.fx.WispParticleData; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java index b24e36b44..241f4386f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java @@ -14,7 +14,6 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.entity.LivingEntity; @@ -23,7 +22,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java index cc7001b53..8de104ff4 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -10,20 +10,13 @@ package vazkii.botania.common.item.equipment.bauble; import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.ComparatorBlock; -import net.minecraft.block.RedstoneWireBlock; -import net.minecraft.block.RepeaterBlock; +import net.minecraft.block.*; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -35,7 +28,6 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.api.item.IBurstViewerBauble; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java index acb66a6b5..236b389a9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java @@ -14,7 +14,6 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.entity.LivingEntity; @@ -25,7 +24,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.core.handler.EquipmentHandler; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java index e1ba33a96..22f94157c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java @@ -14,7 +14,6 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.entity.Entity; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index f07552fa1..af4a60279 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -22,11 +22,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ToolItem; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.Vec3d; -import net.minecraft.util.math.Vec3i; +import net.minecraft.util.math.*; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index fc18e201e..057ad2cb4 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -19,12 +19,7 @@ import net.minecraft.item.BowItem; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.stats.Stats; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; +import net.minecraft.util.*; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java index 893d0635c..135fc9555 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java @@ -11,11 +11,7 @@ package vazkii.botania.common.item.equipment.tool.elementium; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.Enchantments; import net.minecraft.entity.item.ItemEntity; -import net.minecraft.entity.monster.AbstractSkeletonEntity; -import net.minecraft.entity.monster.CreeperEntity; -import net.minecraft.entity.monster.WitherSkeletonEntity; -import net.minecraft.entity.monster.ZombieEntity; -import net.minecraft.entity.monster.ZombiePigmanEntity; +import net.minecraft.entity.monster.*; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index 94770dcaa..c6f679fb4 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -11,8 +11,6 @@ package vazkii.botania.common.item.equipment.tool.elementium; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.item.ModItems; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index 7e17e64a1..b27400293 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -13,11 +13,7 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.HoeItem; -import net.minecraft.item.IItemTier; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.item.ShovelItem; +import net.minecraft.item.*; import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; import net.minecraft.util.SoundCategory; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index 60e208264..ecabf8c8e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -32,14 +32,7 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.PriorityQueue; -import java.util.Set; +import java.util.*; public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index d23d14ab4..0beff0c3b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -17,13 +17,7 @@ import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundCategory; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java index 474a987e6..3878e25e9 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemElementiumHelmRevealing.java @@ -10,7 +10,6 @@ package vazkii.botania.common.item.interaction.thaumcraft; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; - import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.equipment.armor.elementium.ItemElementiumHelm; diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index b6de98377..cc6ff42f0 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -14,7 +14,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; import net.minecraft.world.World; - import vazkii.botania.api.mana.IManaItem; import vazkii.botania.common.core.helper.ItemNBTHelper; diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java index 0199b2dfc..16c832f30 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java @@ -10,7 +10,6 @@ package vazkii.botania.common.item.interaction.thaumcraft; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; - import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelHelm; diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java index 56a6e3dbf..fd386d730 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemTerrasteelHelmRevealing.java @@ -10,7 +10,6 @@ package vazkii.botania.common.item.interaction.thaumcraft; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; - import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index c5d66a091..0c9b3fccf 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -24,13 +24,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.IManaBurst; -import vazkii.botania.api.mana.BurstProperties; -import vazkii.botania.api.mana.ICompositableLens; -import vazkii.botania.api.mana.ILens; -import vazkii.botania.api.mana.ILensControl; -import vazkii.botania.api.mana.IManaReceiver; -import vazkii.botania.api.mana.IManaSpreader; -import vazkii.botania.api.mana.ITinyPlanetExcempt; +import vazkii.botania.api.mana.*; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index 247a037cb..72f8b6b19 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -15,11 +15,7 @@ import net.minecraft.entity.projectile.ThrowableEntity; import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.EntityRayTraceResult; -import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.*; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java b/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java index aa893563b..cdfd24a72 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java @@ -14,33 +14,24 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.particles.ParticleTypes; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraft.world.dimension.EndDimension; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.common.entity.EntityEnderAirBottle; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ItemEnderAir extends Item { public ItemEnderAir(Properties props) { super(props); } - @SubscribeEvent public static void onPlayerInteract(PlayerInteractEvent.RightClickItem event) { ItemStack stack = event.getItemStack(); World world = event.getWorld(); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java index 076f86436..990ae922b 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -13,11 +13,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; +import net.minecraft.util.*; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java index 331a6057c..9097a0963 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -18,12 +18,7 @@ import net.minecraft.item.ItemUseContext; import net.minecraft.item.UseAction; import net.minecraft.nbt.INBT; import net.minecraft.nbt.NBTDynamicOps; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.GlobalPos; import net.minecraft.world.World; 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 bfabc7882..ebad94ccf 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -14,7 +14,6 @@ import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.Item; @@ -24,17 +23,11 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.*; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.api.item.ISequentialBreaker; import vazkii.botania.api.item.IWireframeCoordinateListProvider; @@ -53,7 +46,6 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinateListProvider, IManaUsingItem { private static final String TAG_CURSOR_LIST = "cursorList"; @@ -70,7 +62,6 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat super(props); } - @SubscribeEvent public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { PlayerEntity player = event.getPlayer(); ItemStack lokiRing = getLokiRing(player); 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 b647a42ea..5e0945946 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -18,8 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.entity.living.LivingAttackEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.EquipmentHandler; @@ -29,7 +27,6 @@ import vazkii.botania.common.lib.LibMisc; import java.util.HashSet; import java.util.Set; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ItemOdinRing extends ItemRelicBauble { private static final Set damageNegations = new HashSet<>(); @@ -62,7 +59,6 @@ public class ItemOdinRing extends ItemRelicBauble { return attributes; } - @SubscribeEvent public static void onPlayerAttacked(LivingAttackEvent event) { if (event.getEntityLiving() instanceof PlayerEntity) { PlayerEntity player = (PlayerEntity) event.getEntityLiving(); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index b802bdf10..2b6abde98 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -9,7 +9,6 @@ package vazkii.botania.common.item.relic; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java index e00b4c78b..65aae9e82 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -16,11 +16,7 @@ import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResult; import net.minecraft.util.Direction; import net.minecraft.util.Hand; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.*; import net.minecraft.world.World; import vazkii.botania.api.mana.ManaItemHandler; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index 5730eba39..060db4b2a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -10,21 +10,13 @@ package vazkii.botania.common.item.rod; import com.google.common.collect.ImmutableList; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.DoublePlantBlock; -import net.minecraft.block.FlowerBlock; +import net.minecraft.block.*; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.UseAction; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index ba0cd4825..47308669d 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -15,7 +15,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.fml.network.FMLHandshakeHandler; import net.minecraftforge.fml.network.NetworkDirection; import net.minecraftforge.fml.network.NetworkRegistry; import net.minecraftforge.fml.network.PacketDistributor; diff --git a/src/main/java/vazkii/botania/common/world/ModFeatures.java b/src/main/java/vazkii/botania/common/world/ModFeatures.java index 2542ebd10..71fe415e5 100644 --- a/src/main/java/vazkii/botania/common/world/ModFeatures.java +++ b/src/main/java/vazkii/botania/common/world/ModFeatures.java @@ -19,18 +19,12 @@ import net.minecraft.world.gen.placement.IPlacementConfig; import net.minecraft.world.gen.placement.Placement; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.IForgeRegistry; -import vazkii.botania.common.lib.LibMisc; - import java.util.Set; import static vazkii.botania.common.block.ModBlocks.register; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class ModFeatures { public static final Feature MYSTICAL_FLOWERS = new MysticalFlowerFeature(MysticalFlowerConfig::deserialize); public static final Feature MYSTICAL_MUSHROOMS = new MysticalMushroomFeature(MysticalFlowerConfig::deserialize); @@ -44,7 +38,6 @@ public class ModFeatures { BiomeDictionary.Type.VOID ); - @SubscribeEvent public static void registerFeatures(RegistryEvent.Register> event) { IForgeRegistry> r = event.getRegistry(); @@ -52,7 +45,6 @@ public class ModFeatures { register(r, MYSTICAL_MUSHROOMS, "mystical_mushrooms"); } - @SubscribeEvent public static void registerChunkGenerators(RegistryEvent.Register> evt) { register(evt.getRegistry(), SkyblockChunkGenerator.TYPE, "garden_of_glass"); } diff --git a/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java b/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java index 40dd1955e..223a889b1 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java @@ -12,11 +12,7 @@ import net.minecraft.world.IWorld; import net.minecraft.world.biome.BiomeManager; import net.minecraft.world.biome.provider.BiomeProvider; import net.minecraft.world.chunk.IChunk; -import net.minecraft.world.gen.ChunkGeneratorType; -import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.OverworldChunkGenerator; -import net.minecraft.world.gen.OverworldGenSettings; -import net.minecraft.world.gen.WorldGenRegion; +import net.minecraft.world.gen.*; public class SkyblockChunkGenerator extends OverworldChunkGenerator { public static final ChunkGeneratorType TYPE = new ChunkGeneratorType<>(SkyblockChunkGenerator::new, false, OverworldGenSettings::new); diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index aadfdcf9a..caea97a38 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -28,7 +28,6 @@ import net.minecraft.world.dimension.DimensionType; import net.minecraftforge.event.LootTableLoadEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.server.ServerLifecycleHooks; import net.minecraftforge.items.ItemHandlerHelper; @@ -51,7 +50,6 @@ public final class SkyblockWorldEvents { private static final String TAG_ISLAND_Y = "Botania-IslandY"; private static final String TAG_ISLAND_Z = "Botania-IslandZ"; - @SubscribeEvent public static void onPlayerUpdate(LivingUpdateEvent event) { if (event.getEntityLiving() instanceof PlayerEntity && !event.getEntityLiving().world.isRemote) { PlayerEntity player = (PlayerEntity) event.getEntityLiving(); @@ -80,7 +78,6 @@ public final class SkyblockWorldEvents { } } - @SubscribeEvent public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { if (Botania.gardenOfGlassLoaded) { ItemStack equipped = event.getItemStack(); @@ -128,7 +125,6 @@ public final class SkyblockWorldEvents { private static final ResourceLocation TARGET_LOOT_TABLE = new ResourceLocation("blocks/grass"); - @SubscribeEvent public static void loadLoot(LootTableLoadEvent event) { if (Botania.gardenOfGlassLoaded && event.getName().equals(TARGET_LOOT_TABLE)) { event.getTable().addPool(LootHandler.getInjectPool("gog_grass")); diff --git a/src/main/java/vazkii/botania/data/BlockLootProvider.java b/src/main/java/vazkii/botania/data/BlockLootProvider.java index 1e593795d..5b7dcc0e9 100644 --- a/src/main/java/vazkii/botania/data/BlockLootProvider.java +++ b/src/main/java/vazkii/botania/data/BlockLootProvider.java @@ -27,16 +27,7 @@ import net.minecraft.state.properties.DoubleBlockHalf; import net.minecraft.state.properties.SlabType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; -import net.minecraft.world.storage.loot.AlternativesLootEntry; -import net.minecraft.world.storage.loot.ConstantRange; -import net.minecraft.world.storage.loot.ItemLootEntry; -import net.minecraft.world.storage.loot.LootEntry; -import net.minecraft.world.storage.loot.LootParameterSets; -import net.minecraft.world.storage.loot.LootPool; -import net.minecraft.world.storage.loot.LootTable; -import net.minecraft.world.storage.loot.LootTableManager; -import net.minecraft.world.storage.loot.RandomValueRange; -import net.minecraft.world.storage.loot.TableLootEntry; +import net.minecraft.world.storage.loot.*; import net.minecraft.world.storage.loot.conditions.BlockStateProperty; import net.minecraft.world.storage.loot.conditions.MatchTool; import net.minecraft.world.storage.loot.conditions.SurvivesExplosion; @@ -44,19 +35,13 @@ import net.minecraft.world.storage.loot.functions.CopyName; import net.minecraft.world.storage.loot.functions.CopyNbt; import net.minecraft.world.storage.loot.functions.ExplosionDecay; import net.minecraft.world.storage.loot.functions.SetCount; -import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; -import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockAltGrass; import vazkii.botania.common.block.BlockModDoubleFlower; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.block.subtile.generating.SubTileGourmaryllis; -import vazkii.botania.common.block.subtile.generating.SubTileHydroangeas; -import vazkii.botania.common.block.subtile.generating.SubTileMunchdew; -import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; -import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; +import vazkii.botania.common.block.subtile.generating.*; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; @@ -68,7 +53,6 @@ import java.io.IOException; import java.nio.file.Path; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.TimeUnit; import java.util.function.Function; public class BlockLootProvider implements IDataProvider { diff --git a/src/main/java/vazkii/botania/data/BlockTagProvider.java b/src/main/java/vazkii/botania/data/BlockTagProvider.java index 9861f827a..1197d611a 100644 --- a/src/main/java/vazkii/botania/data/BlockTagProvider.java +++ b/src/main/java/vazkii/botania/data/BlockTagProvider.java @@ -8,11 +8,7 @@ */ package vazkii.botania.data; -import net.minecraft.block.Block; -import net.minecraft.block.FenceBlock; -import net.minecraft.block.SlabBlock; -import net.minecraft.block.StairsBlock; -import net.minecraft.block.WallBlock; +import net.minecraft.block.*; import net.minecraft.data.BlockTagsProvider; import net.minecraft.data.DataGenerator; import net.minecraft.item.DyeColor; diff --git a/src/main/java/vazkii/botania/data/BlockstateProvider.java b/src/main/java/vazkii/botania/data/BlockstateProvider.java index 8632ae65d..52757b096 100644 --- a/src/main/java/vazkii/botania/data/BlockstateProvider.java +++ b/src/main/java/vazkii/botania/data/BlockstateProvider.java @@ -8,15 +8,7 @@ */ package vazkii.botania.data; -import net.minecraft.block.Block; -import net.minecraft.block.FenceBlock; -import net.minecraft.block.FenceGateBlock; -import net.minecraft.block.PaneBlock; -import net.minecraft.block.RotatedPillarBlock; -import net.minecraft.block.SlabBlock; -import net.minecraft.block.StairsBlock; -import net.minecraft.block.TallFlowerBlock; -import net.minecraft.block.WallBlock; +import net.minecraft.block.*; import net.minecraft.data.DataGenerator; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.state.properties.DoubleBlockHalf; diff --git a/src/main/java/vazkii/botania/data/DataGenerators.java b/src/main/java/vazkii/botania/data/DataGenerators.java index 9e8cfb446..edbad90d9 100644 --- a/src/main/java/vazkii/botania/data/DataGenerators.java +++ b/src/main/java/vazkii/botania/data/DataGenerators.java @@ -8,16 +8,11 @@ */ package vazkii.botania.data; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; -import vazkii.botania.common.lib.LibMisc; import vazkii.botania.data.recipes.*; -@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class DataGenerators { - @SubscribeEvent public static void gatherData(GatherDataEvent evt) { if (evt.includeServer()) { evt.getGenerator().addProvider(new BlockLootProvider(evt.getGenerator())); diff --git a/src/main/java/vazkii/botania/data/recipes/BrewProvider.java b/src/main/java/vazkii/botania/data/recipes/BrewProvider.java index dbb4b3a45..417e5c546 100644 --- a/src/main/java/vazkii/botania/data/recipes/BrewProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/BrewProvider.java @@ -22,7 +22,6 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.tags.ItemTags; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; -import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.api.brew.Brew; import vazkii.botania.common.Botania; diff --git a/src/main/java/vazkii/botania/data/recipes/ElvenTradeProvider.java b/src/main/java/vazkii/botania/data/recipes/ElvenTradeProvider.java index d2a0ec1cd..8b2a51f75 100644 --- a/src/main/java/vazkii/botania/data/recipes/ElvenTradeProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/ElvenTradeProvider.java @@ -21,13 +21,11 @@ import net.minecraft.item.Items; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.crafting.CraftingHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.ModTags; import javax.annotation.Nullable; diff --git a/src/main/java/vazkii/botania/data/recipes/PetalProvider.java b/src/main/java/vazkii/botania/data/recipes/PetalProvider.java index 84c8f4013..6ea4895c1 100644 --- a/src/main/java/vazkii/botania/data/recipes/PetalProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/PetalProvider.java @@ -22,9 +22,7 @@ import net.minecraft.tags.ItemTags; import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; -import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.botania.common.item.ModItems; diff --git a/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java index 764c4c8b9..5a3cf0c0b 100644 --- a/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java @@ -17,11 +17,7 @@ import net.minecraft.advancements.IRequirementsStrategy; import net.minecraft.advancements.criterion.InventoryChangeTrigger; import net.minecraft.advancements.criterion.RecipeUnlockedTrigger; import net.minecraft.block.Block; -import net.minecraft.data.CustomRecipeBuilder; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.IFinishedRecipe; -import net.minecraft.data.ShapedRecipeBuilder; -import net.minecraft.data.ShapelessRecipeBuilder; +import net.minecraft.data.*; import net.minecraft.item.DyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -38,10 +34,8 @@ import net.minecraft.util.registry.Registry; import net.minecraftforge.common.Tags; import net.minecraftforge.common.crafting.ConditionalAdvancement; import net.minecraftforge.common.crafting.ConditionalRecipe; -import net.minecraftforge.common.crafting.NBTIngredient; import net.minecraftforge.common.crafting.conditions.TagEmptyCondition; import net.minecraftforge.common.crafting.conditions.TrueCondition; -import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.common.block.ModBlocks; @@ -2274,8 +2268,8 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { List allAzulejos = IntStream.range(0, 16).mapToObj(i -> "azulejo_" + i) .map(ResourceLocationHelper::prefix) .map(Registry.ITEM::getValue) - .map(Optional::get) - .collect(Collectors.toList()); + .map(Optional::get) + .collect(Collectors.toList()); for (int i = 0; i < allAzulejos.size(); i++) { int resultIndex = i + 1 == allAzulejos.size() ? 0 : i + 1; String recipeName = "azulejo_" + resultIndex; diff --git a/src/main/java/vazkii/botania/data/recipes/StonecuttingProvider.java b/src/main/java/vazkii/botania/data/recipes/StonecuttingProvider.java index 9905671f8..b58aee186 100644 --- a/src/main/java/vazkii/botania/data/recipes/StonecuttingProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/StonecuttingProvider.java @@ -21,7 +21,6 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; -import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; @@ -74,8 +73,8 @@ public class StonecuttingProvider extends RecipeProvider { List allAzulejos = IntStream.range(0, 16).mapToObj(i -> "azulejo_" + i) .map(ResourceLocationHelper::prefix) .map(Registry.ITEM::getValue) - .map(Optional::get) - .collect(Collectors.toList()); + .map(Optional::get) + .collect(Collectors.toList()); for (Item azulejo : allAzulejos) { consumer.accept(azulejoStonecutting(allAzulejos, azulejo)); }