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