Merge pull request gbl#32 from dever-cube/fabric_1_19_4

Update to 1.19.4
char3210 · Apr 2, 2023 · bf8c925 · bf8c925
2 parents 612b67e + b09b5c4
commit bf8c925
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.12.+'
+	id 'fabric-loom' version '1.1-SNAPSHOT'
 	id "com.modrinth.minotaur" version "2.+"
 	id "com.matthewprenger.cursegradle" version "1.4.0"
 }
@@ -23,7 +23,7 @@ sourceCompatibility = 17
 targetCompatibility = 17
 
 ext.Versions = new Properties()
-Versions.load(file("Versionfiles/mcversion-1.19.3.properties").newReader())
+Versions.load(file("Versionfiles/mcversion-1.19.4.properties").newReader())
 
 archivesBaseName = "advancementinfo"
 ext.projectVersion = "1.3.1"
@@ -47,7 +47,7 @@ dependencies {
     mappings   "net.fabricmc:yarn:${Versions['yarn_mappings']}:v2"
     modImplementation "net.fabricmc:fabric-loader:${Versions['loader_version']}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${Versions['fabric_version']}"
-    modImplementation include ("me.shedaniel.cloth:cloth-config-fabric:7.0.73") {
+    modImplementation include ("me.shedaniel.cloth:cloth-config-fabric:${Versions['cloth_config_version']}") {
         exclude(group: "net.fabricmc.fabric-api")
     }
     modCompileOnly "com.terraformersmc:modmenu:${Versions['modmenu_version']}"

diff --git a/src/main/java/de/guntram/mcmod/advancementinfo/mixin/AdvancementScreenMixin.java b/src/main/java/de/guntram/mcmod/advancementinfo/mixin/AdvancementScreenMixin.java
@@ -64,7 +64,7 @@ public abstract class AdvancementScreenMixin extends Screen implements Advanceme
     private int getAdvTreeYSize(int orig) { return height - config.marginY*2 - 3*9; }
 
     @Redirect(method = "drawWindow", at=@At(value = "INVOKE", target = "net/minecraft/client/gui/screen/advancement/AdvancementsScreen.drawTexture(Lnet/minecraft/client/util/math/MatrixStack;IIIIII)V"))
-    public void disableDefaultDraw(AdvancementsScreen advancementsScreen, MatrixStack matrices, int x, int y, int u, int v, int width, int height) {
+    public void disableDefaultDraw(MatrixStack matrices, int x, int y, int u, int v, int width, int height) {
         // do nothing
     }
 
@@ -289,4 +289,4 @@ public ClientAdvancementManager getAdvancementHandler() {
     public AdvancementTab myGetTab(Advancement advancement) {
         return getTab(advancement);
     }
-}
+}
diff --git a/src/main/java/de/guntram/mcmod/advancementinfo/mixin/AdvancementTabMixin.java b/src/main/java/de/guntram/mcmod/advancementinfo/mixin/AdvancementTabMixin.java
@@ -31,7 +31,7 @@ public class AdvancementTabMixin {
     private int currentInfoWidth;
 
     @Inject(method="render", at = @At("HEAD"))
-    private void updateLayout(MatrixStack matrices, CallbackInfo ci) {
+    private void updateLayout(MatrixStack matrices, int x, int y, CallbackInfo ci) {
         if(screen != null) {
             currentInfoWidth = config.infoWidth.calculate(screen.width);
         }