From 42414c103e43eb4306a6aefee7a2578961087f11 Mon Sep 17 00:00:00 2001 From: Motschen Date: Mon, 31 Oct 2022 10:12:09 +0100 Subject: [PATCH] Fix MidnightConfig command on Forge --- .../midnightdust/core/MidnightLibServer.java | 1 - ...ents.java => MidnightLibClientEvents.java} | 8 +----- .../midnightdust/forge/MidnightLibForge.java | 3 ++- .../forge/MidnightLibServerEvents.java | 23 ++++++++++++++++++ forge/src/main/resources/META-INF/mods.toml | 1 + forge/src/main/resources/midnightlib.png | Bin 0 -> 2801 bytes 6 files changed, 27 insertions(+), 9 deletions(-) rename forge/src/main/java/eu/midnightdust/forge/{MidnightLibEvents.java => MidnightLibClientEvents.java} (80%) create mode 100644 forge/src/main/java/eu/midnightdust/forge/MidnightLibServerEvents.java create mode 100644 forge/src/main/resources/midnightlib.png diff --git a/common/src/main/java/eu/midnightdust/core/MidnightLibServer.java b/common/src/main/java/eu/midnightdust/core/MidnightLibServer.java index 50c0349..a092123 100755 --- a/common/src/main/java/eu/midnightdust/core/MidnightLibServer.java +++ b/common/src/main/java/eu/midnightdust/core/MidnightLibServer.java @@ -1,6 +1,5 @@ package eu.midnightdust.core; -import eu.midnightdust.core.config.MidnightLibConfig; import eu.midnightdust.lib.config.AutoCommand; import eu.midnightdust.lib.config.MidnightConfig; diff --git a/forge/src/main/java/eu/midnightdust/forge/MidnightLibEvents.java b/forge/src/main/java/eu/midnightdust/forge/MidnightLibClientEvents.java similarity index 80% rename from forge/src/main/java/eu/midnightdust/forge/MidnightLibEvents.java rename to forge/src/main/java/eu/midnightdust/forge/MidnightLibClientEvents.java index 4603c8c..36aaa5a 100644 --- a/forge/src/main/java/eu/midnightdust/forge/MidnightLibEvents.java +++ b/forge/src/main/java/eu/midnightdust/forge/MidnightLibClientEvents.java @@ -13,18 +13,12 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @Mod.EventBusSubscriber(modid = "midnightlib", bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) -public class MidnightLibEvents { +public class MidnightLibClientEvents { @SubscribeEvent public static void registerLayerDefinition(EntityRenderersEvent.RegisterLayerDefinitions event) { event.registerLayerDefinition(WitchHatFeatureRenderer.WITCH_HAT_MODEL_LAYER, WitchHatFeatureRenderer::getTexturedModelData); } @SubscribeEvent - public void registerCommands(RegisterCommandsEvent event) { - for (LiteralArgumentBuilder command : AutoCommand.commands){ - event.getDispatcher().register(command); - } - } - @SubscribeEvent public void registerClientTick(TickEvent.ClientTickEvent event) { MidnightColorUtil.tick(); } diff --git a/forge/src/main/java/eu/midnightdust/forge/MidnightLibForge.java b/forge/src/main/java/eu/midnightdust/forge/MidnightLibForge.java index 809c501..2960e34 100644 --- a/forge/src/main/java/eu/midnightdust/forge/MidnightLibForge.java +++ b/forge/src/main/java/eu/midnightdust/forge/MidnightLibForge.java @@ -33,6 +33,7 @@ public class MidnightLibForge { ); ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> MidnightConfig.getScreen(parent, "midnightlib"))); - MinecraftForge.EVENT_BUS.register(new MidnightLibEvents()); + MinecraftForge.EVENT_BUS.register(new MidnightLibClientEvents()); + MinecraftForge.EVENT_BUS.register(new MidnightLibServerEvents()); } } diff --git a/forge/src/main/java/eu/midnightdust/forge/MidnightLibServerEvents.java b/forge/src/main/java/eu/midnightdust/forge/MidnightLibServerEvents.java new file mode 100644 index 0000000..f5ce3df --- /dev/null +++ b/forge/src/main/java/eu/midnightdust/forge/MidnightLibServerEvents.java @@ -0,0 +1,23 @@ +package eu.midnightdust.forge; + +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import eu.midnightdust.hats.witch.WitchHatFeatureRenderer; +import eu.midnightdust.lib.config.AutoCommand; +import eu.midnightdust.lib.util.MidnightColorUtil; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.EntityRenderersEvent; +import net.minecraftforge.event.RegisterCommandsEvent; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + +@Mod.EventBusSubscriber(modid = "midnightlib", bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.DEDICATED_SERVER) +public class MidnightLibServerEvents { + @SubscribeEvent + public void registerCommands(RegisterCommandsEvent event) { + for (LiteralArgumentBuilder command : AutoCommand.commands){ + event.getDispatcher().register(command); + } + } +} diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index f35466c..ea5e9ea 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -7,6 +7,7 @@ license = "MIT License" modId = "midnightlib" version = "${version}" displayName = "MidnightLib" +logoFile = "midnightlib.png" authors = "TeamMidnightDust, Motschen" description = ''' Common Library for Team MidnightDust's mods. diff --git a/forge/src/main/resources/midnightlib.png b/forge/src/main/resources/midnightlib.png new file mode 100644 index 0000000000000000000000000000000000000000..d31b4c46823b2536b67007b68606f8b82c806a08 GIT binary patch literal 2801 zcmd5-dpOkDAD)>Q%ov2&+-aJy%(|3lv1VMRVbU~4xvX}EtlZWNa?3SJqS~yIOPQg_ zZ6dcs#$6>s2_d(p5O&-dmwsoT{qMKG|Ms8X`99~I&w0P+^SAo%BIz^tyWPNUIeWMmo|8mgtp#TyV76x)l zOG`m;?AWpYA}J~=0!UO;6p#ZOfEHkgiHTve*$WE`2m~TEHMOUwCnF;xIXRh3CRbHe z6&4oe<>dhoqyYY*p&`IOH8oXRTl?zOtCW-!-~O>5s{KzfRBsX%Sjv*mJz5vJ)~=NQXJ`Ldv(je?!EkvZQ2ZPV+BKV<E?B0GbTi##1o2XaYn&}+3VR`)b%gp@x zf}x$Ir9b<&&8+=Hd+)8U?QHROJNc{gf{yW#-pN%S`|X>smY17LJJajq{X^RyKMZcq zjZTi%56mo1404x0bZmQa`CAi<{Pk(U+9&?%@Y>g%nRWh9%TU+yE`Md4|8&IXTekxQ z0)Irb!cm=C`qLeq6rE*b=>;=~{qdO()TN;K`(~fqu1bGys3m(1J<~9^J9aem^ZnZO*JcK1va@&V#*Jk>-qJ`) zp_PVz=t^ma=`_eSc`eG~p;_KsX-rlz?O|5y$LPR3d#|*u@Z=LSI>PDx0~U<@gcii> z%tuJO`_j=vEUE%F@g(sqE9fQS91~rg*pw!o9?{b$6{6H9n+4g<4kPw zl99J0()G5!nYz9}Fo|N0cStH`VRF4MOPbDL(lsj_>Mfn{AwR{_5LPqLCbmHQajBJL zwf(D}M0iL3_d-z;FqtQ$KvhqhMV;I;?F~|eD`E!aPn}eEOd_2b6ymH!?n$`Z9kg)r zCcZ@8kdcyy5;Y_#<5uiGP%WKee-!yTzvU8e-8|+ydVJjQN(1x5eFZ&sT@9u}FR_eh zPtV76yKSVvG3lz~Ss6u`Ig5LlGm4#GLW1^S$CFxC#3h@t@5Fat`X_rF_vG`lfAVpa zpdT_Bw&_}@2J6G*ed62C-4(0T_ev4#L*z){n*Z>YmXnbvGs7L2A|5k)k<`22Mp{C@ zkCi+T{HZcwpFCTeLBhppYs9uK@GVH&&BTOw5~aPvbP?8`eElvhgc=u)Pa`Eb2U&d2 zeXXW+h3UM2Epwr1yMCH`3j1R1dA|~MSJMd3J7t-Afm?HH-S_31E4u9ny7oH9Cbh(y zeb9gP-1p4**UwK5a3UV1dRSAH1}R*=MlKxU0?qVcPsou+tWp=b(8I8Il|89HuJ+hg zTK*>ER%a`FaFbYQELv$}S+s2Hf^hA|w-iHE>rnyZ)N}~hpNH6Bw5RMBNpJ2uN;JO6 zIM7&Un0?QIu)hlSN?5%~!2CRPTKI%7Yr?c~Zhhi&=V`GB{W{?r8GG%#n{Iy2fxc(W z8b>ii17YSPveiL4p3OPrF*?4>?Sl}aSSt^ju5<+ovk{WF7041FMIZMJwwLapm7jXwV%dyklz%FQ?qKAt+6(Xr6^>Tz-Ct@mj>$eqAEB7()VFKANcr^A^5Qj77$FQFJc30c&s7ihSVS0(5 z(WTh!|1lD+i>jh}pVK&o;Jq!edY*Z(E^FZ1$%^$Mp+wvB<@Uc@}NNvirsT5qH zr9dLr81j|8i9{%ib)IfCkbO}Dk(hgU30ViR9ccPO;3le$_e2zJzGHZ(-A?-X@Bv9a z%L4N$ER41HZ0?Cc!#}hYPwOVGiD+IpFSFb2?F;QReYP2^g?q;xN8f7S)Qi{{zqwc` zse-%cUm$toNR!*8^OppN46kKfINd6nU#Z)yxh|z(Tox5tIhE6U^t&1ll`fuc&8HkEdoL+%6~^lnYe+^ z%Bw3|3gbcK-)I|sfE=42%$felT4k`-X!7U65S=e!VX*f0eYVU-4$6O51QQMat?P_?@Xmm zdYWxHT=Zlgwp+Nf-%MSaO+i)lF=Lu56A(wk?^Ldj8a>fqx|an|L(Yd-QJ*L_cU&8G zI80wYl)0f)GGHl!ojC5%ip2#c{qEx%x{L?%DV`&wY^0@!`1K59