diff --git a/build.gradle b/build.gradle index e417f3549..f451aff19 100644 --- a/build.gradle +++ b/build.gradle @@ -8,9 +8,8 @@ buildscript { plugins { id "architectury-plugin" version "3.4-SNAPSHOT" - id "dev.architectury.loom" version "1.1-SNAPSHOT" apply false + id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false id "org.cadixdev.licenser" version "0.6.1" - id "io.github.juuxel.loom-vineflower" version "1.11.0" apply false id "me.shedaniel.unified-publishing" version "0.1.+" apply false id "maven-publish" } @@ -21,7 +20,6 @@ architectury { subprojects { apply plugin: "dev.architectury.loom" - apply plugin: "io.github.juuxel.loom-vineflower" loom { silentMojangMappingsLicense() @@ -56,7 +54,7 @@ allprojects { tasks.withType(JavaCompile) { options.encoding = "UTF-8" - options.release = 16 + options.release = 17 } javadoc { diff --git a/forge/src/main/java/dev/architectury/hooks/level/entity/forge/PlayerHooksImpl.java b/forge/src/main/java/dev/architectury/hooks/level/entity/forge/PlayerHooksImpl.java index 6eb9a1fe6..720e778fd 100644 --- a/forge/src/main/java/dev/architectury/hooks/level/entity/forge/PlayerHooksImpl.java +++ b/forge/src/main/java/dev/architectury/hooks/level/entity/forge/PlayerHooksImpl.java @@ -19,11 +19,11 @@ package dev.architectury.hooks.level.entity.forge; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; -import net.minecraftforge.common.util.FakePlayer; public class PlayerHooksImpl { public static boolean isFake(Player playerEntity) { - return playerEntity instanceof FakePlayer; + return playerEntity instanceof ServerPlayer && playerEntity.getClass() != ServerPlayer.class; } } diff --git a/gradle.properties b/gradle.properties index 9b5bfe49e..a30c3aa64 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,7 @@ fabric_loader_version=0.14.22 fabric_api_version=0.89.1+1.20.2 mod_menu_version=7.0.0 -forge_version=48.0.1 +forge_version=48.0.38 curseforge_id=419699 modrinth_id=lhGA9TYQ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f72df95a7..e411586a5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists