update to 1.21.3

BlossomMods · Oct 27, 2024 · c3e649a · c3e649a
1 parent 18c022f
commit c3e649a
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.5.10
+
+* Update to support 1.21.3
+
 # 2.5.9
 
 * Update to support 1.21.1

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.7-SNAPSHOT'
+    id 'fabric-loom' version '1.8-SNAPSHOT'
     id 'maven-publish'
     id "com.modrinth.minotaur" version "2.+"
 }

diff --git a/gradle.properties b/gradle.properties
@@ -2,20 +2,20 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Mod Properties
-mod_version=2.5.9
+mod_version=2.5.10
 maven_group=dev.codedsakura.blossom
 mod_slug=BlossomLib
 archives_base_name=blossom-lib
-supported_versions=1.21;1.21.1
+supported_versions=1.21.3;1.21.2
 
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.21.1
-yarn_mappings=build.3
-loader_version=0.16.5
+minecraft_version=1.21.3
+yarn_mappings=build.2
+loader_version=0.16.7
 
 # Dependencies
-fabric_version=0.103.0
-fpa_version=0.2-SNAPSHOT
+fabric_version=0.107.0
+fpa_version=0.3.2
 # https://maven.nucleoid.xyz/xyz/nucleoid/server-translations-api/
-server_translations_version=2.3.1+1.21-pre2
+server_translations_version=2.4.0+1.21.2-rc1
diff --git a/src/main/java/dev/codedsakura/blossom/lib/BlossomLib.java b/src/main/java/dev/codedsakura/blossom/lib/BlossomLib.java
@@ -150,7 +150,7 @@ public void onInitialize() {
                                                     .then(argument("rot", RotationArgumentType.rotation())
                                                             .executes(ctx -> {
                                                                 Vec2f rot = RotationArgumentType.getRotation(ctx, "rot")
-                                                                        .toAbsoluteRotation(ctx.getSource());
+                                                                        .getRotation(ctx.getSource());
                                                                 int standStill = IntegerArgumentType.getInteger(ctx, "standStill");
                                                                 TextUtils.send(ctx, "blossom.debug.teleport.no-cooldown", standStill);
                                                                 return TeleportUtils.teleport(
@@ -169,7 +169,7 @@ public void onInitialize() {
                                                             .then(argument("rot", RotationArgumentType.rotation())
                                                                     .executes(ctx -> {
                                                                         Vec2f rot = RotationArgumentType.getRotation(ctx, "rot")
-                                                                                .toAbsoluteRotation(ctx.getSource());
+                                                                                .getRotation(ctx.getSource());
                                                                         int standStill = IntegerArgumentType.getInteger(ctx, "standStill");
                                                                         int cooldown = IntegerArgumentType.getInteger(ctx, "cooldown");
                                                                         ServerPlayerEntity player = ctx.getSource().getPlayer();

diff --git a/src/main/java/dev/codedsakura/blossom/lib/permissions/Permissions.java b/src/main/java/dev/codedsakura/blossom/lib/permissions/Permissions.java
@@ -3,6 +3,8 @@
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.entity.Entity;
 import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.world.World;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Predicate;
@@ -80,6 +82,7 @@ public static boolean check(@NotNull Entity entity, @NotNull String permission,
         if (isFPAPILoaded()) {
             return PermissionsExecutor.check(entity, permission, level);
         }
-        return entity.hasPermissionLevel(level);
+        World world = entity.getWorld();
+        return entity.getCommandSource(world instanceof ServerWorld ? (ServerWorld)world : null).hasPermissionLevel(level);
     }
 }
diff --git a/src/main/java/dev/codedsakura/blossom/lib/teleport/TeleportUtils.java b/src/main/java/dev/codedsakura/blossom/lib/teleport/TeleportUtils.java
@@ -262,7 +262,7 @@ public static boolean teleport(@Nullable TeleportConfig customConfig, double sta
                 TeleportUtils.addLastTeleport(who.getUuid(), new TeleportDestination(who));
             }
             TeleportDestination where = getWhere.get();
-            who.teleport(where.world, where.x, where.y, where.z, where.yaw, where.pitch);
+            who.teleport(where.world, where.x, where.y, where.z, Set.of(), where.yaw, where.pitch, false);
             COOLDOWNS.put(pair, new Date().getTime() / 1000 + cooldownTime);
         });
         return true;

diff --git a/src/main/java/dev/codedsakura/blossom/lib/utils/PlayerSetFoV.java b/src/main/java/dev/codedsakura/blossom/lib/utils/PlayerSetFoV.java
@@ -7,7 +7,7 @@ public class PlayerSetFoV {
     public static void setPlayerFoV(ServerPlayerEntity player, float multiplier) {
 
         // invert math done in AbstractClientPlayerEntity#getFovMultiplier
-        float genericMovementSpeed = (float) player.getAttributeValue(EntityAttributes.GENERIC_MOVEMENT_SPEED);
+        float genericMovementSpeed = (float) player.getAttributeValue(EntityAttributes.MOVEMENT_SPEED);
         multiplier = (genericMovementSpeed / 2f) / (multiplier - .5f);
 
         player.getAbilities().setWalkSpeed(multiplier);