diff --git a/gradle.properties b/gradle.properties index 1fcb02f..78d8e0c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,21 +1,17 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G org.gradle.parallel=true - # IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349 org.gradle.configuration-cache=false - # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=26.1 -loader_version=0.18.4 -loom_version=1.15-SNAPSHOT -fabric_kotlin_version=1.13.9+kotlin.2.3.10 - +minecraft_version=26.2-rc-2 +loader_version=0.19.3 +loom_version=1.16-SNAPSHOT +fabric_kotlin_version=1.13.12+kotlin.2.4.0 # Mod Properties mod_version=1.0.0 maven_group=com.steelextractor archives_base_name=steel-extractor - # Dependencies -fabric_version=0.144.0+26.1 +fabric_version=0.152.0+26.2 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37f78a6..1a70468 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/kotlin/com/steelextractor/extractors/Classes.kt b/src/main/kotlin/com/steelextractor/extractors/Classes.kt index 8c83018..201ec1a 100644 --- a/src/main/kotlin/com/steelextractor/extractors/Classes.kt +++ b/src/main/kotlin/com/steelextractor/extractors/Classes.kt @@ -10,6 +10,7 @@ import net.minecraft.sounds.SoundEvent import net.minecraft.world.entity.Entity import net.minecraft.world.entity.EntitySpawnReason import net.minecraft.world.entity.EntityType +import net.minecraft.world.entity.EntityTypes import net.minecraft.world.entity.player.Player import net.minecraft.world.item.Item import net.minecraft.world.level.block.Block @@ -87,7 +88,7 @@ class Classes : SteelExtractor.Extractor { if (entity != null) { return entity.javaClass } - if (entityType == EntityType.PLAYER) { + if (entityType == EntityTypes.PLAYER) { return Player::class.java } return entityType.baseClass diff --git a/src/main/kotlin/com/steelextractor/extractors/Entities.kt b/src/main/kotlin/com/steelextractor/extractors/Entities.kt index e67da66..504ad49 100644 --- a/src/main/kotlin/com/steelextractor/extractors/Entities.kt +++ b/src/main/kotlin/com/steelextractor/extractors/Entities.kt @@ -30,6 +30,7 @@ import org.slf4j.LoggerFactory import java.lang.reflect.Field import java.util.UUID import com.mojang.authlib.GameProfile +import net.minecraft.world.entity.EntityTypes class Entities : SteelExtractor.Extractor { private val logger = LoggerFactory.getLogger("steel-extractor-entities") @@ -176,7 +177,7 @@ class Entities : SteelExtractor.Extractor { entity.discard() } else { // Entity can't be instantiated (e.g., Player). - if (entityType == EntityType.PLAYER) { + if (entityType == EntityTypes.PLAYER) { val fakePlayer = createFakeServerPlayer(server = world.server) if (fakePlayer != null) { writeSynchedDataFromEntity(fakePlayer, Player::class.java, synchedDataJson) @@ -302,7 +303,7 @@ class Entities : SteelExtractor.Extractor { if (entity != null) { return entity.javaClass } - if (entityType == EntityType.PLAYER) { + if (entityType == EntityTypes.PLAYER) { return Player::class.java } return null