From 2e9c99c9459700370fe5b4e6d510e48e5e797839 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 04:41:54 +0000 Subject: [PATCH 01/14] Bump org.jetbrains.kotlin.plugin.serialization from 2.1.10 to 2.1.20 Bumps org.jetbrains.kotlin.plugin.serialization from 2.1.10 to 2.1.20. --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 691a123..5d1e381 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id "fabric-loom" version "1.10.4" - id "org.jetbrains.kotlin.plugin.serialization" version "2.1.10" + id "org.jetbrains.kotlin.plugin.serialization" version "2.1.20" id "org.jetbrains.kotlin.jvm" version "2.1.10" id "com.modrinth.minotaur" version "2.+" id "maven-publish" From 85c39226eefe14347088b67e4490cb16b2d2942a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 11:24:09 +0000 Subject: [PATCH 02/14] Bump org.jetbrains.kotlin.jvm from 2.1.10 to 2.1.20 Bumps org.jetbrains.kotlin.jvm from 2.1.10 to 2.1.20. --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.jvm dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5d1e381..0454188 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id "fabric-loom" version "1.10.4" id "org.jetbrains.kotlin.plugin.serialization" version "2.1.20" - id "org.jetbrains.kotlin.jvm" version "2.1.10" + id "org.jetbrains.kotlin.jvm" version "2.1.20" id "com.modrinth.minotaur" version "2.+" id "maven-publish" } From 43ceaa1102ed7cfb16d354a06bd9a159d96c36fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 11:33:07 +0000 Subject: [PATCH 03/14] Bump fabric-loom from 1.10.4 to 1.10.5 Bumps fabric-loom from 1.10.4 to 1.10.5. --- updated-dependencies: - dependency-name: fabric-loom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0454188..4bad3b3 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ import com.modrinth.minotaur.dependencies.ModDependency import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id "fabric-loom" version "1.10.4" + id "fabric-loom" version "1.10.5" id "org.jetbrains.kotlin.plugin.serialization" version "2.1.20" id "org.jetbrains.kotlin.jvm" version "2.1.20" id "com.modrinth.minotaur" version "2.+" From 44b200259a2972721d23d1eeaea0ec0afa376ad3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 04:24:02 +0000 Subject: [PATCH 04/14] Bump org.jetbrains.kotlin.plugin.serialization from 2.1.20 to 2.1.21 Bumps org.jetbrains.kotlin.plugin.serialization from 2.1.20 to 2.1.21. --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-version: 2.1.21 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4bad3b3..a1e841e 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id "fabric-loom" version "1.10.5" - id "org.jetbrains.kotlin.plugin.serialization" version "2.1.20" + id "org.jetbrains.kotlin.plugin.serialization" version "2.1.21" id "org.jetbrains.kotlin.jvm" version "2.1.20" id "com.modrinth.minotaur" version "2.+" id "maven-publish" From a3860d7bb3edd61afa4e42829b0e06a3a15e048b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 09:37:37 +0000 Subject: [PATCH 05/14] Bump org.jetbrains.kotlin.jvm from 2.1.20 to 2.1.21 Bumps org.jetbrains.kotlin.jvm from 2.1.20 to 2.1.21. --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.jvm dependency-version: 2.1.21 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a1e841e..32291af 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id "fabric-loom" version "1.10.5" id "org.jetbrains.kotlin.plugin.serialization" version "2.1.21" - id "org.jetbrains.kotlin.jvm" version "2.1.20" + id "org.jetbrains.kotlin.jvm" version "2.1.21" id "com.modrinth.minotaur" version "2.+" id "maven-publish" } From 820a80f35b3282d898ecd7d5c72f83d385cfd7c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jun 2025 05:30:06 +0000 Subject: [PATCH 06/14] Bump fabric-loom from 1.10.5 to 1.11.1 Bumps fabric-loom from 1.10.5 to 1.11.1. --- updated-dependencies: - dependency-name: fabric-loom dependency-version: 1.11.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 32291af..6074c0e 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ import com.modrinth.minotaur.dependencies.ModDependency import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id "fabric-loom" version "1.10.5" + id "fabric-loom" version "1.11.1" id "org.jetbrains.kotlin.plugin.serialization" version "2.1.21" id "org.jetbrains.kotlin.jvm" version "2.1.21" id "com.modrinth.minotaur" version "2.+" From e435517793a9a5998947d05bd243beabc7bca245 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jun 2025 05:38:04 +0000 Subject: [PATCH 07/14] Bump org.jetbrains.kotlin.jvm from 2.1.21 to 2.2.0 Bumps org.jetbrains.kotlin.jvm from 2.1.21 to 2.2.0. --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.jvm dependency-version: 2.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 32291af..dfa6e58 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id "fabric-loom" version "1.10.5" id "org.jetbrains.kotlin.plugin.serialization" version "2.1.21" - id "org.jetbrains.kotlin.jvm" version "2.1.21" + id "org.jetbrains.kotlin.jvm" version "2.2.0" id "com.modrinth.minotaur" version "2.+" id "maven-publish" } From b2fd2bc83680706b075f4d145ea9e42d2c295807 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Jul 2025 12:04:22 +0000 Subject: [PATCH 08/14] Bump org.jetbrains.kotlin.plugin.serialization from 2.1.21 to 2.2.0 Bumps org.jetbrains.kotlin.plugin.serialization from 2.1.21 to 2.2.0. --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-version: 2.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f81b509..e6b7759 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { id "fabric-loom" version "1.11.1" - id "org.jetbrains.kotlin.plugin.serialization" version "2.1.21" + id "org.jetbrains.kotlin.plugin.serialization" version "2.2.0" id "org.jetbrains.kotlin.jvm" version "2.2.0" id "com.modrinth.minotaur" version "2.+" id "maven-publish" From 364147dfdd901ad29547805186f9096f75967148 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Jul 2025 05:23:41 +0000 Subject: [PATCH 09/14] Bump fabric-loom from 1.11.1 to 1.11.4 Bumps fabric-loom from 1.11.1 to 1.11.4. --- updated-dependencies: - dependency-name: fabric-loom dependency-version: 1.11.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e6b7759..70a8d83 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ import com.modrinth.minotaur.dependencies.ModDependency import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id "fabric-loom" version "1.11.1" + id "fabric-loom" version "1.11.4" id "org.jetbrains.kotlin.plugin.serialization" version "2.2.0" id "org.jetbrains.kotlin.jvm" version "2.2.0" id "com.modrinth.minotaur" version "2.+" From d4b2387117ada35e6c56122ce0cbbf5d4a1660c7 Mon Sep 17 00:00:00 2001 From: Artem Samchuk Date: Thu, 17 Jul 2025 18:19:57 +0300 Subject: [PATCH 10/14] update gradle --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e18bc25..d4081da 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-8.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 23c4979dd17f08c139202af0e2b3234de2ff1343 Mon Sep 17 00:00:00 2001 From: Artem Samchuk Date: Thu, 17 Jul 2025 18:26:58 +0300 Subject: [PATCH 11/14] closes #141 --- .../ua/pp/lumivoid/redstonehelper/commands/ColorcodeCommand.kt | 2 +- .../redstonehelper/network/packets/c2s/SetBlockC2SPacket.kt | 2 +- .../network/receiver/server/SetBlockPacketReceiver.kt | 2 +- .../ua/pp/lumivoid/redstonehelper/util/features/AutoWire.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/ua/pp/lumivoid/redstonehelper/commands/ColorcodeCommand.kt b/src/main/kotlin/ua/pp/lumivoid/redstonehelper/commands/ColorcodeCommand.kt index 52bcf3d..2a1fa1e 100644 --- a/src/main/kotlin/ua/pp/lumivoid/redstonehelper/commands/ColorcodeCommand.kt +++ b/src/main/kotlin/ua/pp/lumivoid/redstonehelper/commands/ColorcodeCommand.kt @@ -67,7 +67,7 @@ object ColorcodeCommand { "${StringArgumentType.getString(context, "color")}_${it}" ) if (Registries.BLOCK.containsId(fullId)) { - SendPacket.sendPacket(SetBlockC2SPacket(blockPos, fullId, Direction.UP, Constants.aMinecraftClass)) + SendPacket.sendPacket(SetBlockC2SPacket(blockPos, fullId, Direction.UP, false, Constants.aMinecraftClass)) totalBlocksColored++ } return@any true diff --git a/src/main/kotlin/ua/pp/lumivoid/redstonehelper/network/packets/c2s/SetBlockC2SPacket.kt b/src/main/kotlin/ua/pp/lumivoid/redstonehelper/network/packets/c2s/SetBlockC2SPacket.kt index e875143..10b0764 100644 --- a/src/main/kotlin/ua/pp/lumivoid/redstonehelper/network/packets/c2s/SetBlockC2SPacket.kt +++ b/src/main/kotlin/ua/pp/lumivoid/redstonehelper/network/packets/c2s/SetBlockC2SPacket.kt @@ -5,4 +5,4 @@ import net.minecraft.util.math.BlockPos import net.minecraft.util.math.Direction @JvmRecord -data class SetBlockC2SPacket(val blockPos: BlockPos, val block: Identifier, val direction: Direction, val aMinecraftClass: Identifier) +data class SetBlockC2SPacket(val blockPos: BlockPos, val block: Identifier, val direction: Direction, val isAuto: Boolean, val aMinecraftClass: Identifier) diff --git a/src/main/kotlin/ua/pp/lumivoid/redstonehelper/network/receiver/server/SetBlockPacketReceiver.kt b/src/main/kotlin/ua/pp/lumivoid/redstonehelper/network/receiver/server/SetBlockPacketReceiver.kt index 536d0df..52211bd 100644 --- a/src/main/kotlin/ua/pp/lumivoid/redstonehelper/network/receiver/server/SetBlockPacketReceiver.kt +++ b/src/main/kotlin/ua/pp/lumivoid/redstonehelper/network/receiver/server/SetBlockPacketReceiver.kt @@ -17,6 +17,7 @@ object SetBlockPacketReceiver { Constants.NET_CHANNEL.registerServerbound(SetBlockC2SPacket::class.java) { message, access -> Scheduling.scheduleAction(1) { // delay, need to place dust because it thinks there's no block under it + if (message.isAuto && !access.player.serverWorld.getBlockState(message.blockPos).isAir) return@scheduleAction var blockState = Registries.BLOCK.get(message.block).defaultState if (message.direction != Direction.UP) { @@ -33,7 +34,6 @@ object SetBlockPacketReceiver { access.player.serverWorld.setBlockState(message.blockPos, blockState) access.player.serverWorld.updateNeighbors(message.blockPos.east(), blockState.block) } - } } } \ No newline at end of file diff --git a/src/main/kotlin/ua/pp/lumivoid/redstonehelper/util/features/AutoWire.kt b/src/main/kotlin/ua/pp/lumivoid/redstonehelper/util/features/AutoWire.kt index 8447e08..8969b41 100644 --- a/src/main/kotlin/ua/pp/lumivoid/redstonehelper/util/features/AutoWire.kt +++ b/src/main/kotlin/ua/pp/lumivoid/redstonehelper/util/features/AutoWire.kt @@ -145,7 +145,7 @@ enum class AutoWire { logger.debug("Trying to set $block block at $blockPos") val blockToSet = Identifier.of(block) - SendPacket.sendPacket(SetBlockC2SPacket(blockPos.up(), blockToSet, direction, Constants.aMinecraftClass)) + SendPacket.sendPacket(SetBlockC2SPacket(blockPos.up(), blockToSet, direction, true, Constants.aMinecraftClass)) } abstract fun place(blockPos: BlockPos, player: PlayerEntity, world: World): String From 122d02f4bd660081ecc7cfa6f7720281a1f4fa2b Mon Sep 17 00:00:00 2001 From: Artem Samchuk Date: Thu, 17 Jul 2025 18:33:29 +0300 Subject: [PATCH 12/14] update dependencies --- gradle.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index d1a4588..089f6b5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,9 +7,9 @@ kotlin.daemon.jvmargs=-Xmx2G # check these on https://fabricmc.net/develop minecraft_version=1.21.4 yarn_mappings=1.21.4+build.8 -loader_version=0.16.10 -fabric_kotlin_version=1.13.0+kotlin.2.1.0 -fabric_api_version=0.115.0+1.21.4 +loader_version=0.16.14 +fabric_kotlin_version=1.13.4+kotlin.2.2.0 +fabric_api_version=0.119.3+1.21.4 # Mod Properties mod_version=0.2.5.4 @@ -21,7 +21,7 @@ archives_base_name=redstone-helper # -Fix - for small fixes and problems with launch version_suffix= -release_minecraft_versions=["1.21.3", "1.21.4"] +release_minecraft_versions=["1.21.4"] # Dependencies # https://mathparser.org/ From 91c4f5263404164ce9f7f3091ed4cfa97a8831b1 Mon Sep 17 00:00:00 2001 From: Artem Samchuk Date: Thu, 17 Jul 2025 18:40:34 +0300 Subject: [PATCH 13/14] update 0.2.5.5 --- CHANGELOG.md | 9 ++------- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c10db35..ed2a062 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,3 @@ -Hi! Version 0.2.5.4 +Hi! Version 0.2.5.5 -- Fixed scaling for macro's screens, now you can use it with any ui scale -- Fixed but with key handler in macro edit screen (before you can't press backspace, now you can) -- Cleanups "under the hood" deleted useless "dead" code -- Removed useless argument "test" from /redstone-helper -- Removed useless argument "cleanup" from /redstone-helper -- Now if redstone helper created a config file the first time, it didn't cause errors in logs \ No newline at end of file +Fixed [#141](https://github.com/Bumer-32/Redstone-Helper/issues/141), now auto wire will not overwrite blocks (Thanks [ibotimew](https://github.com/ibotimew)) \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 089f6b5..1c14830 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ fabric_kotlin_version=1.13.4+kotlin.2.2.0 fabric_api_version=0.119.3+1.21.4 # Mod Properties -mod_version=0.2.5.4 +mod_version=0.2.5.5 maven_group=ua.pp.lumivoid.redstonehelper archives_base_name=redstone-helper From 06c8cc8d61b79d59da0f4677e1a156c6719ad957 Mon Sep 17 00:00:00 2001 From: Artem Samchuk Date: Thu, 17 Jul 2025 18:52:15 +0300 Subject: [PATCH 14/14] fix autowire with airplace --- CHANGELOG.md | 2 +- .../redstonehelper/keybindings/minecraft/UseKeyBinding.kt | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed2a062..fe147fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ Hi! Version 0.2.5.5 -Fixed [#141](https://github.com/Bumer-32/Redstone-Helper/issues/141), now auto wire will not overwrite blocks (Thanks [ibotimew](https://github.com/ibotimew)) \ No newline at end of file + - Fixed [#141](https://github.com/Bumer-32/Redstone-Helper/issues/141), now autowire will not overwrite blocks, also no autowire works with airplace (Thanks [ibotimew](https://github.com/ibotimew)) \ No newline at end of file diff --git a/src/main/kotlin/ua/pp/lumivoid/redstonehelper/keybindings/minecraft/UseKeyBinding.kt b/src/main/kotlin/ua/pp/lumivoid/redstonehelper/keybindings/minecraft/UseKeyBinding.kt index d9d7e56..a7d6ba6 100644 --- a/src/main/kotlin/ua/pp/lumivoid/redstonehelper/keybindings/minecraft/UseKeyBinding.kt +++ b/src/main/kotlin/ua/pp/lumivoid/redstonehelper/keybindings/minecraft/UseKeyBinding.kt @@ -26,6 +26,11 @@ object UseKeyBinding { client.player!!.swingHand(client.player!!.activeHand) client.networkHandler!!.sendPacket(PlayerInteractBlockC2SPacket(client.player!!.activeHand, hit, 1)) lastBlockPlacementTime = currentTime + + // Autowire + if (ClientOptions.isAutoWireEnabled) { + ClientOptions.autoWireMode.place(hit.blockPos, client.player!!, client.player!!.world) + } } } }