Skip to content

Commit b55a0d0

Browse files
committed
Merge branch 'dev' into release/1.20
# Conflicts: # gradle/libs.versions.toml
2 parents a3f1aa3 + 29cfcc1 commit b55a0d0

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

OptiGUI/src/main/kotlin/opekope2/optigui/internal/fabric/FabricInteractionHandler.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import net.fabricmc.fabric.api.event.player.UseItemCallback
66
import net.minecraft.entity.Entity
77
import net.minecraft.entity.player.PlayerEntity
88
import net.minecraft.item.ItemStack
9-
import net.minecraft.item.Items
109
import net.minecraft.util.ActionResult
1110
import net.minecraft.util.Hand
1211
import net.minecraft.util.TypedActionResult
@@ -68,11 +67,10 @@ internal object FabricInteractionHandler : UseBlockCallback, UseEntityCallback,
6867

6968
if (!world.isClient) return result
7069

71-
if (stack.isOf(Items.WRITABLE_BOOK) || stack.isOf(Items.WRITTEN_BOOK)) {
72-
InteractionManager.prepare(
73-
ItemInteractionData(stack, InteractionPlayerData(player, hand))
74-
)
75-
}
70+
InteractionManager.prepare(
71+
ItemInteractionData(stack, InteractionPlayerData(player, hand))
72+
)
73+
7674
return result
7775
}
7876
}

buildSrc/build.gradle.kts

Lines changed: 0 additions & 7 deletions
This file was deleted.

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
java = "17"
33
kotlin = "1.9.20"
4-
optigui = "3.0.0-alpha.2+fabric.1.20"
4+
optigui = "3.0.0-alpha.3+fabric.1.20"
55
minecraft = "1.20"
66
yarn = "1.20+build.1"
77
fabric-loom = "1.8-SNAPSHOT" # 1.9 refuses to resolve dependencies

0 commit comments

Comments
 (0)