diff --git a/src/api/java/appeng/api/definitions/IBlockDefinition.java b/src/api/java/appeng/api/definitions/IBlockDefinition.java index cec10119..dd20c96d 100644 --- a/src/api/java/appeng/api/definitions/IBlockDefinition.java +++ b/src/api/java/appeng/api/definitions/IBlockDefinition.java @@ -6,7 +6,7 @@ import com.google.common.base.Optional; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; diff --git a/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java b/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java index 400fff51..0a52d461 100644 --- a/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java +++ b/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java @@ -25,7 +25,7 @@ package appeng.api.implementations.guiobjects; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/api/java/appeng/api/implementations/items/IAEWrench.java b/src/api/java/appeng/api/implementations/items/IAEWrench.java index d735d1ec..afba8aa4 100644 --- a/src/api/java/appeng/api/implementations/items/IAEWrench.java +++ b/src/api/java/appeng/api/implementations/items/IAEWrench.java @@ -26,7 +26,7 @@ package appeng.api.implementations.items; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /** diff --git a/src/api/java/appeng/api/movable/IMovableHandler.java b/src/api/java/appeng/api/movable/IMovableHandler.java index 0f811ce5..5c682ee1 100644 --- a/src/api/java/appeng/api/movable/IMovableHandler.java +++ b/src/api/java/appeng/api/movable/IMovableHandler.java @@ -25,7 +25,7 @@ package appeng.api.movable; 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/api/java/appeng/api/parts/IFacadePart.java b/src/api/java/appeng/api/parts/IFacadePart.java index 170a9d47..02d76b2d 100644 --- a/src/api/java/appeng/api/parts/IFacadePart.java +++ b/src/api/java/appeng/api/parts/IFacadePart.java @@ -27,8 +27,8 @@ package appeng.api.parts; import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/api/java/appeng/api/parts/IPart.java b/src/api/java/appeng/api/parts/IPart.java index 8df58e77..eb9a722b 100644 --- a/src/api/java/appeng/api/parts/IPart.java +++ b/src/api/java/appeng/api/parts/IPart.java @@ -37,8 +37,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.Vec3; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -241,7 +241,7 @@ public interface IPart extends IBoxProvider * * @return if your activate method performed something. */ - boolean onActivate( EntityPlayer player, Vec3 pos ); + boolean onActivate( EntityPlayer player, Vec3d pos ); /** * Called when you right click the part, very similar to Block.onActivateBlock @@ -251,7 +251,7 @@ public interface IPart extends IBoxProvider * * @return if your activate method performed something, you should use false unless you really need it. */ - boolean onShiftActivate( EntityPlayer player, Vec3 pos ); + boolean onShiftActivate( EntityPlayer player, Vec3d pos ); /** * Add drops to the items being dropped into the world, if your item stores its contents when wrenched use the diff --git a/src/api/java/appeng/api/parts/IPartHelper.java b/src/api/java/appeng/api/parts/IPartHelper.java index dc78aebf..34be5ade 100644 --- a/src/api/java/appeng/api/parts/IPartHelper.java +++ b/src/api/java/appeng/api/parts/IPartHelper.java @@ -26,8 +26,8 @@ package appeng.api.parts; import net.minecraft.entity.player.EntityPlayer; 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; diff --git a/src/api/java/appeng/api/parts/IPartHost.java b/src/api/java/appeng/api/parts/IPartHost.java index 700585f7..331a2535 100644 --- a/src/api/java/appeng/api/parts/IPartHost.java +++ b/src/api/java/appeng/api/parts/IPartHost.java @@ -30,7 +30,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraft.util.Vec3; +import net.minecraft.util.math.Vec3d; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; @@ -142,7 +142,7 @@ public interface IPartHost * * @return a new SelectedPart, this is never null. */ - SelectedPart selectPart( Vec3 pos ); + SelectedPart selectPart( Vec3d pos ); /** * can be used by parts to trigger the tile or part to save. diff --git a/src/api/java/appeng/api/parts/IPartRenderHelper.java b/src/api/java/appeng/api/parts/IPartRenderHelper.java index b2e10073..0446ddbe 100644 --- a/src/api/java/appeng/api/parts/IPartRenderHelper.java +++ b/src/api/java/appeng/api/parts/IPartRenderHelper.java @@ -27,8 +27,8 @@ package appeng.api.parts; import java.util.EnumSet; import net.minecraft.block.Block; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/api/java/appeng/api/util/AEAxisAlignedBB.java b/src/api/java/appeng/api/util/AEAxisAlignedBB.java index 9d2db27a..fba68703 100644 --- a/src/api/java/appeng/api/util/AEAxisAlignedBB.java +++ b/src/api/java/appeng/api/util/AEAxisAlignedBB.java @@ -2,7 +2,7 @@ package appeng.api.util; -import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.math.AxisAlignedBB; /** @@ -19,7 +19,7 @@ public class AEAxisAlignedBB public AxisAlignedBB getBoundingBox() { - return AxisAlignedBB.fromBounds( this.minX, this.minY, this.minZ, this.maxX, this.maxY, this.maxZ ); + return new AxisAlignedBB( this.minX, this.minY, this.minZ, this.maxX, this.maxY, this.maxZ ); } public AEAxisAlignedBB( final double a, final double b, final double c, final double d, final double e, final double f ) diff --git a/src/api/java/appeng/api/util/AEColor.java b/src/api/java/appeng/api/util/AEColor.java index 350d1b88..0318fa8b 100644 --- a/src/api/java/appeng/api/util/AEColor.java +++ b/src/api/java/appeng/api/util/AEColor.java @@ -28,7 +28,7 @@ import java.util.Arrays; import java.util.List; import net.minecraft.item.EnumDyeColor; -import net.minecraft.util.StatCollector; +import net.minecraft.util.text.translation.I18n; /** @@ -120,7 +120,7 @@ public enum AEColor @Override public String toString() { - return StatCollector.translateToLocal( this.unlocalizedName ); + return I18n.translateToLocal( this.unlocalizedName ); } } diff --git a/src/api/java/appeng/api/util/DimensionalCoord.java b/src/api/java/appeng/api/util/DimensionalCoord.java index ff291592..6b03a80b 100644 --- a/src/api/java/appeng/api/util/DimensionalCoord.java +++ b/src/api/java/appeng/api/util/DimensionalCoord.java @@ -25,7 +25,7 @@ package appeng.api.util; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -49,21 +49,21 @@ public class DimensionalCoord extends WorldCoord { super( s ); this.w = s.getWorld(); - this.dimId = this.w.provider.getDimensionId(); + this.dimId = this.w.provider.getDimension(); } public DimensionalCoord( final World _w, final int x, final int y, final int z ) { super( x, y, z ); this.w = _w; - this.dimId = _w.provider.getDimensionId(); + this.dimId = _w.provider.getDimension(); } public DimensionalCoord( final World _w, final BlockPos pos ) { super( pos ); this.w = _w; - this.dimId = _w.provider.getDimensionId(); + this.dimId = _w.provider.getDimension(); } @Override diff --git a/src/api/java/appeng/api/util/ICommonTile.java b/src/api/java/appeng/api/util/ICommonTile.java index 90f70c27..e6431aa4 100644 --- a/src/api/java/appeng/api/util/ICommonTile.java +++ b/src/api/java/appeng/api/util/ICommonTile.java @@ -27,7 +27,7 @@ package appeng.api.util; import java.util.List; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/src/api/java/appeng/api/util/INetworkToolAgent.java b/src/api/java/appeng/api/util/INetworkToolAgent.java index 915df02c..01a28083 100644 --- a/src/api/java/appeng/api/util/INetworkToolAgent.java +++ b/src/api/java/appeng/api/util/INetworkToolAgent.java @@ -23,9 +23,7 @@ package appeng.api.util; - -import net.minecraft.util.MovingObjectPosition; - +import net.minecraft.util.math.RayTraceResult; /** * Implement on Tile or part to customize if the info gui opens, or an action is preformed. @@ -33,5 +31,5 @@ import net.minecraft.util.MovingObjectPosition; public interface INetworkToolAgent { - boolean showNetworkInfo( MovingObjectPosition where ); + boolean showNetworkInfo( RayTraceResult where ); } diff --git a/src/api/java/appeng/api/util/IOrientableBlock.java b/src/api/java/appeng/api/util/IOrientableBlock.java index de75256b..297af6b7 100644 --- a/src/api/java/appeng/api/util/IOrientableBlock.java +++ b/src/api/java/appeng/api/util/IOrientableBlock.java @@ -24,7 +24,7 @@ package appeng.api.util; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; diff --git a/src/api/java/appeng/api/util/ModelGenerator.java b/src/api/java/appeng/api/util/ModelGenerator.java index c37e432a..22d2efb8 100644 --- a/src/api/java/appeng/api/util/ModelGenerator.java +++ b/src/api/java/appeng/api/util/ModelGenerator.java @@ -5,10 +5,10 @@ import java.util.EnumSet; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.renderer.block.model.IBakedModel; 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.IBlockAccess; diff --git a/src/api/java/appeng/api/util/WorldCoord.java b/src/api/java/appeng/api/util/WorldCoord.java index 30191841..d9d3b734 100644 --- a/src/api/java/appeng/api/util/WorldCoord.java +++ b/src/api/java/appeng/api/util/WorldCoord.java @@ -25,7 +25,7 @@ package appeng.api.util; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; +import net.minecraft.util.math.BlockPos; /**