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/client/gui/implementations/CraftingStatusScreen.java
+1 -8
View File
@@ -16,19 +16,12 @@
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
*/
/**
*
*/
package appeng.client.gui.implementations;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.text.Text;
import net.minecraft.util.text.StringTextComponent;
import appeng.container.implementations.CraftingStatusContainer;
import appeng.core.localization.GuiText;
@@ -84,7 +77,7 @@ public class CraftingStatusScreen extends CraftingCPUScreen<CraftingStatusContai
btnTextText = GuiText.NoCraftingJobs.text();
}
this.selectCPU.setMessage(new StringTextComponent(btnTextText));
this.selectCPU.setMessage(btnTextText);
}
@Override
src/main/java/appeng/fluids/parts/FluidLevelEmitterPart.java
+2 -2
View File
@@ -11,7 +11,7 @@ import net.minecraft.particle.DustParticleEffect;
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.RedstoneMode;
@@ -281,7 +281,7 @@ public class FluidLevelEmitterPart extends UpgradeablePart
}
@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(FluidLevelEmitterContainer.TYPE, player, ContainerLocator.forPart(this));
}
src/main/java/appeng/items/misc/EncodedPatternItem.java
+1 -1
View File
@@ -219,7 +219,7 @@ public class EncodedPatternItem extends AEBaseItem implements AEToolItem {
final CompoundTag tag = itemStack.getTag();
Preconditions.checkArgument(tag != null, "itemStack missing a NBT tag");
return tag.contains(NBT_RECIPE_ID, Constants.NBT.TAG_STRING)
return tag.contains(NBT_RECIPE_ID, NbtType.STRING)
? new Identifier(tag.getString(NBT_RECIPE_ID))
: null;
}
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));
src/main/java/appeng/tile/storage/DriveBlockEntity.java
+1 -2
View File
@@ -61,7 +61,6 @@ import appeng.api.util.DimensionalCoord;
import appeng.block.storage.DriveSlotsState;
import appeng.container.implementations.DriveContainer;
import appeng.core.Api;
import appeng.core.sync.BasePacket;
import appeng.helpers.IPriorityHost;
import appeng.me.GridAccessException;
import appeng.me.helpers.MachineSource;
@@ -184,7 +183,7 @@ public class DriveBlockEntity extends AENetworkInvBlockEntity implements IChestO
int uniqueIdCount = data.readByte();
int[] uniqueIds = new int[uniqueIdCount];
for (int i = 0; i < uniqueIdCount; i++) {
uniqueIds[i] = data.readVarInt(BasePacket.MAX_STRING_LENGTH);
uniqueIds[i] = data.readVarInt();
}
boolean changed = false;
src/main/java/appeng/util/LookDirection.java
+6 -6
View File
@@ -18,23 +18,23 @@
package appeng.util;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.util.math.Vec3d;
public class LookDirection {
private final Vector3d a;
private final Vector3d b;
private final Vec3d a;
private final Vec3d b;
public LookDirection(final Vector3d a, final Vector3d b) {
public LookDirection(final Vec3d a, final Vec3d b) {
this.a = a;
this.b = b;
}
public Vector3d getA() {
public Vec3d getA() {
return this.a;
}
public Vector3d getB() {
public Vec3d getB() {
return this.b;
}
}