Merge pull request #84 from o7Moon/83-boat-collision

implement collision modes

Author: o7Moon

gradle.properties

@@ -7,7 +7,7 @@ minecraft_version_allowed_range=>=1.20.1 <=1.20.4
 yarn_mappings=1.20.1+build.10
 loader_version=0.15.11
 # Mod Properties
-mod_version=0.4.2_1.20.1-1.20.4
+mod_version=0.4.3_1.20.1-1.20.4
 maven_group=dev.o7moon
 archives_base_name=OpenBoatUtils
 # Dependencies

src/main/java/dev/o7moon/openboatutils/ClientboundPackets.java

@@ -36,12 +36,13 @@ public enum ClientboundPackets {
     CLEAR_SLIPPERINESS,
     MODE_SERIES,
     EXCLUSIVE_MODE_SERIES,
-    SET_PER_BLOCK;
+    SET_PER_BLOCK,
+    SET_COLLISION_MODE;
 
     public static void registerCodecs() {
         //? >=1.21 {
-        /*PayloadTypeRegistry.playS2C().register(OpenBoatUtils.BytePayload.ID, OpenBoatUtils.BytePayload.CODEC);*/
-        //? }
+        /*PayloadTypeRegistry.playS2C().register(OpenBoatUtils.BytePayload.ID, OpenBoatUtils.BytePayload.CODEC);
+        *///?}
     }
 
     public static void registerHandlers(){
@@ -180,6 +181,10 @@ public static void handlePacket(PacketByteBuf buf) {
                     blocksArray = blocks.split(",");
                     OpenBoatUtils.setBlocksSetting(OpenBoatUtils.PerBlockSettingType.values()[setting], Arrays.asList(blocksArray), value);
                     return;
+                case 27:
+                    short cmode = buf.readShort();
+                    OpenBoatUtils.setCollisionMode(CollisionMode.values()[cmode]);
+                    return;
             }
         } catch (Exception E) {
             OpenBoatUtils.LOG.error("Error when handling clientbound openboatutils packet: ");

src/main/java/dev/o7moon/openboatutils/CollisionMode.java

@@ -0,0 +1,7 @@
+package dev.o7moon.openboatutils;
+
+public enum CollisionMode {
+    VANILLA,// 0
+    NO_BOATS_OR_PLAYERS,// 1
+    NO_ENTITIES;// 2
+}

src/main/java/dev/o7moon/openboatutils/Modes.java

@@ -23,6 +23,8 @@ public enum Modes {
     BOOSTER_BLOCKS,//17
     DEFAULT_ICE,//18
     DEFAULT_BLUE_ICE,//19
+    NOCOL_BOATS_AND_PLAYERS,//20
+    NOCOL_ALL_ENTITIES,//21
     ;
 
     public static void setMode(Modes mode) {
@@ -155,6 +157,12 @@ public static void setMode(Modes mode) {
             case DEFAULT_BLUE_ICE:
                 OpenBoatUtils.setAllBlocksSlipperiness(0.985f);
                 return;
+            case NOCOL_BOATS_AND_PLAYERS:
+                OpenBoatUtils.setCollisionMode(CollisionMode.NO_BOATS_OR_PLAYERS);
+                return;
+            case NOCOL_ALL_ENTITIES:
+                OpenBoatUtils.setCollisionMode(CollisionMode.NO_ENTITIES);
+                return;
         }
     }
 }

src/main/java/dev/o7moon/openboatutils/OpenBoatUtils.java

@@ -44,7 +44,7 @@ public void onInitialize() {
 
     public static final Logger LOG = LoggerFactory.getLogger("OpenBoatUtils");
 
-    public static final int VERSION = 9;
+    public static final int VERSION = 10;
 
     public static final Identifier settingsChannel = Identifier.of("openboatutils","settings");
 
@@ -67,6 +67,7 @@ public void onInitialize() {
     public static int coyoteTimer = 0;// timer decrements per tick, is reset to time when grounded
     public static boolean waterJumping = false;
     public static float swimForce = 0.0f;
+    public static CollisionMode collision = CollisionMode.VANILLA;
 
     public static HashMap<String, Float> vanillaSlipperinessMap;
 
@@ -172,6 +173,7 @@ public static void resetSettings(){
         swimForce = 0.0f;
         slipperinessMap = new HashMap<>(getVanillaSlipperinessMap());
         perBlockSettings = new HashMap<>();
+        collision = CollisionMode.VANILLA;
     }
 
     public static void setStepSize(float stepsize){
@@ -386,4 +388,13 @@ public static void setBlockSetting(PerBlockSettingType setting, String block, fl
         blocks.add(block);
         setBlocksSetting(setting, blocks, value);
     }
+
+    public static void setCollisionMode(CollisionMode mode) {
+        enabled = true;
+        collision = mode;
+    }
+
+    public static CollisionMode getCollisionMode() {
+        return collision;
+    }
 }

src/main/java/dev/o7moon/openboatutils/ServerboundPackets.java

@@ -10,8 +10,8 @@ public enum ServerboundPackets {
 
     public static void registerCodecs() {
         //? >=1.21 {
-        /*PayloadTypeRegistry.playC2S().register(OpenBoatUtils.BytePayload.ID, OpenBoatUtils.BytePayload.CODEC);*/
-        //? }
+        /*PayloadTypeRegistry.playC2S().register(OpenBoatUtils.BytePayload.ID, OpenBoatUtils.BytePayload.CODEC);
+        *///?}
     }
 
     public static void registerHandlers(){

src/main/java/dev/o7moon/openboatutils/SingleplayerCommands.java

@@ -411,6 +411,19 @@ public static void registerCommands(){
                         return 1;
                     }))))
             );
+
+            dispatcher.register(
+                    literal("collisionmode").then(argument("ID", IntegerArgumentType.integer(0,2)).executes(ctx -> {
+                                ServerPlayerEntity player = ctx.getSource().getPlayer();
+                                if (player == null) return 0;
+                                PacketByteBuf packet = PacketByteBufs.create();
+                                packet.writeShort(ClientboundPackets.SET_COLLISION_MODE.ordinal());
+                                packet.writeShort(IntegerArgumentType.getInteger(ctx, "ID"));
+                                OpenBoatUtils.sendPacketS2C(player, packet);
+                                return 1;
+                            })
+                    )
+            );
         });
     }
 }

