diff --git a/contributors.properties b/contributors.properties index eb900b9978..d0be3ce1ec 100644 --- a/contributors.properties +++ b/contributors.properties @@ -5,7 +5,7 @@ wiiv=99 dylangk=99 yrsegal=99 ViviSpook=99 -MilkBringer=99 +Glaasje_Melk=99 # Patrons aginsun=3 diff --git a/dependencies.properties b/dependencies.properties index 2bfee41130..5b335c98b4 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -1,5 +1,5 @@ forge=47.1.3 -zeta=1.0-beta-2.32 +zeta=1.0-beta-2.34 jei=4712868 terrablender=1.20.1-3.0.0.169 flan=4819286 diff --git a/src/main/java/org/violetmoon/quark/base/Quark.java b/src/main/java/org/violetmoon/quark/base/Quark.java index 1406981376..2edc530267 100644 --- a/src/main/java/org/violetmoon/quark/base/Quark.java +++ b/src/main/java/org/violetmoon/quark/base/Quark.java @@ -1,14 +1,7 @@ package org.violetmoon.quark.base; -import net.minecraft.core.Registry; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fml.common.Mod; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - import org.violetmoon.quark.base.proxy.ClientProxy; import org.violetmoon.quark.base.proxy.CommonProxy; import org.violetmoon.quark.integration.claim.FlanIntegration; @@ -20,9 +13,13 @@ import org.violetmoon.quark.integration.terrablender.VanillaUndergroundBiomeHandler; import org.violetmoon.zeta.Zeta; import org.violetmoon.zeta.multiloader.Env; -import org.violetmoon.zeta.util.Utils; import org.violetmoon.zetaimplforge.ForgeZeta; +import net.minecraft.core.Registry; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.fml.common.Mod; + @Mod(Quark.MOD_ID) public class Quark { diff --git a/src/main/java/org/violetmoon/quark/base/client/handler/ClientUtil.java b/src/main/java/org/violetmoon/quark/base/client/handler/ClientUtil.java index 66dc78a22b..ac3a9d3eb4 100644 --- a/src/main/java/org/violetmoon/quark/base/client/handler/ClientUtil.java +++ b/src/main/java/org/violetmoon/quark/base/client/handler/ClientUtil.java @@ -5,15 +5,20 @@ import org.violetmoon.quark.base.Quark; import org.violetmoon.zeta.client.config.screen.ZetaScreen; import org.violetmoon.zeta.client.event.play.ZScreen; +import org.violetmoon.zeta.event.bus.LoadEvent; import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.load.ZConfigChanged; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.ChatFormatting; import net.minecraft.Util; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; public class ClientUtil { @@ -46,6 +51,16 @@ public static void onKeystroke(ZScreen.KeyPressed.Pre event) { progress = 0; } } + + @LoadEvent + public static void handleQuarkConfigChange(ZConfigChanged z) { + Minecraft mc = Minecraft.getInstance(); + mc.submit(() -> { + if(mc.hasSingleplayerServer() && mc.player != null && mc.getSingleplayerServer() != null) + for(int i = 0; i < 3; i++) + mc.player.sendSystemMessage(Component.translatable("quark.misc.reloaded" + i).withStyle(i == 0 ? ChatFormatting.AQUA : ChatFormatting.WHITE)); + }); + } public static int getGuiTextColor(String name) { return getGuiTextColor(name, BASIC_GUI_TEXT_COLOR); diff --git a/src/main/java/org/violetmoon/quark/base/proxy/ClientProxy.java b/src/main/java/org/violetmoon/quark/base/proxy/ClientProxy.java index 570d698c45..2c858daac5 100644 --- a/src/main/java/org/violetmoon/quark/base/proxy/ClientProxy.java +++ b/src/main/java/org/violetmoon/quark/base/proxy/ClientProxy.java @@ -19,6 +19,7 @@ import org.violetmoon.quark.base.handler.WoodSetHandler; import org.violetmoon.quark.mixin.mixins.client.accessor.AccessorMultiPlayerGameMode; import org.violetmoon.zeta.client.TopLayerTooltipHandler; +import org.violetmoon.zeta.event.load.ZConfigChanged; import org.violetmoon.zeta.network.message.C2SUpdateFlag; import org.violetmoon.zeta.util.handler.RequiredModTooltipHandler; @@ -52,7 +53,8 @@ public void start() { Quark.ZETA.loadBus .subscribe(ModelHandler.class) //TODO: Make this especially not a singleton, move it into respective modules .subscribe(ContributorRewardHandler.Client.class) - .subscribe(WoodSetHandler.Client.class); + .subscribe(WoodSetHandler.Client.class) + .subscribe(ClientUtil.class); Quark.ZETA.playBus .subscribe(ContributorRewardHandler.Client.class) @@ -67,21 +69,6 @@ public void start() { copyProgrammerArtIfMissing(); } - @Override - public void handleQuarkConfigChange() { - super.handleQuarkConfigChange(); - - if(Minecraft.getInstance().getConnection() != null) - QuarkClient.ZETA_CLIENT.sendToServer(C2SUpdateFlag.createPacket()); - - Minecraft mc = Minecraft.getInstance(); - mc.submit(() -> { - if(mc.hasSingleplayerServer() && mc.player != null && mc.getSingleplayerServer() != null) - for(int i = 0; i < 3; i++) - mc.player.sendSystemMessage(Component.translatable("quark.misc.reloaded" + i).withStyle(i == 0 ? ChatFormatting.AQUA : ChatFormatting.WHITE)); - }); - } - @Override public InteractionResult clientUseItem(Player player, Level level, InteractionHand hand, BlockHitResult hit) { if(player instanceof LocalPlayer lPlayer) { diff --git a/src/main/java/org/violetmoon/quark/base/proxy/CommonProxy.java b/src/main/java/org/violetmoon/quark/base/proxy/CommonProxy.java index 4ede5b03e6..4f7df672d3 100644 --- a/src/main/java/org/violetmoon/quark/base/proxy/CommonProxy.java +++ b/src/main/java/org/violetmoon/quark/base/proxy/CommonProxy.java @@ -99,35 +99,12 @@ public void start() { jingleTheBells = true; } - @LoadEvent - public void setup(ZCommonSetup event) { - event.enqueueWork(this::handleQuarkConfigChange); - } - //TODO find a better place for this little one-off thing, lol @LoadEvent public void recipe(ZRegister event) { event.getRegistry().register(ExclusionRecipe.SERIALIZER, "exclusion", Registries.RECIPE_SERIALIZER); } - //forge event - public void configChanged(ModConfigEvent event) { - if(!event.getConfig().getModId().equals(Quark.MOD_ID) || Quark.ZETA.configInternals == null) - return; - - // https://github.com/VazkiiMods/Quark/commit/b0e00864f74539d8650cb349e88d0302a0fda8e4 - // "The Forge config api writes to the config file on every single change - // to the config, which would cause the file watcher to trigger - // a config reload while the config gui is committing changes." - if(System.currentTimeMillis() - Quark.ZETA.configInternals.debounceTime() > 20) - handleQuarkConfigChange(); - } - - public void handleQuarkConfigChange() { - Quark.ZETA.configManager.onReload(); - Quark.ZETA.loadBus.fire(new ZConfigChanged()); - } - /** * Use an item WITHOUT sending the use to the server. This will cause ghost interactions if used incorrectly! */