fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.8.8 + deleted all integration can be recovered later or something.

Browse Source
This commit is contained in:
AlgorithmX2
2015-12-31 17:19:44 -06:00
parent 2e51ea5f78
commit 71afa9bf53
142 changed files with 386 additions and 7919 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/AEBaseInvTile.java
+2 -2
View File
@@ -41,7 +41,7 @@ import appeng.tile.inventory.InvOperation;
public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventory, IAEAppEngInventory
{
@Override
public String getCommandSenderName()
public String getName()
{
return this.getCustomName();
}
@@ -97,7 +97,7 @@ public abstract class AEBaseInvTile extends AEBaseTile implements ISidedInventor
}
@Override
public ItemStack getStackInSlotOnClosing( final int i )
public ItemStack removeStackFromSlot( final int i )
{
return null;
}
src/main/java/appeng/tile/AEBaseTile.java
+2
View File
@@ -411,12 +411,14 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
@Override
public EnumFacing getForward()
{
if ( forward == null ) return EnumFacing.NORTH;
return this.forward;
}
@Override
public EnumFacing getUp()
{
if ( up == null ) return EnumFacing.UP;
return this.up;
}
src/main/java/appeng/tile/events/TileEventType.java
+1 -1
View File
@@ -22,7 +22,7 @@ package appeng.tile.events;
public enum TileEventType
{
/**
* Requires IUpdatePlayerListBox, this makes the tile entity tick in 1.8
* Requires ITickable, this makes the tile entity tick in 1.8
*/
TICK,
src/main/java/appeng/tile/grid/AENetworkInvTile.java
+1 -1
View File
@@ -51,7 +51,7 @@ public abstract class AENetworkInvTile extends AEBaseInvTile implements IActionH
@Override
public AENetworkProxy getProxy()
{
return this.getProxy();
return gridProxy;
}
@Override
src/main/java/appeng/tile/grindstone/TileCrank.java
+2 -2
View File
@@ -26,11 +26,11 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.server.gui.IUpdatePlayerListBox;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ITickable;
import net.minecraft.world.World;
import appeng.api.implementations.tiles.ICrankable;
@@ -41,7 +41,7 @@ import appeng.tile.events.TileEventType;
import appeng.util.Platform;
public class TileCrank extends AEBaseTile implements ICustomCollision, IUpdatePlayerListBox
public class TileCrank extends AEBaseTile implements ICustomCollision, ITickable
{
private final int ticksPerRotation = 18;
src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java
+2 -2
View File
@@ -178,7 +178,7 @@ public class AppEngInternalAEInventory implements IInventory, Iterable<ItemStack
}
@Override
public ItemStack getStackInSlotOnClosing( final int var1 )
public ItemStack removeStackFromSlot( final int var1 )
{
return null;
}
@@ -219,7 +219,7 @@ public class AppEngInternalAEInventory implements IInventory, Iterable<ItemStack
}
@Override
public String getCommandSenderName()
public String getName()
{
return "appeng-internal";
}
src/main/java/appeng/tile/inventory/AppEngInternalInventory.java
+2 -2
View File
@@ -115,7 +115,7 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
}
@Override
public ItemStack getStackInSlotOnClosing( final int var1 )
public ItemStack removeStackFromSlot( final int var1 )
{
return null;
}
@@ -158,7 +158,7 @@ public class AppEngInternalInventory implements IInventory, Iterable<ItemStack>
}
@Override
public String getCommandSenderName()
public String getName()
{
return "appeng-internal";
}
src/main/java/appeng/tile/inventory/AppEngNullInventory.java
+2 -2
View File
@@ -56,7 +56,7 @@ public class AppEngNullInventory implements IInventory
}
@Override
public ItemStack getStackInSlotOnClosing( final int var1 )
public ItemStack removeStackFromSlot( final int var1 )
{
return null;
}
@@ -68,7 +68,7 @@ public class AppEngNullInventory implements IInventory
}
@Override
public String getCommandSenderName()
public String getName()
{
return "appeng-internal";
}
src/main/java/appeng/tile/misc/TileCharger.java
+2 -3
View File
@@ -29,9 +29,8 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.server.gui.IUpdatePlayerListBox;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ITickable;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
import appeng.api.config.PowerMultiplier;
@@ -54,7 +53,7 @@ import appeng.util.Platform;
import appeng.util.item.AEItemStack;
public class TileCharger extends AENetworkPowerTile implements ICrankable, IUpdatePlayerListBox
public class TileCharger extends AENetworkPowerTile implements ICrankable, ITickable
{
private final int[] sides = { 0 };
src/main/java/appeng/tile/misc/TileLightDetector.java
+2 -2
View File
@@ -19,15 +19,15 @@
package appeng.tile.misc;
import net.minecraft.server.gui.IUpdatePlayerListBox;
import appeng.tile.AEBaseTile;
import appeng.tile.TileEvent;
import appeng.tile.events.TileEventType;
import appeng.util.Platform;
import net.minecraft.util.ITickable;
public class TileLightDetector extends AEBaseTile implements IUpdatePlayerListBox
public class TileLightDetector extends AEBaseTile implements ITickable
{
private int lastCheck = 30;
src/main/java/appeng/tile/qnb/TileQuantumBridge.java
+2 -3
View File
@@ -29,10 +29,9 @@ import net.minecraft.block.Block;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.server.gui.IUpdatePlayerListBox;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ITickable;
import appeng.api.AEApi;
import appeng.api.definitions.IBlockDefinition;
import appeng.api.networking.GridFlags;
@@ -54,7 +53,7 @@ import appeng.tile.inventory.InvOperation;
import appeng.util.Platform;
public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock, IUpdatePlayerListBox
public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock, ITickable
{
private final byte corner = 16;
private final int[] sidesRing = {};
src/main/java/appeng/tile/storage/TileChest.java
+3 -3
View File
@@ -24,14 +24,13 @@ import java.util.Collections;
import java.util.List;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.server.gui.IUpdatePlayerListBox;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ITickable;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
@@ -93,7 +92,7 @@ import appeng.util.Platform;
import appeng.util.item.AEFluidStack;
public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHandler, ITerminalHost, IPriorityHost, IConfigManagerHost, IColorableTile, IUpdatePlayerListBox
public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHandler, ITerminalHost, IPriorityHost, IConfigManagerHost, IColorableTile, ITickable
{
private static final ChestNoHandler NO_HANDLER = new ChestNoHandler();
@@ -993,4 +992,5 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
return super.extractItems( request, mode, src );
}
}
}