From 3983cc858bf89e2831e20b518d04d9ef39bfc0f1 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 24 May 2016 20:04:40 -0400 Subject: [PATCH] Begin the great port. 2378 errors to go! --- build.properties | 2 +- src/main/java/cofh/api/item/IToolHammer.java | 2 +- src/main/java/mekanism/api/Chunk3D.java | 1 - src/main/java/mekanism/api/Coord4D.java | 7 +++---- src/main/java/mekanism/api/EnumColor.java | 1 - src/main/java/mekanism/api/IMekWrench.java | 2 +- src/main/java/mekanism/api/Pos3D.java | 8 +++----- src/main/java/mekanism/api/gas/Gas.java | 1 - .../java/mekanism/api/gas/GasTransmission.java | 2 +- src/main/java/mekanism/api/gas/OreGas.java | 1 - src/main/java/mekanism/api/infuse/InfuseType.java | 1 - .../api/transmitters/TransmissionType.java | 1 - src/main/java/mekanism/client/ClientProxy.java | 9 ++++----- src/main/java/mekanism/client/HolidayManager.java | 1 - .../java/mekanism/client/MekanismKeyHandler.java | 1 - .../java/mekanism/client/entity/EntityLaser.java | 2 -- .../java/mekanism/client/gui/GuiMekanism.java | 2 -- .../java/mekanism/client/gui/GuiRobitRepair.java | 3 --- .../mekanism/client/gui/GuiSeismicReader.java | 2 +- .../ChemicalCrystallizerRecipeWrapper.java | 1 - .../chemical/ChemicalOxidizerRecipeWrapper.java | 1 - .../client/model/ModelAtomicDisassembler.java | 2 -- .../mekanism/client/model/ModelChargepad.java | 2 -- .../mekanism/client/model/ModelDigitalMiner.java | 2 -- .../java/mekanism/client/model/ModelRobit.java | 2 -- .../mekanism/client/render/MekanismRenderer.java | 4 ++-- .../mekanism/client/render/ModelCustomArmor.java | 2 -- .../client/render/RenderResizableCuboid.java | 6 ++---- .../mekanism/client/render/RenderTickHandler.java | 2 -- src/main/java/mekanism/client/render/ctm/CTM.java | 2 +- .../client/render/ctm/CTMBlockRenderContext.java | 2 +- .../java/mekanism/client/render/ctm/CTMData.java | 2 +- .../java/mekanism/client/render/ctm/CTMFace.java | 1 - src/main/java/mekanism/client/render/ctm/Dir.java | 2 +- .../client/render/entity/RenderFlame.java | 1 - .../render/entity/RenderObsidianTNTPrimed.java | 2 +- .../client/render/item/BakedCustomItemModel.java | 4 +--- .../render/item/CustomItemModelFactory.java | 3 +-- .../client/render/obj/GlowPanelModel.java | 6 ++---- .../client/render/obj/MekanismOBJLoader.java | 6 +++--- .../client/render/obj/MekanismOBJModel.java | 3 +-- .../client/render/obj/OBJBakedModelBase.java | 6 +++--- .../client/render/obj/TransmitterModel.java | 6 ++---- .../render/particle/EntityJetpackFlameFX.java | 2 -- .../render/particle/EntityJetpackSmokeFX.java | 2 -- .../render/particle/EntityScubaBubbleFX.java | 2 -- .../client/render/tileentity/RenderBin.java | 2 +- .../client/render/tileentity/RenderChargepad.java | 2 -- .../RenderChemicalDissolutionChamber.java | 2 -- .../tileentity/RenderConfigurableMachine.java | 3 +-- .../render/tileentity/RenderLogisticalSorter.java | 2 -- .../render/tileentity/RenderPersonalChest.java | 2 -- .../tileentity/RenderQuantumEntangloporter.java | 2 -- .../render/tileentity/RenderResistiveHeater.java | 2 -- .../tileentity/RenderRotaryCondensentrator.java | 2 -- .../render/tileentity/RenderSecurityDesk.java | 2 -- .../render/tileentity/RenderSeismicVibrator.java | 2 -- .../tileentity/RenderSolarNeutronActivator.java | 2 -- .../transmitter/RenderLogisticalTransporter.java | 1 - .../render/transmitter/RenderMechanicalPipe.java | 2 -- .../render/transmitter/RenderPressurizedTube.java | 2 -- .../transmitter/RenderThermodynamicConductor.java | 2 -- .../render/transmitter/RenderTransmitterBase.java | 2 -- .../render/transmitter/RenderUniversalCable.java | 1 - .../java/mekanism/client/sound/ISoundSource.java | 1 - .../java/mekanism/common/CommandMekanism.java | 1 - .../mekanism/common/CommonPlayerTickHandler.java | 6 +++--- src/main/java/mekanism/common/CommonProxy.java | 3 +-- .../mekanism/common/CommonWorldTickHandler.java | 1 - src/main/java/mekanism/common/CoreGuiHandler.java | 2 +- src/main/java/mekanism/common/LaserManager.java | 1 - src/main/java/mekanism/common/Mekanism.java | 3 --- src/main/java/mekanism/common/PacketHandler.java | 3 +-- src/main/java/mekanism/common/RobitAIFollow.java | 4 ++-- src/main/java/mekanism/common/RobitAIPickup.java | 6 +++--- .../java/mekanism/common/base/IGuiProvider.java | 2 +- .../java/mekanism/common/block/BlockBasic.java | 7 ++----- .../java/mekanism/common/block/BlockBounding.java | 4 +--- .../mekanism/common/block/BlockCardboardBox.java | 4 +--- .../mekanism/common/block/BlockEnergyCube.java | 6 ++---- .../java/mekanism/common/block/BlockGasTank.java | 6 ++---- .../java/mekanism/common/block/BlockMachine.java | 9 +++------ .../mekanism/common/block/BlockObsidianTNT.java | 2 +- src/main/java/mekanism/common/block/BlockOre.java | 1 - .../java/mekanism/common/block/BlockPlastic.java | 4 +--- .../mekanism/common/block/BlockPlasticFence.java | 5 ++--- .../common/block/states/BlockStateBasic.java | 2 +- .../common/block/states/BlockStateBounding.java | 1 - .../block/states/BlockStateCardboardBox.java | 3 +-- .../common/block/states/BlockStateFacing.java | 1 - .../common/block/states/BlockStateMachine.java | 2 +- .../common/block/states/BlockStateOre.java | 1 - .../common/block/states/BlockStatePlastic.java | 3 +-- .../common/chunkloading/ChunkManager.java | 2 +- .../content/boiler/BoilerUpdateProtocol.java | 2 +- .../content/boiler/SynchronizedBoilerData.java | 1 - .../content/matrix/MatrixUpdateProtocol.java | 2 +- .../common/content/miner/ThreadMinerSearch.java | 2 +- .../common/content/tank/TankUpdateProtocol.java | 2 +- .../transporter/TransporterPathfinder.java | 1 - .../mekanism/common/entity/EntityBalloon.java | 4 +--- .../java/mekanism/common/entity/EntityFlame.java | 7 ++----- .../java/mekanism/common/entity/EntityRobit.java | 2 +- .../mekanism/common/integration/CCPeripheral.java | 2 +- .../mekanism/common/integration/OCDriver.java | 2 +- .../common/integration/WailaDataProvider.java | 2 +- .../container/ContainerRobitCrafting.java | 2 +- .../inventory/container/ContainerRobitRepair.java | 2 +- .../container/ContainerRobitSmelting.java | 1 - src/main/java/mekanism/common/item/ItemAlloy.java | 2 +- .../common/item/ItemAtomicDisassembler.java | 3 +-- .../java/mekanism/common/item/ItemBalloon.java | 5 ++--- .../java/mekanism/common/item/ItemBlockBasic.java | 2 +- .../common/item/ItemBlockCardboardBox.java | 2 +- .../mekanism/common/item/ItemBlockEnergyCube.java | 2 +- .../mekanism/common/item/ItemBlockGasTank.java | 2 +- .../mekanism/common/item/ItemBlockMachine.java | 4 +--- .../mekanism/common/item/ItemBlockPlastic.java | 1 - .../common/item/ItemConfigurationCard.java | 3 +-- .../mekanism/common/item/ItemConfigurator.java | 3 +-- .../mekanism/common/item/ItemCraftingFormula.java | 2 +- .../java/mekanism/common/item/ItemDictionary.java | 3 +-- .../common/item/ItemFactoryInstaller.java | 2 +- .../mekanism/common/item/ItemNetworkReader.java | 3 +-- .../common/item/ItemPortableTeleporter.java | 1 - src/main/java/mekanism/common/item/ItemRobit.java | 2 +- .../mekanism/common/item/ItemSeismicReader.java | 1 - .../mekanism/common/item/ItemWalkieTalkie.java | 2 +- .../multiblock/TileEntityInternalMultiblock.java | 2 +- .../common/multiblock/UpdateProtocol.java | 2 +- .../mekanism/common/multipart/ItemGlowPanel.java | 4 +--- .../common/multipart/ItemPartTransmitter.java | 3 +-- .../common/multipart/MultipartTransmitter.java | 1 - .../multipart/PartDiversionTransporter.java | 1 - .../mekanism/common/multipart/PartGlowPanel.java | 6 +----- .../multipart/PartLogisticalTransporter.java | 1 - .../mekanism/common/multipart/PartSidedPipe.java | 15 +++------------ .../common/network/PacketDigitalMinerGui.java | 2 +- .../common/network/PacketLogisticalSorterGui.java | 2 +- .../network/PacketOredictionificatorGui.java | 2 +- .../common/network/PacketPersonalChest.java | 2 +- .../common/network/PacketTransmitterUpdate.java | 1 - .../tile/TileEntityAdvancedBoundingBlock.java | 2 -- .../java/mekanism/common/tile/TileEntityBin.java | 2 -- .../common/tile/TileEntityBoundingBlock.java | 2 +- .../mekanism/common/tile/TileEntityChargepad.java | 2 +- .../common/tile/TileEntityContainerBlock.java | 4 +--- .../common/tile/TileEntityDigitalMiner.java | 4 ++-- .../common/tile/TileEntityElectricPump.java | 1 - .../common/tile/TileEntityEnergyCube.java | 2 +- .../common/tile/TileEntityFluidicPlenisher.java | 1 - .../mekanism/common/tile/TileEntityGasTank.java | 2 +- .../common/tile/TileEntityInductionPort.java | 1 - .../mekanism/common/tile/TileEntityLaser.java | 1 - .../common/tile/TileEntityLaserAmplifier.java | 1 - .../common/tile/TileEntityLaserTractorBeam.java | 1 - .../common/tile/TileEntityMultiblock.java | 4 ++-- .../common/tile/TileEntityNoisyElectricBlock.java | 1 - .../common/tile/TileEntitySecurityDesk.java | 2 +- .../common/tile/TileEntitySeismicVibrator.java | 2 +- .../tile/TileEntitySolarNeutronActivator.java | 3 +-- .../common/tile/TileEntityTeleporter.java | 7 ++----- .../TileEntityThermalEvaporationController.java | 2 +- .../java/mekanism/common/util/CableUtils.java | 2 +- src/main/java/mekanism/common/util/LangUtils.java | 1 - .../java/mekanism/common/util/MekanismUtils.java | 5 +---- src/main/java/mekanism/common/util/PipeUtils.java | 2 +- .../java/mekanism/common/util/SecurityUtils.java | 1 - .../java/mekanism/common/world/GenHandler.java | 3 +-- .../java/mekanism/common/world/WorldGenSalt.java | 2 +- .../generators/client/GeneratorsClientProxy.java | 6 +++--- .../generators/client/gui/GuiReactorHeat.java | 1 - .../render/item/BakedGeneratorItemModel.java | 4 +--- .../render/item/GeneratorItemModelFactory.java | 3 +-- .../mekanism/generators/common/FusionReactor.java | 2 +- .../generators/common/GeneratorsCommonProxy.java | 2 +- .../generators/common/GeneratorsGuiHandler.java | 2 +- .../generators/common/GeneratorsItems.java | 2 +- .../generators/common/block/BlockGenerator.java | 8 +++----- .../generators/common/block/BlockReactor.java | 4 +--- .../common/block/states/BlockStateGenerator.java | 2 +- .../common/block/states/BlockStateReactor.java | 2 +- .../content/turbine/TurbineUpdateProtocol.java | 2 +- .../common/item/ItemBlockGenerator.java | 2 +- .../common/tile/TileEntityGenerator.java | 2 +- .../common/tile/TileEntityHeatGenerator.java | 2 +- .../common/tile/TileEntitySolarGenerator.java | 1 - .../tile/reactor/TileEntityReactorController.java | 3 +-- .../tile/turbine/TileEntityTurbineRotor.java | 2 +- .../java/mekanism/tools/item/ItemMekanismHoe.java | 10 +++++----- 190 files changed, 159 insertions(+), 345 deletions(-) diff --git a/build.properties b/build.properties index 3285e2991..3d6bdb407 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft_version=1.8.9 mappings_version=stable_22 -forge_version=11.15.1.1902-1.8.9 +forge_version=12.17.0.1919-1.9.4 mcmp_version=1.0.9_47 CCLIB_version=1.1.3.136 NEI_version=1.0.4.101 diff --git a/src/main/java/cofh/api/item/IToolHammer.java b/src/main/java/cofh/api/item/IToolHammer.java index 2f67b8d2b..eb5eed571 100644 --- a/src/main/java/cofh/api/item/IToolHammer.java +++ b/src/main/java/cofh/api/item/IToolHammer.java @@ -2,7 +2,7 @@ package cofh.api.item; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** * Implement this interface on subclasses of Item to have that item work as a tool for CoFH mods. diff --git a/src/main/java/mekanism/api/Chunk3D.java b/src/main/java/mekanism/api/Chunk3D.java index f469d5db5..efbd19702 100644 --- a/src/main/java/mekanism/api/Chunk3D.java +++ b/src/main/java/mekanism/api/Chunk3D.java @@ -1,7 +1,6 @@ package mekanism.api; import net.minecraft.entity.Entity; -import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index 7b416d28a..70a5fee7b 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -11,11 +11,10 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/mekanism/api/EnumColor.java b/src/main/java/mekanism/api/EnumColor.java index 32164cbf1..edfea2b89 100644 --- a/src/main/java/mekanism/api/EnumColor.java +++ b/src/main/java/mekanism/api/EnumColor.java @@ -1,7 +1,6 @@ package mekanism.api; import net.minecraft.util.IStringSerializable; -import net.minecraft.util.StatCollector; /** * Simple color enum for adding colors to in-game GUI strings of text. diff --git a/src/main/java/mekanism/api/IMekWrench.java b/src/main/java/mekanism/api/IMekWrench.java index 7442bfff2..094351ae2 100644 --- a/src/main/java/mekanism/api/IMekWrench.java +++ b/src/main/java/mekanism/api/IMekWrench.java @@ -1,7 +1,7 @@ package mekanism.api; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; public interface IMekWrench { diff --git a/src/main/java/mekanism/api/Pos3D.java b/src/main/java/mekanism/api/Pos3D.java index b480604fb..21e5edc44 100644 --- a/src/main/java/mekanism/api/Pos3D.java +++ b/src/main/java/mekanism/api/Pos3D.java @@ -3,13 +3,11 @@ package mekanism.api; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.util.Vec3i; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3i; /** * Pos3D - a way of performing operations on objects in a three dimensional environment. diff --git a/src/main/java/mekanism/api/gas/Gas.java b/src/main/java/mekanism/api/gas/Gas.java index 89cbbd4d0..c6b6c4801 100644 --- a/src/main/java/mekanism/api/gas/Gas.java +++ b/src/main/java/mekanism/api/gas/Gas.java @@ -6,7 +6,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/mekanism/api/gas/GasTransmission.java b/src/main/java/mekanism/api/gas/GasTransmission.java index 35a76a0eb..8569157cf 100644 --- a/src/main/java/mekanism/api/gas/GasTransmission.java +++ b/src/main/java/mekanism/api/gas/GasTransmission.java @@ -10,8 +10,8 @@ import mekanism.common.capabilities.Capabilities; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/mekanism/api/gas/OreGas.java b/src/main/java/mekanism/api/gas/OreGas.java index 73c1aaeb5..4f0740fa9 100644 --- a/src/main/java/mekanism/api/gas/OreGas.java +++ b/src/main/java/mekanism/api/gas/OreGas.java @@ -1,6 +1,5 @@ package mekanism.api.gas; -import net.minecraft.util.StatCollector; public class OreGas extends Gas { diff --git a/src/main/java/mekanism/api/infuse/InfuseType.java b/src/main/java/mekanism/api/infuse/InfuseType.java index 5d5fb6087..93064f2b1 100644 --- a/src/main/java/mekanism/api/infuse/InfuseType.java +++ b/src/main/java/mekanism/api/infuse/InfuseType.java @@ -2,7 +2,6 @@ package mekanism.api.infuse; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; /** * The types of infuse currently available in Mekanism. diff --git a/src/main/java/mekanism/api/transmitters/TransmissionType.java b/src/main/java/mekanism/api/transmitters/TransmissionType.java index 8ea4b4311..2b2b5560d 100644 --- a/src/main/java/mekanism/api/transmitters/TransmissionType.java +++ b/src/main/java/mekanism/api/transmitters/TransmissionType.java @@ -2,7 +2,6 @@ package mekanism.api.transmitters; import mekanism.api.gas.IGasTransmitter; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.StatCollector; public enum TransmissionType { diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 81955453b..4f90aedb7 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -192,21 +192,20 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderSkeleton; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.client.resources.model.ModelBakery; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.ModelLoader; diff --git a/src/main/java/mekanism/client/HolidayManager.java b/src/main/java/mekanism/client/HolidayManager.java index 4506099f6..7feaba274 100644 --- a/src/main/java/mekanism/client/HolidayManager.java +++ b/src/main/java/mekanism/client/HolidayManager.java @@ -9,7 +9,6 @@ import mekanism.api.MekanismConfig.client; import mekanism.common.Mekanism; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.ResourceLocation; public final class HolidayManager diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index 2fd5e249f..215a38792 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -29,7 +29,6 @@ import net.minecraft.client.settings.KeyBinding; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.registry.ClientRegistry; diff --git a/src/main/java/mekanism/client/entity/EntityLaser.java b/src/main/java/mekanism/client/entity/EntityLaser.java index 9f96f6656..bbe7fdd8d 100644 --- a/src/main/java/mekanism/client/entity/EntityLaser.java +++ b/src/main/java/mekanism/client/entity/EntityLaser.java @@ -3,9 +3,7 @@ package mekanism.client.entity; import mekanism.api.Pos3D; import mekanism.client.render.MekanismRenderer; import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/client/gui/GuiMekanism.java b/src/main/java/mekanism/client/gui/GuiMekanism.java index 99141197d..577d827bf 100644 --- a/src/main/java/mekanism/client/gui/GuiMekanism.java +++ b/src/main/java/mekanism/client/gui/GuiMekanism.java @@ -19,8 +19,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import org.lwjgl.opengl.GL11; - public abstract class GuiMekanism extends GuiContainer implements IGuiWrapper { public Set guiElements = new HashSet(); diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index 7d12f7481..01b5ea0b2 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -17,12 +17,9 @@ import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ContainerRepair; -import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; -import net.minecraft.network.play.client.C17PacketCustomPayload; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiSeismicReader.java b/src/main/java/mekanism/client/gui/GuiSeismicReader.java index 1eb4229af..a047f9f22 100644 --- a/src/main/java/mekanism/client/gui/GuiSeismicReader.java +++ b/src/main/java/mekanism/client/gui/GuiSeismicReader.java @@ -13,7 +13,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java index 2bd77b778..c1b1720ea 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalCrystallizerRecipeWrapper.java @@ -7,7 +7,6 @@ import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import mekanism.common.recipe.inputs.AdvancedMachineInput; import mekanism.common.recipe.machines.CrystallizerRecipe; import mekanism.common.util.LangUtils; import mezz.jei.api.recipe.BlankRecipeWrapper; diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java index 2391b3999..75806fc71 100644 --- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java +++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalOxidizerRecipeWrapper.java @@ -7,7 +7,6 @@ import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import mekanism.api.gas.GasRegistry; import mekanism.common.recipe.machines.OxidationRecipe; import mekanism.common.util.LangUtils; import mezz.jei.api.recipe.BlankRecipeWrapper; diff --git a/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java b/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java index c64b7808c..be0b10136 100644 --- a/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java +++ b/src/main/java/mekanism/client/model/ModelAtomicDisassembler.java @@ -5,8 +5,6 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; -import org.lwjgl.opengl.GL11; - public class ModelAtomicDisassembler extends ModelBase { ModelRenderer Shape1; diff --git a/src/main/java/mekanism/client/model/ModelChargepad.java b/src/main/java/mekanism/client/model/ModelChargepad.java index 50db8e829..b7861c3c8 100644 --- a/src/main/java/mekanism/client/model/ModelChargepad.java +++ b/src/main/java/mekanism/client/model/ModelChargepad.java @@ -11,8 +11,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class ModelChargepad extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelDigitalMiner.java b/src/main/java/mekanism/client/model/ModelDigitalMiner.java index 56ed296e9..0874f98ae 100644 --- a/src/main/java/mekanism/client/model/ModelDigitalMiner.java +++ b/src/main/java/mekanism/client/model/ModelDigitalMiner.java @@ -11,8 +11,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class ModelDigitalMiner extends ModelBase { diff --git a/src/main/java/mekanism/client/model/ModelRobit.java b/src/main/java/mekanism/client/model/ModelRobit.java index 275863559..a017cb2da 100644 --- a/src/main/java/mekanism/client/model/ModelRobit.java +++ b/src/main/java/mekanism/client/model/ModelRobit.java @@ -8,8 +8,6 @@ import net.minecraft.entity.Entity; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class ModelRobit extends ModelBase { diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 64564589d..f730f243c 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -28,10 +28,10 @@ import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.resources.model.ModelBakery; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/client/render/ModelCustomArmor.java b/src/main/java/mekanism/client/render/ModelCustomArmor.java index d676373de..f5cee378e 100644 --- a/src/main/java/mekanism/client/render/ModelCustomArmor.java +++ b/src/main/java/mekanism/client/render/ModelCustomArmor.java @@ -17,8 +17,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class ModelCustomArmor extends ModelBiped { diff --git a/src/main/java/mekanism/client/render/RenderResizableCuboid.java b/src/main/java/mekanism/client/render/RenderResizableCuboid.java index 307b8f763..eb894621f 100644 --- a/src/main/java/mekanism/client/render/RenderResizableCuboid.java +++ b/src/main/java/mekanism/client/render/RenderResizableCuboid.java @@ -9,7 +9,6 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -17,12 +16,11 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.renderer.vertex.VertexFormatElement; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; import net.minecraft.util.EnumFacing.AxisDirection; -import net.minecraft.util.Vec3; -import net.minecraft.util.Vec3i; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3i; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index 2afb176aa..a5f933444 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -17,11 +17,9 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.particle.EntityFX; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; diff --git a/src/main/java/mekanism/client/render/ctm/CTM.java b/src/main/java/mekanism/client/render/ctm/CTM.java index c40ebd968..56ec3fa0b 100644 --- a/src/main/java/mekanism/client/render/ctm/CTM.java +++ b/src/main/java/mekanism/client/render/ctm/CTM.java @@ -14,9 +14,9 @@ import gnu.trove.map.hash.TIntObjectHashMap; import java.util.EnumMap; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import com.google.common.base.Optional; diff --git a/src/main/java/mekanism/client/render/ctm/CTMBlockRenderContext.java b/src/main/java/mekanism/client/render/ctm/CTMBlockRenderContext.java index ceed95c0e..624d3483a 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMBlockRenderContext.java +++ b/src/main/java/mekanism/client/render/ctm/CTMBlockRenderContext.java @@ -2,8 +2,8 @@ package mekanism.client.render.ctm; import java.util.EnumMap; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; public class CTMBlockRenderContext diff --git a/src/main/java/mekanism/client/render/ctm/CTMData.java b/src/main/java/mekanism/client/render/ctm/CTMData.java index f6cfd7e77..3cb7015bc 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMData.java +++ b/src/main/java/mekanism/client/render/ctm/CTMData.java @@ -4,9 +4,9 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/render/ctm/CTMFace.java b/src/main/java/mekanism/client/render/ctm/CTMFace.java index baf7bfe0e..ea5c4ca40 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMFace.java +++ b/src/main/java/mekanism/client/render/ctm/CTMFace.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.EnumWorldBlockLayer; /** * Chisel Face, basically a list of IChiselTexture's diff --git a/src/main/java/mekanism/client/render/ctm/Dir.java b/src/main/java/mekanism/client/render/ctm/Dir.java index db3fc3b05..b33d38458 100644 --- a/src/main/java/mekanism/client/render/ctm/Dir.java +++ b/src/main/java/mekanism/client/render/ctm/Dir.java @@ -7,10 +7,10 @@ import static net.minecraft.util.EnumFacing.SOUTH; import static net.minecraft.util.EnumFacing.UP; import static net.minecraft.util.EnumFacing.WEST; import net.minecraft.block.state.IBlockState; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; import net.minecraft.util.EnumFacing.AxisDirection; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; /** diff --git a/src/main/java/mekanism/client/render/entity/RenderFlame.java b/src/main/java/mekanism/client/render/entity/RenderFlame.java index c3e080daf..982fc9cc8 100644 --- a/src/main/java/mekanism/client/render/entity/RenderFlame.java +++ b/src/main/java/mekanism/client/render/entity/RenderFlame.java @@ -4,7 +4,6 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.entity.EntityFlame; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; diff --git a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java index 9ecec3915..130ecfdee 100644 --- a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java +++ b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java @@ -9,8 +9,8 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java index 0aa94a283..14f7fb25a 100644 --- a/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java +++ b/src/main/java/mekanism/client/render/item/BakedCustomItemModel.java @@ -52,8 +52,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; @@ -61,12 +61,10 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.Attributes; -import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/mekanism/client/render/item/CustomItemModelFactory.java b/src/main/java/mekanism/client/render/item/CustomItemModelFactory.java index 9536dc0ae..3bfe189bb 100644 --- a/src/main/java/mekanism/client/render/item/CustomItemModelFactory.java +++ b/src/main/java/mekanism/client/render/item/CustomItemModelFactory.java @@ -3,12 +3,11 @@ package mekanism.client.render.item; import java.util.List; import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraftforge.client.model.ISmartItemModel; public class CustomItemModelFactory implements ISmartItemModel { diff --git a/src/main/java/mekanism/client/render/obj/GlowPanelModel.java b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java index ad91e5909..a6155eb45 100644 --- a/src/main/java/mekanism/client/render/obj/GlowPanelModel.java +++ b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java @@ -5,7 +5,6 @@ import java.util.Map; import javax.vecmath.Matrix4f; -import mcmultipart.client.multipart.ISmartMultipartModel; import mekanism.api.EnumColor; import mekanism.client.render.ctm.CTMModelFactory; import mekanism.common.multipart.ColorProperty; @@ -13,20 +12,19 @@ import mekanism.common.multipart.PartGlowPanel; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.IFlexibleBakedModel; -import net.minecraftforge.client.model.IModelState; import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.client.model.obj.OBJModel.Face; import net.minecraftforge.client.model.obj.OBJModel.OBJBakedModel; +import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.property.IExtendedBlockState; import org.apache.commons.lang3.tuple.ImmutablePair; diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java index 8364bb2fc..031a78d15 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java +++ b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java @@ -8,21 +8,21 @@ import javax.vecmath.Matrix4f; import mekanism.client.render.obj.MekanismOBJModel.OBJModelType; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.IModelState; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.client.model.obj.OBJModel.OBJBakedModel; +import net.minecraftforge.common.model.IModelState; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java b/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java index f057f283e..650de0c8a 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java +++ b/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java @@ -3,10 +3,9 @@ package mekanism.client.render.obj; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IModel; -import net.minecraftforge.client.model.IModelState; import net.minecraftforge.client.model.obj.OBJModel; +import net.minecraftforge.common.model.IModelState; import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; diff --git a/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java b/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java index 31f704a8f..19d79678c 100644 --- a/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java +++ b/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java @@ -13,14 +13,12 @@ import javax.vecmath.Matrix4f; import mekanism.client.render.MekanismRenderer; import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.util.EnumFacing; -import net.minecraftforge.client.model.IModelState; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.client.model.obj.OBJModel.Face; import net.minecraftforge.client.model.obj.OBJModel.Group; @@ -31,6 +29,8 @@ import net.minecraftforge.client.model.obj.OBJModel.TextureCoordinate; import net.minecraftforge.client.model.obj.OBJModel.Vertex; import net.minecraftforge.client.model.pipeline.LightUtil; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; +import net.minecraftforge.common.model.IModelState; +import net.minecraftforge.common.model.TRSRTransformation; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; diff --git a/src/main/java/mekanism/client/render/obj/TransmitterModel.java b/src/main/java/mekanism/client/render/obj/TransmitterModel.java index 1168745c2..69fe042ac 100644 --- a/src/main/java/mekanism/client/render/obj/TransmitterModel.java +++ b/src/main/java/mekanism/client/render/obj/TransmitterModel.java @@ -8,30 +8,28 @@ import java.util.Objects; import javax.vecmath.Matrix4f; -import mcmultipart.client.multipart.ISmartMultipartModel; import mekanism.api.MekanismConfig.client; import mekanism.common.multipart.ColorProperty; import mekanism.common.multipart.ConnectionProperty; import mekanism.common.multipart.PartSidedPipe; import mekanism.common.multipart.PartSidedPipe.ConnectionType; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; -import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.client.model.IModelState; import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.client.model.obj.OBJModel.Face; import net.minecraftforge.client.model.obj.OBJModel.Group; import net.minecraftforge.client.model.obj.OBJModel.OBJProperty; import net.minecraftforge.client.model.obj.OBJModel.OBJState; +import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.property.IExtendedBlockState; import com.google.common.collect.ImmutableMap; diff --git a/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java b/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java index 5b8540313..3fcf43daa 100644 --- a/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityJetpackFlameFX.java @@ -1,8 +1,6 @@ package mekanism.client.render.particle; import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityFlameFX; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.entity.Entity; import net.minecraft.world.World; import net.minecraftforge.fml.client.FMLClientHandler; diff --git a/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java b/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java index 8d219b70e..2d6006431 100644 --- a/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityJetpackSmokeFX.java @@ -1,8 +1,6 @@ package mekanism.client.render.particle; import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntitySmokeFX; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.entity.Entity; import net.minecraft.world.World; import net.minecraftforge.fml.client.FMLClientHandler; diff --git a/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java b/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java index caa6d488c..49a44c689 100644 --- a/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java +++ b/src/main/java/mekanism/client/render/particle/EntityScubaBubbleFX.java @@ -1,8 +1,6 @@ package mekanism.client.render.particle; import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityBubbleFX; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.entity.Entity; import net.minecraft.world.World; import net.minecraftforge.fml.client.FMLClientHandler; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index fa7ead15f..c27ef8ea8 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -5,7 +5,7 @@ import mekanism.common.tile.TileEntityBin; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java index 331c73ef4..1d3de3735 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChargepad.java @@ -9,8 +9,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class RenderChargepad extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java b/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java index 43a18352f..12f3db8ef 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderChemicalDissolutionChamber.java @@ -9,8 +9,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class RenderChemicalDissolutionChamber extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java index 8430d88a9..ec7814782 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -18,9 +18,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java index 33867c5a5..2257a635b 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderLogisticalSorter.java @@ -9,8 +9,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class RenderLogisticalSorter extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderPersonalChest.java b/src/main/java/mekanism/client/render/tileentity/RenderPersonalChest.java index 657054ea0..5ccda8153 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderPersonalChest.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderPersonalChest.java @@ -9,8 +9,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class RenderPersonalChest extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java b/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java index bff471ded..1c39c364e 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderQuantumEntangloporter.java @@ -10,8 +10,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class RenderQuantumEntangloporter extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java b/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java index 50fe0e5c8..04569e70b 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderResistiveHeater.java @@ -9,8 +9,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class RenderResistiveHeater extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java index 7772d8c6c..c0f7cdfa9 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderRotaryCondensentrator.java @@ -9,8 +9,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class RenderRotaryCondensentrator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java b/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java index a862c3540..be0068ce4 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSecurityDesk.java @@ -9,8 +9,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class RenderSecurityDesk extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java index e0a57ccbf..fc58c57cb 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSeismicVibrator.java @@ -9,8 +9,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class RenderSeismicVibrator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java b/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java index bdde7cd34..256b4b1f9 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderSolarNeutronActivator.java @@ -9,8 +9,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - @SideOnly(Side.CLIENT) public class RenderSolarNeutronActivator extends TileEntitySpecialRenderer { diff --git a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java index 44ccb1d72..689a176a9 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java @@ -24,7 +24,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java index 755519938..768275b33 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderMechanicalPipe.java @@ -2,7 +2,6 @@ package mekanism.client.render.transmitter; import java.util.HashMap; -import mcmultipart.multipart.IMultipart; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.FluidType; @@ -11,7 +10,6 @@ import mekanism.common.ColourRGBA; import mekanism.common.multipart.PartMechanicalPipe; import mekanism.common.multipart.PartSidedPipe.ConnectionType; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java b/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java index 22da53299..d83356fff 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderPressurizedTube.java @@ -1,11 +1,9 @@ package mekanism.client.render.transmitter; -import mcmultipart.multipart.IMultipart; import mekanism.client.render.MekanismRenderer; import mekanism.common.ColourRGBA; import mekanism.common.multipart.PartPressurizedTube; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java b/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java index f98d7b25b..add1addc2 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderThermodynamicConductor.java @@ -1,11 +1,9 @@ package mekanism.client.render.transmitter; -import mcmultipart.multipart.IMultipart; import mekanism.client.render.ColourTemperature; import mekanism.client.render.MekanismRenderer; import mekanism.common.multipart.PartThermodynamicConductor; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/render/transmitter/RenderTransmitterBase.java b/src/main/java/mekanism/client/render/transmitter/RenderTransmitterBase.java index 5e2739254..af505e3ce 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderTransmitterBase.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderTransmitterBase.java @@ -10,13 +10,11 @@ import mekanism.common.multipart.PartTransmitter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.Attributes; -import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.client.model.pipeline.LightUtil; diff --git a/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java b/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java index 43d2e4837..f52bcaf58 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderUniversalCable.java @@ -5,7 +5,6 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.ColourRGBA; import mekanism.common.multipart.PartUniversalCable; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.util.EnumFacing; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/client/sound/ISoundSource.java b/src/main/java/mekanism/client/sound/ISoundSource.java index 01c7bcfb6..debcc82f1 100644 --- a/src/main/java/mekanism/client/sound/ISoundSource.java +++ b/src/main/java/mekanism/client/sound/ISoundSource.java @@ -2,7 +2,6 @@ package mekanism.client.sound; import net.minecraft.client.audio.ISound.AttenuationType; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/CommandMekanism.java b/src/main/java/mekanism/common/CommandMekanism.java index c5da7a6ec..99870a8d9 100644 --- a/src/main/java/mekanism/common/CommandMekanism.java +++ b/src/main/java/mekanism/common/CommandMekanism.java @@ -15,7 +15,6 @@ import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ChatComponentText; public class CommandMekanism extends CommandBase { diff --git a/src/main/java/mekanism/common/CommonPlayerTickHandler.java b/src/main/java/mekanism/common/CommonPlayerTickHandler.java index 749c72ee0..c0be7d4ea 100644 --- a/src/main/java/mekanism/common/CommonPlayerTickHandler.java +++ b/src/main/java/mekanism/common/CommonPlayerTickHandler.java @@ -16,9 +16,9 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.common.gameevent.TickEvent.PlayerTickEvent; diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 839a76873..7ef302dda 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -121,9 +121,8 @@ import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/mekanism/common/CommonWorldTickHandler.java b/src/main/java/mekanism/common/CommonWorldTickHandler.java index f0956cf31..ce3b65352 100644 --- a/src/main/java/mekanism/common/CommonWorldTickHandler.java +++ b/src/main/java/mekanism/common/CommonWorldTickHandler.java @@ -7,7 +7,6 @@ import java.util.Random; import mekanism.common.frequency.FrequencyManager; import mekanism.common.multiblock.MultiblockManager; -import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; diff --git a/src/main/java/mekanism/common/CoreGuiHandler.java b/src/main/java/mekanism/common/CoreGuiHandler.java index 6eb0b974c..c9f50ccda 100644 --- a/src/main/java/mekanism/common/CoreGuiHandler.java +++ b/src/main/java/mekanism/common/CoreGuiHandler.java @@ -1,7 +1,7 @@ package mekanism.common; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; diff --git a/src/main/java/mekanism/common/LaserManager.java b/src/main/java/mekanism/common/LaserManager.java index 1d4a29988..4a5871e5f 100644 --- a/src/main/java/mekanism/common/LaserManager.java +++ b/src/main/java/mekanism/common/LaserManager.java @@ -14,7 +14,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 79c5c4a92..affab0272 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -114,9 +114,6 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.ChunkCoordIntPair; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.biome.WorldChunkManager; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index 360193619..25db94866 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -74,9 +74,8 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; diff --git a/src/main/java/mekanism/common/RobitAIFollow.java b/src/main/java/mekanism/common/RobitAIFollow.java index 7e2a66338..f4a37f651 100644 --- a/src/main/java/mekanism/common/RobitAIFollow.java +++ b/src/main/java/mekanism/common/RobitAIFollow.java @@ -4,8 +4,8 @@ import mekanism.common.entity.EntityRobit; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.pathfinding.PathNavigateGround; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; public class RobitAIFollow extends EntityAIBase diff --git a/src/main/java/mekanism/common/RobitAIPickup.java b/src/main/java/mekanism/common/RobitAIPickup.java index b6a478e1b..11268db78 100644 --- a/src/main/java/mekanism/common/RobitAIPickup.java +++ b/src/main/java/mekanism/common/RobitAIPickup.java @@ -7,9 +7,9 @@ import mekanism.common.entity.EntityRobit; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.pathfinding.PathNavigate; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; /* diff --git a/src/main/java/mekanism/common/base/IGuiProvider.java b/src/main/java/mekanism/common/base/IGuiProvider.java index e7156b084..c12a85789 100644 --- a/src/main/java/mekanism/common/base/IGuiProvider.java +++ b/src/main/java/mekanism/common/base/IGuiProvider.java @@ -2,7 +2,7 @@ package mekanism.common.base; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public interface IGuiProvider diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 765d6e059..8622ae61f 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -40,7 +40,6 @@ import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -52,11 +51,9 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java index 18e91d223..28bddece2 100644 --- a/src/main/java/mekanism/common/block/BlockBounding.java +++ b/src/main/java/mekanism/common/block/BlockBounding.java @@ -7,15 +7,13 @@ import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class BlockBounding extends Block diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java index f7d2c351f..1715de5ef 100644 --- a/src/main/java/mekanism/common/block/BlockCardboardBox.java +++ b/src/main/java/mekanism/common/block/BlockCardboardBox.java @@ -12,7 +12,6 @@ import mekanism.common.tile.TileEntityCardboardBox; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -20,9 +19,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class BlockCardboardBox extends BlockContainer diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 3cb529f1a..38f9d0b55 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -21,7 +21,6 @@ import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -31,10 +30,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index dc4eb3f0e..9cfb5b3fb 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -18,7 +18,6 @@ import mekanism.common.util.SecurityUtils; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -27,10 +26,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import buildcraft.api.tools.IToolWrench; diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index e8c21508c..cf3d89f71 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -53,7 +53,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -66,13 +65,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.EnumWorldBlockLayer; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/common/block/BlockObsidianTNT.java b/src/main/java/mekanism/common/block/BlockObsidianTNT.java index 353cf2cfc..677a7e9cd 100644 --- a/src/main/java/mekanism/common/block/BlockObsidianTNT.java +++ b/src/main/java/mekanism/common/block/BlockObsidianTNT.java @@ -9,8 +9,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Items; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/common/block/BlockOre.java b/src/main/java/mekanism/common/block/BlockOre.java index 40c4b62f5..3c1698d68 100644 --- a/src/main/java/mekanism/common/block/BlockOre.java +++ b/src/main/java/mekanism/common/block/BlockOre.java @@ -7,7 +7,6 @@ import mekanism.common.block.states.BlockStateOre; import mekanism.common.block.states.BlockStateOre.EnumOreType; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index 187506081..39f1472b3 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -10,15 +10,13 @@ import mekanism.common.block.states.BlockStatePlastic; import mekanism.common.block.states.BlockStatePlastic.PlasticBlockType; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/common/block/BlockPlasticFence.java b/src/main/java/mekanism/common/block/BlockPlasticFence.java index 1f029786d..b01ba4603 100644 --- a/src/main/java/mekanism/common/block/BlockPlasticFence.java +++ b/src/main/java/mekanism/common/block/BlockPlasticFence.java @@ -9,16 +9,15 @@ import mekanism.common.Mekanism; import net.minecraft.block.BlockFence; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index 3e11545a8..f6c973bea 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -27,8 +27,8 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/common/block/states/BlockStateBounding.java b/src/main/java/mekanism/common/block/states/BlockStateBounding.java index f97a1d67d..824356cde 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBounding.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBounding.java @@ -2,7 +2,6 @@ package mekanism.common.block.states; import mekanism.common.block.BlockBounding; import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.state.BlockState; public class BlockStateBounding extends BlockState { diff --git a/src/main/java/mekanism/common/block/states/BlockStateCardboardBox.java b/src/main/java/mekanism/common/block/states/BlockStateCardboardBox.java index 1575f5f7b..c800a8bef 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateCardboardBox.java +++ b/src/main/java/mekanism/common/block/states/BlockStateCardboardBox.java @@ -2,10 +2,9 @@ package mekanism.common.block.states; import mekanism.common.block.BlockCardboardBox; import net.minecraft.block.properties.PropertyBool; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.util.ResourceLocation; public class BlockStateCardboardBox extends BlockState diff --git a/src/main/java/mekanism/common/block/states/BlockStateFacing.java b/src/main/java/mekanism/common/block/states/BlockStateFacing.java index 94690a946..502b4433c 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateFacing.java +++ b/src/main/java/mekanism/common/block/states/BlockStateFacing.java @@ -6,7 +6,6 @@ import net.minecraft.block.Block; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; public class BlockStateFacing extends BlockState { diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java index 5e126c33b..44af8c1f7 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java +++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java @@ -59,8 +59,8 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/common/block/states/BlockStateOre.java b/src/main/java/mekanism/common/block/states/BlockStateOre.java index c413b5294..21e23ac87 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateOre.java +++ b/src/main/java/mekanism/common/block/states/BlockStateOre.java @@ -2,7 +2,6 @@ package mekanism.common.block.states; import mekanism.common.block.BlockOre; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.util.IStringSerializable; /** diff --git a/src/main/java/mekanism/common/block/states/BlockStatePlastic.java b/src/main/java/mekanism/common/block/states/BlockStatePlastic.java index 0f19d8ccc..daccbf689 100644 --- a/src/main/java/mekanism/common/block/states/BlockStatePlastic.java +++ b/src/main/java/mekanism/common/block/states/BlockStatePlastic.java @@ -2,10 +2,9 @@ package mekanism.common.block.states; import mekanism.common.block.BlockPlastic; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/mekanism/common/chunkloading/ChunkManager.java b/src/main/java/mekanism/common/chunkloading/ChunkManager.java index 6175021ac..5f17f5908 100644 --- a/src/main/java/mekanism/common/chunkloading/ChunkManager.java +++ b/src/main/java/mekanism/common/chunkloading/ChunkManager.java @@ -3,7 +3,7 @@ package mekanism.common.chunkloading; import java.util.List; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.ForgeChunkManager.LoadingCallback; import net.minecraftforge.common.ForgeChunkManager.Ticket; diff --git a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java index ead5f76d1..e1c9e0f41 100644 --- a/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/boiler/BoilerUpdateProtocol.java @@ -17,7 +17,7 @@ import mekanism.common.tile.TileEntityPressureDisperser; import mekanism.common.tile.TileEntitySuperheatingElement; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; public class BoilerUpdateProtocol extends UpdateProtocol { diff --git a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java index 4c85c3080..601fba1f8 100644 --- a/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java +++ b/src/main/java/mekanism/common/content/boiler/SynchronizedBoilerData.java @@ -11,7 +11,6 @@ import mekanism.api.MekanismConfig.general; import mekanism.api.util.UnitDisplayUtils.TemperatureUnit; import mekanism.common.content.tank.SynchronizedTankData.ValveData; import mekanism.common.multiblock.SynchronizedData; -import mekanism.common.util.FluidContainerUtils.ContainerEditMode; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java index ea1998146..40f1615bd 100644 --- a/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/matrix/MatrixUpdateProtocol.java @@ -15,7 +15,7 @@ import mekanism.common.tile.TileEntityInductionProvider; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; public class MatrixUpdateProtocol extends UpdateProtocol { diff --git a/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java b/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java index 89d40da86..df8e43cf3 100644 --- a/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java +++ b/src/main/java/mekanism/common/content/miner/ThreadMinerSearch.java @@ -14,7 +14,7 @@ import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fluids.IFluidBlock; public class ThreadMinerSearch extends Thread diff --git a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java index 94d19c759..8b466d974 100644 --- a/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java +++ b/src/main/java/mekanism/common/content/tank/TankUpdateProtocol.java @@ -16,7 +16,7 @@ import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicValve; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; public class TankUpdateProtocol extends UpdateProtocol { diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index 46841a7cf..51b18e6e3 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -20,7 +20,6 @@ import mekanism.common.content.transporter.TransporterStack.Path; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; - import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/common/entity/EntityBalloon.java b/src/main/java/mekanism/common/entity/EntityBalloon.java index 2ed03473d..d598a103d 100644 --- a/src/main/java/mekanism/common/entity/EntityBalloon.java +++ b/src/main/java/mekanism/common/entity/EntityBalloon.java @@ -8,14 +8,12 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Pos3D; import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.particle.EntityReddustFX; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index 79257fd76..b05e6c35b 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -19,13 +19,10 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.MovingObjectPosition.MovingObjectType; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index 86dc56835..958308671 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -37,8 +37,8 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.pathfinding.PathNavigateGround; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraft.util.BlockPos; import net.minecraft.util.DamageSource; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.util.Constants; diff --git a/src/main/java/mekanism/common/integration/CCPeripheral.java b/src/main/java/mekanism/common/integration/CCPeripheral.java index 73a606a8a..94008f185 100644 --- a/src/main/java/mekanism/common/integration/CCPeripheral.java +++ b/src/main/java/mekanism/common/integration/CCPeripheral.java @@ -1,8 +1,8 @@ package mekanism.common.integration; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; import dan200.computercraft.api.lua.ILuaContext; diff --git a/src/main/java/mekanism/common/integration/OCDriver.java b/src/main/java/mekanism/common/integration/OCDriver.java index 28afd23e0..22d520075 100644 --- a/src/main/java/mekanism/common/integration/OCDriver.java +++ b/src/main/java/mekanism/common/integration/OCDriver.java @@ -12,7 +12,7 @@ import li.cil.oc.api.network.Visibility; import li.cil.oc.api.prefab.DriverTileEntity; import li.cil.oc.api.prefab.ManagedEnvironment; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/mekanism/common/integration/WailaDataProvider.java b/src/main/java/mekanism/common/integration/WailaDataProvider.java index ed4785831..310cd9e09 100644 --- a/src/main/java/mekanism/common/integration/WailaDataProvider.java +++ b/src/main/java/mekanism/common/integration/WailaDataProvider.java @@ -22,7 +22,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.Method; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitCrafting.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitCrafting.java index 1317ca95f..40e57969e 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitCrafting.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitCrafting.java @@ -3,7 +3,7 @@ package mekanism.common.inventory.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ContainerWorkbench; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ContainerRobitCrafting extends ContainerWorkbench diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitRepair.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitRepair.java index 7727e235e..ded670c2f 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitRepair.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitRepair.java @@ -3,7 +3,7 @@ package mekanism.common.inventory.container; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ContainerRepair; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ContainerRobitRepair extends ContainerRepair diff --git a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java index 7378939ea..28d21cc19 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerRobitSmelting.java @@ -4,7 +4,6 @@ import mekanism.common.entity.EntityRobit; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotFurnaceOutput; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/item/ItemAlloy.java b/src/main/java/mekanism/common/item/ItemAlloy.java index 5069ea901..95cc0a969 100644 --- a/src/main/java/mekanism/common/item/ItemAlloy.java +++ b/src/main/java/mekanism/common/item/ItemAlloy.java @@ -7,8 +7,8 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ItemAlloy extends ItemMekanism diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 8db94439c..fde507c15 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -19,10 +19,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.UseHoeEvent; diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index a64f2a67c..a53ff9d65 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -16,10 +16,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.StatCollector; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 9d9f86b4e..519a4cb6b 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -35,8 +35,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java index 4a968bc71..c430500f5 100644 --- a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java +++ b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java @@ -18,8 +18,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.EntityJoinWorldEvent; diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 0597727d3..904b6a8fc 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -37,8 +37,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index d8a45c6c1..2bb1aa401 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -36,8 +36,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 30e38babc..b26a71ed3 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -53,11 +53,9 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/mekanism/common/item/ItemBlockPlastic.java b/src/main/java/mekanism/common/item/ItemBlockPlastic.java index a3bb8d126..3887fd987 100644 --- a/src/main/java/mekanism/common/item/ItemBlockPlastic.java +++ b/src/main/java/mekanism/common/item/ItemBlockPlastic.java @@ -6,7 +6,6 @@ import net.minecraft.block.Block; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/item/ItemConfigurationCard.java b/src/main/java/mekanism/common/item/ItemConfigurationCard.java index 2626f9fd5..27880783c 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurationCard.java +++ b/src/main/java/mekanism/common/item/ItemConfigurationCard.java @@ -15,9 +15,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ItemConfigurationCard extends ItemMekanism diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java index 191f6e555..4fd0423d2 100644 --- a/src/main/java/mekanism/common/item/ItemConfigurator.java +++ b/src/main/java/mekanism/common/item/ItemConfigurator.java @@ -32,9 +32,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; diff --git a/src/main/java/mekanism/common/item/ItemCraftingFormula.java b/src/main/java/mekanism/common/item/ItemCraftingFormula.java index c5951ead3..c57490cc7 100644 --- a/src/main/java/mekanism/common/item/ItemCraftingFormula.java +++ b/src/main/java/mekanism/common/item/ItemCraftingFormula.java @@ -7,7 +7,7 @@ import mekanism.api.EnumColor; import mekanism.common.util.InventoryUtils; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/item/ItemDictionary.java b/src/main/java/mekanism/common/item/ItemDictionary.java index 5d23fae5b..4d204341f 100644 --- a/src/main/java/mekanism/common/item/ItemDictionary.java +++ b/src/main/java/mekanism/common/item/ItemDictionary.java @@ -10,9 +10,8 @@ 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.util.BlockPos; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ItemDictionary extends ItemMekanism diff --git a/src/main/java/mekanism/common/item/ItemFactoryInstaller.java b/src/main/java/mekanism/common/item/ItemFactoryInstaller.java index 482e90af7..1f4cd6b0e 100644 --- a/src/main/java/mekanism/common/item/ItemFactoryInstaller.java +++ b/src/main/java/mekanism/common/item/ItemFactoryInstaller.java @@ -18,8 +18,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ItemFactoryInstaller extends ItemMekanism implements IMetaItem diff --git a/src/main/java/mekanism/common/item/ItemNetworkReader.java b/src/main/java/mekanism/common/item/ItemNetworkReader.java index 5b7083227..fb3349eca 100644 --- a/src/main/java/mekanism/common/item/ItemNetworkReader.java +++ b/src/main/java/mekanism/common/item/ItemNetworkReader.java @@ -15,9 +15,8 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ItemNetworkReader extends ItemEnergized diff --git a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java index 08c5c0965..56948333f 100644 --- a/src/main/java/mekanism/common/item/ItemPortableTeleporter.java +++ b/src/main/java/mekanism/common/item/ItemPortableTeleporter.java @@ -15,7 +15,6 @@ import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; public class ItemPortableTeleporter extends ItemEnergized implements IOwnerItem diff --git a/src/main/java/mekanism/common/item/ItemRobit.java b/src/main/java/mekanism/common/item/ItemRobit.java index e647364e7..a916e78b4 100644 --- a/src/main/java/mekanism/common/item/ItemRobit.java +++ b/src/main/java/mekanism/common/item/ItemRobit.java @@ -13,8 +13,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/item/ItemSeismicReader.java b/src/main/java/mekanism/common/item/ItemSeismicReader.java index 1292d7b4c..42346e2e1 100644 --- a/src/main/java/mekanism/common/item/ItemSeismicReader.java +++ b/src/main/java/mekanism/common/item/ItemSeismicReader.java @@ -7,7 +7,6 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; public class ItemSeismicReader extends ItemEnergized diff --git a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java index ed836be29..3a0d5d2bc 100644 --- a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java +++ b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java @@ -7,7 +7,7 @@ import java.util.Map; import mekanism.api.EnumColor; import mekanism.common.util.ItemDataUtils; import mekanism.common.util.LangUtils; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java index 3ef65046d..9b721874d 100644 --- a/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java +++ b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java @@ -4,9 +4,9 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import net.minecraftforge.fml.common.FMLCommonHandler; import mekanism.common.PacketHandler; import mekanism.common.tile.TileEntityBasicBlock; +import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityInternalMultiblock extends TileEntityBasicBlock { diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index 5683afb78..3f61b639d 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -9,8 +9,8 @@ import mekanism.api.Coord4D; import mekanism.common.tile.TileEntityMultiblock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public abstract class UpdateProtocol> diff --git a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java index 6c3d39108..cee16ce15 100644 --- a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java @@ -21,10 +21,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.StatCollector; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; public class ItemGlowPanel extends ItemMultiPart implements IMetaItem diff --git a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java index ab495b856..b0d4cbb78 100644 --- a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java @@ -20,9 +20,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /* import codechicken.lib.vec.BlockCoord; diff --git a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java index 9c8fa39a9..ab1ac42ff 100644 --- a/src/main/java/mekanism/common/multipart/MultipartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/MultipartTransmitter.java @@ -10,7 +10,6 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.capabilities.Capabilities; import mekanism.common.transmitters.Transmitter; import mekanism.common.util.MekanismUtils; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java index 6e17a6d2b..977576a14 100644 --- a/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartDiversionTransporter.java @@ -14,7 +14,6 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; public class PartDiversionTransporter extends PartLogisticalTransporter diff --git a/src/main/java/mekanism/common/multipart/PartGlowPanel.java b/src/main/java/mekanism/common/multipart/PartGlowPanel.java index 6dcba9171..ec7a987ec 100644 --- a/src/main/java/mekanism/common/multipart/PartGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/PartGlowPanel.java @@ -5,25 +5,21 @@ import java.util.List; import mcmultipart.microblock.IMicroblock.IFaceMicroblock; import mcmultipart.multipart.IMultipart; -import mcmultipart.multipart.IOccludingPart; import mcmultipart.multipart.Multipart; import mcmultipart.multipart.PartSlot; import mcmultipart.raytrace.PartMOP; -import mcmultipart.util.TransformationHelper; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.MekanismItems; import mekanism.common.block.states.BlockStateFacing; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; //import net.minecraft.util.IIcon; import net.minecraft.network.PacketBuffer; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.common.property.IExtendedBlockState; public class PartGlowPanel extends Multipart implements IOccludingPart diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index d2c7a521b..0d80bff63 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -33,7 +33,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.property.IExtendedBlockState; diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index ff6839f08..5dd483c11 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -7,17 +7,13 @@ import java.util.Collections; import java.util.List; import mcmultipart.MCMultiPartMod; -import mcmultipart.block.TileMultipart; import mcmultipart.multipart.IMultipart; -import mcmultipart.multipart.IOccludingPart; import mcmultipart.multipart.Multipart; import mcmultipart.raytrace.PartMOP; import mcmultipart.raytrace.RayTraceUtils; -import mcmultipart.raytrace.RayTraceUtils.RayTraceResultPart; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; -import mekanism.api.MekanismConfig.client; import mekanism.api.transmitters.IBlockableConnection; import mekanism.api.transmitters.ITransmitter; import mekanism.api.transmitters.TransmissionType; @@ -29,24 +25,18 @@ import mekanism.common.multipart.TransmitterType.Size; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; -//import net.minecraft.util.IIcon; -import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ITickable; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.obj.OBJModel.OBJProperty; import net.minecraftforge.client.model.obj.OBJModel.OBJState; @@ -54,6 +44,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; +//import net.minecraft.util.IIcon; public abstract class PartSidedPipe extends Multipart implements IOccludingPart, /*ISlotOccludingPart, ISidedHollowConnect, JIconHitEffects, INeighborTileChange,*/ ITileNetwork, IBlockableConnection, IConfigurable, ITransmitter, ITickable { diff --git a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java index f9242b00e..096d970a9 100644 --- a/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java +++ b/src/main/java/mekanism/common/network/PacketDigitalMinerGui.java @@ -25,7 +25,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; diff --git a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java index 103b6608c..8200c3d34 100644 --- a/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java +++ b/src/main/java/mekanism/common/network/PacketLogisticalSorterGui.java @@ -19,7 +19,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; diff --git a/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java b/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java index a30772b41..eaf87e2c7 100644 --- a/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java +++ b/src/main/java/mekanism/common/network/PacketOredictionificatorGui.java @@ -19,7 +19,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; diff --git a/src/main/java/mekanism/common/network/PacketPersonalChest.java b/src/main/java/mekanism/common/network/PacketPersonalChest.java index f75f53e4a..012fc6081 100644 --- a/src/main/java/mekanism/common/network/PacketPersonalChest.java +++ b/src/main/java/mekanism/common/network/PacketPersonalChest.java @@ -12,7 +12,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java index 7f0e207b1..ad735b4f1 100644 --- a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java +++ b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java @@ -21,7 +21,6 @@ import mekanism.common.base.EnergyAcceptorWrapper; import mekanism.common.capabilities.Capabilities; import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; import mekanism.common.util.MekanismUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java index e1f5eb796..645986d75 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java @@ -13,9 +13,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.Optional.Interface; import net.minecraftforge.fml.common.Optional.InterfaceList; diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 9e60f982c..5c7ca714a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -27,9 +27,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ITickable; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Optional.Interface; diff --git a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java index 3052691cb..d8d3d0a73 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoundingBlock.java @@ -14,8 +14,8 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; public class TileEntityBoundingBlock extends TileEntity implements ITileNetwork diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 6038bd024..38ccd653b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -23,9 +23,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java index 550c3b84e..722963854 100644 --- a/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityContainerBlock.java @@ -10,11 +10,9 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IChatComponent; import net.minecraft.util.ITickable; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants.NBT; diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index c884d77f1..bcb021b56 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -55,9 +55,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldServer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.Constants.NBT; diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index 97e88a928..6c1a01707 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -35,7 +35,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.Constants.NBT; diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 9046e53dd..f0f89125b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -28,7 +28,7 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityEnergyCube extends TileEntityElectricBlock implements IComputerIntegration, IRedstoneControl, ISideConfiguration, ISecurityTile diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index 21658da13..effbe744b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -32,7 +32,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.Constants.NBT; diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index 7ebf73dde..300cc2942 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -34,7 +34,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; diff --git a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java index 33c32db59..1aa568b1a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityInductionPort.java +++ b/src/main/java/mekanism/common/tile/TileEntityInductionPort.java @@ -26,7 +26,6 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java index 20394d59f..0641c75ab 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaser.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java @@ -21,7 +21,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IActiveState diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index c31260ae5..cfc1e4324 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -24,7 +24,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java index dc6bab104..14edd25e3 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserTractorBeam.java @@ -21,7 +21,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityLaserTractorBeam extends TileEntityContainerBlock implements ILaserReceptor, ISecurityTile diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java index 91718a9f1..c9381c817 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java +++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java @@ -19,9 +19,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java index 6d21a9630..26e44341f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityNoisyElectricBlock.java @@ -10,7 +10,6 @@ import mekanism.common.base.IUpgradeTile; import mekanism.common.base.SoundWrapper; import net.minecraft.client.audio.ISound.AttenuationType; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java index 323cb827d..f8e14e193 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java +++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java @@ -20,7 +20,7 @@ import mekanism.common.security.SecurityFrequency; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index cd3cf25e9..7464d78a1 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -21,8 +21,8 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java index ef6c4eef9..31cd432ad 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java @@ -32,9 +32,8 @@ import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; -import net.minecraft.world.biome.BiomeGenDesert; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 52baf1ec7..2cd6f2eac 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -34,14 +34,11 @@ import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.play.server.S07PacketRespawn; -import net.minecraft.network.play.server.S1DPacketEntityEffect; -import net.minecraft.network.play.server.S1FPacketSetExperience; import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.ForgeChunkManager; diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java index 1daa4dead..15d68c0dd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java +++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java @@ -28,8 +28,8 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 8bf8821e4..9ae8fbdf7 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -16,8 +16,8 @@ import mekanism.api.transmitters.TransmissionType; import mekanism.common.base.IEnergyWrapper; import mekanism.common.capabilities.Capabilities; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import cofh.api.energy.IEnergyConnection; import cofh.api.energy.IEnergyProvider; diff --git a/src/main/java/mekanism/common/util/LangUtils.java b/src/main/java/mekanism/common/util/LangUtils.java index aef0132ac..0b3d1a3e1 100644 --- a/src/main/java/mekanism/common/util/LangUtils.java +++ b/src/main/java/mekanism/common/util/LangUtils.java @@ -1,7 +1,6 @@ package mekanism.common.util; import mekanism.api.gas.GasStack; -import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; public final class LangUtils diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index db2dd10b1..614393a0e 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -72,14 +72,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.Axis; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; diff --git a/src/main/java/mekanism/common/util/PipeUtils.java b/src/main/java/mekanism/common/util/PipeUtils.java index a3a39c945..b7e3db647 100644 --- a/src/main/java/mekanism/common/util/PipeUtils.java +++ b/src/main/java/mekanism/common/util/PipeUtils.java @@ -7,8 +7,8 @@ import java.util.List; import mekanism.common.capabilities.Capabilities; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/common/util/SecurityUtils.java b/src/main/java/mekanism/common/util/SecurityUtils.java index 5e51f3e8b..7df991538 100644 --- a/src/main/java/mekanism/common/util/SecurityUtils.java +++ b/src/main/java/mekanism/common/util/SecurityUtils.java @@ -13,7 +13,6 @@ import mekanism.common.security.SecurityFrequency; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; import net.minecraftforge.fml.relauncher.Side; public final class SecurityUtils diff --git a/src/main/java/mekanism/common/world/GenHandler.java b/src/main/java/mekanism/common/world/GenHandler.java index 76cb68830..9afb4f731 100644 --- a/src/main/java/mekanism/common/world/GenHandler.java +++ b/src/main/java/mekanism/common/world/GenHandler.java @@ -4,9 +4,8 @@ import java.util.Random; import mekanism.api.MekanismConfig.general; import mekanism.common.MekanismBlocks; -import net.minecraft.block.state.pattern.BlockHelper; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderEnd; diff --git a/src/main/java/mekanism/common/world/WorldGenSalt.java b/src/main/java/mekanism/common/world/WorldGenSalt.java index b16258b2d..1420156f9 100644 --- a/src/main/java/mekanism/common/world/WorldGenSalt.java +++ b/src/main/java/mekanism/common/world/WorldGenSalt.java @@ -6,7 +6,7 @@ import mekanism.common.MekanismBlocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java index 7c205c893..99530370a 100644 --- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java +++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java @@ -45,12 +45,12 @@ import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import mekanism.generators.common.tile.turbine.TileEntityTurbineValve; import mekanism.generators.common.tile.turbine.TileEntityTurbineVent; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.client.renderer.block.model.IBakedModel; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java index c5ee86ad4..13ae7a7a6 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java @@ -33,7 +33,6 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.client.gui.element.GuiFuelTab; import mekanism.generators.client.gui.element.GuiStatTab; import mekanism.generators.common.tile.reactor.TileEntityReactorController; -import net.minecraft.block.BlockStaticLiquid; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java index 7e9e61894..2fbc129c5 100644 --- a/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java +++ b/src/main/java/mekanism/generators/client/render/item/BakedGeneratorItemModel.java @@ -19,20 +19,18 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.Attributes; -import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IPerspectiveAwareModel; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/mekanism/generators/client/render/item/GeneratorItemModelFactory.java b/src/main/java/mekanism/generators/client/render/item/GeneratorItemModelFactory.java index a51a2d1f4..f8bb715e0 100644 --- a/src/main/java/mekanism/generators/client/render/item/GeneratorItemModelFactory.java +++ b/src/main/java/mekanism/generators/client/render/item/GeneratorItemModelFactory.java @@ -3,12 +3,11 @@ package mekanism.generators.client.render.item; import java.util.List; import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraftforge.client.model.ISmartItemModel; public class GeneratorItemModelFactory implements ISmartItemModel { diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index d6e16aa9b..fdfa83d2a 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -27,9 +27,9 @@ import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 31866fbf8..b3379f155 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -35,7 +35,7 @@ import mekanism.generators.common.tile.turbine.TileEntityTurbineVent; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/src/main/java/mekanism/generators/common/GeneratorsGuiHandler.java b/src/main/java/mekanism/generators/common/GeneratorsGuiHandler.java index df51274e1..ed1cfe00c 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsGuiHandler.java +++ b/src/main/java/mekanism/generators/common/GeneratorsGuiHandler.java @@ -1,7 +1,7 @@ package mekanism.generators.common; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; diff --git a/src/main/java/mekanism/generators/common/GeneratorsItems.java b/src/main/java/mekanism/generators/common/GeneratorsItems.java index e2a820beb..ca5fbd992 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsItems.java +++ b/src/main/java/mekanism/generators/common/GeneratorsItems.java @@ -5,7 +5,7 @@ import mekanism.generators.common.item.ItemHohlraum; import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index f55b4c58e..27ee3119d 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -36,7 +36,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -46,12 +45,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.IExtendedBlockState; diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 30931c380..dbcfae65a 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -22,7 +22,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; @@ -30,9 +29,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.IExtendedBlockState; diff --git a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java index 1a9776507..221998463 100644 --- a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java +++ b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java @@ -24,8 +24,8 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java b/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java index 5c5cf2375..e3fb9d620 100644 --- a/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java +++ b/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java @@ -18,8 +18,8 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IStringSerializable; diff --git a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java index 695d57109..f88205f7b 100644 --- a/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java +++ b/src/main/java/mekanism/generators/common/content/turbine/TurbineUpdateProtocol.java @@ -19,8 +19,8 @@ import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor; import mekanism.generators.common.tile.turbine.TileEntityTurbineVent; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; public class TurbineUpdateProtocol extends UpdateProtocol { diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index a8b7132c5..06814831d 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -33,8 +33,8 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index b69c7941f..6f254fcc5 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -21,8 +21,8 @@ import mekanism.common.tile.component.TileComponentSecurity; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index b534c3900..901c43d50 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -22,8 +22,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index 17240d1da..631e5bf46 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -11,7 +11,6 @@ import mekanism.common.util.MekanismUtils; import micdoodle8.mods.galacticraft.api.world.ISolarLevel; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraft.world.biome.BiomeGenDesert; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java index b24856f3d..d21cf3260 100644 --- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java +++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java @@ -22,9 +22,8 @@ import net.minecraft.client.audio.ISound.AttenuationType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java index 74d211258..41f1b5e1e 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineRotor.java @@ -13,8 +13,8 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java index b0075edf6..7c0a3dcdf 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java @@ -11,8 +11,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.UseHoeEvent; @@ -30,7 +30,7 @@ public class ItemMekanismHoe extends ItemMekanism toolMaterial = enumtoolmaterial; maxStackSize = 1; setMaxDamage(enumtoolmaterial.getMaxUses()); - setCreativeTab(CreativeTabs.tabTools); + setCreativeTab(CreativeTabs.TOOLS); } @Override @@ -53,7 +53,7 @@ public class ItemMekanismHoe extends ItemMekanism { return false; } - + if(event.getResult() == Result.ALLOW) { itemstack.damageItem(1, entityplayer); @@ -63,12 +63,12 @@ public class ItemMekanismHoe extends ItemMekanism Block blockID = world.getBlockState(pos).getBlock(); Block aboveBlock = world.getBlockState(pos.add(0, 1, 0)).getBlock(); - if((side == EnumFacing.DOWN || !aboveBlock.isAir(world, pos.add(0, 1, 0)) || blockID != Blocks.grass) && blockID != Blocks.dirt) + if((side == EnumFacing.DOWN || !aboveBlock.isAir(world.getBlockState(pos), world, pos.add(0, 1, 0)) || blockID != Blocks.grass) && blockID != Blocks.DIRT) { return false; } else { - IBlockState block = Blocks.farmland.getDefaultState(); + IBlockState block = Blocks.FARMLAND.getDefaultState(); world.playSoundEffect(pos.getX() + 0.5F, pos.getY() + 0.5F, pos.getZ() + 0.5F, block.getBlock().stepSound.getStepSound(), (block.getBlock().stepSound.getVolume() + 1.0F) / 2.0F, block.getBlock().stepSound.getFrequency() * 0.8F); if(world.isRemote)