Skip to content

Commit db05760

Browse files
committed
Indicate 1.21.71 support in readme
2 parents db588da + 3239e61 commit db05760

File tree

58 files changed

+712
-296
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+712
-296
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t
1515
Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here!
1616

1717
## Supported Versions
18-
Geyser is currently supporting Minecraft Bedrock 1.21.50 - 1.21.70 and Minecraft Java 1.21.5. For more information, please see [here](https://geysermc.org/wiki/geyser/supported-versions/).
18+
Geyser is currently supporting Minecraft Bedrock 1.21.50 - 1.21.71 and Minecraft Java 1.21.5. For more information, please see [here](https://geysermc.org/wiki/geyser/supported-versions/).
1919

2020
## Setting Up
2121
Take a look [here](https://geysermc.org/wiki/geyser/setup/) for how to set up Geyser.

api/src/main/java/org/geysermc/geyser/api/pack/PackCodec.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public SeekableByteChannel serialize(@NonNull ResourcePack resourcePack) throws
9898
* @since 2.1.1
9999
*/
100100
@NonNull
101-
public static PathPackCodec path(@NonNull Path path) {
101+
public static PackCodec path(@NonNull Path path) {
102102
return GeyserApi.api().provider(PathPackCodec.class, path);
103103
}
104104

@@ -110,7 +110,7 @@ public static PathPackCodec path(@NonNull Path path) {
110110
* @since 2.6.2
111111
*/
112112
@NonNull
113-
public static UrlPackCodec url(@NonNull String url) {
113+
public static PackCodec url(@NonNull String url) {
114114
return GeyserApi.api().provider(UrlPackCodec.class, url);
115115
}
116116
}

bootstrap/mod/src/main/java/org/geysermc/geyser/platform/mod/GeyserModLogger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void debug(String message) {
8787
@Override
8888
public void debug(String message, Object... arguments) {
8989
if (debug) {
90-
logger.info(message, arguments);
90+
logger.info(String.format(message, arguments));
9191
}
9292
}
9393

bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneLogger.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ public void debug(String message) {
117117

118118
@Override
119119
public void debug(String message, Object... arguments) {
120-
log.debug(ChatColor.GRAY + message, arguments);
120+
// We can't use the debug call that would format for us as we're using Java's string formatting
121+
log.debug(ChatColor.GRAY + String.format(message, arguments));
121122
}
122123

123124
@Override

bootstrap/velocity/src/main/java/org/geysermc/geyser/platform/velocity/GeyserVelocityLogger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void debug(String message) {
7777
@Override
7878
public void debug(String message, Object... arguments) {
7979
if (debug) {
80-
logger.info(message, arguments);
80+
logger.info(String.format(message, arguments));
8181
}
8282
}
8383
}

core/src/main/java/org/geysermc/geyser/GeyserLogger.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.checkerframework.checker.nullness.qual.NonNull;
3030
import org.checkerframework.checker.nullness.qual.Nullable;
3131
import org.geysermc.geyser.command.GeyserCommandSource;
32+
import org.geysermc.geyser.session.GeyserSession;
3233

3334
import java.util.UUID;
3435

@@ -119,6 +120,15 @@ default void debug(@Nullable Object object) {
119120
*/
120121
void setDebug(boolean debug);
121122

123+
/**
124+
* A method to debug information specific to a session.
125+
*/
126+
default void debug(GeyserSession session, String message, Object... arguments) {
127+
if (isDebug()) {
128+
debug("(" + session.bedrockUsername() + ") " + message, arguments);
129+
}
130+
}
131+
122132
/**
123133
* If debug is enabled for this logger
124134
*/

core/src/main/java/org/geysermc/geyser/command/defaults/AdvancedTooltipsCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ public void execute(CommandContext<GeyserCommandSource> context) {
5151
+ MinecraftLocale.getLocaleString("debug.prefix", session.locale())
5252
+ " " + ChatColor.RESET
5353
+ MinecraftLocale.getLocaleString("debug.advanced_tooltips." + onOrOff, session.locale()));
54-
session.getInventoryTranslator().updateInventory(session, session.getPlayerInventory());
54+
session.getPlayerInventory().updateInventory();
5555
}
5656
}

core/src/main/java/org/geysermc/geyser/entity/type/BoatEntity.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.cloudburstmc.protocol.bedrock.packet.MoveEntityAbsolutePacket;
3434
import org.geysermc.geyser.entity.EntityDefinition;
3535
import org.geysermc.geyser.entity.EntityDefinitions;
36+
import org.geysermc.geyser.network.GameProtocol;
3637
import org.geysermc.geyser.session.GeyserSession;
3738
import org.geysermc.geyser.util.InteractionResult;
3839
import org.geysermc.geyser.util.InteractiveTag;
@@ -86,8 +87,10 @@ public BoatEntity(GeyserSession session, int entityId, long geyserId, UUID uuid,
8687
@Override
8788
protected void initializeMetadata() {
8889
super.initializeMetadata();
89-
// Without this flag you cant stand on boats
90-
setFlag(EntityFlag.COLLIDABLE, true);
90+
if (GameProtocol.is1_21_70orHigher(session)) {
91+
// Without this flag you cant stand on boats
92+
setFlag(EntityFlag.COLLIDABLE, true);
93+
}
9194
}
9295

9396
@Override

core/src/main/java/org/geysermc/geyser/inventory/AnvilContainer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import net.kyori.adventure.text.Component;
3131
import org.checkerframework.checker.nullness.qual.Nullable;
3232
import org.geysermc.geyser.session.GeyserSession;
33+
import org.geysermc.geyser.translator.inventory.InventoryTranslator;
3334
import org.geysermc.geyser.translator.text.MessageTranslator;
3435
import org.geysermc.mcprotocollib.protocol.data.game.inventory.ContainerType;
3536
import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponentTypes;
@@ -62,8 +63,8 @@ public class AnvilContainer extends Container {
6263

6364
private int lastTargetSlot = -1;
6465

65-
public AnvilContainer(String title, int id, int size, ContainerType containerType, PlayerInventory playerInventory) {
66-
super(title, id, size, containerType, playerInventory);
66+
public AnvilContainer(GeyserSession session, String title, int id, int size, ContainerType containerType, PlayerInventory playerInventory, InventoryTranslator translator) {
67+
super(session, title, id, size, containerType, playerInventory, translator);
6768
}
6869

6970
/**

core/src/main/java/org/geysermc/geyser/inventory/BeaconContainer.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
package org.geysermc.geyser.inventory;
2727

28+
import org.geysermc.geyser.session.GeyserSession;
29+
import org.geysermc.geyser.translator.inventory.InventoryTranslator;
2830
import org.geysermc.mcprotocollib.protocol.data.game.inventory.ContainerType;
2931
import lombok.Getter;
3032
import lombok.Setter;
@@ -35,7 +37,7 @@ public class BeaconContainer extends Container {
3537
private int primaryId;
3638
private int secondaryId;
3739

38-
public BeaconContainer(String title, int id, int size, ContainerType containerType, PlayerInventory playerInventory) {
39-
super(title, id, size, containerType, playerInventory);
40+
public BeaconContainer(GeyserSession session, String title, int id, int size, ContainerType containerType, PlayerInventory playerInventory, InventoryTranslator translator) {
41+
super(session, title, id, size, containerType, playerInventory, translator);
4042
}
4143
}

0 commit comments

Comments
 (0)