diff --git a/build.gradle b/build.gradle index b494859db..0c22c8f59 100644 --- a/build.gradle +++ b/build.gradle @@ -75,11 +75,11 @@ if (ENV.BUILD_NUMBER) { } minecraft { - version = "1.8.8-11.14.4.1590-1.8.8" - mappings = 'snapshot_20151126' + version = "1.8.8-11.15.0.1595-1.8.8" + mappings = 'snapshot_20151129' replace "@MODVERSION@", project.version makeObfSourceJar = false - // useDepAts = true + useDepAts = true } group = 'TechReborn' @@ -108,7 +108,7 @@ dependencies { // compile name: "MineTweaker3", version: "1.7.10-3.0.9C", classifier: "Dev" // shade 'IC2-Classic-API-STANDALONE:IC2-Classic-API-STANDALONE:1.1.0.19-5:api' compile 'RebornCore:RebornCore-1.8.8:1.0.0.+:dev' - // deobfCompile "mezz.jei:jei_1.8.8:2.0.4.5" + deobfCompile "mezz.jei:jei_1.8.8:2.0.4.5" testCompile 'junit:junit:4.12' } diff --git a/src/main/java/techreborn/blocks/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/BlockPlayerDetector.java index cd4724030..e7c9fbc3a 100644 --- a/src/main/java/techreborn/blocks/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/BlockPlayerDetector.java @@ -73,7 +73,7 @@ public class BlockPlayerDetector extends BaseTileBlock implements IBlockTextureP } @Override - public int isProvidingWeakPower(IBlockAccess blockAccess, BlockPos pos, IBlockState state, EnumFacing side) { + public int getWeakPower(IBlockAccess blockAccess, BlockPos pos, IBlockState state, EnumFacing side) { TileEntity entity = blockAccess.getTileEntity(pos); if (entity instanceof TilePlayerDectector) { return ((TilePlayerDectector) entity).isProvidingPower() ? 15 : 0; @@ -82,7 +82,7 @@ public class BlockPlayerDetector extends BaseTileBlock implements IBlockTextureP } @Override - public int isProvidingStrongPower(IBlockAccess blockAccess, BlockPos pos, IBlockState state, EnumFacing side) { + public int getStrongPower(IBlockAccess blockAccess, BlockPos pos, IBlockState state, EnumFacing side) { TileEntity entity = blockAccess.getTileEntity(pos); if (entity instanceof TilePlayerDectector) { return ((TilePlayerDectector) entity).isProvidingPower() ? 15 : 0; diff --git a/src/main/java/techreborn/tiles/TileAlloyFurnace.java b/src/main/java/techreborn/tiles/TileAlloyFurnace.java index 3dc99eb06..2b77ec1bc 100644 --- a/src/main/java/techreborn/tiles/TileAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/TileAlloyFurnace.java @@ -291,8 +291,8 @@ public class TileAlloyFurnace extends TileMachineBase implements IWrenchable, II } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -350,8 +350,8 @@ public class TileAlloyFurnace extends TileMachineBase implements IWrenchable, II } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileAlloySmelter.java b/src/main/java/techreborn/tiles/TileAlloySmelter.java index f1adbf279..512d41045 100644 --- a/src/main/java/techreborn/tiles/TileAlloySmelter.java +++ b/src/main/java/techreborn/tiles/TileAlloySmelter.java @@ -119,8 +119,8 @@ public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable, } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -227,8 +227,8 @@ public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable, } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileAssemblingMachine.java b/src/main/java/techreborn/tiles/TileAssemblingMachine.java index 442b7aa5a..da0873b2f 100644 --- a/src/main/java/techreborn/tiles/TileAssemblingMachine.java +++ b/src/main/java/techreborn/tiles/TileAssemblingMachine.java @@ -105,8 +105,8 @@ public class TileAssemblingMachine extends TilePowerAcceptor implements IWrencha } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -222,8 +222,8 @@ public class TileAssemblingMachine extends TilePowerAcceptor implements IWrencha } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileBlastFurnace.java b/src/main/java/techreborn/tiles/TileBlastFurnace.java index a743ab2a8..603cb762d 100644 --- a/src/main/java/techreborn/tiles/TileBlastFurnace.java +++ b/src/main/java/techreborn/tiles/TileBlastFurnace.java @@ -134,8 +134,8 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, } @Override - public ItemStack getStackInSlotOnClosing(int p_70304_1_) { - return inventory.getStackInSlotOnClosing(p_70304_1_); + public ItemStack removeStackFromSlot(int p_70304_1_) { + return inventory.removeStackFromSlot(p_70304_1_); } @Override @@ -272,8 +272,8 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileCentrifuge.java b/src/main/java/techreborn/tiles/TileCentrifuge.java index 3a6faa08b..e9e079bf7 100644 --- a/src/main/java/techreborn/tiles/TileCentrifuge.java +++ b/src/main/java/techreborn/tiles/TileCentrifuge.java @@ -121,8 +121,8 @@ public class TileCentrifuge extends TilePowerAcceptor implements IWrenchable, II } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -227,8 +227,8 @@ public class TileCentrifuge extends TilePowerAcceptor implements IWrenchable, II } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileChargeBench.java b/src/main/java/techreborn/tiles/TileChargeBench.java index dd164734e..060b7fd32 100644 --- a/src/main/java/techreborn/tiles/TileChargeBench.java +++ b/src/main/java/techreborn/tiles/TileChargeBench.java @@ -106,8 +106,8 @@ public class TileChargeBench extends TilePowerAcceptor implements IWrenchable, I } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -210,8 +210,8 @@ public class TileChargeBench extends TilePowerAcceptor implements IWrenchable, I } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileChemicalReactor.java b/src/main/java/techreborn/tiles/TileChemicalReactor.java index 27d6f6e61..e5b4db54d 100644 --- a/src/main/java/techreborn/tiles/TileChemicalReactor.java +++ b/src/main/java/techreborn/tiles/TileChemicalReactor.java @@ -104,8 +104,8 @@ public class TileChemicalReactor extends TilePowerAcceptor implements IWrenchabl } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -221,8 +221,8 @@ public class TileChemicalReactor extends TilePowerAcceptor implements IWrenchabl } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileChunkLoader.java b/src/main/java/techreborn/tiles/TileChunkLoader.java index 23bcca809..dbc7e917d 100644 --- a/src/main/java/techreborn/tiles/TileChunkLoader.java +++ b/src/main/java/techreborn/tiles/TileChunkLoader.java @@ -75,8 +75,8 @@ public class TileChunkLoader extends TilePowerAcceptor implements IWrenchable, I } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -157,8 +157,8 @@ public class TileChunkLoader extends TilePowerAcceptor implements IWrenchable, I } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileDieselGenerator.java b/src/main/java/techreborn/tiles/TileDieselGenerator.java index f3e055649..1fbe8d32a 100644 --- a/src/main/java/techreborn/tiles/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/TileDieselGenerator.java @@ -172,8 +172,8 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl } @Override - public ItemStack getStackInSlotOnClosing(int p_70304_1_) { - return inventory.getStackInSlotOnClosing(p_70304_1_); + public ItemStack removeStackFromSlot(int p_70304_1_) { + return inventory.removeStackFromSlot(p_70304_1_); } @Override @@ -254,8 +254,8 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileDigitalChest.java b/src/main/java/techreborn/tiles/TileDigitalChest.java index cda7c7b03..ae90cdde6 100644 --- a/src/main/java/techreborn/tiles/TileDigitalChest.java +++ b/src/main/java/techreborn/tiles/TileDigitalChest.java @@ -161,8 +161,8 @@ public class TileDigitalChest extends TileMachineBase implements IInventory, } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -275,8 +275,8 @@ public class TileDigitalChest extends TileMachineBase implements IInventory, } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileDragonEggSiphoner.java b/src/main/java/techreborn/tiles/TileDragonEggSiphoner.java index 3e538177a..18c9038aa 100644 --- a/src/main/java/techreborn/tiles/TileDragonEggSiphoner.java +++ b/src/main/java/techreborn/tiles/TileDragonEggSiphoner.java @@ -98,8 +98,8 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -139,8 +139,8 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileGasTurbine.java b/src/main/java/techreborn/tiles/TileGasTurbine.java index 24a945a25..c8973d974 100644 --- a/src/main/java/techreborn/tiles/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/TileGasTurbine.java @@ -190,8 +190,8 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, } @Override - public ItemStack getStackInSlotOnClosing(int p_70304_1_) { - return inventory.getStackInSlotOnClosing(p_70304_1_); + public ItemStack removeStackFromSlot(int p_70304_1_) { + return inventory.removeStackFromSlot(p_70304_1_); } @Override @@ -231,8 +231,8 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileGrinder.java b/src/main/java/techreborn/tiles/TileGrinder.java index c9f0f4020..c89097852 100644 --- a/src/main/java/techreborn/tiles/TileGrinder.java +++ b/src/main/java/techreborn/tiles/TileGrinder.java @@ -198,8 +198,8 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable, IFlui } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -239,8 +239,8 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable, IFlui } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/TileImplosionCompressor.java index 12b73b7f4..affe9190f 100644 --- a/src/main/java/techreborn/tiles/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/TileImplosionCompressor.java @@ -137,8 +137,8 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -178,8 +178,8 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java index 70767f375..d1ccd7556 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java @@ -117,8 +117,8 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWr } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -158,8 +158,8 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWr } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java index 33b2ea065..93fbdea77 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/TileIndustrialSawmill.java @@ -189,8 +189,8 @@ public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrencha } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -230,8 +230,8 @@ public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrencha } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 9e1428056..cae77c838 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -92,8 +92,8 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -133,8 +133,8 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileQuantumChest.java b/src/main/java/techreborn/tiles/TileQuantumChest.java index bf4058b74..48096764c 100644 --- a/src/main/java/techreborn/tiles/TileQuantumChest.java +++ b/src/main/java/techreborn/tiles/TileQuantumChest.java @@ -159,8 +159,8 @@ public class TileQuantumChest extends TileMachineBase implements IInventory, } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -199,8 +199,8 @@ public class TileQuantumChest extends TileMachineBase implements IInventory, } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index b0969e0fd..ed7353ab8 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -137,8 +137,8 @@ public class TileQuantumTank extends TileMachineBase implements IFluidHandler, } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -179,8 +179,8 @@ public class TileQuantumTank extends TileMachineBase implements IFluidHandler, } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileRollingMachine.java b/src/main/java/techreborn/tiles/TileRollingMachine.java index 55ff41c93..90e5f871e 100644 --- a/src/main/java/techreborn/tiles/TileRollingMachine.java +++ b/src/main/java/techreborn/tiles/TileRollingMachine.java @@ -214,8 +214,8 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -255,8 +255,8 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileSemifluidGenerator.java b/src/main/java/techreborn/tiles/TileSemifluidGenerator.java index 0851cbb2d..946c61a3c 100644 --- a/src/main/java/techreborn/tiles/TileSemifluidGenerator.java +++ b/src/main/java/techreborn/tiles/TileSemifluidGenerator.java @@ -194,8 +194,8 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench } @Override - public ItemStack getStackInSlotOnClosing(int p_70304_1_) { - return inventory.getStackInSlotOnClosing(p_70304_1_); + public ItemStack removeStackFromSlot(int p_70304_1_) { + return inventory.removeStackFromSlot(p_70304_1_); } @Override @@ -235,8 +235,8 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileThermalGenerator.java b/src/main/java/techreborn/tiles/TileThermalGenerator.java index 3b6bac202..62d25e7df 100644 --- a/src/main/java/techreborn/tiles/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/TileThermalGenerator.java @@ -175,8 +175,8 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab } @Override - public ItemStack getStackInSlotOnClosing(int p_70304_1_) { - return inventory.getStackInSlotOnClosing(p_70304_1_); + public ItemStack removeStackFromSlot(int p_70304_1_) { + return inventory.removeStackFromSlot(p_70304_1_); } @Override @@ -215,8 +215,8 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/TileVacuumFreezer.java b/src/main/java/techreborn/tiles/TileVacuumFreezer.java index 4e68d7d6d..1cf87a17c 100644 --- a/src/main/java/techreborn/tiles/TileVacuumFreezer.java +++ b/src/main/java/techreborn/tiles/TileVacuumFreezer.java @@ -135,8 +135,8 @@ public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable, } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -176,8 +176,8 @@ public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable, } @Override - public String getCommandSenderName() { - return inventory.getCommandSenderName(); + public String getName() { + return inventory.getName(); } @Override diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java index fbfdc8680..b1ebcaa98 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java @@ -120,8 +120,8 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn } @Override - public ItemStack getStackInSlotOnClosing(int slot) { - return inventory.getStackInSlotOnClosing(slot); + public ItemStack removeStackFromSlot(int slot) { + return inventory.removeStackFromSlot(slot); } @Override @@ -337,7 +337,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn } @Override - public String getCommandSenderName() { + public String getName() { return null; }