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

Post merge fixes.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-07-27 19:12:16 +02:00
parent 0fdc46b358
commit 49296915c9
9 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/automation/LevelEmitterPart.java
+2 -2
View File
@@ -31,7 +31,7 @@ import net.minecraft.block.entity.BlockEntity;
import net.minecraft.util.Hand;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import appeng.api.config.FuzzyMode;
@@ -402,7 +402,7 @@ public class LevelEmitterPart extends UpgradeablePart implements IEnergyWatcherH
}
@Override
public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vector3d pos) {
public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) {
if (Platform.isServer()) {
ContainerOpener.openContainer(LevelEmitterContainer.TYPE, player, ContainerLocator.forPart(this));
}
src/main/java/appeng/parts/reporting/AbstractReportingPart.java
+2 -2
View File
@@ -28,7 +28,7 @@ import net.minecraft.block.entity.BlockEntity;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
@@ -171,7 +171,7 @@ public abstract class AbstractReportingPart extends AEBasePart implements IMonit
}
@Override
public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vector3d pos) {
public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) {
final BlockEntity te = this.getTile();
if (Platform.isWrench(player, player.inventory.getMainHandStack(), te.getPos())) {
src/main/java/appeng/parts/reporting/AbstractTerminalPart.java
+2 -2
View File
@@ -26,7 +26,6 @@ import net.minecraft.screen.ScreenHandlerType;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.Hand;
import net.minecraft.util.math.vector.Vector3d;
import appeng.api.config.Settings;
import appeng.api.config.SortDir;
@@ -47,6 +46,7 @@ import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost;
import appeng.util.inv.IAEAppEngInventory;
import appeng.util.inv.InvOperation;
import net.minecraft.util.math.Vec3d;
/**
* Anything resembling an network terminal with view cells can reuse this.
@@ -104,7 +104,7 @@ public abstract class AbstractTerminalPart extends AbstractDisplayPart
}
@Override
public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vector3d pos) {
public boolean onPartActivate(final PlayerEntity player, final Hand hand, final Vec3d pos) {
if (!super.onPartActivate(player, hand, pos)) {
if (!player.world.isClient) {
ContainerOpener.openContainer(getContainerType(player), player, ContainerLocator.forPart(this));