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/fluids/parts/PartFluidAnnihilationPlane.java → src/main/java/appeng/fluids/parts/FluidAnnihilationPlanePart.java
+6 -6
View File
@@ -47,18 +47,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.BlockTransitionEffectPacket;
import appeng.fluids.util.AEFluidStack;
import appeng.items.parts.PartModels;
import appeng.me.GridAccessException;
import appeng.me.helpers.MachineSource;
import appeng.parts.PartBasicState;
import appeng.parts.BasicStatePart;
import appeng.parts.automation.PlaneConnections;
import appeng.parts.automation.PlaneModelData;
import appeng.parts.automation.PlaneModels;
import appeng.util.Platform;
public class PartFluidAnnihilationPlane extends PartBasicState implements IGridTickable {
public class FluidAnnihilationPlanePart extends BasicStatePart implements IGridTickable {
public static final ResourceLocation TAG_BLACKLIST = new ResourceLocation(AppEng.MOD_ID,
"blacklisted/fluid_annihilation_plane");
@@ -73,7 +73,7 @@ public class PartFluidAnnihilationPlane extends PartBasicState implements IGridT
private final IActionSource mySrc = new MachineSource(this);
public PartFluidAnnihilationPlane(final ItemStack is) {
public FluidAnnihilationPlanePart(final ItemStack is) {
super(is);
}
@@ -252,8 +252,8 @@ public class PartFluidAnnihilationPlane extends PartBasicState implements IGridT
true);
AppEng.proxy.sendToAllNearExcept(null, pos.getX(), pos.getY(), pos.getZ(), 64, w,
new PacketBlockTransitionEffect(pos, blockstate, this.getSide().getOpposite(),
PacketBlockTransitionEffect.SoundMode.FLUID));
new BlockTransitionEffectPacket(pos, blockstate, this.getSide().getOpposite(),
BlockTransitionEffectPacket.SoundMode.FLUID));
return TickRateModulation.URGENT;
}
src/main/java/appeng/fluids/parts/PartFluidExportBus.java → src/main/java/appeng/fluids/parts/FluidExportBusPart.java
+2 -2
View File
@@ -54,7 +54,7 @@ import appeng.parts.PartModel;
* @version rv6 - 30/04/2018
* @since rv6 30/04/2018
*/
public class PartFluidExportBus extends PartSharedFluidBus {
public class FluidExportBusPart extends SharedFluidBusPart {
public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/fluid_export_bus_base");
@PartModels
public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE,
@@ -68,7 +68,7 @@ public class PartFluidExportBus extends PartSharedFluidBus {
private final IActionSource source;
public PartFluidExportBus(ItemStack is) {
public FluidExportBusPart(ItemStack is) {
super(is);
this.getConfigManager().registerSetting(Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE);
this.getConfigManager().registerSetting(Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL);
src/main/java/appeng/fluids/parts/PartFluidFormationPlane.java → src/main/java/appeng/fluids/parts/FluidFormationPlanePart.java
+6 -7
View File
@@ -8,7 +8,6 @@ import java.util.List;
import javax.annotation.Nonnull;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.item.ItemStack;
@@ -47,20 +46,20 @@ import appeng.api.storage.data.IItemList;
import appeng.api.util.AEPartLocation;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.fluids.container.ContainerFluidFormationPlane;
import appeng.fluids.container.FluidFormationPlaneContainer;
import appeng.fluids.util.AEFluidInventory;
import appeng.fluids.util.IAEFluidInventory;
import appeng.fluids.util.IAEFluidTank;
import appeng.items.parts.PartModels;
import appeng.me.GridAccessException;
import appeng.me.storage.MEInventoryHandler;
import appeng.parts.automation.PartAbstractFormationPlane;
import appeng.parts.automation.AbstractFormationPlanePart;
import appeng.parts.automation.PlaneModelData;
import appeng.parts.automation.PlaneModels;
import appeng.util.Platform;
import appeng.util.prioritylist.PrecisePriorityList;
public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluidStack> implements IAEFluidInventory {
public class FluidFormationPlanePart extends AbstractFormationPlanePart<IAEFluidStack> implements IAEFluidInventory {
private static final PlaneModels MODELS = new PlaneModels("part/fluid_formation_plane",
"part/fluid_formation_plane_on");
@@ -73,7 +72,7 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluid
AEApi.instance().storage().getStorageChannel(IFluidStorageChannel.class));
private final AEFluidInventory config = new AEFluidInventory(this, 63);
public PartFluidFormationPlane(final ItemStack is) {
public FluidFormationPlanePart(final ItemStack is) {
super(is);
this.updateHandler();
}
@@ -176,7 +175,7 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluid
@Override
public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) {
if (Platform.isServer()) {
ContainerOpener.openContainer(ContainerFluidFormationPlane.TYPE, player, ContainerLocator.forPart(this));
ContainerOpener.openContainer(FluidFormationPlaneContainer.TYPE, player, ContainerLocator.forPart(this));
}
return true;
@@ -220,6 +219,6 @@ public class PartFluidFormationPlane extends PartAbstractFormationPlane<IAEFluid
@Override
public ContainerType<?> getContainerType() {
return ContainerFluidFormationPlane.TYPE;
return FluidFormationPlaneContainer.TYPE;
}
}
src/main/java/appeng/fluids/parts/PartFluidImportBus.java → src/main/java/appeng/fluids/parts/FluidImportBusPart.java
+2 -2
View File
@@ -55,7 +55,7 @@ import appeng.parts.PartModel;
* @version rv6 - 30/04/2018
* @since rv6 30/04/2018
*/
public class PartFluidImportBus extends PartSharedFluidBus {
public class FluidImportBusPart extends SharedFluidBusPart {
public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/fluid_import_bus_base");
@PartModels
public static final IPartModel MODELS_OFF = new PartModel(MODEL_BASE,
@@ -69,7 +69,7 @@ public class PartFluidImportBus extends PartSharedFluidBus {
private final IActionSource source;
public PartFluidImportBus(ItemStack is) {
public FluidImportBusPart(ItemStack is) {
super(is);
this.getConfigManager().registerSetting(Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE);
this.getConfigManager().registerSetting(Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL);
src/main/java/appeng/fluids/parts/PartFluidInterface.java → src/main/java/appeng/fluids/parts/FluidInterfacePart.java
+6 -6
View File
@@ -53,17 +53,17 @@ import appeng.api.util.IConfigManager;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.core.AppEng;
import appeng.fluids.container.ContainerFluidInterface;
import appeng.fluids.container.FluidInterfaceContainer;
import appeng.fluids.helper.DualityFluidInterface;
import appeng.fluids.helper.IFluidInterfaceHost;
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;
public class PartFluidInterface extends PartBasicState
public class FluidInterfacePart extends BasicStatePart
implements IGridTickable, IStorageMonitorable, IFluidInterfaceHost, IPriorityHost {
public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID, "part/fluid_interface_base");
@@ -82,7 +82,7 @@ public class PartFluidInterface extends PartBasicState
private final DualityFluidInterface duality = new DualityFluidInterface(this.getProxy(), this);
@Reflected
public PartFluidInterface(final ItemStack is) {
public FluidInterfacePart(final ItemStack is) {
super(is);
}
@@ -132,7 +132,7 @@ public class PartFluidInterface extends PartBasicState
@Override
public boolean onPartActivate(final PlayerEntity p, final Hand hand, final Vec3d pos) {
if (Platform.isServer()) {
ContainerOpener.openContainer(ContainerFluidInterface.TYPE, p, ContainerLocator.forPart(this));
ContainerOpener.openContainer(FluidInterfaceContainer.TYPE, p, ContainerLocator.forPart(this));
}
return true;
@@ -211,6 +211,6 @@ public class PartFluidInterface extends PartBasicState
@Override
public ContainerType<?> getContainerType() {
return ContainerFluidInterface.TYPE;
return FluidInterfaceContainer.TYPE;
}
}
src/main/java/appeng/fluids/parts/PartFluidLevelEmitter.java → src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java
+5 -5
View File
@@ -39,18 +39,18 @@ import appeng.api.util.IConfigManager;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.core.AppEng;
import appeng.fluids.container.ContainerFluidLevelEmitter;
import appeng.fluids.container.FluidLevelEmitterContainer;
import appeng.fluids.util.AEFluidInventory;
import appeng.fluids.util.IAEFluidInventory;
import appeng.fluids.util.IAEFluidTank;
import appeng.items.parts.PartModels;
import appeng.me.GridAccessException;
import appeng.parts.PartModel;
import appeng.parts.automation.PartUpgradeable;
import appeng.parts.automation.UpgradeablePart;
import appeng.util.IConfigManagerHost;
import appeng.util.Platform;
public class PartFluidLevelEmitter extends PartUpgradeable
public class FluidLevelEmitterPart extends UpgradeablePart
implements IStackWatcherHost, IConfigManagerHost, IAEFluidInventory, IMEMonitorHandlerReceiver<IAEFluidStack> {
@PartModels
public static final ResourceLocation MODEL_BASE_OFF = new ResourceLocation(AppEng.MOD_ID,
@@ -83,7 +83,7 @@ public class PartFluidLevelEmitter extends PartUpgradeable
private IStackWatcher stackWatcher = null;
private final AEFluidInventory config = new AEFluidInventory(this, 1);
public PartFluidLevelEmitter(ItemStack is) {
public FluidLevelEmitterPart(ItemStack is) {
super(is);
this.getConfigManager().registerSetting(Settings.REDSTONE_EMITTER, RedstoneMode.HIGH_SIGNAL);
@@ -283,7 +283,7 @@ public class PartFluidLevelEmitter extends PartUpgradeable
@Override
public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) {
if (Platform.isServer()) {
ContainerOpener.openContainer(ContainerFluidLevelEmitter.TYPE, player, ContainerLocator.forPart(this));
ContainerOpener.openContainer(FluidLevelEmitterContainer.TYPE, player, ContainerLocator.forPart(this));
}
return true;
}
src/main/java/appeng/fluids/parts/PartFluidStorageBus.java → src/main/java/appeng/fluids/parts/FluidStorageBusPart.java
+6 -6
View File
@@ -68,7 +68,7 @@ import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.core.AppEng;
import appeng.core.settings.TickRates;
import appeng.fluids.container.ContainerFluidStorageBus;
import appeng.fluids.container.FluidStorageBusContainer;
import appeng.fluids.util.AEFluidInventory;
import appeng.fluids.util.IAEFluidInventory;
import appeng.fluids.util.IAEFluidTank;
@@ -79,7 +79,7 @@ import appeng.me.helpers.MachineSource;
import appeng.me.storage.ITickingMonitor;
import appeng.me.storage.MEInventoryHandler;
import appeng.parts.PartModel;
import appeng.parts.misc.PartSharedStorageBus;
import appeng.parts.misc.SharedStorageBusPart;
import appeng.util.Platform;
import appeng.util.prioritylist.FuzzyPriorityList;
import appeng.util.prioritylist.PrecisePriorityList;
@@ -89,7 +89,7 @@ import appeng.util.prioritylist.PrecisePriorityList;
* @version rv6 - 22/05/2018
* @since rv6 22/05/2018
*/
public class PartFluidStorageBus extends PartSharedStorageBus
public class FluidStorageBusPart extends SharedStorageBusPart
implements IMEMonitorHandlerReceiver<IAEFluidStack>, IAEFluidInventory {
public static final ResourceLocation MODEL_BASE = new ResourceLocation(AppEng.MOD_ID,
"part/fluid_storage_bus_base");
@@ -111,7 +111,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus
private int handlerHash = 0;
private byte resetCacheLogic = 0;
public PartFluidStorageBus(ItemStack is) {
public FluidStorageBusPart(ItemStack is) {
super(is);
this.getConfigManager().registerSetting(Settings.ACCESS, AccessRestriction.READ_WRITE);
this.getConfigManager().registerSetting(Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL);
@@ -215,7 +215,7 @@ public class PartFluidStorageBus extends PartSharedStorageBus
@Override
public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) {
if (Platform.isServer()) {
ContainerOpener.openContainer(ContainerFluidStorageBus.TYPE, player, ContainerLocator.forPart(this));
ContainerOpener.openContainer(FluidStorageBusContainer.TYPE, player, ContainerLocator.forPart(this));
}
return true;
}
@@ -439,6 +439,6 @@ public class PartFluidStorageBus extends PartSharedStorageBus
@Override
public ContainerType<?> getContainerType() {
return ContainerFluidStorageBus.TYPE;
return FluidStorageBusContainer.TYPE;
}
}
src/main/java/appeng/fluids/parts/PartFluidTerminal.java → src/main/java/appeng/fluids/parts/FluidTerminalPart.java
+5 -5
View File
@@ -25,17 +25,17 @@ import net.minecraft.util.ResourceLocation;
import appeng.api.parts.IPartModel;
import appeng.core.AppEng;
import appeng.fluids.container.ContainerFluidTerminal;
import appeng.fluids.container.FluidTerminalContainer;
import appeng.items.parts.PartModels;
import appeng.parts.PartModel;
import appeng.parts.reporting.AbstractPartTerminal;
import appeng.parts.reporting.AbstractTerminalPart;
/**
* @author BrockWS
* @version rv6 - 12/05/2018
* @since rv6 12/05/2018
*/
public class PartFluidTerminal extends AbstractPartTerminal {
public class FluidTerminalPart extends AbstractTerminalPart {
@PartModels
public static final ResourceLocation MODEL_OFF = new ResourceLocation(AppEng.MOD_ID, "part/fluid_terminal_off");
@@ -46,13 +46,13 @@ public class PartFluidTerminal 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 PartFluidTerminal(ItemStack is) {
public FluidTerminalPart(ItemStack is) {
super(is);
}
@Override
public ContainerType<?> getContainerType(PlayerEntity player) {
return ContainerFluidTerminal.TYPE;
return FluidTerminalContainer.TYPE;
}
@Override
src/main/java/appeng/fluids/parts/PartSharedFluidBus.java → src/main/java/appeng/fluids/parts/SharedFluidBusPart.java
+5 -5
View File
@@ -40,11 +40,11 @@ import appeng.api.storage.channels.IFluidStorageChannel;
import appeng.api.util.AECableType;
import appeng.container.ContainerLocator;
import appeng.container.ContainerOpener;
import appeng.fluids.container.ContainerFluidIO;
import appeng.fluids.container.FluidIOContainer;
import appeng.fluids.util.AEFluidInventory;
import appeng.fluids.util.IAEFluidTank;
import appeng.me.GridAccessException;
import appeng.parts.automation.PartUpgradeable;
import appeng.parts.automation.UpgradeablePart;
import appeng.util.Platform;
/**
@@ -52,12 +52,12 @@ import appeng.util.Platform;
* @version rv6 - 30/04/2018
* @since rv6 30/04/2018
*/
public abstract class PartSharedFluidBus extends PartUpgradeable implements IGridTickable {
public abstract class SharedFluidBusPart extends UpgradeablePart implements IGridTickable {
private final AEFluidInventory config = new AEFluidInventory(null, 9);
private boolean lastRedstone;
public PartSharedFluidBus(ItemStack is) {
public SharedFluidBusPart(ItemStack is) {
super(is);
}
@@ -92,7 +92,7 @@ public abstract class PartSharedFluidBus extends PartUpgradeable implements IGri
@Override
public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) {
if (Platform.isServer()) {
ContainerOpener.openContainer(ContainerFluidIO.TYPE, player, ContainerLocator.forPart(this));
ContainerOpener.openContainer(FluidIOContainer.TYPE, player, ContainerLocator.forPart(this));
}
return true;