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

pick 97420a31d The big reformat of 2020

Browse Source
This commit is contained in:
yueh
2020-06-16 21:41:28 +02:00
parent 5304b3febe
commit 5225ea426b
2252 changed files with 95466 additions and 118582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/grid/AENetworkInvTile.java
+52 -65
View File
@@ -18,8 +18,8 @@
package appeng.tile.grid;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityType;
import appeng.api.networking.IGridNode;
import appeng.api.networking.security.IActionHost;
@@ -27,82 +27,69 @@ 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 {
public abstract class AENetworkInvTile extends AEBaseInvTile implements IActionHost, IGridProxyable
{
private final AENetworkProxy gridProxy = new AENetworkProxy(this, "proxy", this.getItemFromTile(this), true);
private final AENetworkProxy gridProxy = new AENetworkProxy( this, "proxy", this.getItemFromTile( this ), true );
public AENetworkInvTile(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
public AENetworkInvTile(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
this.getProxy().readFromNBT(data);
}
@Override
public void read(final CompoundNBT data )
{
super.read( data );
this.getProxy().readFromNBT( data );
}
@Override
public CompoundNBT write(final CompoundNBT data) {
super.write(data);
this.getProxy().writeToNBT(data);
return data;
}
@Override
public CompoundNBT write(final CompoundNBT data )
{
super.write( data );
this.getProxy().writeToNBT( data );
return data;
}
@Override
public AENetworkProxy getProxy() {
return this.gridProxy;
}
@Override
public AENetworkProxy getProxy()
{
return this.gridProxy;
}
@Override
public void gridChanged() {
@Override
public void gridChanged()
{
}
}
@Override
public IGridNode getGridNode(final AEPartLocation dir) {
return this.getProxy().getNode();
}
@Override
public IGridNode getGridNode( final AEPartLocation dir )
{
return this.getProxy().getNode();
}
@Override
public void onChunkUnloaded() {
super.onChunkUnloaded();
this.getProxy().onChunkUnloaded();
}
@Override
public void onChunkUnloaded()
{
super.onChunkUnloaded();
this.getProxy().onChunkUnloaded();
}
@Override
public void onReady() {
super.onReady();
this.getProxy().onReady();
}
@Override
public void onReady()
{
super.onReady();
this.getProxy().onReady();
}
@Override
public void remove() {
super.remove();
this.getProxy().remove();
}
@Override
public void remove()
{
super.remove();
this.getProxy().remove();
}
@Override
public void validate() {
super.validate();
this.getProxy().validate();
}
@Override
public void validate()
{
super.validate();
this.getProxy().validate();
}
@Override
public IGridNode getActionableNode()
{
return this.getProxy().getNode();
}
@Override
public IGridNode getActionableNode() {
return this.getProxy().getNode();
}
}
src/main/java/appeng/tile/grid/AENetworkPowerTile.java
+60 -75
View File
@@ -18,8 +18,8 @@
package appeng.tile.grid;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityType;
import appeng.api.networking.IGridNode;
import appeng.api.networking.security.IActionHost;
@@ -29,95 +29,80 @@ 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 {
public abstract class AENetworkPowerTile extends AEBasePoweredTile implements IActionHost, IGridProxyable
{
private final AENetworkProxy gridProxy = new AENetworkProxy(this, "proxy", this.getItemFromTile(this), true);
private final AENetworkProxy gridProxy = new AENetworkProxy( this, "proxy", this.getItemFromTile( this ), true );
public AENetworkPowerTile(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
public AENetworkPowerTile(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
this.getProxy().readFromNBT(data);
}
@Override
public void read(final CompoundNBT data )
{
super.read( data );
this.getProxy().readFromNBT( data );
}
@Override
public CompoundNBT write(final CompoundNBT data) {
super.write(data);
this.getProxy().writeToNBT(data);
return data;
}
@Override
public CompoundNBT write(final CompoundNBT data )
{
super.write( data );
this.getProxy().writeToNBT( data );
return data;
}
@Override
public AENetworkProxy getProxy() {
return this.gridProxy;
}
@Override
public AENetworkProxy getProxy()
{
return this.gridProxy;
}
@Override
public DimensionalCoord getLocation() {
return new DimensionalCoord(this);
}
@Override
public DimensionalCoord getLocation()
{
return new DimensionalCoord( this );
}
@Override
public void gridChanged() {
@Override
public void gridChanged()
{
}
}
@Override
public IGridNode getGridNode(final AEPartLocation dir) {
return this.getProxy().getNode();
}
@Override
public IGridNode getGridNode( final AEPartLocation dir )
{
return this.getProxy().getNode();
}
@Override
public AECableType getCableConnectionType(final AEPartLocation dir) {
return AECableType.SMART;
}
@Override
public AECableType getCableConnectionType( final AEPartLocation dir )
{
return AECableType.SMART;
}
@Override
public void validate() {
super.validate();
this.getProxy().validate();
}
@Override
public void validate()
{
super.validate();
this.getProxy().validate();
}
@Override
public void remove() {
super.remove();
this.getProxy().remove();
}
@Override
public void remove()
{
super.remove();
this.getProxy().remove();
}
@Override
public void onChunkUnloaded() {
super.onChunkUnloaded();
this.getProxy().onChunkUnloaded();
}
@Override
public void onChunkUnloaded()
{
super.onChunkUnloaded();
this.getProxy().onChunkUnloaded();
}
@Override
public void onReady() {
super.onReady();
this.getProxy().onReady();
}
@Override
public void onReady()
{
super.onReady();
this.getProxy().onReady();
}
@Override
public IGridNode getActionableNode()
{
return this.getProxy().getNode();
}
@Override
public IGridNode getActionableNode() {
return this.getProxy().getNode();
}
}
src/main/java/appeng/tile/grid/AENetworkTile.java
+63 -79
View File
@@ -18,8 +18,8 @@
package appeng.tile.grid;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityType;
import appeng.api.networking.IGridNode;
import appeng.api.networking.security.IActionHost;
@@ -29,99 +29,83 @@ 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 {
public class AENetworkTile extends AEBaseTile implements IActionHost, IGridProxyable
{
private final AENetworkProxy gridProxy = this.createProxy();
private final AENetworkProxy gridProxy = this.createProxy();
public AENetworkTile(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
public AENetworkTile(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@Override
public void read(final CompoundNBT data) {
super.read(data);
this.getProxy().readFromNBT(data);
}
@Override
public void read(final CompoundNBT data )
{
super.read( data );
this.getProxy().readFromNBT( data );
}
@Override
public CompoundNBT write(final CompoundNBT data) {
super.write(data);
this.getProxy().writeToNBT(data);
return data;
}
@Override
public CompoundNBT write(final CompoundNBT data )
{
super.write( data );
this.getProxy().writeToNBT( data );
return data;
}
protected AENetworkProxy createProxy() {
return new AENetworkProxy(this, "proxy", this.getItemFromTile(this), true);
}
protected AENetworkProxy createProxy()
{
return new AENetworkProxy( this, "proxy", this.getItemFromTile( this ), true );
}
@Override
public IGridNode getGridNode(final AEPartLocation dir) {
return this.getProxy().getNode();
}
@Override
public IGridNode getGridNode( final AEPartLocation dir )
{
return this.getProxy().getNode();
}
@Override
public AECableType getCableConnectionType(final AEPartLocation dir) {
return AECableType.SMART;
}
@Override
public AECableType getCableConnectionType( final AEPartLocation dir )
{
return AECableType.SMART;
}
@Override
public void onChunkUnloaded() {
super.onChunkUnloaded();
this.getProxy().onChunkUnloaded();
}
@Override
public void onChunkUnloaded()
{
super.onChunkUnloaded();
this.getProxy().onChunkUnloaded();
}
@Override
public void onReady() {
super.onReady();
this.getProxy().onReady();
}
@Override
public void onReady()
{
super.onReady();
this.getProxy().onReady();
}
@Override
public void remove() {
super.remove();
this.getProxy().remove();
}
@Override
public void remove()
{
super.remove();
this.getProxy().remove();
}
@Override
public void validate() {
super.validate();
this.getProxy().validate();
}
@Override
public void validate()
{
super.validate();
this.getProxy().validate();
}
@Override
public AENetworkProxy getProxy() {
return this.gridProxy;
}
@Override
public AENetworkProxy getProxy()
{
return this.gridProxy;
}
@Override
public DimensionalCoord getLocation() {
return new DimensionalCoord(this);
}
@Override
public DimensionalCoord getLocation()
{
return new DimensionalCoord( this );
}
@Override
public void gridChanged() {
@Override
public void gridChanged()
{
}
}
@Override
public IGridNode getActionableNode()
{
return this.getProxy().getNode();
}
@Override
public IGridNode getActionableNode() {
return this.getProxy().getNode();
}
}