Merge pull request #63 from diademiemi/main

Update to 1.19.4

Author: DarkKronicle

build.gradle

@@ -30,7 +30,7 @@ dependencies {
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
-	modImplementation "fi.dy.masa.malilib:malilib-fabric-1.19.3:${project.malilib_version}"
+	modImplementation "fi.dy.masa.malilib:malilib-fabric-1.19.4:${project.malilib_version}"
 	modCompileOnly "com.terraformersmc:modmenu:5.0.1"
 
 	implementation "com.github.DarkKronicle.Konstruct:addons:${project.konstruct_version}"

gradle.properties

@@ -1,15 +1,15 @@
 org.gradle.jvmargs=-Xmx1G
 
-minecraft_version=1.19.3
-yarn_mappings=1.19.3+build.2
-loader_version=0.14.11
-fabric_api_version=0.68.1+1.19.3
+minecraft_version=1.19.4
+yarn_mappings=1.19.4+build.1
+loader_version=0.14.18
+fabric_api_version=0.76.0+1.19.4
 
-mod_version=1.5.9
+mod_version=1.5.10
 maven_group=io.github.darkkronicle
 archives_base_name=AdvancedChatCore
 
-malilib_version=0.14.0
+malilib_version=0.15.2
 konstruct_version=2.0.3-build1
 mxparser_version=4.4.2
 owo_version=2.0.0

src/main/java/io/github/darkkronicle/advancedchatcore/AdvancedChatCore.java

@@ -86,13 +86,11 @@ public void onInitializeClient() {
      */
     public static InputStream getResource(String path) throws URISyntaxException, IOException {
         URI uri = Thread.currentThread().getContextClassLoader().getResource(path).toURI();
-        if (uri.getScheme().contains("jar")) {
-            // Not IDE
-            // jar.toString() begins with file:
-            // i want to trim it out...
+        if (!uri.getScheme().equals("file")) {
+            // it's not a file
             return Thread.currentThread().getContextClassLoader().getResourceAsStream(path);
         } else {
-            // IDE
+            // it's a file - try to access it directly!
             return new FileInputStream(Paths.get(uri).toFile());
         }
     }

src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedChatScreen.java

@@ -383,7 +383,7 @@ public void setChatFromHistory(int i) {
     public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) {
         ChatHud hud = client.inGameHud.getChatHud();
         this.setFocused(this.chatField);
-        this.chatField.setTextFieldFocused(true);
+        this.chatField.setFocused(true);
         this.chatField.render(matrixStack, mouseX, mouseY, partialTicks);
         super.render(matrixStack, mouseX, mouseY, partialTicks);
         for (AdvancedChatScreenSection section : sections) {

src/main/java/io/github/darkkronicle/advancedchatcore/chat/AdvancedTextField.java

@@ -251,7 +251,7 @@ private void drawSelectionHighlight(int x1, int y1, int x2, int y2) {
         BufferBuilder bufferBuilder = tessellator.getBuffer();
         RenderSystem.setShader(GameRenderer::getPositionProgram);
         RenderSystem.setShaderColor(0.0f, 0.0f, 1.0f, 1.0f);
-        RenderSystem.disableTexture();
+//        RenderSystem.disableTexture();
         RenderSystem.enableColorLogicOp();
         RenderSystem.logicOp(GlStateManager.LogicOp.OR_REVERSE);
         bufferBuilder.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION);
@@ -262,7 +262,7 @@ private void drawSelectionHighlight(int x1, int y1, int x2, int y2) {
         tessellator.draw();
         RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, 1.0f);
         RenderSystem.disableColorLogicOp();
-        RenderSystem.enableTexture();
+//        RenderSystem.enableTexture();
     }
 
     @Override

src/main/java/io/github/darkkronicle/advancedchatcore/gui/IconButton.java

@@ -77,7 +77,7 @@ public void render(int mouseX, int mouseY, boolean unused, MatrixStack matrixSta
                 0, 0, iconWidth, iconHeight, iconWidth, iconHeight);
 
         if (hovered && onHover != null) {
-            DrawableHelper.drawStringWithShadow(
+            DrawableHelper.drawCenteredTextWithShadow(
                     matrixStack,
                     MinecraftClient.getInstance().textRenderer,
                     onHover,

src/main/resources/fabric.mod.json

@@ -28,10 +28,10 @@
     "advancedchatcore.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.13.0",
+    "fabricloader": ">=0.14.18",
     "fabric": "*",
-    "minecraft": ">=1.19.1",
-    "malilib": ">=0.13.0"
+    "minecraft": ">=1.19.4",
+    "malilib": ">=0.15.2"
   },
   "custom": {
     "modmenu": {