Second update pass (2/3) - 82 -> 0 errors

Second update pass which fixes all compile errors. Some parts may have
aftermath effect, hence why 3rd pass will check those maked with
"aftermath".
Errors: 82 -> 0. Mod can be launched.
This commit is contained in:
elix-x
2016-06-21 11:03:10 +02:00
parent 5498eb6d7c
commit 05aa6972c4
83 changed files with 564 additions and 405 deletions
+4 -3
View File
@@ -37,6 +37,7 @@ 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.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
@@ -241,7 +242,7 @@ public interface IPart extends IBoxProvider
*
* @return if your activate method performed something.
*/
boolean onActivate( EntityPlayer player, Vec3d pos );
boolean onActivate( EntityPlayer player, EnumHand hand, Vec3d pos );
/**
* Called when you right click the part, very similar to Block.onActivateBlock
@@ -251,7 +252,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, Vec3d pos );
boolean onShiftActivate( EntityPlayer player, EnumHand hand, Vec3d pos );
/**
* Add drops to the items being dropped into the world, if your item stores its contents when wrenched use the
@@ -283,7 +284,7 @@ public interface IPart extends IBoxProvider
* @param held held item
* @param side placing side
*/
void onPlacement( EntityPlayer player, ItemStack held, AEPartLocation side );
void onPlacement( EntityPlayer player, EnumHand hand, ItemStack held, AEPartLocation side );
/**
* Used to determine which parts can be placed on what cables.
@@ -27,6 +27,7 @@ package appeng.api.parts;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@@ -76,7 +77,7 @@ public interface IPartHelper
*
* @return true if placing was successful
*/
boolean placeBus( ItemStack is, BlockPos pos, EnumFacing side, EntityPlayer player, World world );
boolean placeBus( ItemStack is, BlockPos pos, EnumFacing side, EntityPlayer player, EnumHand hand, World world );
/**
* @return the render mode
+2 -1
View File
@@ -30,6 +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.EnumHand;
import net.minecraft.util.math.Vec3d;
import appeng.api.util.AEColor;
@@ -71,7 +72,7 @@ public interface IPartHost
* @return null if the item failed to add, the side it was placed on other wise ( may different for cables,
* {@link AEPartLocation}.UNKNOWN )
*/
AEPartLocation addPart( ItemStack is, AEPartLocation side, EntityPlayer owner );
AEPartLocation addPart( ItemStack is, AEPartLocation side, EntityPlayer owner, EnumHand hand );
/**
* Get part by side ( center is {@link AEPartLocation}.UNKNOWN )
@@ -3,6 +3,8 @@ package appeng.api.util;
import java.util.EnumSet;
import javax.annotation.Nullable;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.IBakedModel;
@@ -49,7 +51,7 @@ public interface ModelGenerator
void setFlipTexture( boolean b );
void setRenderBoundsFromBlock( Block block );
void setRenderBoundsFromBlock( IBlockState state, @Nullable BlockPos pos );
void setRenderBounds( double v, double v1, double v2, double v3, double v4, double v5 );