1.20.5 (#12)

* cleanup and update to 1.20.5 (does not work cause of fapi=

* add fabric to runtime to prevent crashes

* reformat code

* update versions, add editorconfig

.editorconfig

@@ -0,0 +1,40 @@
+# https://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+max_line_length = 140
+
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{java,kt,kts,scala,rs,xml,kt.spec,kts.spec}]
+indent_size = 4
+
+[*.{kt,kts}]
+ktlint_code_style = ktlint_official
+ktlint_ignore_back_ticked_identifier = true
+ij_kotlin_allow_trailing_comma_on_call_site = false
+ij_kotlin_allow_trailing_comma = false
+
+ktlint_standard = enabled
+
+# Don't allow any wildcard imports
+ij_kotlin_packages_to_use_import_on_demand = unset
+
+# Prevent wildcard imports
+ij_kotlin_name_count_to_use_star_import = 99
+ij_kotlin_name_count_to_use_star_import_for_members = 99
+
+[*.md]
+trim_trailing_whitespace = false
+max_line_length = unset
+
+[gradle/verification-metadata.xml]
+indent_size = 3
+
+[*.yml]
+ij_yaml_spaces_within_brackets = false

build.gradle.kts

@@ -1,14 +1,14 @@
 plugins {
-    kotlin("jvm") version "1.9.22"
-    kotlin("plugin.serialization") version "1.9.22"
+    kotlin("jvm") version "1.9.23"
+    kotlin("plugin.serialization") version "1.9.23"
     id("com.modrinth.minotaur") version "2.8.7" apply (false)
     id("com.github.breadmoirai.github-release") version "2.5.2" apply (false)
 
-    id("fabric-loom") version "1.5-SNAPSHOT" apply (false)
+    id("fabric-loom") version "1.6-SNAPSHOT" apply (false)
 
     id("io.papermc.paperweight.userdev") version "1.5.5" apply (false)
 }
 
 repositories {
     mavenCentral()
-}
+}

changelog.md

@@ -0,0 +1,2 @@
+- update to 1.20.5
+  - no config screen cause of yacl at the moment

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

telekinesis-fabric/build.gradle.kts

