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/parts/AEBasePart.java
+5 -5
View File
@@ -67,11 +67,11 @@ import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager;
import appeng.helpers.ICustomNameObject;
import appeng.helpers.IPriorityHost;
import appeng.items.parts.ItemPart;
import appeng.items.parts.PartItem;
import appeng.items.parts.PartType;
import appeng.me.helpers.AENetworkProxy;
import appeng.me.helpers.IGridProxyable;
import appeng.parts.networking.PartCable;
import appeng.parts.networking.CablePart;
import appeng.tile.inventory.AppEngInternalAEInventory;
import appeng.util.Platform;
import appeng.util.SettingsFrom;
@@ -88,7 +88,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
Preconditions.checkNotNull(is);
this.is = is;
this.proxy = new AENetworkProxy(this, "part", is, this instanceof PartCable);
this.proxy = new AENetworkProxy(this, "part", is, this instanceof CablePart);
this.proxy.setValidSides(EnumSet.noneOf(Direction.class));
}
@@ -98,11 +98,11 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost,
public PartType getType() {
Item item = this.is.getItem();
if (!(item instanceof ItemPart)) {
if (!(item instanceof PartItem)) {
return PartType.INVALID_TYPE;
}
return ((ItemPart<?>) item).getType();
return ((PartItem<?>) item).getType();
}
@Override
src/main/java/appeng/parts/PartBasicState.java → src/main/java/appeng/parts/BasicStatePart.java
+2 -2
View File
@@ -30,14 +30,14 @@ import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.me.GridAccessException;
public abstract class PartBasicState extends AEBasePart implements IPowerChannelState {
public abstract class BasicStatePart extends AEBasePart implements IPowerChannelState {
protected static final int POWERED_FLAG = 1;
protected static final int CHANNEL_FLAG = 2;
private int clientFlags = 0; // sent as byte.
public PartBasicState(final ItemStack is) {
public BasicStatePart(final ItemStack is) {
super(is);
this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL);
}
src/main/java/appeng/parts/CableBusContainer.java
+17 -17
View File
@@ -44,7 +44,7 @@ import net.minecraftforge.common.util.Constants;
import appeng.api.AEApi;
import appeng.api.config.YesNo;
import appeng.api.exceptions.FailedConnectionException;
import appeng.api.implementations.parts.IPartCable;
import appeng.api.implementations.parts.ICablePart;
import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode;
import appeng.api.parts.*;
@@ -59,7 +59,7 @@ import appeng.core.AELog;
import appeng.facade.FacadeContainer;
import appeng.helpers.AEMultiTile;
import appeng.me.GridConnection;
import appeng.parts.networking.PartCable;
import appeng.parts.networking.CablePart;
import appeng.util.Platform;
public class CableBusContainer extends CableBusStorage implements AEMultiTile, ICableBusContainer {
@@ -123,11 +123,11 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
final IPart bp = bi.createPart(is);
if (bp != null) {
if (bp instanceof IPartCable) {
if (bp instanceof ICablePart) {
boolean canPlace = true;
for (final AEPartLocation d : AEPartLocation.SIDE_LOCATIONS) {
if (this.getPart(d) != null
&& !this.getPart(d).canBePlacedOn(((IPartCable) bp).supportsBuses())) {
&& !this.getPart(d).canBePlacedOn(((ICablePart) bp).supportsBuses())) {
canPlace = false;
}
}
@@ -137,9 +137,9 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
}
return this.getPart(AEPartLocation.INTERNAL) == null;
} else if (!(bp instanceof IPartCable) && side != AEPartLocation.INTERNAL) {
} else if (!(bp instanceof ICablePart) && side != AEPartLocation.INTERNAL) {
final IPart cable = this.getPart(AEPartLocation.INTERNAL);
if (cable != null && !bp.canBePlacedOn(((IPartCable) cable).supportsBuses())) {
if (cable != null && !bp.canBePlacedOn(((ICablePart) cable).supportsBuses())) {
return false;
}
@@ -161,11 +161,11 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
is.setCount(1);
final IPart bp = bi.createPart(is);
if (bp instanceof IPartCable) {
if (bp instanceof ICablePart) {
boolean canPlace = true;
for (final AEPartLocation d : AEPartLocation.SIDE_LOCATIONS) {
if (this.getPart(d) != null
&& !this.getPart(d).canBePlacedOn(((IPartCable) bp).supportsBuses())) {
&& !this.getPart(d).canBePlacedOn(((ICablePart) bp).supportsBuses())) {
canPlace = false;
}
}
@@ -178,7 +178,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
return null;
}
this.setCenter((IPartCable) bp);
this.setCenter((ICablePart) bp);
bp.setPartHostInfo(AEPartLocation.INTERNAL, this, this.tcb.getTile());
if (player != null) {
@@ -215,9 +215,9 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
this.markForSave();
this.partChanged();
return AEPartLocation.INTERNAL;
} else if (bp != null && !(bp instanceof IPartCable) && side != AEPartLocation.INTERNAL) {
} else if (bp != null && !(bp instanceof ICablePart) && side != AEPartLocation.INTERNAL) {
final IPart cable = this.getPart(AEPartLocation.INTERNAL);
if (cable != null && !bp.canBePlacedOn(((IPartCable) cable).supportsBuses())) {
if (cable != null && !bp.canBePlacedOn(((ICablePart) cable).supportsBuses())) {
return null;
}
@@ -315,7 +315,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
@Override
public AEColor getColor() {
if (this.getCenter() != null) {
final IPartCable c = this.getCenter();
final ICablePart c = this.getCenter();
return c.getCableColor();
}
return AEColor.TRANSPARENT;
@@ -576,7 +576,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
}
if (this.getCenter() != null) {
final IPartCable c = this.getCenter();
final ICablePart c = this.getCenter();
return c.getCableConnectionType();
}
return AECableType.NONE;
@@ -584,7 +584,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
@Override
public float getCableConnectionLength(AECableType cable) {
return this.getPart(AEPartLocation.INTERNAL) instanceof IPartCable
return this.getPart(AEPartLocation.INTERNAL) instanceof ICablePart
? this.getPart(AEPartLocation.INTERNAL).getCableConnectionLength(cable)
: -1;
}
@@ -609,7 +609,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
final IPart part = this.getPart(s);
if (part != null) {
if (ignoreConnections && part instanceof IPartCable) {
if (ignoreConnections && part instanceof ICablePart) {
bch.addBox(6.0, 6.0, 6.0, 10.0, 10.0, 10.0);
} else {
part.getBoxes(bch);
@@ -917,7 +917,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
public boolean recolourBlock(final Direction side, final AEColor colour, final PlayerEntity who) {
final IPart cable = this.getPart(AEPartLocation.INTERNAL);
if (cable != null) {
final IPartCable pc = (IPartCable) cable;
final ICablePart pc = (ICablePart) cable;
return pc.changeColor(colour, who);
}
return false;
@@ -933,7 +933,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
@Override
public CableBusRenderState getRenderState() {
final PartCable cable = (PartCable) this.getCenter();
final CablePart cable = (CablePart) this.getCenter();
final CableBusRenderState renderState = new CableBusRenderState();
src/main/java/appeng/parts/CableBusStorage.java
+4 -4
View File
@@ -20,7 +20,7 @@ package appeng.parts;
import javax.annotation.Nullable;
import appeng.api.implementations.parts.IPartCable;
import appeng.api.implementations.parts.ICablePart;
import appeng.api.parts.IFacadePart;
import appeng.api.parts.IPart;
import appeng.api.util.AEPartLocation;
@@ -30,15 +30,15 @@ import appeng.api.util.AEPartLocation;
*/
public class CableBusStorage {
private IPartCable center;
private ICablePart center;
private IPart[] sides;
private IFacadePart[] facades;
protected IPartCable getCenter() {
protected ICablePart getCenter() {
return this.center;
}
protected void setCenter(final IPartCable center) {
protected void setCenter(final ICablePart center) {
this.center = center;
}
src/main/java/appeng/parts/PartPlacement.java
+7 -7
View File
@@ -61,8 +61,8 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.DimensionalCoord;
import appeng.core.AppEng;
import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketClick;
import appeng.core.sync.packets.PacketPartPlacement;
import appeng.core.sync.packets.ClickPacket;
import appeng.core.sync.packets.PartPlacementPacket;
import appeng.facade.IFacadeItem;
import appeng.util.LookDirection;
import appeng.util.Platform;
@@ -128,7 +128,7 @@ public class PartPlacement {
} else {
player.swingArm(hand);
NetworkHandler.instance()
.sendToServer(new PacketPartPlacement(pos, side, getEyeOffset(player), hand));
.sendToServer(new PartPlacementPacket(pos, side, getEyeOffset(player), hand));
}
return ActionResultType.SUCCESS;
}
@@ -171,7 +171,7 @@ public class PartPlacement {
} else {
player.swingArm(hand);
NetworkHandler.instance()
.sendToServer(new PacketPartPlacement(pos, side, getEyeOffset(player), hand));
.sendToServer(new PartPlacementPacket(pos, side, getEyeOffset(player), hand));
return ActionResultType.SUCCESS;
}
}
@@ -189,7 +189,7 @@ public class PartPlacement {
if (sPart.part.onShiftActivate(player, hand, hitVec)) {
if (world.isRemote) {
NetworkHandler.instance()
.sendToServer(new PacketPartPlacement(pos, side, getEyeOffset(player), hand));
.sendToServer(new PartPlacementPacket(pos, side, getEyeOffset(player), hand));
}
return ActionResultType.SUCCESS;
}
@@ -254,7 +254,7 @@ public class PartPlacement {
} else {
player.swingArm(hand);
NetworkHandler.instance()
.sendToServer(new PacketPartPlacement(pos, side, getEyeOffset(player), hand));
.sendToServer(new PartPlacementPacket(pos, side, getEyeOffset(player), hand));
return ActionResultType.SUCCESS;
}
} else if (host != null && !host.canAddPart(held, AEPartLocation.fromFacing(side))) {
@@ -386,7 +386,7 @@ public class PartPlacement {
supportedItem |= items.colorApplicator().isSameAs(held);
if (event.getPlayer().isCrouching() && !held.isEmpty() && supportedItem) {
NetworkHandler.instance().sendToServer(new PacketClick(event.getHand()));
NetworkHandler.instance().sendToServer(new ClickPacket(event.getHand()));
}
}
} else if (event instanceof PlayerInteractEvent.RightClickBlock && !event.getPlayer().world.isRemote) {
src/main/java/appeng/parts/automation/PartAbstractFormationPlane.java → src/main/java/appeng/parts/automation/AbstractFormationPlanePart.java
+2 -2
View File
@@ -24,14 +24,14 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.IConfigManager;
import appeng.helpers.IPriorityHost;
public abstract class PartAbstractFormationPlane<T extends IAEStack<T>> extends PartUpgradeable
public abstract class AbstractFormationPlanePart<T extends IAEStack<T>> extends UpgradeablePart
implements ICellContainer, IPriorityHost, IMEInventory<T> {
private boolean wasActive = false;
private int priority = 0;
protected boolean blocked = false;
public PartAbstractFormationPlane(ItemStack is) {
public AbstractFormationPlanePart(ItemStack is) {
super(is);
}
src/main/java/appeng/parts/automation/PartAnnihilationPlane.java → src/main/java/appeng/parts/automation/AnnihilationPlanePart.java
+8 -8
View File
@@ -69,18 +69,18 @@ import appeng.api.util.AECableType;
import appeng.api.util.AEPartLocation;
import appeng.core.AppEng;
import appeng.core.settings.TickRates;
import appeng.core.sync.packets.PacketBlockTransitionEffect;
import appeng.core.sync.packets.PacketItemTransitionEffect;
import appeng.core.sync.packets.BlockTransitionEffectPacket;
import appeng.core.sync.packets.ItemTransitionEffectPacket;
import appeng.hooks.TickHandler;
import appeng.items.parts.PartModels;
import appeng.me.GridAccessException;
import appeng.me.helpers.MachineSource;
import appeng.parts.PartBasicState;
import appeng.parts.BasicStatePart;
import appeng.util.IWorldCallable;
import appeng.util.Platform;
import appeng.util.item.AEItemStack;
public class PartAnnihilationPlane extends PartBasicState implements IGridTickable, IWorldCallable<TickRateModulation> {
public class AnnihilationPlanePart extends BasicStatePart implements IGridTickable, IWorldCallable<TickRateModulation> {
public static final ResourceLocation TAG_BLACKLIST = new ResourceLocation(AppEng.MOD_ID,
"blacklisted/annihilation_plane");
@@ -96,7 +96,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
private boolean isAccepting = true;
private boolean breaking = false;
public PartAnnihilationPlane(final ItemStack is) {
public AnnihilationPlanePart(final ItemStack is) {
super(is);
}
@@ -283,7 +283,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
if (changed) {
AppEng.proxy.sendToAllNearExcept(null, pos.getX(), pos.getY(), pos.getZ(), 64,
this.getTile().getWorld(), new PacketItemTransitionEffect(entity.getPosX(),
this.getTile().getWorld(), new ItemTransitionEffectPacket(entity.getPosX(),
entity.getPosY(), entity.getPosZ(), this.getSide().getOpposite()));
}
}
@@ -443,8 +443,8 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
energy.extractAEPower(requiredPower, Actionable.MODULATE, PowerMultiplier.CONFIG);
AppEng.proxy.sendToAllNearExcept(null, pos.getX(), pos.getY(), pos.getZ(), 64, w,
new PacketBlockTransitionEffect(pos, blockState, this.getSide().getOpposite(),
PacketBlockTransitionEffect.SoundMode.NONE));
new BlockTransitionEffectPacket(pos, blockState, this.getSide().getOpposite(),
BlockTransitionEffectPacket.SoundMode.NONE));
}
@Override
src/main/java/appeng/parts/automation/PartExportBus.java → src/main/java/appeng/parts/automation/ExportBusPart.java
+4 -4
View File
@@ -54,7 +54,7 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.AECableType;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerUpgradeable;
import appeng.container.implementations.UpgradeableContainer;
import appeng.core.AELog;
import appeng.core.AppEng;
import appeng.core.settings.TickRates;
@@ -68,7 +68,7 @@ import appeng.util.InventoryAdaptor;
import appeng.util.Platform;
import appeng.util.item.AEItemStack;
public class PartExportBus extends PartSharedItemBus implements ICraftingRequester {
public class ExportBusPart extends SharedItemBusPart implements ICraftingRequester {
public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/export_bus_base");
@@ -91,7 +91,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
private int nextSlot = 0;
@Reflected
public PartExportBus(final ItemStack is) {
public ExportBusPart(final ItemStack is) {
super(is);
this.getConfigManager().registerSetting(Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE);
@@ -198,7 +198,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
@Override
public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) {
if (Platform.isServer()) {
ContainerOpener.openContainer(ContainerUpgradeable.TYPE, player, ContainerLocator.forPart(this));
ContainerOpener.openContainer(UpgradeableContainer.TYPE, player, ContainerLocator.forPart(this));
}
return true;
}
src/main/java/appeng/parts/automation/PartFormationPlane.java → src/main/java/appeng/parts/automation/FormationPlanePart.java
+5 -5
View File
@@ -75,7 +75,7 @@ import appeng.api.storage.data.IItemList;
import appeng.api.util.AEPartLocation;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerFormationPlane;
import appeng.container.implementations.FormationPlaneContainer;
import appeng.core.AEConfig;
import appeng.items.parts.PartModels;
import appeng.me.GridAccessException;
@@ -86,7 +86,7 @@ import appeng.util.inv.InvOperation;
import appeng.util.prioritylist.FuzzyPriorityList;
import appeng.util.prioritylist.PrecisePriorityList;
public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack> {
public class FormationPlanePart extends AbstractFormationPlanePart<IAEItemStack> {
private static final PlaneModels MODELS = new PlaneModels("part/formation_plane", "part/formation_plane_on");
@@ -99,7 +99,7 @@ public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class));
private final AppEngInternalAEInventory Config = new AppEngInternalAEInventory(this, 63);
public PartFormationPlane(final ItemStack is) {
public FormationPlanePart(final ItemStack is) {
super(is);
this.getConfigManager().registerSetting(Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL);
@@ -185,7 +185,7 @@ public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
@Override
public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) {
if (Platform.isServer()) {
ContainerOpener.openContainer(ContainerFormationPlane.TYPE, player, ContainerLocator.forPart(this));
ContainerOpener.openContainer(FormationPlaneContainer.TYPE, player, ContainerLocator.forPart(this));
}
return true;
}
@@ -354,7 +354,7 @@ public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
@Override
public ContainerType<?> getContainerType() {
return ContainerFormationPlane.TYPE;
return FormationPlaneContainer.TYPE;
}
private int countEntitesAround(World world, BlockPos pos) {
src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java → src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java
+2 -2
View File
@@ -39,7 +39,7 @@ import appeng.api.parts.IPartModel;
import appeng.api.util.AEPartLocation;
import appeng.items.parts.PartModels;
public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane {
public class IdentityAnnihilationPlanePart extends AnnihilationPlanePart {
private static final PlaneModels MODELS = new PlaneModels("part/identity_annihilation_plane",
"part/identity_annihilation_plane_on");
@@ -51,7 +51,7 @@ public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane {
private static final float SILK_TOUCH_FACTOR = 16;
public PartIdentityAnnihilationPlane(final ItemStack is) {
public IdentityAnnihilationPlanePart(final ItemStack is) {
super(is);
}
src/main/java/appeng/parts/automation/PartImportBus.java → src/main/java/appeng/parts/automation/ImportBusPart.java
+4 -4
View File
@@ -45,7 +45,7 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.AECableType;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerUpgradeable;
import appeng.container.implementations.UpgradeableContainer;
import appeng.core.AppEng;
import appeng.core.settings.TickRates;
import appeng.helpers.Reflected;
@@ -58,7 +58,7 @@ import appeng.util.Platform;
import appeng.util.inv.IInventoryDestination;
import appeng.util.item.AEItemStack;
public class PartImportBus extends PartSharedItemBus implements IInventoryDestination {
public class ImportBusPart extends SharedItemBusPart implements IInventoryDestination {
public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/import_bus_base");
@PartModels
@@ -76,7 +76,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
private boolean worked; // used in tickingRequest
@Reflected
public PartImportBus(final ItemStack is) {
public ImportBusPart(final ItemStack is) {
super(is);
this.getConfigManager().registerSetting(Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE);
@@ -121,7 +121,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
@Override
public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) {
if (Platform.isServer()) {
ContainerOpener.openContainer(ContainerUpgradeable.TYPE, player, ContainerLocator.forPart(this));
ContainerOpener.openContainer(UpgradeableContainer.TYPE, player, ContainerLocator.forPart(this));
}
return true;
}
src/main/java/appeng/parts/automation/PartLevelEmitter.java → src/main/java/appeng/parts/automation/LevelEmitterPart.java
+4 -4
View File
@@ -72,7 +72,7 @@ import appeng.api.util.AEPartLocation;
import appeng.api.util.IConfigManager;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerLevelEmitter;
import appeng.container.implementations.LevelEmitterContainer;
import appeng.core.AppEng;
import appeng.helpers.Reflected;
import appeng.items.parts.PartModels;
@@ -82,7 +82,7 @@ import appeng.tile.inventory.AppEngInternalAEInventory;
import appeng.util.Platform;
import appeng.util.inv.InvOperation;
public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherHost, IStackWatcherHost,
public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherHost, IStackWatcherHost,
ICraftingWatcherHost, IMEMonitorHandlerReceiver<IAEItemStack>, ICraftingProvider {
@PartModels
@@ -125,7 +125,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
private double centerZ;
@Reflected
public PartLevelEmitter(final ItemStack is) {
public LevelEmitterPart(final ItemStack is) {
super(is);
this.getConfigManager().registerSetting(Settings.REDSTONE_EMITTER, RedstoneMode.HIGH_SIGNAL);
@@ -406,7 +406,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
@Override
public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) {
if (Platform.isServer()) {
ContainerOpener.openContainer(ContainerLevelEmitter.TYPE, player, ContainerLocator.forPart(this));
ContainerOpener.openContainer(LevelEmitterContainer.TYPE, player, ContainerLocator.forPart(this));
}
return true;
}
src/main/java/appeng/parts/automation/PartSharedItemBus.java → src/main/java/appeng/parts/automation/SharedItemBusPart.java
+2 -2
View File
@@ -34,12 +34,12 @@ import appeng.me.GridAccessException;
import appeng.tile.inventory.AppEngInternalAEInventory;
import appeng.util.InventoryAdaptor;
public abstract class PartSharedItemBus extends PartUpgradeable implements IGridTickable {
public abstract class SharedItemBusPart extends UpgradeablePart implements IGridTickable {
private final AppEngInternalAEInventory config = new AppEngInternalAEInventory(this, 9);
private boolean lastRedstone = false;
public PartSharedItemBus(final ItemStack is) {
public SharedItemBusPart(final ItemStack is) {
super(is);
}
src/main/java/appeng/parts/automation/PartUpgradeable.java → src/main/java/appeng/parts/automation/UpgradeablePart.java
+3 -3
View File
@@ -27,17 +27,17 @@ import appeng.api.config.RedstoneMode;
import appeng.api.config.Settings;
import appeng.api.config.Upgrades;
import appeng.api.util.IConfigManager;
import appeng.parts.PartBasicState;
import appeng.parts.BasicStatePart;
import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost;
import appeng.util.inv.IAEAppEngInventory;
import appeng.util.inv.InvOperation;
public abstract class PartUpgradeable extends PartBasicState implements IAEAppEngInventory, IConfigManagerHost {
public abstract class UpgradeablePart extends BasicStatePart implements IAEAppEngInventory, IConfigManagerHost {
private final IConfigManager manager;
private final UpgradeInventory upgrades;
public PartUpgradeable(final ItemStack is) {
public UpgradeablePart(final ItemStack is) {
super(is);
this.upgrades = new StackUpgradeInventory(this.getItemStack(), this, this.getUpgradeSlots());
this.manager = new ConfigManager(this);
src/main/java/appeng/parts/misc/PartCableAnchor.java → src/main/java/appeng/parts/misc/CableAnchorPart.java
+2 -2
View File
@@ -49,7 +49,7 @@ import appeng.core.AppEng;
import appeng.items.parts.PartModels;
import appeng.parts.PartModel;
public class PartCableAnchor implements IPart {
public class CableAnchorPart implements IPart {
@PartModels
public static final PartModel DEFAULT_MODELS = new PartModel(false,
@@ -63,7 +63,7 @@ public class PartCableAnchor implements IPart {
private IPartHost host = null;
private AEPartLocation mySide = AEPartLocation.UP;
public PartCableAnchor(final ItemStack is) {
public CableAnchorPart(final ItemStack is) {
this.is = is;
}
src/main/java/appeng/parts/misc/PartInterface.java → src/main/java/appeng/parts/misc/InterfacePart.java
+6 -6
View File
@@ -61,21 +61,21 @@ import appeng.api.util.AECableType;
import appeng.api.util.IConfigManager;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerInterface;
import appeng.container.implementations.InterfaceContainer;
import appeng.core.AppEng;
import appeng.helpers.DualityInterface;
import appeng.helpers.IInterfaceHost;
import appeng.helpers.IPriorityHost;
import appeng.helpers.Reflected;
import appeng.items.parts.PartModels;
import appeng.parts.PartBasicState;
import appeng.parts.BasicStatePart;
import appeng.parts.PartModel;
import appeng.util.Platform;
import appeng.util.inv.IAEAppEngInventory;
import appeng.util.inv.IInventoryDestination;
import appeng.util.inv.InvOperation;
public class PartInterface extends PartBasicState implements IGridTickable, IStorageMonitorable, IInventoryDestination,
public class InterfacePart extends BasicStatePart implements IGridTickable, IStorageMonitorable, IInventoryDestination,
IInterfaceHost, IAEAppEngInventory, IPriorityHost {
public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/interface_base");
@@ -95,7 +95,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
private final DualityInterface duality = new DualityInterface(this.getProxy(), this);
@Reflected
public PartInterface(final ItemStack is) {
public InterfacePart(final ItemStack is) {
super(is);
}
@@ -166,7 +166,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
@Override
public boolean onPartActivate(final PlayerEntity p, final Hand hand, final Vec3d pos) {
if (Platform.isServer()) {
ContainerOpener.openContainer(ContainerInterface.TYPE, p, ContainerLocator.forPart(this));
ContainerOpener.openContainer(InterfaceContainer.TYPE, p, ContainerLocator.forPart(this));
}
return true;
}
@@ -275,6 +275,6 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISto
@Override
public ContainerType<?> getContainerType() {
return ContainerInterface.TYPE;
return InterfaceContainer.TYPE;
}
}
src/main/java/appeng/parts/misc/PartInvertedToggleBus.java → src/main/java/appeng/parts/misc/InvertedToggleBusPart.java
+2 -2
View File
@@ -27,7 +27,7 @@ import appeng.helpers.Reflected;
import appeng.items.parts.PartModels;
import appeng.parts.PartModel;
public class PartInvertedToggleBus extends PartToggleBus {
public class InvertedToggleBusPart extends ToggleBusPart {
@PartModels
public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID,
"part/inverted_toggle_bus_base");
@@ -37,7 +37,7 @@ public class PartInvertedToggleBus extends PartToggleBus {
public static final PartModel MODELS_HAS_CHANNEL = new PartModel(MODEL_BASE, MODEL_STATUS_HAS_CHANNEL);
@Reflected
public PartInvertedToggleBus(final ItemStack is) {
public InvertedToggleBusPart(final ItemStack is) {
super(is);
this.getProxy().setIdlePowerUsage(0.0);
this.getOuterProxy().setIdlePowerUsage(0.0);
src/main/java/appeng/parts/misc/PartSharedStorageBus.java → src/main/java/appeng/parts/misc/SharedStorageBusPart.java
+3 -3
View File
@@ -43,19 +43,19 @@ import appeng.api.util.AECableType;
import appeng.api.util.IConfigManager;
import appeng.helpers.IPriorityHost;
import appeng.me.GridAccessException;
import appeng.parts.automation.PartUpgradeable;
import appeng.parts.automation.UpgradeablePart;
/**
* @author BrockWS
* @version rv6 - 22/05/2018
* @since rv6 22/05/2018
*/
public abstract class PartSharedStorageBus extends PartUpgradeable
public abstract class SharedStorageBusPart extends UpgradeablePart
implements IGridTickable, ICellContainer, IPriorityHost {
private boolean wasActive = false;
private int priority = 0;
public PartSharedStorageBus(ItemStack is) {
public SharedStorageBusPart(ItemStack is) {
super(is);
}
src/main/java/appeng/parts/misc/PartStorageBus.java → src/main/java/appeng/parts/misc/StorageBusPart.java
+6 -6
View File
@@ -75,7 +75,7 @@ import appeng.api.util.IConfigManager;
import appeng.capabilities.Capabilities;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerStorageBus;
import appeng.container.implementations.StorageBusContainer;
import appeng.core.AppEng;
import appeng.core.settings.TickRates;
import appeng.helpers.IInterfaceHost;
@@ -88,14 +88,14 @@ import appeng.me.storage.ITickingMonitor;
import appeng.me.storage.MEInventoryHandler;
import appeng.me.storage.MEMonitorIInventory;
import appeng.parts.PartModel;
import appeng.parts.automation.PartUpgradeable;
import appeng.parts.automation.UpgradeablePart;
import appeng.tile.inventory.AppEngInternalAEInventory;
import appeng.util.Platform;
import appeng.util.inv.InvOperation;
import appeng.util.prioritylist.FuzzyPriorityList;
import appeng.util.prioritylist.PrecisePriorityList;
public class PartStorageBus extends PartUpgradeable
public class StorageBusPart extends UpgradeablePart
implements IGridTickable, ICellContainer, IMEMonitorHandlerReceiver<IAEItemStack>, IPriorityHost {
public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/storage_bus_base");
@@ -123,7 +123,7 @@ public class PartStorageBus extends PartUpgradeable
private byte resetCacheLogic = 0;
@Reflected
public PartStorageBus(final ItemStack is) {
public StorageBusPart(final ItemStack is) {
super(is);
this.getConfigManager().registerSetting(Settings.ACCESS, AccessRestriction.READ_WRITE);
this.getConfigManager().registerSetting(Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL);
@@ -277,7 +277,7 @@ public class PartStorageBus extends PartUpgradeable
@Override
public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) {
if (Platform.isServer()) {
ContainerOpener.openContainer(ContainerStorageBus.TYPE, player, ContainerLocator.forPart(this));
ContainerOpener.openContainer(StorageBusContainer.TYPE, player, ContainerLocator.forPart(this));
}
return true;
}
@@ -564,6 +564,6 @@ public class PartStorageBus extends PartUpgradeable
@Override
public ContainerType<?> getContainerType() {
return ContainerStorageBus.TYPE;
return StorageBusContainer.TYPE;
}
}
src/main/java/appeng/parts/misc/PartToggleBus.java → src/main/java/appeng/parts/misc/ToggleBusPart.java
+3 -3
View File
@@ -43,10 +43,10 @@ import appeng.core.AppEng;
import appeng.helpers.Reflected;
import appeng.items.parts.PartModels;
import appeng.me.helpers.AENetworkProxy;
import appeng.parts.PartBasicState;
import appeng.parts.BasicStatePart;
import appeng.parts.PartModel;
public class PartToggleBus extends PartBasicState {
public class ToggleBusPart extends BasicStatePart {
@PartModels
public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/toggle_bus_base");
@@ -70,7 +70,7 @@ public class PartToggleBus extends PartBasicState {
private boolean hasRedstone = false;
@Reflected
public PartToggleBus(final ItemStack is) {
public ToggleBusPart(final ItemStack is) {
super(is);
this.getProxy().setIdlePowerUsage(0.0);
src/main/java/appeng/parts/networking/PartCable.java → src/main/java/appeng/parts/networking/CablePart.java
+3 -3
View File
@@ -30,7 +30,7 @@ import net.minecraft.util.Direction;
import appeng.api.AEApi;
import appeng.api.config.SecurityPermissions;
import appeng.api.definitions.IParts;
import appeng.api.implementations.parts.IPartCable;
import appeng.api.implementations.parts.ICablePart;
import appeng.api.networking.GridFlags;
import appeng.api.networking.IGridConnection;
import appeng.api.networking.IGridHost;
@@ -48,14 +48,14 @@ import appeng.me.GridAccessException;
import appeng.parts.AEBasePart;
import appeng.util.Platform;
public class PartCable extends AEBasePart implements IPartCable {
public class CablePart extends AEBasePart implements ICablePart {
private final int[] channelsOnSide = { 0, 0, 0, 0, 0, 0 };
private EnumSet<AEPartLocation> connections = EnumSet.noneOf(AEPartLocation.class);
private boolean powered = false;
public PartCable(final ItemStack is) {
public CablePart(final ItemStack is) {
super(is);
this.getProxy().setFlags(GridFlags.PREFERRED);
this.getProxy().setIdlePowerUsage(0.0);
src/main/java/appeng/parts/networking/PartCableCovered.java → src/main/java/appeng/parts/networking/CoveredCablePart.java
+2 -2
View File
@@ -30,9 +30,9 @@ import appeng.api.util.AEPartLocation;
import appeng.helpers.Reflected;
import appeng.util.Platform;
public class PartCableCovered extends PartCable {
public class CoveredCablePart extends CablePart {
@Reflected
public PartCableCovered(final ItemStack is) {
public CoveredCablePart(final ItemStack is) {
super(is);
}
src/main/java/appeng/parts/networking/PartDenseCableCovered.java → src/main/java/appeng/parts/networking/CoveredDenseCablePart.java
+2 -2
View File
@@ -22,9 +22,9 @@ import net.minecraft.item.ItemStack;
import appeng.api.util.AECableType;
public class PartDenseCableCovered extends PartDenseCable {
public class CoveredDenseCablePart extends DenseCablePart {
public PartDenseCableCovered(ItemStack is) {
public CoveredDenseCablePart(ItemStack is) {
super(is);
}
src/main/java/appeng/parts/networking/PartDenseCable.java → src/main/java/appeng/parts/networking/DenseCablePart.java
+2 -2
View File
@@ -34,9 +34,9 @@ import appeng.api.util.AEPartLocation;
import appeng.helpers.Reflected;
import appeng.util.Platform;
public abstract class PartDenseCable extends PartCable {
public abstract class DenseCablePart extends CablePart {
@Reflected
public PartDenseCable(final ItemStack is) {
public DenseCablePart(final ItemStack is) {
super(is);
this.getProxy().setFlags(GridFlags.DENSE_CAPACITY, GridFlags.PREFERRED);
src/main/java/appeng/parts/networking/PartCableGlass.java → src/main/java/appeng/parts/networking/GlassCablePart.java
+2 -2
View File
@@ -22,9 +22,9 @@ import net.minecraft.item.ItemStack;
import appeng.helpers.Reflected;
public class PartCableGlass extends PartCable {
public class GlassCablePart extends CablePart {
@Reflected
public PartCableGlass(final ItemStack is) {
public GlassCablePart(final ItemStack is) {
super(is);
}
}
src/main/java/appeng/parts/networking/PartQuartzFiber.java → src/main/java/appeng/parts/networking/QuartzFiberPart.java
+2 -2
View File
@@ -46,7 +46,7 @@ import appeng.me.helpers.AENetworkProxy;
import appeng.parts.AEBasePart;
import appeng.parts.PartModel;
public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider {
public class QuartzFiberPart extends AEBasePart implements IEnergyGridProvider {
@PartModels
private static final IPartModel MODELS = new PartModel(new ResourceLocation(AppEng.MOD_ID, "part/quartz_fiber"));
@@ -54,7 +54,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider {
private final AENetworkProxy outerProxy = new AENetworkProxy(this, "outer",
this.getProxy().getMachineRepresentation(), true);
public PartQuartzFiber(final ItemStack is) {
public QuartzFiberPart(final ItemStack is) {
super(is);
this.getProxy().setIdlePowerUsage(0);
this.getProxy().setFlags(GridFlags.CANNOT_CARRY);
src/main/java/appeng/parts/networking/PartCableSmart.java → src/main/java/appeng/parts/networking/SmartCablePart.java
+2 -2
View File
@@ -30,9 +30,9 @@ import appeng.api.util.AEPartLocation;
import appeng.helpers.Reflected;
import appeng.util.Platform;
public class PartCableSmart extends PartCable {
public class SmartCablePart extends CablePart {
@Reflected
public PartCableSmart(final ItemStack is) {
public SmartCablePart(final ItemStack is) {
super(is);
}
src/main/java/appeng/parts/networking/PartDenseCableSmart.java → src/main/java/appeng/parts/networking/SmartDenseCablePart.java
+2 -2
View File
@@ -22,9 +22,9 @@ import net.minecraft.item.ItemStack;
import appeng.api.util.AECableType;
public class PartDenseCableSmart extends PartDenseCable {
public class SmartDenseCablePart extends DenseCablePart {
public PartDenseCableSmart(ItemStack is) {
public SmartDenseCablePart(ItemStack is) {
super(is);
}
src/main/java/appeng/parts/p2p/PartP2PFEPower.java → src/main/java/appeng/parts/p2p/FEP2PTunnelPart.java
+12 -12
View File
@@ -35,13 +35,13 @@ import appeng.capabilities.Capabilities;
import appeng.items.parts.PartModels;
import appeng.me.GridAccessException;
public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower> {
public class FEP2PTunnelPart extends P2PTunnelPart<FEP2PTunnelPart> {
private static final P2PModels MODELS = new P2PModels("part/p2p/p2p_tunnel_fe");
private static final IEnergyStorage NULL_ENERGY_STORAGE = new NullEnergyStorage();
private final IEnergyStorage inputHandler = new InputEnergyStorage();
private final IEnergyStorage outputHandler = new OutputEnergyStorage();
public PartP2PFEPower(ItemStack is) {
public FEP2PTunnelPart(ItemStack is) {
super(is);
}
@@ -98,7 +98,7 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower> {
int total = 0;
try {
final int outputTunnels = PartP2PFEPower.this.getOutputs().size();
final int outputTunnels = FEP2PTunnelPart.this.getOutputs().size();
if (outputTunnels == 0 | maxReceive == 0) {
return 0;
@@ -107,7 +107,7 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower> {
final int amountPerOutput = maxReceive / outputTunnels;
int overflow = amountPerOutput == 0 ? maxReceive : maxReceive % amountPerOutput;
for (PartP2PFEPower target : PartP2PFEPower.this.getOutputs()) {
for (FEP2PTunnelPart target : FEP2PTunnelPart.this.getOutputs()) {
final IEnergyStorage output = target.getAttachedEnergyStorage();
final int toSend = amountPerOutput + overflow;
final int received = output.receiveEnergy(toSend, simulate);
@@ -117,7 +117,7 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower> {
}
if (!simulate) {
PartP2PFEPower.this.queueTunnelDrain(PowerUnits.RF, total);
FEP2PTunnelPart.this.queueTunnelDrain(PowerUnits.RF, total);
}
} catch (GridAccessException ignored) {
}
@@ -140,7 +140,7 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower> {
int total = 0;
try {
for (PartP2PFEPower t : PartP2PFEPower.this.getOutputs()) {
for (FEP2PTunnelPart t : FEP2PTunnelPart.this.getOutputs()) {
total += t.getAttachedEnergyStorage().getMaxEnergyStored();
}
} catch (GridAccessException e) {
@@ -155,7 +155,7 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower> {
int total = 0;
try {
for (PartP2PFEPower t : PartP2PFEPower.this.getOutputs()) {
for (FEP2PTunnelPart t : FEP2PTunnelPart.this.getOutputs()) {
total += t.getAttachedEnergyStorage().getEnergyStored();
}
} catch (GridAccessException e) {
@@ -169,10 +169,10 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower> {
private class OutputEnergyStorage implements IEnergyStorage {
@Override
public int extractEnergy(int maxExtract, boolean simulate) {
final int total = PartP2PFEPower.this.getAttachedEnergyStorage().extractEnergy(maxExtract, simulate);
final int total = FEP2PTunnelPart.this.getAttachedEnergyStorage().extractEnergy(maxExtract, simulate);
if (!simulate) {
PartP2PFEPower.this.queueTunnelDrain(PowerUnits.RF, total);
FEP2PTunnelPart.this.queueTunnelDrain(PowerUnits.RF, total);
}
return total;
@@ -185,7 +185,7 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower> {
@Override
public boolean canExtract() {
return PartP2PFEPower.this.getAttachedEnergyStorage().canExtract();
return FEP2PTunnelPart.this.getAttachedEnergyStorage().canExtract();
}
@Override
@@ -195,12 +195,12 @@ public class PartP2PFEPower extends PartP2PTunnel<PartP2PFEPower> {
@Override
public int getMaxEnergyStored() {
return PartP2PFEPower.this.getAttachedEnergyStorage().getMaxEnergyStored();
return FEP2PTunnelPart.this.getAttachedEnergyStorage().getMaxEnergyStored();
}
@Override
public int getEnergyStored() {
return PartP2PFEPower.this.getAttachedEnergyStorage().getEnergyStored();
return FEP2PTunnelPart.this.getAttachedEnergyStorage().getEnergyStored();
}
}
src/main/java/appeng/parts/p2p/PartP2PFluids.java → src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java
+15 -15
View File
@@ -41,16 +41,16 @@ import appeng.api.parts.IPartModel;
import appeng.items.parts.PartModels;
import appeng.me.GridAccessException;
public class PartP2PFluids extends PartP2PTunnel<PartP2PFluids> implements IFluidHandler {
public class FluidP2PTunnelPart extends P2PTunnelPart<FluidP2PTunnelPart> implements IFluidHandler {
private static final P2PModels MODELS = new P2PModels("part/p2p/p2p_tunnel_fluids");
private static final ThreadLocal<Deque<PartP2PFluids>> DEPTH = new ThreadLocal<>();;
private static final ThreadLocal<Deque<FluidP2PTunnelPart>> DEPTH = new ThreadLocal<>();;
private LazyOptional<IFluidHandler> cachedTank;
private int tmpUsed;
public PartP2PFluids(final ItemStack is) {
public FluidP2PTunnelPart(final ItemStack is) {
super(is);
}
@@ -73,7 +73,7 @@ public class PartP2PFluids extends PartP2PTunnel<PartP2PFluids> implements IFlui
this.cachedTank = null;
if (this.isOutput()) {
final PartP2PFluids in = this.getInput();
final FluidP2PTunnelPart in = this.getInput();
if (in != null) {
in.onTunnelNetworkChange();
}
@@ -119,9 +119,9 @@ public class PartP2PFluids extends PartP2PTunnel<PartP2PFluids> implements IFlui
@Override
public int fill(FluidStack resource, FluidAction action) {
final Deque<PartP2PFluids> stack = this.getDepth();
final Deque<FluidP2PTunnelPart> stack = this.getDepth();
for (final PartP2PFluids t : stack) {
for (final FluidP2PTunnelPart t : stack) {
if (t == this) {
return 0;
}
@@ -129,13 +129,13 @@ public class PartP2PFluids extends PartP2PTunnel<PartP2PFluids> implements IFlui
stack.push(this);
final List<PartP2PFluids> list = this.getOutputs(resource.getFluid());
final List<FluidP2PTunnelPart> list = this.getOutputs(resource.getFluid());
int requestTotal = 0;
Iterator<PartP2PFluids> i = list.iterator();
Iterator<FluidP2PTunnelPart> i = list.iterator();
while (i.hasNext()) {
final PartP2PFluids l = i.next();
final FluidP2PTunnelPart l = i.next();
final IFluidHandler tank = l.getTarget().orElse(null);
if (tank != null) {
l.tmpUsed = tank.fill(resource.copy(), FluidAction.SIMULATE);
@@ -172,7 +172,7 @@ public class PartP2PFluids extends PartP2PTunnel<PartP2PFluids> implements IFlui
int used = 0;
while (i.hasNext() && available > 0) {
final PartP2PFluids l = i.next();
final FluidP2PTunnelPart l = i.next();
final FluidStack insert = resource.copy();
insert.setAmount((int) Math.ceil(insert.getAmount() * ((double) l.tmpUsed / (double) requestTotal)));
@@ -210,8 +210,8 @@ public class PartP2PFluids extends PartP2PTunnel<PartP2PFluids> implements IFlui
return FluidStack.EMPTY;
}
private Deque<PartP2PFluids> getDepth() {
Deque<PartP2PFluids> s = DEPTH.get();
private Deque<FluidP2PTunnelPart> getDepth() {
Deque<FluidP2PTunnelPart> s = DEPTH.get();
if (s == null) {
DEPTH.set(s = new ArrayDeque<>());
@@ -220,11 +220,11 @@ public class PartP2PFluids extends PartP2PTunnel<PartP2PFluids> implements IFlui
return s;
}
private List<PartP2PFluids> getOutputs(final Fluid input) {
final List<PartP2PFluids> outs = new ArrayList<>();
private List<FluidP2PTunnelPart> getOutputs(final Fluid input) {
final List<FluidP2PTunnelPart> outs = new ArrayList<>();
try {
for (final PartP2PFluids l : this.getOutputs()) {
for (final FluidP2PTunnelPart l : this.getOutputs()) {
final IFluidHandler handler = l.getTarget().orElse(null);
if (handler != null) {
src/main/java/appeng/parts/p2p/PartP2PItems.java → src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java
+6 -6
View File
@@ -50,7 +50,7 @@ import appeng.me.cache.helpers.TunnelCollection;
import appeng.util.Platform;
import appeng.util.inv.WrapperChainedItemHandler;
public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IItemHandler, IGridTickable {
public class ItemP2PTunnelPart extends P2PTunnelPart<ItemP2PTunnelPart> implements IItemHandler, IGridTickable {
private static final float POWER_DRAIN = 2.0f;
private static final P2PModels MODELS = new P2PModels("part/p2p/p2p_tunnel_items");
private boolean partVisited = false;
@@ -64,14 +64,14 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IItemHa
private boolean requested;
private IItemHandler cachedInv;
public PartP2PItems(final ItemStack is) {
public ItemP2PTunnelPart(final ItemStack is) {
super(is);
}
@Override
public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) {
this.cachedInv = null;
final PartP2PItems input = this.getInput();
final ItemP2PTunnelPart input = this.getInput();
if (input != null && this.isOutput()) {
input.onTunnelNetworkChange();
}
@@ -85,7 +85,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IItemHa
}
final List<IItemHandler> outs = new ArrayList<IItemHandler>();
final TunnelCollection<PartP2PItems> itemTunnels;
final TunnelCollection<ItemP2PTunnelPart> itemTunnels;
try {
itemTunnels = this.getOutputs();
@@ -93,7 +93,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IItemHa
return EmptyHandler.INSTANCE;
}
for (final PartP2PItems t : itemTunnels) {
for (final ItemP2PTunnelPart t : itemTunnels) {
final IItemHandler inv = t.getOutputInv();
if (inv != null && inv != this) {
if (Platform.getRandomInt() % 2 == 0) {
@@ -188,7 +188,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IItemHa
this.getHost().notifyNeighbors();
}
} else {
final PartP2PItems input = this.getInput();
final ItemP2PTunnelPart input = this.getInput();
if (input != null) {
input.getHost().notifyNeighbors();
}
src/main/java/appeng/parts/p2p/PartP2PLight.java → src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java
+4 -4
View File
@@ -40,7 +40,7 @@ import appeng.core.settings.TickRates;
import appeng.items.parts.PartModels;
import appeng.me.GridAccessException;
public class PartP2PLight extends PartP2PTunnel<PartP2PLight> implements IGridTickable {
public class LightP2PTunnelPart extends P2PTunnelPart<LightP2PTunnelPart> implements IGridTickable {
private static final P2PModels MODELS = new P2PModels("part/p2p/p2p_tunnel_light");
@@ -52,7 +52,7 @@ public class PartP2PLight extends PartP2PTunnel<PartP2PLight> implements IGridTi
private int lastValue = 0;
private int opacity = -1;
public PartP2PLight(final ItemStack is) {
public LightP2PTunnelPart(final ItemStack is) {
super(is);
}
@@ -101,7 +101,7 @@ public class PartP2PLight extends PartP2PTunnel<PartP2PLight> implements IGridTi
if (this.lastValue != newLevel && this.getProxy().isActive()) {
this.lastValue = newLevel;
try {
for (final PartP2PLight out : this.getOutputs()) {
for (final LightP2PTunnelPart out : this.getOutputs()) {
out.setLightLevel(this.lastValue);
}
} catch (final GridAccessException e) {
@@ -165,7 +165,7 @@ public class PartP2PLight extends PartP2PTunnel<PartP2PLight> implements IGridTi
@Override
public void onTunnelNetworkChange() {
if (this.isOutput()) {
final PartP2PLight src = this.getInput();
final LightP2PTunnelPart src = this.getInput();
if (src != null && src.getProxy().isActive()) {
this.setLightLevel(src.lastValue);
} else {
src/main/java/appeng/parts/p2p/PartP2PTunnelME.java → src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java
+5 -5
View File
@@ -49,7 +49,7 @@ import appeng.me.cache.helpers.Connections;
import appeng.me.cache.helpers.TunnelConnection;
import appeng.me.helpers.AENetworkProxy;
public class PartP2PTunnelME extends PartP2PTunnel<PartP2PTunnelME> implements IGridTickable {
public class MEP2PTunnelPart extends P2PTunnelPart<MEP2PTunnelPart> implements IGridTickable {
private static final P2PModels MODELS = new P2PModels("part/p2p/p2p_tunnel_me");
@@ -61,7 +61,7 @@ public class PartP2PTunnelME extends PartP2PTunnel<PartP2PTunnelME> implements I
private final Connections connection = new Connections(this);
private final AENetworkProxy outerProxy = new AENetworkProxy(this, "outer", ItemStack.EMPTY, true);
public PartP2PTunnelME(final ItemStack is) {
public MEP2PTunnelPart(final ItemStack is) {
super(is);
this.getProxy().setFlags(GridFlags.REQUIRE_CHANNEL, GridFlags.COMPRESSED_CHANNEL);
this.outerProxy.setFlags(GridFlags.DENSE_CAPACITY, GridFlags.CANNOT_CARRY_COMPRESSED);
@@ -183,15 +183,15 @@ public class PartP2PTunnelME extends PartP2PTunnel<PartP2PTunnelME> implements I
}
}
final List<PartP2PTunnelME> newSides = new ArrayList<>();
final List<MEP2PTunnelPart> newSides = new ArrayList<>();
try {
for (final PartP2PTunnelME me : this.getOutputs()) {
for (final MEP2PTunnelPart me : this.getOutputs()) {
if (me.getProxy().isActive() && connections.getConnections().get(me.getGridNode()) == null) {
newSides.add(me);
}
}
for (final PartP2PTunnelME me : newSides) {
for (final MEP2PTunnelPart me : newSides) {
try {
connections.getConnections().put(me.getGridNode(), new TunnelConnection(me, AEApi.instance()
.grid().createGridConnection(this.outerProxy.getNode(), me.outerProxy.getNode())));
src/main/java/appeng/parts/p2p/PartP2PTunnel.java → src/main/java/appeng/parts/p2p/P2PTunnelPart.java
+11 -11
View File
@@ -51,20 +51,20 @@ import appeng.core.AEConfig;
import appeng.me.GridAccessException;
import appeng.me.cache.P2PCache;
import appeng.me.cache.helpers.TunnelCollection;
import appeng.parts.PartBasicState;
import appeng.parts.BasicStatePart;
import appeng.util.Platform;
public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState {
public abstract class P2PTunnelPart<T extends P2PTunnelPart> extends BasicStatePart {
private final TunnelCollection type = new TunnelCollection<T>(null, this.getClass());
private boolean output;
private short freq;
public PartP2PTunnel(final ItemStack is) {
public P2PTunnelPart(final ItemStack is) {
super(is);
}
public TunnelCollection<T> getCollection(final Collection<PartP2PTunnel> collection,
final Class<? extends PartP2PTunnel> c) {
public TunnelCollection<T> getCollection(final Collection<P2PTunnelPart> collection,
final Class<? extends P2PTunnelPart> c) {
if (this.type.matches(c)) {
this.type.setSource(collection);
return this.type;
@@ -79,7 +79,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
}
try {
final PartP2PTunnel tunnel = this.getProxy().getP2P().getInput(this.getFrequency());
final P2PTunnelPart tunnel = this.getProxy().getP2P().getInput(this.getFrequency());
if (this.getClass().isInstance(tunnel)) {
return (T) tunnel;
}
@@ -179,13 +179,13 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
if (!newType.isEmpty()) {
if (newType.getItem() instanceof IPartItem) {
final IPart testPart = ((IPartItem<?>) newType.getItem()).createPart(newType);
if (testPart instanceof PartP2PTunnel) {
if (testPart instanceof P2PTunnelPart) {
this.getHost().removePart(this.getSide(), true);
final AEPartLocation dir = this.getHost().addPart(newType, this.getSide(), player, hand);
final IPart newBus = this.getHost().getPart(dir);
if (newBus instanceof PartP2PTunnel) {
final PartP2PTunnel<?> newTunnel = (PartP2PTunnel<?>) newBus;
if (newBus instanceof P2PTunnelPart) {
final P2PTunnelPart<?> newTunnel = (P2PTunnelPart<?>) newBus;
newTunnel.setOutput(true);
try {
@@ -258,8 +258,8 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
final AEPartLocation dir = this.getHost().addPart(newType, this.getSide(), player, hand);
final IPart newBus = this.getHost().getPart(dir);
if (newBus instanceof PartP2PTunnel) {
final PartP2PTunnel newTunnel = (PartP2PTunnel) newBus;
if (newBus instanceof P2PTunnelPart) {
final P2PTunnelPart newTunnel = (P2PTunnelPart) newBus;
newTunnel.setOutput(oldOutput);
newTunnel.onTunnelNetworkChange();
src/main/java/appeng/parts/p2p/PartP2PRedstone.java → src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java
+4 -4
View File
@@ -39,7 +39,7 @@ import appeng.items.parts.PartModels;
import appeng.me.GridAccessException;
import appeng.util.Platform;
public class PartP2PRedstone extends PartP2PTunnel<PartP2PRedstone> {
public class RedstoneP2PTunnelPart extends P2PTunnelPart<RedstoneP2PTunnelPart> {
private static final P2PModels MODELS = new P2PModels("part/p2p/p2p_tunnel_redstone");
@@ -51,7 +51,7 @@ public class PartP2PRedstone extends PartP2PTunnel<PartP2PRedstone> {
private int power;
private boolean recursive = false;
public PartP2PRedstone(final ItemStack is) {
public RedstoneP2PTunnelPart(final ItemStack is) {
super(is);
}
@@ -62,7 +62,7 @@ public class PartP2PRedstone extends PartP2PTunnel<PartP2PRedstone> {
private void setNetworkReady() {
if (this.isOutput()) {
final PartP2PRedstone in = this.getInput();
final RedstoneP2PTunnelPart in = this.getInput();
if (in != null) {
this.putInput(in.power);
}
@@ -166,7 +166,7 @@ public class PartP2PRedstone extends PartP2PTunnel<PartP2PRedstone> {
private void sendToOutput(final int power) {
try {
for (final PartP2PRedstone rs : this.getOutputs()) {
for (final RedstoneP2PTunnelPart rs : this.getOutputs()) {
rs.putInput(power);
}
} catch (final GridAccessException e) {
src/main/java/appeng/parts/reporting/AbstractPartDisplay.java → src/main/java/appeng/parts/reporting/AbstractDisplayPart.java
+2 -2
View File
@@ -36,7 +36,7 @@ import appeng.items.parts.PartModels;
* @version rv3
* @since rv3
*/
public abstract class AbstractPartDisplay extends AbstractPartReporting {
public abstract class AbstractDisplayPart extends AbstractReportingPart {
// The base chassis of all display parts
@PartModels
@@ -53,7 +53,7 @@ public abstract class AbstractPartDisplay extends AbstractPartReporting {
protected static final ResourceLocation MODEL_STATUS_HAS_CHANNEL = new ResourceLocation(AppEng.MOD_ID,
"part/display_status_has_channel");
public AbstractPartDisplay(final ItemStack is) {
public AbstractDisplayPart(final ItemStack is) {
super(is, true);
}
src/main/java/appeng/parts/reporting/AbstractPartMonitor.java → src/main/java/appeng/parts/reporting/AbstractMonitorPart.java
+6 -6
View File
@@ -35,7 +35,7 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import appeng.api.AEApi;
import appeng.api.implementations.parts.IPartStorageMonitor;
import appeng.api.implementations.parts.IStorageMonitorPart;
import appeng.api.networking.security.IActionSource;
import appeng.api.networking.storage.IStackWatcher;
import appeng.api.networking.storage.IStackWatcherHost;
@@ -68,8 +68,8 @@ import appeng.util.item.AEItemStack;
* @version rv3
* @since rv3
*/
public abstract class AbstractPartMonitor extends AbstractPartDisplay
implements IPartStorageMonitor, IStackWatcherHost {
public abstract class AbstractMonitorPart extends AbstractDisplayPart
implements IStorageMonitorPart, IStackWatcherHost {
private static final IWideReadableNumberConverter NUMBER_CONVERTER = ReadableNumberConverter.INSTANCE;
private IAEItemStack configuredItem;
private String lastHumanReadableText;
@@ -77,7 +77,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay
private IStackWatcher myWatcher;
@Reflected
public AbstractPartMonitor(final ItemStack is) {
public AbstractMonitorPart(final ItemStack is) {
super(is);
}
@@ -222,8 +222,8 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay
public void renderDynamic(float partialTicks, MatrixStack matrixStack, IRenderTypeBuffer buffers,
int combinedLightIn, int combinedOverlayIn) {
if ((this.getClientFlags() & (PartPanel.POWERED_FLAG | PartPanel.CHANNEL_FLAG)) != (PartPanel.POWERED_FLAG
| PartPanel.CHANNEL_FLAG)) {
if ((this.getClientFlags() & (PanelPart.POWERED_FLAG | PanelPart.CHANNEL_FLAG)) != (PanelPart.POWERED_FLAG
| PanelPart.CHANNEL_FLAG)) {
return;
}
src/main/java/appeng/parts/reporting/AbstractPartPanel.java → src/main/java/appeng/parts/reporting/AbstractPanelPart.java
+3 -3
View File
@@ -28,7 +28,7 @@ import appeng.items.parts.PartModels;
/**
* A very simple part for emitting light.
*
* Opposed to the other subclass of {@link AbstractPartReporting}, it will only
* Opposed to the other subclass of {@link AbstractReportingPart}, it will only
* use the bright front texture.
*
* @author AlgorithmX2
@@ -36,12 +36,12 @@ import appeng.items.parts.PartModels;
* @version rv3
* @since rv3
*/
public abstract class AbstractPartPanel extends AbstractPartReporting {
public abstract class AbstractPanelPart extends AbstractReportingPart {
@PartModels
public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/monitor_base");
public AbstractPartPanel(final ItemStack is) {
public AbstractPanelPart(final ItemStack is) {
super(is, false);
}
src/main/java/appeng/parts/reporting/AbstractPartReporting.java → src/main/java/appeng/parts/reporting/AbstractReportingPart.java
+10 -10
View File
@@ -33,7 +33,7 @@ import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import appeng.api.implementations.IPowerChannelState;
import appeng.api.implementations.parts.IPartMonitor;
import appeng.api.implementations.parts.IMonitorPart;
import appeng.api.networking.GridFlags;
import appeng.api.networking.events.MENetworkBootingStatusChange;
import appeng.api.networking.events.MENetworkEventSubscribe;
@@ -61,7 +61,7 @@ import appeng.util.Platform;
* @version rv3
* @since rv3
*/
public abstract class AbstractPartReporting extends AEBasePart implements IPartMonitor, IPowerChannelState {
public abstract class AbstractReportingPart extends AEBasePart implements IMonitorPart, IPowerChannelState {
protected static final int POWERED_FLAG = 4;
protected static final int CHANNEL_FLAG = 16;
@@ -71,11 +71,11 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM
private int clientFlags = 0; // sent as byte.
private int opacity = -1;
public AbstractPartReporting(final ItemStack is) {
public AbstractReportingPart(final ItemStack is) {
this(is, false);
}
protected AbstractPartReporting(final ItemStack is, final boolean requireChannel) {
protected AbstractReportingPart(final ItemStack is, final boolean requireChannel) {
super(is);
if (requireChannel) {
@@ -131,15 +131,15 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM
try {
if (this.getProxy().getEnergy().isNetworkPowered()) {
this.clientFlags = this.getClientFlags() | AbstractPartReporting.POWERED_FLAG;
this.clientFlags = this.getClientFlags() | AbstractReportingPart.POWERED_FLAG;
}
if (this.getProxy().getPath().isNetworkBooting()) {
this.clientFlags = this.getClientFlags() | AbstractPartReporting.BOOTING_FLAG;
this.clientFlags = this.getClientFlags() | AbstractReportingPart.BOOTING_FLAG;
}
if (this.getProxy().getNode().meetsChannelRequirements()) {
this.clientFlags = this.getClientFlags() | AbstractPartReporting.CHANNEL_FLAG;
this.clientFlags = this.getClientFlags() | AbstractReportingPart.CHANNEL_FLAG;
}
} catch (final GridAccessException e) {
// um.. nothing.
@@ -234,7 +234,7 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM
if (Platform.isServer()) {
return this.getProxy().getEnergy().isNetworkPowered();
} else {
return ((this.getClientFlags() & PartPanel.POWERED_FLAG) == PartPanel.POWERED_FLAG);
return ((this.getClientFlags() & PanelPart.POWERED_FLAG) == PanelPart.POWERED_FLAG);
}
} catch (final GridAccessException e) {
return false;
@@ -245,8 +245,8 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM
public final boolean isActive() {
if (!this.isLightSource()) {
return ((this.getClientFlags()
& (PartPanel.CHANNEL_FLAG | PartPanel.POWERED_FLAG)) == (PartPanel.CHANNEL_FLAG
| PartPanel.POWERED_FLAG));
& (PanelPart.CHANNEL_FLAG | PanelPart.POWERED_FLAG)) == (PanelPart.CHANNEL_FLAG
| PanelPart.POWERED_FLAG));
} else {
return this.isPowered();
}
src/main/java/appeng/parts/reporting/AbstractPartTerminal.java → src/main/java/appeng/parts/reporting/AbstractTerminalPart.java
+4 -4
View File
@@ -40,7 +40,7 @@ import appeng.api.storage.data.IAEStack;
import appeng.api.util.IConfigManager;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerMEMonitorable;
import appeng.container.implementations.MEMonitorableContainer;
import appeng.me.GridAccessException;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.ConfigManager;
@@ -59,13 +59,13 @@ import appeng.util.inv.InvOperation;
* @version rv3
* @since rv3
*/
public abstract class AbstractPartTerminal extends AbstractPartDisplay
public abstract class AbstractTerminalPart extends AbstractDisplayPart
implements ITerminalHost, IConfigManagerHost, IViewCellStorage, IAEAppEngInventory {
private final IConfigManager cm = new ConfigManager(this);
private final AppEngInternalInventory viewCell = new AppEngInternalInventory(this, 5);
public AbstractPartTerminal(final ItemStack is) {
public AbstractTerminalPart(final ItemStack is) {
super(is);
this.cm.registerSetting(Settings.SORT_BY, SortOrder.NAME);
@@ -114,7 +114,7 @@ public abstract class AbstractPartTerminal extends AbstractPartDisplay
}
public ContainerType<?> getContainerType(final PlayerEntity player) {
return ContainerMEMonitorable.TYPE;
return MEMonitorableContainer.TYPE;
}
@Override
src/main/java/appeng/parts/reporting/PartConversionMonitor.java → src/main/java/appeng/parts/reporting/ConversionMonitorPart.java
+2 -2
View File
@@ -46,7 +46,7 @@ import appeng.util.InventoryAdaptor;
import appeng.util.Platform;
import appeng.util.item.AEItemStack;
public class PartConversionMonitor extends AbstractPartMonitor {
public class ConversionMonitorPart extends AbstractMonitorPart {
@PartModels
public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/conversion_monitor_off");
@@ -68,7 +68,7 @@ public class PartConversionMonitor extends AbstractPartMonitor {
MODEL_STATUS_HAS_CHANNEL);
@Reflected
public PartConversionMonitor(final ItemStack is) {
public ConversionMonitorPart(final ItemStack is) {
super(is);
}
src/main/java/appeng/parts/reporting/PartCraftingTerminal.java → src/main/java/appeng/parts/reporting/CraftingTerminalPart.java
+6 -6
View File
@@ -29,8 +29,8 @@ import net.minecraftforge.items.IItemHandler;
import appeng.api.config.SecurityPermissions;
import appeng.api.parts.IPartModel;
import appeng.container.implementations.ContainerCraftingTerm;
import appeng.container.implementations.ContainerMEMonitorable;
import appeng.container.implementations.CraftingTermContainer;
import appeng.container.implementations.MEMonitorableContainer;
import appeng.core.AppEng;
import appeng.helpers.Reflected;
import appeng.items.parts.PartModels;
@@ -38,7 +38,7 @@ import appeng.parts.PartModel;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.Platform;
public class PartCraftingTerminal extends AbstractPartTerminal {
public class CraftingTerminalPart extends AbstractTerminalPart {
@PartModels
public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/crafting_terminal_off");
@@ -52,7 +52,7 @@ public class PartCraftingTerminal extends AbstractPartTerminal {
private final AppEngInternalInventory craftingGrid = new AppEngInternalInventory(this, 9);
@Reflected
public PartCraftingTerminal(final ItemStack is) {
public CraftingTerminalPart(final ItemStack is) {
super(is);
}
@@ -82,9 +82,9 @@ public class PartCraftingTerminal extends AbstractPartTerminal {
@Override
public ContainerType<?> getContainerType(final PlayerEntity p) {
if (Platform.checkPermissions(p, this, SecurityPermissions.CRAFT, false)) {
return ContainerCraftingTerm.TYPE;
return CraftingTermContainer.TYPE;
}
return ContainerMEMonitorable.TYPE;
return MEMonitorableContainer.TYPE;
}
@Override
src/main/java/appeng/parts/reporting/PartDarkPanel.java → src/main/java/appeng/parts/reporting/DarkPanelPart.java
+2 -2
View File
@@ -27,7 +27,7 @@ import appeng.helpers.Reflected;
import appeng.items.parts.PartModels;
import appeng.parts.PartModel;
public class PartDarkPanel extends AbstractPartPanel {
public class DarkPanelPart extends AbstractPanelPart {
@PartModels
public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/monitor_dark_off");
@@ -38,7 +38,7 @@ public class PartDarkPanel extends AbstractPartPanel {
public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON);
@Reflected
public PartDarkPanel(final ItemStack is) {
public DarkPanelPart(final ItemStack is) {
super(is);
}
src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java → src/main/java/appeng/parts/reporting/InterfaceTerminalPart.java
+4 -4
View File
@@ -27,13 +27,13 @@ import net.minecraft.util.math.Vec3d;
import appeng.api.parts.IPartModel;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.container.implementations.ContainerInterfaceTerminal;
import appeng.container.implementations.InterfaceTerminalContainer;
import appeng.core.AppEng;
import appeng.items.parts.PartModels;
import appeng.parts.PartModel;
import appeng.util.Platform;
public class PartInterfaceTerminal extends AbstractPartDisplay {
public class InterfaceTerminalPart extends AbstractDisplayPart {
@PartModels
public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/interface_terminal_off");
@@ -44,7 +44,7 @@ public class PartInterfaceTerminal extends AbstractPartDisplay {
public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_ON);
public static final IPartModel MODELS_HAS_CHANNEL = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_HAS_CHANNEL);
public PartInterfaceTerminal(final ItemStack is) {
public InterfaceTerminalPart(final ItemStack is) {
super(is);
}
@@ -52,7 +52,7 @@ public class PartInterfaceTerminal extends AbstractPartDisplay {
public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) {
if (!super.onPartActivate(player, hand, pos)) {
if (Platform.isServer()) {
ContainerOpener.openContainer(ContainerInterfaceTerminal.TYPE, player, ContainerLocator.forPart(this));
ContainerOpener.openContainer(InterfaceTerminalContainer.TYPE, player, ContainerLocator.forPart(this));
}
}
return true;
src/main/java/appeng/parts/reporting/PartPanel.java → src/main/java/appeng/parts/reporting/PanelPart.java
+2 -2
View File
@@ -27,7 +27,7 @@ import appeng.helpers.Reflected;
import appeng.items.parts.PartModels;
import appeng.parts.PartModel;
public class PartPanel extends AbstractPartPanel {
public class PanelPart extends AbstractPanelPart {
@PartModels
public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/monitor_bright_off");
@@ -38,7 +38,7 @@ public class PartPanel extends AbstractPartPanel {
public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON);
@Reflected
public PartPanel(final ItemStack is) {
public PanelPart(final ItemStack is) {
super(is);
}
src/main/java/appeng/parts/reporting/PartPatternTerminal.java → src/main/java/appeng/parts/reporting/PatternTerminalPart.java
+6 -6
View File
@@ -32,8 +32,8 @@ import appeng.api.implementations.ICraftingPatternItem;
import appeng.api.networking.crafting.ICraftingPatternDetails;
import appeng.api.parts.IPartModel;
import appeng.api.storage.data.IAEItemStack;
import appeng.container.implementations.ContainerMEMonitorable;
import appeng.container.implementations.ContainerPatternTerm;
import appeng.container.implementations.MEMonitorableContainer;
import appeng.container.implementations.PatternTermContainer;
import appeng.core.AppEng;
import appeng.helpers.Reflected;
import appeng.items.parts.PartModels;
@@ -42,7 +42,7 @@ import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.Platform;
import appeng.util.inv.InvOperation;
public class PartPatternTerminal extends AbstractPartTerminal {
public class PatternTerminalPart extends AbstractTerminalPart {
@PartModels
public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/pattern_terminal_off");
@@ -61,7 +61,7 @@ public class PartPatternTerminal extends AbstractPartTerminal {
private boolean substitute = false;
@Reflected
public PartPatternTerminal(final ItemStack is) {
public PatternTerminalPart(final ItemStack is) {
super(is);
}
@@ -97,9 +97,9 @@ public class PartPatternTerminal extends AbstractPartTerminal {
@Override
public ContainerType<?> getContainerType(final PlayerEntity p) {
if (Platform.checkPermissions(p, this, SecurityPermissions.CRAFT, false)) {
return ContainerPatternTerm.TYPE;
return PatternTermContainer.TYPE;
}
return ContainerMEMonitorable.TYPE;
return MEMonitorableContainer.TYPE;
}
@Override
src/main/java/appeng/parts/reporting/PartSemiDarkPanel.java → src/main/java/appeng/parts/reporting/SemiDarkPanelPart.java
+2 -2
View File
@@ -27,7 +27,7 @@ import appeng.helpers.Reflected;
import appeng.items.parts.PartModels;
import appeng.parts.PartModel;
public class PartSemiDarkPanel extends AbstractPartPanel {
public class SemiDarkPanelPart extends AbstractPanelPart {
@PartModels
public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/monitor_medium_off");
@PartModels
@@ -37,7 +37,7 @@ public class PartSemiDarkPanel extends AbstractPartPanel {
public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON);
@Reflected
public PartSemiDarkPanel(final ItemStack is) {
public SemiDarkPanelPart(final ItemStack is) {
super(is);
}
src/main/java/appeng/parts/reporting/PartStorageMonitor.java → src/main/java/appeng/parts/reporting/StorageMonitorPart.java
+2 -2
View File
@@ -33,7 +33,7 @@ import appeng.parts.PartModel;
* @version rv2
* @since rv0
*/
public class PartStorageMonitor extends AbstractPartMonitor {
public class StorageMonitorPart extends AbstractMonitorPart {
@PartModels
public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/storage_monitor_off");
@@ -56,7 +56,7 @@ public class PartStorageMonitor extends AbstractPartMonitor {
MODEL_STATUS_HAS_CHANNEL);
@Reflected
public PartStorageMonitor(final ItemStack is) {
public StorageMonitorPart(final ItemStack is) {
super(is);
}
src/main/java/appeng/parts/reporting/PartTerminal.java → src/main/java/appeng/parts/reporting/TerminalPart.java
+2 -2
View File
@@ -26,7 +26,7 @@ import appeng.core.AppEng;
import appeng.items.parts.PartModels;
import appeng.parts.PartModel;
public class PartTerminal extends AbstractPartTerminal {
public class TerminalPart extends AbstractTerminalPart {
@PartModels
public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/terminal_off");
@@ -37,7 +37,7 @@ public class PartTerminal extends AbstractPartTerminal {
public static final IPartModel MODELS_ON = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_ON);
public static final IPartModel MODELS_HAS_CHANNEL = new PartModel(MODEL_BASE, MODEL_ON, MODEL_STATUS_HAS_CHANNEL);
public PartTerminal(final ItemStack is) {
public TerminalPart(final ItemStack is) {
super(is);
}