From d71f7af0be3463770c30f8e415362740887517ad Mon Sep 17 00:00:00 2001 From: opekope2 Date: Thu, 20 Jul 2023 01:53:19 +0200 Subject: [PATCH 1/2] Fix #62 Move hanging signs to OptiGlue --- .../optigui/internal/BuiltinPreprocessors.kt | 13 ------------- .../opekope2/optiglue_1_19_3/OptiGlueMod.kt | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/OptiGUI/src/main/kotlin/opekope2/optigui/internal/BuiltinPreprocessors.kt b/OptiGUI/src/main/kotlin/opekope2/optigui/internal/BuiltinPreprocessors.kt index 5314f47d..549634b1 100644 --- a/OptiGUI/src/main/kotlin/opekope2/optigui/internal/BuiltinPreprocessors.kt +++ b/OptiGUI/src/main/kotlin/opekope2/optigui/internal/BuiltinPreprocessors.kt @@ -59,8 +59,6 @@ internal fun initializePreprocessors(context: InitializerContext) { context.registerPreprocessor(::processCommonComparable) context.registerPreprocessor(::processLectern) - - context.registerPreprocessor(::processHangingSign) } private val lookup: RegistryLookupService by lazy(::getService) @@ -182,17 +180,6 @@ private fun processVillager(villager: VillagerEntity): Any? { ) } -private fun processHangingSign(sign: HangingSignBlockEntity): Any? { - val world = sign.world ?: return null - - return DefaultProperties( - container = lookup.lookupBlockId(world.getBlockState(sign.pos).block), - name = null, - biome = lookup.lookupBiomeId(world, sign.pos), - height = sign.pos.y - ) -} - private fun processLectern(lectern: LecternBlockEntity): Any? { val world = lectern.world ?: return null // Workaround, because LecternBlockEntity doesn't sync diff --git a/OptiGlue/1.19.3/src/main/kotlin/opekope2/optiglue_1_19_3/OptiGlueMod.kt b/OptiGlue/1.19.3/src/main/kotlin/opekope2/optiglue_1_19_3/OptiGlueMod.kt index 4c1f093b..d64ee5fa 100644 --- a/OptiGlue/1.19.3/src/main/kotlin/opekope2/optiglue_1_19_3/OptiGlueMod.kt +++ b/OptiGlue/1.19.3/src/main/kotlin/opekope2/optiglue_1_19_3/OptiGlueMod.kt @@ -1,6 +1,7 @@ package opekope2.optiglue_1_19_3 import net.fabricmc.fabric.api.resource.ResourceManagerHelper +import net.minecraft.block.entity.HangingSignBlockEntity import net.minecraft.client.gui.screen.ingame.HangingSignEditScreen import net.minecraft.entity.passive.CamelEntity import net.minecraft.entity.vehicle.ChestBoatEntity @@ -11,6 +12,7 @@ import opekope2.optigui.InitializerContext import opekope2.optigui.internal.processCommon import opekope2.optigui.internal.service.RetexturableScreensRegistryService import opekope2.optigui.properties.ChestBoatProperties +import opekope2.optigui.properties.DefaultProperties import opekope2.optigui.service.RegistryLookupService import opekope2.optigui.service.ResourceAccessService import opekope2.optigui.service.getService @@ -33,6 +35,8 @@ object OptiGlueMod : EntryPoint { context.registerPreprocessor(::processChestBoat) context.registerPreprocessor(::processCommon) + context.registerPreprocessor(::processHangingSign) + ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(ResourceLoader) logger.info("OptiGlue initialized.") @@ -49,4 +53,16 @@ object OptiGlueMod : EntryPoint { variant = chestBoat.variant.getName() ) } + + + private fun processHangingSign(sign: HangingSignBlockEntity): Any? { + val world = sign.world ?: return null + + return DefaultProperties( + container = lookup.lookupBlockId(world.getBlockState(sign.pos).block), + name = null, + biome = lookup.lookupBiomeId(world, sign.pos), + height = sign.pos.y + ) + } } From 024decbbf677f7822eaddbdbb15f6986bb0872f5 Mon Sep 17 00:00:00 2001 From: opekope2 Date: Thu, 20 Jul 2023 01:53:27 +0200 Subject: [PATCH 2/2] Bump version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ab933016..1c56c6d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loom_version=1.2-SNAPSHOT java_version=17 ########################################################################## # Mod Properties -mod_version=2.1.3 +mod_version=2.1.4 maven_group=opekope2.optigui ########################################################################## # Kotlin Dependencies