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

The Great Renamening of 2020

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-22 12:14:54 +02:00
parent abe3334488
commit b4471b1abb
441 changed files with 3395 additions and 3468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/tile/AEBaseInvTile.java → src/main/java/appeng/tile/AEBaseInvTileEntity.java
+2 -2
View File
@@ -38,9 +38,9 @@ import appeng.util.helpers.ItemHandlerUtil;
import appeng.util.inv.IAEAppEngInventory;
import appeng.util.inv.InvOperation;
public abstract class AEBaseInvTile extends AEBaseTile implements IAEAppEngInventory {
public abstract class AEBaseInvTileEntity extends AEBaseTileEntity implements IAEAppEngInventory {
public AEBaseInvTile(TileEntityType<?> tileEntityTypeIn) {
public AEBaseInvTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
src/main/java/appeng/tile/AEBaseTile.java → src/main/java/appeng/tile/AEBaseTileEntity.java
+4 -4
View File
@@ -62,9 +62,9 @@ import appeng.tile.inventory.AppEngInternalAEInventory;
import appeng.util.Platform;
import appeng.util.SettingsFrom;
public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, ICustomNameObject {
public class AEBaseTileEntity extends TileEntity implements IOrientable, ICommonTile, ICustomNameObject {
private static final ThreadLocal<WeakReference<AEBaseTile>> DROP_NO_ITEMS = new ThreadLocal<>();
private static final ThreadLocal<WeakReference<AEBaseTileEntity>> DROP_NO_ITEMS = new ThreadLocal<>();
private static final Map<Class<? extends TileEntity>, IStackSrc> ITEM_STACKS = new HashMap<>();
private int renderFragment = 0;
@Nullable
@@ -73,7 +73,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
private Direction up = Direction.UP;
private boolean markDirtyQueued = false;
public AEBaseTile(TileEntityType<?> tileEntityTypeIn) {
public AEBaseTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@@ -82,7 +82,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
}
public boolean dropItems() {
final WeakReference<AEBaseTile> what = DROP_NO_ITEMS.get();
final WeakReference<AEBaseTileEntity> what = DROP_NO_ITEMS.get();
return what == null || what.get() != this;
}
src/main/java/appeng/tile/crafting/TileCraftingMonitorTile.java → src/main/java/appeng/tile/crafting/CraftingMonitorTileEntity.java
+2 -2
View File
@@ -39,7 +39,7 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.AEColor;
import appeng.util.item.AEItemStack;
public class TileCraftingMonitorTile extends TileCraftingTile implements IColorableTile {
public class CraftingMonitorTileEntity extends CraftingTileEntity implements IColorableTile {
@OnlyIn(Dist.CLIENT)
private Integer dspList;
@@ -50,7 +50,7 @@ public class TileCraftingMonitorTile extends TileCraftingTile implements IColora
private IAEItemStack dspPlay;
private AEColor paintedColor = AEColor.TRANSPARENT;
public TileCraftingMonitorTile(TileEntityType<?> tileEntityTypeIn) {
public CraftingMonitorTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java → src/main/java/appeng/tile/crafting/CraftingStorageTileEntity.java
+3 -3
View File
@@ -27,17 +27,17 @@ import appeng.api.AEApi;
import appeng.api.definitions.IBlocks;
import appeng.block.crafting.AbstractCraftingUnitBlock;
public class TileCraftingStorageTile extends TileCraftingTile {
public class CraftingStorageTileEntity extends CraftingTileEntity {
private static final int KILO_SCALAR = 1024;
public TileCraftingStorageTile(TileEntityType<?> tileEntityTypeIn) {
public CraftingStorageTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@Override
protected ItemStack getItemFromTile(final Object obj) {
final IBlocks blocks = AEApi.instance().definitions().blocks();
final int storage = ((TileCraftingTile) obj).getStorageBytes() / KILO_SCALAR;
final int storage = ((CraftingTileEntity) obj).getStorageBytes() / KILO_SCALAR;
Optional<ItemStack> is;
src/main/java/appeng/tile/crafting/TileCraftingTile.java → src/main/java/appeng/tile/crafting/CraftingTileEntity.java
+4 -4
View File
@@ -58,17 +58,17 @@ import appeng.me.cluster.implementations.CraftingCPUCalculator;
import appeng.me.cluster.implementations.CraftingCPUCluster;
import appeng.me.helpers.AENetworkProxy;
import appeng.me.helpers.AENetworkProxyMultiblock;
import appeng.tile.grid.AENetworkTile;
import appeng.tile.grid.AENetworkTileEntity;
import appeng.util.Platform;
public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IPowerChannelState {
public class CraftingTileEntity extends AENetworkTileEntity implements IAEMultiBlock, IPowerChannelState {
private final CraftingCPUCalculator calc = new CraftingCPUCalculator(this);
private CompoundNBT previousState = null;
private boolean isCoreBlock = false;
private CraftingCPUCluster cluster;
public TileCraftingTile(TileEntityType<?> tileEntityTypeIn) {
public CraftingTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setFlags(GridFlags.MULTIBLOCK, GridFlags.REQUIRE_CHANNEL);
this.getProxy().setValidSides(EnumSet.noneOf(Direction.class));
@@ -83,7 +83,7 @@ public class TileCraftingTile extends AENetworkTile implements IAEMultiBlock, IP
protected ItemStack getItemFromTile(final Object obj) {
Optional<ItemStack> is;
if (((TileCraftingTile) obj).isAccelerator()) {
if (((CraftingTileEntity) obj).isAccelerator()) {
is = AEApi.instance().definitions().blocks().craftingAccelerator().maybeStack(1);
} else {
is = AEApi.instance().definitions().blocks().craftingUnit().maybeStack(1);
src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java
+5 -5
View File
@@ -53,7 +53,7 @@ import appeng.core.AppEng;
* as the light strip when it's powered.
*/
@OnlyIn(Dist.CLIENT)
public class MolecularAssemblerRenderer extends TileEntityRenderer<TileMolecularAssembler> {
public class MolecularAssemblerRenderer extends TileEntityRenderer<MolecularAssemblerTileEntity> {
public static final ResourceLocation LIGHTS_MODEL = new ResourceLocation(AppEng.MOD_ID,
"block/molecular_assembler_lights");
@@ -67,8 +67,8 @@ public class MolecularAssemblerRenderer extends TileEntityRenderer<TileMolecular
}
@Override
public void render(TileMolecularAssembler molecularAssembler, float partialTicks, MatrixStack ms,
IRenderTypeBuffer bufferIn, int combinedLightIn, int combinedOverlayIn) {
public void render(MolecularAssemblerTileEntity molecularAssembler, float partialTicks, MatrixStack ms,
IRenderTypeBuffer bufferIn, int combinedLightIn, int combinedOverlayIn) {
AssemblerAnimationStatus status = molecularAssembler.getAnimationStatus();
if (status != null) {
@@ -105,8 +105,8 @@ public class MolecularAssemblerRenderer extends TileEntityRenderer<TileMolecular
lightsModel, 1, 1, 1, combinedLightIn, combinedOverlayIn, EmptyModelData.INSTANCE);
}
private void renderStatus(TileMolecularAssembler molecularAssembler, MatrixStack ms, IRenderTypeBuffer bufferIn,
int combinedLightIn, AssemblerAnimationStatus status) {
private void renderStatus(MolecularAssemblerTileEntity molecularAssembler, MatrixStack ms, IRenderTypeBuffer bufferIn,
int combinedLightIn, AssemblerAnimationStatus status) {
double centerX = molecularAssembler.getPos().getX() + 0.5f;
double centerY = molecularAssembler.getPos().getY() + 0.5f;
double centerZ = molecularAssembler.getPos().getZ() + 0.5f;
src/main/java/appeng/tile/crafting/TileMolecularAssembler.java → src/main/java/appeng/tile/crafting/MolecularAssemblerTileEntity.java
+14 -14
View File
@@ -63,12 +63,12 @@ import appeng.api.util.IConfigManager;
import appeng.container.ContainerNull;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.network.TargetPoint;
import appeng.core.sync.packets.PacketAssemblerAnimation;
import appeng.items.misc.ItemEncodedPattern;
import appeng.core.sync.packets.AssemblerAnimationPacket;
import appeng.items.misc.EncodedPatternItem;
import appeng.me.GridAccessException;
import appeng.parts.automation.DefinitionUpgradeInventory;
import appeng.parts.automation.UpgradeInventory;
import appeng.tile.grid.AENetworkInvTile;
import appeng.tile.grid.AENetworkInvTileEntity;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost;
@@ -81,7 +81,7 @@ import appeng.util.inv.WrapperFilteredItemHandler;
import appeng.util.inv.filter.IAEItemFilter;
import appeng.util.item.AEItemStack;
public class TileMolecularAssembler extends AENetworkInvTile
public class MolecularAssemblerTileEntity extends AENetworkInvTileEntity
implements IUpgradeableHost, IConfigManagerHost, IGridTickable, ICraftingMachine, IPowerChannelState {
public static final String INVENTORY_MAIN = "molecular_assembler";
@@ -105,7 +105,7 @@ public class TileMolecularAssembler extends AENetworkInvTile
@OnlyIn(Dist.CLIENT)
private AssemblerAnimationStatus animationStatus;
public TileMolecularAssembler(TileEntityType<?> tileEntityTypeIn) {
public MolecularAssemblerTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
final ITileDefinition assembler = AEApi.instance().definitions().blocks().molecularAssembler();
@@ -224,9 +224,9 @@ public class TileMolecularAssembler extends AENetworkInvTile
if (data.contains("myPlan")) {
final ItemStack myPat = ItemStack.read(data.getCompound("myPlan"));
if (!myPat.isEmpty() && myPat.getItem() instanceof ItemEncodedPattern) {
if (!myPat.isEmpty() && myPat.getItem() instanceof EncodedPatternItem) {
final World w = this.getWorld();
final ItemEncodedPattern iep = (ItemEncodedPattern) myPat.getItem();
final EncodedPatternItem iep = (EncodedPatternItem) myPat.getItem();
final ICraftingPatternDetails ph = iep.getPatternForItem(myPat, w);
if (ph != null && ph.isCraftable()) {
this.forcePlan = true;
@@ -250,10 +250,10 @@ public class TileMolecularAssembler extends AENetworkInvTile
final ItemStack is = this.patternInv.getStackInSlot(0);
if (!is.isEmpty() && is.getItem() instanceof ItemEncodedPattern) {
if (!is.isEmpty() && is.getItem() instanceof EncodedPatternItem) {
if (!ItemStack.areItemsEqual(is, this.myPattern)) {
final World w = this.getWorld();
final ItemEncodedPattern iep = (ItemEncodedPattern) is.getItem();
final EncodedPatternItem iep = (EncodedPatternItem) is.getItem();
final ICraftingPatternDetails ph = iep.getPatternForItem(is, w);
if (ph != null && ph.isCraftable()) {
@@ -429,7 +429,7 @@ public class TileMolecularAssembler extends AENetworkInvTile
final TargetPoint where = new TargetPoint(this.pos.getX(), this.pos.getY(), this.pos.getZ(), 32,
this.world.getDimension().getType());
NetworkHandler.instance()
.sendToAllAround(new PacketAssemblerAnimation(this.pos, (byte) speed, item), where);
.sendToAllAround(new AssemblerAnimationPacket(this.pos, (byte) speed, item), where);
}
this.saveChanges();
@@ -555,8 +555,8 @@ public class TileMolecularAssembler extends AENetworkInvTile
private class CraftingGridFilter implements IAEItemFilter {
private boolean hasPattern() {
return TileMolecularAssembler.this.myPlan != null
&& !ItemHandlerUtil.isEmpty(TileMolecularAssembler.this.patternInv);
return MolecularAssemblerTileEntity.this.myPlan != null
&& !ItemHandlerUtil.isEmpty(MolecularAssemblerTileEntity.this.patternInv);
}
@Override
@@ -571,8 +571,8 @@ public class TileMolecularAssembler extends AENetworkInvTile
}
if (this.hasPattern()) {
return TileMolecularAssembler.this.myPlan.isValidItemForSlot(slot, stack,
TileMolecularAssembler.this.getWorld());
return MolecularAssemblerTileEntity.this.myPlan.isValidItemForSlot(slot, stack,
MolecularAssemblerTileEntity.this.getWorld());
}
return false;
}
src/main/java/appeng/tile/grid/AENetworkInvTile.java → src/main/java/appeng/tile/grid/AENetworkInvTileEntity.java
+3 -3
View File
@@ -26,13 +26,13 @@ import appeng.api.networking.security.IActionHost;
import appeng.api.util.AEPartLocation;
import appeng.me.helpers.AENetworkProxy;
import appeng.me.helpers.IGridProxyable;
import appeng.tile.AEBaseInvTile;
import appeng.tile.AEBaseInvTileEntity;
public abstract class AENetworkInvTile extends AEBaseInvTile implements IActionHost, IGridProxyable {
public abstract class AENetworkInvTileEntity extends AEBaseInvTileEntity implements IActionHost, IGridProxyable {
private final AENetworkProxy gridProxy = new AENetworkProxy(this, "proxy", this.getItemFromTile(this), true);
public AENetworkInvTile(TileEntityType<?> tileEntityTypeIn) {
public AENetworkInvTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
src/main/java/appeng/tile/grid/AENetworkPowerTile.java → src/main/java/appeng/tile/grid/AENetworkPowerTileEntity.java
+3 -3
View File
@@ -28,13 +28,13 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.me.helpers.AENetworkProxy;
import appeng.me.helpers.IGridProxyable;
import appeng.tile.powersink.AEBasePoweredTile;
import appeng.tile.powersink.AEBasePoweredTileEntity;
public abstract class AENetworkPowerTile extends AEBasePoweredTile implements IActionHost, IGridProxyable {
public abstract class AENetworkPowerTileEntity extends AEBasePoweredTileEntity implements IActionHost, IGridProxyable {
private final AENetworkProxy gridProxy = new AENetworkProxy(this, "proxy", this.getItemFromTile(this), true);
public AENetworkPowerTile(TileEntityType<?> tileEntityTypeIn) {
public AENetworkPowerTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
src/main/java/appeng/tile/grid/AENetworkTile.java → src/main/java/appeng/tile/grid/AENetworkTileEntity.java
+3 -3
View File
@@ -28,13 +28,13 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.me.helpers.AENetworkProxy;
import appeng.me.helpers.IGridProxyable;
import appeng.tile.AEBaseTile;
import appeng.tile.AEBaseTileEntity;
public class AENetworkTile extends AEBaseTile implements IActionHost, IGridProxyable {
public class AENetworkTileEntity extends AEBaseTileEntity implements IActionHost, IGridProxyable {
private final AENetworkProxy gridProxy = this.createProxy();
public AENetworkTile(TileEntityType<?> tileEntityTypeIn) {
public AENetworkTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
src/main/java/appeng/tile/grindstone/TileCrank.java → src/main/java/appeng/tile/grindstone/CrankTileEntity.java
+3 -3
View File
@@ -28,9 +28,9 @@ import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import appeng.api.implementations.tiles.ICrankable;
import appeng.tile.AEBaseTile;
import appeng.tile.AEBaseTileEntity;
public class TileCrank extends AEBaseTile implements ITickableTileEntity {
public class CrankTileEntity extends AEBaseTileEntity implements ITickableTileEntity {
private final int ticksPerRotation = 18;
@@ -41,7 +41,7 @@ public class TileCrank extends AEBaseTile implements ITickableTileEntity {
private int hits = 0;
private int rotation = 0;
public TileCrank(TileEntityType<?> tileEntityTypeIn) {
public CrankTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
src/main/java/appeng/tile/grindstone/TileGrinder.java → src/main/java/appeng/tile/grindstone/GrinderTileEntity.java
+3 -3
View File
@@ -32,7 +32,7 @@ import appeng.api.implementations.tiles.ICrankable;
import appeng.recipes.handlers.GrinderOptionalResult;
import appeng.recipes.handlers.GrinderRecipe;
import appeng.recipes.handlers.GrinderRecipes;
import appeng.tile.AEBaseInvTile;
import appeng.tile.AEBaseInvTileEntity;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.InventoryAdaptor;
import appeng.util.Platform;
@@ -41,14 +41,14 @@ import appeng.util.inv.InvOperation;
import appeng.util.inv.WrapperFilteredItemHandler;
import appeng.util.inv.filter.IAEItemFilter;
public class TileGrinder extends AEBaseInvTile implements ICrankable {
public class GrinderTileEntity extends AEBaseInvTileEntity implements ICrankable {
private static final int SLOT_PROCESSING = 6;
private final AppEngInternalInventory inv = new AppEngInternalInventory(this, 7);
private final IItemHandler invExt = new WrapperFilteredItemHandler(this.inv, new GrinderFilter());
private int points;
public TileGrinder(TileEntityType<?> tileEntityTypeIn) {
public GrinderTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
src/main/java/appeng/tile/misc/TileCellWorkbench.java → src/main/java/appeng/tile/misc/CellWorkbenchTileEntity.java
+3 -3
View File
@@ -33,7 +33,7 @@ import appeng.api.config.Upgrades;
import appeng.api.implementations.IUpgradeableHost;
import appeng.api.storage.ICellWorkbenchItem;
import appeng.api.util.IConfigManager;
import appeng.tile.AEBaseTile;
import appeng.tile.AEBaseTileEntity;
import appeng.tile.inventory.AppEngInternalAEInventory;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.ConfigManager;
@@ -42,7 +42,7 @@ import appeng.util.helpers.ItemHandlerUtil;
import appeng.util.inv.IAEAppEngInventory;
import appeng.util.inv.InvOperation;
public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, IAEAppEngInventory, IConfigManagerHost {
public class CellWorkbenchTileEntity extends AEBaseTileEntity implements IUpgradeableHost, IAEAppEngInventory, IConfigManagerHost {
private final AppEngInternalInventory cell = new AppEngInternalInventory(this, 1);
private final AppEngInternalAEInventory config = new AppEngInternalAEInventory(this, 63);
@@ -52,7 +52,7 @@ public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, I
private IItemHandler cacheConfig = null;
private boolean locked = false;
public TileCellWorkbench(TileEntityType<?> tileEntityTypeIn) {
public CellWorkbenchTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.manager.registerSetting(Settings.COPY_MODE, CopyMode.CLEAR_ON_REMOVE);
this.cell.setEnableClientEvents(true);
src/main/java/appeng/tile/misc/TileCharger.java → src/main/java/appeng/tile/misc/ChargerTileEntity.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.AENetworkPowerTile;
import appeng.tile.grid.AENetworkPowerTileEntity;
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 TileCharger extends AENetworkPowerTile implements ICrankable, IGridTickable {
public class ChargerTileEntity extends AENetworkPowerTileEntity 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 TileCharger(TileEntityType<?> tileEntityTypeIn) {
public ChargerTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setValidSides(EnumSet.noneOf(Direction.class));
this.getProxy().setFlags();
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 TileCondenser target;
private final CondenserTileEntity target;
private boolean hasChanged = true;
private final ItemList cachedList = new ItemList();
private IActionSource actionSource = new BaseActionSource();
private ItemList changeSet = new ItemList();
CondenserItemInventory(final TileCondenser te) {
CondenserItemInventory(final CondenserTileEntity te) {
this.target = te;
}
src/main/java/appeng/tile/misc/TileCondenser.java → src/main/java/appeng/tile/misc/CondenserTileEntity.java
+7 -7
View File
@@ -52,7 +52,7 @@ import appeng.api.storage.data.IAEStack;
import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigurableObject;
import appeng.capabilities.Capabilities;
import appeng.tile.AEBaseInvTile;
import appeng.tile.AEBaseInvTileEntity;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost;
@@ -61,7 +61,7 @@ import appeng.util.inv.WrapperChainedItemHandler;
import appeng.util.inv.WrapperFilteredItemHandler;
import appeng.util.inv.filter.AEItemFilters;
public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost, IConfigurableObject {
public class CondenserTileEntity extends AEBaseInvTileEntity implements IConfigManagerHost, IConfigurableObject {
public static final int BYTE_MULTIPLIER = 8;
@@ -80,7 +80,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
private double storedPower = 0;
public TileCondenser(TileEntityType<?> tileEntityTypeIn) {
public CondenserTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.cm.registerSetting(Settings.CONDENSER_OUTPUT, CondenserOutput.TRASH);
}
@@ -235,7 +235,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
return stack;
}
if (!simulate && !stack.isEmpty()) {
TileCondenser.this.addPower(stack.getCount());
CondenserTileEntity.this.addPower(stack.getCount());
}
return ItemStack.EMPTY;
}
@@ -283,7 +283,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
if (action == FluidAction.EXECUTE) {
final IStorageChannel<IAEFluidStack> chan = AEApi.instance().storage()
.getStorageChannel(IFluidStorageChannel.class);
TileCondenser.this
CondenserTileEntity.this
.addPower((resource.isEmpty() ? 0.0 : (double) resource.getAmount()) / chan.transferFactor());
}
@@ -331,7 +331,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
* 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(TileCondenser.this);
private final CondenserItemInventory itemInventory = new CondenserItemInventory(CondenserTileEntity.this);
void outputChanged(ItemStack added, ItemStack removed) {
this.itemInventory.updateOutput(added, removed);
@@ -348,7 +348,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
if (channel == AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)) {
return (IMEMonitor<T>) this.itemInventory;
} else {
return new CondenserVoidInventory<>(TileCondenser.this, channel);
return new CondenserVoidInventory<>(CondenserTileEntity.this, channel);
}
}
}
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 TileCondenser target;
private final CondenserTileEntity target;
private final IStorageChannel<T> channel;
CondenserVoidInventory(final TileCondenser te, final IStorageChannel<T> channel) {
CondenserVoidInventory(final CondenserTileEntity te, final IStorageChannel<T> channel) {
this.target = te;
this.channel = channel;
}
src/main/java/appeng/tile/misc/InscriberRecipes.java
+3 -3
View File
@@ -19,7 +19,7 @@ import appeng.api.AEApi;
import appeng.api.definitions.IComparableDefinition;
import appeng.api.features.InscriberProcessType;
import appeng.core.AppEng;
import appeng.items.materials.ItemMaterial;
import appeng.items.materials.MaterialItem;
import appeng.recipes.handlers.InscriberRecipe;
/**
@@ -78,12 +78,12 @@ public final class InscriberRecipes {
if (!plateA.isEmpty()) {
final CompoundNBT tag = plateA.getOrCreateTag();
name += tag.getString(ItemMaterial.TAG_INSCRIBE_NAME);
name += tag.getString(MaterialItem.TAG_INSCRIBE_NAME);
}
if (!plateB.isEmpty()) {
final CompoundNBT tag = plateB.getOrCreateTag();
name += " " + tag.getString(ItemMaterial.TAG_INSCRIBE_NAME);
name += " " + tag.getString(MaterialItem.TAG_INSCRIBE_NAME);
}
final Ingredient startingItem = Ingredient.fromStacks(input.copy());
src/main/java/appeng/tile/misc/TileInscriber.java → src/main/java/appeng/tile/misc/InscriberTileEntity.java
+7 -7
View File
@@ -57,7 +57,7 @@ import appeng.me.GridAccessException;
import appeng.parts.automation.DefinitionUpgradeInventory;
import appeng.parts.automation.UpgradeInventory;
import appeng.recipes.handlers.InscriberRecipe;
import appeng.tile.grid.AENetworkPowerTile;
import appeng.tile.grid.AENetworkPowerTileEntity;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost;
@@ -73,7 +73,7 @@ import appeng.util.item.AEItemStack;
* @version rv2
* @since rv0
*/
public class TileInscriber extends AENetworkPowerTile implements IGridTickable, IUpgradeableHost, IConfigManagerHost {
public class InscriberTileEntity extends AENetworkPowerTileEntity implements IGridTickable, IUpgradeableHost, IConfigManagerHost {
private final int maxProcessingTime = 100;
private final IConfigManager settings;
@@ -97,7 +97,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
private final IItemHandlerModifiable inv = new WrapperChainedItemHandler(this.topItemHandler,
this.bottomItemHandler, this.sideItemHandler);
public TileInscriber(TileEntityType<?> tileEntityTypeIn) {
public InscriberTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setValidSides(EnumSet.noneOf(Direction.class));
@@ -410,11 +410,11 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
private class ItemHandlerFilter implements IAEItemFilter {
@Override
public boolean allowExtract(IItemHandler inv, int slot, int amount) {
if (TileInscriber.this.isSmash()) {
if (InscriberTileEntity.this.isSmash()) {
return false;
}
return inv == TileInscriber.this.topItemHandler || inv == TileInscriber.this.bottomItemHandler || slot == 1;
return inv == InscriberTileEntity.this.topItemHandler || inv == InscriberTileEntity.this.bottomItemHandler || slot == 1;
}
@Override
@@ -424,11 +424,11 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
return false;
}
if (TileInscriber.this.isSmash()) {
if (InscriberTileEntity.this.isSmash()) {
return false;
}
if (inv == TileInscriber.this.topItemHandler || inv == TileInscriber.this.bottomItemHandler) {
if (inv == InscriberTileEntity.this.topItemHandler || inv == InscriberTileEntity.this.bottomItemHandler) {
if (AEApi.instance().definitions().materials().namePress().isSameAs(stack)) {
return true;
}
src/main/java/appeng/tile/misc/TileInterface.java → src/main/java/appeng/tile/misc/InterfaceTileEntity.java
+5 -5
View File
@@ -58,16 +58,16 @@ import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager;
import appeng.container.implementations.ContainerInterface;
import appeng.container.implementations.InterfaceContainer;
import appeng.helpers.DualityInterface;
import appeng.helpers.IInterfaceHost;
import appeng.helpers.IPriorityHost;
import appeng.tile.grid.AENetworkInvTile;
import appeng.tile.grid.AENetworkInvTileEntity;
import appeng.util.Platform;
import appeng.util.inv.IInventoryDestination;
import appeng.util.inv.InvOperation;
public class TileInterface extends AENetworkInvTile
public class InterfaceTileEntity extends AENetworkInvTileEntity
implements IGridTickable, IInventoryDestination, IInterfaceHost, IPriorityHost {
private final DualityInterface duality = new DualityInterface(this.getProxy(), this);
@@ -75,7 +75,7 @@ public class TileInterface extends AENetworkInvTile
// Indicates that this interface has no specific direction set
private boolean omniDirectional = true;
public TileInterface(TileEntityType<?> tileEntityTypeIn) {
public InterfaceTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@@ -311,6 +311,6 @@ public class TileInterface extends AENetworkInvTile
@Override
public ContainerType<?> getContainerType() {
return ContainerInterface.TYPE;
return InterfaceContainer.TYPE;
}
}
src/main/java/appeng/tile/misc/TileLightDetector.java → src/main/java/appeng/tile/misc/LightDetectorTileEntity.java
+3 -3
View File
@@ -21,15 +21,15 @@ package appeng.tile.misc;
import net.minecraft.tileentity.ITickableTileEntity;
import net.minecraft.tileentity.TileEntityType;
import appeng.tile.AEBaseTile;
import appeng.tile.AEBaseTileEntity;
import appeng.util.Platform;
public class TileLightDetector extends AEBaseTile implements ITickableTileEntity {
public class LightDetectorTileEntity extends AEBaseTileEntity implements ITickableTileEntity {
private int lastCheck = 30;
private int lastLight = 0;
public TileLightDetector(TileEntityType<?> tileEntityTypeIn) {
public LightDetectorTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
src/main/java/appeng/tile/misc/TilePaint.java → src/main/java/appeng/tile/misc/PaintSplotchesTileEntity.java
+5 -5
View File
@@ -45,10 +45,10 @@ import net.minecraftforge.client.model.data.ModelProperty;
import appeng.api.util.AEColor;
import appeng.block.paint.PaintSplotches;
import appeng.helpers.Splotch;
import appeng.items.misc.ItemPaintBall;
import appeng.tile.AEBaseTile;
import appeng.items.misc.PaintBallItem;
import appeng.tile.AEBaseTileEntity;
public class TilePaint extends AEBaseTile {
public class PaintSplotchesTileEntity extends AEBaseTileEntity {
public static final ModelProperty<PaintSplotches> SPLOTCHES = new ModelProperty<>();
@@ -57,7 +57,7 @@ public class TilePaint extends AEBaseTile {
private int isLit = 0;
private List<Splotch> dots = null;
public TilePaint(TileEntityType<?> tileEntityTypeIn) {
public PaintSplotchesTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
@@ -216,7 +216,7 @@ public class TilePaint extends AEBaseTile {
final BlockState blk = this.world.getBlockState(p);
if (blk.isSolidSide(this.world, p, side.getOpposite())) {
final ItemPaintBall ipb = (ItemPaintBall) type.getItem();
final PaintBallItem ipb = (PaintBallItem) type.getItem();
final AEColor col = ipb.getColor();
final boolean lit = ipb.isLumen();
src/main/java/appeng/tile/misc/TileQuartzGrowthAccelerator.java → src/main/java/appeng/tile/misc/QuartzGrowthAcceleratorTileEntity.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.AENetworkTile;
import appeng.tile.grid.AENetworkTileEntity;
import appeng.util.Platform;
public class TileQuartzGrowthAccelerator extends AENetworkTile
public class QuartzGrowthAcceleratorTileEntity extends AENetworkTileEntity
implements IPowerChannelState, ICrystalGrowthAccelerator {
private boolean hasPower = false;
public TileQuartzGrowthAccelerator(TileEntityType<?> tileEntityTypeIn) {
public QuartzGrowthAcceleratorTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setValidSides(EnumSet.noneOf(Direction.class));
this.getProxy().setFlags();
src/main/java/appeng/tile/misc/TileSecurityStation.java → src/main/java/appeng/tile/misc/SecurityStationTileEntity.java
+3 -3
View File
@@ -70,7 +70,7 @@ import appeng.helpers.PlayerSecurityWrapper;
import appeng.me.GridAccessException;
import appeng.me.helpers.MEMonitorHandler;
import appeng.me.storage.SecurityStationInventory;
import appeng.tile.grid.AENetworkTile;
import appeng.tile.grid.AENetworkTileEntity;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost;
@@ -80,7 +80,7 @@ import appeng.util.inv.IAEAppEngInventory;
import appeng.util.inv.InvOperation;
import appeng.util.item.AEItemStack;
public class TileSecurityStation extends AENetworkTile implements ITerminalHost, IAEAppEngInventory, ILocatable,
public class SecurityStationTileEntity extends AENetworkTileEntity implements ITerminalHost, IAEAppEngInventory, ILocatable,
IConfigManagerHost, ISecurityProvider, IColorableTile {
private static int difference = 0;
@@ -92,7 +92,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
private AEColor paintedColor = AEColor.TRANSPARENT;
private boolean isActive = false;
public TileSecurityStation(TileEntityType<?> tileEntityTypeIn) {
public SecurityStationTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL);
this.getProxy().setIdlePowerUsage(2.0);
src/main/java/appeng/tile/misc/TileSkyCompass.java → src/main/java/appeng/tile/misc/SkyCompassTileEntity.java
+3 -3
View File
@@ -20,11 +20,11 @@ package appeng.tile.misc;
import net.minecraft.tileentity.TileEntityType;
import appeng.tile.AEBaseTile;
import appeng.tile.AEBaseTileEntity;
public class TileSkyCompass extends AEBaseTile {
public class SkyCompassTileEntity extends AEBaseTileEntity {
public TileSkyCompass(TileEntityType<?> tileEntityTypeIn) {
public SkyCompassTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
src/main/java/appeng/tile/misc/TileVibrationChamber.java → src/main/java/appeng/tile/misc/VibrationChamberTileEntity.java
+3 -3
View File
@@ -42,14 +42,14 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.core.settings.TickRates;
import appeng.me.GridAccessException;
import appeng.tile.grid.AENetworkInvTile;
import appeng.tile.grid.AENetworkInvTileEntity;
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 TileVibrationChamber extends AENetworkInvTile implements IGridTickable {
public class VibrationChamberTileEntity extends AENetworkInvTileEntity 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 +64,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
// client side..
public boolean isOn;
public TileVibrationChamber(TileEntityType<?> tileEntityTypeIn) {
public VibrationChamberTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setIdlePowerUsage(0);
this.getProxy().setFlags();
src/main/java/appeng/tile/networking/CableBusTESR.java
+3 -3
View File
@@ -27,15 +27,15 @@ import net.minecraft.util.Direction;
import appeng.api.parts.IPart;
public class CableBusTESR extends TileEntityRenderer<TileCableBus> {
public class CableBusTESR extends TileEntityRenderer<CableBusTileEntity> {
public CableBusTESR(TileEntityRendererDispatcher rendererDispatcherIn) {
super(rendererDispatcherIn);
}
@Override
public void render(TileCableBus te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers,
int combinedLightIn, int combinedOverlayIn) {
public void render(CableBusTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers,
int combinedLightIn, int combinedOverlayIn) {
if (!te.getCableBus().isRequiresDynamicRender()) {
return;
}
src/main/java/appeng/tile/networking/TileCableBus.java → src/main/java/appeng/tile/networking/CableBusTileEntity.java
+3 -3
View File
@@ -54,16 +54,16 @@ import appeng.client.render.cablebus.CableBusRenderState;
import appeng.helpers.AEMultiTile;
import appeng.hooks.TickHandler;
import appeng.parts.CableBusContainer;
import appeng.tile.AEBaseTile;
import appeng.tile.AEBaseTileEntity;
import appeng.util.Platform;
public class TileCableBus extends AEBaseTile implements AEMultiTile {
public class CableBusTileEntity extends AEBaseTileEntity implements AEMultiTile {
private CableBusContainer cb = new CableBusContainer(this);
private int oldLV = -1; // on re-calculate light when it changes
public TileCableBus(TileEntityType<?> tileEntityTypeIn) {
public CableBusTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
}
src/main/java/appeng/tile/networking/TileController.java → src/main/java/appeng/tile/networking/ControllerTileEntity.java
+8 -8
View File
@@ -39,16 +39,16 @@ import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType;
import appeng.api.networking.pathing.ControllerState;
import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.block.networking.BlockController;
import appeng.block.networking.BlockController.ControllerBlockState;
import appeng.block.networking.ControllerBlock;
import appeng.block.networking.ControllerBlock.ControllerBlockState;
import appeng.me.GridAccessException;
import appeng.tile.grid.AENetworkPowerTile;
import appeng.tile.grid.AENetworkPowerTileEntity;
import appeng.util.inv.InvOperation;
public class TileController extends AENetworkPowerTile {
public class ControllerTileEntity extends AENetworkPowerTileEntity {
private boolean isValid = false;
public TileController(TileEntityType<?> tileEntityTypeIn) {
public ControllerTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.setInternalMaxPower(8000);
this.setInternalPublicPowerStorage(true);
@@ -116,9 +116,9 @@ public class TileController extends AENetworkPowerTile {
}
if (this.checkController(this.pos)
&& this.world.getBlockState(this.pos).get(BlockController.CONTROLLER_STATE) != metaState) {
&& this.world.getBlockState(this.pos).get(ControllerBlock.CONTROLLER_STATE) != metaState) {
this.world.setBlockState(this.pos,
this.world.getBlockState(this.pos).with(BlockController.CONTROLLER_STATE, metaState));
this.world.getBlockState(this.pos).with(ControllerBlock.CONTROLLER_STATE, metaState));
}
}
@@ -184,7 +184,7 @@ public class TileController extends AENetworkPowerTile {
*/
private boolean checkController(final BlockPos pos) {
if (this.world.getChunkProvider().isChunkLoaded(new ChunkPos(pos.getX() >> 4, pos.getZ() >> 4))) {
return this.world.getTileEntity(pos) instanceof TileController;
return this.world.getTileEntity(pos) instanceof ControllerTileEntity;
}
return false;
src/main/java/appeng/tile/networking/TileCreativeEnergyCell.java → src/main/java/appeng/tile/networking/CreativeEnergyCellTileEntity.java
+3 -3
View File
@@ -26,11 +26,11 @@ import appeng.api.config.PowerMultiplier;
import appeng.api.networking.energy.IAEPowerStorage;
import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.tile.grid.AENetworkTile;
import appeng.tile.grid.AENetworkTileEntity;
public class TileCreativeEnergyCell extends AENetworkTile implements IAEPowerStorage {
public class CreativeEnergyCellTileEntity extends AENetworkTileEntity implements IAEPowerStorage {
public TileCreativeEnergyCell(TileEntityType<?> tileEntityTypeIn) {
public CreativeEnergyCellTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setIdlePowerUsage(0);
}
src/main/java/appeng/tile/networking/TileDenseEnergyCell.java → src/main/java/appeng/tile/networking/DenseEnergyCellTileEntity.java
+2 -2
View File
@@ -20,9 +20,9 @@ package appeng.tile.networking;
import net.minecraft.tileentity.TileEntityType;
public class TileDenseEnergyCell extends TileEnergyCell {
public class DenseEnergyCellTileEntity extends EnergyCellTileEntity {
public TileDenseEnergyCell(TileEntityType<?> tileEntityTypeIn) {
public DenseEnergyCellTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.setInternalMaxPower(200000 * 8);
}
src/main/java/appeng/tile/networking/TileEnergyAcceptor.java → src/main/java/appeng/tile/networking/EnergyAcceptorTileEntity.java
+3 -3
View File
@@ -28,12 +28,12 @@ import appeng.api.networking.energy.IEnergyGrid;
import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.me.GridAccessException;
import appeng.tile.grid.AENetworkPowerTile;
import appeng.tile.grid.AENetworkPowerTileEntity;
import appeng.util.inv.InvOperation;
public class TileEnergyAcceptor extends AENetworkPowerTile {
public class EnergyAcceptorTileEntity extends AENetworkPowerTileEntity {
public TileEnergyAcceptor(TileEntityType<?> tileEntityTypeIn) {
public EnergyAcceptorTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setIdlePowerUsage(0.0);
this.setInternalMaxPower(0);
src/main/java/appeng/tile/networking/TileEnergyCell.java → src/main/java/appeng/tile/networking/EnergyCellTileEntity.java
+6 -6
View File
@@ -29,19 +29,19 @@ import appeng.api.networking.events.MENetworkPowerStorage;
import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType;
import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.block.networking.BlockEnergyCell;
import appeng.block.networking.EnergyCellBlock;
import appeng.me.GridAccessException;
import appeng.tile.grid.AENetworkTile;
import appeng.tile.grid.AENetworkTileEntity;
import appeng.util.SettingsFrom;
public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage {
public class EnergyCellTileEntity extends AENetworkTileEntity implements IAEPowerStorage {
private double internalCurrentPower = 0.0;
private double internalMaxPower = 200000.0;
private byte currentMeta = -1;
public TileEnergyCell(TileEntityType<?> tileEntityTypeIn) {
public EnergyCellTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setIdlePowerUsage(0);
}
@@ -54,7 +54,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage {
@Override
public void onReady() {
super.onReady();
final int value = this.world.getBlockState(this.pos).get(BlockEnergyCell.ENERGY_STORAGE);
final int value = this.world.getBlockState(this.pos).get(EnergyCellBlock.ENERGY_STORAGE);
this.currentMeta = (byte) value;
this.changePowerLevel();
}
@@ -85,7 +85,7 @@ public class TileEnergyCell extends AENetworkTile implements IAEPowerStorage {
if (this.currentMeta != storageLevel) {
this.currentMeta = (byte) storageLevel;
this.world.setBlockState(this.pos,
this.world.getBlockState(this.pos).with(BlockEnergyCell.ENERGY_STORAGE, storageLevel));
this.world.getBlockState(this.pos).with(EnergyCellBlock.ENERGY_STORAGE, storageLevel));
}
}
src/main/java/appeng/tile/networking/TileWireless.java → src/main/java/appeng/tile/networking/WirelessTileEntity.java
+3 -3
View File
@@ -40,12 +40,12 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.core.AEConfig;
import appeng.me.GridAccessException;
import appeng.tile.grid.AENetworkInvTile;
import appeng.tile.grid.AENetworkInvTileEntity;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.inv.InvOperation;
import appeng.util.inv.filter.AEItemDefinitionFilter;
public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoint, IPowerChannelState {
public class WirelessTileEntity extends AENetworkInvTileEntity implements IWirelessAccessPoint, IPowerChannelState {
public static final int POWERED_FLAG = 1;
public static final int CHANNEL_FLAG = 2;
@@ -54,7 +54,7 @@ public class TileWireless extends AENetworkInvTile implements IWirelessAccessPoi
private int clientFlags = 0;
public TileWireless(TileEntityType<?> tileEntityTypeIn) {
public WirelessTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.inv.setFilter(new AEItemDefinitionFilter(AEApi.instance().definitions().materials().wirelessBooster()));
this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL);
src/main/java/appeng/tile/powersink/AEBasePoweredTile.java → src/main/java/appeng/tile/powersink/AEBasePoweredTileEntity.java
+3 -3
View File
@@ -39,9 +39,9 @@ import appeng.api.config.PowerUnits;
import appeng.api.networking.energy.IAEPowerStorage;
import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType;
import appeng.capabilities.Capabilities;
import appeng.tile.AEBaseInvTile;
import appeng.tile.AEBaseInvTileEntity;
public abstract class AEBasePoweredTile extends AEBaseInvTile implements IAEPowerStorage, IExternalPowerSink {
public abstract class AEBasePoweredTileEntity extends AEBaseInvTileEntity implements IAEPowerStorage, IExternalPowerSink {
// values that determine general function, are set by inheriting classes if
// needed. These should generally remain static.
@@ -58,7 +58,7 @@ public abstract class AEBasePoweredTile extends AEBaseInvTile implements IAEPowe
// IC2 private IC2PowerSink ic2Sink;
public AEBasePoweredTile(TileEntityType<?> tileEntityTypeIn) {
public AEBasePoweredTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.forgeEnergyAdapter = new ForgeEnergyAdapter(this);
this.forgeEnergyAdapterOptional = LazyOptional.of(() -> forgeEnergyAdapter);
src/main/java/appeng/tile/qnb/TileQuantumBridge.java → src/main/java/appeng/tile/qnb/QuantumBridgeTileEntity.java
+4 -4
View File
@@ -52,11 +52,11 @@ import appeng.me.cluster.IAECluster;
import appeng.me.cluster.IAEMultiBlock;
import appeng.me.cluster.implementations.QuantumCalculator;
import appeng.me.cluster.implementations.QuantumCluster;
import appeng.tile.grid.AENetworkInvTile;
import appeng.tile.grid.AENetworkInvTileEntity;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.inv.InvOperation;
public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock, ITickableTileEntity {
public class QuantumBridgeTileEntity extends AENetworkInvTileEntity implements IAEMultiBlock, ITickableTileEntity {
public static final ModelProperty<QnbFormedState> FORMED_STATE = new ModelProperty<>();
@@ -70,7 +70,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock
private QuantumCluster cluster;
private boolean updateStatus = false;
public TileQuantumBridge(TileEntityType<?> tileEntityTypeIn) {
public QuantumBridgeTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setValidSides(EnumSet.noneOf(Direction.class));
this.getProxy().setFlags(GridFlags.DENSE_CAPACITY);
@@ -230,7 +230,7 @@ public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock
for (final Direction d : Direction.values()) {
final TileEntity te = this.world.getTileEntity(this.pos.offset(d));
if (te instanceof TileQuantumBridge) {
if (te instanceof QuantumBridgeTileEntity) {
set.add(d);
}
}
src/main/java/appeng/tile/spatial/TileSpatialIOPort.java → src/main/java/appeng/tile/spatial/SpatialIOPortTileEntity.java
+4 -4
View File
@@ -43,7 +43,7 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.hooks.TickHandler;
import appeng.me.cache.SpatialPylonCache;
import appeng.tile.grid.AENetworkInvTile;
import appeng.tile.grid.AENetworkInvTileEntity;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.IWorldCallable;
import appeng.util.Platform;
@@ -51,13 +51,13 @@ import appeng.util.inv.InvOperation;
import appeng.util.inv.WrapperFilteredItemHandler;
import appeng.util.inv.filter.IAEItemFilter;
public class TileSpatialIOPort extends AENetworkInvTile implements IWorldCallable<Void> {
public class SpatialIOPortTileEntity extends AENetworkInvTileEntity implements IWorldCallable<Void> {
private final AppEngInternalInventory inv = new AppEngInternalInventory(this, 2);
private final IItemHandler invExt = new WrapperFilteredItemHandler(this.inv, new SpatialIOFilter());
private YesNo lastRedstoneState = YesNo.UNDECIDED;
public TileSpatialIOPort(TileEntityType<?> tileEntityTypeIn) {
public SpatialIOPortTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL);
}
@@ -182,7 +182,7 @@ public class TileSpatialIOPort extends AENetworkInvTile implements IWorldCallabl
@Override
public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) {
return (slot == 0 && TileSpatialIOPort.this.isSpatialCell(stack));
return (slot == 0 && SpatialIOPortTileEntity.this.isSpatialCell(stack));
}
}
src/main/java/appeng/tile/spatial/TileSpatialPylon.java → src/main/java/appeng/tile/spatial/SpatialPylonTileEntity.java
+3 -3
View File
@@ -40,9 +40,9 @@ import appeng.me.cluster.implementations.SpatialPylonCalculator;
import appeng.me.cluster.implementations.SpatialPylonCluster;
import appeng.me.helpers.AENetworkProxy;
import appeng.me.helpers.AENetworkProxyMultiblock;
import appeng.tile.grid.AENetworkTile;
import appeng.tile.grid.AENetworkTileEntity;
public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock {
public class SpatialPylonTileEntity extends AENetworkTileEntity implements IAEMultiBlock {
public static final ModelProperty<Integer> STATE = new ModelProperty<>(value -> {
// The lower 6 bits are used
@@ -66,7 +66,7 @@ public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock {
private SpatialPylonCluster cluster;
private boolean didHaveLight = false;
public TileSpatialPylon(TileEntityType<?> tileEntityTypeIn) {
public SpatialPylonTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL, GridFlags.MULTIBLOCK);
this.getProxy().setIdlePowerUsage(0.5);
src/main/java/appeng/tile/storage/TileChest.java → src/main/java/appeng/tile/storage/ChestTileEntity.java
+27 -27
View File
@@ -88,15 +88,15 @@ import appeng.api.storage.data.IAEStack;
import appeng.api.util.AEColor;
import appeng.api.util.IConfigManager;
import appeng.capabilities.Capabilities;
import appeng.container.implementations.ContainerMEMonitorable;
import appeng.fluids.container.ContainerFluidTerminal;
import appeng.container.implementations.MEMonitorableContainer;
import appeng.fluids.container.FluidTerminalContainer;
import appeng.fluids.util.AEFluidStack;
import appeng.helpers.IPriorityHost;
import appeng.me.GridAccessException;
import appeng.me.helpers.MEMonitorHandler;
import appeng.me.helpers.MachineSource;
import appeng.me.storage.MEInventoryHandler;
import appeng.tile.grid.AENetworkPowerTile;
import appeng.tile.grid.AENetworkPowerTileEntity;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost;
@@ -107,7 +107,7 @@ import appeng.util.inv.WrapperChainedItemHandler;
import appeng.util.inv.filter.IAEItemFilter;
import appeng.util.item.AEItemStack;
public class TileChest extends AENetworkPowerTile
public class ChestTileEntity extends AENetworkPowerTileEntity
implements IMEChest, ITerminalHost, IPriorityHost, IConfigManagerHost, IColorableTile, ITickableTileEntity {
private final AppEngInternalInventory inputInventory = new AppEngInternalInventory(this, 1);
private final AppEngInternalInventory cellInventory = new AppEngInternalInventory(this, 1);
@@ -126,7 +126,7 @@ public class TileChest extends AENetworkPowerTile
private Accessor accessor;
private IFluidHandler fluidHandler;
public TileChest(TileEntityType<?> tileEntityTypeIn) {
public ChestTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.setInternalMaxPower(PowerMultiplier.CONFIG.multiply(40));
this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL);
@@ -587,28 +587,28 @@ public class TileChest extends AENetworkPowerTile
@Override
public boolean isValid(final Object verificationToken) {
TileChest.this.updateHandler();
if (TileChest.this.cellHandler != null && this.chan == TileChest.this.cellHandler.getChannel()) {
return verificationToken == TileChest.this.cellHandler;
ChestTileEntity.this.updateHandler();
if (ChestTileEntity.this.cellHandler != null && this.chan == ChestTileEntity.this.cellHandler.getChannel()) {
return verificationToken == ChestTileEntity.this.cellHandler;
}
return false;
}
@Override
public void postChange(final IBaseMonitor<T> monitor, final Iterable<T> change, final IActionSource source) {
if (source == TileChest.this.mySrc
|| source.machine().map(machine -> machine == TileChest.this).orElse(false)) {
if (source == ChestTileEntity.this.mySrc
|| source.machine().map(machine -> machine == ChestTileEntity.this).orElse(false)) {
try {
if (TileChest.this.getProxy().isActive()) {
TileChest.this.getProxy().getStorage().postAlterationOfStoredItems(this.chan, change,
TileChest.this.mySrc);
if (ChestTileEntity.this.getProxy().isActive()) {
ChestTileEntity.this.getProxy().getStorage().postAlterationOfStoredItems(this.chan, change,
ChestTileEntity.this.mySrc);
}
} catch (final GridAccessException e) {
// :(
}
}
TileChest.this.blinkCell(0);
ChestTileEntity.this.blinkCell(0);
}
@Override
@@ -640,9 +640,9 @@ public class TileChest extends AENetworkPowerTile
}
private boolean securityCheck(final PlayerEntity player, final SecurityPermissions requiredPermission) {
if (TileChest.this.getTile() instanceof IActionHost && requiredPermission != null) {
if (ChestTileEntity.this.getTile() instanceof IActionHost && requiredPermission != null) {
final IGridNode gn = ((IActionHost) TileChest.this.getTile()).getActionableNode();
final IGridNode gn = ((IActionHost) ChestTileEntity.this.getTile()).getActionableNode();
if (gn != null) {
final IGrid g = gn.getGrid();
if (g != null) {
@@ -694,8 +694,8 @@ public class TileChest extends AENetworkPowerTile
@Nullable
@Override
public IStorageMonitorable getInventory(IActionSource src) {
if (Platform.canAccess(TileChest.this.getProxy(), src)) {
return TileChest.this;
if (Platform.canAccess(ChestTileEntity.this.getProxy(), src)) {
return ChestTileEntity.this;
}
return null;
}
@@ -704,7 +704,7 @@ public class TileChest extends AENetworkPowerTile
private class FluidHandler implements IFluidHandler, IFluidTank {
private boolean canAcceptLiquids() {
return TileChest.this.cellHandler != null && TileChest.this.cellHandler.getChannel() == AEApi.instance()
return ChestTileEntity.this.cellHandler != null && ChestTileEntity.this.cellHandler.getChannel() == AEApi.instance()
.storage().getStorageChannel(IFluidStorageChannel.class);
}
@@ -752,10 +752,10 @@ public class TileChest extends AENetworkPowerTile
@Override
public int fill(FluidStack resource, FluidAction action) {
TileChest.this.updateHandler();
ChestTileEntity.this.updateHandler();
if (canAcceptLiquids()) {
final IAEFluidStack results = Platform.poweredInsert(TileChest.this, TileChest.this.cellHandler,
AEFluidStack.fromFluidStack(resource), TileChest.this.mySrc,
final IAEFluidStack results = Platform.poweredInsert(ChestTileEntity.this, ChestTileEntity.this.cellHandler,
AEFluidStack.fromFluidStack(resource), ChestTileEntity.this.mySrc,
action == FluidAction.EXECUTE ? Actionable.MODULATE : Actionable.SIMULATE);
if (results == null) {
@@ -787,9 +787,9 @@ public class TileChest extends AENetworkPowerTile
@Override
public boolean allowInsert(IItemHandler inv, int slot, ItemStack stack) {
if (TileChest.this.isPowered()) {
TileChest.this.updateHandler();
return TileChest.this.cellHandler != null && TileChest.this.cellHandler.getChannel() == AEApi.instance()
if (ChestTileEntity.this.isPowered()) {
ChestTileEntity.this.updateHandler();
return ChestTileEntity.this.cellHandler != null && ChestTileEntity.this.cellHandler.getChannel() == AEApi.instance()
.storage().getStorageChannel(IItemStorageChannel.class);
}
return false;
@@ -821,11 +821,11 @@ public class TileChest extends AENetworkPowerTile
if (this.cellHandler != null) {
if (this.cellHandler.getChannel() == AEApi.instance().storage()
.getStorageChannel(IItemStorageChannel.class)) {
return ContainerMEMonitorable.TYPE;
return MEMonitorableContainer.TYPE;
}
if (this.cellHandler.getChannel() == AEApi.instance().storage()
.getStorageChannel(IFluidStorageChannel.class)) {
return ContainerFluidTerminal.TYPE;
return FluidTerminalContainer.TYPE;
}
}
return null;
src/main/java/appeng/tile/storage/TileDrive.java → src/main/java/appeng/tile/storage/DriveTileEntity.java
+5 -5
View File
@@ -61,18 +61,18 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.block.storage.DriveSlotsState;
import appeng.client.render.model.DriveModelData;
import appeng.container.implementations.ContainerDrive;
import appeng.container.implementations.DriveContainer;
import appeng.helpers.IPriorityHost;
import appeng.me.GridAccessException;
import appeng.me.helpers.MachineSource;
import appeng.me.storage.DriveWatcher;
import appeng.tile.grid.AENetworkInvTile;
import appeng.tile.grid.AENetworkInvTileEntity;
import appeng.tile.inventory.AppEngCellInventory;
import appeng.util.Platform;
import appeng.util.inv.InvOperation;
import appeng.util.inv.filter.IAEItemFilter;
public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPriorityHost {
public class DriveTileEntity extends AENetworkInvTileEntity implements IChestOrDrive, IPriorityHost {
private static final int BIT_POWER_MASK = 0x80000000;
private static final int BIT_BLINK_MASK = 0x24924924;
@@ -102,7 +102,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
*/
private int state = 0;
public TileDrive(TileEntityType<?> tileEntityTypeIn) {
public DriveTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.mySrc = new MachineSource(this);
this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL);
@@ -444,6 +444,6 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior
@Override
public ContainerType<?> getContainerType() {
return ContainerDrive.TYPE;
return DriveContainer.TYPE;
}
}
src/main/java/appeng/tile/storage/TileIOPort.java → src/main/java/appeng/tile/storage/IOPortTileEntity.java
+3 -3
View File
@@ -22,6 +22,7 @@ import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import appeng.tile.grid.AENetworkInvTileEntity;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
@@ -61,7 +62,6 @@ import appeng.me.GridAccessException;
import appeng.me.helpers.MachineSource;
import appeng.parts.automation.BlockUpgradeInventory;
import appeng.parts.automation.UpgradeInventory;
import appeng.tile.grid.AENetworkInvTile;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost;
@@ -74,7 +74,7 @@ import appeng.util.inv.WrapperChainedItemHandler;
import appeng.util.inv.WrapperFilteredItemHandler;
import appeng.util.inv.filter.AEItemFilters;
public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IConfigManagerHost, IGridTickable {
public class IOPortTileEntity extends AENetworkInvTileEntity implements IUpgradeableHost, IConfigManagerHost, IGridTickable {
private static final int NUMBER_OF_CELL_SLOTS = 6;
private static final int NUMBER_OF_UPGRADE_SLOTS = 3;
@@ -95,7 +95,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC
private ItemStack currentCell;
private Map<IStorageChannel<?>, IMEInventory<?>> cachedInventories;
public TileIOPort(TileEntityType<?> tileEntityTypeIn) {
public IOPortTileEntity(TileEntityType<?> tileEntityTypeIn) {
super(tileEntityTypeIn);
this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL);
this.manager = new ConfigManager(this);
src/main/java/appeng/tile/storage/TileSkyChest.java → src/main/java/appeng/tile/storage/SkyChestTileEntity.java
+5 -5
View File
@@ -32,12 +32,12 @@ import net.minecraft.util.SoundEvents;
import net.minecraft.util.math.MathHelper;
import net.minecraftforge.items.IItemHandler;
import appeng.block.storage.BlockSkyChest;
import appeng.tile.AEBaseInvTile;
import appeng.block.storage.SkyChestBlock;
import appeng.tile.AEBaseInvTileEntity;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.inv.InvOperation;
public class TileSkyChest extends AEBaseInvTile implements ITickableTileEntity, IChestLid {
public class SkyChestTileEntity extends AEBaseInvTileEntity implements ITickableTileEntity, IChestLid {
private final AppEngInternalInventory inv = new AppEngInternalInventory(this, 9 * 4);
@@ -48,7 +48,7 @@ public class TileSkyChest extends AEBaseInvTile implements ITickableTileEntity,
private float lidAngle;
private float prevLidAngle;
public TileSkyChest(TileEntityType<? extends TileSkyChest> type) {
public SkyChestTileEntity(TileEntityType<? extends SkyChestTileEntity> type) {
super(type);
}
@@ -116,7 +116,7 @@ public class TileSkyChest extends AEBaseInvTile implements ITickableTileEntity,
// See ChestTileEntity
private void onOpenOrClose() {
Block block = this.getBlockState().getBlock();
if (block instanceof BlockSkyChest) {
if (block instanceof SkyChestBlock) {
this.world.addBlockEvent(this.pos, block, 1, this.numPlayersUsing);
this.world.notifyNeighborsOfStateChange(this.pos, block);
// FIXME: Uhm, we are we doing this?