src/main/java/dev/o7moon/openboatutils/mixin/BoatMixin.java

@@ -1,5 +1,6 @@
 package dev.o7moon.openboatutils.mixin;
 
+import dev.o7moon.openboatutils.CollisionMode;
 import dev.o7moon.openboatutils.GetStepHeight;
 import dev.o7moon.openboatutils.OpenBoatUtils;
 import net.minecraft.block.Block;
@@ -147,6 +148,23 @@ float getFriction(Block block) {
         return OpenBoatUtils.getBlockSlipperiness(Registries.BLOCK.getId(block).toString());
     }
 
+    @Inject(method = "collidesWith", at = @At("HEAD"), cancellable = true)
+    void canCollideHook(Entity other, CallbackInfoReturnable<Boolean> ci) {
+        if (!OpenBoatUtils.enabled) return;
+        CollisionMode mode = OpenBoatUtils.getCollisionMode();
+        if (mode == CollisionMode.VANILLA) return;
+        if (mode == CollisionMode.NO_BOATS_OR_PLAYERS && (other instanceof BoatEntity || other instanceof PlayerEntity)) {
+            ci.setReturnValue(false);
+            ci.cancel();
+            return;
+        }
+        if (mode == CollisionMode.NO_ENTITIES) {
+            ci.setReturnValue(false);
+            ci.cancel();
+            return;
+        }
+    }
+
     @Inject(method = "fall", at = @At("HEAD"), cancellable = true)
     void fallHook(CallbackInfo ci) {
         if (!OpenBoatUtils.fallDamage) ci.cancel();

versions/1.21/gradle.properties

@@ -7,7 +7,7 @@ minecraft_version_allowed_range=>=1.21 <=1.21.1
 yarn_mappings=1.21+build.8
 loader_version=0.15.11
 # Mod Properties
-mod_version=0.4.2_1.21
+mod_version=0.4.3_1.21
 maven_group=dev.o7moon
 archives_base_name=OpenBoatUtils
 # Dependencies