Update to new forge and mappings
This commit is contained in:
parent
c02269f4d6
commit
3367e990be
26 changed files with 101 additions and 101 deletions
|
@ -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'
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue