From 4bf61e049d09ff46304a0dbcfd7c9f59b4d30b03 Mon Sep 17 00:00:00 2001 From: PepperBell <44146161+PepperCode1@users.noreply.github.com> Date: Sun, 27 Jun 2021 11:03:21 -0700 Subject: [PATCH] Organize imports --- .../java/com/simibubi/create/AllBlocks.java | 1 - .../components/crafter/RecipeGridHandler.java | 5 ++--- .../components/deployer/DeployerHandler.java | 14 +++++--------- .../components/fan/SplashingRecipe.java | 2 +- .../BlockMovementChecks.java | 2 -- .../bearing/MechanicalBearingTileEntity.java | 1 - .../mounted/MountedContraption.java | 1 - .../render/ContraptionRenderDispatcher.java | 19 +++++++------------ .../train/MinecartCouplingItem.java | 1 - .../processing/BasinTileEntity.java | 1 - .../processing/burner/BlazeBurnerBlock.java | 2 +- .../contraptions/relays/belt/BeltBlock.java | 3 +-- .../bell/AbstractBellRenderer.java | 2 -- .../bell/AbstractBellTileEntity.java | 5 ++--- .../curiosities/bell/CursedBellBlock.java | 5 ----- .../bell/CursedBellTileEntity.java | 3 --- .../curiosities/bell/PeculiarBellBlock.java | 6 ------ .../bell/PeculiarBellTileEntity.java | 3 --- .../bell/SoulPulseEffectHandler.java | 3 --- .../projector/ChromaticProjectorBlock.java | 1 - .../weapons/PotatoCannonRenderHandler.java | 1 - .../block/chute/SmartChuteBlock.java | 2 -- .../simibubi/create/events/ClientEvents.java | 1 - .../config/ui/SubMenuConfigScreen.java | 2 +- .../foundation/data/BasicParticleData.java | 3 --- .../create/foundation/data/BlockStateGen.java | 5 +---- .../foundation/data/CreateEntityBuilder.java | 8 +++----- .../simibubi/create/foundation/gui/Theme.java | 2 +- .../foundation/gui/widgets/BoxWidget.java | 2 +- .../foundation/gui/widgets/IconButton.java | 4 ++-- .../mixin/ModelDataRefreshMixin.java | 11 +++++------ .../create/foundation/ponder/PonderUI.java | 2 +- .../ponder/content/PonderIndexScreen.java | 2 -- .../ponder/content/PonderTagScreen.java | 2 -- .../foundation/ponder/ui/PonderButton.java | 2 +- .../foundation/render/AllMaterialSpecs.java | 1 - .../foundation/render/CreateContexts.java | 2 -- .../foundation/utility/BlockHelper.java | 12 +++--------- .../worldWrappers/chunk/EmptierChunk.java | 10 +++++----- 39 files changed, 43 insertions(+), 111 deletions(-) diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 6b17ca7ff..b286877bc 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -194,7 +194,6 @@ import net.minecraft.loot.conditions.ILootCondition.IBuilder; import net.minecraft.loot.conditions.SurvivesExplosion; import net.minecraft.loot.functions.CopyName; import net.minecraft.loot.functions.CopyNbt; -import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.state.properties.PistonType; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/RecipeGridHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/RecipeGridHandler.java index 0dd0d5991..0650e9107 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/RecipeGridHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/RecipeGridHandler.java @@ -11,9 +11,6 @@ import java.util.Set; import java.util.function.Predicate; import java.util.stream.IntStream; -import net.minecraft.item.crafting.FireworkRocketRecipe; -import net.minecraft.item.crafting.ICraftingRecipe; - import org.apache.commons.lang3.tuple.Pair; import com.google.common.base.Predicates; @@ -26,6 +23,8 @@ import com.simibubi.create.foundation.utility.Pointing; import net.minecraft.block.BlockState; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FireworkRocketRecipe; +import net.minecraft.item.crafting.ICraftingRecipe; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java index b15e827a9..696332e89 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java @@ -9,20 +9,13 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; -import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity; -import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlockItem; - -import net.minecraft.block.DoublePlantBlock; - -import net.minecraft.entity.merchant.villager.AbstractVillagerEntity; -import net.minecraft.entity.merchant.villager.VillagerEntity; -import net.minecraft.state.properties.DoubleBlockHalf; - import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.Multimap; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.content.contraptions.components.deployer.DeployerTileEntity.Mode; +import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity; +import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerBlockItem; import com.simibubi.create.content.curiosities.tools.SandPaperItem; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour; @@ -34,12 +27,14 @@ import net.minecraft.block.BeehiveBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; +import net.minecraft.block.DoublePlantBlock; import net.minecraft.block.material.Material; 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.item.ItemEntity; +import net.minecraft.entity.merchant.villager.AbstractVillagerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.fluid.Fluid; @@ -54,6 +49,7 @@ import net.minecraft.item.ItemUseContext; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundNBT; import net.minecraft.server.management.PlayerInteractionManager; +import net.minecraft.state.properties.DoubleBlockHalf; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/SplashingRecipe.java b/src/main/java/com/simibubi/create/content/contraptions/components/fan/SplashingRecipe.java index 9bf446385..9a9801cc3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/SplashingRecipe.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/fan/SplashingRecipe.java @@ -4,8 +4,8 @@ import javax.annotation.ParametersAreNonnullByDefault; import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.content.contraptions.processing.InWorldProcessing; -import com.simibubi.create.content.contraptions.processing.ProcessingRecipe; import com.simibubi.create.content.contraptions.processing.InWorldProcessing.SplashingWrapper; +import com.simibubi.create.content.contraptions.processing.ProcessingRecipe; import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams; import net.minecraft.world.World; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementChecks.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementChecks.java index b8b0da9d1..f2d12f89d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementChecks.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementChecks.java @@ -29,9 +29,7 @@ import com.simibubi.create.content.contraptions.components.structureMovement.pul import com.simibubi.create.content.contraptions.fluids.tank.FluidTankBlock; import com.simibubi.create.content.contraptions.fluids.tank.FluidTankConnectivityHandler; import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkBlock; - import com.simibubi.create.foundation.config.AllConfigs; - import com.simibubi.create.foundation.config.CKinetics; import net.minecraft.block.AbstractPressurePlateBlock; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java index 2cc024c2a..ef692c0a3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java @@ -6,7 +6,6 @@ import java.util.List; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.content.contraptions.base.GeneratingKineticTileEntity; -import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity; import com.simibubi.create.content.contraptions.components.structureMovement.AssemblyException; import com.simibubi.create.content.contraptions.components.structureMovement.ControlledContraptionEntity; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java index fae052d36..9f4149f81 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java @@ -33,7 +33,6 @@ import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraft.world.gen.feature.template.Template.BlockInfo; import net.minecraftforge.items.IItemHandlerModifiable; -import net.minecraftforge.items.wrapper.CombinedInvWrapper; import net.minecraftforge.items.wrapper.InvWrapper; public class MountedContraption extends Contraption { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java index 9fe12c235..cd6f7973b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java @@ -1,28 +1,23 @@ package com.simibubi.create.content.contraptions.components.structureMovement.render; +import static org.lwjgl.opengl.GL11.GL_QUADS; import static org.lwjgl.opengl.GL11.glBindTexture; -import static org.lwjgl.opengl.GL13.GL_QUADS; +import static org.lwjgl.opengl.GL11.glDisable; +import static org.lwjgl.opengl.GL11.glEnable; +import static org.lwjgl.opengl.GL12.GL_TEXTURE_3D; import static org.lwjgl.opengl.GL13.GL_TEXTURE0; import static org.lwjgl.opengl.GL13.GL_TEXTURE4; -import static org.lwjgl.opengl.GL13.GL_TEXTURE_3D; import static org.lwjgl.opengl.GL13.glActiveTexture; -import static org.lwjgl.opengl.GL13.glDisable; -import static org.lwjgl.opengl.GL13.glEnable; import static org.lwjgl.opengl.GL20.glUseProgram; import java.util.List; import java.util.Random; -import com.jozufozu.flywheel.event.GatherContextEvent; - -import net.minecraftforge.api.distmarker.Dist; - -import net.minecraftforge.api.distmarker.OnlyIn; - import org.apache.commons.lang3.tuple.Pair; import com.jozufozu.flywheel.backend.Backend; import com.jozufozu.flywheel.event.BeginFrameEvent; +import com.jozufozu.flywheel.event.GatherContextEvent; import com.jozufozu.flywheel.event.ReloadRenderersEvent; import com.jozufozu.flywheel.event.RenderLayerEvent; import com.mojang.blaze3d.matrix.MatrixStack; @@ -61,14 +56,14 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.LightType; import net.minecraft.world.World; import net.minecraft.world.gen.feature.template.Template; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.common.util.Lazy; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import org.lwjgl.opengl.GL20; - @OnlyIn(Dist.CLIENT) @Mod.EventBusSubscriber(Dist.CLIENT) public class ContraptionRenderDispatcher { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartCouplingItem.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartCouplingItem.java index 66986c18d..268ba703a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartCouplingItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartCouplingItem.java @@ -3,7 +3,6 @@ package com.simibubi.create.content.contraptions.components.structureMovement.tr import com.simibubi.create.AllItems; import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.CapabilityMinecartController; import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.MinecartController; - import com.simibubi.create.foundation.utility.Iterate; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinTileEntity.java index 6df4389e8..b15887024 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinTileEntity.java @@ -17,7 +17,6 @@ import com.simibubi.create.content.contraptions.fluids.particle.FluidParticleDat import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation; import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock; import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel; -import com.simibubi.create.content.logistics.block.funnel.FunnelTileEntity; import com.simibubi.create.foundation.fluid.CombinedTankWrapper; import com.simibubi.create.foundation.item.SmartInventory; import com.simibubi.create.foundation.tileEntity.SmartTileEntity; diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java index ddd630313..527441ceb 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java @@ -29,8 +29,8 @@ import net.minecraft.loot.LootPool; import net.minecraft.loot.LootTable; import net.minecraft.loot.conditions.BlockStateProperty; import net.minecraft.loot.conditions.ILootCondition.IBuilder; -import net.minecraft.pathfinding.PathType; import net.minecraft.loot.conditions.SurvivesExplosion; +import net.minecraft.pathfinding.PathType; import net.minecraft.state.EnumProperty; import net.minecraft.state.Property; import net.minecraft.state.StateContainer.Builder; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java index c8a2f3ce2..0385ae526 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import com.simibubi.create.content.contraptions.relays.belt.transport.BeltTunnelInteractionHandler; - import org.apache.commons.lang3.mutable.MutableBoolean; import com.simibubi.create.AllBlocks; @@ -17,6 +15,7 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.processing.EmptyingByBasin; import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity.CasingType; import com.simibubi.create.content.contraptions.relays.belt.transport.BeltMovementHandler.TransportedEntityInfo; +import com.simibubi.create.content.contraptions.relays.belt.transport.BeltTunnelInteractionHandler; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock; import com.simibubi.create.content.schematics.ISpecialBlockItemRequirement; import com.simibubi.create.content.schematics.ItemRequirement; diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellRenderer.java b/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellRenderer.java index 48fe66ed2..25c7db9d9 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellRenderer.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellRenderer.java @@ -3,11 +3,9 @@ package com.simibubi.create.content.curiosities.bell; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.content.logistics.block.redstone.AnalogLeverBlock; import com.simibubi.create.foundation.render.PartialBufferer; import com.simibubi.create.foundation.render.SuperByteBuffer; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; - import com.simibubi.create.foundation.utility.AngleHelper; import net.minecraft.block.BellBlock; diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellTileEntity.java b/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellTileEntity.java index 3da76a6e0..0a0e8ebd7 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellTileEntity.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/AbstractBellTileEntity.java @@ -1,7 +1,8 @@ package com.simibubi.create.content.curiosities.bell; -import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import java.util.List; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import net.minecraft.tileentity.TileEntityType; @@ -9,8 +10,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.List; - public abstract class AbstractBellTileEntity extends SmartTileEntity { public static final int RING_DURATION = 50; diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellBlock.java b/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellBlock.java index 9fbede200..67fd30eae 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellBlock.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellBlock.java @@ -2,14 +2,9 @@ package com.simibubi.create.content.curiosities.bell; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.block.ITE; - 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.IBlockReader; -import net.minecraft.world.World; public class CursedBellBlock extends AbstractBellBlock { diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellTileEntity.java b/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellTileEntity.java index cb1993634..36c7aafcd 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellTileEntity.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/CursedBellTileEntity.java @@ -2,11 +2,8 @@ package com.simibubi.create.content.curiosities.bell; import java.util.List; -import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; -import com.sun.org.apache.regexp.internal.RE; - import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntityType; diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlock.java b/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlock.java index 0c79bad5a..28fdccdc7 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlock.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellBlock.java @@ -1,16 +1,10 @@ package com.simibubi.create.content.curiosities.bell; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.block.ITE; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; -import net.minecraft.world.World; public class PeculiarBellBlock extends AbstractBellBlock { diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellTileEntity.java b/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellTileEntity.java index 8522bbb73..49f2ded90 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellTileEntity.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/PeculiarBellTileEntity.java @@ -1,9 +1,6 @@ package com.simibubi.create.content.curiosities.bell; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; public class PeculiarBellTileEntity extends AbstractBellTileEntity { diff --git a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffectHandler.java b/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffectHandler.java index 95f74d2cd..484e1f38d 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffectHandler.java +++ b/src/main/java/com/simibubi/create/content/curiosities/bell/SoulPulseEffectHandler.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Set; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -13,8 +12,6 @@ import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.networking.SimplePacketBase; -import com.sun.org.apache.xpath.internal.operations.Bool; - import net.minecraft.network.PacketBuffer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorBlock.java b/src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorBlock.java index 86fcea0f8..d303e77a4 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorBlock.java +++ b/src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorBlock.java @@ -3,7 +3,6 @@ package com.simibubi.create.content.curiosities.projector; import javax.annotation.Nullable; import com.simibubi.create.AllItems; -import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.gui.ScreenOpener; diff --git a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonRenderHandler.java b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonRenderHandler.java index 81009bc54..0cdf10d4a 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonRenderHandler.java +++ b/src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonRenderHandler.java @@ -14,7 +14,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.particles.ItemParticleData; import net.minecraft.particles.ParticleTypes; import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; public class PotatoCannonRenderHandler extends ShootableGadgetRenderHandler { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteBlock.java index a27f1a92a..55b0b2d52 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/chute/SmartChuteBlock.java @@ -3,8 +3,6 @@ package com.simibubi.create.content.logistics.block.chute; import java.util.Random; import com.simibubi.create.AllTileEntities; -import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; -import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/events/ClientEvents.java b/src/main/java/com/simibubi/create/events/ClientEvents.java index ef8681f3b..cfc441162 100644 --- a/src/main/java/com/simibubi/create/events/ClientEvents.java +++ b/src/main/java/com/simibubi/create/events/ClientEvents.java @@ -25,7 +25,6 @@ import com.simibubi.create.content.contraptions.goggles.GoggleOverlayRenderer; import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation; import com.simibubi.create.content.contraptions.relays.belt.item.BeltConnectorHandler; import com.simibubi.create.content.curiosities.armor.CopperBacktankArmorLayer; -import com.simibubi.create.content.curiosities.bell.SoulPulseEffectHandler; import com.simibubi.create.content.curiosities.tools.BlueprintOverlayRenderer; import com.simibubi.create.content.curiosities.tools.ExtendoGripRenderHandler; import com.simibubi.create.content.curiosities.zapper.ZapperItem; diff --git a/src/main/java/com/simibubi/create/foundation/config/ui/SubMenuConfigScreen.java b/src/main/java/com/simibubi/create/foundation/config/ui/SubMenuConfigScreen.java index 34d68af65..1dd1156b5 100644 --- a/src/main/java/com/simibubi/create/foundation/config/ui/SubMenuConfigScreen.java +++ b/src/main/java/com/simibubi/create/foundation/config/ui/SubMenuConfigScreen.java @@ -1,6 +1,6 @@ package com.simibubi.create.foundation.config.ui; -import java.awt.*; +import java.awt.Color; import java.util.Collections; import java.util.List; import java.util.Locale; diff --git a/src/main/java/com/simibubi/create/foundation/data/BasicParticleData.java b/src/main/java/com/simibubi/create/foundation/data/BasicParticleData.java index 7cb0ff2fc..4671f8c5d 100644 --- a/src/main/java/com/simibubi/create/foundation/data/BasicParticleData.java +++ b/src/main/java/com/simibubi/create/foundation/data/BasicParticleData.java @@ -8,7 +8,6 @@ import com.simibubi.create.content.contraptions.particle.ICustomParticleDataWith import mcp.MethodsReturnNonnullByDefault; import net.minecraft.client.particle.IAnimatedSprite; -import net.minecraft.client.particle.IParticleFactory; import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.ParticleManager; import net.minecraft.client.world.ClientWorld; @@ -19,8 +18,6 @@ import net.minecraft.util.registry.Registry; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import java.util.Map; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public abstract class BasicParticleData implements IParticleData, ICustomParticleDataWithSprite> { diff --git a/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java b/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java index 12fa64c92..dac5680af 100644 --- a/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java @@ -9,10 +9,6 @@ import java.util.Vector; import java.util.function.BiFunction; import java.util.function.Function; -import com.simibubi.create.content.curiosities.bell.CursedBellBlock; - -import net.minecraft.block.BellBlock; - import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.ImmutableList; @@ -36,6 +32,7 @@ import com.tterrag.registrate.providers.RegistrateBlockstateProvider; import com.tterrag.registrate.util.nullness.NonNullBiConsumer; import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; +import net.minecraft.block.BellBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.state.BooleanProperty; diff --git a/src/main/java/com/simibubi/create/foundation/data/CreateEntityBuilder.java b/src/main/java/com/simibubi/create/foundation/data/CreateEntityBuilder.java index 1cd900123..ef35ef8f0 100644 --- a/src/main/java/com/simibubi/create/foundation/data/CreateEntityBuilder.java +++ b/src/main/java/com/simibubi/create/foundation/data/CreateEntityBuilder.java @@ -1,12 +1,13 @@ package com.simibubi.create.foundation.data; +import javax.annotation.Nullable; +import javax.annotation.ParametersAreNonnullByDefault; + import com.jozufozu.flywheel.backend.instancing.InstancedRenderRegistry; import com.jozufozu.flywheel.backend.instancing.entity.IEntityInstanceFactory; -import com.jozufozu.flywheel.backend.instancing.tile.ITileInstanceFactory; import com.tterrag.registrate.AbstractRegistrate; import com.tterrag.registrate.builders.BuilderCallback; import com.tterrag.registrate.builders.EntityBuilder; - import com.tterrag.registrate.util.OneTimeEventReceiver; import com.tterrag.registrate.util.nullness.NonNullSupplier; @@ -17,9 +18,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; - @ParametersAreNonnullByDefault public class CreateEntityBuilder extends EntityBuilder { diff --git a/src/main/java/com/simibubi/create/foundation/gui/Theme.java b/src/main/java/com/simibubi/create/foundation/gui/Theme.java index 57b2b6412..83e218945 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/Theme.java +++ b/src/main/java/com/simibubi/create/foundation/gui/Theme.java @@ -1,6 +1,6 @@ package com.simibubi.create.foundation.gui; -import java.awt.*; +import java.awt.Color; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/simibubi/create/foundation/gui/widgets/BoxWidget.java b/src/main/java/com/simibubi/create/foundation/gui/widgets/BoxWidget.java index 0623d96f9..672f48b8d 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/widgets/BoxWidget.java +++ b/src/main/java/com/simibubi/create/foundation/gui/widgets/BoxWidget.java @@ -1,6 +1,6 @@ package com.simibubi.create.foundation.gui.widgets; -import java.awt.*; +import java.awt.Color; import java.util.function.Function; import javax.annotation.Nonnull; diff --git a/src/main/java/com/simibubi/create/foundation/gui/widgets/IconButton.java b/src/main/java/com/simibubi/create/foundation/gui/widgets/IconButton.java index 3b553b729..fbb6ee950 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/widgets/IconButton.java +++ b/src/main/java/com/simibubi/create/foundation/gui/widgets/IconButton.java @@ -1,5 +1,7 @@ package com.simibubi.create.foundation.gui.widgets; +import javax.annotation.Nonnull; + import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.foundation.gui.AllGuiTextures; @@ -7,8 +9,6 @@ import com.simibubi.create.foundation.gui.AllIcons; import net.minecraft.util.text.ITextComponent; -import javax.annotation.Nonnull; - public class IconButton extends AbstractSimiWidget { private AllIcons icon; diff --git a/src/main/java/com/simibubi/create/foundation/mixin/ModelDataRefreshMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/ModelDataRefreshMixin.java index 151a0a7c6..cf9babd4d 100644 --- a/src/main/java/com/simibubi/create/foundation/mixin/ModelDataRefreshMixin.java +++ b/src/main/java/com/simibubi/create/foundation/mixin/ModelDataRefreshMixin.java @@ -1,19 +1,18 @@ package com.simibubi.create.foundation.mixin; -import com.simibubi.create.content.schematics.SchematicWorld; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.client.model.ModelDataManager; - import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import com.simibubi.create.content.schematics.SchematicWorld; + import net.minecraft.client.Minecraft; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.client.model.ModelDataManager; @OnlyIn(Dist.CLIENT) @Mixin(ModelDataManager.class) diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java index cd8f2fe1d..20a99833a 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java @@ -2,7 +2,7 @@ package com.simibubi.create.foundation.ponder; import static com.simibubi.create.foundation.ponder.PonderLocalization.LANG_PREFIX; -import java.awt.*; +import java.awt.Color; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndexScreen.java b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndexScreen.java index e9a0a8097..3e7936354 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndexScreen.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndexScreen.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import org.apache.commons.lang3.mutable.MutableBoolean; - import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.components.crank.ValveHandleBlock; diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagScreen.java b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagScreen.java index 3d37bd86a..c861360e2 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagScreen.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderTagScreen.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import org.apache.commons.lang3.mutable.MutableBoolean; - import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.Create; diff --git a/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderButton.java b/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderButton.java index f7af4e2bb..66d348cfe 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderButton.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/ui/PonderButton.java @@ -1,6 +1,6 @@ package com.simibubi.create.foundation.ponder.ui; -import java.awt.*; +import java.awt.Color; import javax.annotation.Nonnull; diff --git a/src/main/java/com/simibubi/create/foundation/render/AllMaterialSpecs.java b/src/main/java/com/simibubi/create/foundation/render/AllMaterialSpecs.java index 96f7340eb..0bf3868a0 100644 --- a/src/main/java/com/simibubi/create/foundation/render/AllMaterialSpecs.java +++ b/src/main/java/com/simibubi/create/foundation/render/AllMaterialSpecs.java @@ -1,6 +1,5 @@ package com.simibubi.create.foundation.render; -import com.jozufozu.flywheel.backend.Backend; import com.jozufozu.flywheel.backend.instancing.MaterialSpec; import com.jozufozu.flywheel.core.Formats; import com.jozufozu.flywheel.event.GatherContextEvent; diff --git a/src/main/java/com/simibubi/create/foundation/render/CreateContexts.java b/src/main/java/com/simibubi/create/foundation/render/CreateContexts.java index 5e2efaa4b..c472dc157 100644 --- a/src/main/java/com/simibubi/create/foundation/render/CreateContexts.java +++ b/src/main/java/com/simibubi/create/foundation/render/CreateContexts.java @@ -14,8 +14,6 @@ import com.simibubi.create.foundation.render.effects.EffectsContext; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; @OnlyIn(Dist.CLIENT) public class CreateContexts { diff --git a/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java b/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java index cc76d5dbe..929a73904 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java @@ -1,24 +1,16 @@ package com.simibubi.create.foundation.utility; -import java.util.ArrayList; -import java.util.List; import java.util.function.Consumer; import javax.annotation.Nullable; -import net.minecraft.block.AbstractRailBlock; -import net.minecraft.block.RailBlock; - -import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.ChunkSection; -import net.minecraftforge.common.util.BlockSnapshot; - import org.apache.commons.lang3.mutable.MutableInt; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.components.actors.SeatBlock; +import net.minecraft.block.AbstractRailBlock; import net.minecraft.block.BedBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -49,6 +41,8 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.GameRules; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; +import net.minecraft.world.chunk.ChunkSection; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/chunk/EmptierChunk.java b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/chunk/EmptierChunk.java index dae7595f3..7543375f2 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/chunk/EmptierChunk.java +++ b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/chunk/EmptierChunk.java @@ -1,5 +1,10 @@ package com.simibubi.create.foundation.utility.worldWrappers.chunk; +import java.util.List; +import java.util.function.Predicate; + +import javax.annotation.Nullable; + import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; @@ -12,11 +17,6 @@ import net.minecraft.world.chunk.Chunk; import net.minecraft.world.lighting.WorldLightManager; import net.minecraft.world.server.ChunkHolder; -import javax.annotation.Nullable; - -import java.util.List; -import java.util.function.Predicate; - public class EmptierChunk extends Chunk { public EmptierChunk() {