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

Lots of compile fixes

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-04 03:02:48 +02:00
parent 6eb2a9504a
commit 237463dd94
241 changed files with 3438 additions and 3474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/grid/AENetworkInvTile.java
+11 -6
View File
@@ -27,6 +27,7 @@ import appeng.api.util.AEPartLocation;
import appeng.me.helpers.AENetworkProxy;
import appeng.me.helpers.IGridProxyable;
import appeng.tile.AEBaseInvTile;
import net.minecraft.tileentity.TileEntityType;
public abstract class AENetworkInvTile extends AEBaseInvTile implements IActionHost, IGridProxyable
@@ -34,6 +35,10 @@ public abstract class AENetworkInvTile extends AEBaseInvTile implements IActionH
private final AENetworkProxy gridProxy = new AENetworkProxy( this, "proxy", this.getItemFromTile( this ), true );
public AENetworkInvTile(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@Override
public void read(final CompoundNBT data )
{
@@ -68,10 +73,10 @@ public abstract class AENetworkInvTile extends AEBaseInvTile implements IActionH
}
@Override
public void onChunkUnload()
public void onChunkUnloaded()
{
super.onChunkUnload();
this.getProxy().onChunkUnload();
super.onChunkUnloaded();
this.getProxy().onChunkUnloaded();
}
@Override
@@ -82,10 +87,10 @@ public abstract class AENetworkInvTile extends AEBaseInvTile implements IActionH
}
@Override
public void invalidate()
public void remove()
{
super.invalidate();
this.getProxy().invalidate();
super.remove();
this.getProxy().remove();
}
@Override
src/main/java/appeng/tile/grid/AENetworkPowerTile.java
+11 -6
View File
@@ -29,6 +29,7 @@ import appeng.api.util.DimensionalCoord;
import appeng.me.helpers.AENetworkProxy;
import appeng.me.helpers.IGridProxyable;
import appeng.tile.powersink.AEBasePoweredTile;
import net.minecraft.tileentity.TileEntityType;
public abstract class AENetworkPowerTile extends AEBasePoweredTile implements IActionHost, IGridProxyable
@@ -36,6 +37,10 @@ public abstract class AENetworkPowerTile extends AEBasePoweredTile implements IA
private final AENetworkProxy gridProxy = new AENetworkProxy( this, "proxy", this.getItemFromTile( this ), true );
public AENetworkPowerTile(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@Override
public void read(final CompoundNBT data )
{
@@ -89,17 +94,17 @@ public abstract class AENetworkPowerTile extends AEBasePoweredTile implements IA
}
@Override
public void invalidate()
public void remove()
{
super.invalidate();
this.getProxy().invalidate();
super.remove();
this.getProxy().remove();
}
@Override
public void onChunkUnload()
public void onChunkUnloaded()
{
super.onChunkUnload();
this.getProxy().onChunkUnload();
super.onChunkUnloaded();
this.getProxy().onChunkUnloaded();
}
@Override
src/main/java/appeng/tile/grid/AENetworkTile.java
+15 -10
View File
@@ -29,6 +29,7 @@ import appeng.api.util.DimensionalCoord;
import appeng.me.helpers.AENetworkProxy;
import appeng.me.helpers.IGridProxyable;
import appeng.tile.AEBaseTile;
import net.minecraft.tileentity.TileEntityType;
public class AENetworkTile extends AEBaseTile implements IActionHost, IGridProxyable
@@ -36,17 +37,21 @@ public class AENetworkTile extends AEBaseTile implements IActionHost, IGridProxy
private final AENetworkProxy gridProxy = this.createProxy();
public AENetworkTile(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@Override
public void readFromNBT( final CompoundNBT data )
public void read(final CompoundNBT data )
{
super.readFromNBT( data );
super.read( data );
this.getProxy().readFromNBT( data );
}
@Override
public CompoundNBT writeToNBT( final CompoundNBT data )
public CompoundNBT write(final CompoundNBT data )
{
super.writeToNBT( data );
super.write( data );
this.getProxy().writeToNBT( data );
return data;
}
@@ -69,10 +74,10 @@ public class AENetworkTile extends AEBaseTile implements IActionHost, IGridProxy
}
@Override
public void onChunkUnload()
public void onChunkUnloaded()
{
super.onChunkUnload();
this.getProxy().onChunkUnload();
super.onChunkUnloaded();
this.getProxy().onChunkUnloaded();
}
@Override
@@ -83,10 +88,10 @@ public class AENetworkTile extends AEBaseTile implements IActionHost, IGridProxy
}
@Override
public void invalidate()
public void remove()
{
super.invalidate();
this.getProxy().invalidate();
super.remove();
this.getProxy().remove();
}
@Override