diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index de2104ab7..0d29aa5a4 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -45,7 +45,8 @@ import techreborn.events.BlockBreakHandler; import techreborn.events.TRRecipeHandler; import techreborn.events.TRTickHandler; import techreborn.init.*; -import techreborn.packets.*; +import techreborn.packets.ClientboundPackets; +import techreborn.packets.ServerboundPackets; import techreborn.proxies.CommonProxy; import techreborn.tiles.fusionReactor.TileFusionControlComputer; import techreborn.utils.BehaviorDispenseScrapbox; @@ -53,8 +54,6 @@ import techreborn.utils.StackWIPHandler; import techreborn.world.village.ModLootTables; import techreborn.world.village.VillagePlantaionHandler; -import java.io.File; - @Mod("techreborn") public class TechReborn { diff --git a/src/main/java/techreborn/api/IC2Helper.java b/src/main/java/techreborn/api/IC2Helper.java index 343641a76..fa1ca059b 100644 --- a/src/main/java/techreborn/api/IC2Helper.java +++ b/src/main/java/techreborn/api/IC2Helper.java @@ -24,13 +24,8 @@ package techreborn.api; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; import java.util.List; diff --git a/src/main/java/techreborn/api/TechRebornAPI.java b/src/main/java/techreborn/api/TechRebornAPI.java index 219bd7f47..994a811a8 100644 --- a/src/main/java/techreborn/api/TechRebornAPI.java +++ b/src/main/java/techreborn/api/TechRebornAPI.java @@ -26,8 +26,6 @@ package techreborn.api; import net.minecraft.block.Block; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import techreborn.api.recipe.IRecipeCompact; public final class TechRebornAPI { diff --git a/src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java b/src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java index df80278cc..e07564279 100644 --- a/src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java +++ b/src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java @@ -24,10 +24,9 @@ package techreborn.api.fluidreplicator; -import reborncore.common.util.FluidUtils; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; +import reborncore.common.util.FluidUtils; import techreborn.init.TRContent; import techreborn.tiles.machine.multiblock.TileFluidReplicator; diff --git a/src/main/java/techreborn/blocks/BlockAlarm.java b/src/main/java/techreborn/blocks/BlockAlarm.java index adebb6698..491b4075d 100644 --- a/src/main/java/techreborn/blocks/BlockAlarm.java +++ b/src/main/java/techreborn/blocks/BlockAlarm.java @@ -26,13 +26,13 @@ package techreborn.blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.DirectionProperty; -import net.minecraft.state.StateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.state.BooleanProperty; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.StateContainer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; @@ -52,6 +52,7 @@ import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.util.WrenchUtils; import techreborn.TechReborn; import techreborn.tiles.TileAlarm; + import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/techreborn/blocks/BlockNuke.java b/src/main/java/techreborn/blocks/BlockNuke.java index 4dd36d3fa..cf88b23a9 100644 --- a/src/main/java/techreborn/blocks/BlockNuke.java +++ b/src/main/java/techreborn/blocks/BlockNuke.java @@ -26,14 +26,14 @@ package techreborn.blocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.StateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.SoundEvents; +import net.minecraft.state.BooleanProperty; +import net.minecraft.state.StateContainer; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index ba1d93d9e..8a4653390 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -36,6 +36,7 @@ import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.OreDrop; import techreborn.TechReborn; import techreborn.init.TRContent; + import java.util.Random; @RebornRegister(TechReborn.MOD_ID) diff --git a/src/main/java/techreborn/blocks/BlockReinforcedGlass.java b/src/main/java/techreborn/blocks/BlockReinforcedGlass.java index e4b05c779..c278a05e8 100644 --- a/src/main/java/techreborn/blocks/BlockReinforcedGlass.java +++ b/src/main/java/techreborn/blocks/BlockReinforcedGlass.java @@ -32,6 +32,7 @@ import net.minecraft.block.state.IBlockState; import reborncore.client.models.ModelCompound; import reborncore.client.models.RebornModelRegistry; import techreborn.TechReborn; + import java.util.Random; public class BlockReinforcedGlass extends BlockGlass { diff --git a/src/main/java/techreborn/blocks/BlockRubberLog.java b/src/main/java/techreborn/blocks/BlockRubberLog.java index 054a9fefd..9ce8ea24b 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/BlockRubberLog.java @@ -29,16 +29,16 @@ import net.minecraft.block.BlockFire; import net.minecraft.block.BlockLeaves; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.DirectionProperty; -import net.minecraft.state.StateContainer; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.Tag; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.state.BooleanProperty; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.StateContainer; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.Tag; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; @@ -54,8 +54,9 @@ import techreborn.TechReborn; import techreborn.events.TRRecipeHandler; import techreborn.init.ModSounds; import techreborn.init.TRContent; -import techreborn.items.tool.basic.ItemElectricTreetap; import techreborn.items.tool.ItemTreeTap; +import techreborn.items.tool.basic.ItemElectricTreetap; + import java.util.Random; /** diff --git a/src/main/java/techreborn/blocks/BlockSupercondensator.java b/src/main/java/techreborn/blocks/BlockSupercondensator.java index e2a95fe7b..e7d28e267 100644 --- a/src/main/java/techreborn/blocks/BlockSupercondensator.java +++ b/src/main/java/techreborn/blocks/BlockSupercondensator.java @@ -33,9 +33,9 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.IBlockReader; import reborncore.api.tile.IMachineGuiHandler; import reborncore.common.blocks.BlockMachineBase; -import java.util.List; import javax.annotation.Nullable; +import java.util.List; public class BlockSupercondensator extends BlockMachineBase { public BlockSupercondensator(Material material) { diff --git a/src/main/java/techreborn/blocks/cable/BlockCable.java b/src/main/java/techreborn/blocks/cable/BlockCable.java index 35fe6d39e..bcd232ade 100644 --- a/src/main/java/techreborn/blocks/cable/BlockCable.java +++ b/src/main/java/techreborn/blocks/cable/BlockCable.java @@ -27,33 +27,27 @@ package techreborn.blocks.cable; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.state.AbstractProperty; -import net.minecraft.state.BooleanProperty; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.state.AbstractProperty; +import net.minecraft.state.BooleanProperty; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; -import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; import net.minecraft.world.World; -import net.minecraft.world.chunk.BlockStateContainer; -import net.minecraft.world.chunk.Chunk; -import net.minecraftforge.energy.CapabilityEnergy; import reborncore.api.ToolManager; import reborncore.common.blocks.BlockWrenchEventHandler; -import reborncore.common.util.WrenchUtils; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; +import reborncore.common.util.WrenchUtils; import techreborn.TechReborn; -import techreborn.init.ModSounds; import techreborn.init.TRContent; import techreborn.tiles.cable.TileCable; -import techreborn.utils.damageSources.ElectrialShockSource; import javax.annotation.Nullable; diff --git a/src/main/java/techreborn/blocks/fluid/TechRebornFluid.java b/src/main/java/techreborn/blocks/fluid/TechRebornFluid.java index d2c98bce0..b52cbdade 100644 --- a/src/main/java/techreborn/blocks/fluid/TechRebornFluid.java +++ b/src/main/java/techreborn/blocks/fluid/TechRebornFluid.java @@ -26,7 +26,6 @@ package techreborn.blocks.fluid; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; public class TechRebornFluid extends Fluid { public TechRebornFluid(String fluidName) { diff --git a/src/main/java/techreborn/blocks/generator/BlockFusionCoil.java b/src/main/java/techreborn/blocks/generator/BlockFusionCoil.java index 05133b120..188968811 100644 --- a/src/main/java/techreborn/blocks/generator/BlockFusionCoil.java +++ b/src/main/java/techreborn/blocks/generator/BlockFusionCoil.java @@ -47,6 +47,7 @@ import reborncore.client.models.ModelCompound; import reborncore.client.models.RebornModelRegistry; import techreborn.TechReborn; import techreborn.init.ModSounds; + import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java index db34c33a3..901ad32f6 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java @@ -35,9 +35,9 @@ import reborncore.client.models.ModelCompound; import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.TechReborn; -import java.util.List; import javax.annotation.Nullable; +import java.util.List; public class BlockMagicEnergyAbsorber extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java index 0a1188844..3e870f34f 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java @@ -35,9 +35,9 @@ import reborncore.client.models.ModelCompound; import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.TechReborn; -import java.util.List; import javax.annotation.Nullable; +import java.util.List; public class BlockMagicEnergyConverter extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/lighting/BlockLamp.java b/src/main/java/techreborn/blocks/lighting/BlockLamp.java index ef11a171b..0d9b9a8a2 100644 --- a/src/main/java/techreborn/blocks/lighting/BlockLamp.java +++ b/src/main/java/techreborn/blocks/lighting/BlockLamp.java @@ -26,14 +26,14 @@ package techreborn.blocks.lighting; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.DirectionProperty; -import net.minecraft.state.StateContainer; import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.state.BooleanProperty; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.StateContainer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java index 390e9921e..89cca4a4e 100644 --- a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java @@ -47,6 +47,7 @@ import reborncore.common.BaseTileBlock; import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.util.WrenchUtils; import techreborn.TechReborn; + import java.util.Iterator; import java.util.Random; diff --git a/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java b/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java index 8c53f6893..f685f71a5 100644 --- a/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java +++ b/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java @@ -44,6 +44,7 @@ import reborncore.common.blocks.BlockMachineBase; import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.iron.TileIronFurnace; + import java.util.Random; public class BlockIronFurnace extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java index 3a27bb6ec..f87a913f1 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java @@ -25,7 +25,6 @@ package techreborn.blocks.tier1; import com.google.common.collect.Lists; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; @@ -53,10 +52,11 @@ import reborncore.common.util.ArrayUtils; import reborncore.common.util.ChatUtils; import reborncore.common.util.StringUtils; import techreborn.TechReborn; -import techreborn.utils.MessageIDs; import techreborn.tiles.machine.tier1.TilePlayerDectector; -import java.util.List; +import techreborn.utils.MessageIDs; + import javax.annotation.Nullable; +import java.util.List; public class BlockPlayerDetector extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java index eadb88811..030f2ea4d 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java +++ b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java @@ -29,7 +29,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; - import reborncore.api.tile.IMachineGuiHandler; import reborncore.client.models.ModelCompound; import reborncore.client.models.RebornModelRegistry; diff --git a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java index b918dcc04..a3acc616e 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java @@ -28,12 +28,12 @@ import com.google.common.base.Predicate; import com.google.common.collect.Iterators; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.state.DirectionProperty; -import net.minecraft.state.StateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.StateContainer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -46,6 +46,7 @@ import reborncore.common.BaseTileBlock; import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.util.WrenchUtils; import techreborn.TechReborn; + import java.util.Iterator; import java.util.Random; diff --git a/src/main/java/techreborn/client/EGui.java b/src/main/java/techreborn/client/EGui.java index f31529159..14a9e2b52 100644 --- a/src/main/java/techreborn/client/EGui.java +++ b/src/main/java/techreborn/client/EGui.java @@ -28,7 +28,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; -import techreborn.TechReborn; public enum EGui implements IMachineGuiHandler { diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index 21d843f10..eaf9130e3 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -29,28 +29,27 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; -import techreborn.client.container.ContainerDestructoPack; import reborncore.client.containerBuilder.IContainerProvider; +import techreborn.client.container.ContainerDestructoPack; import techreborn.client.gui.*; -import techreborn.client.gui.GuiAutoCrafting; import techreborn.tiles.*; import techreborn.tiles.fusionReactor.TileFusionControlComputer; -import techreborn.tiles.generator.*; +import techreborn.tiles.generator.TilePlasmaGenerator; import techreborn.tiles.generator.advanced.TileDieselGenerator; import techreborn.tiles.generator.advanced.TileGasTurbine; import techreborn.tiles.generator.advanced.TileSemiFluidGenerator; import techreborn.tiles.generator.advanced.TileThermalGenerator; import techreborn.tiles.generator.basic.TileSolidFuelGenerator; -import techreborn.tiles.storage.idsu.TileInterdimensionalSU; -import techreborn.tiles.storage.lesu.TileLapotronicSU; +import techreborn.tiles.machine.iron.TileIronAlloyFurnace; +import techreborn.tiles.machine.iron.TileIronFurnace; import techreborn.tiles.machine.multiblock.*; +import techreborn.tiles.machine.tier1.*; import techreborn.tiles.storage.TileAdjustableSU; import techreborn.tiles.storage.TileHighVoltageSU; import techreborn.tiles.storage.TileLowVoltageSU; import techreborn.tiles.storage.TileMediumVoltageSU; -import techreborn.tiles.machine.iron.TileIronAlloyFurnace; -import techreborn.tiles.machine.iron.TileIronFurnace; -import techreborn.tiles.machine.tier1.*; +import techreborn.tiles.storage.idsu.TileInterdimensionalSU; +import techreborn.tiles.storage.lesu.TileLapotronicSU; public class GuiHandler implements IGuiHandler { diff --git a/src/main/java/techreborn/client/gui/GuiAESU.java b/src/main/java/techreborn/client/gui/GuiAESU.java index 94ea8e865..885079a3a 100644 --- a/src/main/java/techreborn/client/gui/GuiAESU.java +++ b/src/main/java/techreborn/client/gui/GuiAESU.java @@ -24,19 +24,16 @@ package techreborn.client.gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; +import reborncore.client.gui.builder.widget.GuiButtonUpDown; import reborncore.common.network.NetworkManager; import reborncore.common.powerSystem.PowerSystem; -import reborncore.client.gui.builder.widget.GuiButtonUpDown; import techreborn.packets.ServerboundPackets; import techreborn.tiles.storage.TileAdjustableSU; -import java.io.IOException; - public class GuiAESU extends GuiBase { TileAdjustableSU tile; diff --git a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java index ba6bf7768..dc277a3aa 100644 --- a/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiAssemblingMachine.java @@ -25,9 +25,9 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; +import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.tiles.machine.tier1.TileAssemblingMachine; -import reborncore.client.gui.builder.GuiBase; public class GuiAssemblingMachine extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiAutoCrafting.java b/src/main/java/techreborn/client/gui/GuiAutoCrafting.java index 194f98cb2..2dadf6a63 100644 --- a/src/main/java/techreborn/client/gui/GuiAutoCrafting.java +++ b/src/main/java/techreborn/client/gui/GuiAutoCrafting.java @@ -24,7 +24,6 @@ package techreborn.client.gui; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.player.EntityPlayer; @@ -32,14 +31,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.common.network.NetworkManager; import techreborn.packets.ServerboundPackets; import techreborn.tiles.machine.tier1.TileAutoCraftingTable; -import java.io.IOException; - import static net.minecraft.item.ItemStack.EMPTY; /** diff --git a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java index ffcea4d49..bf702afff 100644 --- a/src/main/java/techreborn/client/gui/GuiBlastFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiBlastFurnace.java @@ -25,7 +25,6 @@ package techreborn.client.gui; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumFacing; @@ -39,9 +38,6 @@ import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import techreborn.init.TRContent; import techreborn.tiles.machine.multiblock.TileIndustrialBlastFurnace; -import reborncore.client.gui.builder.widget.GuiButtonHologram; - -import java.io.IOException; public class GuiBlastFurnace extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiChemicalReactor.java b/src/main/java/techreborn/client/gui/GuiChemicalReactor.java index 6ebadb377..be3117c80 100644 --- a/src/main/java/techreborn/client/gui/GuiChemicalReactor.java +++ b/src/main/java/techreborn/client/gui/GuiChemicalReactor.java @@ -25,9 +25,9 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; +import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.tiles.machine.tier1.TileChemicalReactor; -import reborncore.client.gui.builder.GuiBase; public class GuiChemicalReactor extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiCompressor.java b/src/main/java/techreborn/client/gui/GuiCompressor.java index 1f02de2aa..8f5480f0d 100644 --- a/src/main/java/techreborn/client/gui/GuiCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiCompressor.java @@ -25,9 +25,9 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; +import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.tiles.machine.tier1.TileCompressor; -import reborncore.client.gui.builder.GuiBase; public class GuiCompressor extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiDistillationTower.java b/src/main/java/techreborn/client/gui/GuiDistillationTower.java index d64011d89..22548bbc1 100644 --- a/src/main/java/techreborn/client/gui/GuiDistillationTower.java +++ b/src/main/java/techreborn/client/gui/GuiDistillationTower.java @@ -25,7 +25,6 @@ package techreborn.client.gui; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumFacing; @@ -37,12 +36,9 @@ import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; -import techreborn.blocks.BlockMachineCasing; import techreborn.init.TRContent; import techreborn.tiles.machine.multiblock.TileDistillationTower; -import java.io.IOException; - public class GuiDistillationTower extends GuiBase { public TileDistillationTower tile; diff --git a/src/main/java/techreborn/client/gui/GuiElectricFurnace.java b/src/main/java/techreborn/client/gui/GuiElectricFurnace.java index 06c28691b..ecb019de4 100644 --- a/src/main/java/techreborn/client/gui/GuiElectricFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiElectricFurnace.java @@ -25,9 +25,9 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; +import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.tiles.machine.tier1.TileElectricFurnace; -import reborncore.client.gui.builder.GuiBase; public class GuiElectricFurnace extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiExtractor.java b/src/main/java/techreborn/client/gui/GuiExtractor.java index e582a12e8..c4391556c 100644 --- a/src/main/java/techreborn/client/gui/GuiExtractor.java +++ b/src/main/java/techreborn/client/gui/GuiExtractor.java @@ -25,9 +25,9 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; +import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.tiles.machine.tier1.TileExtractor; -import reborncore.client.gui.builder.GuiBase; public class GuiExtractor extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java index 5d36f59c6..072cf9153 100644 --- a/src/main/java/techreborn/client/gui/GuiFluidReplicator.java +++ b/src/main/java/techreborn/client/gui/GuiFluidReplicator.java @@ -25,7 +25,6 @@ package techreborn.client.gui; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -38,10 +37,6 @@ import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import techreborn.init.TRContent; import techreborn.tiles.machine.multiblock.TileFluidReplicator; -import reborncore.client.gui.builder.widget.GuiButtonHologram; -import techreborn.blocks.BlockMachineCasing; - -import java.io.IOException; /** * @author drcrazy diff --git a/src/main/java/techreborn/client/gui/GuiFusionReactor.java b/src/main/java/techreborn/client/gui/GuiFusionReactor.java index 6254bb663..f552f8b61 100644 --- a/src/main/java/techreborn/client/gui/GuiFusionReactor.java +++ b/src/main/java/techreborn/client/gui/GuiFusionReactor.java @@ -25,13 +25,13 @@ package techreborn.client.gui; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import org.apache.commons.lang3.tuple.Pair; import reborncore.ClientProxy; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; +import reborncore.client.gui.builder.widget.GuiButtonUpDown; import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; @@ -39,13 +39,11 @@ import reborncore.client.multiblock.MultiblockSet; import reborncore.common.network.NetworkManager; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.util.Torus; -import reborncore.client.gui.builder.widget.GuiButtonUpDown; import techreborn.init.TRContent; import techreborn.packets.ServerboundPackets; import techreborn.tiles.fusionReactor.TileFusionControlComputer; import java.awt.*; -import java.io.IOException; import java.util.List; import java.util.Optional; diff --git a/src/main/java/techreborn/client/gui/GuiGasTurbine.java b/src/main/java/techreborn/client/gui/GuiGasTurbine.java index d5fd21d0a..2c38321e5 100644 --- a/src/main/java/techreborn/client/gui/GuiGasTurbine.java +++ b/src/main/java/techreborn/client/gui/GuiGasTurbine.java @@ -25,9 +25,9 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; +import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.tiles.generator.advanced.TileGasTurbine; -import reborncore.client.gui.builder.GuiBase; public class GuiGasTurbine extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiGenerator.java b/src/main/java/techreborn/client/gui/GuiGenerator.java index 24b3a88da..0cb5d1810 100644 --- a/src/main/java/techreborn/client/gui/GuiGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiGenerator.java @@ -25,8 +25,8 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; -import techreborn.tiles.generator.basic.TileSolidFuelGenerator; import reborncore.client.gui.builder.GuiBase; +import techreborn.tiles.generator.basic.TileSolidFuelGenerator; public class GuiGenerator extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index 07663034c..878ee328a 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -25,7 +25,6 @@ package techreborn.client.gui; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; @@ -38,10 +37,6 @@ import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; import techreborn.init.TRContent; import techreborn.tiles.machine.multiblock.TileImplosionCompressor; -import techreborn.blocks.BlockMachineCasing; -import reborncore.client.gui.builder.widget.GuiButtonHologram; - -import java.io.IOException; public class GuiImplosionCompressor extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java b/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java index 1abca16c9..7f43f1dbd 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java @@ -25,9 +25,9 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; +import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.tiles.machine.tier1.TileIndustrialElectrolyzer; -import reborncore.client.gui.builder.GuiBase; public class GuiIndustrialElectrolyzer extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java index 061fad77a..7e15ad5e5 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java @@ -25,7 +25,6 @@ package techreborn.client.gui; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; @@ -37,13 +36,9 @@ import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; -import techreborn.blocks.BlockMachineCasing; -import reborncore.client.gui.builder.widget.GuiButtonHologram; import techreborn.init.TRContent; import techreborn.tiles.machine.multiblock.TileIndustrialGrinder; -import java.io.IOException; - public class GuiIndustrialGrinder extends GuiBase { TileIndustrialGrinder tile; diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index 5dfd5e22e..5bc283708 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -25,7 +25,6 @@ package techreborn.client.gui; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; @@ -37,12 +36,9 @@ import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; -import techreborn.blocks.BlockMachineCasing; import techreborn.init.TRContent; import techreborn.tiles.machine.multiblock.TileIndustrialSawmill; -import java.io.IOException; - public class GuiIndustrialSawmill extends GuiBase { TileIndustrialSawmill tile; diff --git a/src/main/java/techreborn/client/gui/GuiIronFurnace.java b/src/main/java/techreborn/client/gui/GuiIronFurnace.java index 5e7a1e04d..d3c6c38f3 100644 --- a/src/main/java/techreborn/client/gui/GuiIronFurnace.java +++ b/src/main/java/techreborn/client/gui/GuiIronFurnace.java @@ -29,9 +29,9 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import reborncore.client.gui.builder.GuiBase; import techreborn.init.TRContent; import techreborn.tiles.machine.iron.TileIronFurnace; -import reborncore.client.gui.builder.GuiBase; public class GuiIronFurnace extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiManual.java b/src/main/java/techreborn/client/gui/GuiManual.java index 7ce548208..4ff68defb 100644 --- a/src/main/java/techreborn/client/gui/GuiManual.java +++ b/src/main/java/techreborn/client/gui/GuiManual.java @@ -24,7 +24,6 @@ package techreborn.client.gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiConfirmOpenLink; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/techreborn/client/gui/GuiRecycler.java b/src/main/java/techreborn/client/gui/GuiRecycler.java index 2ab06455e..a9328eb50 100644 --- a/src/main/java/techreborn/client/gui/GuiRecycler.java +++ b/src/main/java/techreborn/client/gui/GuiRecycler.java @@ -25,9 +25,9 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; +import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.tiles.machine.tier1.TileRecycler; -import reborncore.client.gui.builder.GuiBase; public class GuiRecycler extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiRollingMachine.java b/src/main/java/techreborn/client/gui/GuiRollingMachine.java index 939300cf8..098bacd41 100644 --- a/src/main/java/techreborn/client/gui/GuiRollingMachine.java +++ b/src/main/java/techreborn/client/gui/GuiRollingMachine.java @@ -31,8 +31,6 @@ import reborncore.common.network.NetworkManager; import techreborn.packets.ServerboundPackets; import techreborn.tiles.machine.tier1.TileRollingMachine; -import java.io.IOException; - public class GuiRollingMachine extends GuiBase { TileRollingMachine rollingMachine; diff --git a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java index b435fca3f..03bba60e5 100644 --- a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java @@ -25,9 +25,9 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; +import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; import techreborn.tiles.generator.advanced.TileSemiFluidGenerator; -import reborncore.client.gui.builder.GuiBase; public class GuiSemifluidGenerator extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java index 05cd579c8..3c2020710 100644 --- a/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java +++ b/src/main/java/techreborn/client/gui/GuiVacuumFreezer.java @@ -25,7 +25,6 @@ package techreborn.client.gui; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; import reborncore.ClientProxy; @@ -35,12 +34,9 @@ import reborncore.client.gui.guibuilder.GuiBuilder; import reborncore.client.multiblock.Multiblock; import reborncore.client.multiblock.MultiblockRenderEvent; import reborncore.client.multiblock.MultiblockSet; -import techreborn.blocks.BlockMachineCasing; import techreborn.init.TRContent; import techreborn.tiles.machine.multiblock.TileVacuumFreezer; -import java.io.IOException; - public class GuiVacuumFreezer extends GuiBase { TileVacuumFreezer tile; diff --git a/src/main/java/techreborn/client/render/ModelDynamicCell.java b/src/main/java/techreborn/client/render/ModelDynamicCell.java index 77b4802bd..27a021a33 100644 --- a/src/main/java/techreborn/client/render/ModelDynamicCell.java +++ b/src/main/java/techreborn/client/render/ModelDynamicCell.java @@ -26,31 +26,22 @@ package techreborn.client.render; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.model.*; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; import net.minecraft.resources.IResourceManager; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.model.*; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; -import techreborn.init.TRContent; -import techreborn.items.DynamicCell; -import javax.annotation.Nullable; import java.awt.*; -import java.util.*; import java.util.List; +import java.util.*; import java.util.function.Function; //TODO 1.13 very broken, look at ModelDynBucket for help porting this fully diff --git a/src/main/java/techreborn/events/BlockBreakHandler.java b/src/main/java/techreborn/events/BlockBreakHandler.java index 0c1912efa..ebd86af01 100644 --- a/src/main/java/techreborn/events/BlockBreakHandler.java +++ b/src/main/java/techreborn/events/BlockBreakHandler.java @@ -35,7 +35,6 @@ import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import reborncore.common.registration.RebornRegister; - import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.OreDrop; import techreborn.TechReborn; diff --git a/src/main/java/techreborn/events/ModelRegistryEventHandler.java b/src/main/java/techreborn/events/ModelRegistryEventHandler.java index 6426fbfc0..bfebada07 100644 --- a/src/main/java/techreborn/events/ModelRegistryEventHandler.java +++ b/src/main/java/techreborn/events/ModelRegistryEventHandler.java @@ -24,41 +24,22 @@ package techreborn.events; -import java.util.Arrays; -import java.util.Map; - -import com.google.common.collect.Maps; - -import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.ModelRegistryEvent; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; import reborncore.client.models.ModelCompound; import reborncore.client.models.RebornModelRegistry; import techreborn.TechReborn; -import techreborn.blocks.fluid.BlockFluidTechReborn; import techreborn.client.render.ModelDynamicCell; import techreborn.config.ConfigTechReborn; -import techreborn.init.ModFluids; import techreborn.init.TRContent; -import techreborn.init.TRContent.Cables; -import techreborn.init.TRContent.Dusts; -import techreborn.init.TRContent.Gems; -import techreborn.init.TRContent.Ingots; -import techreborn.init.TRContent.MachineBlocks; -import techreborn.init.TRContent.Nuggets; -import techreborn.init.TRContent.Ores; -import techreborn.init.TRContent.Parts; -import techreborn.init.TRContent.Plates; -import techreborn.init.TRContent.SmallDusts; -import techreborn.init.TRContent.StorageBlocks; -import techreborn.init.TRContent.Upgrades; +import techreborn.init.TRContent.*; + +import java.util.Arrays; /** * @author drcrazy diff --git a/src/main/java/techreborn/events/RegistryEventHandler.java b/src/main/java/techreborn/events/RegistryEventHandler.java index cb9a481e4..06b36e763 100644 --- a/src/main/java/techreborn/events/RegistryEventHandler.java +++ b/src/main/java/techreborn/events/RegistryEventHandler.java @@ -3,52 +3,23 @@ */ package techreborn.events; -import java.util.Arrays; - import net.minecraft.block.Block; -import net.minecraft.block.BlockSlab; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; import reborncore.RebornRegistry; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.util.BucketHandler; import techreborn.TechReborn; -import techreborn.api.Reference; -import techreborn.blocks.BlockComputerCube; -import techreborn.blocks.BlockNuke; -import techreborn.blocks.BlockRefinedIronFence; -import techreborn.blocks.BlockReinforcedGlass; -import techreborn.blocks.BlockRubberLeaves; -import techreborn.blocks.BlockRubberLog; -import techreborn.blocks.BlockRubberPlank; -import techreborn.blocks.BlockRubberPlankSlab; -import techreborn.blocks.BlockRubberPlankStair; -import techreborn.blocks.BlockRubberSapling; +import techreborn.blocks.*; import techreborn.config.ConfigTechReborn; -import techreborn.init.ModRecipes; import techreborn.init.TRArmorMaterial; import techreborn.init.TRContent; -import techreborn.init.TRContent.Cables; -import techreborn.init.TRContent.Dusts; -import techreborn.init.TRContent.Gems; -import techreborn.init.TRContent.Ingots; -import techreborn.init.TRContent.Machine; -import techreborn.init.TRContent.MachineBlocks; -import techreborn.init.TRContent.Nuggets; -import techreborn.init.TRContent.Ores; -import techreborn.init.TRContent.Parts; -import techreborn.init.TRContent.Plates; -import techreborn.init.TRContent.SmallDusts; -import techreborn.init.TRContent.SolarPanels; -import techreborn.init.TRContent.StorageBlocks; -import techreborn.init.TRContent.Upgrades; +import techreborn.init.TRContent.*; import techreborn.init.TRToolTeir; import techreborn.itemblocks.ItemBlockRubberSapling; import techreborn.items.DynamicCell; @@ -59,11 +30,7 @@ import techreborn.items.armor.ItemCloakingDevice; import techreborn.items.armor.ItemLapotronicOrbpack; import techreborn.items.armor.ItemLithiumIonBatpack; import techreborn.items.armor.ItemTRArmour; -import techreborn.items.battery.ItemEnergyCrystal; -import techreborn.items.battery.ItemLapotronCrystal; -import techreborn.items.battery.ItemLapotronicOrb; -import techreborn.items.battery.ItemLithiumIonBattery; -import techreborn.items.battery.ItemRedCellBattery; +import techreborn.items.battery.*; import techreborn.items.tool.ItemDebugTool; import techreborn.items.tool.ItemTreeTap; import techreborn.items.tool.ItemWrench; @@ -75,17 +42,15 @@ import techreborn.items.tool.basic.ItemBasicChainsaw; import techreborn.items.tool.basic.ItemBasicDrill; import techreborn.items.tool.basic.ItemBasicJackhammer; import techreborn.items.tool.basic.ItemElectricTreetap; -import techreborn.items.tool.industrial.ItemIndustrialChainsaw; -import techreborn.items.tool.industrial.ItemIndustrialDrill; -import techreborn.items.tool.industrial.ItemIndustrialJackhammer; -import techreborn.items.tool.industrial.ItemNanosaber; -import techreborn.items.tool.industrial.ItemOmniTool; +import techreborn.items.tool.industrial.*; import techreborn.items.tool.vanilla.ItemTRAxe; import techreborn.items.tool.vanilla.ItemTRHoe; import techreborn.items.tool.vanilla.ItemTRSpade; import techreborn.items.tool.vanilla.ItemTRSword; import techreborn.utils.InitUtils; +import java.util.Arrays; + /** * @author drcrazy * diff --git a/src/main/java/techreborn/events/StackToolTipEvent.java b/src/main/java/techreborn/events/StackToolTipEvent.java index a483b3b17..e8fbbe0f5 100644 --- a/src/main/java/techreborn/events/StackToolTipEvent.java +++ b/src/main/java/techreborn/events/StackToolTipEvent.java @@ -24,8 +24,6 @@ package techreborn.events; -import org.lwjgl.glfw.GLFW; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.ITileEntityProvider; @@ -41,6 +39,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; +import org.lwjgl.glfw.GLFW; import reborncore.api.IListInfoProvider; import reborncore.api.power.IEnergyItemInfo; import reborncore.common.RebornCoreConfig; diff --git a/src/main/java/techreborn/events/TRRecipeHandler.java b/src/main/java/techreborn/events/TRRecipeHandler.java index 75aa204a6..7df46e08d 100644 --- a/src/main/java/techreborn/events/TRRecipeHandler.java +++ b/src/main/java/techreborn/events/TRRecipeHandler.java @@ -38,11 +38,10 @@ import net.minecraftforge.registries.IForgeRegistryEntry; import reborncore.common.util.ItemUtils; import techreborn.TechReborn; import techreborn.init.TRContent; + import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; import java.util.stream.Collectors; public class TRRecipeHandler { diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 06c0d58af..4932c33a8 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -30,26 +30,13 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.oredict.OreDictionary; import reborncore.api.recipe.RecipeHandler; import reborncore.common.registration.RebornRegister; -import reborncore.common.util.ItemUtils; import techreborn.TechReborn; import techreborn.api.Reference; import techreborn.api.recipe.machines.GrinderRecipe; import techreborn.api.recipe.machines.VacuumFreezerRecipe; -import techreborn.config.ConfigTechReborn; -import techreborn.init.recipes.*; -import techreborn.items.*; - -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; - -import static techreborn.utils.TagUtils.getDictData; -import static techreborn.utils.TagUtils.getDictOreOrEmpty; -import static techreborn.utils.TagUtils.isDictPrefixed; -import static techreborn.utils.TagUtils.joinDictName; +import techreborn.items.ItemCells; @RebornRegister(TechReborn.MOD_ID) public class ModRecipes { diff --git a/src/main/java/techreborn/init/OreDict.java b/src/main/java/techreborn/init/OreDict.java index be7a38bdd..79a0006b2 100644 --- a/src/main/java/techreborn/init/OreDict.java +++ b/src/main/java/techreborn/init/OreDict.java @@ -24,15 +24,8 @@ package techreborn.init; -import com.google.common.base.CaseFormat; import com.google.common.collect.ImmutableList; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import reborncore.common.util.StringUtils; import techreborn.api.TechRebornAPI; -import techreborn.init.TRContent.Dusts; -import techreborn.init.TRContent.Ores; public class OreDict { diff --git a/src/main/java/techreborn/init/SubItemRetriever.java b/src/main/java/techreborn/init/SubItemRetriever.java index c1019c46b..a7bfc8656 100644 --- a/src/main/java/techreborn/init/SubItemRetriever.java +++ b/src/main/java/techreborn/init/SubItemRetriever.java @@ -26,7 +26,7 @@ package techreborn.init; import net.minecraft.item.ItemStack; import techreborn.api.ISubItemRetriever; -import techreborn.items.*; +import techreborn.items.ItemCells; /** * Created by Mark on 03/04/2016. */ diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index ad1fe0606..71d0068c6 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -24,7 +24,8 @@ import techreborn.blocks.transformers.BlockHVTransformer; import techreborn.blocks.transformers.BlockLVTransformer; import techreborn.blocks.transformers.BlockMVTransformer; import techreborn.config.ConfigTechReborn; -import techreborn.items.*; +import techreborn.items.DynamicCell; +import techreborn.items.ItemUpgrade; import techreborn.utils.InitUtils; import javax.annotation.Nullable; diff --git a/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java b/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java index 66da7808f..9ebf255bc 100644 --- a/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java +++ b/src/main/java/techreborn/init/recipes/AlloySmelterRecipes.java @@ -24,13 +24,6 @@ package techreborn.init.recipes; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import reborncore.api.recipe.RecipeHandler; -import techreborn.api.Reference; -import techreborn.api.recipe.machines.AlloySmelterRecipe; - /** * @author drcrazy * diff --git a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java index 472a93e0a..a005eea83 100644 --- a/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java +++ b/src/main/java/techreborn/init/recipes/CraftingTableRecipes.java @@ -24,16 +24,6 @@ package techreborn.init.recipes; -import net.minecraft.init.Blocks; -import net.minecraft.init.Enchantments; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import techreborn.TechReborn; -import techreborn.config.ConfigTechReborn; -import techreborn.init.TRContent; -import techreborn.items.*; - /** * Created by Prospector */ diff --git a/src/main/java/techreborn/init/recipes/ExtractorRecipes.java b/src/main/java/techreborn/init/recipes/ExtractorRecipes.java index 260dfb002..c4bc9dffb 100644 --- a/src/main/java/techreborn/init/recipes/ExtractorRecipes.java +++ b/src/main/java/techreborn/init/recipes/ExtractorRecipes.java @@ -24,17 +24,6 @@ package techreborn.init.recipes; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import reborncore.api.recipe.RecipeHandler; -import techreborn.api.Reference; -import techreborn.api.recipe.machines.ExtractorRecipe; -import techreborn.init.TRContent; -import techreborn.items.DynamicCell; - /** * Created by Prospector */ diff --git a/src/main/java/techreborn/init/recipes/FluidGeneratorRecipes.java b/src/main/java/techreborn/init/recipes/FluidGeneratorRecipes.java index e87f58a0e..dadd8c3ab 100644 --- a/src/main/java/techreborn/init/recipes/FluidGeneratorRecipes.java +++ b/src/main/java/techreborn/init/recipes/FluidGeneratorRecipes.java @@ -24,9 +24,7 @@ package techreborn.init.recipes; -import net.minecraft.init.Fluids; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; import techreborn.api.generator.EFluidGenerator; import techreborn.api.generator.GeneratorRecipeHelper; import techreborn.init.ModFluids; diff --git a/src/main/java/techreborn/init/recipes/FluidReplicatorRecipes.java b/src/main/java/techreborn/init/recipes/FluidReplicatorRecipes.java index 3956d1351..ba0b6ac10 100644 --- a/src/main/java/techreborn/init/recipes/FluidReplicatorRecipes.java +++ b/src/main/java/techreborn/init/recipes/FluidReplicatorRecipes.java @@ -24,12 +24,6 @@ package techreborn.init.recipes; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import techreborn.api.fluidreplicator.FluidReplicatorRecipe; -import techreborn.api.fluidreplicator.FluidReplicatorRecipeList; -import techreborn.init.ModFluids; - /** * @author drcrazy * diff --git a/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java index 52a5f21a6..f7590a885 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java @@ -30,7 +30,6 @@ import net.minecraft.item.ItemStack; import reborncore.api.recipe.RecipeHandler; import techreborn.api.Reference; import techreborn.api.recipe.machines.CentrifugeRecipe; -import techreborn.init.TRContent; import techreborn.items.DynamicCell; import java.security.InvalidParameterException; diff --git a/src/main/java/techreborn/init/recipes/IndustrialElectrolyzerRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialElectrolyzerRecipes.java index a7e0b6a5b..584909b42 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialElectrolyzerRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialElectrolyzerRecipes.java @@ -24,17 +24,6 @@ package techreborn.init.recipes; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import reborncore.api.recipe.RecipeHandler; -import techreborn.api.Reference; -import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe; -import techreborn.items.DynamicCell; -import techreborn.items.ItemCells; - -import java.security.InvalidParameterException; - /** * Created by Prospector */ diff --git a/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java index da168a31a..9621ccc08 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java @@ -24,17 +24,6 @@ package techreborn.init.recipes; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import reborncore.api.recipe.RecipeHandler; -import techreborn.api.Reference; -import techreborn.api.recipe.machines.IndustrialGrinderRecipe; -import techreborn.init.ModFluids; - -import java.security.InvalidParameterException; - /** * Created by Prospector */ diff --git a/src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java index 0d4c210e0..4c69859c9 100644 --- a/src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java +++ b/src/main/java/techreborn/init/recipes/IndustrialSawmillRecipes.java @@ -24,29 +24,8 @@ package techreborn.init.recipes; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; -import reborncore.api.recipe.RecipeHandler; import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.config.ConfigRegistry; -import reborncore.common.util.ItemUtils; import techreborn.TechReborn; -import techreborn.api.Reference; -import techreborn.api.recipe.machines.IndustrialSawmillRecipe; -import techreborn.init.TRContent; - -import javax.annotation.Nonnull; -import java.security.InvalidParameterException; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; @RebornRegister(TechReborn.MOD_ID) public class IndustrialSawmillRecipes extends RecipeMethods { diff --git a/src/main/java/techreborn/init/recipes/RecipeMethods.java b/src/main/java/techreborn/init/recipes/RecipeMethods.java index 8e7ba9716..b4f1cdb88 100644 --- a/src/main/java/techreborn/init/recipes/RecipeMethods.java +++ b/src/main/java/techreborn/init/recipes/RecipeMethods.java @@ -28,9 +28,8 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; -import net.minecraftforge.oredict.OreDictionary; import reborncore.common.util.StringUtils; -import techreborn.items.*; +import techreborn.items.ItemCells; /** * Created by Prospector diff --git a/src/main/java/techreborn/init/recipes/RollingMachineRecipes.java b/src/main/java/techreborn/init/recipes/RollingMachineRecipes.java index 893ad50d2..438f9d94f 100644 --- a/src/main/java/techreborn/init/recipes/RollingMachineRecipes.java +++ b/src/main/java/techreborn/init/recipes/RollingMachineRecipes.java @@ -29,7 +29,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import techreborn.TechReborn; -import techreborn.api.TechRebornAPI; import techreborn.init.TRContent; /** diff --git a/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java b/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java index ab3fda31d..13dc471f4 100644 --- a/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java +++ b/src/main/java/techreborn/init/recipes/ScrapboxRecipes.java @@ -27,7 +27,6 @@ package techreborn.init.recipes; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import reborncore.api.recipe.RecipeHandler; import techreborn.api.Reference; diff --git a/src/main/java/techreborn/items/DynamicCell.java b/src/main/java/techreborn/items/DynamicCell.java index 593e22ed2..47e8217f0 100644 --- a/src/main/java/techreborn/items/DynamicCell.java +++ b/src/main/java/techreborn/items/DynamicCell.java @@ -29,7 +29,6 @@ import net.minecraft.block.BlockFlowingFluid; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Fluids; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; @@ -42,7 +41,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack; import org.apache.commons.lang3.Validate; diff --git a/src/main/java/techreborn/items/ItemCells.java b/src/main/java/techreborn/items/ItemCells.java index d1de3ee2b..de1d0700f 100644 --- a/src/main/java/techreborn/items/ItemCells.java +++ b/src/main/java/techreborn/items/ItemCells.java @@ -26,7 +26,6 @@ package techreborn.items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; import org.apache.commons.lang3.Validate; import techreborn.utils.FluidUtils; diff --git a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java index 3ff4129c2..cf3433341 100644 --- a/src/main/java/techreborn/items/ItemFrequencyTransmitter.java +++ b/src/main/java/techreborn/items/ItemFrequencyTransmitter.java @@ -33,7 +33,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.IRegistry; import net.minecraft.util.text.ITextComponent; @@ -42,7 +45,6 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.common.DimensionManager; import reborncore.client.hud.StackInfoElement; import reborncore.common.util.ChatUtils; import techreborn.TechReborn; diff --git a/src/main/java/techreborn/items/ItemManual.java b/src/main/java/techreborn/items/ItemManual.java index 1948c12dc..a34cfa113 100644 --- a/src/main/java/techreborn/items/ItemManual.java +++ b/src/main/java/techreborn/items/ItemManual.java @@ -28,11 +28,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; -import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; import techreborn.TechReborn; -import techreborn.client.EGui; public class ItemManual extends Item { diff --git a/src/main/java/techreborn/items/ItemScrapBox.java b/src/main/java/techreborn/items/ItemScrapBox.java index 9a74ef47a..fa4efff04 100644 --- a/src/main/java/techreborn/items/ItemScrapBox.java +++ b/src/main/java/techreborn/items/ItemScrapBox.java @@ -36,6 +36,7 @@ import reborncore.api.recipe.RecipeHandler; import reborncore.common.util.WorldUtils; import techreborn.TechReborn; import techreborn.api.Reference; + import java.util.List; public class ItemScrapBox extends Item { diff --git a/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java b/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java index af0895aa1..88f8e4e9c 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java @@ -27,11 +27,7 @@ package techreborn.items.armor; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ArmorMaterial; -import net.minecraft.item.Item; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.world.World; @@ -43,6 +39,7 @@ import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PoweredItemContainerProvider; import reborncore.common.util.ItemUtils; import techreborn.config.ConfigTechReborn; + import javax.annotation.Nullable; public class ItemLapotronicOrbpack extends ItemArmor implements IEnergyItemInfo { diff --git a/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java index 1dde371c8..993af3d41 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java @@ -27,11 +27,7 @@ package techreborn.items.armor; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ArmorMaterial; -import net.minecraft.item.Item; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/items/armor/ItemTRArmour.java b/src/main/java/techreborn/items/armor/ItemTRArmour.java index ff91d5dee..8c55e5554 100644 --- a/src/main/java/techreborn/items/armor/ItemTRArmour.java +++ b/src/main/java/techreborn/items/armor/ItemTRArmour.java @@ -25,7 +25,10 @@ package techreborn.items.armor; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.*; +import net.minecraft.item.IArmorMaterial; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; import reborncore.common.util.ItemUtils; import techreborn.TechReborn; import techreborn.events.TRRecipeHandler; diff --git a/src/main/java/techreborn/items/tool/advanced/ItemAdvancedDrill.java b/src/main/java/techreborn/items/tool/advanced/ItemAdvancedDrill.java index 5caa96c24..160f939a6 100644 --- a/src/main/java/techreborn/items/tool/advanced/ItemAdvancedDrill.java +++ b/src/main/java/techreborn/items/tool/advanced/ItemAdvancedDrill.java @@ -25,8 +25,8 @@ package techreborn.items.tool.advanced; import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemGroup; import net.minecraft.init.Items; +import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTier; import net.minecraft.util.NonNullList; diff --git a/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java b/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java index c46be0136..5b96ac6c6 100644 --- a/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java +++ b/src/main/java/techreborn/items/tool/advanced/ItemRockCutter.java @@ -25,12 +25,12 @@ package techreborn.items.tool.advanced; import net.minecraft.block.state.IBlockState; -import net.minecraft.item.*; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Enchantments; import net.minecraft.init.Items; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/techreborn/items/tool/basic/ItemBasicChainsaw.java b/src/main/java/techreborn/items/tool/basic/ItemBasicChainsaw.java index 6f90ae783..dd3481932 100644 --- a/src/main/java/techreborn/items/tool/basic/ItemBasicChainsaw.java +++ b/src/main/java/techreborn/items/tool/basic/ItemBasicChainsaw.java @@ -25,8 +25,8 @@ package techreborn.items.tool.basic; import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemGroup; import net.minecraft.init.Items; +import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTier; import net.minecraft.util.NonNullList; diff --git a/src/main/java/techreborn/items/tool/basic/ItemBasicDrill.java b/src/main/java/techreborn/items/tool/basic/ItemBasicDrill.java index 2f6c0febd..ccd618f14 100644 --- a/src/main/java/techreborn/items/tool/basic/ItemBasicDrill.java +++ b/src/main/java/techreborn/items/tool/basic/ItemBasicDrill.java @@ -32,7 +32,6 @@ import net.minecraft.item.ItemTier; import net.minecraft.util.NonNullList; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.common.ToolType; import reborncore.common.powerSystem.forge.ForgePowerItemManager; import techreborn.config.ConfigTechReborn; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java b/src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java index e44ff5fe8..0d4b2410e 100644 --- a/src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java +++ b/src/main/java/techreborn/items/tool/basic/ItemElectricTreetap.java @@ -25,18 +25,13 @@ package techreborn.items.tool.basic; import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemGroup; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumActionResult; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.capabilities.ICapabilityProvider; diff --git a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java index d2b6f73e4..f2e19a996 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java @@ -25,7 +25,6 @@ package techreborn.items.tool.industrial; import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemGroup; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; diff --git a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java index 729cc4261..468ea3234 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java @@ -26,10 +26,10 @@ package techreborn.items.tool.industrial; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemGroup; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTier; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java b/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java index 654e3b8e3..82f841aed 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java @@ -28,20 +28,19 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.*; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java b/src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java index 7e1379a97..f46b5eb77 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemOmniTool.java @@ -26,12 +26,14 @@ package techreborn.items.tool.industrial; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.*; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.item.*; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; diff --git a/src/main/java/techreborn/items/tool/vanilla/ItemTRHoe.java b/src/main/java/techreborn/items/tool/vanilla/ItemTRHoe.java index 2ba9f9e08..ac4e9fadd 100644 --- a/src/main/java/techreborn/items/tool/vanilla/ItemTRHoe.java +++ b/src/main/java/techreborn/items/tool/vanilla/ItemTRHoe.java @@ -28,8 +28,6 @@ import net.minecraft.item.IItemTier; import net.minecraft.item.Item; import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemStack; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import reborncore.common.util.ItemUtils; public class ItemTRHoe extends ItemHoe { diff --git a/src/main/java/techreborn/proxies/ClientProxy.java b/src/main/java/techreborn/proxies/ClientProxy.java index 0e7ab6bfe..f22ca9d72 100644 --- a/src/main/java/techreborn/proxies/ClientProxy.java +++ b/src/main/java/techreborn/proxies/ClientProxy.java @@ -29,22 +29,18 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.IRenderFactory; import net.minecraftforge.fml.client.registry.RenderingRegistry; import reborncore.api.tile.IUpgradeable; import reborncore.client.IconSupplier; -import reborncore.client.hud.StackInfoHUD; -import techreborn.blocks.BlockRubberLeaves; -import techreborn.client.ClientEventHandler; - import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.slot.GuiFluidConfiguration; import reborncore.client.gui.builder.slot.GuiSlotConfiguration; +import reborncore.client.hud.StackInfoHUD; +import techreborn.client.ClientEventHandler; import techreborn.client.keybindings.KeyBindings; -import techreborn.client.render.ModelDynamicCell; import techreborn.client.render.entitys.RenderNukePrimed; import techreborn.entities.EntityNukePrimed; import techreborn.events.StackToolTipEvent; diff --git a/src/main/java/techreborn/tiles/TileAlarm.java b/src/main/java/techreborn/tiles/TileAlarm.java index da7afdae9..be7b7f81a 100644 --- a/src/main/java/techreborn/tiles/TileAlarm.java +++ b/src/main/java/techreborn/tiles/TileAlarm.java @@ -24,19 +24,15 @@ package techreborn.tiles; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ITickable; import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; import reborncore.api.IToolDrop; import reborncore.common.util.ChatUtils; import techreborn.blocks.BlockAlarm; diff --git a/src/main/java/techreborn/tiles/TileChargeOMat.java b/src/main/java/techreborn/tiles/TileChargeOMat.java index 951ebe84d..4a7e5d447 100644 --- a/src/main/java/techreborn/tiles/TileChargeOMat.java +++ b/src/main/java/techreborn/tiles/TileChargeOMat.java @@ -29,6 +29,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import reborncore.api.IToolDrop; import reborncore.api.tile.ItemHandlerProvider; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; @@ -36,9 +39,6 @@ import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.init.TRContent; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRTileEntities; @RebornRegister(TechReborn.MOD_ID) diff --git a/src/main/java/techreborn/tiles/TileChunkLoader.java b/src/main/java/techreborn/tiles/TileChunkLoader.java index 9b433f00d..7d282d0e0 100644 --- a/src/main/java/techreborn/tiles/TileChunkLoader.java +++ b/src/main/java/techreborn/tiles/TileChunkLoader.java @@ -29,14 +29,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import reborncore.api.IToolDrop; import reborncore.api.tile.ItemHandlerProvider; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; diff --git a/src/main/java/techreborn/tiles/TileCreativeQuantumTank.java b/src/main/java/techreborn/tiles/TileCreativeQuantumTank.java index cfffc81c8..60b808d45 100644 --- a/src/main/java/techreborn/tiles/TileCreativeQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileCreativeQuantumTank.java @@ -24,7 +24,6 @@ package techreborn.tiles; -import techreborn.init.TRContent; import techreborn.init.TRTileEntities; public class TileCreativeQuantumTank extends TileQuantumTank { diff --git a/src/main/java/techreborn/tiles/TileDigitalChest.java b/src/main/java/techreborn/tiles/TileDigitalChest.java index 5a36193de..a24697186 100644 --- a/src/main/java/techreborn/tiles/TileDigitalChest.java +++ b/src/main/java/techreborn/tiles/TileDigitalChest.java @@ -25,12 +25,12 @@ package techreborn.tiles; import net.minecraft.entity.player.EntityPlayer; -import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.config.ConfigRegistry; -import techreborn.TechReborn; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.common.registration.RebornRegister; +import reborncore.common.registration.config.ConfigRegistry; +import techreborn.TechReborn; import techreborn.init.TRTileEntities; @RebornRegister(TechReborn.MOD_ID) diff --git a/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java b/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java index 8358c2719..a038e2cf4 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java +++ b/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java @@ -28,6 +28,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import reborncore.api.IListInfoProvider; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; @@ -35,9 +38,6 @@ import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.TechReborn; import techreborn.api.Reference; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; import techreborn.items.DynamicCell; diff --git a/src/main/java/techreborn/tiles/TileMachineCasing.java b/src/main/java/techreborn/tiles/TileMachineCasing.java index ff81f06db..df027c051 100644 --- a/src/main/java/techreborn/tiles/TileMachineCasing.java +++ b/src/main/java/techreborn/tiles/TileMachineCasing.java @@ -24,7 +24,6 @@ package techreborn.tiles; -import net.minecraft.tileentity.TileEntityType; import reborncore.common.multiblock.MultiblockControllerBase; import reborncore.common.multiblock.rectangular.RectangularMultiblockTileEntityBase; import techreborn.init.TRTileEntities; diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 571f7f5ad..4fce61d64 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -29,6 +29,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import reborncore.api.IToolDrop; import reborncore.api.tile.ItemHandlerProvider; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; @@ -36,9 +39,6 @@ import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.TechReborn; import techreborn.init.TRContent; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRTileEntities; @RebornRegister(TechReborn.MOD_ID) diff --git a/src/main/java/techreborn/tiles/TileQuantumChest.java b/src/main/java/techreborn/tiles/TileQuantumChest.java index 03de8d142..0626d4bca 100644 --- a/src/main/java/techreborn/tiles/TileQuantumChest.java +++ b/src/main/java/techreborn/tiles/TileQuantumChest.java @@ -26,18 +26,14 @@ package techreborn.tiles; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntityType; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.util.LazyOptional; -import reborncore.common.registration.RebornRegister; -import reborncore.common.registration.config.ConfigRegistry; -import techreborn.TechReborn; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; +import reborncore.common.registration.RebornRegister; +import reborncore.common.registration.config.ConfigRegistry; +import techreborn.TechReborn; import techreborn.init.TRTileEntities; -import javax.annotation.Nonnull; - @RebornRegister(TechReborn.MOD_ID) public class TileQuantumChest extends TileTechStorageBase implements IContainerProvider { diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index e08539117..c353b6389 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -35,6 +35,9 @@ import net.minecraft.util.text.TextComponentString; import reborncore.api.IListInfoProvider; import reborncore.api.IToolDrop; import reborncore.api.tile.ItemHandlerProvider; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.tile.TileMachineBase; @@ -42,9 +45,6 @@ import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; import reborncore.common.util.Tank; import techreborn.TechReborn; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; diff --git a/src/main/java/techreborn/tiles/TileTechStorageBase.java b/src/main/java/techreborn/tiles/TileTechStorageBase.java index 4768b62db..cc0950d3c 100644 --- a/src/main/java/techreborn/tiles/TileTechStorageBase.java +++ b/src/main/java/techreborn/tiles/TileTechStorageBase.java @@ -30,7 +30,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import net.minecraftforge.common.capabilities.Capability; @@ -45,7 +44,6 @@ import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/techreborn/tiles/cable/TileCable.java b/src/main/java/techreborn/tiles/cable/TileCable.java index b4c1dbc9c..53f9f8917 100644 --- a/src/main/java/techreborn/tiles/cable/TileCable.java +++ b/src/main/java/techreborn/tiles/cable/TileCable.java @@ -31,7 +31,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; import net.minecraft.util.text.ITextComponent; @@ -39,7 +38,6 @@ import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.common.util.NonNullSupplier; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import reborncore.api.IListInfoProvider; @@ -51,7 +49,6 @@ import techreborn.blocks.cable.BlockCable; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java index a34b4f134..413d21dfb 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java @@ -31,6 +31,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import reborncore.api.IToolDrop; import reborncore.api.tile.ItemHandlerProvider; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.RebornCoreConfig; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; @@ -41,9 +44,6 @@ import reborncore.common.util.Torus; import techreborn.TechReborn; import techreborn.api.reactor.FusionReactorRecipe; import techreborn.api.reactor.FusionReactorRecipeHelper; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; diff --git a/src/main/java/techreborn/tiles/generator/TileLightningRod.java b/src/main/java/techreborn/tiles/generator/TileLightningRod.java index 97ce57a5c..436944306 100644 --- a/src/main/java/techreborn/tiles/generator/TileLightningRod.java +++ b/src/main/java/techreborn/tiles/generator/TileLightningRod.java @@ -27,11 +27,9 @@ package techreborn.tiles.generator; import net.minecraft.block.Block; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.oredict.OreDictionary; import reborncore.api.IToolDrop; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; diff --git a/src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java b/src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java index 5a686d11e..3ac535a5a 100644 --- a/src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TilePlasmaGenerator.java @@ -26,14 +26,14 @@ package techreborn.tiles.generator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import techreborn.api.generator.EFluidGenerator; import techreborn.init.TRContent; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRTileEntities; @RebornRegister(TechReborn.MOD_ID) diff --git a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java index 4825e2bcc..3542a558b 100644 --- a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java +++ b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java @@ -28,7 +28,6 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java index f2ebceed8..1c53de886 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileDieselGenerator.java @@ -26,6 +26,9 @@ package techreborn.tiles.generator.advanced; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; @@ -33,9 +36,6 @@ import techreborn.api.generator.EFluidGenerator; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; import techreborn.tiles.generator.TileBaseFluidGenerator; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; @RebornRegister(TechReborn.MOD_ID) public class TileDieselGenerator extends TileBaseFluidGenerator implements IContainerProvider { diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java index 33815bdf5..f2f594612 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileGasTurbine.java @@ -26,6 +26,9 @@ package techreborn.tiles.generator.advanced; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; @@ -33,9 +36,6 @@ import techreborn.api.generator.EFluidGenerator; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; import techreborn.tiles.generator.TileBaseFluidGenerator; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; @RebornRegister(TechReborn.MOD_ID) public class TileGasTurbine extends TileBaseFluidGenerator implements IContainerProvider { diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java b/src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java index ed829772f..36dc4cd8c 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileSemiFluidGenerator.java @@ -26,6 +26,9 @@ package techreborn.tiles.generator.advanced; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; @@ -33,9 +36,6 @@ import techreborn.api.generator.EFluidGenerator; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; import techreborn.tiles.generator.TileBaseFluidGenerator; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; @RebornRegister(TechReborn.MOD_ID) public class TileSemiFluidGenerator extends TileBaseFluidGenerator implements IContainerProvider { diff --git a/src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java index 04b83716d..e43adc132 100644 --- a/src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/advanced/TileThermalGenerator.java @@ -26,6 +26,9 @@ package techreborn.tiles.generator.advanced; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; @@ -33,9 +36,6 @@ import techreborn.api.generator.EFluidGenerator; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; import techreborn.tiles.generator.TileBaseFluidGenerator; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; @RebornRegister(TechReborn.MOD_ID) public class TileThermalGenerator extends TileBaseFluidGenerator implements IContainerProvider { diff --git a/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java b/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java index fac6b22ac..451552908 100644 --- a/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java +++ b/src/main/java/techreborn/tiles/generator/basic/TileSolidFuelGenerator.java @@ -33,15 +33,15 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.common.ForgeMod; import reborncore.api.IToolDrop; import reborncore.api.tile.ItemHandlerProvider; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; diff --git a/src/main/java/techreborn/tiles/lighting/TileLamp.java b/src/main/java/techreborn/tiles/lighting/TileLamp.java index 2babb0cd9..6f13a04d8 100644 --- a/src/main/java/techreborn/tiles/lighting/TileLamp.java +++ b/src/main/java/techreborn/tiles/lighting/TileLamp.java @@ -28,7 +28,6 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.EnumFacing; import reborncore.api.IToolDrop; import reborncore.common.powerSystem.TilePowerAcceptor; diff --git a/src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java b/src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java index 89e7733d0..5760907f9 100644 --- a/src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java @@ -24,18 +24,17 @@ package techreborn.tiles.machine.iron; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; import reborncore.api.IToolDrop; import reborncore.api.recipe.IBaseRecipeType; import reborncore.api.recipe.RecipeHandler; import reborncore.api.tile.ItemHandlerProvider; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.recipes.RecipeTranslator; import reborncore.common.registration.RebornRegister; import reborncore.common.tile.TileMachineBase; @@ -45,11 +44,7 @@ import techreborn.TechReborn; import techreborn.api.Reference; import techreborn.api.recipe.machines.AlloySmelterRecipe; import techreborn.init.TRContent; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRTileEntities; -import techreborn.tiles.machine.tier1.TileElectricFurnace; @RebornRegister(TechReborn.MOD_ID) public class TileIronAlloyFurnace extends TileMachineBase diff --git a/src/main/java/techreborn/tiles/machine/iron/TileIronFurnace.java b/src/main/java/techreborn/tiles/machine/iron/TileIronFurnace.java index 25d75dab7..834eb13e6 100644 --- a/src/main/java/techreborn/tiles/machine/iron/TileIronFurnace.java +++ b/src/main/java/techreborn/tiles/machine/iron/TileIronFurnace.java @@ -30,14 +30,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraftforge.common.crafting.VanillaRecipeTypes; import reborncore.api.tile.ItemHandlerProvider; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.tile.TileMachineBase; import reborncore.common.util.IInventoryAccess; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.events.TRRecipeHandler; import techreborn.init.TRTileEntities; diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java b/src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java index f6728077c..ee8c998bf 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileDistillationTower.java @@ -27,6 +27,9 @@ package techreborn.tiles.machine.multiblock; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; @@ -34,9 +37,6 @@ import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.Reference; import techreborn.init.TRContent; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRTileEntities; import techreborn.tiles.TileGenericMachine; diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java b/src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java index 09b625a78..5372d4ed1 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java @@ -27,6 +27,9 @@ package techreborn.tiles.machine.multiblock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; @@ -37,9 +40,6 @@ import reborncore.common.util.Tank; import techreborn.TechReborn; import techreborn.api.fluidreplicator.FluidReplicatorRecipeCrafter; import techreborn.init.TRContent; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRTileEntities; import techreborn.tiles.TileGenericMachine; diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java index efbd907bb..16ab2dbbc 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileImplosionCompressor.java @@ -26,6 +26,9 @@ package techreborn.tiles.machine.multiblock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.BlockPos; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; @@ -33,9 +36,6 @@ import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.Reference; import techreborn.init.TRContent; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRTileEntities; import techreborn.tiles.TileGenericMachine; diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java index fc3925ec6..ee3839b05 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java @@ -31,6 +31,9 @@ import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.multiblock.IMultiblockPart; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; @@ -42,9 +45,6 @@ import techreborn.api.recipe.ITileRecipeHandler; import techreborn.api.recipe.machines.BlastFurnaceRecipe; import techreborn.blocks.BlockMachineCasing; import techreborn.init.TRContent; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRTileEntities; import techreborn.multiblocks.MultiBlockCasing; import techreborn.tiles.TileGenericMachine; diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java index 9a8bfe08c..8ff3bab97 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java @@ -34,6 +34,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; @@ -46,9 +49,6 @@ import techreborn.api.Reference; import techreborn.api.recipe.ITileRecipeHandler; import techreborn.api.recipe.machines.IndustrialGrinderRecipe; import techreborn.init.TRContent; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRTileEntities; import techreborn.tiles.TileGenericMachine; diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java index 1df0acd47..4013f2550 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java @@ -34,6 +34,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; @@ -46,11 +49,9 @@ import techreborn.api.Reference; import techreborn.api.recipe.ITileRecipeHandler; import techreborn.api.recipe.machines.IndustrialSawmillRecipe; import techreborn.init.TRContent; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRTileEntities; import techreborn.tiles.TileGenericMachine; + import javax.annotation.Nullable; @RebornRegister(TechReborn.MOD_ID) diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java b/src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java index 052a68038..b500fd021 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java @@ -25,6 +25,9 @@ package techreborn.tiles.machine.multiblock; import net.minecraft.entity.player.EntityPlayer; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; @@ -32,9 +35,6 @@ import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.Reference; import techreborn.init.TRContent; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRTileEntities; import techreborn.tiles.TileGenericMachine; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java b/src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java index ca0706658..75e81425e 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileAlloySmelter.java @@ -26,6 +26,9 @@ package techreborn.tiles.machine.tier1; import net.minecraft.entity.player.EntityPlayer; import reborncore.api.recipe.RecipeHandler; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; @@ -34,9 +37,6 @@ import reborncore.common.util.ItemUtils; import techreborn.TechReborn; import techreborn.api.Reference; import techreborn.api.recipe.machines.AlloySmelterRecipe; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; import techreborn.tiles.TileGenericMachine; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java b/src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java index ee78093b8..b1f9b9edb 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileAssemblingMachine.java @@ -25,15 +25,15 @@ package techreborn.tiles.machine.tier1; import net.minecraft.entity.player.EntityPlayer; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.Reference; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; import techreborn.tiles.TileGenericMachine; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java b/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java index 2af514154..25aff0b07 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java @@ -38,6 +38,9 @@ import net.minecraftforge.items.IItemHandler; import org.apache.commons.lang3.tuple.Pair; import reborncore.api.IToolDrop; import reborncore.api.tile.ItemHandlerProvider; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; @@ -45,9 +48,6 @@ import reborncore.common.util.IInventoryAccess; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.TechReborn; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.events.TRRecipeHandler; import techreborn.init.ModSounds; import techreborn.init.TRContent; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java b/src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java index 659d4a11f..17b167e71 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileChemicalReactor.java @@ -25,6 +25,9 @@ package techreborn.tiles.machine.tier1; import net.minecraft.entity.player.EntityPlayer; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; @@ -32,9 +35,6 @@ import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.Reference; import techreborn.init.TRContent; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRTileEntities; import techreborn.tiles.TileGenericMachine; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java b/src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java index beb165e47..24a223117 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileCompressor.java @@ -25,15 +25,15 @@ package techreborn.tiles.machine.tier1; import net.minecraft.entity.player.EntityPlayer; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.Reference; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; import techreborn.tiles.TileGenericMachine; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java index 6f9424623..77321c423 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileElectricFurnace.java @@ -31,15 +31,15 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.common.crafting.VanillaRecipeTypes; import reborncore.api.IToolDrop; import reborncore.api.tile.ItemHandlerProvider; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.events.TRRecipeHandler; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java b/src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java index e3420b54d..647ed1a2c 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileExtractor.java @@ -25,15 +25,15 @@ package techreborn.tiles.machine.tier1; import net.minecraft.entity.player.EntityPlayer; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.Reference; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; import techreborn.tiles.TileGenericMachine; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java b/src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java index 19c69d868..7cd219129 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileGrinder.java @@ -25,15 +25,15 @@ package techreborn.tiles.machine.tier1; import net.minecraft.entity.player.EntityPlayer; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.Reference; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; import techreborn.tiles.TileGenericMachine; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.java b/src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.java index 36177db9a..3a35dd591 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileIndustrialElectrolyzer.java @@ -25,6 +25,9 @@ package techreborn.tiles.machine.tier1; import net.minecraft.entity.player.EntityPlayer; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.recipes.RecipeCrafter; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; @@ -32,9 +35,6 @@ import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.TechReborn; import techreborn.api.Reference; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; import techreborn.items.DynamicCell; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TilePlayerDectector.java b/src/main/java/techreborn/tiles/machine/tier1/TilePlayerDectector.java index b0def561c..47fb00276 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TilePlayerDectector.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TilePlayerDectector.java @@ -29,7 +29,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import reborncore.api.IToolDrop; -import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java b/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java index a031f3ad2..2d0ce79c9 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java @@ -30,6 +30,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import reborncore.api.IToolDrop; import reborncore.api.tile.ItemHandlerProvider; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; @@ -37,9 +40,6 @@ import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.init.TRContent; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRTileEntities; @RebornRegister(TechReborn.MOD_ID) diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java b/src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java index 0dbb42fb2..dc390b79e 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java @@ -35,6 +35,9 @@ import net.minecraft.util.EnumFacing; import org.apache.commons.lang3.tuple.Pair; import reborncore.api.IToolDrop; import reborncore.api.tile.ItemHandlerProvider; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; @@ -42,9 +45,6 @@ import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.TechReborn; import techreborn.api.RollingMachineRecipe; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java b/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java index 6bdafd862..32823ca42 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java @@ -25,14 +25,14 @@ package techreborn.tiles.machine.tier1; import net.minecraft.entity.player.EntityPlayer; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; import techreborn.api.recipe.ScrapboxRecipeCrafter; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; import techreborn.tiles.TileGenericMachine; diff --git a/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java b/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java index 3503cdf69..2f873fa68 100644 --- a/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java +++ b/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java @@ -28,13 +28,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import reborncore.api.power.EnumPowerTier; +import reborncore.client.containerBuilder.IContainerProvider; +import reborncore.client.containerBuilder.builder.BuiltContainer; +import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.TechReborn; -import reborncore.client.containerBuilder.IContainerProvider; -import reborncore.client.containerBuilder.builder.BuiltContainer; -import reborncore.client.containerBuilder.builder.ContainerBuilder; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; diff --git a/src/main/java/techreborn/tiles/storage/idsu/IDSUManager.java b/src/main/java/techreborn/tiles/storage/idsu/IDSUManager.java index 2b81a2663..7ffbd51d3 100644 --- a/src/main/java/techreborn/tiles/storage/idsu/IDSUManager.java +++ b/src/main/java/techreborn/tiles/storage/idsu/IDSUManager.java @@ -26,7 +26,6 @@ package techreborn.tiles.storage.idsu; import net.minecraft.world.World; import net.minecraft.world.storage.WorldSavedDataStorage; -import techreborn.TechReborn; public class IDSUManager { public static IDataIDSU getData(World world) { diff --git a/src/main/java/techreborn/tiles/storage/lesu/TileLSUStorage.java b/src/main/java/techreborn/tiles/storage/lesu/TileLSUStorage.java index a1e774022..df46ddcfc 100644 --- a/src/main/java/techreborn/tiles/storage/lesu/TileLSUStorage.java +++ b/src/main/java/techreborn/tiles/storage/lesu/TileLSUStorage.java @@ -26,7 +26,6 @@ package techreborn.tiles.storage.lesu; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java b/src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java index 23bbeeb94..8fda3b1c6 100644 --- a/src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java +++ b/src/main/java/techreborn/tiles/storage/lesu/TileLapotronicSU.java @@ -30,6 +30,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import reborncore.api.power.EnumPowerTier; +import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.common.RebornCoreConfig; @@ -40,7 +41,6 @@ import techreborn.blocks.storage.BlockLapotronicSU; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; import techreborn.tiles.storage.TileEnergyStorage; -import reborncore.client.containerBuilder.IContainerProvider; import java.util.ArrayList; diff --git a/src/main/java/techreborn/utils/StackWIPHandler.java b/src/main/java/techreborn/utils/StackWIPHandler.java index 8c5cd3a4a..fb31901c6 100644 --- a/src/main/java/techreborn/utils/StackWIPHandler.java +++ b/src/main/java/techreborn/utils/StackWIPHandler.java @@ -35,8 +35,8 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import techreborn.init.TRContent; import reborncore.common.util.StringUtils; +import techreborn.init.TRContent; import java.util.ArrayList; diff --git a/src/main/java/techreborn/utils/TagUtils.java b/src/main/java/techreborn/utils/TagUtils.java index 4d9566cb5..54b73e1ea 100644 --- a/src/main/java/techreborn/utils/TagUtils.java +++ b/src/main/java/techreborn/utils/TagUtils.java @@ -32,11 +32,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tags.Tag; import net.minecraft.tags.TagCollection; import net.minecraft.world.World; -import net.minecraftforge.oredict.OreDictionary; -import techreborn.init.ModTags; import javax.annotation.Nonnull; -import java.util.List; public class TagUtils { diff --git a/src/main/java/techreborn/world/RubberTreeGenerator.java b/src/main/java/techreborn/world/RubberTreeGenerator.java index 6d3261085..3fe2f3077 100644 --- a/src/main/java/techreborn/world/RubberTreeGenerator.java +++ b/src/main/java/techreborn/world/RubberTreeGenerator.java @@ -24,23 +24,14 @@ package techreborn.world; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; import net.minecraft.block.trees.AbstractTree; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.IChunkGenerator; import net.minecraft.world.gen.feature.AbstractTreeFeature; import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraftforge.common.IPlantable; import net.minecraftforge.fml.common.IWorldGenerator; -import techreborn.TechReborn; -import techreborn.blocks.BlockRubberLeaves; -import techreborn.blocks.BlockRubberLog; -import techreborn.init.TRContent; import javax.annotation.Nullable; import java.util.Random; diff --git a/src/main/java/techreborn/world/village/VillageComponentRubberPlantaion.java b/src/main/java/techreborn/world/village/VillageComponentRubberPlantaion.java index 6380ec5f2..3b3bcf7d3 100644 --- a/src/main/java/techreborn/world/village/VillageComponentRubberPlantaion.java +++ b/src/main/java/techreborn/world/village/VillageComponentRubberPlantaion.java @@ -32,8 +32,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.MutableBoundingBox; import net.minecraft.world.IWorld; -import net.minecraft.world.World; - import net.minecraft.world.gen.feature.structure.StructurePiece; import net.minecraft.world.gen.feature.structure.VillagePieces; import techreborn.init.TRContent;