[DEV] New Cloth Config GUIs, new nojang apis, and bug fixes

patches/1.19.3/.jenkins/Jenkinsfile.snapshot.patch

@@ -6,7 +6,7 @@
 -def JDK = "21";
 -def majorMc = "1.21.2";
 -def modLoaders = "neoforge|fabric|quilt|paper";
--def supportedMc = "1.21.3";
+-def supportedMc = "1.21.3|1.21.4";
 -def reltype = "port";
 +def JDK = "17";
 +def majorMc = "1.19.3";

patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/ClothConfigScreenBuilder.java.patch

@@ -0,0 +1,14 @@
+--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/ClothConfigScreenBuilder.java
++++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/ClothConfigScreenBuilder.java
+@@ -390,9 +390,9 @@
+             config.saveConfig(config);
+             Files.deleteIfExists(backupPath);
+         } catch (Exception e) {
+-            Minecraft.getInstance().getToastManager().addToast(
++            Minecraft.getInstance().getToasts().addToast(
+                     new SystemToast(
+-                            SystemToast.SystemToastId.PACK_LOAD_FAILURE,
++                            SystemToast.SystemToastIds.PACK_LOAD_FAILURE,
+                             Component.literal("Failed To Save Config"),
+                             Component.literal("Restoring Backup Copy. Check log for details"))
+             );

patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/CraterConfigScreen.java.patch

@@ -8,7 +8,7 @@
  import net.minecraft.client.gui.screens.ConfirmScreen;
  import net.minecraft.client.gui.screens.Screen;
  import net.minecraft.client.renderer.GameRenderer;
-@@ -158,7 +157,7 @@
+@@ -159,7 +158,7 @@
              return new TextConfigOption<>(Objects::toString, BigDecimal::new);
          }
          if (value instanceof ResourceLocation) {
@@ -17,7 +17,7 @@
          }
          if (isSubConfig) {
              return new SubConfigWidget<>(config, this, value);
-@@ -177,19 +176,19 @@
+@@ -178,19 +177,19 @@
      }
  
      @Override
@@ -47,7 +47,7 @@
  
          int y = (int) (TOP + 4 - Math.round(scrollerAmount));
          for (Option<?> option : options) {
-@@ -216,23 +215,24 @@
+@@ -217,23 +216,24 @@
              int maxY = this.height - BOTTOM;
              //RenderSystem.disableTexture();
              Tesselator tesselator = Tesselator.getInstance();
@@ -89,7 +89,7 @@
              RenderSystem.disableBlend();
              //RenderSystem.enableTexture();
          }
-@@ -240,21 +240,22 @@
+@@ -241,21 +241,22 @@
  
      private void renderShadow(PoseStack matrices) {
          Tesselator tesselator = Tesselator.getInstance();
@@ -123,7 +123,7 @@
          //RenderSystem.enableTexture();
          RenderSystem.disableBlend();
      }
-@@ -265,15 +266,16 @@
+@@ -266,15 +267,16 @@
  
      protected void overlayBackground(Matrix4f matrix, int minX, int minY, int maxX, int maxY, int red, int green, int blue, int startAlpha, int endAlpha) {
          Tesselator tesselator = Tesselator.getInstance();
@@ -148,7 +148,7 @@
      }
  
      public int scrollHeight() {
-@@ -331,12 +333,12 @@
+@@ -332,12 +334,12 @@
      }
  
      @Override
@@ -163,7 +163,7 @@
      }
  
      @Override
-@@ -375,7 +377,7 @@
+@@ -376,7 +378,7 @@
          }
      }
  
@@ -172,7 +172,7 @@
          if (mouseX > startX && mouseX < startX + sizeX) {
              if (mouseY > startY && mouseY < startY + sizeY) {
                  List<Component> list = new ArrayList<>();
-@@ -383,7 +385,7 @@
+@@ -384,7 +386,7 @@
                  for (String desc : description) {
                      list.add(Component.translatable(desc));
                  }

patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/AbstractConfigWidget.java.patch

@@ -10,7 +10,7 @@
  import net.minecraft.client.gui.components.AbstractWidget;
  import net.minecraft.client.gui.components.EditBox;
  
-@@ -17,7 +17,7 @@
+@@ -18,7 +18,7 @@
      public W widget;
  
      @Override

patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/BaseWidget.java.patch

@@ -11,7 +11,7 @@
  import net.minecraft.client.gui.components.Button;
  import net.minecraft.network.chat.Component;
  import net.minecraft.network.chat.MutableComponent;
-@@ -39,7 +39,7 @@
+@@ -40,7 +40,7 @@
      }
  
      @Override
@@ -20,7 +20,7 @@
          MutableComponent text = Component.literal(this.text.getString());
          boolean edited = isEdited() || hasErrors;
          if (edited) {
-@@ -50,7 +50,7 @@
+@@ -51,7 +51,7 @@
          } else {
              text.withStyle(ChatFormatting.GRAY);
          }

patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/ClothConfigButtonEntry.java.patch

@@ -0,0 +1,34 @@
+--- a/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/ClothConfigButtonEntry.java
++++ b/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/ClothConfigButtonEntry.java
+@@ -1,9 +1,9 @@
+ package com.hypherionmc.craterlib.client.gui.config.widgets;
+ 
+ import com.mojang.blaze3d.platform.Window;
++import com.mojang.blaze3d.vertex.PoseStack;
+ import me.shedaniel.clothconfig2.api.AbstractConfigListEntry;
+ import net.minecraft.client.Minecraft;
+-import net.minecraft.client.gui.GuiGraphics;
+ import net.minecraft.client.gui.components.Button;
+ import net.minecraft.client.gui.components.events.GuiEventListener;
+ import net.minecraft.client.gui.narration.NarratableEntry;
+@@ -59,17 +59,17 @@
+     }
+ 
+     @Override
+-    public void render(GuiGraphics matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isHovered, float delta) {
++    public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean isHovered, float delta) {
+         Window window = Minecraft.getInstance().getWindow();
+         Component displayedFieldName = displayName;
+         if (Minecraft.getInstance().font.isBidirectional()) {
+-            matrices.drawString(Minecraft.getInstance().font, displayedFieldName.getVisualOrderText(), window.getGuiScaledWidth() - x - Minecraft.getInstance().font.width(displayedFieldName), y + 6, 16777215);
++            drawString(matrices, Minecraft.getInstance().font, displayedFieldName.getVisualOrderText(), window.getGuiScaledWidth() - x - Minecraft.getInstance().font.width(displayedFieldName), y + 6, 16777215);
+             this.button.setX(x);
+             if (hasDeleteButton) {
+                 this.deleteButton.setX(x + this.button.getWidth() + 4);
+             }
+         } else {
+-            matrices.drawString(Minecraft.getInstance().font, displayedFieldName.getVisualOrderText(), x, y + 6, this.getPreferredTextColor());
++            drawString(matrices, Minecraft.getInstance().font, displayedFieldName.getVisualOrderText(), x, y + 6, this.getPreferredTextColor());
+             if (hasDeleteButton) {
+                 this.button.setX(x + entryWidth - this.button.getWidth() - 24);
+                 this.deleteButton.setX(x + entryWidth - 20);

patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/InternalConfigButton.java.patch

@@ -14,7 +14,7 @@
  
  /**
   * @author HypherionSA
-@@ -22,7 +23,7 @@
+@@ -23,7 +24,7 @@
      }
  
      @Override
@@ -23,7 +23,7 @@
          if (cancel) {
              setMessage(Component.translatable(screen.isEdited() ? "t.clc.cancel_discard" : "gui.cancel"));
          } else {
-@@ -30,7 +31,7 @@
+@@ -31,7 +32,7 @@
              active = screen.isEdited() && !hasErrors;
              setMessage(Component.translatable(hasErrors ? "t.clc.error" : "t.clc.save"));
          }

patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/Option.java.patch

@@ -12,7 +12,7 @@
  import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
  import net.minecraft.client.gui.components.events.GuiEventListener;
  import net.minecraft.network.chat.Component;
-@@ -34,7 +34,7 @@
+@@ -35,7 +35,7 @@
      @Getter
      private List<String> langKeys = new ArrayList<>();
  

patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/SubConfigWidget.java.patch

@@ -11,7 +11,7 @@
  import net.minecraft.client.gui.components.Button;
  import net.minecraft.client.gui.screens.Screen;
  import net.minecraft.network.chat.Component;
-@@ -27,7 +27,7 @@
+@@ -28,7 +28,7 @@
      }
  
      @Override

patches/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/TextConfigOption.java.patch

@@ -10,7 +10,7 @@
  
  import java.util.function.Function;
  
-@@ -29,7 +29,7 @@
+@@ -30,7 +30,7 @@
      }
  
      @Override

patches/1.19.3/Fabric/build.gradle.patch

@@ -5,15 +5,15 @@
      stupidRemapArch("dev.ftb.mods:ftb-essentials:${ftb_essentials}")
      stupidRemapArch("dev.ftb.mods:ftb-ranks:${ftb_ranks}")
 -
+     modImplementation("me.shedaniel.cloth:cloth-config-fabric:${cloth_config}")
      modImplementation "maven.modrinth:fabrictailor:${fabrictailor}"
      modImplementation "maven.modrinth:vanish:${vanish}"
- 
-@@ -116,8 +115,8 @@
+@@ -117,8 +116,8 @@
      setVersionType("release")
      setChangelog(rootProject.file("changelog.md"))
      setProjectVersion("${minecraft_version}-${project.version}")
--    setDisplayName("[FABRIC/QUILT 1.21.3] CraterLib - ${project.version}")
--    setGameVersions("1.21.3")
+-    setDisplayName("[FABRIC/QUILT 1.21.3/4] CraterLib - ${project.version}")
+-    setGameVersions("1.21.3", "1.21.4")
 +    setDisplayName("[FABRIC/QUILT 1.19.4] CraterLib - ${project.version}")
 +    setGameVersions("1.19.4")
      setLoaders("fabric", "quilt")

patches/1.19.3/Forge/build.gradle.patch

@@ -10,9 +10,9 @@
 +    stupidRemapArch("dev.ftb.mods:ftb-essentials-forge:${ftb_essentials}")
 +    stupidRemapArch("dev.ftb.mods:ftb-ranks-forge:${ftb_ranks}")
  
-     // Do not edit or remove
-     implementation project(":Common")
-@@ -107,8 +110,8 @@
+     modImplementation("me.shedaniel.cloth:cloth-config-forge:${cloth_config}")
+ 
+@@ -109,8 +112,8 @@
      setVersionType("release")
      setChangelog(rootProject.file("changelog.md"))
      setProjectVersion("${minecraft_version}-${project.version}")

patches/1.19.3/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java.patch

@@ -1,22 +1,45 @@
 --- a/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
 +++ b/Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
-@@ -1,6 +1,7 @@
+@@ -1,9 +1,12 @@
  package com.hypherionmc.craterlib.mixin;
  
++import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
  import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
 +import com.hypherionmc.craterlib.core.config.AbstractConfig;
  import com.hypherionmc.craterlib.core.config.ConfigController;
- import com.hypherionmc.craterlib.core.config.ModuleConfig;
+-import com.hypherionmc.craterlib.core.config.ModuleConfig;
++import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
  import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
-@@ -28,9 +29,9 @@
++import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
+ import net.minecraft.client.Minecraft;
+ import net.minecraft.client.gui.screens.Screen;
+ import net.minecraftforge.client.ConfigScreenHandler;
+@@ -28,17 +31,22 @@
       */
      @Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
      private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
 -        ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
 +        ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
-             if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
--                ModuleConfig config = (ModuleConfig) conf;
-+                AbstractConfig config = watcher.getLeft();
-                 if (config.getModId().equals(selectedMod.getModId())) {
-                     cir.setReturnValue(
-                             Optional.of((minecraft, screen) -> new CraterConfigScreen(config, screen))
+             AbstractConfig config = watcher.getLeft();
+             if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
+                 return;
+ 
+-            if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
+-                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
+-            } else {
+-                //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
++            if (config.getModId().equals(selectedMod.getModId())) {
++                if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config")) {
++                    cir.setReturnValue(
++                            Optional.of((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))
++                    );
++                } else {
++                    cir.setReturnValue(
++                            Optional.of((minecraft, screen) -> new CraterConfigScreen(config, screen))
++                    );
++                }
+             }
+         });
+     }
+-
+ }

patches/1.19.3/NeoForge/build.gradle.patch

@@ -1,6 +1,6 @@
 --- a/NeoForge/build.gradle
 +++ /dev/null
-@@ -1,123 +1,0 @@
+@@ -1,133 +1,0 @@
 -archivesBaseName = "${mod_name.replace(" ", "")}-NeoForge-${minecraft_version}"
 -
 -dependencies {
@@ -10,6 +10,8 @@
 -    stupidRemapArch("dev.ftb.mods:ftb-essentials-neoforge:${ftb_essentials}")
 -    stupidRemapArch("dev.ftb.mods:ftb-ranks-neoforge:${ftb_ranks}")
 -
+-    modImplementation("me.shedaniel.cloth:cloth-config-neoforge:${cloth_config}")
+-
 -    // Do not edit or remove
 -    implementation project(":Common")
 -}
@@ -117,10 +119,18 @@
 -    setVersionType("release")
 -    setChangelog(rootProject.file("changelog.md"))
 -    setProjectVersion("${minecraft_version}-${project.version}")
--    setDisplayName("[NeoForge 1.21.3] CraterLib - ${project.version}")
--    setGameVersions("1.21.3")
+-    setDisplayName("[NeoForge 1.21.3/1.21.4] CraterLib - ${project.version}")
+-    setGameVersions("1.21.3", "1.21.4")
 -    setLoaders("neoforge")
 -    setArtifact(remapJar)
 -    setCurseEnvironment("both")
 -    setIsManualRelease(true)
