From 7b60e8ccf53132ebf9dad595363b92f9b00d7a51 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Jun 2020 23:23:41 -0500 Subject: [PATCH] Optimize imports and format --- src/main/java/vazkii/botania/api/BotaniaAPI.java | 5 ----- src/main/java/vazkii/botania/api/brew/Brew.java | 1 + .../java/vazkii/botania/api/item/IAvatarTile.java | 1 - .../java/vazkii/botania/api/recipe/IBrewRecipe.java | 1 - .../vazkii/botania/api/recipe/IPetalRecipe.java | 1 - .../vazkii/botania/api/recipe/IRuneAltarRecipe.java | 1 - .../client/core/handler/BaubleRenderHandler.java | 5 ----- .../client/core/handler/BoundTileRenderer.java | 5 ++++- .../botania/client/core/handler/DebugHandler.java | 1 - .../botania/client/core/handler/ModelHandler.java | 6 +----- .../botania/client/core/handler/RenderLexicon.java | 4 +++- .../botania/client/core/helper/RenderHelper.java | 4 ---- .../java/vazkii/botania/client/fx/FXSparkle.java | 1 - src/main/java/vazkii/botania/client/fx/FXWisp.java | 1 - .../vazkii/botania/client/fx/WispParticleType.java | 1 - .../vazkii/botania/client/gui/bag/GuiFlowerBag.java | 1 - .../client/integration/jei/JEIBotaniaPlugin.java | 1 - .../jei/crafting/AncientWillRecipeWrapper.java | 1 - .../botania/client/model/FloatingFlowerModel.java | 5 ++++- .../java/vazkii/botania/client/model/GunModel.java | 2 -- .../vazkii/botania/client/model/PlatformModel.java | 1 - .../client/patchouli/component/ManaComponent.java | 1 - .../component/RotatingItemListComponentBase.java | 1 - .../patchouli/component/TerraPlateComponent.java | 1 - .../client/render/tile/RenderTileAlfPortal.java | 3 ++- .../client/render/world/SkyblockSkyRenderer.java | 5 ++++- src/main/java/vazkii/botania/common/Botania.java | 6 +++--- .../common/advancements/AlfPortalBreadTrigger.java | 2 -- .../common/advancements/UseItemSuccessTrigger.java | 6 ------ .../vazkii/botania/common/block/BlockAlfPortal.java | 1 - .../vazkii/botania/common/block/BlockAltar.java | 1 - .../vazkii/botania/common/block/BlockAvatar.java | 1 - .../vazkii/botania/common/block/BlockBifrost.java | 2 -- .../java/vazkii/botania/common/block/BlockCell.java | 1 - .../vazkii/botania/common/block/BlockFakeAir.java | 1 - .../vazkii/botania/common/block/BlockHourglass.java | 1 - .../botania/common/block/BlockIncensePlate.java | 1 - .../botania/common/block/BlockLightRelay.java | 1 - .../botania/common/block/BlockPistonRelay.java | 2 -- .../botania/common/block/BlockSolidVines.java | 3 --- .../botania/common/block/BlockSparkChanger.java | 1 - .../vazkii/botania/common/block/ModBanners.java | 1 - .../vazkii/botania/common/block/ModSubtiles.java | 4 +++- .../block/corporea/BlockCorporeaInterceptor.java | 1 - .../botania/common/block/decor/BlockManaFlame.java | 1 - .../botania/common/block/decor/BlockModGlass.java | 2 -- .../botania/common/block/mana/BlockEnchanter.java | 1 - .../botania/common/block/mana/BlockManaVoid.java | 1 - .../botania/common/block/mana/BlockPrism.java | 1 - .../botania/common/block/mana/BlockRFGenerator.java | 1 - .../botania/common/block/mana/BlockSpreader.java | 1 - .../block/string/BlockRedStringContainer.java | 1 - .../block/string/BlockRedStringInterceptor.java | 1 - .../common/block/string/BlockRedStringRelay.java | 1 - .../common/block/subtile/SubTileManastar.java | 4 ---- .../subtile/functional/BergamuteEventHandler.java | 1 - .../subtile/functional/SubTileAgricarnation.java | 2 -- .../block/subtile/functional/SubTileBellethorn.java | 3 --- .../block/subtile/functional/SubTileBergamute.java | 4 ---- .../block/subtile/functional/SubTileBubbell.java | 2 -- .../block/subtile/functional/SubTileClayconia.java | 2 -- .../block/subtile/functional/SubTileDaffomill.java | 3 --- .../block/subtile/functional/SubTileDreadthorn.java | 3 --- .../block/subtile/functional/SubTileExoflame.java | 3 --- .../subtile/functional/SubTileFallenKanade.java | 3 --- .../subtile/functional/SubTileHeiseiDream.java | 3 --- .../block/subtile/functional/SubTileHyacidus.java | 3 --- .../subtile/functional/SubTileJadedAmaranthus.java | 3 --- .../block/subtile/functional/SubTileJiyuulia.java | 3 --- .../block/subtile/functional/SubTileLoonuim.java | 6 ------ .../subtile/functional/SubTileMarimorphosis.java | 2 -- .../block/subtile/functional/SubTileMedumone.java | 3 --- .../block/subtile/functional/SubTileOrechid.java | 3 --- .../subtile/functional/SubTileOrechidIgnem.java | 3 --- .../subtile/functional/SubTilePollidisiac.java | 3 --- .../block/subtile/functional/SubTileSolegnolia.java | 2 -- .../subtile/functional/SubTileSpectranthemum.java | 3 --- .../subtile/functional/SubTileTangleberrie.java | 2 -- .../block/subtile/functional/SubTileTigerseye.java | 4 ---- .../block/subtile/functional/SubTileVinculotus.java | 3 --- .../block/subtile/generating/SubTileArcaneRose.java | 4 ---- .../subtile/generating/SubTileDandelifeon.java | 4 ---- .../block/subtile/generating/SubTileEndoflame.java | 4 ---- .../subtile/generating/SubTileEntropinnyum.java | 5 ----- .../subtile/generating/SubTileGourmaryllis.java | 5 ----- .../subtile/generating/SubTileHydroangeas.java | 3 --- .../block/subtile/generating/SubTileKekimurus.java | 4 ---- .../block/subtile/generating/SubTileMunchdew.java | 4 ---- .../block/subtile/generating/SubTileNarslimmus.java | 4 ---- .../block/subtile/generating/SubTileRafflowsia.java | 4 ---- .../block/subtile/generating/SubTileShulkMeNot.java | 4 ---- .../block/subtile/generating/SubTileThermalily.java | 5 ----- .../vazkii/botania/common/block/tile/TileAltar.java | 4 ---- .../common/block/tile/TileAnimatedTorch.java | 4 ---- .../botania/common/block/tile/TileAvatar.java | 7 ------- .../botania/common/block/tile/TileBifrost.java | 5 ----- .../botania/common/block/tile/TileCacophonium.java | 4 ---- .../vazkii/botania/common/block/tile/TileCell.java | 4 ---- .../botania/common/block/tile/TileCocoon.java | 5 ----- .../botania/common/block/tile/TileCraftCrate.java | 4 ---- .../botania/common/block/tile/TileEnderEye.java | 4 ---- .../block/tile/TileExposedSimpleInventory.java | 9 ++++++++- .../botania/common/block/tile/TileFakeAir.java | 4 ---- .../common/block/tile/TileFloatingFlower.java | 4 ---- .../botania/common/block/tile/TileForestEye.java | 5 ----- .../botania/common/block/tile/TileGaiaHead.java | 4 ---- .../botania/common/block/tile/TileHourglass.java | 6 ------ .../botania/common/block/tile/TileIncensePlate.java | 5 ----- .../botania/common/block/tile/TileLightRelay.java | 3 --- .../botania/common/block/tile/TileManaFlame.java | 4 ---- .../botania/common/block/tile/TileOpenCrate.java | 4 ---- .../botania/common/block/tile/TilePlatform.java | 5 ----- .../vazkii/botania/common/block/tile/TilePylon.java | 4 ---- .../botania/common/block/tile/TileRuneAltar.java | 2 -- .../common/block/tile/TileSimpleInventory.java | 8 -------- .../botania/common/block/tile/TileSparkChanger.java | 6 ------ .../botania/common/block/tile/TileSpawnerClaw.java | 4 ---- .../botania/common/block/tile/TileStarfield.java | 4 ---- .../botania/common/block/tile/TileTerraPlate.java | 4 ---- .../botania/common/block/tile/TileTeruTeruBozu.java | 5 ----- .../botania/common/block/tile/TileTinyPlanet.java | 4 ---- .../botania/common/block/tile/TileTinyPotato.java | 4 ---- .../tile/corporea/TileCorporeaCrystalCube.java | 4 ---- .../block/tile/corporea/TileCorporeaFunnel.java | 4 ---- .../block/tile/corporea/TileCorporeaIndex.java | 4 ---- .../tile/corporea/TileCorporeaInterceptor.java | 4 ---- .../block/tile/corporea/TileCorporeaRetainer.java | 4 ---- .../botania/common/block/tile/mana/TileBellows.java | 8 ++++---- .../common/block/tile/mana/TileDistributor.java | 4 ---- .../common/block/tile/mana/TileManaDetector.java | 4 ---- .../common/block/tile/mana/TileManaVoid.java | 5 ----- .../botania/common/block/tile/mana/TilePrism.java | 7 ------- .../botania/common/block/tile/mana/TilePump.java | 4 ---- .../common/block/tile/mana/TileRFGenerator.java | 4 ---- .../common/block/tile/mana/TileSpreader.java | 3 --- .../common/block/tile/mana/TileTurntable.java | 4 ---- .../block/tile/string/TileRedStringComparator.java | 4 ---- .../block/tile/string/TileRedStringContainer.java | 3 --- .../block/tile/string/TileRedStringDispenser.java | 4 ---- .../block/tile/string/TileRedStringFertilizer.java | 4 ---- .../block/tile/string/TileRedStringInterceptor.java | 4 ---- .../block/tile/string/TileRedStringRelay.java | 4 ---- .../java/vazkii/botania/common/brew/ModPotions.java | 2 -- .../botania/common/brew/potion/PotionClear.java | 1 - .../common/core/handler/EquipmentHandler.java | 1 - .../botania/common/core/helper/InventoryHelper.java | 1 - .../vazkii/botania/common/core/loot/BindUuid.java | 8 ++++---- .../vazkii/botania/common/crafting/RecipeBrew.java | 1 - .../botania/common/crafting/RecipePetals.java | 1 - .../botania/common/crafting/RecipeRuneAltar.java | 1 - .../common/crafting/StateIngredientHelper.java | 1 - .../botania/common/crafting/StateIngredientTag.java | 3 --- .../common/crafting/recipe/ArmorUpgradeRecipe.java | 2 -- .../botania/common/crafting/recipe/HeadRecipe.java | 1 - .../botania/common/entity/EntityBabylonWeapon.java | 5 ++++- .../botania/common/entity/EntityDoppleganger.java | 1 - .../botania/common/entity/EntityThrowableCopy.java | 13 ++++--------- .../vazkii/botania/common/impl/BotaniaAPIImpl.java | 5 +++-- .../botania/common/item/ItemBlackHoleTalisman.java | 1 - .../vazkii/botania/common/item/ItemBottledMana.java | 6 ++++-- .../java/vazkii/botania/common/item/ItemHorn.java | 7 ++++--- .../vazkii/botania/common/item/ItemLexicon.java | 6 ++++-- .../vazkii/botania/common/item/ItemPinkinator.java | 1 - .../vazkii/botania/common/item/ItemSlimeBottle.java | 3 --- .../botania/common/item/ItemTemperanceStone.java | 6 ++++-- .../java/vazkii/botania/common/item/ItemVirus.java | 1 - .../botania/common/item/block/ItemBlockPool.java | 2 -- .../common/item/block/ItemBlockSpecialFlower.java | 1 - .../botania/common/item/brew/ItemBrewBase.java | 2 -- .../armor/manaweave/ItemManaweaveArmor.java | 1 - .../item/equipment/bauble/ItemMagnetRing.java | 2 -- .../common/item/equipment/bauble/ItemReachRing.java | 1 - .../common/item/equipment/tool/ItemEnderDagger.java | 6 ------ .../item/equipment/tool/ItemThunderSword.java | 8 -------- .../common/item/equipment/tool/ToolCommons.java | 4 +++- .../tool/elementium/ItemElementiumShears.java | 5 ----- .../tool/manasteel/ItemManasteelShears.java | 12 ------------ .../tool/manasteel/ItemManasteelSword.java | 1 - .../equipment/tool/terrasteel/ItemTerraAxe.java | 1 - .../equipment/tool/terrasteel/ItemTerraPick.java | 1 - .../vazkii/botania/common/item/lens/LensPaint.java | 2 +- .../botania/common/item/material/ItemEnderAir.java | 1 - .../botania/common/item/relic/ItemLokiRing.java | 5 ++++- .../botania/common/item/relic/ItemOdinRing.java | 1 - .../botania/common/item/rod/ItemGravityRod.java | 1 - .../botania/common/item/rod/ItemSkyDirtRod.java | 5 ++++- .../java/vazkii/botania/common/lib/ModTags.java | 5 ++++- .../common/world/MysticalMushroomFeature.java | 3 --- .../common/world/SkyblockChunkGenerator.java | 5 ++++- .../botania/common/world/SkyblockWorldEvents.java | 1 - .../java/vazkii/botania/data/ItemTagProvider.java | 3 --- .../vazkii/botania/data/recipes/BrewProvider.java | 3 --- .../vazkii/botania/data/recipes/PetalProvider.java | 1 - .../vazkii/botania/data/recipes/RecipeProvider.java | 1 - 194 files changed, 88 insertions(+), 532 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index cdcdc47db..69daaba08 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -10,8 +10,6 @@ package vazkii.botania.api; import net.minecraft.block.Block; import net.minecraft.entity.Entity; -import net.minecraft.entity.ai.attributes.Attribute; -import net.minecraft.entity.ai.attributes.RangedAttribute; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.*; @@ -21,9 +19,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandlerModifiable; -import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.wrapper.EmptyHandler; -import net.minecraftforge.registries.IRegistryDelegate; import org.apache.logging.log4j.LogManager; @@ -32,7 +28,6 @@ import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.internal.DummyManaNetwork; import vazkii.botania.api.internal.IManaNetwork; -import vazkii.botania.api.subtile.TileEntitySpecialFlower; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/api/brew/Brew.java b/src/main/java/vazkii/botania/api/brew/Brew.java index b93455480..f7bd344a2 100644 --- a/src/main/java/vazkii/botania/api/brew/Brew.java +++ b/src/main/java/vazkii/botania/api/brew/Brew.java @@ -14,6 +14,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.EffectInstance; import net.minecraft.util.ResourceLocation; import net.minecraftforge.registries.ForgeRegistryEntry; + import vazkii.botania.api.BotaniaAPI; import java.util.List; diff --git a/src/main/java/vazkii/botania/api/item/IAvatarTile.java b/src/main/java/vazkii/botania/api/item/IAvatarTile.java index 81ec7ea22..ee7b1f4e5 100644 --- a/src/main/java/vazkii/botania/api/item/IAvatarTile.java +++ b/src/main/java/vazkii/botania/api/item/IAvatarTile.java @@ -10,7 +10,6 @@ package vazkii.botania.api.item; import net.minecraft.inventory.IInventory; import net.minecraft.util.Direction; -import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.mana.IManaReceiver; diff --git a/src/main/java/vazkii/botania/api/recipe/IBrewRecipe.java b/src/main/java/vazkii/botania/api/recipe/IBrewRecipe.java index 8c69eabc9..ce5db2be8 100644 --- a/src/main/java/vazkii/botania/api/recipe/IBrewRecipe.java +++ b/src/main/java/vazkii/botania/api/recipe/IBrewRecipe.java @@ -14,7 +14,6 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; -import net.minecraftforge.items.wrapper.RecipeWrapper; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; diff --git a/src/main/java/vazkii/botania/api/recipe/IPetalRecipe.java b/src/main/java/vazkii/botania/api/recipe/IPetalRecipe.java index 69f6eb5e2..d103bd8cd 100644 --- a/src/main/java/vazkii/botania/api/recipe/IPetalRecipe.java +++ b/src/main/java/vazkii/botania/api/recipe/IPetalRecipe.java @@ -13,7 +13,6 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; -import net.minecraftforge.items.wrapper.RecipeWrapper; import vazkii.botania.api.BotaniaAPI; diff --git a/src/main/java/vazkii/botania/api/recipe/IRuneAltarRecipe.java b/src/main/java/vazkii/botania/api/recipe/IRuneAltarRecipe.java index 6ff686a97..d697517dc 100644 --- a/src/main/java/vazkii/botania/api/recipe/IRuneAltarRecipe.java +++ b/src/main/java/vazkii/botania/api/recipe/IRuneAltarRecipe.java @@ -13,7 +13,6 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; -import net.minecraftforge.items.wrapper.RecipeWrapper; import vazkii.botania.api.BotaniaAPI; 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 88aebed85..6460fa4ff 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -20,20 +20,15 @@ import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Effects; import net.minecraft.util.math.vector.Vector3f; -import vazkii.botania.api.item.ICosmeticAttachable; -import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; -import java.util.Map; - public final class BaubleRenderHandler extends LayerRenderer> { public BaubleRenderHandler(IEntityRenderer> renderer) { 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 5fa178796..f9f23f27b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -15,7 +15,10 @@ 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.*; +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; 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 71c42454c..03566193f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -12,7 +12,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.Screen; import net.minecraft.util.RegistryKey; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.registry.Registry; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderGameOverlayEvent; 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 2428a105f..142ec4cd5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -27,11 +27,7 @@ import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.client.render.entity.*; import vazkii.botania.client.render.tile.*; import vazkii.botania.common.block.ModSubtiles; -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.*; -import vazkii.botania.common.block.tile.string.*; +import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.entity.ModEntities; import vazkii.botania.common.lib.LibMisc; 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 00efbd7a9..5f9f995b3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -14,7 +14,9 @@ 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.*; +import net.minecraft.client.renderer.FirstPersonRenderer; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.model.BookModel; import net.minecraft.client.renderer.model.RenderMaterial; import net.minecraft.client.renderer.texture.AtlasTexture; 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 23a502947..7c7295894 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -13,10 +13,7 @@ import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.IVertexBuilder; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.BreakableBlock; -import net.minecraft.block.StainedGlassPaneBlock; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; import net.minecraft.client.renderer.*; @@ -27,7 +24,6 @@ import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.LivingEntity; -import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.Direction; diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index c35713a85..bb672669b 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -24,7 +24,6 @@ import net.minecraft.client.world.ClientWorld; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.World; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 431db0eb4..df2e91d41 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -19,7 +19,6 @@ import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.world.ClientWorld; -import net.minecraft.world.World; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/vazkii/botania/client/fx/WispParticleType.java b/src/main/java/vazkii/botania/client/fx/WispParticleType.java index 3b66f29c7..1b57c1ecf 100644 --- a/src/main/java/vazkii/botania/client/fx/WispParticleType.java +++ b/src/main/java/vazkii/botania/client/fx/WispParticleType.java @@ -9,7 +9,6 @@ package vazkii.botania.client.fx; import com.mojang.serialization.Codec; -import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.client.particle.IAnimatedSprite; import net.minecraft.client.particle.IParticleFactory; diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index 1db0b57a9..ae802907a 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -12,7 +12,6 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.AbstractGui; import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; 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 a8c4e2369..598dd0902 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -20,7 +20,6 @@ import mezz.jei.api.runtime.IRecipesGui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.inventory.ContainerScreen; -import net.minecraft.client.resources.I18n; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; diff --git a/src/main/java/vazkii/botania/client/integration/jei/crafting/AncientWillRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/crafting/AncientWillRecipeWrapper.java index b827136c3..b805c7cae 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/crafting/AncientWillRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/crafting/AncientWillRecipeWrapper.java @@ -22,7 +22,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import vazkii.botania.api.item.IAncientWillContainer; -import vazkii.botania.common.Botania; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; import vazkii.botania.common.item.ItemAncientWill; import vazkii.botania.common.item.ModItems; diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index f8f81c991..417dab3b8 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -21,7 +21,10 @@ import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.vector.TransformationMatrix; import net.minecraft.util.math.vector.Vector3f; -import net.minecraftforge.client.model.*; +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.data.EmptyModelData; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.client.model.geometry.IModelGeometry; diff --git a/src/main/java/vazkii/botania/client/model/GunModel.java b/src/main/java/vazkii/botania/client/model/GunModel.java index bafe1b7dc..17e3ae80e 100644 --- a/src/main/java/vazkii/botania/client/model/GunModel.java +++ b/src/main/java/vazkii/botania/client/model/GunModel.java @@ -24,8 +24,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.vector.TransformationMatrix; import net.minecraft.util.math.vector.Vector3f; import net.minecraft.util.registry.Registry; -import net.minecraft.world.World; -import net.minecraftforge.client.model.BakedModelWrapper; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.SimpleModelTransform; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 723d424e8..b78c3a71f 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -19,7 +19,6 @@ import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.client.model.BakedModelWrapper; import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.client.model.data.IModelData; diff --git a/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java index d4aedebe8..234a6fa14 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java @@ -12,7 +12,6 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.resources.I18n; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; diff --git a/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponentBase.java b/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponentBase.java index 719a87052..cc81ec7b5 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponentBase.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponentBase.java @@ -9,7 +9,6 @@ package vazkii.botania.client.patchouli.component; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.screen.Screen; import net.minecraft.item.crafting.Ingredient; diff --git a/src/main/java/vazkii/botania/client/patchouli/component/TerraPlateComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/TerraPlateComponent.java index 84a00ae6b..4571181a1 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/TerraPlateComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/TerraPlateComponent.java @@ -9,7 +9,6 @@ package vazkii.botania.client.patchouli.component; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.item.ItemStack; 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 e97aedb6e..58a0b7f9e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -11,7 +11,8 @@ package vazkii.botania.client.render.tile; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.Atlases; +import net.minecraft.client.renderer.IRenderTypeBuffer; 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/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index f8a602020..f0187b46e 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -13,7 +13,10 @@ import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.FogRenderer; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldVertexBufferUploader; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexBuffer; import net.minecraft.client.renderer.vertex.VertexFormat; diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 5bb6da53d..3fcc07b39 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -20,8 +20,6 @@ import net.minecraft.entity.ai.attributes.GlobalEntityTypeAttributes; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.Item; import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.loot.conditions.LootConditionManager; -import net.minecraft.loot.functions.LootFunctionManager; import net.minecraft.particles.ParticleType; import net.minecraft.potion.Effect; import net.minecraft.tileentity.TileEntity; @@ -84,7 +82,9 @@ import vazkii.botania.common.capability.NoopExoflameHeatable; import vazkii.botania.common.core.command.CommandSkyblockSpread; import vazkii.botania.common.core.handler.*; import vazkii.botania.common.core.helper.ColorHelper; -import vazkii.botania.common.core.loot.*; +import vazkii.botania.common.core.loot.DisposeModifier; +import vazkii.botania.common.core.loot.LootHandler; +import vazkii.botania.common.core.loot.ModLootModifiers; import vazkii.botania.common.core.proxy.IProxy; import vazkii.botania.common.core.proxy.ServerProxy; import vazkii.botania.common.crafting.ModRecipeTypes; diff --git a/src/main/java/vazkii/botania/common/advancements/AlfPortalBreadTrigger.java b/src/main/java/vazkii/botania/common/advancements/AlfPortalBreadTrigger.java index b21e08ae9..4ece70faa 100644 --- a/src/main/java/vazkii/botania/common/advancements/AlfPortalBreadTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/AlfPortalBreadTrigger.java @@ -24,8 +24,6 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.*; - public class AlfPortalBreadTrigger extends AbstractCriterionTrigger { public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "alf_portal_bread"); public static final AlfPortalBreadTrigger INSTANCE = new AlfPortalBreadTrigger(); diff --git a/src/main/java/vazkii/botania/common/advancements/UseItemSuccessTrigger.java b/src/main/java/vazkii/botania/common/advancements/UseItemSuccessTrigger.java index 07c8f487d..1a718dfef 100644 --- a/src/main/java/vazkii/botania/common/advancements/UseItemSuccessTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/UseItemSuccessTrigger.java @@ -8,12 +8,8 @@ */ package vazkii.botania.common.advancements; -import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; -import net.minecraft.advancements.ICriterionInstance; -import net.minecraft.advancements.ICriterionTrigger; -import net.minecraft.advancements.PlayerAdvancements; import net.minecraft.advancements.criterion.*; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; @@ -25,8 +21,6 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -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. public class UseItemSuccessTrigger extends AbstractCriterionTrigger { diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 1dde634b8..10a5e2355 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -29,7 +29,6 @@ import vazkii.botania.common.advancements.AlfPortalTrigger; import vazkii.botania.common.block.tile.TileAlfPortal; import javax.annotation.Nonnull; -import javax.annotation.Nullable; public class BlockAlfPortal extends BlockMod implements ITileEntityProvider, IWandable { diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 0b1b80a7f..8833e6d16 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -32,7 +32,6 @@ import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; -import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.ManaItemHandler; diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 834973a3f..d6f073bbb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -25,7 +25,6 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.common.block.tile.TileAvatar; diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 002e24fef..e19b44420 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -10,11 +10,9 @@ package vazkii.botania.common.block; import net.minecraft.block.BlockState; import net.minecraft.block.ITileEntityProvider; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockReader; import vazkii.botania.common.block.tile.TileBifrost; diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 71a6d6b4e..04a6d5b6a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -8,7 +8,6 @@ */ package vazkii.botania.common.block; -import net.minecraft.block.BlockState; import net.minecraft.block.ITileEntityProvider; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockReader; diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index af05a6467..d4e9b5a5c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -12,7 +12,6 @@ import net.minecraft.block.*; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 8330367ed..e434a63cc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -34,7 +34,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.items.ItemHandlerHelper; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 42a486a56..985fd14b7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -27,7 +27,6 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileIncensePlate; diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 6ed03953d..78d94acea 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -25,7 +25,6 @@ import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 5b5544338..af38dd69b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -13,7 +13,6 @@ import net.minecraft.block.Blocks; import net.minecraft.block.MovingPistonBlock; import net.minecraft.block.material.Material; import net.minecraft.block.material.PushReaction; -import net.minecraft.entity.EntityType; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -30,7 +29,6 @@ import net.minecraft.util.RegistryKey; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.GlobalPos; -import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraft.world.storage.WorldSavedData; diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 9656f7506..ec561822b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -12,12 +12,9 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.FireBlock; import net.minecraft.block.VineBlock; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorldReader; import net.minecraft.world.server.ServerWorld; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index f8a5adfdd..4031750d6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -24,7 +24,6 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.block.tile.TileSparkChanger; diff --git a/src/main/java/vazkii/botania/common/block/ModBanners.java b/src/main/java/vazkii/botania/common/block/ModBanners.java index 129712805..9536230f1 100644 --- a/src/main/java/vazkii/botania/common/block/ModBanners.java +++ b/src/main/java/vazkii/botania/common/block/ModBanners.java @@ -9,7 +9,6 @@ package vazkii.botania.common.block; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.tileentity.BannerPattern; import net.minecraft.util.IItemProvider; diff --git a/src/main/java/vazkii/botania/common/block/ModSubtiles.java b/src/main/java/vazkii/botania/common/block/ModSubtiles.java index 7abd90b29..757b3fc52 100644 --- a/src/main/java/vazkii/botania/common/block/ModSubtiles.java +++ b/src/main/java/vazkii/botania/common/block/ModSubtiles.java @@ -11,7 +11,9 @@ package vazkii.botania.common.block; import com.google.common.collect.ImmutableList; import com.mojang.datafixers.util.Pair; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntityType; diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java index c0e664836..c08b18e15 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -15,7 +15,6 @@ import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorldReader; import net.minecraft.world.server.ServerWorld; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 526fc40ba..113ac9078 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -23,7 +23,6 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockModGlass.java index 649c8f0a1..145d8b87b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModGlass.java @@ -9,8 +9,6 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.AbstractGlassBlock; -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; public class BlockModGlass extends AbstractGlassBlock { public BlockModGlass(Properties props) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index fa4b970e3..1b5f74c36 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -29,7 +29,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java index 52f01e9df..a96a50a8a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -8,7 +8,6 @@ */ package vazkii.botania.common.block.mana; -import net.minecraft.block.BlockState; import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index e13ded6b5..f380a8d2e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -24,7 +24,6 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.ILens; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java index b4a3122b7..b2d6828ef 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -8,7 +8,6 @@ */ package vazkii.botania.common.block.mana; -import net.minecraft.block.BlockState; import net.minecraft.block.ITileEntityProvider; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockReader; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index e8f34264d..6c23cc8d2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -32,7 +32,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.wand.IWandHUD; diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java index 946915443..795f3e43a 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java @@ -9,7 +9,6 @@ package vazkii.botania.common.block.string; import net.minecraft.block.Block; -import net.minecraft.block.BlockState; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.Direction; import net.minecraft.world.IBlockReader; 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 a4f436a72..de652e53c 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -15,7 +15,6 @@ import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorldReader; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.event.entity.player.PlayerInteractEvent; diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java index 987456cb3..56c72432a 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java @@ -9,7 +9,6 @@ package vazkii.botania.common.block.string; import net.minecraft.block.Block; -import net.minecraft.block.BlockState; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.Direction; import net.minecraft.world.IBlockReader; diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java index e5b2fdb2c..26ebb9596 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTileManastar.java @@ -9,17 +9,13 @@ package vazkii.botania.common.block.subtile; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibMisc; public class SubTileManastar extends TileEntitySpecialFlower { private static final int SET_STATE_EVENT = 0; 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 04337df23..cf56168fb 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 @@ -15,7 +15,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.sound.PlaySoundEvent; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.block.tile.mana.TilePool; 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 2d732b3ca..3061e5bbd 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 @@ -15,14 +15,12 @@ import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.lib.LibMisc; import java.util.Set; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index a82c11206..8a5f0e191 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -15,13 +15,10 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.DamageSource; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibMisc; import java.util.List; import java.util.function.Predicate; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java index d93c861d1..9bfba5f9c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java @@ -8,13 +8,9 @@ */ package vazkii.botania.common.block.subtile.functional; -import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.registries.ObjectHolder; - import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lib.LibMisc; import java.util.Collections; import java.util.Set; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java index 76225e398..358329299 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBubbell.java @@ -15,14 +15,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.block.tile.TileFakeAir; -import vazkii.botania.common.lib.LibMisc; public class SubTileBubbell extends TileEntityFunctionalFlower { private static final int RANGE = 12; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java index a090239ac..b9dd5a27b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java @@ -15,13 +15,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; 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 6e15b9b5e..6313c869d 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 @@ -15,19 +15,16 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; 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.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.network.PacketItemAge; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java index c4993ab82..6ac847ea6 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java @@ -10,11 +10,8 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.Entity; import net.minecraft.entity.passive.AnimalEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lib.LibMisc; import java.util.function.Predicate; 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 463c148ed..67c1af94b 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 @@ -9,17 +9,14 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.item.IExoflameHeatable; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.handler.ExoflameFurnaceHandler; -import vazkii.botania.common.lib.LibMisc; public class SubTileExoflame extends TileEntityFunctionalFlower { private static final int RANGE = 5; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java index 7fdb1df43..8a7f21665 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java @@ -11,15 +11,12 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lib.LibMisc; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 460062e50..6e6d083b0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -16,14 +16,11 @@ import net.minecraft.entity.MobEntity; import net.minecraft.entity.ai.goal.HurtByTargetGoal; import net.minecraft.entity.ai.goal.PrioritizedGoal; import net.minecraft.entity.monster.IMob; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lib.LibMisc; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java index 04eaaf7ca..2c140b39f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java @@ -13,14 +13,11 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lib.LibMisc; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java index 6f285e20a..aa9e620c5 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJadedAmaranthus.java @@ -11,16 +11,13 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.item.DyeColor; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lib.LibMisc; public class SubTileJadedAmaranthus extends TileEntityFunctionalFlower { private static final int COST = 100; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java index 7b5b0d325..17b368c86 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java @@ -9,11 +9,8 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.LivingEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lib.LibMisc; public class SubTileJiyuulia extends SubTileTangleberrie { public SubTileJiyuulia() { 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 394a61858..137e5edbb 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 @@ -8,9 +8,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.SpawnReason; @@ -24,7 +21,6 @@ import net.minecraft.loot.LootParameterSets; import net.minecraft.nbt.CompoundNBT; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; @@ -32,12 +28,10 @@ import net.minecraft.world.Difficulty; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.event.entity.living.LivingDropsEvent; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.ModTags; import java.util.Collections; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java index d40ab0c87..89cd3392e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java @@ -16,14 +16,12 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.BiomeDictionary.Type; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java index 2b8e2907d..4681dca14 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java @@ -12,14 +12,11 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lib.LibMisc; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java index 7b7dba92f..fd30cbf4b 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java @@ -13,13 +13,11 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ITag; -import net.minecraft.tags.Tag; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.WeightedRandom; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -28,7 +26,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nullable; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java index a9a60083a..34fe50623 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java @@ -10,13 +10,10 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lib.LibMisc; import java.util.Map; import java.util.function.Predicate; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index 0c5586cbf..6a61c3344 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -11,14 +11,11 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lib.LibMisc; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index 86728a5c4..ca52a9d88 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -12,12 +12,10 @@ import com.google.common.collect.MapMaker; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lib.LibMisc; import java.util.Collections; import java.util.Set; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index c20851bb4..fc5a83b99 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -15,20 +15,17 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index d14b5028e..75bdf1159 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -12,7 +12,6 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; @@ -20,7 +19,6 @@ import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.lib.LibMisc; import java.util.List; 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 70be40113..57e17dace 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 @@ -16,15 +16,11 @@ import net.minecraft.entity.item.EnderCrystalEntity; import net.minecraft.entity.monster.CreeperEntity; import net.minecraft.entity.passive.OcelotEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; 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 22033096a..de77fa048 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 @@ -9,16 +9,13 @@ package vazkii.botania.common.block.subtile.functional; 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.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityFunctionalFlower; import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.core.helper.MathHelper; -import vazkii.botania.common.lib.LibMisc; import java.util.*; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java index 5b9953757..72e2d9426 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java @@ -10,16 +10,12 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.entity.item.ExperienceOrbEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.core.helper.ExperienceHelper; -import vazkii.botania.common.lib.LibMisc; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java index 27f50abf7..c9197c0aa 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java @@ -11,18 +11,14 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileCell; -import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index de3f86c97..c0d0005c2 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -14,20 +14,16 @@ import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.particles.ParticleTypes; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.vector.Vector3d; import net.minecraftforge.common.ForgeHooks; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.block.mana.BlockSpreader; -import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.lib.LibMisc; public class SubTileEndoflame extends TileEntityGeneratingFlower { private static final String TAG_BURN_TIME = "burnTime"; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java index 85608a2dd..c83b13cbd 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java @@ -12,18 +12,13 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.TNTEntity; import net.minecraft.fluid.FluidState; import net.minecraft.particles.ParticleTypes; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibMisc; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index 567247841..cb0f1f7c7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -14,21 +14,16 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; import net.minecraft.particles.ItemParticleData; import net.minecraft.particles.ParticleTypes; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.common.util.Constants; -import net.minecraftforge.items.ItemHandlerHelper; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibMisc; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java index 35dd125f4..0f5ce40e0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java @@ -21,14 +21,11 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biome; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibMisc; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java index 3e72c9e21..b427d0353 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileKekimurus.java @@ -11,17 +11,13 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.CakeBlock; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibMisc; public class SubTileKekimurus extends TileEntityGeneratingFlower { private static final int RANGE = 5; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java index b937037ab..2240515d2 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java @@ -12,17 +12,13 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tags.BlockTags; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.Collections; 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 be2bb271f..b20ff338b 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 @@ -11,7 +11,6 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.entity.SpawnReason; import net.minecraft.entity.monster.SlimeEntity; import net.minecraft.particles.ParticleTypes; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SharedSeedRandom; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; @@ -22,13 +21,10 @@ import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibMisc; import java.util.List; 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 17df1e930..e5833ce9c 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 @@ -11,17 +11,13 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; -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.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.ModTags; import javax.annotation.Nullable; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java index f235fd009..a30cfea3c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java @@ -14,7 +14,6 @@ import net.minecraft.entity.monster.IMob; import net.minecraft.entity.monster.ShulkerEntity; import net.minecraft.particles.ParticleTypes; import net.minecraft.potion.Effects; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; @@ -22,13 +21,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibMisc; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java index 8bf592a44..2d1719585 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java @@ -11,16 +11,11 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.fluid.Fluid; import net.minecraft.tags.FluidTags; import net.minecraft.tags.ITag; -import net.minecraft.tags.Tag; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.lib.LibMisc; public class SubTileThermalily extends SubTileHydroangeas { public SubTileThermalily() { 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 73acfd64f..4864b42c1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -41,9 +41,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandlerItem; -import net.minecraftforge.items.IItemHandlerModifiable; -import net.minecraftforge.items.wrapper.InvWrapper; -import net.minecraftforge.items.wrapper.RecipeWrapper; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IPetalApothecary; @@ -56,7 +53,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.crafting.ModRecipeTypes; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java index 7bbcd5fa1..900d22624 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java @@ -18,16 +18,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.particles.RedstoneParticleData; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nullable; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index daf8ff1c2..8e16280fd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -14,17 +14,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.item.IAvatarTile; import vazkii.botania.api.item.IAvatarWieldable; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; - -import javax.annotation.Nonnull; public class TileAvatar extends TileSimpleInventory implements IAvatarTile, ITickableTileEntity { private static final int MAX_MANA = 6400; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java index 1736cd80d..65e6e9dc6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -11,11 +11,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.registries.ObjectHolder; - -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java b/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java index 2481e9f3c..5c5b62455 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java @@ -10,13 +10,9 @@ package vazkii.botania.common.block.tile; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.item.ItemCacophonium; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; public class TileCacophonium extends TileMod { private static final String TAG_STACK = "stack"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCell.java b/src/main/java/vazkii/botania/common/block/tile/TileCell.java index 1ee889690..f971113d9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCell.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCell.java @@ -9,13 +9,9 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.block.subtile.generating.SubTileDandelifeon; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; public class TileCell extends TileMod { private static final String TAG_GENERATION = "generation"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java index 699b7155b..0a634e010 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -19,13 +19,8 @@ import net.minecraft.entity.merchant.villager.VillagerEntity; import net.minecraft.entity.villager.IVillagerType; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; - -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index ac218ee33..5fff12f20 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -17,17 +17,13 @@ import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.ICraftingRecipe; import net.minecraft.item.crafting.IRecipeType; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.world.World; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java index cf61edcc7..43e9fe869 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -15,15 +15,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.item.equipment.tool.ToolCommons; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileExposedSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileExposedSimpleInventory.java index 48ab0b6fc..0ff7e7f30 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileExposedSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileExposedSimpleInventory.java @@ -1,8 +1,15 @@ +/* + * This class is distributed as part of the Botania Mod. + * Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.common.block.tile; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityType; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java index 8b0f0469e..f056174fb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java @@ -11,13 +11,9 @@ package vazkii.botania.common.block.tile; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.block.subtile.functional.SubTileBubbell; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; 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 9cdd25827..4cee2e5b7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -13,14 +13,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SUpdateTileEntityPacket; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraftforge.client.model.ModelDataManager; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.client.model.data.ModelDataMap; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.capability.FloatingFlowerImpl; import vazkii.botania.api.item.IFloatingFlower; @@ -28,8 +26,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.BlockFloatingFlower; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java index 317cd87a5..de01f1bbd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -10,12 +10,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.registries.ObjectHolder; - -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; public class TileForestEye extends TileMod implements ITickableTileEntity { public int entities = 0; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileGaiaHead.java b/src/main/java/vazkii/botania/common/block/tile/TileGaiaHead.java index ac722e8ff..3a0ba9e7d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileGaiaHead.java @@ -10,10 +10,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.tileentity.SkullTileEntity; import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.registries.ObjectHolder; - -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index 7cd0d9f14..ff392f524 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -19,21 +19,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.StringUtils; import net.minecraft.util.math.BlockPos; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IHourglassTrigger; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; - -import javax.annotation.Nonnull; public class TileHourglass extends TileExposedSimpleInventory implements ITickableTileEntity { private static final String TAG_TIME = "time"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java index 925299154..028811f00 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -18,12 +18,10 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -31,10 +29,7 @@ import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemIncenseStick; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 343333616..91560a624 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -25,7 +25,6 @@ import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.DamageSource; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; @@ -34,7 +33,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; 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.wand.IWandBindable; @@ -46,7 +44,6 @@ import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.ModEntities; -import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index c681032bd..d28688ace 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -10,12 +10,8 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.client.fx.WispParticleData; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; public class TileManaFlame extends TileMod implements ITickableTileEntity { private static final String TAG_COLOR = "color"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index dba74c98f..13d48d274 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -19,10 +19,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; -import net.minecraftforge.registries.ObjectHolder; - -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; public class TileOpenCrate extends TileExposedSimpleInventory implements ITickableTileEntity { public TileOpenCrate() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java index 6318f6391..39a81d1cf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java @@ -16,16 +16,11 @@ import net.minecraft.nbt.NBTUtil; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SUpdateTileEntityPacket; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.client.model.data.ModelDataMap; import net.minecraftforge.client.model.data.ModelProperty; -import net.minecraftforge.registries.ObjectHolder; - -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index 44f2b3d2d..c0c3857c7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -11,9 +11,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.block.Block; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; @@ -25,8 +23,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.mana.BlockPool; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import java.util.Random; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index acb87917f..2b638691b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -24,8 +24,6 @@ import net.minecraft.util.Hand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.vector.Vector3d; -import net.minecraftforge.items.wrapper.InvWrapper; -import net.minecraftforge.items.wrapper.RecipeWrapper; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index a585f22ac..0103fcf7a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -16,15 +16,7 @@ import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.wrapper.InvWrapper; - -import javax.annotation.Nonnull; public abstract class TileSimpleInventory extends TileMod { 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 1c5a08f43..71f064450 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -11,19 +11,13 @@ package vazkii.botania.common.block.tile; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; -import net.minecraftforge.registries.ObjectHolder; 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.item.ItemSparkUpgrade; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; - -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Collection; 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 8704a63ed..8a3af66a3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -14,17 +14,13 @@ import net.minecraft.nbt.ListNBT; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.MobSpawnerTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.spawner.AbstractSpawner; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.client.fx.WispParticleData; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import java.util.Optional; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java index 701b9b79d..1c8fa8ede 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -9,13 +9,9 @@ package vazkii.botania.common.block.tile; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.Botania; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; public class TileStarfield extends TileMod implements ITickableTileEntity { public TileStarfield() { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index c6db2e20d..d348d3c36 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -15,11 +15,9 @@ import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.LazyValue; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; @@ -30,8 +28,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; import vazkii.patchouli.api.IMultiblock; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java index 34609fe52..e49c8d9a7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java @@ -9,13 +9,8 @@ package vazkii.botania.common.block.tile; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.registries.ObjectHolder; - -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; public class TileTeruTeruBozu extends TileMod implements ITickableTileEntity { private boolean wasRaining = false; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java index 34652a76f..c76c16e46 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -9,12 +9,8 @@ package vazkii.botania.common.block.tile; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; public class TileTinyPlanet extends TileMod implements ITickableTileEntity { public TileTinyPlanet() { 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 f00447969..80d9dda11 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -14,19 +14,15 @@ import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.*; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TranslationTextComponent; -import net.minecraftforge.items.ItemHandlerHelper; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.PlayerHelper; -import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 329f4cdbd..b75266963 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -12,8 +12,6 @@ import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestMatcher; @@ -21,8 +19,6 @@ import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index 80c27b911..85c7f136d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -12,12 +12,10 @@ import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.item.ItemFrameEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestMatcher; @@ -25,8 +23,6 @@ import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.core.helper.InventoryHelper; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; 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 3d9a52578..2c673a7f2 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 @@ -13,21 +13,17 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Util; import net.minecraft.util.math.AxisAlignedBB; 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.registries.ObjectHolder; import vazkii.botania.api.corporea.*; import vazkii.botania.common.advancements.CorporeaRequestTrigger; import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.core.helper.MathHelper; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import java.util.*; import java.util.regex.Matcher; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index b9a1c503a..da9b3ac5c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -12,18 +12,14 @@ import net.minecraft.entity.item.ItemFrameEntity; import net.minecraft.item.ItemStack; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.corporea.ICorporeaInterceptor; import vazkii.botania.api.corporea.ICorporeaRequestMatcher; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; 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 636ddca49..61fbd3c82 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 @@ -9,16 +9,12 @@ package vazkii.botania.common.block.tile.corporea; import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.corporea.*; import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileMod; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nullable; 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 945ab35e4..65c2efad9 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,10 +16,12 @@ 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.*; +import net.minecraft.tileentity.AbstractFurnaceTileEntity; +import net.minecraft.tileentity.FurnaceTileEntity; +import net.minecraft.tileentity.ITickableTileEntity; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.SoundCategory; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.Botania; @@ -27,8 +29,6 @@ import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.core.handler.ExoflameFurnaceHandler; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nullable; 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 9c81222fd..f460575bb 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 @@ -10,17 +10,13 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileMod; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index 373da713e..3eca78ca6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -13,16 +13,12 @@ import com.google.common.base.Predicates; import net.minecraft.entity.projectile.ThrowableEntity; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileMod; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; public class TileManaDetector extends TileMod implements ITickableTileEntity { public TileManaDetector() { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java index 18f108568..43a694bac 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaVoid.java @@ -8,15 +8,10 @@ */ package vazkii.botania.common.block.tile.mana; -import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.registries.ObjectHolder; - import vazkii.botania.api.mana.IClientManaHandler; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileMod; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; public class TileManaVoid extends TileMod implements IClientManaHandler { public TileManaVoid() { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index a063a631c..d7d8094aa 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -13,8 +13,6 @@ import net.minecraft.entity.Entity; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -25,11 +23,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileExposedSimpleInventory; -import vazkii.botania.common.block.tile.TileSimpleInventory; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; - -import javax.annotation.Nonnull; public class TilePrism extends TileExposedSimpleInventory { public TilePrism() { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 64a634f04..3fba13044 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -11,15 +11,11 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.nbt.CompoundNBT; import net.minecraft.particles.ParticleTypes; import net.minecraft.tileentity.ITickableTileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileMod; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; public class TilePump extends TileMod implements ITickableTileEntity { private static final String TAG_ACTIVE = "active"; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index 634c7999c..06fd824c8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -11,20 +11,16 @@ package vazkii.botania.common.block.tile.mana; 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.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileMod; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import javax.annotation.Nullable; 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 a34808ec8..25a93c429 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 @@ -38,11 +38,9 @@ import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; 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; import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileExposedSimpleInventory; -import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.handler.ModSounds; @@ -50,7 +48,6 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.EntityManaBurst.PositionProperties; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index 78cad197d..0ff59e72e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -16,18 +16,14 @@ import net.minecraft.item.ItemStack; 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.text.TextFormatting; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.block.tile.TileMod; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; public class TileTurntable extends TileMod implements ITickableTileEntity { private static final String TAG_SPEED = "speed"; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java index a0e59b4d7..19969623e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java @@ -9,13 +9,9 @@ package vazkii.botania.common.block.tile.string; import net.minecraft.block.BlockState; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; public class TileRedStringComparator extends TileRedString { private int comparatorValue = 0; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index e7d32d327..c171e2def 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -17,11 +17,8 @@ import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.EmptyHandler; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java index 99ef77b4f..2ced0e3b7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java @@ -10,13 +10,9 @@ package vazkii.botania.common.block.tile.string; import net.minecraft.tileentity.DispenserTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; public class TileRedStringDispenser extends TileRedStringContainer { public TileRedStringDispenser() { diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java index a51e3c0d1..b7992cafc 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java @@ -10,16 +10,12 @@ package vazkii.botania.common.block.tile.string; import net.minecraft.block.Block; import net.minecraft.block.IGrowable; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import java.util.Random; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java index 715ec8244..6a132047a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java @@ -11,17 +11,13 @@ package vazkii.botania.common.block.tile.string; import net.minecraft.block.Block; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Hand; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java index fb2d609c1..36c8e368c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java @@ -13,14 +13,10 @@ import net.minecraft.block.DoublePlantBlock; import net.minecraft.block.FlowerBlock; import net.minecraft.block.MushroomBlock; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.common.block.tile.ModTiles; -import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; public class TileRedStringRelay extends TileRedString { public TileRedStringRelay() { diff --git a/src/main/java/vazkii/botania/common/brew/ModPotions.java b/src/main/java/vazkii/botania/common/brew/ModPotions.java index c1efb0273..47aba8942 100644 --- a/src/main/java/vazkii/botania/common/brew/ModPotions.java +++ b/src/main/java/vazkii/botania/common/brew/ModPotions.java @@ -12,9 +12,7 @@ import net.minecraft.potion.Effect; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.registries.IForgeRegistry; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.brew.potion.*; -import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibPotionNames; import static vazkii.botania.common.block.ModBlocks.register; diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java index 2dfc9270f..4552df913 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java @@ -12,7 +12,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.potion.Effect; import net.minecraft.potion.EffectType; import net.minecraft.potion.InstantEffect; 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 0271957d7..b603e06f6 100644 --- a/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java @@ -17,7 +17,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.event.TickEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.InvWrapper; import net.minecraftforge.items.wrapper.RangedWrapper; diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index 3bece6c48..3cf27c62d 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -18,7 +18,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.common.block.tile.TileSimpleInventory; diff --git a/src/main/java/vazkii/botania/common/core/loot/BindUuid.java b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java index 94ccc9dec..1bd1d1e56 100644 --- a/src/main/java/vazkii/botania/common/core/loot/BindUuid.java +++ b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java @@ -10,17 +10,17 @@ package vazkii.botania.common.core.loot; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; -import com.google.gson.JsonSerializationContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.loot.*; +import net.minecraft.loot.LootContext; +import net.minecraft.loot.LootFunction; +import net.minecraft.loot.LootFunctionType; +import net.minecraft.loot.LootParameters; import net.minecraft.loot.conditions.ILootCondition; -import net.minecraft.util.ResourceLocation; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.relic.ItemRelic; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/crafting/RecipeBrew.java b/src/main/java/vazkii/botania/common/crafting/RecipeBrew.java index 3a7fe1cff..3a7524a7d 100644 --- a/src/main/java/vazkii/botania/common/crafting/RecipeBrew.java +++ b/src/main/java/vazkii/botania/common/crafting/RecipeBrew.java @@ -23,7 +23,6 @@ import net.minecraft.util.JSONUtils; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraftforge.items.wrapper.RecipeWrapper; import net.minecraftforge.registries.ForgeRegistryEntry; import vazkii.botania.api.BotaniaAPI; diff --git a/src/main/java/vazkii/botania/common/crafting/RecipePetals.java b/src/main/java/vazkii/botania/common/crafting/RecipePetals.java index 11d7eb172..184d9ecb4 100644 --- a/src/main/java/vazkii/botania/common/crafting/RecipePetals.java +++ b/src/main/java/vazkii/botania/common/crafting/RecipePetals.java @@ -22,7 +22,6 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.crafting.CraftingHelper; -import net.minecraftforge.items.wrapper.RecipeWrapper; import net.minecraftforge.registries.ForgeRegistryEntry; import vazkii.botania.api.recipe.IPetalRecipe; diff --git a/src/main/java/vazkii/botania/common/crafting/RecipeRuneAltar.java b/src/main/java/vazkii/botania/common/crafting/RecipeRuneAltar.java index 9d3a069d3..b86804dee 100644 --- a/src/main/java/vazkii/botania/common/crafting/RecipeRuneAltar.java +++ b/src/main/java/vazkii/botania/common/crafting/RecipeRuneAltar.java @@ -23,7 +23,6 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.crafting.CraftingHelper; -import net.minecraftforge.items.wrapper.RecipeWrapper; import net.minecraftforge.registries.ForgeRegistryEntry; import vazkii.botania.api.recipe.IRuneAltarRecipe; diff --git a/src/main/java/vazkii/botania/common/crafting/StateIngredientHelper.java b/src/main/java/vazkii/botania/common/crafting/StateIngredientHelper.java index 4a398c272..e786d3080 100644 --- a/src/main/java/vazkii/botania/common/crafting/StateIngredientHelper.java +++ b/src/main/java/vazkii/botania/common/crafting/StateIngredientHelper.java @@ -23,7 +23,6 @@ import net.minecraft.nbt.NBTUtil; import net.minecraft.network.PacketBuffer; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ITag; -import net.minecraft.tags.Tag; import net.minecraft.util.JSONUtils; import net.minecraft.util.ResourceLocation; import net.minecraftforge.registries.ForgeRegistries; diff --git a/src/main/java/vazkii/botania/common/crafting/StateIngredientTag.java b/src/main/java/vazkii/botania/common/crafting/StateIngredientTag.java index d2d8d83e4..9c25c073f 100644 --- a/src/main/java/vazkii/botania/common/crafting/StateIngredientTag.java +++ b/src/main/java/vazkii/botania/common/crafting/StateIngredientTag.java @@ -16,12 +16,9 @@ import net.minecraft.block.BlockState; import net.minecraft.network.PacketBuffer; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ITag; -import net.minecraft.tags.Tag; import net.minecraft.util.ResourceLocation; -import java.util.HashSet; import java.util.List; -import java.util.Set; import java.util.stream.Collectors; public class StateIngredientTag extends StateIngredientBlocks { diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java index df385ce65..aa0e1dfc0 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java @@ -24,8 +24,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.registries.ForgeRegistryEntry; -import vazkii.botania.common.Botania; - import javax.annotation.Nonnull; public class ArmorUpgradeRecipe implements ICraftingRecipe { diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java index 1642588d0..d3273d7b4 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java @@ -23,7 +23,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.common.crafting.CraftingHelper; -import net.minecraftforge.items.wrapper.RecipeWrapper; import net.minecraftforge.registries.ForgeRegistryEntry; import vazkii.botania.common.core.helper.ItemNBTHelper; diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 045bfb1bd..1d01ca549 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -20,7 +20,10 @@ 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.*; +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.vector.Vector3d; import net.minecraft.world.Explosion; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index afcb0b0e7..6c0544a6a 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -41,7 +41,6 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.EffectType; import net.minecraft.potion.Effects; import net.minecraft.tags.ITag; -import net.minecraft.tags.Tag; import net.minecraft.tileentity.BeaconTileEntity; import net.minecraft.util.*; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index e9767fe92..8fe21d3a7 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -10,29 +10,24 @@ package vazkii.botania.common.entity; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.projectile.ProjectileEntity; import net.minecraft.entity.projectile.ProjectileHelper; -import net.minecraft.nbt.CompoundNBT; -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.tileentity.EndGatewayTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.*; +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.vector.Vector3d; import net.minecraft.world.World; -import net.minecraft.world.server.ServerWorld; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import javax.annotation.Nullable; - -import java.util.UUID; - public abstract class EntityThrowableCopy extends ProjectileEntity { protected EntityThrowableCopy(EntityType type, World worldIn) { super(type, worldIn); diff --git a/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java b/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java index 2fe1f31c0..e6138635f 100644 --- a/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java +++ b/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java @@ -22,7 +22,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.EmptyHandler; -import net.minecraftforge.registries.IRegistryDelegate; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; @@ -35,7 +34,9 @@ import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.Botania; import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia; import vazkii.botania.common.brew.ModBrews; -import vazkii.botania.common.core.handler.*; +import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.core.handler.EquipmentHandler; +import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.integration.corporea.WrappedIInventory; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.relic.ItemLokiRing; diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 50f12ebd3..435673810 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -32,7 +32,6 @@ import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.PlayerHelper; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 03d1e9b62..5ff242c4b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -20,7 +20,10 @@ import net.minecraft.item.Items; import net.minecraft.item.UseAction; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.DamageSource; +import net.minecraft.util.Hand; +import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -35,7 +38,6 @@ import net.minecraftforge.fml.server.ServerLifecycleHooks; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.entity.EntitySignalFlare; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/item/ItemHorn.java b/src/main/java/vazkii/botania/common/item/ItemHorn.java index 9d6e452c4..8fed780f9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemHorn.java @@ -18,13 +18,15 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.UseAction; import net.minecraft.tags.BlockTags; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.item.IHornHarvestable.EnumHornType; -import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.ModTags; import javax.annotation.Nonnull; @@ -32,7 +34,6 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Locale; public class ItemHorn extends Item { public ItemHorn(Properties props) { diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 6dd8f7c70..ccba89979 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -14,7 +14,10 @@ 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.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; +import net.minecraft.util.NonNullList; import net.minecraft.util.registry.Registry; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; @@ -27,7 +30,6 @@ import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.client.core.handler.TooltipHandler; import vazkii.botania.common.advancements.UseItemSuccessTrigger; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.lib.LibMisc; import vazkii.patchouli.api.PatchouliAPI; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index c261a63ce..c98bf8660 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -19,7 +19,6 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; diff --git a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java index e14cf8d62..74899f45c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java @@ -11,13 +11,10 @@ package vazkii.botania.common.item; import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.lib.LibMisc; public class ItemSlimeBottle extends Item { public static final String TAG_ACTIVE = "active"; diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index 714a3d31d..f37ac43a8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -13,7 +13,10 @@ 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.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.SoundEvents; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; @@ -21,7 +24,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 1e78703a2..769ac6544 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -24,7 +24,6 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.DamageSource; 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.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index ffdd31bee..2f15c6a0d 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -12,7 +12,6 @@ import net.minecraft.block.Block; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; @@ -21,7 +20,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.common.block.mana.BlockPool; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; 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 a55af7229..72bb9ab3a 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -15,7 +15,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tags.ITag; -import net.minecraft.tags.Tag; import net.minecraft.util.text.IFormattableTextComponent; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; 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 821521c23..549fed200 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -32,9 +32,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewItem; -import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index 22115ab3f..597fff6e5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -14,7 +14,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; import net.minecraft.util.LazyValue; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.*; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index cba1d4966..23df15649 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -11,7 +11,6 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.MinecraftForge; @@ -21,7 +20,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.client.fx.SparkleParticleData; -import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java index cfb874fd4..af2731d55 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java @@ -13,7 +13,6 @@ import com.google.common.collect.Multimap; import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeMod; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index 989de04ab..8251571d0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -8,16 +8,10 @@ */ package vazkii.botania.common.item.equipment.tool; -import com.google.common.collect.Multimap; - import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.attributes.Attribute; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.entity.monster.EndermanEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.Hand; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index ebbca4754..c9d539e85 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -8,18 +8,10 @@ */ package vazkii.botania.common.item.equipment.tool; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.Multimap; - import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.attributes.Attribute; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.math.AxisAlignedBB; 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 0205e89dc..cafe6094b 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,7 +22,9 @@ 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.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.RayTraceContext; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3i; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java index d5b3bf9e4..cbb22096d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java @@ -8,8 +8,6 @@ */ package vazkii.botania.common.item.equipment.tool.elementium; -import com.google.common.base.Predicates; - import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.Enchantments; import net.minecraft.entity.Entity; @@ -20,16 +18,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.UseAction; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.IForgeShearable; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShears; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java index 1ba571e02..9b0cef93f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java @@ -8,19 +8,11 @@ */ package vazkii.botania.common.item.equipment.tool.manasteel; -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.enchantment.Enchantments; 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.item.ItemStack; import net.minecraft.item.ShearsItem; -import net.minecraft.stats.Stats; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; @@ -28,10 +20,6 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; -import javax.annotation.Nonnull; - -import java.util.List; -import java.util.Random; import java.util.function.Consumer; public class ItemManasteelShears extends ShearsItem implements IManaUsingItem { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index 477efb3b0..ab3969980 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -14,7 +14,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.IItemTier; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; 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 946ef5856..4af4f56b5 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 @@ -26,7 +26,6 @@ import vazkii.botania.api.item.ISequentialBreaker; import vazkii.botania.common.item.ItemTemperanceStone; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe; -import vazkii.botania.common.item.relic.ItemLokiRing; import javax.annotation.Nonnull; 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 dfc6af7cb..d783f1432 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 @@ -39,7 +39,6 @@ import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ItemTemperanceStone; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; -import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.item.relic.ItemThorRing; import vazkii.botania.common.lib.LibMisc; 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 b8ac40a8d..087e36778 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -17,8 +17,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.*; - import net.minecraft.util.registry.Registry; + import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.network.PacketBotaniaEffect; 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 4092d8100..3639f2c08 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java @@ -18,7 +18,6 @@ import net.minecraft.util.*; import net.minecraft.world.DimensionType; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.common.entity.EntityEnderAirBottle; import vazkii.botania.common.item.ModItems; 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 cd57fa87e..a3f48e2a0 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -23,7 +23,10 @@ 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.*; +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.vector.Vector3d; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; 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 bf2884db1..2f1824a86 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -20,7 +20,6 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.entity.living.LivingAttackEvent; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index 67b90b699..79a8d9281 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -18,7 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.tags.ITag; -import net.minecraft.tags.Tag; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; 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 ac8334c21..fd640b700 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -16,7 +16,10 @@ 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.*; +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.vector.Vector3d; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/lib/ModTags.java b/src/main/java/vazkii/botania/common/lib/ModTags.java index 024797ca0..7e0fa58a2 100644 --- a/src/main/java/vazkii/botania/common/lib/ModTags.java +++ b/src/main/java/vazkii/botania/common/lib/ModTags.java @@ -12,7 +12,10 @@ import net.minecraft.block.Block; import net.minecraft.entity.EntityType; import net.minecraft.item.DyeColor; import net.minecraft.item.Item; -import net.minecraft.tags.*; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.EntityTypeTags; +import net.minecraft.tags.ITag; +import net.minecraft.tags.ItemTags; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; diff --git a/src/main/java/vazkii/botania/common/world/MysticalMushroomFeature.java b/src/main/java/vazkii/botania/common/world/MysticalMushroomFeature.java index 3911aaaa5..459d80255 100644 --- a/src/main/java/vazkii/botania/common/world/MysticalMushroomFeature.java +++ b/src/main/java/vazkii/botania/common/world/MysticalMushroomFeature.java @@ -8,13 +8,10 @@ */ package vazkii.botania.common.world; -import com.mojang.serialization.Dynamic; - import net.minecraft.block.BlockState; import net.minecraft.item.DyeColor; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ISeedReader; -import net.minecraft.world.IWorld; import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.structure.StructureManager; diff --git a/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java b/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java index bfa5f7353..d0d4afbd9 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java @@ -18,7 +18,10 @@ 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.*; +import net.minecraft.world.gen.ChunkGenerator; +import net.minecraft.world.gen.GenerationStage; +import net.minecraft.world.gen.Heightmap; +import net.minecraft.world.gen.WorldGenRegion; import net.minecraft.world.gen.feature.structure.StructureManager; import net.minecraft.world.gen.settings.DimensionStructuresSettings; diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 9bc440c99..c6e740970 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -29,7 +29,6 @@ import net.minecraftforge.event.LootTableLoadEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.server.ServerLifecycleHooks; -import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; diff --git a/src/main/java/vazkii/botania/data/ItemTagProvider.java b/src/main/java/vazkii/botania/data/ItemTagProvider.java index 2c6cbefbc..ab5725e59 100644 --- a/src/main/java/vazkii/botania/data/ItemTagProvider.java +++ b/src/main/java/vazkii/botania/data/ItemTagProvider.java @@ -13,11 +13,8 @@ import net.minecraft.data.ItemTagsProvider; import net.minecraft.data.TagsProvider; import net.minecraft.item.DyeColor; import net.minecraft.item.Item; -import net.minecraft.item.Items; import net.minecraft.tags.BlockTags; -import net.minecraft.tags.ITag; import net.minecraft.tags.ItemTags; -import net.minecraft.tags.Tag; import net.minecraft.util.registry.Registry; import vazkii.botania.common.item.ModItems; diff --git a/src/main/java/vazkii/botania/data/recipes/BrewProvider.java b/src/main/java/vazkii/botania/data/recipes/BrewProvider.java index 3a17da460..027047598 100644 --- a/src/main/java/vazkii/botania/data/recipes/BrewProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/BrewProvider.java @@ -15,17 +15,14 @@ import net.minecraft.block.Blocks; import net.minecraft.data.DataGenerator; import net.minecraft.data.IFinishedRecipe; import net.minecraft.data.RecipeProvider; -import net.minecraft.item.Item; import net.minecraft.item.Items; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.Ingredient; import net.minecraft.tags.ItemTags; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.registry.Registry; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; -import vazkii.botania.common.Botania; import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.botania.common.item.ModItems; diff --git a/src/main/java/vazkii/botania/data/recipes/PetalProvider.java b/src/main/java/vazkii/botania/data/recipes/PetalProvider.java index 0d171e943..421972a61 100644 --- a/src/main/java/vazkii/botania/data/recipes/PetalProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/PetalProvider.java @@ -27,7 +27,6 @@ import vazkii.botania.common.block.ModSubtiles; 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 javax.annotation.Nullable; diff --git a/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java index 22a5cc59d..8f6755559 100644 --- a/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java @@ -28,7 +28,6 @@ import net.minecraft.potion.PotionUtils; import net.minecraft.potion.Potions; import net.minecraft.tags.ITag; import net.minecraft.tags.ItemTags; -import net.minecraft.tags.Tag; import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry;