Merge development into main

Merge development into main

Author: duplidev

1.12.2/cloudclient/src/main/java/dev/cloudmc/Cloud.java

@@ -53,13 +53,23 @@ public void init(FMLInitializationEvent event) throws IOException {
                 messageHelper = new MessageHelper()
         );
 
-        if (!ConfigSaver.configExists()) {
-            ConfigSaver.saveConfig();
+        try {
+            if (!ConfigSaver.configExists()) {
+                ConfigSaver.saveConfig();
+            }
+            ConfigLoader.loadConfig();
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
         }
-        ConfigLoader.loadConfig();
         fontHelper.init();
 
-        Runtime.getRuntime().addShutdownHook(new Thread(ConfigSaver::saveConfig));
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            try {
+                ConfigSaver.saveConfig();
+            } catch (Exception e) {
+                System.out.println(e.getMessage());
+            }
+        }));
     }
 
     private void registerEvents(Object... events) {

1.12.2/cloudclient/src/main/java/dev/cloudmc/config/ConfigLoader.java

@@ -23,17 +23,8 @@ public class ConfigLoader {
      * Loads the config from .minecraft/cloud/config.json
      */
 
-    public static void loadConfig() {
-        FileReader reader = null;
-        try {
-            reader = new FileReader(OSHelper.getCloudDirectory() + "config.json");
-        } catch (FileNotFoundException e) {
-            System.out.println(e.getMessage());
-        }
-
-        if(reader == null) {
-            return;
-        }
+    public static void loadConfig() throws FileNotFoundException {
+        FileReader reader = new FileReader(OSHelper.getCloudDirectory() + "config.json");
 
         Config config = new Gson().fromJson(reader, Config.class);
 

1.12.2/cloudclient/src/main/java/dev/cloudmc/config/ConfigSaver.java

@@ -23,15 +23,10 @@ public class ConfigSaver {
      * Creates and saves a configuration in .minecraft/cloud/config.json
      */
 
-    public static void saveConfig() {
+    public static void saveConfig() throws IOException {
         createDir();
 
-        FileWriter writer;
-        try {
-            writer = new FileWriter(OSHelper.getCloudDirectory() + "config.json");
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+        FileWriter writer = new FileWriter(OSHelper.getCloudDirectory() + "config.json");
 
         Config config = new Config();
 
@@ -57,12 +52,8 @@ public static void saveConfig() {
         config.setSnapping(Style.isSnapping());
 
         String json = new Gson().toJson(config);
-        try {
-            writer.write(json);
-            writer.close();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+        writer.write(json);
+        writer.close();
     }
 
     /**

1.12.2/cloudclient/src/main/java/dev/cloudmc/feature/mod/ModManager.java

@@ -40,7 +40,7 @@ public void init() {
         addMod(new FreelookMod());
         addMod(new CrosshairMod());
         addMod(new MotionblurMod());
-        addMod(new GuiBlurMod());
+        addMod(new GuiTweaksMod());
         addMod(new BlockOverlayMod());
         addMod(new BlockInfoMod());
         addMod(new ReachDisplayMod());

1.12.2/cloudclient/src/main/java/dev/cloudmc/feature/mod/impl/GuiBlurMod.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2022 DupliCAT
+ * GNU Lesser General Public License v3.0
+ */
+
+package dev.cloudmc.feature.mod.impl;
+
+import dev.cloudmc.Cloud;
+import dev.cloudmc.feature.mod.Mod;
+import dev.cloudmc.feature.mod.Type;
+import dev.cloudmc.feature.setting.Setting;
+import net.minecraft.client.gui.GuiChat;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.event.GuiOpenEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+
+public class GuiTweaksMod extends Mod {
+
+    public GuiTweaksMod() {
+        super(
+                "Gui Tweaks",
+                "Adds Tweaks to the Gui like blur and transparency.",
+                Type.Tweaks
+        );
+
+        Cloud.INSTANCE.settingManager.addSetting(new Setting("Blur Background", this, true));
+        Cloud.INSTANCE.settingManager.addSetting(new Setting("Darken Background", this, true));
+    }
+
+    @SubscribeEvent
+    public void onGuiOpen(GuiOpenEvent e) {
+        if (Cloud.INSTANCE.settingManager.getSettingByModAndName(getName(), "Blur Background").isCheckToggled()) {
+            if (!(e.getGui() instanceof GuiChat)) {
+                try {
+                    Cloud.INSTANCE.mc.entityRenderer.loadShader(
+                            new ResourceLocation("shaders/post/blur.json"));
+                } catch (Exception exception) {
+                    System.out.println(exception.getMessage());
+                }
+            }
+            if (e.getGui() == null) {
+                if (Cloud.INSTANCE.mc.entityRenderer.getShaderGroup() != null) {
+                    Cloud.INSTANCE.mc.entityRenderer.getShaderGroup().deleteShaderGroup();
+                }
+            }
+        }
+    }
+}

1.12.2/cloudclient/src/main/java/dev/cloudmc/feature/mod/impl/GuiTweaksMod.java

@@ -0,0 +1,26 @@
+package dev.cloudmc.mixins;
+
+import dev.cloudmc.Cloud;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiScreen;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(GuiScreen.class)
+public abstract class GuiScreenMixin extends Gui {
+
+    @Redirect(
+            method = "drawWorldBackground",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/gui/GuiScreen;drawGradientRect(IIIIII)V"
+            )
+    )
+    public void drawWorldBackground(GuiScreen instance, int left, int top, int right, int bottom, int startColor, int endColor) {
+        if (Cloud.INSTANCE.settingManager.getSettingByModAndName("Gui Tweaks", "Darken Background").isCheckToggled() &&
+                Cloud.INSTANCE.modManager.getMod("Gui Tweaks").isToggled()) {
+            this.drawGradientRect(left, top, right, bottom, startColor, endColor);
+        }
+    }
+}

1.12.2/cloudclient/src/main/java/dev/cloudmc/mixins/GuiScreenMixin.java

@@ -9,6 +9,7 @@
     "GuiIngameMenuMixin",
     "GuiInGameMixin",
     "GuiMainMenuMixin",
+    "GuiScreenMixin",
     "ItemRendererMixin",
     "MinecraftMixin"
   ],

…s/cloudmc/icon/button/button/guiblur.png …loudmc/icon/button/button/gui tweaks.png1.12.2/cloudclient/src/main/resources/assets/cloudmc/icon/button/button/guiblur.png renamed to 1.12.2/cloudclient/src/main/resources/assets/cloudmc/icon/button/button/gui tweaks.png 1.12.2/cloudclient/src/main/resources/assets/cloudmc/icon/button/button/guiblur.png renamed to 1.12.2/cloudclient/src/main/resources/assets/cloudmc/icon/button/button/gui tweaks.png

@@ -64,13 +64,23 @@ public void init(FMLInitializationEvent event) throws IOException {
                 messageHelper = new MessageHelper()
         );
 
-        if (!ConfigSaver.configExists()) {
-            ConfigSaver.saveConfig();
+        try {
+            if (!ConfigSaver.configExists()) {
+                ConfigSaver.saveConfig();
+            }
+            ConfigLoader.loadConfig();
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
         }
-        ConfigLoader.loadConfig();
         fontHelper.init();
 
-        Runtime.getRuntime().addShutdownHook(new Thread(ConfigSaver::saveConfig));
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            try {
+                ConfigSaver.saveConfig();
+            } catch (Exception e) {
+                System.out.println(e.getMessage());
+            }
+        }));
     }
 
     private void registerEvents(Object... events) {