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

Port to 1.11

Browse Source
This commit is contained in:
yueh
2016-12-08 12:42:00 +01:00
parent 589730bfad
commit ed9e6dd21c
262 changed files with 4027 additions and 3954 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/api/ApiPart.java
+2 -2
View File
@@ -55,7 +55,7 @@ import appeng.api.parts.CableRenderMode;
import appeng.api.parts.IPartHelper;
import appeng.api.parts.LayerBase;
import appeng.core.AELog;
import appeng.core.CommonHelper;
import appeng.core.AppEng;
import appeng.parts.PartPlacement;
import appeng.tile.AEBaseTile;
import appeng.tile.networking.TileCableBus;
@@ -328,7 +328,7 @@ public class ApiPart implements IPartHelper
@Override
public CableRenderMode getCableRenderMode()
{
return CommonHelper.proxy.getRenderMode();
return AppEng.proxy.getRenderMode();
}
private static class DefaultPackageClassNameRemapper extends Remapper
src/main/java/appeng/core/api/definitions/ApiParts.java
+15 -15
View File
@@ -61,8 +61,8 @@ public final class ApiParts implements IParts
private final IItemDefinition p2PTunnelME;
private final IItemDefinition p2PTunnelRedstone;
private final IItemDefinition p2PTunnelItems;
private final IItemDefinition p2PTunnelLiquids;
private final IItemDefinition p2PTunnelEU;
//private final IItemDefinition p2PTunnelLiquids;
//private final IItemDefinition p2PTunnelEU;
// private final IItemDefinition p2PTunnelRF;
private final IItemDefinition p2PTunnelLight;
// private final IItemDefinition p2PTunnelOpenComputers;
@@ -112,8 +112,8 @@ public final class ApiParts implements IParts
this.p2PTunnelME = new DamagedItemDefinition( "part.tunnel.me", itemPart.createPart( PartType.P2PTunnelME ) );
this.p2PTunnelRedstone = new DamagedItemDefinition( "part.tunnel.redstone", itemPart.createPart( PartType.P2PTunnelRedstone ) );
this.p2PTunnelItems = new DamagedItemDefinition( "part.tunnel.item", itemPart.createPart( PartType.P2PTunnelItems ) );
this.p2PTunnelLiquids = new DamagedItemDefinition( "part.tunnel.fluid", itemPart.createPart( PartType.P2PTunnelLiquids ) );
this.p2PTunnelEU = new DamagedItemDefinition( "part.tunnel.eu", itemPart.createPart( PartType.P2PTunnelEU ) );
//this.p2PTunnelLiquids = new DamagedItemDefinition( "part.tunnel.fluid", itemPart.createPart( PartType.P2PTunnelLiquids ) );
//this.p2PTunnelEU = new DamagedItemDefinition( "part.tunnel.eu", itemPart.createPart( PartType.P2PTunnelEU ) );
// this.p2PTunnelRF = new DamagedItemDefinition( itemMultiPart.createPart( PartType.P2PTunnelRF ) );
this.p2PTunnelLight = new DamagedItemDefinition( "part.tunnel.light", itemPart.createPart( PartType.P2PTunnelLight ) );
// this.p2PTunnelOpenComputers = new DamagedItemDefinition( itemMultiPart.createPart(
@@ -280,17 +280,17 @@ public final class ApiParts implements IParts
return this.p2PTunnelItems;
}
@Override
public IItemDefinition p2PTunnelLiquids()
{
return this.p2PTunnelLiquids;
}
@Override
public IItemDefinition p2PTunnelEU()
{
return this.p2PTunnelEU;
}
// @Override
// public IItemDefinition p2PTunnelLiquids()
// {
// return this.p2PTunnelLiquids;
// }
//
// @Override
// public IItemDefinition p2PTunnelEU()
// {
// return this.p2PTunnelEU;
// }
/* @Override
* public IItemDefinition p2PTunnelRF()
src/main/java/appeng/core/api/imc/IMCGrinder.java
+3 -3
View File
@@ -70,8 +70,8 @@ public class IMCGrinder implements IIMCProcessor
final NBTTagCompound inTag = (NBTTagCompound) msg.getTag( "in" );
final NBTTagCompound outTag = (NBTTagCompound) msg.getTag( "out" );
final ItemStack in = ItemStack.loadItemStackFromNBT( inTag );
final ItemStack out = ItemStack.loadItemStackFromNBT( outTag );
final ItemStack in = new ItemStack( inTag );
final ItemStack out = new ItemStack( outTag );
final int turns = msg.getInteger( "turns" );
@@ -88,7 +88,7 @@ public class IMCGrinder implements IIMCProcessor
if( msg.hasKey( "optional" ) )
{
final NBTTagCompound optionalTag = (NBTTagCompound) msg.getTag( "optional" );
final ItemStack optional = ItemStack.loadItemStackFromNBT( optionalTag );
final ItemStack optional = new ItemStack( optionalTag );
if( optional == null )
{
src/main/java/appeng/core/api/imc/IMCMatterCannon.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class IMCMatterCannon implements IIMCProcessor
final NBTTagCompound msg = m.getNBTValue();
final NBTTagCompound item = (NBTTagCompound) msg.getTag( "item" );
final ItemStack ammo = ItemStack.loadItemStackFromNBT( item );
final ItemStack ammo = new ItemStack( item );
final double weight = msg.getDouble( "weight" );
if( ammo == null )