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

Fabric port in progress

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-27 23:25:38 +02:00
parent 80fbb58d4f
commit b79cd732b2
368 changed files with 2498 additions and 2698 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/grid/AENetworkTileEntity.java → src/main/java/appeng/tile/grid/AENetworkBlockEntity.java
+8 -7
View File
@@ -18,6 +18,7 @@
package appeng.tile.grid;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.nbt.CompoundTag;
@@ -28,25 +29,25 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.me.helpers.AENetworkProxy;
import appeng.me.helpers.IGridProxyable;
import appeng.tile.AEBaseTileEntity;
import appeng.tile.AEBaseBlockEntity;
public class AENetworkTileEntity extends AEBaseTileEntity implements IActionHost, IGridProxyable {
public class AENetworkBlockEntity extends AEBaseBlockEntity implements IActionHost, IGridProxyable {
private final AENetworkProxy gridProxy = this.createProxy();
public AENetworkTileEntity(BlockEntityType<?> tileEntityTypeIn) {
public AENetworkBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@Override
public void read(final CompoundTag data) {
super.read(data);
public void fromTag(BlockState state, final CompoundTag data) {
super.fromTag(state, data);
this.getProxy().readFromNBT(data);
}
@Override
public CompoundTag write(final CompoundTag data) {
super.write(data);
public CompoundTag toTag(final CompoundTag data) {
super.toTag(data);
this.getProxy().writeToNBT(data);
return data;
}
src/main/java/appeng/tile/grid/AENetworkInvTileEntity.java → src/main/java/appeng/tile/grid/AENetworkInvBlockEntity.java
+8 -7
View File
@@ -18,6 +18,7 @@
package appeng.tile.grid;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.nbt.CompoundTag;
@@ -26,25 +27,25 @@ import appeng.api.networking.security.IActionHost;
import appeng.api.util.AEPartLocation;
import appeng.me.helpers.AENetworkProxy;
import appeng.me.helpers.IGridProxyable;
import appeng.tile.AEBaseInvTileEntity;
import appeng.tile.AEBaseInvBlockEntity;
public abstract class AENetworkInvTileEntity extends AEBaseInvTileEntity implements IActionHost, IGridProxyable {
public abstract class AENetworkInvBlockEntity extends AEBaseInvBlockEntity implements IActionHost, IGridProxyable {
private final AENetworkProxy gridProxy = new AENetworkProxy(this, "proxy", this.getItemFromTile(this), true);
public AENetworkInvTileEntity(BlockEntityType<?> tileEntityTypeIn) {
public AENetworkInvBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@Override
public void read(final CompoundTag data) {
super.read(data);
public void fromTag(BlockState state, final CompoundTag data) {
super.fromTag(state, data);
this.getProxy().readFromNBT(data);
}
@Override
public CompoundTag write(final CompoundTag data) {
super.write(data);
public CompoundTag toTag(final CompoundTag data) {
super.toTag(data);
this.getProxy().writeToNBT(data);
return data;
}
src/main/java/appeng/tile/grid/AENetworkPowerTileEntity.java → src/main/java/appeng/tile/grid/AENetworkPowerBlockEntity.java
+8 -7
View File
@@ -18,6 +18,7 @@
package appeng.tile.grid;
import net.minecraft.block.BlockState;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.block.entity.BlockEntityType;
@@ -28,25 +29,25 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.me.helpers.AENetworkProxy;
import appeng.me.helpers.IGridProxyable;
import appeng.tile.powersink.AEBasePoweredTileEntity;
import appeng.tile.powersink.AEBasePoweredBlockEntity;
public abstract class AENetworkPowerTileEntity extends AEBasePoweredTileEntity implements IActionHost, IGridProxyable {
public abstract class AENetworkPowerBlockEntity extends AEBasePoweredBlockEntity implements IActionHost, IGridProxyable {
private final AENetworkProxy gridProxy = new AENetworkProxy(this, "proxy", this.getItemFromTile(this), true);
public AENetworkPowerTileEntity(BlockEntityType<?> tileEntityTypeIn) {
public AENetworkPowerBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@Override
public void read(final CompoundTag data) {
super.read(data);
public void fromTag(BlockState state, final CompoundTag data) {
super.fromTag(state, data);
this.getProxy().readFromNBT(data);
}
@Override
public CompoundTag write(final CompoundTag data) {
super.write(data);
public CompoundTag toTag(final CompoundTag data) {
super.toTag(data);
this.getProxy().writeToNBT(data);
return data;
}