diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/GuiBase.java b/RebornCore/src/client/java/reborncore/client/gui/builder/GuiBase.java index db359b3ed..736291d57 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/GuiBase.java +++ b/RebornCore/src/client/java/reborncore/client/gui/builder/GuiBase.java @@ -52,9 +52,9 @@ import reborncore.client.gui.builder.slot.GuiTab; import reborncore.client.gui.builder.slot.SlotConfigGui; import reborncore.client.gui.builder.widget.GuiButtonHologram; import reborncore.client.gui.guibuilder.GuiBuilder; +import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.screen.slot.PlayerInventorySlot; -import reborncore.common.blockentity.MachineBaseBlockEntity; import java.util.ArrayList; import java.util.Collections; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/SlotConfigGui.java b/RebornCore/src/client/java/reborncore/client/gui/builder/slot/SlotConfigGui.java index 1a4abc9ea..31bdebb9b 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/SlotConfigGui.java +++ b/RebornCore/src/client/java/reborncore/client/gui/builder/slot/SlotConfigGui.java @@ -31,16 +31,16 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.screen.slot.Slot; import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; +import reborncore.client.ClientChatUtils; import reborncore.client.gui.GuiUtil; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.slot.elements.ConfigSlotElement; import reborncore.client.gui.builder.slot.elements.ElementBase; import reborncore.client.gui.builder.slot.elements.SlotType; -import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.network.NetworkManager; import reborncore.common.network.ServerBoundPackets; -import reborncore.client.ClientChatUtils; +import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.util.Color; import java.util.Collections; diff --git a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ConfigSlotElement.java b/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ConfigSlotElement.java index c47275dd6..234ad78e6 100644 --- a/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ConfigSlotElement.java +++ b/RebornCore/src/client/java/reborncore/client/gui/builder/slot/elements/ConfigSlotElement.java @@ -34,8 +34,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.text.Text; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.slot.SlotConfigGui; -import reborncore.common.screen.slot.BaseSlot; import reborncore.common.blockentity.SlotConfiguration; +import reborncore.common.screen.slot.BaseSlot; import java.util.ArrayList; import java.util.Arrays; diff --git a/RebornCore/src/client/java/reborncore/client/multiblock/HologramRenderer.java b/RebornCore/src/client/java/reborncore/client/multiblock/HologramRenderer.java index 58b276f62..496fc8e75 100644 --- a/RebornCore/src/client/java/reborncore/client/multiblock/HologramRenderer.java +++ b/RebornCore/src/client/java/reborncore/client/multiblock/HologramRenderer.java @@ -20,7 +20,6 @@ import net.minecraft.world.BlockRenderView; import net.minecraft.world.BlockView; import reborncore.common.blockentity.MultiblockWriter; -import net.minecraft.util.math.random.Random; import java.util.function.BiPredicate; /** diff --git a/RebornCore/src/client/resources/reborncore.client.mixins.json b/RebornCore/src/client/resources/reborncore.client.mixins.json index 9fead01db..d31d2cc9f 100644 --- a/RebornCore/src/client/resources/reborncore.client.mixins.json +++ b/RebornCore/src/client/resources/reborncore.client.mixins.json @@ -3,8 +3,8 @@ "package": "reborncore.client.mixin", "compatibilityLevel": "JAVA_17", "client": [ - "MixinGameRenderer", - "MixinDebugRenderer" + "MixinDebugRenderer", + "MixinGameRenderer" ], "injectors": { "defaultRequire": 1 diff --git a/RebornCore/src/main/java/reborncore/RebornCore.java b/RebornCore/src/main/java/reborncore/RebornCore.java index 9f9cb10cc..2b560bfd8 100644 --- a/RebornCore/src/main/java/reborncore/RebornCore.java +++ b/RebornCore/src/main/java/reborncore/RebornCore.java @@ -53,9 +53,7 @@ import reborncore.common.util.CalenderUtils; import reborncore.common.util.GenericWrenchHelper; import team.reborn.energy.api.EnergyStorage; -import java.io.File; import java.util.Locale; -import java.util.function.Supplier; public class RebornCore implements ModInitializer { public static final String MOD_NAME = "Reborn Core"; diff --git a/RebornCore/src/main/java/reborncore/common/network/ExtendedPacketBuffer.java b/RebornCore/src/main/java/reborncore/common/network/ExtendedPacketBuffer.java index 194f22ece..32de22eb1 100644 --- a/RebornCore/src/main/java/reborncore/common/network/ExtendedPacketBuffer.java +++ b/RebornCore/src/main/java/reborncore/common/network/ExtendedPacketBuffer.java @@ -33,12 +33,6 @@ import net.minecraft.nbt.NbtList; import net.minecraft.nbt.NbtOps; import net.minecraft.network.PacketByteBuf; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.math.BigInteger; - public class ExtendedPacketBuffer extends PacketByteBuf { public ExtendedPacketBuffer(ByteBuf wrapped) { super(wrapped); diff --git a/RebornCore/src/main/java/reborncore/common/network/ObjectBufferUtils.java b/RebornCore/src/main/java/reborncore/common/network/ObjectBufferUtils.java index 08af9e797..c6e220493 100644 --- a/RebornCore/src/main/java/reborncore/common/network/ObjectBufferUtils.java +++ b/RebornCore/src/main/java/reborncore/common/network/ObjectBufferUtils.java @@ -30,7 +30,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import reborncore.common.fluid.FluidValue; -import java.math.BigInteger; import java.util.Arrays; import java.util.Objects; diff --git a/RebornCore/src/main/java/reborncore/common/screen/BuiltScreenHandlerProvider.java b/RebornCore/src/main/java/reborncore/common/screen/BuiltScreenHandlerProvider.java index d4a23c618..8b60eb975 100644 --- a/RebornCore/src/main/java/reborncore/common/screen/BuiltScreenHandlerProvider.java +++ b/RebornCore/src/main/java/reborncore/common/screen/BuiltScreenHandlerProvider.java @@ -25,7 +25,6 @@ package reborncore.common.screen; import net.minecraft.entity.player.PlayerEntity; -import reborncore.common.screen.BuiltScreenHandler; public interface BuiltScreenHandlerProvider { BuiltScreenHandler createScreenHandler(int syncID, PlayerEntity player); diff --git a/RebornCore/src/main/java/reborncore/common/util/ColoredItem.java b/RebornCore/src/main/java/reborncore/common/util/ColoredItem.java index f1f4e3533..387cae3dc 100644 --- a/RebornCore/src/main/java/reborncore/common/util/ColoredItem.java +++ b/RebornCore/src/main/java/reborncore/common/util/ColoredItem.java @@ -7,7 +7,6 @@ import org.apache.commons.lang3.tuple.Pair; import java.util.Map; import java.util.Objects; -import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/RebornCore/src/main/java/reborncore/common/util/ItemUtils.java b/RebornCore/src/main/java/reborncore/common/util/ItemUtils.java index 444d668ef..92fadae7c 100644 --- a/RebornCore/src/main/java/reborncore/common/util/ItemUtils.java +++ b/RebornCore/src/main/java/reborncore/common/util/ItemUtils.java @@ -34,7 +34,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; -import net.minecraft.text.Text; import net.minecraft.util.Formatting; import reborncore.common.powerSystem.RcEnergyItem; import reborncore.common.recipes.IRecipeInput; diff --git a/RebornCore/src/main/java/reborncore/common/util/WorldUtils.java b/RebornCore/src/main/java/reborncore/common/util/WorldUtils.java index af79eb35d..2ed4d0293 100644 --- a/RebornCore/src/main/java/reborncore/common/util/WorldUtils.java +++ b/RebornCore/src/main/java/reborncore/common/util/WorldUtils.java @@ -31,10 +31,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkSectionPos; import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.random.Random; import net.minecraft.world.World; import java.util.List; -import net.minecraft.util.math.random.Random; /** * Created by Mark on 13/03/2016. diff --git a/src/client/java/techreborn/TechRebornClient.java b/src/client/java/techreborn/TechRebornClient.java index a3aea165d..a6aeaed42 100644 --- a/src/client/java/techreborn/TechRebornClient.java +++ b/src/client/java/techreborn/TechRebornClient.java @@ -57,12 +57,12 @@ import reborncore.common.util.ItemUtils; import team.reborn.energy.api.base.SimpleBatteryItem; import techreborn.client.ClientGuiType; import techreborn.client.ClientboundPacketHandlers; +import techreborn.client.events.StackToolTipHandler; import techreborn.client.render.DynamicBucketBakedModel; import techreborn.client.render.DynamicCellBakedModel; import techreborn.client.render.entitys.CableCoverRenderer; import techreborn.client.render.entitys.StorageUnitRenderer; import techreborn.client.render.entitys.TurbineRenderer; -import techreborn.client.events.StackToolTipHandler; import techreborn.init.ModFluids; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; diff --git a/src/client/java/techreborn/client/compat/rei/ReiPlugin.java b/src/client/java/techreborn/client/compat/rei/ReiPlugin.java index 82dc4c322..ce76f9ec3 100644 --- a/src/client/java/techreborn/client/compat/rei/ReiPlugin.java +++ b/src/client/java/techreborn/client/compat/rei/ReiPlugin.java @@ -76,10 +76,10 @@ import techreborn.api.generator.GeneratorRecipeHelper; import techreborn.api.recipe.recipes.FluidReplicatorRecipe; import techreborn.api.recipe.recipes.RollingMachineRecipe; import techreborn.client.compat.rei.fluidgenerator.FluidGeneratorRecipeCategory; -import techreborn.client.compat.rei.machine.*; import techreborn.client.compat.rei.fluidgenerator.FluidGeneratorRecipeDisplay; import techreborn.client.compat.rei.fluidreplicator.FluidReplicatorRecipeCategory; import techreborn.client.compat.rei.fluidreplicator.FluidReplicatorRecipeDisplay; +import techreborn.client.compat.rei.machine.*; import techreborn.client.compat.rei.rollingmachine.RollingMachineCategory; import techreborn.client.compat.rei.rollingmachine.RollingMachineDisplay; import techreborn.init.ModRecipes; diff --git a/src/client/java/techreborn/client/events/ToolTipAssistUtils.java b/src/client/java/techreborn/client/events/ToolTipAssistUtils.java index ad8374187..504259c6a 100644 --- a/src/client/java/techreborn/client/events/ToolTipAssistUtils.java +++ b/src/client/java/techreborn/client/events/ToolTipAssistUtils.java @@ -27,7 +27,6 @@ package techreborn.client.events; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.resource.language.I18n; import net.minecraft.text.Text; -import net.minecraft.text.Text; import net.minecraft.util.Formatting; import techreborn.config.TechRebornConfig; import techreborn.init.TRContent; diff --git a/src/client/java/techreborn/client/gui/GuiAESU.java b/src/client/java/techreborn/client/gui/GuiAESU.java index 4bd7e2ff9..a1b9b5690 100644 --- a/src/client/java/techreborn/client/gui/GuiAESU.java +++ b/src/client/java/techreborn/client/gui/GuiAESU.java @@ -24,16 +24,15 @@ package techreborn.client.gui; -import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonUpDown; import reborncore.client.gui.builder.widget.GuiButtonUpDown.UpDownButtonType; -import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.network.NetworkManager; import reborncore.common.powerSystem.PowerSystem; +import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.storage.energy.AdjustableSUBlockEntity; import techreborn.packets.ServerboundPackets; diff --git a/src/client/java/techreborn/client/gui/GuiAutoCrafting.java b/src/client/java/techreborn/client/gui/GuiAutoCrafting.java index a1c1d67af..a005befa7 100644 --- a/src/client/java/techreborn/client/gui/GuiAutoCrafting.java +++ b/src/client/java/techreborn/client/gui/GuiAutoCrafting.java @@ -32,8 +32,8 @@ import net.minecraft.recipe.CraftingRecipe; import net.minecraft.util.Identifier; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; -import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.network.NetworkManager; +import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.AutoCraftingTableBlockEntity; import techreborn.packets.ServerboundPackets; diff --git a/src/client/java/techreborn/client/gui/GuiBatbox.java b/src/client/java/techreborn/client/gui/GuiBatbox.java index 4b4d43873..4ea361a23 100644 --- a/src/client/java/techreborn/client/gui/GuiBatbox.java +++ b/src/client/java/techreborn/client/gui/GuiBatbox.java @@ -28,8 +28,8 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import reborncore.client.gui.builder.GuiBase; -import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.powerSystem.PowerSystem; +import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.storage.energy.LowVoltageSUBlockEntity; public class GuiBatbox extends GuiBase { diff --git a/src/client/java/techreborn/client/gui/GuiChunkLoader.java b/src/client/java/techreborn/client/gui/GuiChunkLoader.java index bbfa18fe1..38625b204 100644 --- a/src/client/java/techreborn/client/gui/GuiChunkLoader.java +++ b/src/client/java/techreborn/client/gui/GuiChunkLoader.java @@ -32,8 +32,8 @@ import reborncore.client.ClientChunkManager; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonUpDown; import reborncore.client.gui.builder.widget.GuiButtonUpDown.UpDownButtonType; -import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.network.NetworkManager; +import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier3.ChunkLoaderBlockEntity; import techreborn.packets.ServerboundPackets; diff --git a/src/client/java/techreborn/client/gui/GuiIDSU.java b/src/client/java/techreborn/client/gui/GuiIDSU.java index 1572bb4fd..ee9954fc1 100644 --- a/src/client/java/techreborn/client/gui/GuiIDSU.java +++ b/src/client/java/techreborn/client/gui/GuiIDSU.java @@ -28,8 +28,8 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import reborncore.client.gui.builder.GuiBase; -import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.powerSystem.PowerSystem; +import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.storage.energy.idsu.InterdimensionalSUBlockEntity; public class GuiIDSU extends GuiBase { diff --git a/src/client/java/techreborn/client/gui/GuiIronFurnace.java b/src/client/java/techreborn/client/gui/GuiIronFurnace.java index 236ff5c82..0db954dfd 100644 --- a/src/client/java/techreborn/client/gui/GuiIronFurnace.java +++ b/src/client/java/techreborn/client/gui/GuiIronFurnace.java @@ -33,8 +33,8 @@ import net.minecraft.text.Text; import net.minecraft.util.Identifier; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; -import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.network.NetworkManager; +import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.iron.IronFurnaceBlockEntity; import techreborn.packets.ServerboundPackets; import techreborn.utils.PlayerUtils; diff --git a/src/client/java/techreborn/client/gui/GuiLESU.java b/src/client/java/techreborn/client/gui/GuiLESU.java index be1fcc76d..450350f4f 100644 --- a/src/client/java/techreborn/client/gui/GuiLESU.java +++ b/src/client/java/techreborn/client/gui/GuiLESU.java @@ -28,8 +28,8 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import reborncore.client.gui.builder.GuiBase; -import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.powerSystem.PowerSystem; +import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.storage.energy.lesu.LapotronicSUBlockEntity; public class GuiLESU extends GuiBase { diff --git a/src/client/java/techreborn/client/gui/GuiMFE.java b/src/client/java/techreborn/client/gui/GuiMFE.java index a4b6e2b30..3c168adab 100644 --- a/src/client/java/techreborn/client/gui/GuiMFE.java +++ b/src/client/java/techreborn/client/gui/GuiMFE.java @@ -28,8 +28,8 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import reborncore.client.gui.builder.GuiBase; -import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.powerSystem.PowerSystem; +import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.storage.energy.MediumVoltageSUBlockEntity; public class GuiMFE extends GuiBase { diff --git a/src/client/java/techreborn/client/gui/GuiMFSU.java b/src/client/java/techreborn/client/gui/GuiMFSU.java index b3625eb18..885dcf624 100644 --- a/src/client/java/techreborn/client/gui/GuiMFSU.java +++ b/src/client/java/techreborn/client/gui/GuiMFSU.java @@ -28,8 +28,8 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import reborncore.client.gui.builder.GuiBase; -import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.powerSystem.PowerSystem; +import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.storage.energy.HighVoltageSUBlockEntity; public class GuiMFSU extends GuiBase { diff --git a/src/client/java/techreborn/client/gui/GuiPlayerDetector.java b/src/client/java/techreborn/client/gui/GuiPlayerDetector.java index c53735913..ba95050d5 100644 --- a/src/client/java/techreborn/client/gui/GuiPlayerDetector.java +++ b/src/client/java/techreborn/client/gui/GuiPlayerDetector.java @@ -29,8 +29,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonUpDown; -import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.network.NetworkManager; +import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.PlayerDetectorBlockEntity; import techreborn.packets.ServerboundPackets; diff --git a/src/client/java/techreborn/client/gui/GuiRollingMachine.java b/src/client/java/techreborn/client/gui/GuiRollingMachine.java index 2b60de4d6..5e4475060 100644 --- a/src/client/java/techreborn/client/gui/GuiRollingMachine.java +++ b/src/client/java/techreborn/client/gui/GuiRollingMachine.java @@ -28,8 +28,8 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; -import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.network.NetworkManager; +import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.machine.tier1.RollingMachineBlockEntity; import techreborn.packets.ServerboundPackets; diff --git a/src/client/java/techreborn/client/gui/GuiStorageUnit.java b/src/client/java/techreborn/client/gui/GuiStorageUnit.java index f5c373253..08d88d9be 100644 --- a/src/client/java/techreborn/client/gui/GuiStorageUnit.java +++ b/src/client/java/techreborn/client/gui/GuiStorageUnit.java @@ -28,8 +28,8 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import reborncore.client.gui.builder.GuiBase; -import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.network.NetworkManager; +import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.storage.item.StorageUnitBaseBlockEntity; import techreborn.packets.ServerboundPackets; diff --git a/src/client/java/techreborn/client/gui/GuiTankUnit.java b/src/client/java/techreborn/client/gui/GuiTankUnit.java index a466e9e9e..dfad4b89c 100644 --- a/src/client/java/techreborn/client/gui/GuiTankUnit.java +++ b/src/client/java/techreborn/client/gui/GuiTankUnit.java @@ -28,9 +28,9 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.Text; import reborncore.client.gui.builder.GuiBase; -import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.fluid.FluidUtils; import reborncore.common.fluid.container.FluidInstance; +import reborncore.common.screen.BuiltScreenHandler; import techreborn.blockentity.storage.fluid.TankUnitBaseBlockEntity; public class GuiTankUnit extends GuiBase { diff --git a/src/client/java/techreborn/client/render/entitys/CableCoverRenderer.java b/src/client/java/techreborn/client/render/entitys/CableCoverRenderer.java index 3b854d7c8..1cbd2677d 100644 --- a/src/client/java/techreborn/client/render/entitys/CableCoverRenderer.java +++ b/src/client/java/techreborn/client/render/entitys/CableCoverRenderer.java @@ -38,8 +38,6 @@ import net.minecraft.util.math.random.Random; import techreborn.blockentity.cable.CableBlockEntity; import techreborn.blocks.cable.CableBlock; -import net.minecraft.util.math.random.Random; - public class CableCoverRenderer implements BlockEntityRenderer { public CableCoverRenderer(BlockEntityRendererFactory.Context ctx) { diff --git a/src/datagen/groovy/techreborn/datagen/TechRebornDataGen.groovy b/src/datagen/groovy/techreborn/datagen/TechRebornDataGen.groovy index 07c755195..91c897d6b 100644 --- a/src/datagen/groovy/techreborn/datagen/TechRebornDataGen.groovy +++ b/src/datagen/groovy/techreborn/datagen/TechRebornDataGen.groovy @@ -26,6 +26,7 @@ package techreborn.datagen import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator +import techreborn.datagen.recipes.crafting.CraftingRecipesProvider import techreborn.datagen.recipes.machine.assembling_machine.AssemblingMachineRecipesProvider import techreborn.datagen.recipes.machine.blast_furnace.BlastFurnaceRecipesProvider import techreborn.datagen.recipes.machine.chemical_reactor.ChemicalReactorRecipesProvider @@ -35,7 +36,6 @@ import techreborn.datagen.recipes.machine.grinder.GrinderRecipesProvider import techreborn.datagen.recipes.machine.industrial_grinder.IndustrialGrinderRecipesProvider import techreborn.datagen.recipes.machine.industrial_sawmill.IndustrialSawmillRecipesProvider import techreborn.datagen.recipes.smelting.SmeltingRecipesProvider -import techreborn.datagen.recipes.crafting.CraftingRecipesProvider import techreborn.datagen.tags.TRBlockTagProvider import techreborn.datagen.tags.TRItemTagProvider import techreborn.datagen.tags.WaterExplosionTagProvider diff --git a/src/datagen/groovy/techreborn/datagen/recipes/TechRebornRecipesProvider.groovy b/src/datagen/groovy/techreborn/datagen/recipes/TechRebornRecipesProvider.groovy index cbab01d1c..7c398e27c 100644 --- a/src/datagen/groovy/techreborn/datagen/recipes/TechRebornRecipesProvider.groovy +++ b/src/datagen/groovy/techreborn/datagen/recipes/TechRebornRecipesProvider.groovy @@ -33,7 +33,6 @@ import net.minecraft.recipe.Ingredient import net.minecraft.tag.TagKey import net.minecraft.util.Identifier import techreborn.datagen.recipes.machine.MachineRecipeJsonFactory -import techreborn.datagen.recipes.machine.MachineRecipeWithFluidJsonFactory import techreborn.datagen.recipes.machine.blast_furnace.BlastFurnaceRecipeJsonFactory import techreborn.datagen.recipes.machine.industrial_grinder.IndustrialGrinderRecipeJsonFactory import techreborn.datagen.recipes.machine.industrial_sawmill.IndustrialSawmillRecipeJsonFactory diff --git a/src/datagen/groovy/techreborn/datagen/recipes/machine/MachineRecipeJsonFactory.groovy b/src/datagen/groovy/techreborn/datagen/recipes/machine/MachineRecipeJsonFactory.groovy index 45d9b1ea8..5a13436a2 100644 --- a/src/datagen/groovy/techreborn/datagen/recipes/machine/MachineRecipeJsonFactory.groovy +++ b/src/datagen/groovy/techreborn/datagen/recipes/machine/MachineRecipeJsonFactory.groovy @@ -30,7 +30,6 @@ import net.minecraft.advancement.criterion.CriterionConditions import net.minecraft.data.server.recipe.RecipeJsonProvider import net.minecraft.item.ItemConvertible import net.minecraft.item.ItemStack -import net.minecraft.recipe.Ingredient import net.minecraft.recipe.RecipeSerializer import net.minecraft.tag.TagKey import net.minecraft.util.Identifier diff --git a/src/datagen/groovy/techreborn/datagen/recipes/machine/extractor/ExtractorRecipesProvider.groovy b/src/datagen/groovy/techreborn/datagen/recipes/machine/extractor/ExtractorRecipesProvider.groovy index 574dca210..56e6fe1ed 100644 --- a/src/datagen/groovy/techreborn/datagen/recipes/machine/extractor/ExtractorRecipesProvider.groovy +++ b/src/datagen/groovy/techreborn/datagen/recipes/machine/extractor/ExtractorRecipesProvider.groovy @@ -27,9 +27,6 @@ package techreborn.datagen.recipes.machine.extractor import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator import net.minecraft.item.ItemStack import net.minecraft.item.Items -import net.minecraft.tag.TagKey -import net.minecraft.util.Identifier -import net.minecraft.util.registry.Registry import techreborn.datagen.recipes.TechRebornRecipesProvider import techreborn.init.TRContent diff --git a/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_grinder/IndustrialGrinderRecipeJsonFactory.groovy b/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_grinder/IndustrialGrinderRecipeJsonFactory.groovy index 66777cc8b..007a6d027 100644 --- a/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_grinder/IndustrialGrinderRecipeJsonFactory.groovy +++ b/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_grinder/IndustrialGrinderRecipeJsonFactory.groovy @@ -1,12 +1,9 @@ package techreborn.datagen.recipes.machine.industrial_grinder - import net.minecraft.util.Identifier import reborncore.common.fluid.FluidValue import reborncore.common.fluid.container.FluidInstance import techreborn.api.recipe.recipes.IndustrialGrinderRecipe -import techreborn.api.recipe.recipes.IndustrialSawmillRecipe -import techreborn.datagen.recipes.machine.MachineRecipeJsonFactory import techreborn.datagen.recipes.machine.MachineRecipeWithFluidJsonFactory import techreborn.init.ModRecipes diff --git a/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_sawmill/IndustrialSawmillRecipeJsonFactory.groovy b/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_sawmill/IndustrialSawmillRecipeJsonFactory.groovy index f8b7f88c4..519c48495 100644 --- a/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_sawmill/IndustrialSawmillRecipeJsonFactory.groovy +++ b/src/datagen/groovy/techreborn/datagen/recipes/machine/industrial_sawmill/IndustrialSawmillRecipeJsonFactory.groovy @@ -1,15 +1,10 @@ package techreborn.datagen.recipes.machine.industrial_sawmill -import net.minecraft.fluid.Fluid -import net.minecraft.fluid.Fluids + import net.minecraft.util.Identifier -import reborncore.common.crafting.RebornFluidRecipe -import reborncore.common.crafting.RebornRecipe -import reborncore.common.crafting.RebornRecipeType import reborncore.common.fluid.FluidValue import reborncore.common.fluid.container.FluidInstance import techreborn.api.recipe.recipes.IndustrialSawmillRecipe -import techreborn.datagen.recipes.machine.MachineRecipeJsonFactory import techreborn.datagen.recipes.machine.MachineRecipeWithFluidJsonFactory import techreborn.init.ModRecipes diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index bb16be8c1..ea9481bd6 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -33,8 +33,8 @@ import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; -import org.slf4j.LoggerFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import reborncore.common.blockentity.RedstoneConfiguration; import reborncore.common.config.Configuration; import reborncore.common.recipes.RecipeCrafter; diff --git a/src/main/java/techreborn/blockentity/GuiType.java b/src/main/java/techreborn/blockentity/GuiType.java index ad28ec92b..1356fdbeb 100644 --- a/src/main/java/techreborn/blockentity/GuiType.java +++ b/src/main/java/techreborn/blockentity/GuiType.java @@ -34,7 +34,6 @@ import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; -import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java b/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java index 5efc76c27..ed903f219 100644 --- a/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java +++ b/src/main/java/techreborn/blockentity/cable/CableBlockEntity.java @@ -36,8 +36,6 @@ import net.minecraft.nbt.NbtHelper; import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; import net.minecraft.server.world.ServerWorld; import net.minecraft.text.Text; -import net.minecraft.text.Text; -import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; diff --git a/src/main/java/techreborn/blockentity/cable/CableTickManager.java b/src/main/java/techreborn/blockentity/cable/CableTickManager.java index 97b6d36ab..5a0378654 100644 --- a/src/main/java/techreborn/blockentity/cable/CableTickManager.java +++ b/src/main/java/techreborn/blockentity/cable/CableTickManager.java @@ -27,17 +27,11 @@ package techreborn.blockentity.cable; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; import net.minecraft.server.world.ServerWorld; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import team.reborn.energy.api.EnergyStorage; import techreborn.init.TRContent; -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Deque; -import java.util.List; +import java.util.*; @SuppressWarnings("UnstableApiUsage") class CableTickManager { diff --git a/src/main/java/techreborn/blockentity/data/DataDrivenBEProvider.java b/src/main/java/techreborn/blockentity/data/DataDrivenBEProvider.java index c83697449..519ecef06 100644 --- a/src/main/java/techreborn/blockentity/data/DataDrivenBEProvider.java +++ b/src/main/java/techreborn/blockentity/data/DataDrivenBEProvider.java @@ -40,10 +40,10 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.text.WordUtils; import org.jetbrains.annotations.Nullable; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.crafting.RebornRecipeType; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; import reborncore.common.screen.builder.BlockEntityScreenHandlerBuilder; import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; diff --git a/src/main/java/techreborn/blockentity/generator/PlasmaGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/PlasmaGeneratorBlockEntity.java index 030c3a502..6b06c56f7 100644 --- a/src/main/java/techreborn/blockentity/generator/PlasmaGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/PlasmaGeneratorBlockEntity.java @@ -28,10 +28,10 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.fluid.FluidValue; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import techreborn.api.generator.EFluidGenerator; import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; diff --git a/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java b/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java index a06465f77..411728e9e 100644 --- a/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/SolarPanelBlockEntity.java @@ -24,7 +24,6 @@ package techreborn.blockentity.generator; -import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; @@ -37,20 +36,22 @@ import net.minecraft.util.math.Direction; import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; import reborncore.api.IToolDrop; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.RcEnergyTier; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.StringUtils; import techreborn.blocks.generator.BlockSolarPanel; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; import techreborn.init.TRContent.SolarPanels; +import java.util.List; + public class SolarPanelBlockEntity extends PowerAcceptorBlockEntity implements IToolDrop, BuiltScreenHandlerProvider { private boolean generating = false; diff --git a/src/main/java/techreborn/blockentity/generator/advanced/DieselGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/advanced/DieselGeneratorBlockEntity.java index 87851e718..dc9a77060 100644 --- a/src/main/java/techreborn/blockentity/generator/advanced/DieselGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/advanced/DieselGeneratorBlockEntity.java @@ -28,9 +28,9 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.fluid.FluidValue; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; import reborncore.common.screen.builder.ScreenHandlerBuilder; import techreborn.api.generator.EFluidGenerator; import techreborn.blockentity.generator.BaseFluidGeneratorBlockEntity; diff --git a/src/main/java/techreborn/blockentity/generator/advanced/GasTurbineBlockEntity.java b/src/main/java/techreborn/blockentity/generator/advanced/GasTurbineBlockEntity.java index 9f5b5477d..a7bdb5b15 100644 --- a/src/main/java/techreborn/blockentity/generator/advanced/GasTurbineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/advanced/GasTurbineBlockEntity.java @@ -28,10 +28,10 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.fluid.FluidValue; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import techreborn.api.generator.EFluidGenerator; import techreborn.blockentity.generator.BaseFluidGeneratorBlockEntity; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/generator/advanced/SemiFluidGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/advanced/SemiFluidGeneratorBlockEntity.java index b348ec4f5..d2da3adc5 100644 --- a/src/main/java/techreborn/blockentity/generator/advanced/SemiFluidGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/advanced/SemiFluidGeneratorBlockEntity.java @@ -28,10 +28,10 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.fluid.FluidValue; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import techreborn.api.generator.EFluidGenerator; import techreborn.blockentity.generator.BaseFluidGeneratorBlockEntity; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/generator/advanced/ThermalGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/advanced/ThermalGeneratorBlockEntity.java index a52ba9586..63283eeba 100644 --- a/src/main/java/techreborn/blockentity/generator/advanced/ThermalGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/advanced/ThermalGeneratorBlockEntity.java @@ -28,10 +28,10 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.fluid.FluidValue; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import techreborn.api.generator.EFluidGenerator; import techreborn.blockentity.generator.BaseFluidGeneratorBlockEntity; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java b/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java index 623cfdd28..630bbeebe 100644 --- a/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/basic/SolidFuelGeneratorBlockEntity.java @@ -39,12 +39,12 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; diff --git a/src/main/java/techreborn/blockentity/generator/basic/WaterMillBlockEntity.java b/src/main/java/techreborn/blockentity/generator/basic/WaterMillBlockEntity.java index 1b92d2485..65d9bb6e0 100644 --- a/src/main/java/techreborn/blockentity/generator/basic/WaterMillBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/basic/WaterMillBlockEntity.java @@ -36,7 +36,6 @@ import reborncore.api.IToolDrop; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; - import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/blockentity/generator/basic/WindMillBlockEntity.java b/src/main/java/techreborn/blockentity/generator/basic/WindMillBlockEntity.java index 2d4400956..e3f2a86ea 100644 --- a/src/main/java/techreborn/blockentity/generator/basic/WindMillBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/basic/WindMillBlockEntity.java @@ -34,7 +34,6 @@ import org.jetbrains.annotations.Nullable; import reborncore.api.IToolDrop; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; - import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java index 1d8ced0d0..04d051127 100644 --- a/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java @@ -28,11 +28,11 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.ingredient.RebornIngredient; import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.config.TechRebornConfig; import techreborn.init.ModRecipes; diff --git a/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java index b787b69a9..8442ce1bd 100644 --- a/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/iron/IronFurnaceBlockEntity.java @@ -35,9 +35,9 @@ import net.minecraft.recipe.RecipeType; import net.minecraft.recipe.SmeltingRecipe; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; diff --git a/src/main/java/techreborn/blockentity/machine/misc/ChargeOMatBlockEntity.java b/src/main/java/techreborn/blockentity/machine/misc/ChargeOMatBlockEntity.java index 17e4a50c8..16da837b2 100644 --- a/src/main/java/techreborn/blockentity/machine/misc/ChargeOMatBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/misc/ChargeOMatBlockEntity.java @@ -33,11 +33,11 @@ import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/DistillationTowerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/DistillationTowerBlockEntity.java index bd843f5a8..1627d80d4 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/DistillationTowerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/DistillationTowerBlockEntity.java @@ -28,12 +28,12 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MultiblockWriter; import reborncore.common.crafting.RebornRecipe; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java index 1c5a791e7..7f31e9730 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/FluidReplicatorBlockEntity.java @@ -32,13 +32,14 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.blockentity.MultiblockWriter; +import reborncore.common.fluid.FluidUtils; import reborncore.common.fluid.FluidValue; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.IInventoryAccess; import reborncore.common.util.RebornInventory; import reborncore.common.util.Tank; @@ -47,7 +48,6 @@ import techreborn.config.TechRebornConfig; import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -import reborncore.common.fluid.FluidUtils; /** * @author drcrazy diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java index e0332ec51..8d5c81095 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/FusionControlComputerBlockEntity.java @@ -35,13 +35,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.blockentity.MultiblockWriter; import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.ingredient.RebornIngredient; import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.ItemUtils; import reborncore.common.util.RebornInventory; import reborncore.common.util.StringUtils; diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/ImplosionCompressorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/ImplosionCompressorBlockEntity.java index 09a05882a..c2aba4bc3 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/ImplosionCompressorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/ImplosionCompressorBlockEntity.java @@ -28,12 +28,12 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MultiblockWriter; import reborncore.common.crafting.RebornRecipe; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialBlastFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialBlastFurnaceBlockEntity.java index 28990e4be..494038e1d 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialBlastFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialBlastFurnaceBlockEntity.java @@ -32,12 +32,12 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.BlockView; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MultiblockWriter; import reborncore.common.multiblock.IMultiblockPart; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; import techreborn.blockentity.machine.multiblock.casing.MachineCasingBlockEntity; diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java index 9e7e96dd0..a01fd4b55 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialGrinderBlockEntity.java @@ -33,13 +33,14 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.blockentity.MultiblockWriter; +import reborncore.common.fluid.FluidUtils; import reborncore.common.fluid.FluidValue; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import reborncore.common.util.Tank; import techreborn.blockentity.machine.GenericMachineBlockEntity; @@ -47,7 +48,6 @@ import techreborn.config.TechRebornConfig; import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -import reborncore.common.fluid.FluidUtils; public class IndustrialGrinderBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java index 146f94be0..67859cb4c 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/IndustrialSawmillBlockEntity.java @@ -33,13 +33,14 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.blockentity.MultiblockWriter; +import reborncore.common.fluid.FluidUtils; import reborncore.common.fluid.FluidValue; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import reborncore.common.util.Tank; import techreborn.blockentity.machine.GenericMachineBlockEntity; @@ -47,7 +48,6 @@ import techreborn.config.TechRebornConfig; import techreborn.init.ModRecipes; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -import reborncore.common.fluid.FluidUtils; public class IndustrialSawmillBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider { diff --git a/src/main/java/techreborn/blockentity/machine/multiblock/VacuumFreezerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/multiblock/VacuumFreezerBlockEntity.java index 3d72d1aff..130d65b95 100644 --- a/src/main/java/techreborn/blockentity/machine/multiblock/VacuumFreezerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/multiblock/VacuumFreezerBlockEntity.java @@ -28,12 +28,12 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MultiblockWriter; import reborncore.common.crafting.RebornRecipe; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/machine/tier0/block/AbstractBlockBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier0/block/AbstractBlockBlockEntity.java index e27c1a3d7..11f2f6198 100644 --- a/src/main/java/techreborn/blockentity/machine/tier0/block/AbstractBlockBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier0/block/AbstractBlockBlockEntity.java @@ -8,12 +8,12 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.NbtCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import reborncore.common.screen.builder.BlockEntityScreenHandlerBuilder; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.BlockEntityScreenHandlerBuilder; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import techreborn.blockentity.machine.GenericMachineBlockEntity; public class AbstractBlockBlockEntity extends GenericMachineBlockEntity implements BuiltScreenHandlerProvider, BlockProcessable { diff --git a/src/main/java/techreborn/blockentity/machine/tier0/block/BlockBreakerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier0/block/BlockBreakerBlockEntity.java index 7c270e09c..c20e9cb42 100644 --- a/src/main/java/techreborn/blockentity/machine/tier0/block/BlockBreakerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier0/block/BlockBreakerBlockEntity.java @@ -27,10 +27,10 @@ package techreborn.blockentity.machine.tier0.block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.builder.BlockEntityScreenHandlerBuilder; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.BlockEntityScreenHandlerBuilder; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.tier0.block.blockbreaker.BlockBreakerProcessor; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/machine/tier0/block/BlockPlacerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier0/block/BlockPlacerBlockEntity.java index 75f8a3755..04fe233bd 100644 --- a/src/main/java/techreborn/blockentity/machine/tier0/block/BlockPlacerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier0/block/BlockPlacerBlockEntity.java @@ -27,10 +27,10 @@ package techreborn.blockentity.machine.tier0.block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.builder.BlockEntityScreenHandlerBuilder; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.BlockEntityScreenHandlerBuilder; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.tier0.block.blockplacer.BlockPlacerProcessor; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/machine/tier0/block/ProcessingStatus.java b/src/main/java/techreborn/blockentity/machine/tier0/block/ProcessingStatus.java index 502e3bec3..cd7840611 100644 --- a/src/main/java/techreborn/blockentity/machine/tier0/block/ProcessingStatus.java +++ b/src/main/java/techreborn/blockentity/machine/tier0/block/ProcessingStatus.java @@ -1,6 +1,5 @@ package techreborn.blockentity.machine.tier0.block; -import net.minecraft.text.Text; import net.minecraft.text.Text; /** diff --git a/src/main/java/techreborn/blockentity/machine/tier0/block/blockbreaker/BlockBreakerStatus.java b/src/main/java/techreborn/blockentity/machine/tier0/block/blockbreaker/BlockBreakerStatus.java index 03174b3b9..b1d6cda10 100644 --- a/src/main/java/techreborn/blockentity/machine/tier0/block/blockbreaker/BlockBreakerStatus.java +++ b/src/main/java/techreborn/blockentity/machine/tier0/block/blockbreaker/BlockBreakerStatus.java @@ -1,7 +1,5 @@ package techreborn.blockentity.machine.tier0.block.blockbreaker; -import net.minecraft.text.Text; -import net.minecraft.text.Text; import net.minecraft.text.Text; import reborncore.common.util.Color; import techreborn.blockentity.machine.tier0.block.ProcessingStatus; diff --git a/src/main/java/techreborn/blockentity/machine/tier0/block/blockplacer/BlockPlacerStatus.java b/src/main/java/techreborn/blockentity/machine/tier0/block/blockplacer/BlockPlacerStatus.java index 19d0be126..10efc4343 100644 --- a/src/main/java/techreborn/blockentity/machine/tier0/block/blockplacer/BlockPlacerStatus.java +++ b/src/main/java/techreborn/blockentity/machine/tier0/block/blockplacer/BlockPlacerStatus.java @@ -1,7 +1,5 @@ package techreborn.blockentity.machine.tier0.block.blockplacer; -import net.minecraft.text.Text; -import net.minecraft.text.Text; import net.minecraft.text.Text; import reborncore.common.util.Color; import techreborn.blockentity.machine.tier0.block.ProcessingStatus; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/AlloySmelterBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/AlloySmelterBlockEntity.java index f27fcebc6..f0918edde 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/AlloySmelterBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/AlloySmelterBlockEntity.java @@ -27,10 +27,10 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/AssemblingMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/AssemblingMachineBlockEntity.java index b93d84ddd..f62832507 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/AssemblingMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/AssemblingMachineBlockEntity.java @@ -27,10 +27,10 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java index 85bf32181..83822474a 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java @@ -43,11 +43,11 @@ import org.apache.commons.lang3.tuple.Pair; import org.jetbrains.annotations.Nullable; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.ItemUtils; import reborncore.common.util.RebornInventory; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/ChemicalReactorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/ChemicalReactorBlockEntity.java index 2b9c615bb..33a4235b1 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/ChemicalReactorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/ChemicalReactorBlockEntity.java @@ -27,10 +27,10 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/CompressorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/CompressorBlockEntity.java index 55ad7fad7..2f47a8071 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/CompressorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/CompressorBlockEntity.java @@ -27,10 +27,10 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/ElectricFurnaceBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/ElectricFurnaceBlockEntity.java index 600f5de4e..92f429093 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/ElectricFurnaceBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/ElectricFurnaceBlockEntity.java @@ -36,13 +36,13 @@ import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.ItemUtils; import reborncore.common.util.RebornInventory; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/ExtractorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/ExtractorBlockEntity.java index f2a5a14dc..9182e2d48 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/ExtractorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/ExtractorBlockEntity.java @@ -27,10 +27,10 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java index d14c3bb00..0820815f7 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/GreenhouseControllerBlockEntity.java @@ -36,12 +36,12 @@ import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.blockentity.MultiblockWriter; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.ItemUtils; import reborncore.common.util.RebornInventory; import techreborn.blocks.lighting.LampBlock; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/IndustrialElectrolyzerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/IndustrialElectrolyzerBlockEntity.java index 59bfb2488..c797ea4ae 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/IndustrialElectrolyzerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/IndustrialElectrolyzerBlockEntity.java @@ -27,10 +27,10 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.ItemUtils; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/PlayerDetectorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/PlayerDetectorBlockEntity.java index f45c5c370..14a5d5d59 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/PlayerDetectorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/PlayerDetectorBlockEntity.java @@ -34,13 +34,12 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; import reborncore.api.IToolDrop; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.WorldUtils; - import techreborn.blocks.machine.tier1.PlayerDetectorBlock; import techreborn.blocks.machine.tier1.PlayerDetectorBlock.PlayerDetectorType; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/RecyclerBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/RecyclerBlockEntity.java index a44622f81..88d2367e0 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/RecyclerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/RecyclerBlockEntity.java @@ -31,8 +31,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; import reborncore.api.blockentity.IUpgrade; -import reborncore.common.screen.BuiltScreenHandlerProvider; import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.api.recipe.RecyclerRecipeCrafter; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java index cfec8635e..afe9e3563 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java @@ -39,15 +39,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.ItemUtils; import reborncore.common.util.RebornInventory; - import techreborn.api.recipe.recipes.RollingMachineRecipe; import techreborn.config.TechRebornConfig; import techreborn.init.ModRecipes; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/ScrapboxinatorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/ScrapboxinatorBlockEntity.java index 336188d45..87e0c7a6e 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/ScrapboxinatorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/ScrapboxinatorBlockEntity.java @@ -27,8 +27,8 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.BuiltScreenHandlerProvider; import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.api.recipe.ScrapboxRecipeCrafter; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/SolidCanningMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/SolidCanningMachineBlockEntity.java index 0c2616148..e01102c1d 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/SolidCanningMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/SolidCanningMachineBlockEntity.java @@ -27,10 +27,10 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/WireMillBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/WireMillBlockEntity.java index 6f3439c7e..236c1e7f0 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/WireMillBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/WireMillBlockEntity.java @@ -27,10 +27,10 @@ package techreborn.blockentity.machine.tier1; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; import techreborn.init.ModRecipes; diff --git a/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java index d73ae0be7..e1f68b80b 100644 --- a/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier3/ChunkLoaderBlockEntity.java @@ -37,11 +37,11 @@ import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.chunkloading.ChunkLoaderManager; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; diff --git a/src/main/java/techreborn/blockentity/machine/tier3/IndustrialCentrifugeBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier3/IndustrialCentrifugeBlockEntity.java index 01b4172b8..61e46a520 100644 --- a/src/main/java/techreborn/blockentity/machine/tier3/IndustrialCentrifugeBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier3/IndustrialCentrifugeBlockEntity.java @@ -27,10 +27,10 @@ package techreborn.blockentity.machine.tier3; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.ItemUtils; import reborncore.common.util.RebornInventory; import techreborn.blockentity.machine.GenericMachineBlockEntity; diff --git a/src/main/java/techreborn/blockentity/machine/tier3/MatterFabricatorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier3/MatterFabricatorBlockEntity.java index 32fe84629..14aa7d3cc 100644 --- a/src/main/java/techreborn/blockentity/machine/tier3/MatterFabricatorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier3/MatterFabricatorBlockEntity.java @@ -33,11 +33,11 @@ import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.ItemUtils; import reborncore.common.util.RebornInventory; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blockentity/storage/energy/AdjustableSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/energy/AdjustableSUBlockEntity.java index 10640e989..388137e6c 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/AdjustableSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/energy/AdjustableSUBlockEntity.java @@ -33,11 +33,11 @@ import net.minecraft.util.math.Direction; import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; import reborncore.api.blockentity.IUpgrade; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.powerSystem.RcEnergyTier; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; diff --git a/src/main/java/techreborn/blockentity/storage/energy/HighVoltageSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/energy/HighVoltageSUBlockEntity.java index 59c37d70a..737080072 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/HighVoltageSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/energy/HighVoltageSUBlockEntity.java @@ -27,10 +27,10 @@ package techreborn.blockentity.storage.energy; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.powerSystem.RcEnergyTier; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/blockentity/storage/energy/LowVoltageSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/energy/LowVoltageSUBlockEntity.java index ebd02ffba..2dd946888 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/LowVoltageSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/energy/LowVoltageSUBlockEntity.java @@ -27,10 +27,10 @@ package techreborn.blockentity.storage.energy; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.powerSystem.RcEnergyTier; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/blockentity/storage/energy/MediumVoltageSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/energy/MediumVoltageSUBlockEntity.java index 9a088fa3d..5168d60e6 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/MediumVoltageSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/energy/MediumVoltageSUBlockEntity.java @@ -27,10 +27,10 @@ package techreborn.blockentity.storage.energy; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.powerSystem.RcEnergyTier; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/blockentity/storage/energy/idsu/InterdimensionalSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/energy/idsu/InterdimensionalSUBlockEntity.java index 59bf1cbc6..07c612ecf 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/idsu/InterdimensionalSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/energy/idsu/InterdimensionalSUBlockEntity.java @@ -32,10 +32,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.powerSystem.RcEnergyTier; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import team.reborn.energy.api.EnergyStorage; import team.reborn.energy.api.base.DelegatingEnergyStorage; import techreborn.blockentity.storage.energy.EnergyStorageBlockEntity; diff --git a/src/main/java/techreborn/blockentity/storage/energy/lesu/LapotronicSUBlockEntity.java b/src/main/java/techreborn/blockentity/storage/energy/lesu/LapotronicSUBlockEntity.java index fbc68d182..1beee68a9 100644 --- a/src/main/java/techreborn/blockentity/storage/energy/lesu/LapotronicSUBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/energy/lesu/LapotronicSUBlockEntity.java @@ -30,11 +30,11 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.powerSystem.RcEnergyTier; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import techreborn.blockentity.storage.energy.EnergyStorageBlockEntity; import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; diff --git a/src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java b/src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java index d9d97d784..7f079d137 100644 --- a/src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java @@ -37,17 +37,17 @@ import org.jetbrains.annotations.Nullable; import reborncore.api.IListInfoProvider; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.common.screen.BuiltScreenHandlerProvider; -import reborncore.common.screen.BuiltScreenHandler; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; +import reborncore.common.fluid.FluidUtils; import reborncore.common.fluid.FluidValue; import reborncore.common.fluid.container.FluidInstance; +import reborncore.common.screen.BuiltScreenHandler; +import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.RebornInventory; import reborncore.common.util.Tank; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; -import reborncore.common.fluid.FluidUtils; import java.util.List; diff --git a/src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java b/src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java index 956dfc3b9..12a82e754 100644 --- a/src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java +++ b/src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java @@ -42,10 +42,10 @@ import org.jetbrains.annotations.Nullable; import reborncore.api.IListInfoProvider; import reborncore.api.IToolDrop; import reborncore.api.blockentity.InventoryProvider; -import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.screen.BuiltScreenHandler; import reborncore.common.screen.BuiltScreenHandlerProvider; +import reborncore.common.screen.builder.ScreenHandlerBuilder; import reborncore.common.util.ItemUtils; import reborncore.common.util.RebornInventory; import reborncore.common.util.WorldUtils; diff --git a/src/main/java/techreborn/blockentity/transformers/TransformerBlockEntity.java b/src/main/java/techreborn/blockentity/transformers/TransformerBlockEntity.java index 463747ec9..2d95cecee 100644 --- a/src/main/java/techreborn/blockentity/transformers/TransformerBlockEntity.java +++ b/src/main/java/techreborn/blockentity/transformers/TransformerBlockEntity.java @@ -30,7 +30,6 @@ import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; -import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; @@ -39,8 +38,8 @@ import reborncore.api.IListInfoProvider; import reborncore.api.IToolDrop; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.powerSystem.PowerSystem; -import reborncore.common.util.StringUtils; import reborncore.common.powerSystem.RcEnergyTier; +import reborncore.common.util.StringUtils; import techreborn.blocks.transformers.BlockTransformer; import techreborn.config.TechRebornConfig; diff --git a/src/main/java/techreborn/blocks/DataDrivenMachineBlock.java b/src/main/java/techreborn/blocks/DataDrivenMachineBlock.java index 389d5b94a..483d8c80a 100644 --- a/src/main/java/techreborn/blocks/DataDrivenMachineBlock.java +++ b/src/main/java/techreborn/blocks/DataDrivenMachineBlock.java @@ -25,8 +25,8 @@ package techreborn.blocks; import net.minecraft.util.Identifier; -import techreborn.blockentity.data.DataDrivenBEProvider; import techreborn.blockentity.GuiType; +import techreborn.blockentity.data.DataDrivenBEProvider; /** * @author modmuss50 diff --git a/src/main/java/techreborn/blocks/cable/CableShapeUtil.java b/src/main/java/techreborn/blocks/cable/CableShapeUtil.java index 1e4ade7cb..1d33c803a 100644 --- a/src/main/java/techreborn/blocks/cable/CableShapeUtil.java +++ b/src/main/java/techreborn/blocks/cable/CableShapeUtil.java @@ -29,7 +29,10 @@ import net.minecraft.util.math.Direction; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; -import java.util.*; +import java.util.ArrayList; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; public final class CableShapeUtil { diff --git a/src/main/java/techreborn/blocks/generator/BlockFusionCoil.java b/src/main/java/techreborn/blocks/generator/BlockFusionCoil.java index f77a43553..415f4122b 100644 --- a/src/main/java/techreborn/blocks/generator/BlockFusionCoil.java +++ b/src/main/java/techreborn/blocks/generator/BlockFusionCoil.java @@ -35,7 +35,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.SoundCategory; import net.minecraft.text.Text; -import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Formatting; import net.minecraft.util.Hand; diff --git a/src/main/java/techreborn/blocks/generator/BlockFusionControlComputer.java b/src/main/java/techreborn/blocks/generator/BlockFusionControlComputer.java index 3426721b9..3265135ec 100644 --- a/src/main/java/techreborn/blocks/generator/BlockFusionControlComputer.java +++ b/src/main/java/techreborn/blocks/generator/BlockFusionControlComputer.java @@ -38,8 +38,8 @@ import net.minecraft.world.World; import reborncore.api.blockentity.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.util.Torus; -import techreborn.blockentity.machine.multiblock.FusionControlComputerBlockEntity; import techreborn.blockentity.GuiType; +import techreborn.blockentity.machine.multiblock.FusionControlComputerBlockEntity; import techreborn.init.TRContent; import techreborn.utils.damageSources.FusionDamageSource; diff --git a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java index 9a86154c8..8adfd57c6 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java @@ -31,8 +31,8 @@ import net.minecraft.world.World; import reborncore.api.blockentity.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; -import techreborn.blockentity.generator.SolarPanelBlockEntity; import techreborn.blockentity.GuiType; +import techreborn.blockentity.generator.SolarPanelBlockEntity; import techreborn.init.TRContent.SolarPanels; /** diff --git a/src/main/java/techreborn/blocks/machine/tier1/PlayerDetectorBlock.java b/src/main/java/techreborn/blocks/machine/tier1/PlayerDetectorBlock.java index 4a8167450..457de7695 100644 --- a/src/main/java/techreborn/blocks/machine/tier1/PlayerDetectorBlock.java +++ b/src/main/java/techreborn/blocks/machine/tier1/PlayerDetectorBlock.java @@ -36,7 +36,6 @@ import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.state.StateManager; import net.minecraft.state.property.EnumProperty; import net.minecraft.text.Text; -import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Formatting; import net.minecraft.util.Hand; @@ -52,8 +51,8 @@ import reborncore.api.blockentity.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.util.ChatUtils; import reborncore.common.util.StringUtils; -import techreborn.blockentity.machine.tier1.PlayerDetectorBlockEntity; import techreborn.blockentity.GuiType; +import techreborn.blockentity.machine.tier1.PlayerDetectorBlockEntity; import techreborn.utils.MessageIDs; public class PlayerDetectorBlock extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/machine/tier1/ResinBasinBlock.java b/src/main/java/techreborn/blocks/machine/tier1/ResinBasinBlock.java index 360720c6f..6e20c2e87 100644 --- a/src/main/java/techreborn/blocks/machine/tier1/ResinBasinBlock.java +++ b/src/main/java/techreborn/blocks/machine/tier1/ResinBasinBlock.java @@ -48,7 +48,6 @@ import reborncore.common.util.WorldUtils; import techreborn.blockentity.machine.tier1.ResinBasinBlockEntity; import techreborn.init.TRContent; -import java.util.UUID; import java.util.function.BiFunction; public class ResinBasinBlock extends BaseBlockEntityProvider { diff --git a/src/main/java/techreborn/blocks/misc/BlockAlarm.java b/src/main/java/techreborn/blocks/misc/BlockAlarm.java index 32a388213..788b0d754 100644 --- a/src/main/java/techreborn/blocks/misc/BlockAlarm.java +++ b/src/main/java/techreborn/blocks/misc/BlockAlarm.java @@ -35,7 +35,6 @@ import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.DirectionProperty; import net.minecraft.state.property.Properties; import net.minecraft.text.Text; -import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Formatting; import net.minecraft.util.Hand; diff --git a/src/main/java/techreborn/blocks/misc/BlockRubberLog.java b/src/main/java/techreborn/blocks/misc/BlockRubberLog.java index 98195afb1..8c1c55fc5 100644 --- a/src/main/java/techreborn/blocks/misc/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/misc/BlockRubberLog.java @@ -54,8 +54,6 @@ import techreborn.init.TRContent; import techreborn.items.tool.TreeTapItem; import techreborn.items.tool.basic.ElectricTreetapItem; -import net.minecraft.util.math.random.Random; - /** * Created by modmuss50 on 19/02/2016. */ diff --git a/src/main/java/techreborn/blocks/storage/energy/AdjustableSUBlock.java b/src/main/java/techreborn/blocks/storage/energy/AdjustableSUBlock.java index 68f6bc8a2..bcd432817 100644 --- a/src/main/java/techreborn/blocks/storage/energy/AdjustableSUBlock.java +++ b/src/main/java/techreborn/blocks/storage/energy/AdjustableSUBlock.java @@ -27,8 +27,8 @@ package techreborn.blocks.storage.energy; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; -import techreborn.blockentity.storage.energy.AdjustableSUBlockEntity; import techreborn.blockentity.GuiType; +import techreborn.blockentity.storage.energy.AdjustableSUBlockEntity; public class AdjustableSUBlock extends EnergyStorageBlock { diff --git a/src/main/java/techreborn/blocks/storage/energy/HighVoltageSUBlock.java b/src/main/java/techreborn/blocks/storage/energy/HighVoltageSUBlock.java index a8b051f31..e415bd2a4 100644 --- a/src/main/java/techreborn/blocks/storage/energy/HighVoltageSUBlock.java +++ b/src/main/java/techreborn/blocks/storage/energy/HighVoltageSUBlock.java @@ -27,8 +27,8 @@ package techreborn.blocks.storage.energy; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; -import techreborn.blockentity.storage.energy.HighVoltageSUBlockEntity; import techreborn.blockentity.GuiType; +import techreborn.blockentity.storage.energy.HighVoltageSUBlockEntity; /** * Created by modmuss50 on 14/03/2016. diff --git a/src/main/java/techreborn/blocks/storage/energy/InterdimensionalSUBlock.java b/src/main/java/techreborn/blocks/storage/energy/InterdimensionalSUBlock.java index 815283eab..2e3a4028b 100644 --- a/src/main/java/techreborn/blocks/storage/energy/InterdimensionalSUBlock.java +++ b/src/main/java/techreborn/blocks/storage/energy/InterdimensionalSUBlock.java @@ -31,8 +31,8 @@ import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import techreborn.blockentity.storage.energy.idsu.InterdimensionalSUBlockEntity; import techreborn.blockentity.GuiType; +import techreborn.blockentity.storage.energy.idsu.InterdimensionalSUBlockEntity; public class InterdimensionalSUBlock extends EnergyStorageBlock { diff --git a/src/main/java/techreborn/blocks/storage/energy/LapotronicSUBlock.java b/src/main/java/techreborn/blocks/storage/energy/LapotronicSUBlock.java index 94f7f921a..ebcb58a5c 100644 --- a/src/main/java/techreborn/blocks/storage/energy/LapotronicSUBlock.java +++ b/src/main/java/techreborn/blocks/storage/energy/LapotronicSUBlock.java @@ -27,8 +27,8 @@ package techreborn.blocks.storage.energy; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; -import techreborn.blockentity.storage.energy.lesu.LapotronicSUBlockEntity; import techreborn.blockentity.GuiType; +import techreborn.blockentity.storage.energy.lesu.LapotronicSUBlockEntity; public class LapotronicSUBlock extends EnergyStorageBlock { diff --git a/src/main/java/techreborn/blocks/storage/energy/LowVoltageSUBlock.java b/src/main/java/techreborn/blocks/storage/energy/LowVoltageSUBlock.java index 4461de0c2..611b5deb8 100644 --- a/src/main/java/techreborn/blocks/storage/energy/LowVoltageSUBlock.java +++ b/src/main/java/techreborn/blocks/storage/energy/LowVoltageSUBlock.java @@ -27,8 +27,8 @@ package techreborn.blocks.storage.energy; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; -import techreborn.blockentity.storage.energy.LowVoltageSUBlockEntity; import techreborn.blockentity.GuiType; +import techreborn.blockentity.storage.energy.LowVoltageSUBlockEntity; /** * Created by modmuss50 on 14/03/2016. diff --git a/src/main/java/techreborn/blocks/storage/energy/MediumVoltageSUBlock.java b/src/main/java/techreborn/blocks/storage/energy/MediumVoltageSUBlock.java index 5e4515938..987594e16 100644 --- a/src/main/java/techreborn/blocks/storage/energy/MediumVoltageSUBlock.java +++ b/src/main/java/techreborn/blocks/storage/energy/MediumVoltageSUBlock.java @@ -27,8 +27,8 @@ package techreborn.blocks.storage.energy; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; -import techreborn.blockentity.storage.energy.MediumVoltageSUBlockEntity; import techreborn.blockentity.GuiType; +import techreborn.blockentity.storage.energy.MediumVoltageSUBlockEntity; /** * Created by modmuss50 on 14/03/2016. diff --git a/src/main/java/techreborn/blocks/storage/fluid/TankUnitBlock.java b/src/main/java/techreborn/blocks/storage/fluid/TankUnitBlock.java index 845a50e20..3703853fd 100644 --- a/src/main/java/techreborn/blocks/storage/fluid/TankUnitBlock.java +++ b/src/main/java/techreborn/blocks/storage/fluid/TankUnitBlock.java @@ -43,8 +43,8 @@ import reborncore.common.fluid.container.FluidInstance; import reborncore.common.fluid.container.ItemFluidInfo; import reborncore.common.util.Tank; import reborncore.common.util.WorldUtils; -import techreborn.blockentity.storage.fluid.TankUnitBaseBlockEntity; import techreborn.blockentity.GuiType; +import techreborn.blockentity.storage.fluid.TankUnitBaseBlockEntity; import techreborn.init.TRContent; import techreborn.items.DynamicCellItem; diff --git a/src/main/java/techreborn/blocks/storage/item/StorageUnitBlock.java b/src/main/java/techreborn/blocks/storage/item/StorageUnitBlock.java index c65633b6f..8f9fa09c7 100644 --- a/src/main/java/techreborn/blocks/storage/item/StorageUnitBlock.java +++ b/src/main/java/techreborn/blocks/storage/item/StorageUnitBlock.java @@ -41,8 +41,8 @@ import reborncore.api.blockentity.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.util.RebornInventory; import reborncore.common.util.WorldUtils; -import techreborn.blockentity.storage.item.StorageUnitBaseBlockEntity; import techreborn.blockentity.GuiType; +import techreborn.blockentity.storage.item.StorageUnitBaseBlockEntity; import techreborn.init.TRContent; public class StorageUnitBlock extends BlockMachineBase { diff --git a/src/main/java/techreborn/events/ModRegistry.java b/src/main/java/techreborn/events/ModRegistry.java index c8652fe8f..dd4db1ea6 100644 --- a/src/main/java/techreborn/events/ModRegistry.java +++ b/src/main/java/techreborn/events/ModRegistry.java @@ -25,7 +25,6 @@ package techreborn.events; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.fabricmc.fabric.api.object.builder.v1.trade.TradeOfferHelper; import net.fabricmc.fabric.api.transfer.v1.item.ItemStorage; import net.minecraft.block.*; import net.minecraft.entity.EquipmentSlot; @@ -33,11 +32,8 @@ import net.minecraft.item.Item; import net.minecraft.item.Item.Settings; import net.minecraft.item.Items; import net.minecraft.sound.BlockSoundGroup; -import net.minecraft.village.TradeOffer; -import net.minecraft.village.TradeOffers; import reborncore.RebornRegistry; import reborncore.common.powerSystem.RcEnergyTier; -import reborncore.common.util.TradeUtils; import team.reborn.energy.api.EnergyStorage; import techreborn.TechReborn; import techreborn.blockentity.cable.CableBlockEntity; @@ -53,17 +49,13 @@ import techreborn.items.armor.QuantumSuitItem; import techreborn.items.armor.TRArmourItem; import techreborn.items.tool.*; import techreborn.items.tool.advanced.AdvancedJackhammerItem; -import techreborn.items.tool.basic.RockCutterItem; import techreborn.items.tool.basic.ElectricTreetapItem; +import techreborn.items.tool.basic.RockCutterItem; import techreborn.items.tool.industrial.*; import techreborn.items.tool.vanilla.*; import techreborn.utils.InitUtils; import java.util.Arrays; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.stream.Collectors; /** * @author drcrazy diff --git a/src/main/java/techreborn/init/TRCauldronBehavior.java b/src/main/java/techreborn/init/TRCauldronBehavior.java index 9d62c2089..98aec8d71 100644 --- a/src/main/java/techreborn/init/TRCauldronBehavior.java +++ b/src/main/java/techreborn/init/TRCauldronBehavior.java @@ -42,8 +42,8 @@ import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.event.GameEvent; -import techreborn.items.DynamicCellItem; import reborncore.common.fluid.FluidUtils; +import techreborn.items.DynamicCellItem; public class TRCauldronBehavior { public static void init() { diff --git a/src/main/java/techreborn/init/TRDispenserBehavior.java b/src/main/java/techreborn/init/TRDispenserBehavior.java index d51513c24..fa05db2a4 100644 --- a/src/main/java/techreborn/init/TRDispenserBehavior.java +++ b/src/main/java/techreborn/init/TRDispenserBehavior.java @@ -38,6 +38,7 @@ import net.minecraft.util.math.BlockPointer; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Position; +import net.minecraft.util.math.random.Random; import net.minecraft.world.WorldAccess; import reborncore.common.crafting.RebornRecipe; import reborncore.common.fluid.container.ItemFluidInfo; @@ -46,7 +47,6 @@ import techreborn.config.TechRebornConfig; import techreborn.items.DynamicCellItem; import java.util.List; -import net.minecraft.util.math.random.Random; /** * Created by drcrazy on 10-Jan-20 for TechReborn-1.15. diff --git a/src/main/java/techreborn/init/TRToolMaterials.java b/src/main/java/techreborn/init/TRToolMaterials.java index 45a89c1d7..0e58779a6 100644 --- a/src/main/java/techreborn/init/TRToolMaterials.java +++ b/src/main/java/techreborn/init/TRToolMaterials.java @@ -28,7 +28,8 @@ import net.minecraft.item.ToolMaterial; import net.minecraft.recipe.Ingredient; import techreborn.TechReborn; -import static net.minecraft.item.ToolMaterials.*; +import static net.minecraft.item.ToolMaterials.DIAMOND; +import static net.minecraft.item.ToolMaterials.IRON; /** * We use custom materials to allow LevelZ to tweak the mining level of our tools. diff --git a/src/main/java/techreborn/items/DynamicCellItem.java b/src/main/java/techreborn/items/DynamicCellItem.java index 25c42f221..1f183cdd2 100644 --- a/src/main/java/techreborn/items/DynamicCellItem.java +++ b/src/main/java/techreborn/items/DynamicCellItem.java @@ -50,8 +50,6 @@ import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvents; import net.minecraft.tag.FluidTags; import net.minecraft.text.Text; -import net.minecraft.text.Text; -import net.minecraft.text.Text; import net.minecraft.util.Hand; import net.minecraft.util.Identifier; import net.minecraft.util.TypedActionResult; @@ -66,13 +64,12 @@ import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.event.GameEvent; import org.apache.commons.lang3.Validate; -import org.apache.commons.lang3.text.WordUtils; import org.jetbrains.annotations.Nullable; +import reborncore.common.fluid.FluidUtils; import reborncore.common.fluid.container.ItemFluidInfo; import reborncore.common.util.ItemNBTHelper; import techreborn.TechReborn; import techreborn.init.TRContent; -import reborncore.common.fluid.FluidUtils; /** * Created by modmuss50 on 17/05/2016. diff --git a/src/main/java/techreborn/items/FrequencyTransmitterItem.java b/src/main/java/techreborn/items/FrequencyTransmitterItem.java index 278cd46e5..307e81960 100644 --- a/src/main/java/techreborn/items/FrequencyTransmitterItem.java +++ b/src/main/java/techreborn/items/FrequencyTransmitterItem.java @@ -32,8 +32,6 @@ import net.minecraft.item.ItemUsageContext; import net.minecraft.nbt.NbtOps; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; -import net.minecraft.text.Text; -import net.minecraft.text.Text; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.GlobalPos; diff --git a/src/main/java/techreborn/items/tool/ChainsawItem.java b/src/main/java/techreborn/items/tool/ChainsawItem.java index 88ecc81d3..8418ae898 100644 --- a/src/main/java/techreborn/items/tool/ChainsawItem.java +++ b/src/main/java/techreborn/items/tool/ChainsawItem.java @@ -38,8 +38,6 @@ import reborncore.common.util.ItemUtils; import techreborn.TechReborn; import techreborn.utils.InitUtils; -import net.minecraft.util.math.random.Random; - public class ChainsawItem extends AxeItem implements RcEnergyItem { public final int maxCharge; diff --git a/src/main/java/techreborn/items/tool/DebugToolItem.java b/src/main/java/techreborn/items/tool/DebugToolItem.java index 6b2afbb1e..cffb977f9 100644 --- a/src/main/java/techreborn/items/tool/DebugToolItem.java +++ b/src/main/java/techreborn/items/tool/DebugToolItem.java @@ -31,7 +31,6 @@ import net.minecraft.command.BlockDataObject; import net.minecraft.item.Item; import net.minecraft.item.ItemUsageContext; import net.minecraft.state.property.Property; -import net.minecraft.text.Text; import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; diff --git a/src/main/java/techreborn/items/tool/JackhammerItem.java b/src/main/java/techreborn/items/tool/JackhammerItem.java index 908cd58c6..5e2027d39 100644 --- a/src/main/java/techreborn/items/tool/JackhammerItem.java +++ b/src/main/java/techreborn/items/tool/JackhammerItem.java @@ -40,8 +40,6 @@ import techreborn.TechReborn; import techreborn.utils.InitUtils; import techreborn.utils.ToolsUtil; -import net.minecraft.util.math.random.Random; - public class JackhammerItem extends PickaxeItem implements RcEnergyItem { public final int maxCharge; public final RcEnergyTier tier; diff --git a/src/main/java/techreborn/items/tool/PaintingToolItem.java b/src/main/java/techreborn/items/tool/PaintingToolItem.java index 8823a0953..c720ae41a 100644 --- a/src/main/java/techreborn/items/tool/PaintingToolItem.java +++ b/src/main/java/techreborn/items/tool/PaintingToolItem.java @@ -35,7 +35,6 @@ import net.minecraft.nbt.NbtHelper; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.text.Text; -import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Formatting; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/items/tool/advanced/AdvancedJackhammerItem.java b/src/main/java/techreborn/items/tool/advanced/AdvancedJackhammerItem.java index 0fbab73be..867f47df7 100644 --- a/src/main/java/techreborn/items/tool/advanced/AdvancedJackhammerItem.java +++ b/src/main/java/techreborn/items/tool/advanced/AdvancedJackhammerItem.java @@ -24,8 +24,6 @@ package techreborn.items.tool.advanced; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.block.BlockState; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.Entity; @@ -40,8 +38,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; import reborncore.common.misc.MultiBlockBreakingTool; -import reborncore.common.util.ItemUtils; import reborncore.common.powerSystem.RcEnergyTier; +import reborncore.common.util.ItemUtils; import techreborn.config.TechRebornConfig; import techreborn.init.TRToolMaterials; import techreborn.items.tool.JackhammerItem; diff --git a/src/main/java/techreborn/items/tool/basic/RockCutterItem.java b/src/main/java/techreborn/items/tool/basic/RockCutterItem.java index 428c75dea..864ebe0cc 100644 --- a/src/main/java/techreborn/items/tool/basic/RockCutterItem.java +++ b/src/main/java/techreborn/items/tool/basic/RockCutterItem.java @@ -41,8 +41,6 @@ import techreborn.config.TechRebornConfig; import techreborn.init.TRContent; import techreborn.init.TRToolMaterials; -import net.minecraft.util.math.random.Random; - public class RockCutterItem extends PickaxeItem implements RcEnergyItem { public static final int maxCharge = TechRebornConfig.rockCutterCharge; diff --git a/src/main/java/techreborn/items/tool/industrial/IndustrialChainsawItem.java b/src/main/java/techreborn/items/tool/industrial/IndustrialChainsawItem.java index b0dc93234..3117f478c 100644 --- a/src/main/java/techreborn/items/tool/industrial/IndustrialChainsawItem.java +++ b/src/main/java/techreborn/items/tool/industrial/IndustrialChainsawItem.java @@ -50,7 +50,6 @@ import techreborn.utils.ToolsUtil; import java.util.ArrayList; import java.util.List; -import java.util.Optional; public class IndustrialChainsawItem extends ChainsawItem { diff --git a/src/main/java/techreborn/items/tool/industrial/IndustrialJackhammerItem.java b/src/main/java/techreborn/items/tool/industrial/IndustrialJackhammerItem.java index 826a2c1b3..e4a37006c 100644 --- a/src/main/java/techreborn/items/tool/industrial/IndustrialJackhammerItem.java +++ b/src/main/java/techreborn/items/tool/industrial/IndustrialJackhammerItem.java @@ -32,8 +32,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; -import net.minecraft.text.Text; -import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Formatting; import net.minecraft.util.Hand; diff --git a/src/main/java/techreborn/packets/ClientboundPackets.java b/src/main/java/techreborn/packets/ClientboundPackets.java index 4bb9a8a18..dcd6b1f8f 100644 --- a/src/main/java/techreborn/packets/ClientboundPackets.java +++ b/src/main/java/techreborn/packets/ClientboundPackets.java @@ -25,14 +25,12 @@ package techreborn.packets; import net.minecraft.util.Identifier; -import reborncore.common.network.ExtendedPacketBuffer; import reborncore.common.network.IdentifiedPacket; import reborncore.common.network.NetworkManager; import techreborn.TechReborn; import techreborn.world.OreDepth; import java.util.List; -import java.util.function.Consumer; public class ClientboundPackets { public static final Identifier ORE_DEPTH = new Identifier(TechReborn.MOD_ID, "ore_depth"); diff --git a/src/main/java/techreborn/utils/ToolsUtil.java b/src/main/java/techreborn/utils/ToolsUtil.java index 7effc4816..76bd1d53d 100644 --- a/src/main/java/techreborn/utils/ToolsUtil.java +++ b/src/main/java/techreborn/utils/ToolsUtil.java @@ -41,7 +41,6 @@ import reborncore.common.powerSystem.RcEnergyItem; import java.util.Collections; import java.util.HashSet; -import net.minecraft.util.math.random.Random; import java.util.Set; /** diff --git a/src/main/java/techreborn/world/OreFeature.java b/src/main/java/techreborn/world/OreFeature.java index 3795e80c2..4e96e84e5 100644 --- a/src/main/java/techreborn/world/OreFeature.java +++ b/src/main/java/techreborn/world/OreFeature.java @@ -31,7 +31,6 @@ import net.minecraft.structure.rule.RuleTest; import net.minecraft.util.Identifier; import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.RegistryEntry; import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.gen.YOffset; import net.minecraft.world.gen.feature.*; diff --git a/src/main/java/techreborn/world/RubberSaplingGenerator.java b/src/main/java/techreborn/world/RubberSaplingGenerator.java index e4a25dade..cfa6dbf17 100644 --- a/src/main/java/techreborn/world/RubberSaplingGenerator.java +++ b/src/main/java/techreborn/world/RubberSaplingGenerator.java @@ -31,8 +31,6 @@ import net.minecraft.util.registry.RegistryEntry; import net.minecraft.world.gen.feature.ConfiguredFeature; import org.jetbrains.annotations.Nullable; -import net.minecraft.util.math.random.Random; - public class RubberSaplingGenerator extends SaplingGenerator { @Nullable @Override diff --git a/src/main/java/techreborn/world/RubberTreeSpikeDecorator.java b/src/main/java/techreborn/world/RubberTreeSpikeDecorator.java index 289c9df47..61d0a30ee 100644 --- a/src/main/java/techreborn/world/RubberTreeSpikeDecorator.java +++ b/src/main/java/techreborn/world/RubberTreeSpikeDecorator.java @@ -26,19 +26,14 @@ package techreborn.world; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import net.minecraft.block.BlockState; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; -import net.minecraft.world.TestableWorld; import net.minecraft.world.gen.stateprovider.BlockStateProvider; import net.minecraft.world.gen.treedecorator.TreeDecorator; import net.minecraft.world.gen.treedecorator.TreeDecoratorType; import java.util.Comparator; -import java.util.List; -import net.minecraft.util.math.random.Random; -import java.util.function.BiConsumer; public class RubberTreeSpikeDecorator extends TreeDecorator { public static final Codec CODEC = RecordCodecBuilder.create(instance -> diff --git a/src/main/java/techreborn/world/WorldGenerator.java b/src/main/java/techreborn/world/WorldGenerator.java index 35f8e87f6..9e870909b 100644 --- a/src/main/java/techreborn/world/WorldGenerator.java +++ b/src/main/java/techreborn/world/WorldGenerator.java @@ -35,7 +35,6 @@ import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryEntry; import net.minecraft.util.registry.RegistryKey; -import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeKeys; import net.minecraft.world.gen.GenerationStep; import net.minecraft.world.gen.feature.*;