@@ -1,8 +1,6 @@
 @file:Suppress("SpellCheckingInspection")
 
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import java.nio.file.Path
-import kotlin.io.path.notExists
 import kotlin.io.path.readText
 
 plugins {
@@ -20,9 +18,9 @@ plugins {
 
 group = "dev.nyon"
 val majorVersion = "2.4.0"
-val mcVersion = "1.20.4"
-val supportedMcVersions = listOf("1.20.3", "1.20.4")
-version = "$majorVersion-1.20.4"
+val mcVersion = "1.20.5-pre4"
+val supportedMcVersions = listOf(mcVersion)
+version = "$majorVersion-$mcVersion"
 description = "Adds a telekinesis enchantment to minecraft"
 val projectAuthors = listOf("btwonion")
 val githubRepo = "btwonion/telekinesis"
@@ -42,30 +40,33 @@ repositories {
     maven("https://maven.parchmentmc.org/")
     maven("https://jitpack.io")
     maven("https://oss.sonatype.org/content/repositories/snapshots/")
+    maven("https://maven.isxander.dev/snapshots") // remove in stable release
 }
 
 dependencies {
     minecraft("com.mojang:minecraft:$mcVersion")
-    mappings(loom.layered {
-        parchment("org.parchmentmc.data:parchment-1.20.3:2023.12.31@zip")
-        officialMojangMappings()
-    })
+    mappings(
+        loom.layered {
+            parchment("org.parchmentmc.data:parchment-1.20.4:2024.04.14@zip")
+            officialMojangMappings()
+        }
+    )
     implementation("org.vineflower:vineflower:1.9.3")
-    modImplementation("net.fabricmc:fabric-loader:0.15.6")
-    modImplementation("net.fabricmc:fabric-language-kotlin:1.10.17+kotlin.1.9.22")
-    modImplementation("dev.isxander.yacl:yet-another-config-lib-fabric:3.3.1+1.20.4")
-    modImplementation("com.terraformersmc:modmenu:9.0.0-pre.1")
+    modImplementation("net.fabricmc:fabric-loader:0.15.10")
+    modImplementation("net.fabricmc:fabric-language-kotlin:1.10.19+kotlin.1.9.23")
+    modImplementation("dev.isxander.yacl:yet-another-config-lib-fabric:3.3.3+1.20.4+update.1.20.5-SNAPSHOT+update.1.20.5-SNAPSHOT")
+    modImplementation("com.terraformersmc:modmenu:10.0.0-alpha.3")
 
-    modRuntimeOnly("net.fabricmc.fabric-api:fabric-api:0.91.3+1.20.4") // Not necessary, just here for testing purposes
+    modRuntimeOnly("net.fabricmc.fabric-api:fabric-api:0.97.3+1.20.5")
 
     include(implementation(annotationProcessor("com.github.bawnorton.mixinsquared:mixinsquared-fabric:0.1.1")!!)!!)
 
     include(implementation("com.akuleshov7:ktoml-core-jvm:0.5.1")!!)
 
     // Integration
-    modCompileOnly("maven.modrinth:abooMhox:c2klaSgQ") // tree-harvester by ricksouth
-    modCompileOnly("maven.modrinth:MpzVLzy5:9kJblF2V") // better nether by quickueck
-    modCompileOnly("maven.modrinth:EFtixeiF:Gcai736Z") // levelz by Globox1997
+    // modCompileOnly("maven.modrinth:abooMhox:c2klaSgQ") // tree-harvester by ricksouth wait for 1.20.5
+    // modCompileOnly("maven.modrinth:MpzVLzy5:9kJblF2V") // better nether by quickueck wait for 1.20.5
+    // modCompileOnly("maven.modrinth:EFtixeiF:Gcai736Z") // levelz by Globox1997 wait for 1.20.5
 }
 
 tasks {
@@ -103,23 +104,29 @@ tasks {
     }
 
     withType<KotlinCompile> {
-        kotlinOptions.jvmTarget = "17"
+        kotlinOptions.jvmTarget = "21"
     }
 
     withType<JavaCompile> {
-        options.release.set(17)
+        options.release.set(21)
+    }
+
+    loom {
+        accessWidenerPath = file("src/main/resources/telekinesis.accesswidener")
     }
 }
 
-val changelogFile: Path = rootDir.toPath().resolve("changelogs/fabric-$version.md")
-val changelogText = if (changelogFile.notExists()) "" else changelogFile.readText()
-val projectVersionname = "fabric-${project.version}"
+val changelogText =
+    buildString {
+        append("# v${project.version}\n")
+        rootDir.toPath().resolve("changelog.md").readText().also { append(it) }
+    }
 
 modrinth {
     token.set(findProperty("modrinth.token")?.toString())
     projectId.set("LLfA8jAD")
-    versionNumber.set(projectVersionname)
-    versionName.set(projectVersionname)
+    versionNumber.set("v${project.version}")
+    versionName.set("v${project.version}")
     versionType.set("release")
     uploadFile.set(tasks["remapJar"])
     gameVersions.set(supportedMcVersions)
@@ -139,8 +146,8 @@ githubRelease {
     val (rowner, rrepo) = githubRepo.split("/")
     owner = rowner
     repo = rrepo
-    releaseName = projectVersionname
-    tagName = projectVersionname
+    releaseName = "v${project.version}"
+    tagName = "v${project.version}"
     body = changelogText
     targetCommitish = "master"
     setReleaseAssets(tasks["remapJar"])
@@ -173,4 +180,4 @@ signing {
 
 java {
     withSourcesJar()
-}
+}

telekinesis-fabric/src/main/java/dev/nyon/telekinesis/mixins/AbstractChestedHorseMixin.java

@@ -1,9 +1,7 @@
 package dev.nyon.telekinesis.mixins;
 
-import com.llamalad7.mixinextras.injector.WrapWithCondition;
-import dev.nyon.telekinesis.TelekinesisPolicy;
-import dev.nyon.telekinesis.utils.TelekinesisUtils;
-import net.minecraft.server.level.ServerPlayer;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
+import dev.nyon.telekinesis.utils.EntityUtils;
 import net.minecraft.world.entity.animal.horse.AbstractChestedHorse;
 import net.minecraft.world.level.ItemLike;
 import org.spongepowered.asm.mixin.Mixin;
@@ -23,17 +21,6 @@ public boolean redirectEquipmentDrop(
         AbstractChestedHorse instance,
         ItemLike item
     ) {
-        final var attacker = instance.getLastAttacker();
-        if (!(attacker instanceof ServerPlayer serverPlayer)) return true;
-
-        boolean hasTelekinesis = TelekinesisUtils.handleTelekinesis(TelekinesisPolicy.MobDrops,
-            serverPlayer,
-            serverPlayer.getMainHandItem(),
-            player -> {
-                if (!player.addItem(item.asItem()
-                    .getDefaultInstance())) instance.spawnAtLocation(item);
-            });
-
-        return !hasTelekinesis;
+        return EntityUtils.spawnAtLocationInject(instance, item);
     }
 }

telekinesis-fabric/src/main/java/dev/nyon/telekinesis/mixins/AbstractHorseMixin.java

@@ -1,9 +1,7 @@
 package dev.nyon.telekinesis.mixins;
 
-import com.llamalad7.mixinextras.injector.WrapWithCondition;
-import dev.nyon.telekinesis.TelekinesisPolicy;
-import dev.nyon.telekinesis.utils.TelekinesisUtils;
-import net.minecraft.server.level.ServerPlayer;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
+import dev.nyon.telekinesis.utils.EntityUtils;
 import net.minecraft.world.entity.animal.horse.AbstractHorse;
 import net.minecraft.world.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
@@ -23,16 +21,6 @@ public boolean redirectEquipmentDrop(
         AbstractHorse instance,
         ItemStack stack
     ) {
-        final var attacker = instance.getLastAttacker();
-        if (!(attacker instanceof ServerPlayer serverPlayer)) return true;
-
-        boolean hasTelekinesis = TelekinesisUtils.handleTelekinesis(TelekinesisPolicy.MobDrops,
-            serverPlayer,
-            serverPlayer.getMainHandItem(),
-            player -> {
-                if (!player.addItem(stack)) instance.spawnAtLocation(stack);
-            });
-
-        return !hasTelekinesis;
+        return EntityUtils.spawnAtLocationInject(instance, stack);
     }
 }