From c6ed92fa32e5de2ad17d782dcd59f4f2cf722e75 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 22 Jul 2020 09:57:56 -0500 Subject: [PATCH] Fix moriya's typos in floating flowers, format --- .../java/vazkii/botania/api/BotaniaAPI.java | 2 - .../api/subtile/TileEntitySpecialFlower.java | 6 - .../core/handler/BoundTileRenderer.java | 1 - .../client/core/handler/ColorHandler.java | 1 - .../core/handler/ManaTabletRenderHandler.java | 1 - .../client/core/handler/ModelHandler.java | 1 - .../vazkii/botania/client/fx/FXLightning.java | 10 - .../client/fx/LightningSegmentGenerator.java | 1 - .../botania/client/gui/bag/GuiFlowerBag.java | 1 - .../integration/jei/JEIBotaniaPlugin.java | 1 - .../elventrade/ElvenTradeRecipeCategory.java | 1 - .../PetalApothecaryRecipeCategory.java | 1 - .../puredaisy/PureDaisyRecipeCategory.java | 1 - .../client/patchouli/PatchouliUtils.java | 1 - .../patchouli/component/ManaComponent.java | 2 - .../component/RotatingItemListComponent.java | 2 - .../component/TerraPlateComponent.java | 1 - .../processor/BrewRecipeProcessor.java | 2 - .../processor/ManaInfusionProcessor.java | 1 - .../processor/MultiCraftingProcessor.java | 1 - .../client/render/entity/RenderSparkBase.java | 1 - .../client/render/tile/RenderTileAvatar.java | 1 - .../render/tile/RenderTileTeruTeruBozu.java | 1 - .../render/tile/RenderTileTinyPotato.java | 1 - .../common/advancements/LokiPlaceTrigger.java | 2 - .../botania/common/block/BlockAltar.java | 4 - .../block/BlockFloatingSpecialFlower.java | 6 - .../common/block/BlockSpecialFlower.java | 7 - .../botania/common/block/ModBlocks.java | 1 - .../botania/common/block/ModSubtiles.java | 208 +++++++++--------- .../common/block/decor/BlockModMushroom.java | 1 - .../block/decor/panes/BlockModPane.java | 7 - .../functional/SubTileMarimorphosis.java | 1 - .../generating/SubTileDandelifeon.java | 1 - .../common/block/tile/TileAlfPortal.java | 1 - .../tile/TileExposedSimpleInventory.java | 1 - .../botania/common/block/tile/TilePylon.java | 1 - .../common/block/tile/mana/TileSpreader.java | 1 - .../common/core/handler/IMCSender.java | 6 - .../core/handler/ManaNetworkHandler.java | 1 - .../common/core/handler/ModSounds.java | 2 - .../common/core/handler/PixieHandler.java | 2 - .../botania/common/core/helper/Vector3.java | 5 - .../botania/common/core/loot/LootHandler.java | 2 - .../common/crafting/FluxfieldCondition.java | 1 - .../common/entity/EntityBabylonWeapon.java | 1 - .../common/entity/EntityEnderAirBottle.java | 1 - .../common/entity/EntityMagicLandmine.java | 1 - .../common/entity/EntityManaBurst.java | 1 - .../botania/common/entity/EntitySpark.java | 1 - .../common/impl/mana/ManaItemHandlerImpl.java | 1 - .../common/item/ItemAutocraftingHalo.java | 1 - .../botania/common/item/ItemBottledMana.java | 3 - .../botania/common/item/ItemCraftingHalo.java | 5 - .../botania/common/item/ItemEnderHand.java | 1 - .../botania/common/item/ItemTwigWand.java | 1 - .../equipment/bauble/ItemFlightTiara.java | 1 - .../item/equipment/tool/ItemStarSword.java | 1 - .../item/equipment/tool/ToolCommons.java | 2 - .../tool/terrasteel/ItemTerraPick.java | 1 - .../botania/common/item/lens/LensMagnet.java | 1 - .../common/item/lens/LensRedirect.java | 1 - .../common/item/relic/ItemKingKey.java | 1 - .../common/item/relic/ItemLokiRing.java | 1 - .../common/item/relic/ItemOdinRing.java | 1 - .../common/item/relic/ItemThorRing.java | 1 - .../common/item/rod/ItemExchangeRod.java | 3 - .../common/item/rod/ItemTerraformRod.java | 2 - .../common/world/SkyblockWorldEvents.java | 1 - .../vazkii/botania/data/BlockTagProvider.java | 6 - .../vazkii/botania/data/ItemTagProvider.java | 7 - .../botania/data/recipes/RecipeProvider.java | 10 - .../AccessorSkullTileEntityRenderer.java | 2 - 73 files changed, 102 insertions(+), 260 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 1a47c6940..f25117b73 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -20,8 +20,6 @@ import net.minecraft.util.*; 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.wrapper.EmptyHandler; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index dc43b9713..41b0fc191 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -17,19 +17,15 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.loot.LootContext; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SUpdateTileEntityPacket; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; -import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -55,8 +51,6 @@ import vazkii.botania.common.lib.ModTags; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.List; - /** * Common superclass of all magical flower TE's */ 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 d18717680..68ee27fb6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -22,7 +22,6 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; import net.minecraft.util.Util; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index de84fb6c3..e72dd1530 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -27,7 +27,6 @@ import net.minecraft.world.biome.BiomeColors; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.api.mana.BurstProperties; -import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockPlatform; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.BlockPetalBlock; diff --git a/src/main/java/vazkii/botania/client/core/handler/ManaTabletRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/ManaTabletRenderHandler.java index 515b9ab93..1e8ebbe69 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ManaTabletRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ManaTabletRenderHandler.java @@ -21,7 +21,6 @@ import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Effects; import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.common.core.handler.ConfigHandler; 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 5cc27364b..d0a4d330e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -28,7 +28,6 @@ import vazkii.botania.common.block.tile.ModTiles; import vazkii.botania.common.entity.ModEntities; import vazkii.botania.common.lib.LibMisc; -import static vazkii.botania.common.block.ModBlocks.register; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; public final class ModelHandler { diff --git a/src/main/java/vazkii/botania/client/fx/FXLightning.java b/src/main/java/vazkii/botania/client/fx/FXLightning.java index 3ff64f227..4ac13d02f 100644 --- a/src/main/java/vazkii/botania/client/fx/FXLightning.java +++ b/src/main/java/vazkii/botania/client/fx/FXLightning.java @@ -13,7 +13,6 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.mojang.datafixers.util.Pair; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.IParticleRenderType; import net.minecraft.client.particle.Particle; @@ -24,19 +23,10 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; -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.Matrix4f; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.math.vector.Vector3f; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.LightningHandler; -import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.helper.Vector3; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/client/fx/LightningSegmentGenerator.java b/src/main/java/vazkii/botania/client/fx/LightningSegmentGenerator.java index d9c2a3232..0540f2622 100644 --- a/src/main/java/vazkii/botania/client/fx/LightningSegmentGenerator.java +++ b/src/main/java/vazkii/botania/client/fx/LightningSegmentGenerator.java @@ -10,7 +10,6 @@ package vazkii.botania.client.fx; import com.mojang.datafixers.util.Pair; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.util.math.BlockPos; 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 f3f354699..bbbc1d205 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -20,7 +20,6 @@ import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.items.SlotItemHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; 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 ed99aa3e1..db2323a23 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -64,7 +64,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemBrewBase; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index 14854c681..61e7468e1 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -39,7 +39,6 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.recipe.IElvenTradeRecipe; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index b507a3f87..0ed0afca9 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -27,7 +27,6 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.api.recipe.IPetalRecipe; import vazkii.botania.client.integration.jei.JEIBotaniaPlugin; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index cfd01816c..030f7230c 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -32,7 +32,6 @@ import vazkii.botania.api.recipe.IPureDaisyRecipe; import vazkii.botania.api.recipe.StateIngredient; import vazkii.botania.client.integration.jei.JEIBotaniaPlugin; import vazkii.botania.common.block.ModSubtiles; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java b/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java index 4f3e4c640..cbd42167a 100644 --- a/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java +++ b/src/main/java/vazkii/botania/client/patchouli/PatchouliUtils.java @@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import vazkii.patchouli.api.IVariable; -import vazkii.patchouli.api.PatchouliAPI; import java.util.ArrayList; import java.util.Arrays; 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 83702c796..b64c2fdcd 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/ManaComponent.java @@ -8,7 +8,6 @@ */ package vazkii.botania.client.patchouli.component; -import com.google.common.collect.Streams; import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.Minecraft; @@ -22,7 +21,6 @@ import vazkii.patchouli.api.IComponentRenderContext; import vazkii.patchouli.api.ICustomComponent; import vazkii.patchouli.api.IVariable; -import java.util.Arrays; import java.util.function.UnaryOperator; /** diff --git a/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponent.java b/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponent.java index 6d9f6de5a..5273398b2 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponent.java @@ -11,12 +11,10 @@ package vazkii.botania.client.patchouli.component; import net.minecraft.item.crafting.Ingredient; import vazkii.patchouli.api.IVariable; -import vazkii.patchouli.api.PatchouliAPI; import java.util.ArrayList; import java.util.List; import java.util.function.UnaryOperator; -import java.util.stream.Collectors; /** * Patchouli custom component that draws a rotating circle of items from a provided list. 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 f7261d3b2..98bd1d3c2 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/TerraPlateComponent.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/TerraPlateComponent.java @@ -15,7 +15,6 @@ import net.minecraft.item.ItemStack; import vazkii.patchouli.api.IComponentRenderContext; import vazkii.patchouli.api.ICustomComponent; import vazkii.patchouli.api.IVariable; -import vazkii.patchouli.api.PatchouliAPI; import java.util.function.UnaryOperator; diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/BrewRecipeProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/BrewRecipeProcessor.java index 218ffeccc..52cf12f96 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/BrewRecipeProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/BrewRecipeProcessor.java @@ -9,7 +9,6 @@ package vazkii.botania.client.patchouli.processor; import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; @@ -22,7 +21,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.patchouli.api.IComponentProcessor; import vazkii.patchouli.api.IVariable; import vazkii.patchouli.api.IVariableProvider; -import vazkii.patchouli.api.PatchouliAPI; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java index 8f935b4df..8253ebcaf 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java @@ -11,7 +11,6 @@ package vazkii.botania.client.patchouli.processor; import com.google.common.collect.ImmutableList; import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java index aa4aea7dd..9a2cbdabf 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/MultiCraftingProcessor.java @@ -24,7 +24,6 @@ import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.patchouli.api.IComponentProcessor; import vazkii.patchouli.api.IVariable; import vazkii.patchouli.api.IVariableProvider; -import vazkii.patchouli.api.PatchouliAPI; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index 25ae38156..f22cbd16f 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -20,7 +20,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.util.math.vector.Vector3f; -import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.entity.EntitySparkBase; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java index 52a22cc04..af38afbb6 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -27,7 +27,6 @@ import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelAvatar; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAvatar; import javax.annotation.Nullable; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index 3579926ce..ad7081278 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -21,7 +21,6 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelTeruTeruBozu; -import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileTeruTeruBozu; import javax.annotation.Nullable; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index f5449a762..b4597428d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -43,7 +43,6 @@ import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.core.helper.ShaderWrappedRenderLayer; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileTinyPotato; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockTinyPotato; diff --git a/src/main/java/vazkii/botania/common/advancements/LokiPlaceTrigger.java b/src/main/java/vazkii/botania/common/advancements/LokiPlaceTrigger.java index 142a7469a..c82618f94 100644 --- a/src/main/java/vazkii/botania/common/advancements/LokiPlaceTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/LokiPlaceTrigger.java @@ -16,8 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.loot.ConditionArrayParser; import net.minecraft.util.ResourceLocation; -import vazkii.botania.common.lib.LibMisc; - import javax.annotation.Nonnull; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 74008d1c6..90c059bc0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -22,7 +22,6 @@ import net.minecraft.state.StateContainer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; -import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.shapes.IBooleanFunction; @@ -37,7 +36,6 @@ import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.item.IPetalApothecary.State; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; @@ -49,8 +47,6 @@ import vazkii.botania.common.item.rod.ItemWaterRod; import javax.annotation.Nonnull; -import java.util.Locale; - public class BlockAltar extends BlockMod implements ITileEntityProvider { public static final EnumProperty FLUID = EnumProperty.create("fluid", State.class); diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 1382ef8ff..839a44abd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -16,14 +16,9 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; -import net.minecraft.loot.LootContext; -import net.minecraft.loot.LootParameters; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; -import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -37,7 +32,6 @@ import vazkii.botania.common.block.decor.BlockFloatingFlower; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.List; import java.util.Random; import java.util.function.Supplier; diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 038637f47..6b2285a72 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -18,16 +18,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.loot.LootContext; -import net.minecraft.loot.LootParameters; import net.minecraft.potion.Effect; -import net.minecraft.potion.Effects; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; -import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.vector.Vector3d; @@ -43,7 +37,6 @@ import vazkii.botania.api.wand.IWandable; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.List; import java.util.function.Supplier; public class BlockSpecialFlower extends FlowerBlock implements ITileEntityProvider, IWandable, IWandHUD { diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 1639850a2..265473b9c 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -45,7 +45,6 @@ import vazkii.botania.common.item.block.ItemBlockElven; import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.item.block.ItemBlockTinyPotato; import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; import java.util.Locale; diff --git a/src/main/java/vazkii/botania/common/block/ModSubtiles.java b/src/main/java/vazkii/botania/common/block/ModSubtiles.java index c280677cc..9babd0788 100644 --- a/src/main/java/vazkii/botania/common/block/ModSubtiles.java +++ b/src/main/java/vazkii/botania/common/block/ModSubtiles.java @@ -8,9 +8,7 @@ */ package vazkii.botania.common.block; -import com.google.common.collect.ImmutableList; -import com.mojang.datafixers.util.Pair; - +import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.SoundType; @@ -23,7 +21,6 @@ import net.minecraft.util.registry.Registry; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.registries.IForgeRegistry; -import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.common.block.subtile.SubTileManastar; import vazkii.botania.common.block.subtile.SubTilePureDaisy; import vazkii.botania.common.block.subtile.functional.*; @@ -32,152 +29,151 @@ import vazkii.botania.common.brew.ModPotions; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; - -import java.util.List; -import java.util.function.Supplier; import static vazkii.botania.common.block.ModBlocks.register; public class ModSubtiles { - public static final Block pureDaisy = new BlockSpecialFlower(ModPotions.clear, 1, Block.Properties.from(Blocks.POPPY), SubTilePureDaisy::new); - public static final Block pureDaisyFloating = new BlockFloatingSpecialFlower(Block.Properties.create(Material.EARTH).hardnessAndResistance(0.5F).sound(SoundType.GROUND).setLightLevel(s -> 15), SubTilePureDaisy::new); + private static final AbstractBlock.Properties FLOWER_PROPS = AbstractBlock.Properties.from(Blocks.POPPY); + private static final AbstractBlock.Properties FLOATING_PROPS = Block.Properties.create(Material.EARTH).hardnessAndResistance(0.5F).sound(SoundType.GROUND).setLightLevel(s -> 15); - public static final Block manastar = new BlockSpecialFlower(Effects.GLOWING, 10, Block.Properties.from(pureDaisy), SubTileManastar::new); - public static final Block manastarFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileManastar::new); + public static final Block pureDaisy = new BlockSpecialFlower(ModPotions.clear, 1, FLOWER_PROPS, SubTilePureDaisy::new); + public static final Block pureDaisyFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTilePureDaisy::new); - public static final Block hydroangeas = new BlockSpecialFlower(Effects.UNLUCK, 10, Block.Properties.from(pureDaisy), SubTileHydroangeas::new); - public static final Block hydroangeasFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileHydroangeas::new); + public static final Block manastar = new BlockSpecialFlower(Effects.GLOWING, 10, FLOWER_PROPS, SubTileManastar::new); + public static final Block manastarFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileManastar::new); - public static final Block endoflame = new BlockSpecialFlower(Effects.SLOWNESS, 10, Block.Properties.from(pureDaisy), SubTileEndoflame::new); - public static final Block endoflameFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileEndoflame::new); + public static final Block hydroangeas = new BlockSpecialFlower(Effects.UNLUCK, 10, FLOWER_PROPS, SubTileHydroangeas::new); + public static final Block hydroangeasFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileHydroangeas::new); - public static final Block thermalily = new BlockSpecialFlower(Effects.FIRE_RESISTANCE, 120, Block.Properties.from(pureDaisy), SubTileThermalily::new); - public static final Block thermalilyFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileThermalily::new); + public static final Block endoflame = new BlockSpecialFlower(Effects.SLOWNESS, 10, FLOWER_PROPS, SubTileEndoflame::new); + public static final Block endoflameFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileEndoflame::new); - public static final Block rosaArcana = new BlockSpecialFlower(Effects.LUCK, 64, Block.Properties.from(pureDaisy), SubTileArcaneRose::new); - public static final Block rosaArcanaFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileArcaneRose::new); + public static final Block thermalily = new BlockSpecialFlower(Effects.FIRE_RESISTANCE, 120, FLOWER_PROPS, SubTileThermalily::new); + public static final Block thermalilyFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileThermalily::new); - public static final Block munchdew = new BlockSpecialFlower(Effects.SLOW_FALLING, 300, Block.Properties.from(pureDaisy), SubTileMunchdew::new); - public static final Block munchdewFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileMunchdew::new); + public static final Block rosaArcana = new BlockSpecialFlower(Effects.LUCK, 64, FLOWER_PROPS, SubTileArcaneRose::new); + public static final Block rosaArcanaFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileArcaneRose::new); - public static final Block entropinnyum = new BlockSpecialFlower(Effects.RESISTANCE, 72, Block.Properties.from(pureDaisy), SubTileEntropinnyum::new); - public static final Block entropinnyumFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileEntropinnyum::new); + public static final Block munchdew = new BlockSpecialFlower(Effects.SLOW_FALLING, 300, FLOWER_PROPS, SubTileMunchdew::new); + public static final Block munchdewFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileMunchdew::new); - public static final Block kekimurus = new BlockSpecialFlower(Effects.SATURATION, 15, Block.Properties.from(pureDaisy), SubTileKekimurus::new); - public static final Block kekimurusFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileKekimurus::new); + public static final Block entropinnyum = new BlockSpecialFlower(Effects.RESISTANCE, 72, FLOWER_PROPS, SubTileEntropinnyum::new); + public static final Block entropinnyumFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileEntropinnyum::new); - public static final Block gourmaryllis = new BlockSpecialFlower(Effects.HUNGER, 180, Block.Properties.from(pureDaisy), SubTileGourmaryllis::new); - public static final Block gourmaryllisFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileGourmaryllis::new); + public static final Block kekimurus = new BlockSpecialFlower(Effects.SATURATION, 15, FLOWER_PROPS, SubTileKekimurus::new); + public static final Block kekimurusFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileKekimurus::new); - public static final Block narslimmus = new BlockSpecialFlower(ModPotions.featherfeet, 240, Block.Properties.from(pureDaisy), SubTileNarslimmus::new); - public static final Block narslimmusFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileNarslimmus::new); + public static final Block gourmaryllis = new BlockSpecialFlower(Effects.HUNGER, 180, FLOWER_PROPS, SubTileGourmaryllis::new); + public static final Block gourmaryllisFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileGourmaryllis::new); - public static final Block spectrolus = new BlockSpecialFlower(Effects.BLINDNESS, 240, Block.Properties.from(pureDaisy), SubTileSpectrolus::new); - public static final Block spectrolusFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileSpectrolus::new); + public static final Block narslimmus = new BlockSpecialFlower(ModPotions.featherfeet, 240, FLOWER_PROPS, SubTileNarslimmus::new); + public static final Block narslimmusFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileNarslimmus::new); - public static final Block dandelifeon = new BlockSpecialFlower(Effects.NAUSEA, 240, Block.Properties.from(pureDaisy), SubTileDandelifeon::new); - public static final Block dandelifeonFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileDandelifeon::new); + public static final Block spectrolus = new BlockSpecialFlower(Effects.BLINDNESS, 240, FLOWER_PROPS, SubTileSpectrolus::new); + public static final Block spectrolusFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileSpectrolus::new); - public static final Block rafflowsia = new BlockSpecialFlower(Effects.HEALTH_BOOST, 18, Block.Properties.from(pureDaisy), SubTileRafflowsia::new); - public static final Block rafflowsiaFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileRafflowsia::new); + public static final Block dandelifeon = new BlockSpecialFlower(Effects.NAUSEA, 240, FLOWER_PROPS, SubTileDandelifeon::new); + public static final Block dandelifeonFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileDandelifeon::new); - public static final Block shulkMeNot = new BlockSpecialFlower(Effects.LEVITATION, 72, Block.Properties.from(pureDaisy), SubTileShulkMeNot::new); - public static final Block shulkMeNotFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileShulkMeNot::new); + public static final Block rafflowsia = new BlockSpecialFlower(Effects.HEALTH_BOOST, 18, FLOWER_PROPS, SubTileRafflowsia::new); + public static final Block rafflowsiaFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileRafflowsia::new); - public static final Block bellethorn = new BlockSpecialFlower(Effects.WITHER, 10, Block.Properties.from(pureDaisy), SubTileBellethorn::new); - public static final Block bellethornChibi = new BlockSpecialFlower(Effects.WITHER, 10, Block.Properties.from(pureDaisy), SubTileBellethorn.Mini::new); - public static final Block bellethornFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileBellethorn::new); - public static final Block bellethornChibiFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileBellethorn.Mini::new); + public static final Block shulkMeNot = new BlockSpecialFlower(Effects.LEVITATION, 72, FLOWER_PROPS, SubTileShulkMeNot::new); + public static final Block shulkMeNotFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileShulkMeNot::new); - public static final Block bergamute = new BlockSpecialFlower(Effects.BLINDNESS, 10, Block.Properties.from(pureDaisy), SubTileBergamute::new); - public static final Block bergamuteFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileBergamute::new); + public static final Block bellethorn = new BlockSpecialFlower(Effects.WITHER, 10, FLOWER_PROPS, SubTileBellethorn::new); + public static final Block bellethornChibi = new BlockSpecialFlower(Effects.WITHER, 10, FLOWER_PROPS, SubTileBellethorn.Mini::new); + public static final Block bellethornFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileBellethorn::new); + public static final Block bellethornChibiFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileBellethorn.Mini::new); - public static final Block dreadthorn = new BlockSpecialFlower(Effects.WITHER, 10, Block.Properties.from(pureDaisy), SubTileDreadthorn::new); - public static final Block dreadthornFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileDreadthorn::new); + public static final Block bergamute = new BlockSpecialFlower(Effects.BLINDNESS, 10, FLOWER_PROPS, SubTileBergamute::new); + public static final Block bergamuteFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileBergamute::new); - public static final Block heiseiDream = new BlockSpecialFlower(ModPotions.soulCross, 300, Block.Properties.from(pureDaisy), SubTileHeiseiDream::new); - public static final Block heiseiDreamFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileHeiseiDream::new); + public static final Block dreadthorn = new BlockSpecialFlower(Effects.WITHER, 10, FLOWER_PROPS, SubTileDreadthorn::new); + public static final Block dreadthornFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileDreadthorn::new); - public static final Block tigerseye = new BlockSpecialFlower(Effects.STRENGTH, 90, Block.Properties.from(pureDaisy), SubTileTigerseye::new); - public static final Block tigerseyeFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileTigerseye::new); + public static final Block heiseiDream = new BlockSpecialFlower(ModPotions.soulCross, 300, FLOWER_PROPS, SubTileHeiseiDream::new); + public static final Block heiseiDreamFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileHeiseiDream::new); - public static final Block jadedAmaranthus = new BlockSpecialFlower(Effects.INSTANT_HEALTH, 1, Block.Properties.from(pureDaisy), SubTileJadedAmaranthus::new); - public static final Block jadedAmaranthusFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileJadedAmaranthus::new); + public static final Block tigerseye = new BlockSpecialFlower(Effects.STRENGTH, 90, FLOWER_PROPS, SubTileTigerseye::new); + public static final Block tigerseyeFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileTigerseye::new); - public static final Block orechid = new BlockSpecialFlower(Effects.HASTE, 10, Block.Properties.from(pureDaisy), SubTileOrechid::new); - public static final Block orechidFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileOrechid::new); + public static final Block jadedAmaranthus = new BlockSpecialFlower(Effects.INSTANT_HEALTH, 1, FLOWER_PROPS, SubTileJadedAmaranthus::new); + public static final Block jadedAmaranthusFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileJadedAmaranthus::new); - public static final Block fallenKanade = new BlockSpecialFlower(Effects.REGENERATION, 90, Block.Properties.from(pureDaisy), SubTileFallenKanade::new); - public static final Block fallenKanadeFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileFallenKanade::new); + public static final Block orechid = new BlockSpecialFlower(Effects.HASTE, 10, FLOWER_PROPS, SubTileOrechid::new); + public static final Block orechidFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileOrechid::new); - public static final Block exoflame = new BlockSpecialFlower(Effects.SPEED, 240, Block.Properties.from(pureDaisy), SubTileExoflame::new); - public static final Block exoflameFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileExoflame::new); + public static final Block fallenKanade = new BlockSpecialFlower(Effects.REGENERATION, 90, FLOWER_PROPS, SubTileFallenKanade::new); + public static final Block fallenKanadeFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileFallenKanade::new); - public static final Block agricarnation = new BlockSpecialFlower(Effects.ABSORPTION, 48, Block.Properties.from(pureDaisy), SubTileAgricarnation::new); - public static final Block agricarnationChibi = new BlockSpecialFlower(Effects.ABSORPTION, 48, Block.Properties.from(pureDaisy), SubTileAgricarnation.Mini::new); - public static final Block agricarnationFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileAgricarnation::new); - public static final Block agricarnationChibiFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileAgricarnation.Mini::new); + public static final Block exoflame = new BlockSpecialFlower(Effects.SPEED, 240, FLOWER_PROPS, SubTileExoflame::new); + public static final Block exoflameFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileExoflame::new); - public static final Block hopperhock = new BlockSpecialFlower(Effects.SPEED, 30, Block.Properties.from(pureDaisy), SubTileHopperhock::new); - public static final Block hopperhockChibi = new BlockSpecialFlower(Effects.SPEED, 30, Block.Properties.from(pureDaisy), SubTileHopperhock.Mini::new); - public static final Block hopperhockFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileHopperhock::new); - public static final Block hopperhockChibiFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileHopperhock.Mini::new); + public static final Block agricarnation = new BlockSpecialFlower(Effects.ABSORPTION, 48, FLOWER_PROPS, SubTileAgricarnation::new); + public static final Block agricarnationChibi = new BlockSpecialFlower(Effects.ABSORPTION, 48, FLOWER_PROPS, SubTileAgricarnation.Mini::new); + public static final Block agricarnationFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileAgricarnation::new); + public static final Block agricarnationChibiFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileAgricarnation.Mini::new); - public static final Block tangleberrie = new BlockSpecialFlower(ModPotions.bloodthrst, 120, Block.Properties.from(pureDaisy), SubTileTangleberrie::new); - public static final Block tangleberrieFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileTangleberrie::new); + public static final Block hopperhock = new BlockSpecialFlower(Effects.SPEED, 30, FLOWER_PROPS, SubTileHopperhock::new); + public static final Block hopperhockChibi = new BlockSpecialFlower(Effects.SPEED, 30, FLOWER_PROPS, SubTileHopperhock.Mini::new); + public static final Block hopperhockFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileHopperhock::new); + public static final Block hopperhockChibiFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileHopperhock.Mini::new); - public static final Block jiyuulia = new BlockSpecialFlower(ModPotions.emptiness, 120, Block.Properties.from(pureDaisy), SubTileJiyuulia::new); - public static final Block jiyuuliaFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileJiyuulia::new); + public static final Block tangleberrie = new BlockSpecialFlower(ModPotions.bloodthrst, 120, FLOWER_PROPS, SubTileTangleberrie::new); + public static final Block tangleberrieFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileTangleberrie::new); - public static final Block rannuncarpus = new BlockSpecialFlower(Effects.JUMP_BOOST, 30, Block.Properties.from(pureDaisy), SubTileRannuncarpus::new); - public static final Block rannuncarpusChibi = new BlockSpecialFlower(Effects.JUMP_BOOST, 30, Block.Properties.from(pureDaisy), SubTileRannuncarpus.Mini::new); - public static final Block rannuncarpusFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileRannuncarpus::new); - public static final Block rannuncarpusChibiFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileRannuncarpus.Mini::new); + public static final Block jiyuulia = new BlockSpecialFlower(ModPotions.emptiness, 120, FLOWER_PROPS, SubTileJiyuulia::new); + public static final Block jiyuuliaFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileJiyuulia::new); - public static final Block hyacidus = new BlockSpecialFlower(Effects.POISON, 48, Block.Properties.from(pureDaisy), SubTileHyacidus::new); - public static final Block hyacidusFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileHyacidus::new); + public static final Block rannuncarpus = new BlockSpecialFlower(Effects.JUMP_BOOST, 30, FLOWER_PROPS, SubTileRannuncarpus::new); + public static final Block rannuncarpusChibi = new BlockSpecialFlower(Effects.JUMP_BOOST, 30, FLOWER_PROPS, SubTileRannuncarpus.Mini::new); + public static final Block rannuncarpusFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileRannuncarpus::new); + public static final Block rannuncarpusChibiFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileRannuncarpus.Mini::new); - public static final Block pollidisiac = new BlockSpecialFlower(Effects.HASTE, 369, Block.Properties.from(pureDaisy), SubTilePollidisiac::new); - public static final Block pollidisiacFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTilePollidisiac::new); + public static final Block hyacidus = new BlockSpecialFlower(Effects.POISON, 48, FLOWER_PROPS, SubTileHyacidus::new); + public static final Block hyacidusFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileHyacidus::new); - public static final Block clayconia = new BlockSpecialFlower(Effects.WEAKNESS, 30, Block.Properties.from(pureDaisy), SubTileClayconia::new); - public static final Block clayconiaChibi = new BlockSpecialFlower(Effects.WEAKNESS, 30, Block.Properties.from(pureDaisy), SubTileClayconia.Mini::new); - public static final Block clayconiaFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileClayconia::new); - public static final Block clayconiaChibiFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileClayconia.Mini::new); + public static final Block pollidisiac = new BlockSpecialFlower(Effects.HASTE, 369, FLOWER_PROPS, SubTilePollidisiac::new); + public static final Block pollidisiacFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTilePollidisiac::new); - public static final Block loonium = new BlockSpecialFlower(ModPotions.allure, 900, Block.Properties.from(pureDaisy), SubTileLoonuim::new); - public static final Block looniumFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileLoonuim::new); + public static final Block clayconia = new BlockSpecialFlower(Effects.WEAKNESS, 30, FLOWER_PROPS, SubTileClayconia::new); + public static final Block clayconiaChibi = new BlockSpecialFlower(Effects.WEAKNESS, 30, FLOWER_PROPS, SubTileClayconia.Mini::new); + public static final Block clayconiaFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileClayconia::new); + public static final Block clayconiaChibiFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileClayconia.Mini::new); - public static final Block daffomill = new BlockSpecialFlower(Effects.LEVITATION, 6, Block.Properties.from(pureDaisy), SubTileDaffomill::new); - public static final Block daffomillFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileDaffomill::new); + public static final Block loonium = new BlockSpecialFlower(ModPotions.allure, 900, FLOWER_PROPS, SubTileLoonuim::new); + public static final Block looniumFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileLoonuim::new); - public static final Block vinculotus = new BlockSpecialFlower(Effects.NIGHT_VISION, 900, Block.Properties.from(pureDaisy), SubTileVinculotus::new); - public static final Block vinculotusFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileVinculotus::new); + public static final Block daffomill = new BlockSpecialFlower(Effects.LEVITATION, 6, FLOWER_PROPS, SubTileDaffomill::new); + public static final Block daffomillFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileDaffomill::new); - public static final Block spectranthemum = new BlockSpecialFlower(Effects.INVISIBILITY, 360, Block.Properties.from(pureDaisy), SubTileSpectranthemum::new); - public static final Block spectranthemumFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileSpectranthemum::new); + public static final Block vinculotus = new BlockSpecialFlower(Effects.NIGHT_VISION, 900, FLOWER_PROPS, SubTileVinculotus::new); + public static final Block vinculotusFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileVinculotus::new); - public static final Block medumone = new BlockSpecialFlower(Effects.SLOWNESS, 3600, Block.Properties.from(pureDaisy), SubTileMedumone::new); - public static final Block medumoneFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileMedumone::new); + public static final Block spectranthemum = new BlockSpecialFlower(Effects.INVISIBILITY, 360, FLOWER_PROPS, SubTileSpectranthemum::new); + public static final Block spectranthemumFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileSpectranthemum::new); - public static final Block marimorphosis = new BlockSpecialFlower(Effects.MINING_FATIGUE, 60, Block.Properties.from(pureDaisy), SubTileMarimorphosis::new); - public static final Block marimorphosisChibi = new BlockSpecialFlower(Effects.MINING_FATIGUE, 60, Block.Properties.from(pureDaisyFloating), SubTileMarimorphosis.Mini::new); - public static final Block marimorphosisFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileMarimorphosis::new); - public static final Block marimorphosisChibiFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileMarimorphosis.Mini::new); + public static final Block medumone = new BlockSpecialFlower(Effects.SLOWNESS, 3600, FLOWER_PROPS, SubTileMedumone::new); + public static final Block medumoneFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileMedumone::new); - public static final Block bubbell = new BlockSpecialFlower(Effects.WATER_BREATHING, 240, Block.Properties.from(pureDaisy), SubTileBubbell::new); - public static final Block bubbellChibi = new BlockSpecialFlower(Effects.WATER_BREATHING, 240, Block.Properties.from(pureDaisy), SubTileBubbell.Mini::new); - public static final Block bubbellFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileBubbell::new); - public static final Block bubbellChibiFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileBubbell.Mini::new); + public static final Block marimorphosis = new BlockSpecialFlower(Effects.MINING_FATIGUE, 60, FLOWER_PROPS, SubTileMarimorphosis::new); + public static final Block marimorphosisChibi = new BlockSpecialFlower(Effects.MINING_FATIGUE, 60, FLOWER_PROPS, SubTileMarimorphosis.Mini::new); + public static final Block marimorphosisFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileMarimorphosis::new); + public static final Block marimorphosisChibiFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileMarimorphosis.Mini::new); - public static final Block solegnolia = new BlockSpecialFlower(Effects.INSTANT_DAMAGE, 1, Block.Properties.from(pureDaisy), SubTileSolegnolia::new); - public static final Block solegnoliaChibi = new BlockSpecialFlower(Effects.INSTANT_DAMAGE, 1, Block.Properties.from(pureDaisy), SubTileSolegnolia.Mini::new); - public static final Block solegnoliaFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileSolegnolia::new); - public static final Block solegnoliaChibiFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisy), SubTileSolegnolia.Mini::new); + public static final Block bubbell = new BlockSpecialFlower(Effects.WATER_BREATHING, 240, FLOWER_PROPS, SubTileBubbell::new); + public static final Block bubbellChibi = new BlockSpecialFlower(Effects.WATER_BREATHING, 240, FLOWER_PROPS, SubTileBubbell.Mini::new); + public static final Block bubbellFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileBubbell::new); + public static final Block bubbellChibiFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileBubbell.Mini::new); - public static final Block orechidIgnem = new BlockSpecialFlower(Effects.FIRE_RESISTANCE, 600, Block.Properties.from(pureDaisy), SubTileOrechidIgnem::new); - public static final Block orechidIgnemFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileOrechidIgnem::new); + public static final Block solegnolia = new BlockSpecialFlower(Effects.INSTANT_DAMAGE, 1, FLOWER_PROPS, SubTileSolegnolia::new); + public static final Block solegnoliaChibi = new BlockSpecialFlower(Effects.INSTANT_DAMAGE, 1, FLOWER_PROPS, SubTileSolegnolia.Mini::new); + public static final Block solegnoliaFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileSolegnolia::new); + public static final Block solegnoliaChibiFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileSolegnolia.Mini::new); + + public static final Block orechidIgnem = new BlockSpecialFlower(Effects.FIRE_RESISTANCE, 600, FLOWER_PROPS, SubTileOrechidIgnem::new); + public static final Block orechidIgnemFloating = new BlockFloatingSpecialFlower(FLOATING_PROPS, SubTileOrechidIgnem::new); public static final TileEntityType PURE_DAISY = TileEntityType.Builder.create(SubTilePureDaisy::new, pureDaisy, pureDaisyFloating).build(null); public static final TileEntityType MANASTAR = TileEntityType.Builder.create(SubTileManastar::new, manastar, manastarFloating).build(null); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index f97ab3b7b..169f277ed 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -21,7 +21,6 @@ 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; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java index b009c7429..e0ee0a57d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java @@ -8,14 +8,7 @@ */ package vazkii.botania.common.block.decor.panes; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; import net.minecraft.block.PaneBlock; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; - -import vazkii.botania.common.block.ModBlocks; public class BlockModPane extends PaneBlock { 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 025976a95..7e2213acf 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 @@ -11,7 +11,6 @@ package vazkii.botania.common.block.subtile.functional; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.block.pattern.BlockStateMatcher; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.BiomeDictionary; 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 8e1b48ef8..7b281c8bc 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,7 +11,6 @@ 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.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index de11e0dbd..f8ea971df 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -15,7 +15,6 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.RecipeManager; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntity; 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 30dbf4bd2..3d9287d26 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileExposedSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileExposedSimpleInventory.java @@ -9,7 +9,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; 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 bed5fd2cd..d924f1cd9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -23,7 +23,6 @@ import vazkii.botania.common.block.BlockPylon; 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 java.util.Random; 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 b2f784e52..92665bd3c 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 @@ -19,7 +19,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.ThrowableEntity; import net.minecraft.inventory.Inventory; import net.minecraft.item.DyeColor; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.ITickableTileEntity; diff --git a/src/main/java/vazkii/botania/common/core/handler/IMCSender.java b/src/main/java/vazkii/botania/common/core/handler/IMCSender.java index fc12839c3..75c655146 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCSender.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCSender.java @@ -8,19 +8,13 @@ */ package vazkii.botania.common.core.handler; -import com.mojang.datafixers.util.Pair; - -import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.item.DyeColor; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.InterModComms; import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; -import net.minecraftforge.registries.IRegistryDelegate; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.core.helper.ColorHelper; -import vazkii.botania.common.lib.LibMisc; public class IMCSender { public static void enqueue(InterModEnqueueEvent evt) { diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index a69175f29..a2c108b16 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -20,7 +20,6 @@ import vazkii.botania.api.mana.ManaNetworkEvent.ManaBlockType; import javax.annotation.Nullable; import java.util.*; -import java.util.function.BinaryOperator; public final class ManaNetworkHandler implements IManaNetwork { diff --git a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java index 9d06d34ec..b9222ce9d 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java +++ b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java @@ -13,8 +13,6 @@ import net.minecraft.util.SoundEvent; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.registries.IForgeRegistry; -import vazkii.botania.common.lib.LibMisc; - import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; public final class ModSounds { diff --git a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java index 17afe1093..4eef55d05 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -8,7 +8,6 @@ */ package vazkii.botania.common.core.handler; -import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.SpawnReason; import net.minecraft.entity.ai.attributes.Attribute; @@ -21,7 +20,6 @@ import net.minecraft.potion.Effect; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.util.Util; -import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.registries.IForgeRegistry; diff --git a/src/main/java/vazkii/botania/common/core/helper/Vector3.java b/src/main/java/vazkii/botania/common/core/helper/Vector3.java index f2599e4f7..9aaa12e56 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Vector3.java +++ b/src/main/java/vazkii/botania/common/core/helper/Vector3.java @@ -12,17 +12,12 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.math.vector.Vector3f; -import net.minecraft.util.math.vector.Vector4f; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import org.lwjgl.opengl.GL11; - import java.math.BigDecimal; import java.math.MathContext; import java.math.RoundingMode; diff --git a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java index 4ad4b8f17..d415d348e 100644 --- a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java +++ b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java @@ -14,8 +14,6 @@ import net.minecraft.loot.TableLootEntry; import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.LootTableLoadEvent; -import vazkii.botania.common.lib.LibMisc; - import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; public final class LootHandler { diff --git a/src/main/java/vazkii/botania/common/crafting/FluxfieldCondition.java b/src/main/java/vazkii/botania/common/crafting/FluxfieldCondition.java index ab09237dc..47b751805 100644 --- a/src/main/java/vazkii/botania/common/crafting/FluxfieldCondition.java +++ b/src/main/java/vazkii/botania/common/crafting/FluxfieldCondition.java @@ -15,7 +15,6 @@ import net.minecraftforge.common.crafting.conditions.ICondition; import net.minecraftforge.common.crafting.conditions.IConditionSerializer; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lib.LibMisc; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index f8b5a643b..62c55ac38 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -30,7 +30,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; import vazkii.botania.client.fx.WispParticleData; -import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index 992cf3d48..6857b5354 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -11,7 +11,6 @@ package vazkii.botania.common.entity; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.block.pattern.BlockStateMatcher; import net.minecraft.entity.EntityType; import net.minecraft.entity.IRendersAsItem; import net.minecraft.entity.LivingEntity; diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index 51ed2fa46..18f917d4f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -17,7 +17,6 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.util.DamageSource; import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index e83bf5555..31693fe47 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -39,7 +39,6 @@ import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; import vazkii.botania.common.item.lens.LensWarp; diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 48f3500f8..c4e715da8 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -29,7 +29,6 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaItem; diff --git a/src/main/java/vazkii/botania/common/impl/mana/ManaItemHandlerImpl.java b/src/main/java/vazkii/botania/common/impl/mana/ManaItemHandlerImpl.java index 38ecd9f5b..a219fd2f7 100644 --- a/src/main/java/vazkii/botania/common/impl/mana/ManaItemHandlerImpl.java +++ b/src/main/java/vazkii/botania/common/impl/mana/ManaItemHandlerImpl.java @@ -15,7 +15,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.*; diff --git a/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java index e6069bdc7..05ae0166b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java @@ -14,7 +14,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; import vazkii.botania.client.lib.LibResources; diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index f0d25aa0e..4b97f0a05 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -23,8 +23,6 @@ import net.minecraft.potion.Effects; 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; import net.minecraft.util.text.ITextComponent; @@ -33,7 +31,6 @@ import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fml.server.ServerLifecycleHooks; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityPixie; diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 25839d961..cb1d961a8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -37,7 +37,6 @@ import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Matrix4f; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3f; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; @@ -50,17 +49,13 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.crafting.IShapedRecipe; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.items.ItemStackHandler; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.client.gui.crafting.ContainerCraftingHalo; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.PlayerHelper; -import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.crafting.ModRecipeTypes; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; diff --git a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java index a592a246a..341ec0032 100644 --- a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java +++ b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java @@ -21,7 +21,6 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.SoundEvents; import net.minecraft.world.World; -import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.mana.IManaUsingItem; diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index d87d5d267..68cbbfb5d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -49,7 +49,6 @@ import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; -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/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index f950f974c..1d9451c0c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -49,7 +49,6 @@ import vazkii.botania.client.core.helper.AccessoryRenderHelper; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java index 95569307c..d3fc0fb8d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java @@ -21,7 +21,6 @@ import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityFallingStar; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; 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 7391751f8..c7382030f 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 @@ -24,8 +24,6 @@ import net.minecraft.item.ToolItem; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3i; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; 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 33b9397d2..317160130 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 @@ -40,7 +40,6 @@ 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.ItemThorRing; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java index 9ef036e08..58ccbb396 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java @@ -16,7 +16,6 @@ import net.minecraft.util.math.vector.Vector3d; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaReceiver; -import vazkii.botania.common.core.helper.Vector3; import java.util.function.Predicate; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java index 277042df4..42185e55e 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java @@ -22,7 +22,6 @@ import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IDirectioned; import vazkii.botania.api.mana.IThrottledPacket; import vazkii.botania.common.core.helper.MathHelper; -import vazkii.botania.common.core.helper.Vector3; public class LensRedirect extends Lens { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index 4db050d9c..5fba0fd08 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -24,7 +24,6 @@ import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityBabylonWeapon; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; 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 2b324a32f..e87c04215 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -43,7 +43,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nullable; 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 47b3beb54..b6fe3dea9 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -22,7 +22,6 @@ import net.minecraftforge.event.entity.living.LivingAttackEvent; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibMisc; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java index 0f55d1588..6dbafc561 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java @@ -14,7 +14,6 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibMisc; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 5fd63c127..cd7c7c376 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -35,10 +35,7 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBlockProvider; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index 4fbfdfaab..413a42e50 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -8,8 +8,6 @@ */ package vazkii.botania.common.item.rod; -import com.google.common.collect.ImmutableList; - import net.minecraft.block.*; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index ee6f5cfc5..87e51acf3 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -26,7 +26,6 @@ import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; diff --git a/src/main/java/vazkii/botania/data/BlockTagProvider.java b/src/main/java/vazkii/botania/data/BlockTagProvider.java index 8d624b8f2..89052ac86 100644 --- a/src/main/java/vazkii/botania/data/BlockTagProvider.java +++ b/src/main/java/vazkii/botania/data/BlockTagProvider.java @@ -8,26 +8,20 @@ */ package vazkii.botania.data; -import com.mojang.datafixers.util.Pair; - import net.minecraft.block.*; import net.minecraft.data.BlockTagsProvider; import net.minecraft.data.DataGenerator; import net.minecraft.item.DyeColor; import net.minecraft.tags.BlockTags; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; import vazkii.botania.common.block.BlockFloatingSpecialFlower; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModSubtiles; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.ModTags; import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.nio.file.Path; import java.util.Arrays; import java.util.Comparator; import java.util.function.Predicate; diff --git a/src/main/java/vazkii/botania/data/ItemTagProvider.java b/src/main/java/vazkii/botania/data/ItemTagProvider.java index db453e3a3..c1aa8c997 100644 --- a/src/main/java/vazkii/botania/data/ItemTagProvider.java +++ b/src/main/java/vazkii/botania/data/ItemTagProvider.java @@ -10,21 +10,14 @@ package vazkii.botania.data; import net.minecraft.data.DataGenerator; import net.minecraft.data.ItemTagsProvider; -import net.minecraft.data.TagsProvider; -import net.minecraft.item.DyeColor; -import net.minecraft.item.Item; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; -import net.minecraft.util.registry.Registry; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.ModTags; import javax.annotation.Nonnull; -import java.util.Arrays; -import java.util.Comparator; - public class ItemTagProvider extends ItemTagsProvider { public ItemTagProvider(DataGenerator generatorIn, BlockTagProvider blockTagProvider) { super(generatorIn, blockTagProvider); diff --git a/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java index ec4442eeb..82f382ff4 100644 --- a/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java @@ -10,12 +10,8 @@ package vazkii.botania.data.recipes; import com.google.gson.JsonArray; -import net.minecraft.advancements.Advancement; -import net.minecraft.advancements.AdvancementRewards; import net.minecraft.advancements.ICriterionInstance; -import net.minecraft.advancements.IRequirementsStrategy; import net.minecraft.advancements.criterion.InventoryChangeTrigger; -import net.minecraft.advancements.criterion.ItemPredicate; import net.minecraft.advancements.criterion.RecipeUnlockedTrigger; import net.minecraft.block.Block; import net.minecraft.data.*; @@ -30,10 +26,6 @@ import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; import net.minecraftforge.common.Tags; -import net.minecraftforge.common.crafting.ConditionalAdvancement; -import net.minecraftforge.common.crafting.ConditionalRecipe; -import net.minecraftforge.common.crafting.conditions.TagEmptyCondition; -import net.minecraftforge.common.crafting.conditions.TrueCondition; import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.common.block.ModBlocks; @@ -50,12 +42,10 @@ import vazkii.botania.common.lib.ResourceLocationHelper; import javax.annotation.Nullable; -import java.util.Arrays; import java.util.EnumMap; import java.util.List; import java.util.Optional; import java.util.function.Consumer; -import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; diff --git a/src/main/java/vazkii/botania/mixin/AccessorSkullTileEntityRenderer.java b/src/main/java/vazkii/botania/mixin/AccessorSkullTileEntityRenderer.java index 7ce52c45d..8b6a26c30 100644 --- a/src/main/java/vazkii/botania/mixin/AccessorSkullTileEntityRenderer.java +++ b/src/main/java/vazkii/botania/mixin/AccessorSkullTileEntityRenderer.java @@ -14,8 +14,6 @@ import net.minecraft.block.SkullBlock; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.model.GenericHeadModel; import net.minecraft.client.renderer.tileentity.SkullTileEntityRenderer; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor;