From 0f5c1cc6e3bad3c75241923933cf13cef3a5c543 Mon Sep 17 00:00:00 2001 From: Stuart Pomeroy Date: Sat, 10 Aug 2024 14:54:52 +0100 Subject: [PATCH] Optimize imports --- .../main/java/dev/imabad/theatrical/Theatrical.java | 8 ++++---- .../java/dev/imabad/theatrical/TheatricalClient.java | 5 ++--- .../imabad/theatrical/TheatricalExpectPlatform.java | 1 - .../main/java/dev/imabad/theatrical/api/Fixture.java | 2 -- .../theatrical/blockentities/BlockEntities.java | 3 --- .../control/BasicLightingDeskBlockEntity.java | 3 --- .../interfaces/ArtNetInterfaceBlockEntity.java | 1 - .../interfaces/RedstoneInterfaceBlockEntity.java | 1 - .../light/BaseDMXConsumerLightBlockEntity.java | 2 -- .../blockentities/light/BaseLightBlockEntity.java | 5 ----- .../blockentities/light/FresnelBlockEntity.java | 2 -- .../blockentities/light/LEDPanelBlockEntity.java | 1 - .../java/dev/imabad/theatrical/blocks/Blocks.java | 2 +- .../blocks/control/BasicLightingDeskBlock.java | 12 +++--------- .../theatrical/blocks/light/BaseLightBlock.java | 3 --- .../imabad/theatrical/blocks/light/FresnelBlock.java | 5 ----- .../theatrical/blocks/light/LEDPanelBlock.java | 6 ------ .../theatrical/blocks/light/MovingLightBlock.java | 5 ----- .../imabad/theatrical/blocks/rigging/PipeBlock.java | 1 - .../theatrical/blocks/rigging/TankTrapBlock.java | 1 - .../imabad/theatrical/blocks/rigging/TrussBlock.java | 11 ++++++++--- .../dev/imabad/theatrical/client/LazyRenderers.java | 3 --- .../theatrical/client/TheatricalRenderTypes.java | 3 --- .../blockentities/BasicLightingConsoleRenderer.java | 5 ----- .../client/blockentities/FixtureRenderer.java | 1 - .../client/blockentities/FresnelRenderer.java | 3 --- .../client/blockentities/LEDPanelRenderer.java | 3 --- .../client/blockentities/MovingLightRenderer.java | 4 ---- .../client/dmx/TheatricalArtNetClient.java | 5 ----- .../client/gui/screen/ArtNetConfigurationScreen.java | 12 +++--------- .../client/gui/screen/ArtNetInterfaceScreen.java | 2 -- .../client/gui/screen/BasicLightingDeskScreen.java | 1 - .../client/gui/screen/ConfigurationCardScreen.java | 4 ---- .../theatrical/client/gui/screen/FresnelScreen.java | 9 --------- .../gui/screen/GenericDMXConfigurationScreen.java | 3 --- .../gui/widgets/ArtNetUniverseConfigurationList.java | 2 -- .../client/gui/widgets/BetterCheckbox.java | 1 - .../theatrical/client/gui/widgets/FaderWidget.java | 2 -- .../client/gui/widgets/LabeledEditBox.java | 2 -- .../theatrical/commands/MemberRoleArgument.java | 1 - .../imabad/theatrical/commands/NetworkCommand.java | 1 - .../imabad/theatrical/config/TheatricalConfig.java | 4 ---- .../java/dev/imabad/theatrical/dmx/DMXNetwork.java | 1 - .../dev/imabad/theatrical/dmx/DMXNetworkData.java | 2 -- .../theatrical/fixtures/LEDFresnelFixture.java | 5 ----- .../imabad/theatrical/mixin/client/ClientMixin.java | 1 - .../java/dev/imabad/theatrical/net/OpenScreen.java | 1 - .../dev/imabad/theatrical/net/UpdateDMXFixture.java | 2 -- .../imabad/theatrical/net/UpdateFixturePosition.java | 1 - .../imabad/theatrical/net/artnet/ListConsumers.java | 1 - .../theatrical/net/artnet/NotifyConsumerChange.java | 1 - .../imabad/theatrical/net/artnet/NotifyNetworks.java | 3 --- .../theatrical/net/artnet/RequestNetworks.java | 7 +++---- .../theatrical/fabric/TheatricalClientFabric.java | 5 ----- .../fabric/TheatricalExpectPlatformImpl.java | 2 -- .../imabad/theatrical/fabric/TheatricalFabric.java | 6 ------ .../forge/TheatricalExpectPlatformImpl.java | 5 ----- .../dev/imabad/theatrical/forge/TheatricalForge.java | 1 - 58 files changed, 24 insertions(+), 171 deletions(-) diff --git a/common/src/main/java/dev/imabad/theatrical/Theatrical.java b/common/src/main/java/dev/imabad/theatrical/Theatrical.java index 51e9bf2..bf34473 100644 --- a/common/src/main/java/dev/imabad/theatrical/Theatrical.java +++ b/common/src/main/java/dev/imabad/theatrical/Theatrical.java @@ -6,22 +6,22 @@ import dev.architectury.platform.Platform; import dev.architectury.registry.CreativeTabRegistry; import dev.architectury.registry.registries.DeferredRegister; -import dev.architectury.registry.registries.Registrar; import dev.architectury.registry.registries.RegistrySupplier; import dev.imabad.theatrical.blockentities.BlockEntities; import dev.imabad.theatrical.blocks.Blocks; -import dev.imabad.theatrical.commands.CommandArguments; import dev.imabad.theatrical.commands.DMXNetworkModeArgument; import dev.imabad.theatrical.commands.MemberRoleArgument; import dev.imabad.theatrical.commands.NetworkCommand; import dev.imabad.theatrical.config.ConfigHandler; import dev.imabad.theatrical.config.TheatricalConfig; -import dev.imabad.theatrical.dmx.*; +import dev.imabad.theatrical.dmx.DMXDevice; +import dev.imabad.theatrical.dmx.DMXNetwork; +import dev.imabad.theatrical.dmx.DMXNetworkData; import dev.imabad.theatrical.fixtures.Fixtures; import dev.imabad.theatrical.items.Items; import dev.imabad.theatrical.mixin.ArgumentTypeInfosAccessor; -import dev.imabad.theatrical.net.artnet.ListConsumers; import dev.imabad.theatrical.net.TheatricalNet; +import dev.imabad.theatrical.net.artnet.ListConsumers; import net.minecraft.commands.synchronization.ArgumentTypeInfo; import net.minecraft.commands.synchronization.SingletonArgumentInfo; import net.minecraft.core.registries.Registries; diff --git a/common/src/main/java/dev/imabad/theatrical/TheatricalClient.java b/common/src/main/java/dev/imabad/theatrical/TheatricalClient.java index c02d8e8..cb6ddde 100644 --- a/common/src/main/java/dev/imabad/theatrical/TheatricalClient.java +++ b/common/src/main/java/dev/imabad/theatrical/TheatricalClient.java @@ -11,26 +11,25 @@ import dev.imabad.theatrical.blockentities.control.BasicLightingDeskBlockEntity; import dev.imabad.theatrical.blockentities.light.BaseLightBlockEntity; import dev.imabad.theatrical.blockentities.light.FresnelBlockEntity; -import dev.imabad.theatrical.blockentities.light.MovingLightBlockEntity; import dev.imabad.theatrical.blocks.light.MovingLightBlock; import dev.imabad.theatrical.client.LazyRenderers; import dev.imabad.theatrical.client.blockentities.BasicLightingConsoleRenderer; import dev.imabad.theatrical.client.blockentities.FresnelRenderer; import dev.imabad.theatrical.client.blockentities.LEDPanelRenderer; import dev.imabad.theatrical.client.blockentities.MovingLightRenderer; +import dev.imabad.theatrical.client.dmx.ArtNetManager; import dev.imabad.theatrical.client.dmx.ArtNetToNetworkClientData; +import dev.imabad.theatrical.client.dmx.TheatricalArtNetClient; import dev.imabad.theatrical.client.gui.screen.BasicLightingDeskScreen; import dev.imabad.theatrical.client.gui.screen.FresnelScreen; import dev.imabad.theatrical.client.gui.screen.GenericDMXConfigurationScreen; import dev.imabad.theatrical.config.TheatricalConfig; import dev.imabad.theatrical.config.UniverseConfig; import dev.imabad.theatrical.dmx.DMXDevice; -import dev.imabad.theatrical.client.dmx.TheatricalArtNetClient; import dev.imabad.theatrical.lighting.LightManager; import dev.imabad.theatrical.net.OpenScreen; import dev.imabad.theatrical.net.artnet.ListConsumers; import dev.imabad.theatrical.net.artnet.NotifyConsumerChange; -import dev.imabad.theatrical.client.dmx.ArtNetManager; import dev.imabad.theatrical.net.artnet.RequestNetworks; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; diff --git a/common/src/main/java/dev/imabad/theatrical/TheatricalExpectPlatform.java b/common/src/main/java/dev/imabad/theatrical/TheatricalExpectPlatform.java index f3166b2..0c60b46 100644 --- a/common/src/main/java/dev/imabad/theatrical/TheatricalExpectPlatform.java +++ b/common/src/main/java/dev/imabad/theatrical/TheatricalExpectPlatform.java @@ -3,7 +3,6 @@ import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.block.entity.BlockEntityType; import java.nio.file.Path; diff --git a/common/src/main/java/dev/imabad/theatrical/api/Fixture.java b/common/src/main/java/dev/imabad/theatrical/api/Fixture.java index de4c0e7..545e2f4 100644 --- a/common/src/main/java/dev/imabad/theatrical/api/Fixture.java +++ b/common/src/main/java/dev/imabad/theatrical/api/Fixture.java @@ -1,9 +1,7 @@ package dev.imabad.theatrical.api; import dev.imabad.theatrical.api.dmx.DMXPersonality; -import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.state.BlockState; import java.util.List; diff --git a/common/src/main/java/dev/imabad/theatrical/blockentities/BlockEntities.java b/common/src/main/java/dev/imabad/theatrical/blockentities/BlockEntities.java index 1ab6354..828dcd4 100644 --- a/common/src/main/java/dev/imabad/theatrical/blockentities/BlockEntities.java +++ b/common/src/main/java/dev/imabad/theatrical/blockentities/BlockEntities.java @@ -2,7 +2,6 @@ import dev.architectury.registry.registries.DeferredRegister; import dev.architectury.registry.registries.RegistrySupplier; -import dev.imabad.theatrical.TheatricalExpectPlatform; import dev.imabad.theatrical.TheatricalRegistry; import dev.imabad.theatrical.blockentities.control.BasicLightingDeskBlockEntity; import dev.imabad.theatrical.blockentities.interfaces.ArtNetInterfaceBlockEntity; @@ -11,8 +10,6 @@ import dev.imabad.theatrical.blockentities.light.LEDPanelBlockEntity; import dev.imabad.theatrical.blockentities.light.MovingLightBlockEntity; import dev.imabad.theatrical.blocks.Blocks; -import dev.imabad.theatrical.blocks.control.BasicLightingDeskBlock; -import dev.imabad.theatrical.blocks.light.LEDPanelBlock; import net.minecraft.core.registries.Registries; import net.minecraft.world.level.block.entity.BlockEntityType; diff --git a/common/src/main/java/dev/imabad/theatrical/blockentities/control/BasicLightingDeskBlockEntity.java b/common/src/main/java/dev/imabad/theatrical/blockentities/control/BasicLightingDeskBlockEntity.java index 3952f2d..ff738ee 100644 --- a/common/src/main/java/dev/imabad/theatrical/blockentities/control/BasicLightingDeskBlockEntity.java +++ b/common/src/main/java/dev/imabad/theatrical/blockentities/control/BasicLightingDeskBlockEntity.java @@ -4,8 +4,6 @@ import dev.imabad.theatrical.api.dmx.DMXConsumer; import dev.imabad.theatrical.blockentities.BlockEntities; import dev.imabad.theatrical.blockentities.ClientSyncBlockEntity; -import dev.imabad.theatrical.blocks.control.BasicLightingDeskBlock; -import dev.imabad.theatrical.config.TheatricalConfig; import dev.imabad.theatrical.dmx.DMXNetworkData; import dev.imabad.theatrical.util.UUIDUtil; import net.minecraft.core.BlockPos; @@ -13,7 +11,6 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import java.util.*; diff --git a/common/src/main/java/dev/imabad/theatrical/blockentities/interfaces/ArtNetInterfaceBlockEntity.java b/common/src/main/java/dev/imabad/theatrical/blockentities/interfaces/ArtNetInterfaceBlockEntity.java index c2d021e..399cf35 100644 --- a/common/src/main/java/dev/imabad/theatrical/blockentities/interfaces/ArtNetInterfaceBlockEntity.java +++ b/common/src/main/java/dev/imabad/theatrical/blockentities/interfaces/ArtNetInterfaceBlockEntity.java @@ -5,7 +5,6 @@ import dev.imabad.theatrical.config.TheatricalConfig; import dev.imabad.theatrical.dmx.DMXNetworkData; import dev.imabad.theatrical.util.UUIDUtil; -import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.Level; diff --git a/common/src/main/java/dev/imabad/theatrical/blockentities/interfaces/RedstoneInterfaceBlockEntity.java b/common/src/main/java/dev/imabad/theatrical/blockentities/interfaces/RedstoneInterfaceBlockEntity.java index 8bc83ed..df81627 100644 --- a/common/src/main/java/dev/imabad/theatrical/blockentities/interfaces/RedstoneInterfaceBlockEntity.java +++ b/common/src/main/java/dev/imabad/theatrical/blockentities/interfaces/RedstoneInterfaceBlockEntity.java @@ -15,7 +15,6 @@ import net.minecraft.util.Mth; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import java.util.Arrays; diff --git a/common/src/main/java/dev/imabad/theatrical/blockentities/light/BaseDMXConsumerLightBlockEntity.java b/common/src/main/java/dev/imabad/theatrical/blockentities/light/BaseDMXConsumerLightBlockEntity.java index 9124eeb..092adcd 100644 --- a/common/src/main/java/dev/imabad/theatrical/blockentities/light/BaseDMXConsumerLightBlockEntity.java +++ b/common/src/main/java/dev/imabad/theatrical/blockentities/light/BaseDMXConsumerLightBlockEntity.java @@ -3,7 +3,6 @@ import ch.bildspur.artnet.rdm.RDMDeviceId; import dev.imabad.theatrical.Constants; import dev.imabad.theatrical.api.dmx.DMXConsumer; -import dev.imabad.theatrical.dmx.DMXNetwork; import dev.imabad.theatrical.dmx.DMXNetworkData; import dev.imabad.theatrical.util.RndUtils; import dev.imabad.theatrical.util.UUIDUtil; @@ -14,7 +13,6 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import java.util.Arrays; import java.util.Random; import java.util.UUID; diff --git a/common/src/main/java/dev/imabad/theatrical/blockentities/light/BaseLightBlockEntity.java b/common/src/main/java/dev/imabad/theatrical/blockentities/light/BaseLightBlockEntity.java index 4610424..8bfabad 100644 --- a/common/src/main/java/dev/imabad/theatrical/blockentities/light/BaseLightBlockEntity.java +++ b/common/src/main/java/dev/imabad/theatrical/blockentities/light/BaseLightBlockEntity.java @@ -5,7 +5,6 @@ import dev.imabad.theatrical.blockentities.ClientSyncBlockEntity; import dev.imabad.theatrical.blocks.HangableBlock; import dev.imabad.theatrical.blocks.light.BaseLightBlock; -import dev.imabad.theatrical.blocks.light.MovingLightBlock; import dev.imabad.theatrical.config.TheatricalConfig; import dev.imabad.theatrical.lighting.LambDynamicLight; import dev.imabad.theatrical.lighting.LambDynamicLightUtil; @@ -22,10 +21,6 @@ import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.ClipContext; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.HorizontalDirectionalBlock; -import net.minecraft.world.level.block.LightBlock; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/dev/imabad/theatrical/blockentities/light/FresnelBlockEntity.java b/common/src/main/java/dev/imabad/theatrical/blockentities/light/FresnelBlockEntity.java index 56ccf0e..2ff685e 100644 --- a/common/src/main/java/dev/imabad/theatrical/blockentities/light/FresnelBlockEntity.java +++ b/common/src/main/java/dev/imabad/theatrical/blockentities/light/FresnelBlockEntity.java @@ -2,12 +2,10 @@ import dev.imabad.theatrical.api.Fixture; import dev.imabad.theatrical.blockentities.BlockEntities; -import dev.imabad.theatrical.blocks.light.MovingLightBlock; import dev.imabad.theatrical.fixtures.Fixtures; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import java.util.Arrays; diff --git a/common/src/main/java/dev/imabad/theatrical/blockentities/light/LEDPanelBlockEntity.java b/common/src/main/java/dev/imabad/theatrical/blockentities/light/LEDPanelBlockEntity.java index a051fbe..5134b1b 100644 --- a/common/src/main/java/dev/imabad/theatrical/blockentities/light/LEDPanelBlockEntity.java +++ b/common/src/main/java/dev/imabad/theatrical/blockentities/light/LEDPanelBlockEntity.java @@ -6,7 +6,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import java.util.Arrays; diff --git a/common/src/main/java/dev/imabad/theatrical/blocks/Blocks.java b/common/src/main/java/dev/imabad/theatrical/blocks/Blocks.java index feb388f..7b7e500 100644 --- a/common/src/main/java/dev/imabad/theatrical/blocks/Blocks.java +++ b/common/src/main/java/dev/imabad/theatrical/blocks/Blocks.java @@ -9,8 +9,8 @@ import dev.imabad.theatrical.blocks.light.FresnelBlock; import dev.imabad.theatrical.blocks.light.LEDPanelBlock; import dev.imabad.theatrical.blocks.light.MovingLightBlock; -import dev.imabad.theatrical.blocks.rigging.TrussBlock; import dev.imabad.theatrical.blocks.rigging.TankTrapBlock; +import dev.imabad.theatrical.blocks.rigging.TrussBlock; import net.minecraft.core.BlockPos; import net.minecraft.core.registries.Registries; import net.minecraft.world.entity.EntityType; diff --git a/common/src/main/java/dev/imabad/theatrical/blocks/control/BasicLightingDeskBlock.java b/common/src/main/java/dev/imabad/theatrical/blocks/control/BasicLightingDeskBlock.java index 7db478c..f347cce 100644 --- a/common/src/main/java/dev/imabad/theatrical/blocks/control/BasicLightingDeskBlock.java +++ b/common/src/main/java/dev/imabad/theatrical/blocks/control/BasicLightingDeskBlock.java @@ -1,21 +1,13 @@ package dev.imabad.theatrical.blocks.control; -import dev.imabad.theatrical.TheatricalClient; import dev.imabad.theatrical.TheatricalScreen; import dev.imabad.theatrical.blockentities.BlockEntities; import dev.imabad.theatrical.blockentities.control.BasicLightingDeskBlockEntity; -import dev.imabad.theatrical.blockentities.light.FresnelBlockEntity; -import dev.imabad.theatrical.blockentities.light.LightCollisionContext; import dev.imabad.theatrical.blocks.Blocks; -import dev.imabad.theatrical.client.gui.screen.BasicLightingDeskScreen; -import dev.imabad.theatrical.client.gui.screen.FresnelScreen; import dev.imabad.theatrical.dmx.DMXNetwork; import dev.imabad.theatrical.dmx.DMXNetworkData; import dev.imabad.theatrical.net.OpenScreen; import dev.imabad.theatrical.util.UUIDUtil; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerPlayer; @@ -25,7 +17,9 @@ import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.EntityBlock; +import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; diff --git a/common/src/main/java/dev/imabad/theatrical/blocks/light/BaseLightBlock.java b/common/src/main/java/dev/imabad/theatrical/blocks/light/BaseLightBlock.java index 0d115af..2af6823 100644 --- a/common/src/main/java/dev/imabad/theatrical/blocks/light/BaseLightBlock.java +++ b/common/src/main/java/dev/imabad/theatrical/blocks/light/BaseLightBlock.java @@ -1,6 +1,5 @@ package dev.imabad.theatrical.blocks.light; -import dev.imabad.theatrical.blockentities.interfaces.ArtNetInterfaceBlockEntity; import dev.imabad.theatrical.blockentities.light.BaseDMXConsumerLightBlockEntity; import dev.imabad.theatrical.blockentities.light.LightCollisionContext; import dev.imabad.theatrical.blocks.HangableBlock; @@ -8,8 +7,6 @@ import dev.imabad.theatrical.dmx.DMXNetworkData; import dev.imabad.theatrical.items.Items; import dev.imabad.theatrical.util.UUIDUtil; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; diff --git a/common/src/main/java/dev/imabad/theatrical/blocks/light/FresnelBlock.java b/common/src/main/java/dev/imabad/theatrical/blocks/light/FresnelBlock.java index 0fc6070..4d2687b 100644 --- a/common/src/main/java/dev/imabad/theatrical/blocks/light/FresnelBlock.java +++ b/common/src/main/java/dev/imabad/theatrical/blocks/light/FresnelBlock.java @@ -5,18 +5,13 @@ import dev.imabad.theatrical.blockentities.BlockEntities; import dev.imabad.theatrical.blockentities.light.FresnelBlockEntity; import dev.imabad.theatrical.blocks.Blocks; -import dev.imabad.theatrical.client.gui.screen.FresnelScreen; import dev.imabad.theatrical.net.OpenScreen; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; diff --git a/common/src/main/java/dev/imabad/theatrical/blocks/light/LEDPanelBlock.java b/common/src/main/java/dev/imabad/theatrical/blocks/light/LEDPanelBlock.java index 4e2a47e..51b3c3f 100644 --- a/common/src/main/java/dev/imabad/theatrical/blocks/light/LEDPanelBlock.java +++ b/common/src/main/java/dev/imabad/theatrical/blocks/light/LEDPanelBlock.java @@ -3,15 +3,9 @@ import dev.imabad.theatrical.TheatricalClient; import dev.imabad.theatrical.TheatricalScreen; import dev.imabad.theatrical.blockentities.BlockEntities; -import dev.imabad.theatrical.blockentities.light.FresnelBlockEntity; import dev.imabad.theatrical.blockentities.light.LEDPanelBlockEntity; import dev.imabad.theatrical.blocks.Blocks; -import dev.imabad.theatrical.client.gui.screen.FresnelScreen; -import dev.imabad.theatrical.client.gui.screen.GenericDMXConfigurationScreen; import dev.imabad.theatrical.net.OpenScreen; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerPlayer; diff --git a/common/src/main/java/dev/imabad/theatrical/blocks/light/MovingLightBlock.java b/common/src/main/java/dev/imabad/theatrical/blocks/light/MovingLightBlock.java index 59077d7..0b620d2 100644 --- a/common/src/main/java/dev/imabad/theatrical/blocks/light/MovingLightBlock.java +++ b/common/src/main/java/dev/imabad/theatrical/blocks/light/MovingLightBlock.java @@ -5,18 +5,13 @@ import dev.imabad.theatrical.blockentities.BlockEntities; import dev.imabad.theatrical.blockentities.light.MovingLightBlockEntity; import dev.imabad.theatrical.blocks.Blocks; -import dev.imabad.theatrical.client.gui.screen.GenericDMXConfigurationScreen; import dev.imabad.theatrical.net.OpenScreen; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; diff --git a/common/src/main/java/dev/imabad/theatrical/blocks/rigging/PipeBlock.java b/common/src/main/java/dev/imabad/theatrical/blocks/rigging/PipeBlock.java index a03f5aa..5a87e93 100644 --- a/common/src/main/java/dev/imabad/theatrical/blocks/rigging/PipeBlock.java +++ b/common/src/main/java/dev/imabad/theatrical/blocks/rigging/PipeBlock.java @@ -21,7 +21,6 @@ import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.DirectionalBlock; -import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; diff --git a/common/src/main/java/dev/imabad/theatrical/blocks/rigging/TankTrapBlock.java b/common/src/main/java/dev/imabad/theatrical/blocks/rigging/TankTrapBlock.java index a193fc6..1a16f79 100644 --- a/common/src/main/java/dev/imabad/theatrical/blocks/rigging/TankTrapBlock.java +++ b/common/src/main/java/dev/imabad/theatrical/blocks/rigging/TankTrapBlock.java @@ -6,7 +6,6 @@ import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; diff --git a/common/src/main/java/dev/imabad/theatrical/blocks/rigging/TrussBlock.java b/common/src/main/java/dev/imabad/theatrical/blocks/rigging/TrussBlock.java index 1126890..d888fc8 100644 --- a/common/src/main/java/dev/imabad/theatrical/blocks/rigging/TrussBlock.java +++ b/common/src/main/java/dev/imabad/theatrical/blocks/rigging/TrussBlock.java @@ -13,8 +13,14 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.level.*; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.RotatedPillarBlock; +import net.minecraft.world.level.block.SimpleWaterloggedBlock; +import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; @@ -24,7 +30,6 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraft.world.ticks.ScheduledTick; public class TrussBlock extends RotatedPillarBlock implements SimpleWaterloggedBlock, Support { diff --git a/common/src/main/java/dev/imabad/theatrical/client/LazyRenderers.java b/common/src/main/java/dev/imabad/theatrical/client/LazyRenderers.java index 3aa0edb..6d3640d 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/LazyRenderers.java +++ b/common/src/main/java/dev/imabad/theatrical/client/LazyRenderers.java @@ -1,9 +1,7 @@ package dev.imabad.theatrical.client; import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Camera; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.util.Tuple; import net.minecraft.world.phys.Vec3; @@ -11,7 +9,6 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import java.util.Map; public class LazyRenderers { diff --git a/common/src/main/java/dev/imabad/theatrical/client/TheatricalRenderTypes.java b/common/src/main/java/dev/imabad/theatrical/client/TheatricalRenderTypes.java index 5f1b3a3..6d05d80 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/TheatricalRenderTypes.java +++ b/common/src/main/java/dev/imabad/theatrical/client/TheatricalRenderTypes.java @@ -5,9 +5,6 @@ import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.RenderStateShard; import net.minecraft.client.renderer.RenderType; -import org.lwjgl.opengl.GL11; - -import static net.minecraft.client.renderer.RenderStateShard.NO_TEXTURE; public class TheatricalRenderTypes { diff --git a/common/src/main/java/dev/imabad/theatrical/client/blockentities/BasicLightingConsoleRenderer.java b/common/src/main/java/dev/imabad/theatrical/client/blockentities/BasicLightingConsoleRenderer.java index 352b39a..2805269 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/blockentities/BasicLightingConsoleRenderer.java +++ b/common/src/main/java/dev/imabad/theatrical/client/blockentities/BasicLightingConsoleRenderer.java @@ -1,16 +1,12 @@ package dev.imabad.theatrical.client.blockentities; -import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; import dev.imabad.theatrical.blockentities.control.BasicLightingDeskBlockEntity; -import dev.imabad.theatrical.blocks.control.BasicLightingDeskBlock; import dev.imabad.theatrical.client.TheatricalRenderTypes; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; @@ -19,7 +15,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import org.joml.Matrix4f; -import org.joml.Vector3f; public class BasicLightingConsoleRenderer implements BlockEntityRenderer { public BasicLightingConsoleRenderer(BlockEntityRendererProvider.Context context) { diff --git a/common/src/main/java/dev/imabad/theatrical/client/blockentities/FixtureRenderer.java b/common/src/main/java/dev/imabad/theatrical/client/blockentities/FixtureRenderer.java index 1b68180..531fd17 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/blockentities/FixtureRenderer.java +++ b/common/src/main/java/dev/imabad/theatrical/client/blockentities/FixtureRenderer.java @@ -14,7 +14,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; -import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/dev/imabad/theatrical/client/blockentities/FresnelRenderer.java b/common/src/main/java/dev/imabad/theatrical/client/blockentities/FresnelRenderer.java index 251733a..5354b9f 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/blockentities/FresnelRenderer.java +++ b/common/src/main/java/dev/imabad/theatrical/client/blockentities/FresnelRenderer.java @@ -4,11 +4,8 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; import dev.imabad.theatrical.TheatricalExpectPlatform; -import dev.imabad.theatrical.api.HangType; -import dev.imabad.theatrical.api.Support; import dev.imabad.theatrical.blockentities.light.FresnelBlockEntity; import dev.imabad.theatrical.blocks.HangableBlock; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.Direction; diff --git a/common/src/main/java/dev/imabad/theatrical/client/blockentities/LEDPanelRenderer.java b/common/src/main/java/dev/imabad/theatrical/client/blockentities/LEDPanelRenderer.java index 8d65e16..c9933f7 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/blockentities/LEDPanelRenderer.java +++ b/common/src/main/java/dev/imabad/theatrical/client/blockentities/LEDPanelRenderer.java @@ -4,15 +4,12 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; import dev.imabad.theatrical.TheatricalExpectPlatform; -import dev.imabad.theatrical.TheatricalRegistry; -import dev.imabad.theatrical.api.Support; import dev.imabad.theatrical.blockentities.light.LEDPanelBlockEntity; import dev.imabad.theatrical.blocks.HangableBlock; import dev.imabad.theatrical.client.LazyRenderers; import dev.imabad.theatrical.client.TheatricalRenderTypes; import net.minecraft.client.Camera; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.Direction; diff --git a/common/src/main/java/dev/imabad/theatrical/client/blockentities/MovingLightRenderer.java b/common/src/main/java/dev/imabad/theatrical/client/blockentities/MovingLightRenderer.java index 62feb11..8a9ae45 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/blockentities/MovingLightRenderer.java +++ b/common/src/main/java/dev/imabad/theatrical/client/blockentities/MovingLightRenderer.java @@ -4,12 +4,8 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; import dev.imabad.theatrical.TheatricalExpectPlatform; -import dev.imabad.theatrical.api.Fixture; -import dev.imabad.theatrical.api.HangType; -import dev.imabad.theatrical.api.Support; import dev.imabad.theatrical.blockentities.light.MovingLightBlockEntity; import dev.imabad.theatrical.blocks.HangableBlock; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.core.Direction; diff --git a/common/src/main/java/dev/imabad/theatrical/client/dmx/TheatricalArtNetClient.java b/common/src/main/java/dev/imabad/theatrical/client/dmx/TheatricalArtNetClient.java index 024662e..af58cad 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/dmx/TheatricalArtNetClient.java +++ b/common/src/main/java/dev/imabad/theatrical/client/dmx/TheatricalArtNetClient.java @@ -8,8 +8,6 @@ import ch.bildspur.artnet.rdm.RDMPacket; import ch.bildspur.artnet.rdm.RDMParameter; import dev.imabad.theatrical.Constants; -import dev.imabad.theatrical.Theatrical; -import dev.imabad.theatrical.TheatricalClient; import dev.imabad.theatrical.TheatricalExpectPlatform; import dev.imabad.theatrical.api.Fixture; import dev.imabad.theatrical.api.dmx.DMXPersonality; @@ -26,14 +24,11 @@ import io.netty.util.collection.IntObjectHashMap; import io.netty.util.collection.IntObjectMap; import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ServerData; -import org.jetbrains.annotations.Nullable; import java.net.InetAddress; import java.net.SocketException; import java.nio.ByteBuffer; import java.util.*; -import java.util.stream.Collectors; public class TheatricalArtNetClient extends ArtNetClient { private ArtNetManager manager; diff --git a/common/src/main/java/dev/imabad/theatrical/client/gui/screen/ArtNetConfigurationScreen.java b/common/src/main/java/dev/imabad/theatrical/client/gui/screen/ArtNetConfigurationScreen.java index 919368c..bbea499 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/gui/screen/ArtNetConfigurationScreen.java +++ b/common/src/main/java/dev/imabad/theatrical/client/gui/screen/ArtNetConfigurationScreen.java @@ -1,22 +1,15 @@ package dev.imabad.theatrical.client.gui.screen; -import com.mojang.serialization.Codec; -import dev.imabad.theatrical.Theatrical; import dev.imabad.theatrical.TheatricalClient; import dev.imabad.theatrical.client.gui.widgets.ArtNetUniverseConfigurationList; import dev.imabad.theatrical.client.gui.widgets.LabeledEditBox; import dev.imabad.theatrical.config.ConfigHandler; import dev.imabad.theatrical.config.TheatricalConfig; import dev.imabad.theatrical.config.UniverseConfig; -import dev.imabad.theatrical.net.UpdateArtNetInterface; import dev.imabad.theatrical.util.UUIDUtil; import io.netty.util.collection.IntObjectHashMap; import io.netty.util.collection.IntObjectMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectMap; -import it.unimi.dsi.fastutil.ints.Int2ObjectMaps; import net.minecraft.client.Minecraft; -import net.minecraft.client.OptionInstance; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.Checkbox; @@ -25,12 +18,13 @@ import net.minecraft.client.gui.layouts.FrameLayout; import net.minecraft.client.gui.layouts.GridLayout; import net.minecraft.client.gui.layouts.LayoutSettings; -import net.minecraft.client.gui.layouts.LinearLayout; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; -import java.util.*; +import java.util.List; +import java.util.Objects; +import java.util.UUID; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/common/src/main/java/dev/imabad/theatrical/client/gui/screen/ArtNetInterfaceScreen.java b/common/src/main/java/dev/imabad/theatrical/client/gui/screen/ArtNetInterfaceScreen.java index 2a06e70..dbd3f92 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/gui/screen/ArtNetInterfaceScreen.java +++ b/common/src/main/java/dev/imabad/theatrical/client/gui/screen/ArtNetInterfaceScreen.java @@ -4,9 +4,7 @@ import dev.imabad.theatrical.blockentities.interfaces.ArtNetInterfaceBlockEntity; import dev.imabad.theatrical.net.UpdateArtNetInterface; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.EditBox; -import net.minecraft.client.gui.components.Renderable; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; diff --git a/common/src/main/java/dev/imabad/theatrical/client/gui/screen/BasicLightingDeskScreen.java b/common/src/main/java/dev/imabad/theatrical/client/gui/screen/BasicLightingDeskScreen.java index f32bee3..90e3321 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/gui/screen/BasicLightingDeskScreen.java +++ b/common/src/main/java/dev/imabad/theatrical/client/gui/screen/BasicLightingDeskScreen.java @@ -1,6 +1,5 @@ package dev.imabad.theatrical.client.gui.screen; -import com.mojang.blaze3d.systems.RenderSystem; import dev.imabad.theatrical.Theatrical; import dev.imabad.theatrical.TheatricalClient; import dev.imabad.theatrical.blockentities.control.BasicLightingDeskBlockEntity; diff --git a/common/src/main/java/dev/imabad/theatrical/client/gui/screen/ConfigurationCardScreen.java b/common/src/main/java/dev/imabad/theatrical/client/gui/screen/ConfigurationCardScreen.java index fa4f37e..63718cf 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/gui/screen/ConfigurationCardScreen.java +++ b/common/src/main/java/dev/imabad/theatrical/client/gui/screen/ConfigurationCardScreen.java @@ -6,19 +6,15 @@ import dev.imabad.theatrical.client.gui.widgets.BetterStringWidget; import dev.imabad.theatrical.client.gui.widgets.LabeledEditBox; import dev.imabad.theatrical.net.ConfigureConfigurationCard; -import dev.imabad.theatrical.net.UpdateDMXFixture; -import dev.imabad.theatrical.net.UpdateNetworkId; import dev.imabad.theatrical.util.UUIDUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.Checkbox; import net.minecraft.client.gui.components.CycleButton; -import net.minecraft.client.gui.components.StringWidget; import net.minecraft.client.gui.layouts.FrameLayout; import net.minecraft.client.gui.layouts.GridLayout; import net.minecraft.client.gui.layouts.LayoutSettings; -import net.minecraft.client.gui.layouts.LinearLayout; import net.minecraft.client.gui.screens.Screen; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; diff --git a/common/src/main/java/dev/imabad/theatrical/client/gui/screen/FresnelScreen.java b/common/src/main/java/dev/imabad/theatrical/client/gui/screen/FresnelScreen.java index fa34911..1017716 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/gui/screen/FresnelScreen.java +++ b/common/src/main/java/dev/imabad/theatrical/client/gui/screen/FresnelScreen.java @@ -1,21 +1,12 @@ package dev.imabad.theatrical.client.gui.screen; -import dev.imabad.theatrical.Theatrical; import dev.imabad.theatrical.blockentities.light.FresnelBlockEntity; -import dev.imabad.theatrical.blockentities.light.MovingLightBlockEntity; import dev.imabad.theatrical.client.gui.widgets.BasicSlider; -import dev.imabad.theatrical.net.UpdateDMXFixture; import dev.imabad.theatrical.net.UpdateFixturePosition; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.client.gui.components.AbstractSliderButton; -import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.components.StringWidget; import net.minecraft.client.gui.layouts.LayoutSettings; -import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.resources.ResourceLocation; public class FresnelScreen extends GenericDMXConfigurationScreen { private BasicSlider tiltSlider, panSlider; diff --git a/common/src/main/java/dev/imabad/theatrical/client/gui/screen/GenericDMXConfigurationScreen.java b/common/src/main/java/dev/imabad/theatrical/client/gui/screen/GenericDMXConfigurationScreen.java index 0e3b978..b59e4d9 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/gui/screen/GenericDMXConfigurationScreen.java +++ b/common/src/main/java/dev/imabad/theatrical/client/gui/screen/GenericDMXConfigurationScreen.java @@ -3,16 +3,13 @@ import dev.imabad.theatrical.Theatrical; import dev.imabad.theatrical.TheatricalClient; import dev.imabad.theatrical.api.dmx.DMXConsumer; -import dev.imabad.theatrical.blockentities.light.MovingLightBlockEntity; import dev.imabad.theatrical.client.gui.widgets.LabeledEditBox; import dev.imabad.theatrical.net.UpdateDMXFixture; import dev.imabad.theatrical.net.UpdateNetworkId; import dev.imabad.theatrical.util.UUIDUtil; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.CycleButton; -import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.components.StringWidget; import net.minecraft.client.gui.layouts.FrameLayout; import net.minecraft.client.gui.layouts.LinearLayout; diff --git a/common/src/main/java/dev/imabad/theatrical/client/gui/widgets/ArtNetUniverseConfigurationList.java b/common/src/main/java/dev/imabad/theatrical/client/gui/widgets/ArtNetUniverseConfigurationList.java index ef951ab..c48c894 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/gui/widgets/ArtNetUniverseConfigurationList.java +++ b/common/src/main/java/dev/imabad/theatrical/client/gui/widgets/ArtNetUniverseConfigurationList.java @@ -10,10 +10,8 @@ import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.ObjectSelectionList; import net.minecraft.client.gui.layouts.LayoutElement; -import net.minecraft.client.gui.screens.packs.PackSelectionScreen; import net.minecraft.network.chat.Component; -import java.util.List; import java.util.Map; import java.util.function.Consumer; diff --git a/common/src/main/java/dev/imabad/theatrical/client/gui/widgets/BetterCheckbox.java b/common/src/main/java/dev/imabad/theatrical/client/gui/widgets/BetterCheckbox.java index 9b6cdc2..b36da01 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/gui/widgets/BetterCheckbox.java +++ b/common/src/main/java/dev/imabad/theatrical/client/gui/widgets/BetterCheckbox.java @@ -7,7 +7,6 @@ import net.minecraft.client.gui.components.Checkbox; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.Mth; import java.util.function.Consumer; diff --git a/common/src/main/java/dev/imabad/theatrical/client/gui/widgets/FaderWidget.java b/common/src/main/java/dev/imabad/theatrical/client/gui/widgets/FaderWidget.java index 623ff0b..9917e82 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/gui/widgets/FaderWidget.java +++ b/common/src/main/java/dev/imabad/theatrical/client/gui/widgets/FaderWidget.java @@ -2,10 +2,8 @@ import com.mojang.blaze3d.systems.RenderSystem; import dev.imabad.theatrical.Theatrical; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractWidget; -import net.minecraft.client.gui.components.ImageWidget; import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/main/java/dev/imabad/theatrical/client/gui/widgets/LabeledEditBox.java b/common/src/main/java/dev/imabad/theatrical/client/gui/widgets/LabeledEditBox.java index e353f30..7dc1046 100644 --- a/common/src/main/java/dev/imabad/theatrical/client/gui/widgets/LabeledEditBox.java +++ b/common/src/main/java/dev/imabad/theatrical/client/gui/widgets/LabeledEditBox.java @@ -3,13 +3,11 @@ import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; -import net.minecraft.client.gui.components.StringWidget; import net.minecraft.locale.Language; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.FormattedText; import net.minecraft.util.FormattedCharSequence; -import net.minecraft.util.Mth; import org.jetbrains.annotations.Nullable; public class LabeledEditBox extends EditBox { diff --git a/common/src/main/java/dev/imabad/theatrical/commands/MemberRoleArgument.java b/common/src/main/java/dev/imabad/theatrical/commands/MemberRoleArgument.java index 3f7ead4..881f0a1 100644 --- a/common/src/main/java/dev/imabad/theatrical/commands/MemberRoleArgument.java +++ b/common/src/main/java/dev/imabad/theatrical/commands/MemberRoleArgument.java @@ -8,7 +8,6 @@ import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; import dev.imabad.theatrical.dmx.DMXNetworkMemberRole; -import dev.imabad.theatrical.dmx.DMXNetworkMode; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.SharedSuggestionProvider; import net.minecraft.network.chat.Component; diff --git a/common/src/main/java/dev/imabad/theatrical/commands/NetworkCommand.java b/common/src/main/java/dev/imabad/theatrical/commands/NetworkCommand.java index b92d66d..51c2f1b 100644 --- a/common/src/main/java/dev/imabad/theatrical/commands/NetworkCommand.java +++ b/common/src/main/java/dev/imabad/theatrical/commands/NetworkCommand.java @@ -7,7 +7,6 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import dev.imabad.theatrical.dmx.*; -import dev.imabad.theatrical.net.artnet.NotifyNetworks; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.commands.SharedSuggestionProvider; diff --git a/common/src/main/java/dev/imabad/theatrical/config/TheatricalConfig.java b/common/src/main/java/dev/imabad/theatrical/config/TheatricalConfig.java index ff01031..0629e9c 100644 --- a/common/src/main/java/dev/imabad/theatrical/config/TheatricalConfig.java +++ b/common/src/main/java/dev/imabad/theatrical/config/TheatricalConfig.java @@ -3,11 +3,7 @@ import dev.imabad.theatrical.Theatrical; import dev.imabad.theatrical.config.api.TheatricalConfigItem; import io.netty.util.collection.IntObjectHashMap; -import io.netty.util.collection.IntObjectMap; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; import java.util.Map; public class TheatricalConfig { diff --git a/common/src/main/java/dev/imabad/theatrical/dmx/DMXNetwork.java b/common/src/main/java/dev/imabad/theatrical/dmx/DMXNetwork.java index 5967469..77217a8 100644 --- a/common/src/main/java/dev/imabad/theatrical/dmx/DMXNetwork.java +++ b/common/src/main/java/dev/imabad/theatrical/dmx/DMXNetwork.java @@ -5,7 +5,6 @@ import dev.imabad.theatrical.net.artnet.NotifyConsumerChange; import io.netty.util.collection.IntObjectHashMap; import io.netty.util.collection.IntObjectMap; -import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; diff --git a/common/src/main/java/dev/imabad/theatrical/dmx/DMXNetworkData.java b/common/src/main/java/dev/imabad/theatrical/dmx/DMXNetworkData.java index db3ea52..4bb225f 100644 --- a/common/src/main/java/dev/imabad/theatrical/dmx/DMXNetworkData.java +++ b/common/src/main/java/dev/imabad/theatrical/dmx/DMXNetworkData.java @@ -5,12 +5,10 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; -import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.level.saveddata.SavedData; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.*; diff --git a/common/src/main/java/dev/imabad/theatrical/fixtures/LEDFresnelFixture.java b/common/src/main/java/dev/imabad/theatrical/fixtures/LEDFresnelFixture.java index ac7efc6..8f66a87 100644 --- a/common/src/main/java/dev/imabad/theatrical/fixtures/LEDFresnelFixture.java +++ b/common/src/main/java/dev/imabad/theatrical/fixtures/LEDFresnelFixture.java @@ -1,19 +1,14 @@ package dev.imabad.theatrical.fixtures; -import ch.bildspur.artnet.rdm.RDMSlotID; -import ch.bildspur.artnet.rdm.RDMSlotType; import dev.imabad.theatrical.Theatrical; import dev.imabad.theatrical.api.Fixture; import dev.imabad.theatrical.api.HangType; import dev.imabad.theatrical.api.dmx.DMXPersonality; -import dev.imabad.theatrical.api.dmx.DMXSlot; import dev.imabad.theatrical.blocks.light.BaseLightBlock; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.state.BlockState; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/common/src/main/java/dev/imabad/theatrical/mixin/client/ClientMixin.java b/common/src/main/java/dev/imabad/theatrical/mixin/client/ClientMixin.java index b5450b6..e3cd034 100644 --- a/common/src/main/java/dev/imabad/theatrical/mixin/client/ClientMixin.java +++ b/common/src/main/java/dev/imabad/theatrical/mixin/client/ClientMixin.java @@ -3,7 +3,6 @@ import dev.imabad.theatrical.lighting.LightManager; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; -import net.minecraft.world.entity.vehicle.Minecart; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/common/src/main/java/dev/imabad/theatrical/net/OpenScreen.java b/common/src/main/java/dev/imabad/theatrical/net/OpenScreen.java index 153a8b3..135241d 100644 --- a/common/src/main/java/dev/imabad/theatrical/net/OpenScreen.java +++ b/common/src/main/java/dev/imabad/theatrical/net/OpenScreen.java @@ -7,7 +7,6 @@ import dev.imabad.theatrical.TheatricalScreen; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.resources.ResourceLocation; public class OpenScreen extends BaseS2CMessage { diff --git a/common/src/main/java/dev/imabad/theatrical/net/UpdateDMXFixture.java b/common/src/main/java/dev/imabad/theatrical/net/UpdateDMXFixture.java index 8a85056..35906d9 100644 --- a/common/src/main/java/dev/imabad/theatrical/net/UpdateDMXFixture.java +++ b/common/src/main/java/dev/imabad/theatrical/net/UpdateDMXFixture.java @@ -9,8 +9,6 @@ import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.level.block.entity.BlockEntity; -import java.util.UUID; - public class UpdateDMXFixture extends BaseC2SMessage { private BlockPos pos; diff --git a/common/src/main/java/dev/imabad/theatrical/net/UpdateFixturePosition.java b/common/src/main/java/dev/imabad/theatrical/net/UpdateFixturePosition.java index ff3c365..3ffe293 100644 --- a/common/src/main/java/dev/imabad/theatrical/net/UpdateFixturePosition.java +++ b/common/src/main/java/dev/imabad/theatrical/net/UpdateFixturePosition.java @@ -3,7 +3,6 @@ import dev.architectury.networking.NetworkManager; import dev.architectury.networking.simple.BaseC2SMessage; import dev.architectury.networking.simple.MessageType; -import dev.imabad.theatrical.blockentities.light.BaseDMXConsumerLightBlockEntity; import dev.imabad.theatrical.blockentities.light.BaseLightBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; diff --git a/common/src/main/java/dev/imabad/theatrical/net/artnet/ListConsumers.java b/common/src/main/java/dev/imabad/theatrical/net/artnet/ListConsumers.java index 349994e..ca5ea2b 100644 --- a/common/src/main/java/dev/imabad/theatrical/net/artnet/ListConsumers.java +++ b/common/src/main/java/dev/imabad/theatrical/net/artnet/ListConsumers.java @@ -10,7 +10,6 @@ import net.fabricmc.api.EnvType; import net.minecraft.network.FriendlyByteBuf; -import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/dev/imabad/theatrical/net/artnet/NotifyConsumerChange.java b/common/src/main/java/dev/imabad/theatrical/net/artnet/NotifyConsumerChange.java index 40c2f24..ead8e3c 100644 --- a/common/src/main/java/dev/imabad/theatrical/net/artnet/NotifyConsumerChange.java +++ b/common/src/main/java/dev/imabad/theatrical/net/artnet/NotifyConsumerChange.java @@ -8,7 +8,6 @@ import dev.imabad.theatrical.dmx.DMXDevice; import dev.imabad.theatrical.net.TheatricalNet; import net.fabricmc.api.EnvType; -import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; public class NotifyConsumerChange extends BaseS2CMessage { diff --git a/common/src/main/java/dev/imabad/theatrical/net/artnet/NotifyNetworks.java b/common/src/main/java/dev/imabad/theatrical/net/artnet/NotifyNetworks.java index dc5ee83..8e7c8d9 100644 --- a/common/src/main/java/dev/imabad/theatrical/net/artnet/NotifyNetworks.java +++ b/common/src/main/java/dev/imabad/theatrical/net/artnet/NotifyNetworks.java @@ -4,13 +4,10 @@ import dev.architectury.networking.simple.BaseS2CMessage; import dev.architectury.networking.simple.MessageType; import dev.imabad.theatrical.TheatricalClient; -import dev.imabad.theatrical.client.dmx.ArtNetManager; -import dev.imabad.theatrical.dmx.DMXNetwork; import dev.imabad.theatrical.net.TheatricalNet; import net.minecraft.network.FriendlyByteBuf; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.UUID; diff --git a/common/src/main/java/dev/imabad/theatrical/net/artnet/RequestNetworks.java b/common/src/main/java/dev/imabad/theatrical/net/artnet/RequestNetworks.java index ee4bc85..ace771f 100644 --- a/common/src/main/java/dev/imabad/theatrical/net/artnet/RequestNetworks.java +++ b/common/src/main/java/dev/imabad/theatrical/net/artnet/RequestNetworks.java @@ -3,9 +3,6 @@ import dev.architectury.networking.NetworkManager; import dev.architectury.networking.simple.BaseC2SMessage; import dev.architectury.networking.simple.MessageType; -import dev.imabad.theatrical.Theatrical; -import dev.imabad.theatrical.api.dmx.DMXConsumer; -import dev.imabad.theatrical.dmx.DMXDevice; import dev.imabad.theatrical.dmx.DMXNetwork; import dev.imabad.theatrical.dmx.DMXNetworkData; import dev.imabad.theatrical.net.TheatricalNet; @@ -13,7 +10,9 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.Level; -import java.util.*; +import java.util.List; +import java.util.Map; +import java.util.UUID; import java.util.stream.Collectors; public class RequestNetworks extends BaseC2SMessage { diff --git a/fabric/src/main/java/dev/imabad/theatrical/fabric/TheatricalClientFabric.java b/fabric/src/main/java/dev/imabad/theatrical/fabric/TheatricalClientFabric.java index e7aabfd..61cd0e9 100644 --- a/fabric/src/main/java/dev/imabad/theatrical/fabric/TheatricalClientFabric.java +++ b/fabric/src/main/java/dev/imabad/theatrical/fabric/TheatricalClientFabric.java @@ -1,17 +1,12 @@ package dev.imabad.theatrical.fabric; -import dev.architectury.platform.Platform; import dev.imabad.theatrical.TheatricalClient; import dev.imabad.theatrical.api.Fixture; import dev.imabad.theatrical.fixtures.Fixtures; import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry; import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientPacketListener; public class TheatricalClientFabric implements ClientModInitializer { @Override diff --git a/fabric/src/main/java/dev/imabad/theatrical/fabric/TheatricalExpectPlatformImpl.java b/fabric/src/main/java/dev/imabad/theatrical/fabric/TheatricalExpectPlatformImpl.java index 955ae0a..de2cdea 100644 --- a/fabric/src/main/java/dev/imabad/theatrical/fabric/TheatricalExpectPlatformImpl.java +++ b/fabric/src/main/java/dev/imabad/theatrical/fabric/TheatricalExpectPlatformImpl.java @@ -8,8 +8,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityType; import java.nio.file.Path; import java.util.Optional; diff --git a/fabric/src/main/java/dev/imabad/theatrical/fabric/TheatricalFabric.java b/fabric/src/main/java/dev/imabad/theatrical/fabric/TheatricalFabric.java index 083a796..47c5d44 100644 --- a/fabric/src/main/java/dev/imabad/theatrical/fabric/TheatricalFabric.java +++ b/fabric/src/main/java/dev/imabad/theatrical/fabric/TheatricalFabric.java @@ -1,13 +1,7 @@ package dev.imabad.theatrical.fabric; import dev.imabad.theatrical.Theatrical; -import dev.imabad.theatrical.util.ExtServerPlayerGameMode; import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents; -import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; -import net.minecraft.network.protocol.Packet; -import net.minecraft.server.level.ServerPlayer; public class TheatricalFabric implements ModInitializer { @Override diff --git a/forge/src/main/java/dev/imabad/theatrical/forge/TheatricalExpectPlatformImpl.java b/forge/src/main/java/dev/imabad/theatrical/forge/TheatricalExpectPlatformImpl.java index 01fc674..e9bb7be 100644 --- a/forge/src/main/java/dev/imabad/theatrical/forge/TheatricalExpectPlatformImpl.java +++ b/forge/src/main/java/dev/imabad/theatrical/forge/TheatricalExpectPlatformImpl.java @@ -5,16 +5,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.fml.ModContainer; -import net.minecraftforge.fml.ModLoader; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.fml.loading.FMLPaths; import net.minecraftforge.fml.loading.LoadingModList; import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo; import java.nio.file.Path; -import java.util.Optional; public class TheatricalExpectPlatformImpl { /** diff --git a/forge/src/main/java/dev/imabad/theatrical/forge/TheatricalForge.java b/forge/src/main/java/dev/imabad/theatrical/forge/TheatricalForge.java index caea3f4..a1704ca 100644 --- a/forge/src/main/java/dev/imabad/theatrical/forge/TheatricalForge.java +++ b/forge/src/main/java/dev/imabad/theatrical/forge/TheatricalForge.java @@ -1,6 +1,5 @@ package dev.imabad.theatrical.forge; -import dev.architectury.platform.Platform; import dev.architectury.platform.forge.EventBuses; import dev.imabad.theatrical.Theatrical; import dev.imabad.theatrical.TheatricalClient;