Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.20.4' into 1.20.4

Browse source
This commit is contained in:
Flanks255 2024-03-13 16:56:41 -05:00
commit da7de46cdc
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build.gradle
View file

@ -37,6 +37,14 @@ runs {
// Comma-separated list of namespaces to load gametests from. Empty = all namespaces. // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
systemProperty 'neoforge.enabledGameTestNamespaces', "actuallyadditions" systemProperty 'neoforge.enabledGameTestNamespaces', "actuallyadditions"
} }
client2 {
configure ("client")
programArguments.addAll '--username', 'Dev2'
// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
systemProperty 'neoforge.enabledGameTestNamespaces', "actuallyadditions"
}
server { server {
systemProperty 'neoforge.enabledGameTestNamespaces', "actuallyadditions" systemProperty 'neoforge.enabledGameTestNamespaces', "actuallyadditions"

13
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPlayerProbe.java
View file

@ -44,18 +44,18 @@ public class ItemPlayerProbe extends ItemBase {
public void inventoryTick(ItemStack stack, Level world, Entity entity, int itemSlot, boolean isSelected) { public void inventoryTick(ItemStack stack, Level world, Entity entity, int itemSlot, boolean isSelected) {
if (!world.isClientSide) { if (!world.isClientSide) {
CompoundTag compound = stack.getOrCreateTag(); CompoundTag compound = stack.getOrCreateTag();
if (compound.contains("UUIDMost")) { if (compound.contains("UUID")) {
UUID id = compound.getUUID("UUID"); UUID id = compound.getUUID("UUID");
Player player = world.getPlayerByUUID(id); Player player = world.getPlayerByUUID(id);
if (player != null) { if (player != null) {
if (player.isShiftKeyDown()) { if (player.isShiftKeyDown()) {
ItemPhantomConnector.clearStorage(stack, "UUIDLeast", "UUIDMost", "Name"); ItemPhantomConnector.clearStorage(stack, "UUID", "Name");
((Player) entity).displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".playerProbe.disconnect.1"), false); ((Player) entity).displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".playerProbe.disconnect.1"), false);
player.displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".playerProbe.notice"), false); player.displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".playerProbe.notice"), false);
//TheAchievements.GET_UNPROBED.get(player); //TheAchievements.GET_UNPROBED.get(player);
} }
} else { } else {
ItemPhantomConnector.clearStorage(stack, "UUIDLeast", "UUIDMost", "Name"); ItemPhantomConnector.clearStorage(stack, "UUID", "Name");
((Player) entity).displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".playerProbe.disconnect.2"), false); ((Player) entity).displayClientMessage(Component.translatable("tooltip." + ActuallyAdditions.MODID + ".playerProbe.disconnect.2"), false);
} }
} }
@ -71,17 +71,16 @@ public class ItemPlayerProbe extends ItemBase {
ItemStack stack = player.getItemInHand(context.getHand()); ItemStack stack = player.getItemInHand(context.getHand());
BlockEntity tile = context.getLevel().getBlockEntity(context.getClickedPos()); BlockEntity tile = context.getLevel().getBlockEntity(context.getClickedPos());
if (tile instanceof TileEntityPlayerInterface) { if (tile instanceof TileEntityPlayerInterface face) {
CompoundTag compound = stack.getOrCreateTag(); CompoundTag compound = stack.getOrCreateTag();
if (compound.contains("UUIDMost")) { if (compound.contains("UUID")) {
if (!context.getLevel().isClientSide) { if (!context.getLevel().isClientSide) {
TileEntityPlayerInterface face = (TileEntityPlayerInterface) tile;
face.connectedPlayer = compound.getUUID("UUID"); face.connectedPlayer = compound.getUUID("UUID");
face.playerName = compound.getString("Name"); face.playerName = compound.getString("Name");
face.setChanged(); face.setChanged();
face.sendUpdate(); face.sendUpdate();
ItemPhantomConnector.clearStorage(stack, "UUIDLeast", "UUIDMost", "Name"); ItemPhantomConnector.clearStorage(stack, "UUID", "Name");
} }
return InteractionResult.SUCCESS; return InteractionResult.SUCCESS;
} }

2
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlayerInterface.java
View file

@ -131,7 +131,7 @@ public class TileEntityPlayerInterface extends TileEntityBase implements IEnergy
super.readSyncableNBT(compound, type); super.readSyncableNBT(compound, type);
this.storage.readFromNBT(compound); this.storage.readFromNBT(compound);
if (compound.contains("PlayerLeast") && type != NBTType.SAVE_BLOCK) { if (compound.contains("Player") && type != NBTType.SAVE_BLOCK) {
this.connectedPlayer = compound.getUUID("Player"); this.connectedPlayer = compound.getUUID("Player");
this.playerName = compound.getString("PlayerName"); this.playerName = compound.getString("PlayerName");
} }