From a65be62cd1676f0876c4be2ee38071f23a0237fa Mon Sep 17 00:00:00 2001 From: yueh Date: Tue, 28 Jul 2020 10:29:57 +0200 Subject: [PATCH] Organize and clean imports --- .../java/appeng/api/features/IWorldGen.java | 2 - .../items/ISpatialStorageCell.java | 3 +- .../appeng/api/storage/ISpatialDimension.java | 1 - .../appeng/api/util/DimensionalCoord.java | 1 - .../java/appeng/block/AEBaseTileBlock.java | 5 -- .../block/networking/CableBusBlock.java | 1 - .../appeng/client/gui/AEBaseMEScreen.java | 1 - .../java/appeng/client/gui/AEBaseScreen.java | 3 +- .../client/gui/widgets/ActionButton.java | 5 +- .../gui/widgets/SettingToggleButton.java | 2 +- .../render/FacadeDispatcherBakedModel.java | 1 - .../client/render/SpatialSkyRender.java | 4 - .../client/render/cablebus/CableBuilder.java | 1 - .../crafting/EncodedPatternBakedModel.java | 1 - .../client/render/effects/ChargedOreFX.java | 1 - .../client/render/effects/CraftingFx.java | 1 - .../client/render/effects/LightningArcFX.java | 1 - .../client/render/effects/ParticleTypes.java | 1 + .../render/model/BiometricCardBakedModel.java | 1 - .../render/model/MemoryCardBakedModel.java | 1 - .../client/render/model/MemoryCardModel.java | 1 - .../render/model/SkyCompassBakedModel.java | 1 - .../appeng/container/ContainerLocator.java | 2 +- .../WirelessTermContainer.java | 2 +- src/main/java/appeng/core/AEConfig.java | 1 - src/main/java/appeng/core/Registration.java | 83 ++++++++++--------- .../features/registries/WorldGenRegistry.java | 4 +- .../core/stats/AppEngAdvancementTrigger.java | 2 - .../core/sync/network/NetworkHandler.java | 3 - .../appeng/core/sync/network/TargetPoint.java | 1 - .../java/appeng/core/worlddata/WorldData.java | 1 - .../java/appeng/debug/ReplicatorCardItem.java | 1 - .../decorative/solid/SkyStoneBlock.java | 1 - .../client/gui/FluidTerminalScreen.java | 2 +- .../parts/FluidAnnihilationPlanePart.java | 3 +- .../modules/jei/CondenserCategory.java | 2 - .../modules/jei/InscriberRecipeCategory.java | 1 + .../items/storage/SpatialStorageCellItem.java | 1 - .../powered/powersink/AEBasePoweredItem.java | 1 - .../implementations/QuantumCluster.java | 1 - .../DimensionStructuresSettingsMixin.java | 11 ++- .../appeng/mixins/DimensionTypeMixin.java | 12 +-- .../appeng/mixins/MinecraftServerMixin.java | 14 ++-- .../appeng/mixins/SkyPropertiesMixin.java | 12 +-- .../java/appeng/mixins/SkyRenderMixin.java | 11 ++- .../java/appeng/mixins/StructureAccessor.java | 5 +- .../ThreadedAnvilChunkStorageAccessor.java | 5 +- .../subcommands/TestMeteoritesCommand.java | 1 - .../server/subcommands/TestOreGenCommand.java | 1 - .../java/appeng/services/CompassService.java | 24 +++--- src/main/java/appeng/spatial/CachedPlane.java | 3 +- .../spatial/SpatialDimensionManager.java | 3 +- .../appeng/spatial/StorageChunkGenerator.java | 11 +-- .../worldgen/ChargedQuartzOreConfig.java | 8 +- .../worldgen/ChargedQuartzOreFeature.java | 5 +- .../meteorite/MeteoriteStructure.java | 4 +- .../meteorite/MeteoriteStructurePiece.java | 1 - 57 files changed, 125 insertions(+), 157 deletions(-) diff --git a/src/api/java/appeng/api/features/IWorldGen.java b/src/api/java/appeng/api/features/IWorldGen.java index 8d956bdb2..fded0e80d 100644 --- a/src/api/java/appeng/api/features/IWorldGen.java +++ b/src/api/java/appeng/api/features/IWorldGen.java @@ -24,8 +24,6 @@ package appeng.api.features; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.Dimension; -import net.minecraft.world.IWorld; import net.minecraft.world.server.ServerWorld; public interface IWorldGen { diff --git a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java index 37f04571b..58d98fd7f 100644 --- a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java +++ b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java @@ -26,12 +26,11 @@ package appeng.api.implementations.items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.RegistryKey; -import net.minecraft.world.DimensionType; import net.minecraft.world.World; +import net.minecraft.world.server.ServerWorld; import appeng.api.implementations.TransitionResult; import appeng.api.util.WorldCoord; -import net.minecraft.world.server.ServerWorld; /** * Implemented on a {@link Item} diff --git a/src/api/java/appeng/api/storage/ISpatialDimension.java b/src/api/java/appeng/api/storage/ISpatialDimension.java index 129f48d36..b3e3ca2aa 100644 --- a/src/api/java/appeng/api/storage/ISpatialDimension.java +++ b/src/api/java/appeng/api/storage/ISpatialDimension.java @@ -25,7 +25,6 @@ import javax.annotation.Nullable; import net.minecraft.util.RegistryKey; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.DimensionType; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; diff --git a/src/api/java/appeng/api/util/DimensionalCoord.java b/src/api/java/appeng/api/util/DimensionalCoord.java index c8626478c..256095110 100644 --- a/src/api/java/appeng/api/util/DimensionalCoord.java +++ b/src/api/java/appeng/api/util/DimensionalCoord.java @@ -25,7 +25,6 @@ package appeng.api.util; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.Dimension; import net.minecraft.world.DimensionType; import net.minecraft.world.IWorld; diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index 98f80a651..a262dd4c7 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -31,26 +31,21 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; 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.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraftforge.items.ItemHandlerHelper; import appeng.api.implementations.items.IMemoryCard; import appeng.api.implementations.items.MemoryCardMessages; -import appeng.api.implementations.tiles.IColorableTile; -import appeng.api.util.AEColor; import appeng.api.util.IOrientable; import appeng.block.networking.CableBusBlock; import appeng.tile.AEBaseInvTileEntity; diff --git a/src/main/java/appeng/block/networking/CableBusBlock.java b/src/main/java/appeng/block/networking/CableBusBlock.java index 730e9ca31..a792836ed 100644 --- a/src/main/java/appeng/block/networking/CableBusBlock.java +++ b/src/main/java/appeng/block/networking/CableBusBlock.java @@ -53,7 +53,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/appeng/client/gui/AEBaseMEScreen.java b/src/main/java/appeng/client/gui/AEBaseMEScreen.java index c4389c6c8..867242078 100644 --- a/src/main/java/appeng/client/gui/AEBaseMEScreen.java +++ b/src/main/java/appeng/client/gui/AEBaseMEScreen.java @@ -28,7 +28,6 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; import appeng.api.storage.data.IAEItemStack; diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java index e75d180ac..ff968ce47 100644 --- a/src/main/java/appeng/client/gui/AEBaseScreen.java +++ b/src/main/java/appeng/client/gui/AEBaseScreen.java @@ -28,11 +28,9 @@ import java.util.stream.Collectors; import com.google.common.base.Preconditions; import com.google.common.base.Stopwatch; -import com.google.common.collect.Lists; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.util.text.Style; import org.lwjgl.glfw.GLFW; import org.lwjgl.opengl.GL11; @@ -58,6 +56,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.Style; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fml.client.gui.GuiUtils; diff --git a/src/main/java/appeng/client/gui/widgets/ActionButton.java b/src/main/java/appeng/client/gui/widgets/ActionButton.java index 1ff714807..8f011582d 100644 --- a/src/main/java/appeng/client/gui/widgets/ActionButton.java +++ b/src/main/java/appeng/client/gui/widgets/ActionButton.java @@ -21,11 +21,12 @@ package appeng.client.gui.widgets; import java.util.function.Consumer; import java.util.regex.Pattern; -import appeng.api.config.ActionItems; -import appeng.core.localization.ButtonToolTips; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; +import appeng.api.config.ActionItems; +import appeng.core.localization.ButtonToolTips; + public class ActionButton extends IconButton implements ITooltip { private static final Pattern PATTERN_NEW_LINE = Pattern.compile("\\n", Pattern.LITERAL); private final int iconIndex; diff --git a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java index aac4d6f16..74ecf64d8 100644 --- a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java @@ -27,6 +27,7 @@ import java.util.regex.Pattern; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; import appeng.api.config.AccessRestriction; import appeng.api.config.CondenserOutput; @@ -48,7 +49,6 @@ import appeng.api.config.ViewItems; import appeng.api.config.YesNo; import appeng.core.localization.ButtonToolTips; import appeng.util.EnumCycler; -import net.minecraft.util.text.StringTextComponent; public class SettingToggleButton> extends IconButton { private static final Pattern COMPILE = Pattern.compile("%s"); diff --git a/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java b/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java index f6911dd08..b00b928e4 100644 --- a/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java +++ b/src/main/java/appeng/client/render/FacadeDispatcherBakedModel.java @@ -25,7 +25,6 @@ import net.minecraft.client.renderer.model.ItemOverrideList; import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; diff --git a/src/main/java/appeng/client/render/SpatialSkyRender.java b/src/main/java/appeng/client/render/SpatialSkyRender.java index 76d540434..05abb3f0c 100644 --- a/src/main/java/appeng/client/render/SpatialSkyRender.java +++ b/src/main/java/appeng/client/render/SpatialSkyRender.java @@ -25,15 +25,11 @@ import com.mojang.blaze3d.systems.RenderSystem; import org.lwjgl.opengl.GL11; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.world.ClientWorld; import net.minecraft.util.math.vector.Quaternion; -import net.minecraftforge.client.IRenderHandler; -import net.minecraftforge.client.SkyRenderHandler; public class SpatialSkyRender { diff --git a/src/main/java/appeng/client/render/cablebus/CableBuilder.java b/src/main/java/appeng/client/render/cablebus/CableBuilder.java index 5ce6cd828..a6188723b 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/CableBuilder.java @@ -25,7 +25,6 @@ import java.util.EnumSet; import java.util.List; import java.util.function.Function; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.RenderMaterial; import net.minecraft.client.renderer.texture.AtlasTexture; diff --git a/src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java b/src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java index 6628638b7..b50392f0e 100644 --- a/src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java @@ -14,7 +14,6 @@ import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.vector.TransformationMatrix; -import net.minecraft.world.World; import net.minecraftforge.client.model.PerspectiveMapWrapper; import appeng.client.render.DelegateBakedModel; diff --git a/src/main/java/appeng/client/render/effects/ChargedOreFX.java b/src/main/java/appeng/client/render/effects/ChargedOreFX.java index deaf29c31..75665e4a7 100644 --- a/src/main/java/appeng/client/render/effects/ChargedOreFX.java +++ b/src/main/java/appeng/client/render/effects/ChargedOreFX.java @@ -25,7 +25,6 @@ import net.minecraft.client.particle.RedstoneParticle; import net.minecraft.client.world.ClientWorld; import net.minecraft.particles.BasicParticleType; import net.minecraft.particles.RedstoneParticleData; -import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/appeng/client/render/effects/CraftingFx.java b/src/main/java/appeng/client/render/effects/CraftingFx.java index b287dece8..087574d6f 100644 --- a/src/main/java/appeng/client/render/effects/CraftingFx.java +++ b/src/main/java/appeng/client/render/effects/CraftingFx.java @@ -31,7 +31,6 @@ import net.minecraft.particles.BasicParticleType; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3f; -import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/appeng/client/render/effects/LightningArcFX.java b/src/main/java/appeng/client/render/effects/LightningArcFX.java index 08b32f180..a53b0adf5 100644 --- a/src/main/java/appeng/client/render/effects/LightningArcFX.java +++ b/src/main/java/appeng/client/render/effects/LightningArcFX.java @@ -25,7 +25,6 @@ import net.minecraft.client.particle.IParticleFactory; import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.SpriteTexturedParticle; import net.minecraft.client.world.ClientWorld; -import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/appeng/client/render/effects/ParticleTypes.java b/src/main/java/appeng/client/render/effects/ParticleTypes.java index a0b662c10..ba539c81b 100644 --- a/src/main/java/appeng/client/render/effects/ParticleTypes.java +++ b/src/main/java/appeng/client/render/effects/ParticleTypes.java @@ -1,6 +1,7 @@ package appeng.client.render.effects; import com.mojang.serialization.Codec; + import net.minecraft.particles.BasicParticleType; import net.minecraft.particles.ParticleType; diff --git a/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java b/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java index 0fe57ce68..215a7d0ab 100644 --- a/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java +++ b/src/main/java/appeng/client/render/model/BiometricCardBakedModel.java @@ -23,7 +23,6 @@ import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; -import net.minecraft.world.World; import net.minecraftforge.client.model.data.EmptyModelData; import appeng.api.implementations.items.IBiometricCard; diff --git a/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java b/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java index 91cf5471a..9807be838 100644 --- a/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java +++ b/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java @@ -23,7 +23,6 @@ import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; -import net.minecraft.world.World; import net.minecraftforge.client.model.data.EmptyModelData; import appeng.api.implementations.items.IMemoryCard; diff --git a/src/main/java/appeng/client/render/model/MemoryCardModel.java b/src/main/java/appeng/client/render/model/MemoryCardModel.java index 4a2ced7f3..9a60f18cc 100644 --- a/src/main/java/appeng/client/render/model/MemoryCardModel.java +++ b/src/main/java/appeng/client/render/model/MemoryCardModel.java @@ -9,7 +9,6 @@ import javax.annotation.Nullable; import com.mojang.datafixers.util.Pair; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.IModelTransform; import net.minecraft.client.renderer.model.IUnbakedModel; diff --git a/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java b/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java index ea4538ed5..7d29dc180 100644 --- a/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java +++ b/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java @@ -39,7 +39,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.util.math.vector.Quaternion; -import net.minecraft.world.World; import net.minecraftforge.client.model.data.IDynamicBakedModel; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.client.model.data.ModelProperty; diff --git a/src/main/java/appeng/container/ContainerLocator.java b/src/main/java/appeng/container/ContainerLocator.java index f96754c24..78c7ebc88 100644 --- a/src/main/java/appeng/container/ContainerLocator.java +++ b/src/main/java/appeng/container/ContainerLocator.java @@ -31,12 +31,12 @@ import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; import appeng.api.parts.IPartHost; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.parts.AEBasePart; -import net.minecraft.world.World; /** * Describes how a container the player has opened was originally located. This diff --git a/src/main/java/appeng/container/implementations/WirelessTermContainer.java b/src/main/java/appeng/container/implementations/WirelessTermContainer.java index c3513ec48..eb3fe9bfd 100644 --- a/src/main/java/appeng/container/implementations/WirelessTermContainer.java +++ b/src/main/java/appeng/container/implementations/WirelessTermContainer.java @@ -22,13 +22,13 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ContainerType; import net.minecraft.network.PacketBuffer; +import net.minecraft.util.Util; import appeng.container.ContainerLocator; import appeng.core.AEConfig; import appeng.core.localization.PlayerMessages; import appeng.helpers.WirelessTerminalGuiObject; import appeng.util.Platform; -import net.minecraft.util.Util; public class WirelessTermContainer extends MEPortableCellContainer { diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index c743af58f..b3aa4e93c 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -35,7 +35,6 @@ import com.google.common.base.Strings; import org.apache.commons.lang3.tuple.Pair; -import net.minecraft.world.DimensionType; import net.minecraft.world.World; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.common.ForgeConfigSpec.BooleanValue; diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index a57dcf41a..330e03d76 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -18,6 +18,48 @@ package appeng.core; +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScreenManager; +import net.minecraft.client.particle.ParticleManager; +import net.minecraft.entity.EntityType; +import net.minecraft.inventory.container.ContainerType; +import net.minecraft.item.Item; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.particles.ParticleType; +import net.minecraft.tileentity.TileEntityType; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.gen.GenerationStage; +import net.minecraft.world.gen.feature.Feature; +import net.minecraft.world.gen.feature.IFeatureConfig; +import net.minecraft.world.gen.feature.OreFeatureConfig; +import net.minecraft.world.gen.feature.structure.Structure; +import net.minecraft.world.gen.placement.CountRangeConfig; +import net.minecraft.world.gen.placement.IPlacementConfig; +import net.minecraft.world.gen.placement.Placement; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.client.event.ColorHandlerEvent; +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.event.ParticleFactoryRegisterEvent; +import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.common.extensions.IForgeContainerType; +import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.fml.DistExecutor; +import net.minecraftforge.fml.event.server.FMLServerStartingEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import net.minecraftforge.fml.loading.FMLEnvironment; +import net.minecraftforge.fml.network.IContainerFactory; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.IForgeRegistry; + import appeng.api.config.Upgrades; import appeng.api.definitions.IBlocks; import appeng.api.definitions.IItems; @@ -167,47 +209,6 @@ import appeng.tile.crafting.MolecularAssemblerRenderer; import appeng.worldgen.ChargedQuartzOreConfig; import appeng.worldgen.ChargedQuartzOreFeature; import appeng.worldgen.meteorite.MeteoriteStructure; -import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScreenManager; -import net.minecraft.client.particle.ParticleManager; -import net.minecraft.entity.EntityType; -import net.minecraft.inventory.container.ContainerType; -import net.minecraft.item.Item; -import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.particles.ParticleType; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.gen.GenerationStage; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.IFeatureConfig; -import net.minecraft.world.gen.feature.OreFeatureConfig; -import net.minecraft.world.gen.feature.structure.Structure; -import net.minecraft.world.gen.placement.CountRangeConfig; -import net.minecraft.world.gen.placement.IPlacementConfig; -import net.minecraft.world.gen.placement.Placement; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.client.event.ColorHandlerEvent; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.client.event.ModelRegistryEvent; -import net.minecraftforge.client.event.ParticleFactoryRegisterEvent; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.common.extensions.IForgeContainerType; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fml.event.server.FMLServerStartingEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.fml.loading.FMLEnvironment; -import net.minecraftforge.fml.network.IContainerFactory; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.IForgeRegistry; final class Registration { diff --git a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java index 1a4fdda2b..9427faddc 100644 --- a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java +++ b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java @@ -21,11 +21,9 @@ package appeng.core.features.registries; import java.util.HashSet; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.Dimension; -import net.minecraft.world.IWorld; +import net.minecraft.world.server.ServerWorld; import appeng.api.features.IWorldGen; -import net.minecraft.world.server.ServerWorld; public final class WorldGenRegistry implements IWorldGen { diff --git a/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java b/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java index 557ff8c3d..7ba41d285 100644 --- a/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java +++ b/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java @@ -25,13 +25,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import net.minecraft.advancements.ICriterionInstance; import net.minecraft.advancements.ICriterionTrigger; import net.minecraft.advancements.PlayerAdvancements; -import net.minecraft.advancements.criterion.CriterionInstance; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.loot.ConditionArrayParser; diff --git a/src/main/java/appeng/core/sync/network/NetworkHandler.java b/src/main/java/appeng/core/sync/network/NetworkHandler.java index 47aec7167..3b34ca687 100644 --- a/src/main/java/appeng/core/sync/network/NetworkHandler.java +++ b/src/main/java/appeng/core/sync/network/NetworkHandler.java @@ -25,10 +25,7 @@ import net.minecraft.network.IPacket; import net.minecraft.network.ThreadQuickExitException; import net.minecraft.network.play.ServerPlayNetHandler; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.RegistryKey; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.DimensionType; -import net.minecraft.world.World; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.LogicalSide; diff --git a/src/main/java/appeng/core/sync/network/TargetPoint.java b/src/main/java/appeng/core/sync/network/TargetPoint.java index b9b6a28ab..ed107c74d 100644 --- a/src/main/java/appeng/core/sync/network/TargetPoint.java +++ b/src/main/java/appeng/core/sync/network/TargetPoint.java @@ -1,7 +1,6 @@ package appeng.core.sync.network; import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.world.DimensionType; import net.minecraft.world.World; /** diff --git a/src/main/java/appeng/core/worlddata/WorldData.java b/src/main/java/appeng/core/worlddata/WorldData.java index 0e89e2422..cc12abd53 100644 --- a/src/main/java/appeng/core/worlddata/WorldData.java +++ b/src/main/java/appeng/core/worlddata/WorldData.java @@ -26,7 +26,6 @@ import javax.annotation.Nullable; import com.google.common.base.Preconditions; import net.minecraft.server.MinecraftServer; -import net.minecraft.world.DimensionType; import net.minecraft.world.server.ServerWorld; import appeng.services.CompassService; diff --git a/src/main/java/appeng/debug/ReplicatorCardItem.java b/src/main/java/appeng/debug/ReplicatorCardItem.java index 917d90761..adc7da4fd 100644 --- a/src/main/java/appeng/debug/ReplicatorCardItem.java +++ b/src/main/java/appeng/debug/ReplicatorCardItem.java @@ -37,7 +37,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.registry.Registry; import net.minecraft.util.text.StringTextComponent; -import net.minecraft.world.DimensionType; import net.minecraft.world.World; import appeng.api.networking.IGrid; diff --git a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java b/src/main/java/appeng/decorative/solid/SkyStoneBlock.java index 74e89090b..3e1b2af38 100644 --- a/src/main/java/appeng/decorative/solid/SkyStoneBlock.java +++ b/src/main/java/appeng/decorative/solid/SkyStoneBlock.java @@ -23,7 +23,6 @@ import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.ChunkPos; import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; diff --git a/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java b/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java index f93716b89..02c637b2f 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidTerminalScreen.java @@ -26,7 +26,6 @@ import java.util.Locale; import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraft.util.text.StringTextComponent; import org.lwjgl.glfw.GLFW; import net.minecraft.client.util.InputMappings; @@ -34,6 +33,7 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.ClickType; import net.minecraft.inventory.container.Slot; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.api.config.Settings; diff --git a/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java b/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java index f83a21f95..a1efa33a1 100644 --- a/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java +++ b/src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java @@ -8,12 +8,11 @@ import javax.annotation.Nonnull; import net.minecraft.block.BlockState; import net.minecraft.block.IBucketPickupHandler; import net.minecraft.fluid.Fluid; -import net.minecraft.fluid.Fluids; import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemStack; import net.minecraft.tags.FluidTags; import net.minecraft.tags.ITag; -import net.minecraft.tags.Tag; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/appeng/integration/modules/jei/CondenserCategory.java b/src/main/java/appeng/integration/modules/jei/CondenserCategory.java index 1a0691deb..55266265a 100644 --- a/src/main/java/appeng/integration/modules/jei/CondenserCategory.java +++ b/src/main/java/appeng/integration/modules/jei/CondenserCategory.java @@ -24,11 +24,9 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; -import com.google.common.base.Splitter; import com.google.common.collect.Lists; import com.mojang.blaze3d.matrix.MatrixStack; -import jdk.nashorn.internal.objects.annotations.Function; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java b/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java index 6398f3092..8838deaf9 100644 --- a/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java +++ b/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java @@ -19,6 +19,7 @@ package appeng.integration.modules.jei; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.client.resources.I18n; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/appeng/items/storage/SpatialStorageCellItem.java b/src/main/java/appeng/items/storage/SpatialStorageCellItem.java index 71f05688b..c3cfe7239 100644 --- a/src/main/java/appeng/items/storage/SpatialStorageCellItem.java +++ b/src/main/java/appeng/items/storage/SpatialStorageCellItem.java @@ -30,7 +30,6 @@ import net.minecraft.util.registry.Registry; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.DimensionType; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java b/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java index e938b999f..4fcfa3cdf 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java +++ b/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java @@ -28,7 +28,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.NonNullList; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index 04a0ffcd1..802307aad 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -23,7 +23,6 @@ import java.util.Iterator; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; -import net.minecraft.world.DimensionType; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.WorldEvent; diff --git a/src/main/java/appeng/mixins/DimensionStructuresSettingsMixin.java b/src/main/java/appeng/mixins/DimensionStructuresSettingsMixin.java index ed366a7db..da616a07d 100644 --- a/src/main/java/appeng/mixins/DimensionStructuresSettingsMixin.java +++ b/src/main/java/appeng/mixins/DimensionStructuresSettingsMixin.java @@ -1,10 +1,7 @@ package appeng.mixins; -import appeng.worldgen.meteorite.MeteoriteStructure; import com.google.common.collect.ImmutableMap; -import net.minecraft.world.gen.feature.structure.Structure; -import net.minecraft.world.gen.settings.DimensionStructuresSettings; -import net.minecraft.world.gen.settings.StructureSeparationSettings; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.Shadow; @@ -12,6 +9,12 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import net.minecraft.world.gen.feature.structure.Structure; +import net.minecraft.world.gen.settings.DimensionStructuresSettings; +import net.minecraft.world.gen.settings.StructureSeparationSettings; + +import appeng.worldgen.meteorite.MeteoriteStructure; + /** * This Mixin will add the structure placement configuration for the meteorite structure * to the static final immutable map that contains them. There is currently no diff --git a/src/main/java/appeng/mixins/DimensionTypeMixin.java b/src/main/java/appeng/mixins/DimensionTypeMixin.java index 800c32425..e7812b11c 100644 --- a/src/main/java/appeng/mixins/DimensionTypeMixin.java +++ b/src/main/java/appeng/mixins/DimensionTypeMixin.java @@ -1,15 +1,17 @@ package appeng.mixins; -import appeng.spatial.SpatialDimensionManager; -import net.minecraft.server.IDynamicRegistries; -import net.minecraft.tags.BlockTags; -import net.minecraft.world.DimensionType; +import java.util.OptionalLong; + 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.CallbackInfoReturnable; -import java.util.OptionalLong; +import net.minecraft.server.IDynamicRegistries; +import net.minecraft.tags.BlockTags; +import net.minecraft.world.DimensionType; + +import appeng.spatial.SpatialDimensionManager; @Mixin(value = DimensionType.class) public class DimensionTypeMixin { diff --git a/src/main/java/appeng/mixins/MinecraftServerMixin.java b/src/main/java/appeng/mixins/MinecraftServerMixin.java index 159b925ad..5666a0c73 100644 --- a/src/main/java/appeng/mixins/MinecraftServerMixin.java +++ b/src/main/java/appeng/mixins/MinecraftServerMixin.java @@ -1,8 +1,14 @@ package appeng.mixins; -import appeng.hooks.DynamicDimensions; +import java.util.Map; +import java.util.concurrent.Executor; + import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + import net.minecraft.server.IDynamicRegistries; import net.minecraft.server.MinecraftServer; import net.minecraft.util.RegistryKey; @@ -20,12 +26,8 @@ import net.minecraft.world.storage.DerivedWorldInfo; import net.minecraft.world.storage.IServerConfiguration; import net.minecraft.world.storage.IServerWorldInfo; import net.minecraft.world.storage.SaveFormat; -import net.minecraft.world.storage.ServerWorldInfo; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import java.util.Map; -import java.util.concurrent.Executor; +import appeng.hooks.DynamicDimensions; @Mixin(MinecraftServer.class) public class MinecraftServerMixin implements DynamicDimensions { diff --git a/src/main/java/appeng/mixins/SkyPropertiesMixin.java b/src/main/java/appeng/mixins/SkyPropertiesMixin.java index a6a0e8628..0fca89599 100644 --- a/src/main/java/appeng/mixins/SkyPropertiesMixin.java +++ b/src/main/java/appeng/mixins/SkyPropertiesMixin.java @@ -1,15 +1,17 @@ package appeng.mixins; -import appeng.spatial.SpatialDimensionManager; -import net.minecraft.client.world.DimensionRenderInfo; -import net.minecraft.util.RegistryKey; -import net.minecraft.world.DimensionType; +import java.util.Optional; + 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.CallbackInfoReturnable; -import java.util.Optional; +import net.minecraft.client.world.DimensionRenderInfo; +import net.minecraft.util.RegistryKey; +import net.minecraft.world.DimensionType; + +import appeng.spatial.SpatialDimensionManager; @Mixin(DimensionRenderInfo.class) public class SkyPropertiesMixin { diff --git a/src/main/java/appeng/mixins/SkyRenderMixin.java b/src/main/java/appeng/mixins/SkyRenderMixin.java index 3d4c89399..d8b178181 100644 --- a/src/main/java/appeng/mixins/SkyRenderMixin.java +++ b/src/main/java/appeng/mixins/SkyRenderMixin.java @@ -1,16 +1,19 @@ package appeng.mixins; -import appeng.client.render.SpatialSkyRender; -import appeng.spatial.SpatialDimensionManager; import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.WorldRenderer; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.WorldRenderer; + +import appeng.client.render.SpatialSkyRender; +import appeng.spatial.SpatialDimensionManager; + @Mixin(value = WorldRenderer.class) public class SkyRenderMixin { diff --git a/src/main/java/appeng/mixins/StructureAccessor.java b/src/main/java/appeng/mixins/StructureAccessor.java index b39ceb72a..e76622517 100644 --- a/src/main/java/appeng/mixins/StructureAccessor.java +++ b/src/main/java/appeng/mixins/StructureAccessor.java @@ -1,9 +1,10 @@ package appeng.mixins; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.feature.structure.Structure; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(Structure.class) public interface StructureAccessor { diff --git a/src/main/java/appeng/mixins/ThreadedAnvilChunkStorageAccessor.java b/src/main/java/appeng/mixins/ThreadedAnvilChunkStorageAccessor.java index 1a7a0cf9a..1b037f2d5 100644 --- a/src/main/java/appeng/mixins/ThreadedAnvilChunkStorageAccessor.java +++ b/src/main/java/appeng/mixins/ThreadedAnvilChunkStorageAccessor.java @@ -1,9 +1,10 @@ package appeng.mixins; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + import net.minecraft.world.chunk.listener.IChunkStatusListener; import net.minecraft.world.server.ChunkManager; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; @Mixin(ChunkManager.class) public interface ThreadedAnvilChunkStorageAccessor { diff --git a/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java b/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java index 2cfc6d719..f813ab2e5 100644 --- a/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java +++ b/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java @@ -41,7 +41,6 @@ import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.event.ClickEvent; import net.minecraft.util.text.event.HoverEvent; -import net.minecraft.world.DimensionType; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkStatus; import net.minecraft.world.chunk.IChunk; diff --git a/src/main/java/appeng/server/subcommands/TestOreGenCommand.java b/src/main/java/appeng/server/subcommands/TestOreGenCommand.java index 7ce76f35f..af494a7fb 100644 --- a/src/main/java/appeng/server/subcommands/TestOreGenCommand.java +++ b/src/main/java/appeng/server/subcommands/TestOreGenCommand.java @@ -35,7 +35,6 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.text.StringTextComponent; -import net.minecraft.world.DimensionType; import net.minecraft.world.World; import net.minecraft.world.chunk.ChunkStatus; import net.minecraft.world.chunk.IChunk; diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 02df50e56..e848d5b57 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -18,10 +18,15 @@ package appeng.services; -import appeng.api.util.DimensionalCoord; -import appeng.core.Api; -import appeng.services.compass.CompassReader; -import appeng.services.compass.ICompassCallback; +import java.util.WeakHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; + +import javax.annotation.Nonnull; + import net.minecraft.block.Block; import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.BlockPos; @@ -33,13 +38,10 @@ import net.minecraft.world.server.ServerWorld; import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import javax.annotation.Nonnull; -import java.util.WeakHashMap; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; +import appeng.api.util.DimensionalCoord; +import appeng.core.Api; +import appeng.services.compass.CompassReader; +import appeng.services.compass.ICompassCallback; public final class CompassService { private static final int CHUNK_SIZE = 16; diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index b3fc61fe3..68e3864a7 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -32,11 +32,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.EmptyBlockReader; import net.minecraft.world.ITickList; import net.minecraft.world.NextTickListEntry; -import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkSection; import net.minecraft.world.server.ServerChunkProvider; import net.minecraft.world.server.ServerTickList; +import net.minecraft.world.server.ServerWorld; import appeng.api.movable.IMovableHandler; import appeng.api.movable.IMovableRegistry; @@ -45,7 +45,6 @@ import appeng.api.util.WorldCoord; import appeng.core.AELog; import appeng.core.Api; import appeng.core.worlddata.WorldData; -import net.minecraft.world.server.ServerWorld; public class CachedPlane { private final int x_size; diff --git a/src/main/java/appeng/spatial/SpatialDimensionManager.java b/src/main/java/appeng/spatial/SpatialDimensionManager.java index 65243d5a0..1e902a980 100644 --- a/src/main/java/appeng/spatial/SpatialDimensionManager.java +++ b/src/main/java/appeng/spatial/SpatialDimensionManager.java @@ -23,9 +23,7 @@ import java.util.Locale; import javax.annotation.Nullable; -import appeng.hooks.DynamicDimensions; import net.minecraft.client.world.DimensionRenderInfo; -import net.minecraft.network.PacketBuffer; import net.minecraft.server.MinecraftServer; import net.minecraft.util.RegistryKey; import net.minecraft.util.ResourceLocation; @@ -42,6 +40,7 @@ import appeng.api.storage.ISpatialDimension; import appeng.core.AELog; import appeng.core.AppEng; import appeng.core.localization.GuiText; +import appeng.hooks.DynamicDimensions; public final class SpatialDimensionManager implements ISpatialDimension { diff --git a/src/main/java/appeng/spatial/StorageChunkGenerator.java b/src/main/java/appeng/spatial/StorageChunkGenerator.java index be9d10cd5..8ea0d8abc 100644 --- a/src/main/java/appeng/spatial/StorageChunkGenerator.java +++ b/src/main/java/appeng/spatial/StorageChunkGenerator.java @@ -18,8 +18,13 @@ package appeng.spatial; +import java.util.Arrays; +import java.util.Collections; +import java.util.Optional; + import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; + import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Blockreader; @@ -33,14 +38,10 @@ import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.GenerationStage; import net.minecraft.world.gen.Heightmap; import net.minecraft.world.gen.WorldGenRegion; - -import appeng.core.Api; import net.minecraft.world.gen.feature.structure.StructureManager; import net.minecraft.world.gen.settings.DimensionStructuresSettings; -import java.util.Arrays; -import java.util.Collections; -import java.util.Optional; +import appeng.core.Api; public class StorageChunkGenerator extends ChunkGenerator { diff --git a/src/main/java/appeng/worldgen/ChargedQuartzOreConfig.java b/src/main/java/appeng/worldgen/ChargedQuartzOreConfig.java index 54cb492c9..d1915c01e 100644 --- a/src/main/java/appeng/worldgen/ChargedQuartzOreConfig.java +++ b/src/main/java/appeng/worldgen/ChargedQuartzOreConfig.java @@ -1,18 +1,12 @@ package appeng.worldgen; -import com.google.common.collect.ImmutableMap; import com.mojang.serialization.Codec; -import com.mojang.serialization.Dynamic; -import com.mojang.serialization.DynamicOps; - import com.mojang.serialization.codecs.RecordCodecBuilder; + import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.ReplaceBlockConfig; -import appeng.core.AEConfig; - /** * Extends a {@link ReplaceBlockConfig} with a chance. */ diff --git a/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java b/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java index 34e679b93..eaac90b9c 100644 --- a/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java +++ b/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java @@ -1,6 +1,9 @@ package appeng.worldgen; +import java.util.Random; + import com.mojang.serialization.Codec; + import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.ISeedReader; @@ -10,8 +13,6 @@ import net.minecraft.world.gen.Heightmap; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.structure.StructureManager; -import java.util.Random; - /** * Extends {@link net.minecraft.world.gen.feature.OreFeature} by also allowing * for a replacement chance. In addition, the feature will check every block in diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java index 414c3ef1c..4e1da28a6 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructure.java @@ -1,7 +1,7 @@ package appeng.worldgen.meteorite; -import appeng.core.AppEng; import com.mojang.serialization.Codec; + import net.minecraft.util.ResourceLocation; import net.minecraft.util.SharedSeedRandom; import net.minecraft.util.math.ChunkPos; @@ -11,6 +11,8 @@ import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.feature.NoFeatureConfig; import net.minecraft.world.gen.feature.structure.Structure; +import appeng.core.AppEng; + public class MeteoriteStructure extends Structure { public static final ResourceLocation ID = AppEng.makeId("meteorite"); diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java index 14a8b870d..dad15f4e8 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteStructurePiece.java @@ -24,7 +24,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.MutableBoundingBox; import net.minecraft.world.ISeedReader; -import net.minecraft.world.IWorld; import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.feature.structure.IStructurePieceType; import net.minecraft.world.gen.feature.structure.StructureManager;