From 18ccbd18ddc170af627f51fdb055301d7e72d159 Mon Sep 17 00:00:00 2001 From: btwonion Date: Tue, 8 Oct 2024 21:01:38 +0200 Subject: [PATCH] fix rebase --- README.md | 8 +++----- build.gradle.kts | 6 +----- changelog.md | 6 ++---- src/main/kotlin/dev/nyon/telekinesis/DropEvent.kt | 2 +- .../dev/nyon/telekinesis/TelekinesisEnchantment.kt | 10 ++++++---- versions/1.20.1/gradle.properties | 2 +- versions/1.20.4/gradle.properties | 2 +- versions/1.20.6/gradle.properties | 2 +- versions/1.21/gradle.properties | 4 ++-- 9 files changed, 18 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index e7ec9b2..3848a01 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ The configuration file can be found in the client/server directory.
telekinesis.json -```json +```json5 { "version": 1, // For migration purposes only, just ignore this. "config": { @@ -27,11 +27,9 @@ The configuration file can be found in the client/server directory. ### Other -Currently supported versions are: 1.20.1, 1.20.4, 1.20.6 and 1.21. This can change in the future! - -If you need help with any of my mods, just join my [discord server](https://nyon.dev/discord) +If you need help with any of my mods, just join my [discord server](https://nyon.dev/discord). #### Paper Compatibility The paper module of telekinesis is as of Minecraft version 1.20.2 discontinued cause of the lack of ability to -register the enchantment (When Paper's registry modification api is merged I will continue.) +register the enchantment. diff --git a/build.gradle.kts b/build.gradle.kts index 7879ca1..4f0cb49 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,13 +15,12 @@ plugins { } val beta: Int? = null // Pattern is '1.0.0-beta1-1.20.6-pre.2' -val featureVersion = "3.0.4${if (beta != null) "-beta$beta" else ""}" +val featureVersion = "3.0.5${if (beta != null) "-beta$beta" else ""}" val mcVersion = property("mcVersion")!!.toString() val mcVersionRange = property("mcVersionRange")!!.toString() version = "$featureVersion-$mcVersion" group = "dev.nyon" -val projectAuthors = listOf("btwonion") val githubRepo = "btwonion/telekinesis" base { @@ -53,7 +52,6 @@ repositories { maven("https://maven.quiltmc.org/repository/release/") maven("https://repo.nyon.dev/releases") maven("https://maven.isxander.dev/releases") - maven("https://maven.bawnorton.com/releases") } dependencies { @@ -72,8 +70,6 @@ dependencies { modImplementation("dev.isxander:yet-another-config-lib:${property("deps.yacl")!!}") modImplementation("com.terraformersmc:modmenu:${property("deps.modMenu")!!}") - include(implementation(annotationProcessor("com.github.bawnorton.mixinsquared:mixinsquared-fabric:0.2.0-beta.6")!!)!!) - include(modImplementation("dev.nyon:konfig:2.0.2-1.20.4")!!) } diff --git a/changelog.md b/changelog.md index 7b8b284..f2af551 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,2 @@ -- also award player with exp orb gain stat -- fix crash on tool repair with telekinesis (#17 by f-raZ0R) -- fix infinitely dropping boats, without destroying them on <=1.20.2 (#16 by f-raZ0R) -- update konfig, preventing a crash, when inner config does not match json format \ No newline at end of file +- only limit fabric.mod.json Minecraft requirement for versions of Minecraft that are too old +- remove old mixinsquared import \ No newline at end of file diff --git a/src/main/kotlin/dev/nyon/telekinesis/DropEvent.kt b/src/main/kotlin/dev/nyon/telekinesis/DropEvent.kt index 61e0a0e..d4b68e4 100644 --- a/src/main/kotlin/dev/nyon/telekinesis/DropEvent.kt +++ b/src/main/kotlin/dev/nyon/telekinesis/DropEvent.kt @@ -30,7 +30,7 @@ object DropEvent { player.take(fakeExperienceOrb, 1) val leftExp = (fakeExperienceOrb as ExperienceOrbInvoker).invokeRepairPlayerItems(player, exp.value) if (leftExp > 0) player.giveExperiencePoints(leftExp) - exp.setValue(0) + exp.value = 0 } } } diff --git a/src/main/kotlin/dev/nyon/telekinesis/TelekinesisEnchantment.kt b/src/main/kotlin/dev/nyon/telekinesis/TelekinesisEnchantment.kt index 4b38905..9b94a8e 100644 --- a/src/main/kotlin/dev/nyon/telekinesis/TelekinesisEnchantment.kt +++ b/src/main/kotlin/dev/nyon/telekinesis/TelekinesisEnchantment.kt @@ -1,9 +1,6 @@ package dev.nyon.telekinesis -import net.minecraft.ChatFormatting -import net.minecraft.network.chat.Component import net.minecraft.world.item.enchantment.Enchantment -import net.minecraft.world.entity.EquipmentSlot /*? if >=1.21 {*/ import net.minecraft.core.registries.Registries import net.minecraft.resources.ResourceLocation @@ -13,13 +10,18 @@ val telekinesisEffectId: TagKey = TagKey.create(Registries.ENCHANTM val telekinesisEnchantmentId: ResourceLocation = ResourceLocation.fromNamespaceAndPath("telekinesis", "telekinesis") /*?} elif <1.21 && >=1.20.5 {*/ /*import net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags +import net.minecraft.ChatFormatting +import net.minecraft.network.chat.Component +import net.minecraft.world.entity.EquipmentSlot *//*?} elif <=1.20.4 {*/ /*import net.minecraft.world.damagesource.DamageSource +import net.minecraft.ChatFormatting +import net.minecraft.network.chat.Component import net.minecraft.world.entity.MobType import net.minecraft.world.item.enchantment.EnchantmentCategory +import net.minecraft.world.entity.EquipmentSlot *//*?}*/ - /*? if =1.20.6 {*/ /*class TelekinesisEnchantment : Enchantment( definition( diff --git a/versions/1.20.1/gradle.properties b/versions/1.20.1/gradle.properties index 23f1d24..33fbb90 100644 --- a/versions/1.20.1/gradle.properties +++ b/versions/1.20.1/gradle.properties @@ -1,5 +1,5 @@ mcVersion=1.20.1 -mcVersionRange=>=1.20 <=1.20.3 +mcVersionRange=>=1.20 supportedMcVersions=1.20,1.20.1 deps.quiltmappings=1.20.1+build.9 diff --git a/versions/1.20.4/gradle.properties b/versions/1.20.4/gradle.properties index ce7e55e..b01b245 100644 --- a/versions/1.20.4/gradle.properties +++ b/versions/1.20.4/gradle.properties @@ -1,5 +1,5 @@ mcVersion=1.20.4 -mcVersionRange=>=1.20.3 <=1.20.4 +mcVersionRange=>=1.20.3 supportedMcVersions=1.20.4 deps.quiltmappings=1.20.4+build.3 diff --git a/versions/1.20.6/gradle.properties b/versions/1.20.6/gradle.properties index 2ed0b9d..1345b3e 100644 --- a/versions/1.20.6/gradle.properties +++ b/versions/1.20.6/gradle.properties @@ -1,5 +1,5 @@ mcVersion=1.20.6 -mcVersionRange=>=1.20.5 <=1.20.6 +mcVersionRange=>=1.20.5 supportedMcVersions=1.20.5,1.20.6 deps.quiltmappings=1.20.6+build.6 diff --git a/versions/1.21/gradle.properties b/versions/1.21/gradle.properties index 94dfbd3..35dd4a3 100644 --- a/versions/1.21/gradle.properties +++ b/versions/1.21/gradle.properties @@ -1,6 +1,6 @@ mcVersion=1.21 -mcVersionRange=>1.20.6 <=1.21 -supportedMcVersions=1.21 +mcVersionRange=>1.20.6 +supportedMcVersions=1.21,1.21.1 deps.quiltmappings=1.21+build.9 deps.fapi=0.100.8+1.21