GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2026-01-04 15:31:36 +00:00
Code Issues Releases Activity

Use non-Jitpack MCPL

Browse Source
This commit is contained in:
Camotoy
2024-11-03 01:04:56 -05:00
parent 3298cdbc3c
commit 5b5ac3024f
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/geysermc/geyser/inventory/GeyserItemStack.java
View File

@@ -184,7 +184,7 @@ public class GeyserItemStack {
public SlotDisplay asSlotDisplay() {
if (isEmpty()) {
return new EmptySlotDisplay();
return EmptySlotDisplay.INSTANCE;
}
return new ItemStackSlotDisplay(this.getItemStack());
}

26
core/src/main/java/org/geysermc/geyser/registry/populator/TagRegistryPopulator.java
View File

@@ -56,6 +56,19 @@ public final class TagRegistryPopulator {
private static final Gson GSON = new GsonBuilder().create(); // temporary
public static void populate() {
Hash.Strategy<int[]> hashStrategy = new Hash.Strategy<>() {
// Necessary so arrays can actually be compared
@Override
public int hashCode(int[] o) {
return Arrays.hashCode(o);
}
@Override
public boolean equals(int[] a, int[] b) {
return Arrays.equals(a, b);
}
};
List<ObjectIntPair<String>> paletteVersions = List.of(
ObjectIntPair.of("1_20_80", Bedrock_v671.CODEC.getProtocolVersion()),
ObjectIntPair.of("1_21_0", Bedrock_v685.CODEC.getProtocolVersion()),
@@ -77,18 +90,7 @@ public final class TagRegistryPopulator {
throw new AssertionError("Unable to load Bedrock runtime item IDs", e);
}
Object2ObjectMap<int[], String> javaItemsToBedrockTag = new Object2ObjectOpenCustomHashMap<>(new Hash.Strategy<>() {
// Necessary so arrays can actually be compared
@Override
public int hashCode(int[] o) {
return Arrays.hashCode(o);
}
@Override
public boolean equals(int[] a, int[] b) {
return Arrays.equals(a, b);
}
});
Object2ObjectMap<int[], String> javaItemsToBedrockTag = new Object2ObjectOpenCustomHashMap<>(hashStrategy);
for (var entry : bedrockTags.entrySet()) {
List<String> value = entry.getValue();

1
core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
View File

@@ -214,6 +214,7 @@ import org.geysermc.mcprotocollib.protocol.packet.common.serverbound.Serverbound
import org.geysermc.mcprotocollib.protocol.packet.handshake.serverbound.ClientIntentionPacket;
import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundChatCommandSignedPacket;
import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundChatPacket;
import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundClientTickEndPacket;
import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundPlayerAbilitiesPacket;
import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundPlayerActionPacket;
import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundUseItemPacket;