1.20.2

Author: diamonddevv

build.gradle

@@ -12,16 +12,40 @@ base {
 }
 
 repositories {
-	// Add repositories to retrieve artifacts from in here.
-	// You should only use this when depending on other mods because
-	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
-	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
-	// for more information about repositories.
+	exclusiveContent {
 
+		forRepository {
+			maven {
+				name = "Modrinth"
+				url = "https://api.modrinth.com/maven"
+			}
+		}
+
+		filter {
+			includeGroup "maven.modrinth"
+		}
+
+	}
+	maven {
+		name = "QuiltMC"
+		url = "https://maven.quiltmc.org/repository/release"
+	}
 	maven {
 		name = 'Ladysnake Mods'
 		url = 'https://maven.ladysnake.org/releases'
 	}
+	maven {
+		url = 'https://maven.cafeteria.dev'
+		content {
+			includeGroup 'net.adriantodt.fabricmc'
+		}
+	}
+	maven {
+		url "https://maven.jamieswhiteshirt.com/libs-release"
+		content {
+			includeGroup "com.jamieswhiteshirt"
+		}
+	}
 	maven {
 		url "https://jitpack.io"
 	}
@@ -31,11 +55,12 @@ repositories {
 	maven {
 		url "https://maven.terraformersmc.com/"
 	}
-	// idk i just copied what origins needs and got rid of stuff that didnt appear
-}
+	mavenLocal()
+} // copied origins lol
+
 
 loom {
-	accessWidenerPath = file("src/main/resources/simpletrims.accesswidener")
+	//accessWidenerPath = file("src/main/resources/simpletrims.accesswidener")
 }
 
 dependencies {

gradle.properties

@@ -4,16 +4,16 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.10
-loader_version=0.14.21
+minecraft_version=1.20.2
+yarn_mappings=1.20.2+build.1
+loader_version=0.14.22
 
 # Mod Properties
-mod_version=0.3.0
+mod_version=0.4.0
 maven_group=net.diamonddev
 archives_base_name=simpletrims
 
 # Dependencies
-fabric_version=0.86.0+1.20.1
+fabric_version=0.89.1+1.20.2
 mixinextrasver=0.2.0-beta.9
-apoli_version=2.9.0
+apoli_version=2.10.2

src/main/java/net/diamonddev/simpletrims/mixin/MinecraftClientMixin.java

@@ -13,7 +13,7 @@
 @Mixin(MinecraftClient.class)
 public class MinecraftClientMixin {
     @WrapWithCondition(
-            method = "reloadResources(Z)Ljava/util/concurrent/CompletableFuture;",
+            method = "reloadResources(ZLnet/minecraft/client/MinecraftClient$LoadingContext;)Ljava/util/concurrent/CompletableFuture;",
             at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;setOverlay(Lnet/minecraft/client/gui/screen/Overlay;)V")
     )
     private boolean simpletrims$dontDisplayReloadOverlayForQuietReload(MinecraftClient instance, Overlay overlay) {

src/main/java/net/diamonddev/simpletrims/mixin/PalettedPermutationsAtlasSourceMixin.java

@@ -43,7 +43,7 @@ public abstract class PalettedPermutationsAtlasSourceMixin {
         }
     }
 
-    @Inject(method = "method_48486", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "open", at = @At("HEAD"), cancellable = true)
     private static void simpletrims$overrideLoadingLocationForEncodedPaletteResources(ResourceManager resourceManager, Identifier identifier, CallbackInfoReturnable<int[]> cir) {
 
         if (identifier.getPath().contains(SimpleTrimsDataLoader.ENCODED_PALETTE_CONTAIN_STRING)) {

src/main/java/net/diamonddev/simpletrims/mixin/PlayerManagerMixin.java

@@ -12,6 +12,7 @@
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.server.PlayerManager;
+import net.minecraft.server.network.ConnectedClientData;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
@@ -25,7 +26,7 @@
 public class PlayerManagerMixin {
 
     @Inject(method = "onPlayerConnect", at = @At("TAIL"))
-    private void simpletrims$onPlayerConnectToServer(ClientConnection connection, ServerPlayerEntity player, CallbackInfo ci) {
+    private void simpletrims$onPlayerConnectToServer(ClientConnection connection, ServerPlayerEntity player, ConnectedClientData clientData, CallbackInfo ci) {
         String playername = player.getGameProfile().getName();
         boolean shouldQuietReload = false;
 

src/main/resources/fabric.mod.json

@@ -32,7 +32,7 @@
 		}
 	},
 
-	"accessWidener": "simpletrims.accesswidener",
+
 	"depends": {
 		"fabricloader": ">=0.14.21",
 		"minecraft": "~1.20.1",