+-
+-    curseDepends {
+-        optional("cloth-config")
+-    }
+-
+-    modrinthDepends {
+-        optional("cloth-config")
+-    }
 -}

patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java.patch

@@ -1,15 +1,18 @@
 --- a/NeoForge/src/main/java/com/hypherionmc/craterlib/client/NeoForgeClientHelper.java
 +++ /dev/null
-@@ -1,61 +1,0 @@
+@@ -1,69 +1,0 @@
 -package com.hypherionmc.craterlib.client;
 -
 -import com.hypherionmc.craterlib.api.events.client.LateInitEvent;
+-import com.hypherionmc.craterlib.client.gui.config.ClothConfigScreenBuilder;
 -import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
 -import com.hypherionmc.craterlib.core.config.AbstractConfig;
 -import com.hypherionmc.craterlib.core.config.ConfigController;
+-import com.hypherionmc.craterlib.core.config.annotations.ClothScreen;
 -import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
 -import com.hypherionmc.craterlib.core.event.CraterEventBus;
 -import com.hypherionmc.craterlib.core.platform.ClientPlatform;
+-import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment;
 -import com.hypherionmc.craterlib.nojang.client.BridgedMinecraft;
 -import com.hypherionmc.craterlib.nojang.client.BridgedOptions;
 -import com.hypherionmc.craterlib.nojang.client.multiplayer.BridgedClientLevel;
@@ -55,9 +58,14 @@
 -        CraterEventBus.INSTANCE.postEvent(event);
 -
 -        ConfigController.getWatchedConfigs().forEach((conf, watcher) -> {
--            if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {
--                AbstractConfig config = watcher.getLeft();
--                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
+-            AbstractConfig config = watcher.getLeft();
+-            if (config.getClass().isAnnotationPresent(NoConfigScreen.class))
+-                return;
+-
+-            if (watcher.getLeft().getClass().isAnnotationPresent(ClothScreen.class) && (ModloaderEnvironment.INSTANCE.isModLoaded("cloth_config") || ModloaderEnvironment.INSTANCE.isModLoaded("cloth-config") || ModloaderEnvironment.INSTANCE.isModLoaded("clothconfig"))) {
+-                ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> ClothConfigScreenBuilder.buildConfigScreen(config, screen))));
+-            } else {
+-                //ModList.get().getModContainerById(config.getModId()).ifPresent(c -> c.registerExtensionPoint(IConfigScreenFactory.class, ((minecraft, screen) -> new CraterConfigScreen(config, screen))));
 -            }
 -        });
 -    }

patches/1.19.3/gradle.properties.patch

@@ -23,8 +23,12 @@
  
  # Dependencies
  moon_config=1.0.10
-@@ -31,18 +28,17 @@
+@@ -29,21 +26,20 @@
+ adventure=4.17.0
+ rpc_sdk=1.0
  discord_formatter=2.0.0
+-cloth_config=17.0.144
++cloth_config=9.1.104
  
  # Mod Dependencies
 -fabrictailor=2.3.1