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/misc/CellWorkbenchTileEntity.java → src/main/java/appeng/tile/misc/CellWorkbenchBlockEntity.java
+8 -7
View File
@@ -21,6 +21,7 @@ package appeng.tile.misc;
import java.util.List;
import alexiil.mc.lib.attributes.item.ItemTransferable;
import net.minecraft.block.BlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.block.entity.BlockEntityType;
@@ -33,7 +34,7 @@ import appeng.api.config.Upgrades;
import appeng.api.implementations.IUpgradeableHost;
import appeng.api.storage.cells.ICellWorkbenchItem;
import appeng.api.util.IConfigManager;
import appeng.tile.AEBaseTileEntity;
import appeng.tile.AEBaseBlockEntity;
import appeng.tile.inventory.AppEngInternalAEInventory;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.ConfigManager;
@@ -42,7 +43,7 @@ import appeng.util.helpers.ItemHandlerUtil;
import appeng.util.inv.IAEAppEngInventory;
import appeng.util.inv.InvOperation;
public class CellWorkbenchTileEntity extends AEBaseTileEntity
public class CellWorkbenchBlockEntity extends AEBaseBlockEntity
implements IUpgradeableHost, IAEAppEngInventory, IConfigManagerHost {
private final AppEngInternalInventory cell = new AppEngInternalInventory(this, 1);
@@ -53,7 +54,7 @@ public class CellWorkbenchTileEntity extends AEBaseTileEntity
private ItemTransferable cacheConfig = null;
private boolean locked = false;
public CellWorkbenchTileEntity(BlockEntityType<?> tileEntityTypeIn) {
public CellWorkbenchBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.manager.registerSetting(Settings.COPY_MODE, CopyMode.CLEAR_ON_REMOVE);
this.cell.setEnableClientEvents(true);
@@ -94,8 +95,8 @@ public class CellWorkbenchTileEntity extends AEBaseTileEntity
}
@Override
public CompoundTag write(final CompoundTag data) {
super.write(data);
public CompoundTag toTag(final CompoundTag data) {
super.toTag(data);
this.cell.writeToNBT(data, "cell");
this.config.writeToNBT(data, "config");
this.manager.writeToNBT(data);
@@ -103,8 +104,8 @@ public class CellWorkbenchTileEntity extends AEBaseTileEntity
}
@Override
public void read(final CompoundTag data) {
super.read(data);
public void fromTag(BlockState state, final CompoundTag data) {
super.fromTag(state, data);
this.cell.readFromNBT(data, "cell");
this.config.readFromNBT(data, "config");
this.manager.readFromNBT(data);
src/main/java/appeng/tile/misc/ChargerTileEntity.java → src/main/java/appeng/tile/misc/ChargerBlockEntity.java
+3 -3
View File
@@ -48,21 +48,21 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.core.settings.TickRates;
import appeng.me.GridAccessException;
import appeng.tile.grid.AENetworkPowerTileEntity;
import appeng.tile.grid.AENetworkPowerBlockEntity;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.Platform;
import appeng.util.inv.InvOperation;
import appeng.util.inv.filter.IAEItemFilter;
import appeng.util.item.AEItemStack;
public class ChargerTileEntity extends AENetworkPowerTileEntity implements ICrankable, IGridTickable {
public class ChargerBlockEntity extends AENetworkPowerBlockEntity implements ICrankable, IGridTickable {
private static final int POWER_MAXIMUM_AMOUNT = 1600;
private static final int POWER_THRESHOLD = POWER_MAXIMUM_AMOUNT - 1;
private static final int POWER_PER_CRANK_TURN = 160;
private final AppEngInternalInventory inv = new AppEngInternalInventory(this, 1, 1, new ChargerInvFilter());
public ChargerTileEntity(BlockEntityType<?> tileEntityTypeIn) {
public ChargerBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setValidSides(EnumSet.noneOf(Direction.class));
this.getProxy().setFlags();
src/main/java/appeng/tile/misc/CondenserTileEntity.java → src/main/java/appeng/tile/misc/CondenserBlockEntity.java
+12 -11
View File
@@ -23,6 +23,7 @@ import javax.annotation.Nullable;
import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
import alexiil.mc.lib.attributes.item.ItemTransferable;
import net.minecraft.block.BlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.block.entity.BlockEntityType;
@@ -52,7 +53,7 @@ import appeng.api.storage.data.IAEStack;
import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigurableObject;
import appeng.capabilities.Capabilities;
import appeng.tile.AEBaseInvTileEntity;
import appeng.tile.AEBaseInvBlockEntity;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost;
@@ -61,7 +62,7 @@ import appeng.util.inv.WrapperChainedItemHandler;
import appeng.util.inv.WrapperFilteredItemHandler;
import appeng.util.inv.filter.AEItemFilters;
public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigManagerHost, IConfigurableObject {
public class CondenserBlockEntity extends AEBaseInvBlockEntity implements IConfigManagerHost, IConfigurableObject {
public static final int BYTE_MULTIPLIER = 8;
@@ -80,22 +81,22 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM
private double storedPower = 0;
public CondenserTileEntity(BlockEntityType<?> tileEntityTypeIn) {
public CondenserBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.cm.registerSetting(Settings.CONDENSER_OUTPUT, CondenserOutput.TRASH);
}
@Override
public CompoundTag write(final CompoundTag data) {
super.write(data);
public CompoundTag toTag(final CompoundTag data) {
super.toTag(data);
this.cm.writeToNBT(data);
data.putDouble("storedPower", this.getStoredPower());
return data;
}
@Override
public void read(final CompoundTag data) {
super.read(data);
public void fromTag(BlockState state, final CompoundTag data) {
super.fromTag(state, data);
this.cm.readFromNBT(data);
this.setStoredPower(data.getDouble("storedPower"));
}
@@ -235,7 +236,7 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM
return stack;
}
if (!simulate && !stack.isEmpty()) {
CondenserTileEntity.this.addPower(stack.getCount());
CondenserBlockEntity.this.addPower(stack.getCount());
}
return ItemStack.EMPTY;
}
@@ -283,7 +284,7 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM
if (action == FluidAction.EXECUTE) {
final IStorageChannel<IAEFluidStack> chan = AEApi.instance().storage()
.getStorageChannel(IFluidStorageChannel.class);
CondenserTileEntity.this
CondenserBlockEntity.this
.addPower((resource.isEmpty() ? 0.0 : (double) resource.getAmount()) / chan.transferFactor());
}
@@ -331,7 +332,7 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM
* to make sure a condenser is only ever used if an item can't go anywhere else.
*/
private class MEHandler implements IStorageMonitorableAccessor, IStorageMonitorable {
private final CondenserItemInventory itemInventory = new CondenserItemInventory(CondenserTileEntity.this);
private final CondenserItemInventory itemInventory = new CondenserItemInventory(CondenserBlockEntity.this);
void outputChanged(ItemStack added, ItemStack removed) {
this.itemInventory.updateOutput(added, removed);
@@ -348,7 +349,7 @@ public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigM
if (channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) {
return (IMEMonitor<T>) this.itemInventory;
} else {
return new CondenserVoidInventory<>(CondenserTileEntity.this, channel);
return new CondenserVoidInventory<>(CondenserBlockEntity.this, channel);
}
}
}
src/main/java/appeng/tile/misc/CondenserItemInventory.java
+2 -2
View File
@@ -42,13 +42,13 @@ import appeng.util.item.ItemList;
class CondenserItemInventory implements IMEMonitor<IAEItemStack>, ITickingMonitor {
private final HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap<>();
private final CondenserTileEntity target;
private final CondenserBlockEntity target;
private boolean hasChanged = true;
private final ItemList cachedList = new ItemList();
private IActionSource actionSource = new BaseActionSource();
private ItemList changeSet = new ItemList();
CondenserItemInventory(final CondenserTileEntity te) {
CondenserItemInventory(final CondenserBlockEntity te) {
this.target = te;
}
src/main/java/appeng/tile/misc/CondenserVoidInventory.java
+2 -2
View File
@@ -29,10 +29,10 @@ import appeng.api.storage.data.IItemList;
class CondenserVoidInventory<T extends IAEStack<T>> implements IMEMonitor<T> {
private final CondenserTileEntity target;
private final CondenserBlockEntity target;
private final IStorageChannel<T> channel;
CondenserVoidInventory(final CondenserTileEntity te, final IStorageChannel<T> channel) {
CondenserVoidInventory(final CondenserBlockEntity te, final IStorageChannel<T> channel) {
this.target = te;
this.channel = channel;
}
src/main/java/appeng/tile/misc/InscriberTileEntity.java → src/main/java/appeng/tile/misc/InscriberBlockEntity.java
+12 -11
View File
@@ -26,6 +26,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import alexiil.mc.lib.attributes.item.ItemTransferable;
import net.minecraft.block.BlockState;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.PacketByteBuf;
@@ -57,7 +58,7 @@ import appeng.me.GridAccessException;
import appeng.parts.automation.DefinitionUpgradeInventory;
import appeng.parts.automation.UpgradeInventory;
import appeng.recipes.handlers.InscriberRecipe;
import appeng.tile.grid.AENetworkPowerTileEntity;
import appeng.tile.grid.AENetworkPowerBlockEntity;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost;
@@ -73,7 +74,7 @@ import appeng.util.item.AEItemStack;
* @version rv2
* @since rv0
*/
public class InscriberTileEntity extends AENetworkPowerTileEntity
public class InscriberBlockEntity extends AENetworkPowerBlockEntity
implements IGridTickable, IUpgradeableHost, IConfigManagerHost {
private final int maxProcessingTime = 100;
@@ -98,7 +99,7 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity
private final IItemHandlerModifiable inv = new WrapperChainedItemHandler(this.topItemHandler,
this.bottomItemHandler, this.sideItemHandler);
public InscriberTileEntity(BlockEntityType<?> tileEntityTypeIn) {
public InscriberBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setValidSides(EnumSet.noneOf(Direction.class));
@@ -127,16 +128,16 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity
}
@Override
public CompoundTag write(final CompoundTag data) {
super.write(data);
public CompoundTag toTag(final CompoundTag data) {
super.toTag(data);
this.upgrades.writeToNBT(data, "upgrades");
this.settings.writeToNBT(data);
return data;
}
@Override
public void read(final CompoundTag data) {
super.read(data);
public void fromTag(BlockState state, final CompoundTag data) {
super.fromTag(state, data);
this.upgrades.readFromNBT(data, "upgrades");
this.settings.readFromNBT(data);
}
@@ -411,11 +412,11 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity
private class ItemHandlerFilter implements IAEItemFilter {
@Override
public boolean allowExtract(ItemTransferable inv, int slot, int amount) {
if (InscriberTileEntity.this.isSmash()) {
if (InscriberBlockEntity.this.isSmash()) {
return false;
}
return inv == InscriberTileEntity.this.topItemHandler || inv == InscriberTileEntity.this.bottomItemHandler
return inv == InscriberBlockEntity.this.topItemHandler || inv == InscriberBlockEntity.this.bottomItemHandler
|| slot == 1;
}
@@ -426,11 +427,11 @@ public class InscriberTileEntity extends AENetworkPowerTileEntity
return false;
}
if (InscriberTileEntity.this.isSmash()) {
if (InscriberBlockEntity.this.isSmash()) {
return false;
}
if (inv == InscriberTileEntity.this.topItemHandler || inv == InscriberTileEntity.this.bottomItemHandler) {
if (inv == InscriberBlockEntity.this.topItemHandler || inv == InscriberBlockEntity.this.bottomItemHandler) {
if (AEApi.instance().definitions().materials().namePress().isSameAs(stack)) {
return true;
}
src/main/java/appeng/tile/misc/InscriberRecipes.java
+2 -2
View File
@@ -11,8 +11,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.text.LiteralText;
import net.minecraft.util.Identifier;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.world.World;
import appeng.api.AEApi;
@@ -90,7 +90,7 @@ public final class InscriberRecipes {
final ItemStack renamedItem = input.copy();
if (!name.isEmpty()) {
renamedItem.setDisplayName(new StringTextComponent(name));
renamedItem.setDisplayName(new LiteralText(name));
} else {
renamedItem.setDisplayName(null);
}
src/main/java/appeng/tile/misc/InterfaceTileEntity.java → src/main/java/appeng/tile/misc/InterfaceBlockEntity.java
+10 -9
View File
@@ -26,6 +26,7 @@ import javax.annotation.Nullable;
import com.google.common.collect.ImmutableSet;
import net.minecraft.block.BlockState;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.ItemStack;
@@ -62,12 +63,12 @@ import appeng.container.implementations.InterfaceContainer;
import appeng.helpers.DualityInterface;
import appeng.helpers.IInterfaceHost;
import appeng.helpers.IPriorityHost;
import appeng.tile.grid.AENetworkInvTileEntity;
import appeng.tile.grid.AENetworkInvBlockEntity;
import appeng.util.Platform;
import appeng.util.inv.IInventoryDestination;
import appeng.util.inv.InvOperation;
public class InterfaceTileEntity extends AENetworkInvTileEntity
public class InterfaceBlockEntity extends AENetworkInvBlockEntity
implements IGridTickable, IInventoryDestination, IInterfaceHost, IPriorityHost {
private final DualityInterface duality = new DualityInterface(this.getProxy(), this);
@@ -75,7 +76,7 @@ public class InterfaceTileEntity extends AENetworkInvTileEntity
// Indicates that this interface has no specific direction set
private boolean omniDirectional = true;
public InterfaceTileEntity(BlockEntityType<?> tileEntityTypeIn) {
public InterfaceBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@@ -90,7 +91,7 @@ public class InterfaceTileEntity extends AENetworkInvTileEntity
}
public void setSide(final Direction facing) {
if (isRemote()) {
if (isClient()) {
return;
}
@@ -150,16 +151,16 @@ public class InterfaceTileEntity extends AENetworkInvTileEntity
}
@Override
public CompoundTag write(final CompoundTag data) {
super.write(data);
public CompoundTag toTag(final CompoundTag data) {
super.toTag(data);
data.putBoolean("omniDirectional", this.omniDirectional);
this.duality.writeToNBT(data);
return data;
}
@Override
public void read(final CompoundTag data) {
super.read(data);
public void fromTag(BlockState state, final CompoundTag data) {
super.fromTag(state, data);
this.omniDirectional = data.getBoolean("omniDirectional");
this.duality.readFromNBT(data);
@@ -234,7 +235,7 @@ public class InterfaceTileEntity extends AENetworkInvTileEntity
}
@Override
public BlockEntity getTileEntity() {
public BlockEntity getBlockEntity() {
return this;
}
src/main/java/appeng/tile/misc/LightDetectorTileEntity.java → src/main/java/appeng/tile/misc/LightDetectorBlockEntity.java
+3 -3
View File
@@ -21,15 +21,15 @@ package appeng.tile.misc;
import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.block.entity.BlockEntityType;
import appeng.tile.AEBaseTileEntity;
import appeng.tile.AEBaseBlockEntity;
import appeng.util.Platform;
public class LightDetectorTileEntity extends AEBaseTileEntity implements ITickableTileEntity {
public class LightDetectorBlockEntity extends AEBaseBlockEntity implements ITickableTileEntity {
private int lastCheck = 30;
private int lastLight = 0;
public LightDetectorTileEntity(BlockEntityType<?> tileEntityTypeIn) {
public LightDetectorBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
src/main/java/appeng/tile/misc/PaintSplotchesTileEntity.java → src/main/java/appeng/tile/misc/PaintSplotchesBlockEntity.java
+7 -7
View File
@@ -46,9 +46,9 @@ import appeng.api.util.AEColor;
import appeng.block.paint.PaintSplotches;
import appeng.helpers.Splotch;
import appeng.items.misc.PaintBallItem;
import appeng.tile.AEBaseTileEntity;
import appeng.tile.AEBaseBlockEntity;
public class PaintSplotchesTileEntity extends AEBaseTileEntity {
public class PaintSplotchesBlockEntity extends AEBaseBlockEntity {
public static final ModelProperty<PaintSplotches> SPLOTCHES = new ModelProperty<>();
@@ -57,7 +57,7 @@ public class PaintSplotchesTileEntity extends AEBaseTileEntity {
private int isLit = 0;
private List<Splotch> dots = null;
public PaintSplotchesTileEntity(BlockEntityType<?> tileEntityTypeIn) {
public PaintSplotchesBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@@ -67,8 +67,8 @@ public class PaintSplotchesTileEntity extends AEBaseTileEntity {
}
@Override
public CompoundTag write(final CompoundTag data) {
super.write(data);
public CompoundTag toTag(final CompoundTag data) {
super.toTag(data);
final PacketByteBuf myDat = new PacketByteBuf(Unpooled.buffer());
this.writeBuffer(myDat);
if (myDat.hasArray()) {
@@ -91,8 +91,8 @@ public class PaintSplotchesTileEntity extends AEBaseTileEntity {
}
@Override
public void read(final CompoundTag data) {
super.read(data);
public void fromTag(BlockState state, final CompoundTag data) {
super.fromTag(state, data);
if (data.contains("dots")) {
this.readBuffer(new PacketByteBuf(Unpooled.copiedBuffer(data.getByteArray("dots"))));
}
src/main/java/appeng/tile/misc/QuartzGrowthAcceleratorTileEntity.java → src/main/java/appeng/tile/misc/QuartzGrowthAcceleratorBlockEntity.java
+3 -3
View File
@@ -32,15 +32,15 @@ import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.me.GridAccessException;
import appeng.tile.grid.AENetworkTileEntity;
import appeng.tile.grid.AENetworkBlockEntity;
import appeng.util.Platform;
public class QuartzGrowthAcceleratorTileEntity extends AENetworkTileEntity
public class QuartzGrowthAcceleratorBlockEntity extends AENetworkBlockEntity
implements IPowerChannelState, ICrystalGrowthAccelerator {
private boolean hasPower = false;
public QuartzGrowthAcceleratorTileEntity(BlockEntityType<?> tileEntityTypeIn) {
public QuartzGrowthAcceleratorBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setValidSides(EnumSet.noneOf(Direction.class));
this.getProxy().setFlags();
src/main/java/appeng/tile/misc/SecurityStationTileEntity.java → src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java
+9 -8
View File
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Map;
import alexiil.mc.lib.attributes.item.ItemTransferable;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
@@ -70,7 +71,7 @@ import appeng.helpers.PlayerSecurityWrapper;
import appeng.me.GridAccessException;
import appeng.me.helpers.MEMonitorHandler;
import appeng.me.storage.SecurityStationInventory;
import appeng.tile.grid.AENetworkTileEntity;
import appeng.tile.grid.AENetworkBlockEntity;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost;
@@ -80,7 +81,7 @@ import appeng.util.inv.IAEAppEngInventory;
import appeng.util.inv.InvOperation;
import appeng.util.item.AEItemStack;
public class SecurityStationTileEntity extends AENetworkTileEntity implements ITerminalHost, IAEAppEngInventory,
public class SecurityStationBlockEntity extends AENetworkBlockEntity implements ITerminalHost, IAEAppEngInventory,
ILocatable, IConfigManagerHost, ISecurityProvider, IColorableTile {
private static int difference = 0;
@@ -92,7 +93,7 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT
private AEColor paintedColor = AEColor.TRANSPARENT;
private boolean isActive = false;
public SecurityStationTileEntity(BlockEntityType<?> tileEntityTypeIn) {
public SecurityStationBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL);
this.getProxy().setIdlePowerUsage(2.0);
@@ -149,8 +150,8 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT
}
@Override
public CompoundTag write(final CompoundTag data) {
super.write(data);
public CompoundTag toTag(final CompoundTag data) {
super.toTag(data);
this.cm.writeToNBT(data);
data.putByte("paintedColor", (byte) this.paintedColor.ordinal());
@@ -172,8 +173,8 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT
}
@Override
public void read(final CompoundTag data) {
super.read(data);
public void fromTag(BlockState state, final CompoundTag data) {
super.fromTag(state, data);
this.cm.readFromNBT(data);
if (data.contains("paintedColor")) {
this.paintedColor = AEColor.values()[data.getByte("paintedColor")];
@@ -244,7 +245,7 @@ public class SecurityStationTileEntity extends AENetworkTileEntity implements IT
}
public boolean isActive() {
if (world != null && !world.isRemote) {
if (world != null && !world.isClient) {
return isPowered();
} else {
return this.isActive;
src/main/java/appeng/tile/misc/SkyCompassTileEntity.java → src/main/java/appeng/tile/misc/SkyCompassBlockEntity.java
+3 -3
View File
@@ -20,11 +20,11 @@ package appeng.tile.misc;
import net.minecraft.block.entity.BlockEntityType;
import appeng.tile.AEBaseTileEntity;
import appeng.tile.AEBaseBlockEntity;
public class SkyCompassTileEntity extends AEBaseTileEntity {
public class SkyCompassBlockEntity extends AEBaseBlockEntity {
public SkyCompassTileEntity(BlockEntityType<?> tileEntityTypeIn) {
public SkyCompassBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
src/main/java/appeng/tile/misc/VibrationChamberTileEntity.java → src/main/java/appeng/tile/misc/VibrationChamberBlockEntity.java
+8 -7
View File
@@ -23,6 +23,7 @@ import java.io.IOException;
import javax.annotation.Nonnull;
import alexiil.mc.lib.attributes.item.ItemTransferable;
import net.minecraft.block.BlockState;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
@@ -42,14 +43,14 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.core.settings.TickRates;
import appeng.me.GridAccessException;
import appeng.tile.grid.AENetworkInvTileEntity;
import appeng.tile.grid.AENetworkInvBlockEntity;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.Platform;
import appeng.util.inv.InvOperation;
import appeng.util.inv.WrapperFilteredItemHandler;
import appeng.util.inv.filter.IAEItemFilter;
public class VibrationChamberTileEntity extends AENetworkInvTileEntity implements IGridTickable {
public class VibrationChamberBlockEntity extends AENetworkInvBlockEntity implements IGridTickable {
public static final double POWER_PER_TICK = 5;
public static final int MIN_BURN_SPEED = 20;
public static final int MAX_BURN_SPEED = 200;
@@ -64,7 +65,7 @@ public class VibrationChamberTileEntity extends AENetworkInvTileEntity implement
// client side..
public boolean isOn;
public VibrationChamberTileEntity(BlockEntityType<?> tileEntityTypeIn) {
public VibrationChamberBlockEntity(BlockEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setIdlePowerUsage(0);
this.getProxy().setFlags();
@@ -92,8 +93,8 @@ public class VibrationChamberTileEntity extends AENetworkInvTileEntity implement
}
@Override
public CompoundTag write(final CompoundTag data) {
super.write(data);
public CompoundTag toTag(final CompoundTag data) {
super.toTag(data);
data.putDouble("burnTime", this.getBurnTime());
data.putDouble("maxBurnTime", this.getMaxBurnTime());
data.putInt("burnSpeed", this.getBurnSpeed());
@@ -101,8 +102,8 @@ public class VibrationChamberTileEntity extends AENetworkInvTileEntity implement
}
@Override
public void read(final CompoundTag data) {
super.read(data);
public void fromTag(BlockState state, final CompoundTag data) {
super.fromTag(state, data);
this.setBurnTime(data.getDouble("burnTime"));
this.setMaxBurnTime(data.getDouble("maxBurnTime"));
this.setBurnSpeed(data.getInt("burnSpeed"));