Skip to content
This repository was archived by the owner on Apr 17, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/main/java/dev/o7moon/openboatutils/ClientboundPackets.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ public enum ClientboundPackets {
SET_WATER_JUMPING,
SET_SWIM_FORCE,
REMOVE_BLOCKS_SLIPPERINESS,
CLEAR_SLIPPERINESS;
CLEAR_SLIPPERINESS,
MODE_SERIES,
EXCLUSIVE_MODE_SERIES;

public static void registerHandlers(){
ClientPlayNetworking.registerGlobalReceiver(OpenBoatUtils.settingsChannel, (client, handler, buf, responseSender) -> {
Expand Down Expand Up @@ -132,6 +134,21 @@ public static void registerHandlers(){
case 23:
OpenBoatUtils.clearSlipperinessMap();
return;
case 24:
short amount = buf.readShort();
for (int i = 0; i < amount; i++) {
mode = buf.readShort();
Modes.setMode(Modes.values()[mode]);
}
return;
case 25:
OpenBoatUtils.resetSettings();
amount = buf.readShort();
for (int i = 0; i < amount; i++) {
mode = buf.readShort();
Modes.setMode(Modes.values()[mode]);
}
return;
}
} catch (Exception E) {
OpenBoatUtils.LOG.error("Error when handling clientbound openboatutils packet: ");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dev/o7moon/openboatutils/OpenBoatUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static HashMap<String, Float> getVanillaSlipperinessMap() {
if (vanillaSlipperinessMap == null) {
vanillaSlipperinessMap = new HashMap<>();
for (Block b : Registries.BLOCK.stream().toList()) {
if (b.getSlipperiness() != 0.6){
if (b.getSlipperiness() != 0.6f){
vanillaSlipperinessMap.put(Registries.BLOCK.getId(b).toString(), b.getSlipperiness());
}
}
Expand Down
54 changes: 54 additions & 0 deletions src/main/java/dev/o7moon/openboatutils/SingleplayerCommands.java
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,60 @@ public static void registerCommands(){
return 1;
})
);

dispatcher.register(
literal("modeseries").then(argument("modes", StringArgumentType.greedyString()).executes(ctx-> {
ServerPlayerEntity player = ctx.getSource().getPlayer();
if (player == null) return 0;
Modes mode;
String[] strs = StringArgumentType.getString(ctx, "modes").split(",");
PacketByteBuf packet = PacketByteBufs.create();
packet.writeShort(ClientboundPackets.MODE_SERIES.ordinal());
packet.writeShort(strs.length);
for (String modeStr : strs) {
try {
mode = Modes.valueOf(modeStr.trim());
} catch (Exception e) {
String valid_modes = "";
for (Modes m : Modes.values()) {
valid_modes += m.toString() + " ";
}
ctx.getSource().sendMessage(Text.literal("Invalid mode! Valid modes are: "+valid_modes));
return 0;
}
packet.writeShort(mode.ordinal());
}
ServerPlayNetworking.send(player, OpenBoatUtils.settingsChannel, packet);
return 1;
}))
);

dispatcher.register(
literal("exclusivemodeseries").then(argument("modes", StringArgumentType.greedyString()).executes(ctx-> {
ServerPlayerEntity player = ctx.getSource().getPlayer();
if (player == null) return 0;
Modes mode;
String[] strs = StringArgumentType.getString(ctx, "modes").split(",");
PacketByteBuf packet = PacketByteBufs.create();
packet.writeShort(ClientboundPackets.EXCLUSIVE_MODE_SERIES.ordinal());
packet.writeShort(strs.length);
for (String modeStr : strs) {
try {
mode = Modes.valueOf(modeStr.trim());
} catch (Exception e) {
String valid_modes = "";
for (Modes m : Modes.values()) {
valid_modes += m.toString() + " ";
}
ctx.getSource().sendMessage(Text.literal("Invalid mode! Valid modes are: "+valid_modes));
return 0;
}
packet.writeShort(mode.ordinal());
}
ServerPlayNetworking.send(player, OpenBoatUtils.settingsChannel, packet);
return 1;
}))
);
});
}
}