From e6c82d422d18f304e9870ddfb3fdea2913ec4ca4 Mon Sep 17 00:00:00 2001 From: ReignOfFROZE Date: Sun, 20 Apr 2025 11:24:25 -0400 Subject: [PATCH 1/5] Revert file mode changes --- .github/scripts/test_no_error_reports | 0 gradlew | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .github/scripts/test_no_error_reports mode change 100644 => 100755 gradlew diff --git a/.github/scripts/test_no_error_reports b/.github/scripts/test_no_error_reports old mode 100644 new mode 100755 diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 From 6a4886796af5b52e3eca506f78961b6c7a994aa2 Mon Sep 17 00:00:00 2001 From: ReignOfFROZE Date: Sun, 20 Apr 2025 11:46:17 -0400 Subject: [PATCH 2/5] Switched to using SyncedKeybind instead of vanilla keybind implementation --- .../structurelib/ClientProxy.java | 94 +++++++------------ .../structurelib/StructureLib.java | 6 -- .../StructureProjectorCycleModeMessage.java | 37 -------- 3 files changed, 34 insertions(+), 103 deletions(-) delete mode 100644 src/main/java/com/gtnewhorizon/structurelib/net/StructureProjectorCycleModeMessage.java diff --git a/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java b/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java index 21dc68b4..7b70edbd 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java +++ b/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java @@ -1,16 +1,21 @@ package com.gtnewhorizon.structurelib; -import static com.gtnewhorizon.structurelib.StructureLib.RANDOM; - -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.UUID; - +import com.gtnewhorizon.gtnhlib.keybind.SyncedKeybind; +import com.gtnewhorizon.structurelib.entity.fx.WeightlessParticleFX; +import com.gtnewhorizon.structurelib.item.ItemConstructableTrigger; +import com.gtnewhorizon.structurelib.net.RegistryOrderSyncMessage; +import com.gtnewhorizon.structurelib.net.SetChannelDataMessage; +import cpw.mods.fml.client.config.GuiConfig; +import cpw.mods.fml.client.event.ConfigChangedEvent; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import cpw.mods.fml.common.network.FMLNetworkEvent; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; @@ -20,7 +25,6 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.culling.Frustrum; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.I18n; -import net.minecraft.client.settings.KeyBinding; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -36,30 +40,19 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.world.WorldEvent; - import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; -import com.gtnewhorizon.structurelib.entity.fx.WeightlessParticleFX; -import com.gtnewhorizon.structurelib.net.RegistryOrderSyncMessage; -import com.gtnewhorizon.structurelib.net.SetChannelDataMessage; -import com.gtnewhorizon.structurelib.net.StructureProjectorCycleModeMessage; +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.UUID; -import cpw.mods.fml.client.config.GuiConfig; -import cpw.mods.fml.client.event.ConfigChangedEvent; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLLoadCompleteEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.InputEvent; -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.network.FMLNetworkEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import static com.gtnewhorizon.structurelib.StructureLib.RANDOM; public class ClientProxy extends CommonProxy { @@ -71,6 +64,15 @@ public class ClientProxy extends CommonProxy { */ private static final List allGroups = new ArrayList<>(); + private static final SyncedKeybind MODE_SWAP_KEY = SyncedKeybind + .createConfigurable("item.structurelib.constructableTrigger.keys.cycleMode", "item.structurelib.constructableTrigger.keyCategory", 0) + .registerGlobalListener((entityPlayerMP, syncedKeybind) -> { + final ItemStack held = entityPlayerMP.getHeldItem(); + if (held != null && held.getItem() instanceof ItemConstructableTrigger) { + ItemConstructableTrigger.cycleMode(held); + } + }); + /** * Current batch of hints. Belongs to the same logical multiblock. */ @@ -269,8 +271,6 @@ public class ClientProxy extends CommonProxy { @Override public void init(FMLInitializationEvent e) { super.init(e); - - MinecraftForge.EVENT_BUS.register(new KeybindHandler()); } static void markTextureUsed(IIcon icon) { @@ -668,30 +668,4 @@ public class ClientProxy extends CommonProxy { p.endSection(); } } - - public static class KeybindHandler { - - private static final KeyBinding CYCLE_PROJECTOR_MODE = new KeyBinding( - "item.structurelib.constructableTrigger.keys.cycleMode", - 0, - "item.structurelib.constructableTrigger.keyCategory"); - - public KeybindHandler() { - FMLCommonHandler.instance().bus().register(this); - // If somebody wants to make a UI element for this, be my guest - ClientRegistry.registerKeyBinding(CYCLE_PROJECTOR_MODE); - } - - @SideOnly(Side.CLIENT) - @SubscribeEvent - public void key(InputEvent.KeyInputEvent event) { - if (CYCLE_PROJECTOR_MODE.isPressed()) { - cycleProjectorMode(); - } - } - - private static void cycleProjectorMode() { - StructureLib.net.sendToServer(new StructureProjectorCycleModeMessage()); - } - } } diff --git a/src/main/java/com/gtnewhorizon/structurelib/StructureLib.java b/src/main/java/com/gtnewhorizon/structurelib/StructureLib.java index 3c36ba86..0d38f4ea 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/StructureLib.java +++ b/src/main/java/com/gtnewhorizon/structurelib/StructureLib.java @@ -20,7 +20,6 @@ import com.gtnewhorizon.structurelib.net.AlignmentMessage; import com.gtnewhorizon.structurelib.net.ErrorHintParticleMessage; import com.gtnewhorizon.structurelib.net.RegistryOrderSyncMessage; import com.gtnewhorizon.structurelib.net.SetChannelDataMessage; -import com.gtnewhorizon.structurelib.net.StructureProjectorCycleModeMessage; import com.gtnewhorizon.structurelib.net.UpdateHintParticleMessage; import com.gtnewhorizon.structurelib.util.InventoryUtility; import com.gtnewhorizon.structurelib.util.XSTR; @@ -72,11 +71,6 @@ public class StructureLib { net.registerMessage(SetChannelDataMessage.Handler.class, SetChannelDataMessage.class, 3, Side.SERVER); net.registerMessage(ErrorHintParticleMessage.Handler.class, ErrorHintParticleMessage.class, 4, Side.CLIENT); net.registerMessage(RegistryOrderSyncMessage.Handler.class, RegistryOrderSyncMessage.class, 5, Side.SERVER); - net.registerMessage( - StructureProjectorCycleModeMessage.Handler.class, - StructureProjectorCycleModeMessage.class, - 6, - Side.SERVER); try { DEBUG_MODE = Boolean.parseBoolean(System.getProperty("structurelib.debug")); diff --git a/src/main/java/com/gtnewhorizon/structurelib/net/StructureProjectorCycleModeMessage.java b/src/main/java/com/gtnewhorizon/structurelib/net/StructureProjectorCycleModeMessage.java deleted file mode 100644 index 80858eac..00000000 --- a/src/main/java/com/gtnewhorizon/structurelib/net/StructureProjectorCycleModeMessage.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gtnewhorizon.structurelib.net; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; - -import com.gtnewhorizon.structurelib.item.ItemConstructableTrigger; - -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; - -public class StructureProjectorCycleModeMessage implements IMessage { - - @Override - public void fromBytes(ByteBuf buf) { - // no op - } - - @Override - public void toBytes(ByteBuf buf) { - // no op - } - - public static class Handler implements IMessageHandler { - - @Override - public IMessage onMessage(StructureProjectorCycleModeMessage message, MessageContext ctx) { - EntityPlayerMP player = ctx.getServerHandler().playerEntity; - final ItemStack held = player.getHeldItem(); - if (held != null && held.getItem() instanceof ItemConstructableTrigger) { - ItemConstructableTrigger.cycleMode(held); - } - return null; - } - } -} From 086b0a00ffd5c8690df9befdfbb6587e237fa754 Mon Sep 17 00:00:00 2001 From: ReignOfFROZE Date: Sun, 20 Apr 2025 11:48:23 -0400 Subject: [PATCH 3/5] Spotless --- .../structurelib/ClientProxy.java | 70 ++++++++++--------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java b/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java index 7b70edbd..84721595 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java +++ b/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java @@ -1,21 +1,16 @@ package com.gtnewhorizon.structurelib; -import com.gtnewhorizon.gtnhlib.keybind.SyncedKeybind; -import com.gtnewhorizon.structurelib.entity.fx.WeightlessParticleFX; -import com.gtnewhorizon.structurelib.item.ItemConstructableTrigger; -import com.gtnewhorizon.structurelib.net.RegistryOrderSyncMessage; -import com.gtnewhorizon.structurelib.net.SetChannelDataMessage; -import cpw.mods.fml.client.config.GuiConfig; -import cpw.mods.fml.client.event.ConfigChangedEvent; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLLoadCompleteEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.network.FMLNetworkEvent; +import static com.gtnewhorizon.structurelib.StructureLib.RANDOM; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; @@ -40,19 +35,27 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.world.WorldEvent; + import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import com.gtnewhorizon.gtnhlib.keybind.SyncedKeybind; +import com.gtnewhorizon.structurelib.entity.fx.WeightlessParticleFX; +import com.gtnewhorizon.structurelib.item.ItemConstructableTrigger; +import com.gtnewhorizon.structurelib.net.RegistryOrderSyncMessage; +import com.gtnewhorizon.structurelib.net.SetChannelDataMessage; -import static com.gtnewhorizon.structurelib.StructureLib.RANDOM; +import cpw.mods.fml.client.config.GuiConfig; +import cpw.mods.fml.client.event.ConfigChangedEvent; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import cpw.mods.fml.common.network.FMLNetworkEvent; public class ClientProxy extends CommonProxy { @@ -64,14 +67,15 @@ public class ClientProxy extends CommonProxy { */ private static final List allGroups = new ArrayList<>(); - private static final SyncedKeybind MODE_SWAP_KEY = SyncedKeybind - .createConfigurable("item.structurelib.constructableTrigger.keys.cycleMode", "item.structurelib.constructableTrigger.keyCategory", 0) - .registerGlobalListener((entityPlayerMP, syncedKeybind) -> { - final ItemStack held = entityPlayerMP.getHeldItem(); - if (held != null && held.getItem() instanceof ItemConstructableTrigger) { - ItemConstructableTrigger.cycleMode(held); - } - }); + private static final SyncedKeybind MODE_SWAP_KEY = SyncedKeybind.createConfigurable( + "item.structurelib.constructableTrigger.keys.cycleMode", + "item.structurelib.constructableTrigger.keyCategory", + 0).registerGlobalListener((entityPlayerMP, syncedKeybind) -> { + final ItemStack held = entityPlayerMP.getHeldItem(); + if (held != null && held.getItem() instanceof ItemConstructableTrigger) { + ItemConstructableTrigger.cycleMode(held); + } + }); /** * Current batch of hints. Belongs to the same logical multiblock. From f1473bbb3afd6f9ae73843eee1b970f13eba4ec7 Mon Sep 17 00:00:00 2001 From: ReignOfFROZE Date: Sun, 20 Apr 2025 11:49:45 -0400 Subject: [PATCH 4/5] Bapy-ized textures --- .../items/constructableTrigger/BUILDING.png | Bin 667 -> 386 bytes .../items/constructableTrigger/REMOVING.png | Bin 821 -> 392 bytes .../items/constructableTrigger/UPDATING.png | Bin 724 -> 365 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/structurelib/textures/items/constructableTrigger/BUILDING.png b/src/main/resources/assets/structurelib/textures/items/constructableTrigger/BUILDING.png index dd2b6911c96265f8808da13efa12c201ec70b56a..3a5943d641a597432942e58350711c0ef4c53250 100644 GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh1|;P@bT2Y6FzS1{IEH9UoIBAr`%r*L+x(c8 zX&z?-n)0kf=ja5z5SnvzV^cDl`0_u@{~gVDhfL7ByQ{2_@7yD`l1<)*Q}{f0ipLgN zdkEQcY^hyd&Hvu=eX&K`HK~gqO!tTGP>JL1Y0CKV>sslKJpw!Lt$#mb?VSx3Rm&c2 z5!|{_k0Ix28~;w@xuWMUx2?VNgwOb2^DHwal@pa-m#*i}Uy~lpb-eBOz60}}SMU7& zySO6uNRN$h!@TY7vsB{B^ZD9V1k6)$Z%neCt<=}6d_LvL%oPET%5oUgoTaxX8%y3= zY3{wI_iN~Pz4GH40WW{20LeWzAs?Sd=GI>i6Rx^fJxwDkxi|E@uXR8X-{M~@wEboW z?d-^$sct8#wa8&vM?@*dbjd6ck3|kaTH-g?Kh<>p+x+P2fgg-HWj*|R?}*+3g=1=j dXPU1sgBFm@0mLA1DR?r7@^tlcS?83{1OWJ@p%wrD literal 667 zcmV;M0%ZM(P)WFU8GbZ8()Nlj2>E@cM*00I9=L_t(I%Z-!2YZP%1 z#XoP83lf586(nL~ks^{q2%Ac@P~kwavrHov7J`J>=#hkM5ygPm#?HdOK-ePKXya}U zA!n=tpY;N7XSUAo12lHm$yqOVwmLwUqnnxUO6NcXb(P*5*_eV)n z$I#F~#b1@zjhDTf@jv$Fu8II=#^mHHK8X))1zsHg0uF(F%3$?@trB<_aK!OXyfFL* zIG{r>ecDM_{^GQ#jH-Vv!hkHNwEQ?Ns7Q*$6l)|W|IPZ*kdNH<7iJBZl%{-Vv_d}CT^cZ1uqemDH=`=xbn>2OhL0V9UEcKZR6{*u)AO*`@~$z&K-^iUWRC$6g9p3SGQSEbHhvm9upW?OZq z43_T9tJ%C#fRAruWu3PO!!JNaqcM)}pZVuH{{bT)`KeX{RHFa@002ovPDHLkV1ltg BBDVkl diff --git a/src/main/resources/assets/structurelib/textures/items/constructableTrigger/REMOVING.png b/src/main/resources/assets/structurelib/textures/items/constructableTrigger/REMOVING.png index adcb90dee9cbcc7cbfe53e8600c0b0f223e6a5fa..5c00b30ccbaa78b6ed86f2829c74020059aa17eb 100644 GIT binary patch literal 392 zcmV;30eAk1P)At56otP$qy_~o6w$xnE_AV-U0mJjRB&o{q5q&`94d6O&_TL&v1{z;&`s#(B8DKX zf%iz3ybjSvS|do$^0@b&bMCo3OKXiQ%9aY zOsm#lDDpZ75JnP~5&%12G=eaa2hFViL^VPH6S>_aetkDY(QX2uUfuxkSD#E)GsK?d z7(OwM427Qf;z@yP zz@6fc#!21npaKsSc-b3O;3XT}DT{%F3Op7ACv&5vwPq;tx{jSm_zUwL57vop)fyB_ zRSJdj9#N?cavO27no-AQPDpM?kb#E`Jc^|%>E0ojs7K}8q8CTj4~qzpJ0Mc_i~s-t m4rN$LW=%~1DgXcg2mk;800000(o>TF0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA0?J85K~y+TZIe%E zTvZswfA>x1Ihq@*L(?RNl$02nI+)37M%#r7wm66=8fhqG7AAGm;-XaDL>=4WN{xyX zL^mn~1VIbZkrouJh#f=KP+DzmwM|Jw+DR5k=g)h2@3?rAF+$Jo!a3*r?%{lf28100 z9tK`Q%au}TfnxC=z>v#rCX?yF_d{Gawk83;($3C*L^|8s~q++v1zOX1zfd zaD3iv9Xi;*i>dq4NCFHxc_89QIJ+jJu_q52);5sD;NTRi?kRnH_82`jj`{o}oVR|6 zD9teu!c!kOKqs&p&kHzwxP&o>aMF2&$G%pW>`{16xAu4MPZ0r&p(WY-NEx`fm~4djD&lC@mm9k0a?A7Fh~2@Fjsd2UJ=B~SMo}(p zfls!w#EHv4eg!-M2+s=;_7P!!U2^VK@a!}4&VMhH&dW*XRj*x8z4oV)soe@5+OE23 zldvnoo)LDOD0N#9_OJb&8M)hrRj-~?t$I#QYFJKcSmuG}R4Y&GlMP!n(LN+$2ZgmX zn}|)c_wA^bTU?NujWY<**uU{kB_203GY2q@D~S5sw^Na@!ECnSKQjb}#$GoQ6OT5< ztiQ%JcwRs}?ocYtQ!HKt0&=;nWHMd1J?DP`HIPPtGyiB700000NkvXXu0mjf3A}i- diff --git a/src/main/resources/assets/structurelib/textures/items/constructableTrigger/UPDATING.png b/src/main/resources/assets/structurelib/textures/items/constructableTrigger/UPDATING.png index c9ed6178e393652942d771591b1f1693bcbfd78d..28a34c43d6dde3222918e97d0cda1e0a83ae1f89 100644 GIT binary patch literal 365 zcmV-z0h0cSP)YU6vlt|wy31FixK(&E`5SJba66^lN}4vLAv`O-2|nBpgu&lVxPdRi<=;UMv&N> zCWYj>H2-K))Ni`?obNm5JNI0nwMNeRn%`o+Bp%s9h?h&3TTS(R+?#^}FGHEqx7{=Zf&-d4OYO@O4g-#RZ%gm~$B0ROC z)yRHMBG_&94~R#$_yORTc<1tZ{KWtO01jnXNoGw=04e|g00;m8000000Mb*F00000 LNkvXXu0mjfB}tv+ literal 724 zcmV;_0xSKAP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf6951U69E94oEQKA0%=J^K~y+Tb(2p> zR8bVhf9E+f>Qyudo(NhNND$&w)EFU2&>w`BwJIj4MQ&Uaw2J^S*iSw0JX%xw8Who)aj@<{zIavj01q?>r z3Zw3*QFlNNo>$M#YsP+8i6_=hUd%X4G9V>IP!etprAZr9X)i z&1$nj+2mic{-rie^MzX19H z3w$dO0C+iiilgu5iFS@t{B)Sh?_(r}XNg|0TV!T82kF;>NKq&yEXu&sP#9_!8L->GQ2JqohgO@N+&+o1AV|w z;8I!^o^45a_?@>!t1E$C-~_M%%w^M74%7hmfSYMq@c#nEi4f{uJ?uOH0000kE! From bbcf3a86694ad3e56d60f5a323ad21569f476139 Mon Sep 17 00:00:00 2001 From: ReignOfFROZE Date: Sun, 20 Apr 2025 11:52:25 -0400 Subject: [PATCH 5/5] Moved keybind to CommonProxy --- .../com/gtnewhorizon/structurelib/ClientProxy.java | 12 ------------ .../com/gtnewhorizon/structurelib/CommonProxy.java | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java b/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java index 84721595..3fceb0fa 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java +++ b/src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java @@ -39,9 +39,7 @@ import net.minecraftforge.event.world.WorldEvent; import org.apache.commons.lang3.tuple.Pair; import org.lwjgl.opengl.GL11; -import com.gtnewhorizon.gtnhlib.keybind.SyncedKeybind; import com.gtnewhorizon.structurelib.entity.fx.WeightlessParticleFX; -import com.gtnewhorizon.structurelib.item.ItemConstructableTrigger; import com.gtnewhorizon.structurelib.net.RegistryOrderSyncMessage; import com.gtnewhorizon.structurelib.net.SetChannelDataMessage; @@ -67,16 +65,6 @@ public class ClientProxy extends CommonProxy { */ private static final List allGroups = new ArrayList<>(); - private static final SyncedKeybind MODE_SWAP_KEY = SyncedKeybind.createConfigurable( - "item.structurelib.constructableTrigger.keys.cycleMode", - "item.structurelib.constructableTrigger.keyCategory", - 0).registerGlobalListener((entityPlayerMP, syncedKeybind) -> { - final ItemStack held = entityPlayerMP.getHeldItem(); - if (held != null && held.getItem() instanceof ItemConstructableTrigger) { - ItemConstructableTrigger.cycleMode(held); - } - }); - /** * Current batch of hints. Belongs to the same logical multiblock. */ diff --git a/src/main/java/com/gtnewhorizon/structurelib/CommonProxy.java b/src/main/java/com/gtnewhorizon/structurelib/CommonProxy.java index 8660c8fe..f8d3bbea 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/CommonProxy.java +++ b/src/main/java/com/gtnewhorizon/structurelib/CommonProxy.java @@ -14,6 +14,8 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import com.gtnewhorizon.gtnhlib.keybind.SyncedKeybind; +import com.gtnewhorizon.structurelib.item.ItemConstructableTrigger; import com.gtnewhorizon.structurelib.net.ErrorHintParticleMessage; import com.gtnewhorizon.structurelib.net.UpdateHintParticleMessage; @@ -111,6 +113,16 @@ public class CommonProxy { } } + private static final SyncedKeybind MODE_SWAP_KEY = SyncedKeybind.createConfigurable( + "item.structurelib.constructableTrigger.keys.cycleMode", + "item.structurelib.constructableTrigger.keyCategory", + 0).registerGlobalListener((entityPlayerMP, syncedKeybind) -> { + final ItemStack held = entityPlayerMP.getHeldItem(); + if (held != null && held.getItem() instanceof ItemConstructableTrigger) { + ItemConstructableTrigger.cycleMode(held); + } + }); + public void displayConfigGUI(String category) {} public static class ForgeEventHandler {