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/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();