From e2fa31b680f4fbdd0b7a56aecf58dd646af3b171 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Mon, 1 Mar 2021 21:30:13 -0500 Subject: [PATCH] Change screen handler constant names --- .../shadowfacts/phycon/PhysicalConnectivityClient.kt | 7 ++----- .../phycon/block/inserter/InserterScreenHandler.kt | 2 +- .../phycon/block/terminal/TerminalScreenHandler.kt | 2 +- .../kotlin/net/shadowfacts/phycon/init/PhyScreens.kt | 10 ++++------ 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/main/kotlin/net/shadowfacts/phycon/PhysicalConnectivityClient.kt b/src/main/kotlin/net/shadowfacts/phycon/PhysicalConnectivityClient.kt index c92be8b..c8e55ec 100644 --- a/src/main/kotlin/net/shadowfacts/phycon/PhysicalConnectivityClient.kt +++ b/src/main/kotlin/net/shadowfacts/phycon/PhysicalConnectivityClient.kt @@ -1,12 +1,9 @@ package net.shadowfacts.phycon import net.fabricmc.api.ClientModInitializer -import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking import net.fabricmc.fabric.api.client.screenhandler.v1.ScreenRegistry -import net.minecraft.client.render.RenderLayer import net.shadowfacts.phycon.block.inserter.InserterScreen -import net.shadowfacts.phycon.init.PhyBlocks import net.shadowfacts.phycon.init.PhyScreens import net.shadowfacts.phycon.block.terminal.TerminalScreen import net.shadowfacts.phycon.networking.ClientReceiver @@ -18,8 +15,8 @@ import net.shadowfacts.phycon.networking.S2CTerminalUpdateDisplayedItems object PhysicalConnectivityClient: ClientModInitializer { override fun onInitializeClient() { - ScreenRegistry.register(PhyScreens.TERMINAL_SCREEN_HANDLER, ::TerminalScreen) - ScreenRegistry.register(PhyScreens.INSERTER_SCREEN_HANDLER, ::InserterScreen) + ScreenRegistry.register(PhyScreens.TERMINAL, ::TerminalScreen) + ScreenRegistry.register(PhyScreens.INSERTER, ::InserterScreen) registerGlobalReceiver(S2CTerminalUpdateDisplayedItems) } diff --git a/src/main/kotlin/net/shadowfacts/phycon/block/inserter/InserterScreenHandler.kt b/src/main/kotlin/net/shadowfacts/phycon/block/inserter/InserterScreenHandler.kt index 81a4444..ba15769 100644 --- a/src/main/kotlin/net/shadowfacts/phycon/block/inserter/InserterScreenHandler.kt +++ b/src/main/kotlin/net/shadowfacts/phycon/block/inserter/InserterScreenHandler.kt @@ -22,7 +22,7 @@ class InserterScreenHandler( syncId: Int, playerInv: PlayerInventory, val inserter: InserterBlockEntity, -): ScreenHandler(PhyScreens.INSERTER_SCREEN_HANDLER, syncId) { +): ScreenHandler(PhyScreens.INSERTER, syncId) { companion object { val ID = Identifier(PhysicalConnectivity.MODID, "inserter") diff --git a/src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalScreenHandler.kt b/src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalScreenHandler.kt index 4cfe6ff..25d4f5b 100644 --- a/src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalScreenHandler.kt +++ b/src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalScreenHandler.kt @@ -22,7 +22,7 @@ import kotlin.math.min /** * @author shadowfacts */ -class TerminalScreenHandler(syncId: Int, val playerInv: PlayerInventory, val terminal: TerminalBlockEntity): ScreenHandler(PhyScreens.TERMINAL_SCREEN_HANDLER, syncId), +class TerminalScreenHandler(syncId: Int, val playerInv: PlayerInventory, val terminal: TerminalBlockEntity): ScreenHandler(PhyScreens.TERMINAL, syncId), TerminalBlockEntity.NetItemObserver { companion object { diff --git a/src/main/kotlin/net/shadowfacts/phycon/init/PhyScreens.kt b/src/main/kotlin/net/shadowfacts/phycon/init/PhyScreens.kt index f8f36e5..66bcff5 100644 --- a/src/main/kotlin/net/shadowfacts/phycon/init/PhyScreens.kt +++ b/src/main/kotlin/net/shadowfacts/phycon/init/PhyScreens.kt @@ -2,21 +2,19 @@ package net.shadowfacts.phycon.init import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry import net.minecraft.screen.ScreenHandlerType -import net.minecraft.util.Identifier -import net.shadowfacts.phycon.PhysicalConnectivity import net.shadowfacts.phycon.block.inserter.InserterScreenHandler import net.shadowfacts.phycon.block.terminal.TerminalScreenHandler object PhyScreens { - lateinit var TERMINAL_SCREEN_HANDLER: ScreenHandlerType + lateinit var TERMINAL: ScreenHandlerType private set - lateinit var INSERTER_SCREEN_HANDLER: ScreenHandlerType + lateinit var INSERTER: ScreenHandlerType private set fun init() { - TERMINAL_SCREEN_HANDLER = ScreenHandlerRegistry.registerExtended(TerminalScreenHandler.ID, ::TerminalScreenHandler) - INSERTER_SCREEN_HANDLER = ScreenHandlerRegistry.registerExtended(InserterScreenHandler.ID, ::InserterScreenHandler) + TERMINAL = ScreenHandlerRegistry.registerExtended(TerminalScreenHandler.ID, ::TerminalScreenHandler) + INSERTER = ScreenHandlerRegistry.registerExtended(InserterScreenHandler.ID, ::InserterScreenHandler) } }