tilera
/
Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

Updated API to 1.9.4 

Updated API to 1.9.4. All compile errors are fixed in APENG-API.
This commit is contained in:
elix-x 2016-06-17 12:54:13 +02:00
parent 2918a1110b
commit d9725a7d9b
17 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/java/appeng/api/definitions/IBlockDefinition.java
View File

@ -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;

2
src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java
View File

@ -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;

2
src/api/java/appeng/api/implementations/items/IAEWrench.java
View File

@ -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;
/**

2
src/api/java/appeng/api/movable/IMovableHandler.java
View File

@ -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;

4
src/api/java/appeng/api/parts/IFacadePart.java
View File

@ -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;

8
src/api/java/appeng/api/parts/IPart.java
View File

@ -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

2
src/api/java/appeng/api/parts/IPartHelper.java
View File

@ -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;

4
src/api/java/appeng/api/parts/IPartHost.java
View File

@ -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.

2
src/api/java/appeng/api/parts/IPartRenderHelper.java
View File

@ -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;

4
src/api/java/appeng/api/util/AEAxisAlignedBB.java
View File

@ -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 )

4
src/api/java/appeng/api/util/AEColor.java
View File

@ -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 );
}
}

8
src/api/java/appeng/api/util/DimensionalCoord.java
View File

@ -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

2
src/api/java/appeng/api/util/ICommonTile.java
View File

@ -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;

6
src/api/java/appeng/api/util/INetworkToolAgent.java
View File

@ -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 );
}

2
src/api/java/appeng/api/util/IOrientableBlock.java
View File

@ -24,7 +24,7 @@
package appeng.api.util;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;

4
src/api/java/appeng/api/util/ModelGenerator.java
View File

@ -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;

2
src/api/java/appeng/api/util/WorldCoord.java
View File

@ -25,7 +25,7 @@ package appeng.api.util;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
/**