Restructure project

FabiPunktExe · FabiPunktExe · commit 93ac15a835fd · 2026-05-13T18:02:43.000+02:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,6 +24,10 @@ java {
     }
 }
 
+loom {
+    accessWidenerPath = file("src/main/resources/clientspoofer.accesswidener")
+}
+
 tasks {
     compileJava {
         options.encoding = "UTF-8"
@@ -32,11 +36,11 @@ tasks {
 
     processResources {
         filesMatching("fabric.mod.json") {
-            expand(mapOf(
+            expand(
                 "version" to project.version,
                 "minecraft_version" to libs.versions.minecraft.get(),
                 "modmenu_version" to libs.versions.modmenu.get()
-            ))
+            )
         }
     }
 
diff --git a/src/main/java/de/fabiexe/clientspoofer/ClientSpoofer.java b/src/main/java/de/fabiexe/clientspoofer/ClientSpoofer.java
@@ -1,11 +1,12 @@
 package de.fabiexe.clientspoofer;
 
-import java.nio.file.Path;
 import net.fabricmc.api.ClientModInitializer;
 import net.minecraft.client.Minecraft;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.file.Path;
+
 public class ClientSpoofer implements ClientModInitializer {
     public static final Logger LOGGER = LoggerFactory.getLogger("clientspoofer");
     public static Path CONFIG_FILE;
diff --git a/src/main/java/de/fabiexe/clientspoofer/mixin/LanguageAccessor.java b/src/main/java/de/fabiexe/clientspoofer/mixin/LanguageAccessor.java
diff --git a/src/main/java/de/fabiexe/clientspoofer/mixin/brand/ClientBrandRetrieverMixin.java b/src/main/java/de/fabiexe/clientspoofer/mixin/brand/ClientBrandRetrieverMixin.java
@@ -1,4 +1,4 @@
-package de.fabiexe.clientspoofer.mixin.client;
+package de.fabiexe.clientspoofer.mixin.brand;
 
 import de.fabiexe.clientspoofer.ClientSpooferOptions;
 import net.minecraft.client.ClientBrandRetriever;
diff --git a/src/main/java/de/fabiexe/clientspoofer/mixin/client/LanguageManagerAccessor.java b/src/main/java/de/fabiexe/clientspoofer/mixin/client/LanguageManagerAccessor.java
diff --git a/src/main/java/de/fabiexe/clientspoofer/mixin/custompayload/ConnectionMixin.java b/src/main/java/de/fabiexe/clientspoofer/mixin/custompayload/ConnectionMixin.java
@@ -1,4 +1,4 @@
-package de.fabiexe.clientspoofer.mixin.client;
+package de.fabiexe.clientspoofer.mixin.custompayload;
 
 import de.fabiexe.clientspoofer.ClientSpooferOptions;
 import de.fabiexe.clientspoofer.SpoofMode;
diff --git a/src/main/java/de/fabiexe/clientspoofer/mixin/fingerprinting/DownloadQueueMixin.java b/src/main/java/de/fabiexe/clientspoofer/mixin/fingerprinting/DownloadQueueMixin.java
@@ -1,4 +1,4 @@
-package de.fabiexe.clientspoofer.mixin;
+package de.fabiexe.clientspoofer.mixin.fingerprinting;
 
 import de.fabiexe.clientspoofer.ClientSpooferOptions;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/de/fabiexe/clientspoofer/mixin/fingerprinting/KnownPacksManagerMixin.java b/src/main/java/de/fabiexe/clientspoofer/mixin/fingerprinting/KnownPacksManagerMixin.java
@@ -1,14 +1,15 @@
-package de.fabiexe.clientspoofer.mixin.client;
+package de.fabiexe.clientspoofer.mixin.fingerprinting;
 
 import de.fabiexe.clientspoofer.ClientSpooferOptions;
 import de.fabiexe.clientspoofer.SpoofMode;
-import java.util.Map;
 import net.minecraft.client.multiplayer.KnownPacksManager;
 import net.minecraft.server.packs.repository.KnownPack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
+import java.util.Map;
+
 @Mixin(KnownPacksManager.class)
 public class KnownPacksManagerMixin {
     @Redirect(
diff --git a/src/main/java/de/fabiexe/clientspoofer/mixin/translation/AbstractSignEditScreenMixin.java b/src/main/java/de/fabiexe/clientspoofer/mixin/translation/AbstractSignEditScreenMixin.java
@@ -1,16 +1,17 @@
-package de.fabiexe.clientspoofer.mixin.client;
+package de.fabiexe.clientspoofer.mixin.translation;
 
 import de.fabiexe.clientspoofer.ClientSpooferOptions;
 import de.fabiexe.clientspoofer.util.ComponentUtils;
 import de.fabiexe.clientspoofer.util.ToastUtils;
-import java.util.function.Function;
-import java.util.stream.Stream;
 import net.minecraft.client.gui.screens.inventory.AbstractSignEditScreen;
 import net.minecraft.network.chat.Component;
-import org.spongepowered.asm.mixin.*;
+import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
+import java.util.function.Function;
+import java.util.stream.Stream;
+
 @Mixin(AbstractSignEditScreen.class)
 public abstract class AbstractSignEditScreenMixin {
     @Redirect(
diff --git a/src/main/java/de/fabiexe/clientspoofer/mixin/translation/AnvilMenuMixin.java b/src/main/java/de/fabiexe/clientspoofer/mixin/translation/AnvilMenuMixin.java
@@ -1,4 +1,4 @@
-package de.fabiexe.clientspoofer.mixin;
+package de.fabiexe.clientspoofer.mixin.translation;
 
 import de.fabiexe.clientspoofer.ClientSpooferOptions;
 import de.fabiexe.clientspoofer.util.ComponentUtils;
diff --git a/src/main/java/de/fabiexe/clientspoofer/mixin/translation/AnvilScreenMixin.java b/src/main/java/de/fabiexe/clientspoofer/mixin/translation/AnvilScreenMixin.java
@@ -1,4 +1,4 @@
-package de.fabiexe.clientspoofer.mixin.client;
+package de.fabiexe.clientspoofer.mixin.translation;
 
 import de.fabiexe.clientspoofer.ClientSpooferOptions;
 import de.fabiexe.clientspoofer.util.ComponentUtils;
diff --git a/src/main/java/de/fabiexe/clientspoofer/util/ComponentUtils.java b/src/main/java/de/fabiexe/clientspoofer/util/ComponentUtils.java
@@ -1,14 +1,12 @@
 package de.fabiexe.clientspoofer.util;
 
 import de.fabiexe.clientspoofer.ClientSpooferOptions;
-import de.fabiexe.clientspoofer.mixin.LanguageAccessor;
-import de.fabiexe.clientspoofer.mixin.client.LanguageManagerAccessor;
-import java.util.*;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.client.resources.language.ClientLanguage;
 import net.minecraft.client.resources.language.LanguageInfo;
+import net.minecraft.client.resources.language.LanguageManager;
 import net.minecraft.locale.Language;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.ComponentContents;
@@ -22,8 +20,10 @@
 import net.minecraft.server.packs.resources.ResourceManager;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.*;
+
 public class ComponentUtils {
-    private static final Language language = LanguageAccessor.invokeLoadDefault();
+    private static final Language language = Language.loadDefault();
     private static final Map<ClientPacketListener, Language> serverLanguages = new IdentityHashMap<>();
 
     public static @NotNull String getString(@NotNull Component component) {
@@ -110,10 +110,10 @@ public static boolean canTranslate(@NotNull String key) {
 
         String currentLanguageCode = minecraft.getLanguageManager().getSelected();
         LanguageInfo languageInfo;
-        Map<String, LanguageInfo> languages = LanguageManagerAccessor.invokeExtractLanguages(resourceManager.listPacks());
+        Map<String, LanguageInfo> languages = LanguageManager.extractLanguages(resourceManager.listPacks());
         List<String> list = new ArrayList<>(2);
         list.add("en_us");
-        boolean bidirectional = LanguageManagerAccessor.getDefaultLanguage().bidirectional();
+        boolean bidirectional = LanguageManager.DEFAULT_LANGUAGE.bidirectional();
         if (!currentLanguageCode.equals("en_us") && (languageInfo = languages.get(currentLanguageCode)) != null) {
             list.add(currentLanguageCode);
             bidirectional = languageInfo.bidirectional();
diff --git a/src/main/java/de/fabiexe/clientspoofer/util/ToastUtils.java b/src/main/java/de/fabiexe/clientspoofer/util/ToastUtils.java
@@ -1,13 +1,13 @@
 package de.fabiexe.clientspoofer.util;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.toasts.SystemToast;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.network.chat.Component;
 
+import java.util.HashSet;
+import java.util.Set;
+
 public class ToastUtils {
     private static final Set<String> serversAttemptedReadingMods = new HashSet<>();
 
diff --git a/src/main/resources/clientspoofer.accesswidener b/src/main/resources/clientspoofer.accesswidener
@@ -0,0 +1,4 @@
+accessWidener v2 official
+accessible method net/minecraft/locale/Language loadDefault ()Lnet/minecraft/locale/Language;
+accessible method net/minecraft/client/resources/language/LanguageManager extractLanguages (Ljava/util/stream/Stream;)Ljava/util/Map;
+accessible field net/minecraft/client/resources/language/LanguageManager DEFAULT_LANGUAGE Lnet/minecraft/client/resources/language/LanguageInfo;
diff --git a/src/main/resources/clientspoofer.mixins.json b/src/main/resources/clientspoofer.mixins.json
@@ -1,22 +1,21 @@
 {
   "required": true,
-  "minVersion": "0.8",
   "package": "de.fabiexe.clientspoofer.mixin",
-  "compatibilityLevel": "JAVA_21",
-  "mixins": [
-    "AnvilMenuMixin",
-    "DownloadQueueMixin",
-    "LanguageAccessor"
-  ],
+  "compatibilityLevel": "JAVA_25",
+  "mixins": [],
   "client": [
-    "client.AbstractSignEditScreenMixin",
-    "client.AnvilScreenMixin",
-    "client.ClientBrandRetrieverMixin",
-    "client.ConnectionMixin",
-    "client.KnownPacksManagerMixin",
-    "client.LanguageManagerAccessor"
+    "brand.ClientBrandRetrieverMixin",
+    "custompayload.ConnectionMixin",
+    "fingerprinting.DownloadQueueMixin",
+    "fingerprinting.KnownPacksManagerMixin",
+    "translation.AbstractSignEditScreenMixin",
+    "translation.AnvilMenuMixin",
+    "translation.AnvilScreenMixin"
   ],
   "injectors": {
     "defaultRequire": 1
+  },
+  "overwrites": {
+    "requireAnnotations": true
   }
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -17,6 +17,7 @@
     "modmenu": ["de.fabiexe.clientspoofer.integration.ModMenuIntegration"]
   },
   "mixins": ["clientspoofer.mixins.json"],
+  "accessWidener": "clientspoofer.accesswidener",
   "depends": {
     "fabricloader": "*",
     "minecraft": "${minecraft_version}"

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,10 @@ java {`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
	`27`	`+loom {`
	`28`	`+ accessWidenerPath = file("src/main/resources/clientspoofer.accesswidener")`
	`29`	`+}`
	`30`	`+`
`27`	`31`	`tasks {`
`28`	`32`	`compileJava {`
`29`	`33`	`options.encoding = "UTF-8"`
`@@ -32,11 +36,11 @@ tasks {`
`32`	`36`
`33`	`37`	`processResources {`
`34`	`38`	`filesMatching("fabric.mod.json") {`
`35`		`- expand(mapOf(`
	`39`	`+ expand(`
`36`	`40`	`"version" to project.version,`
`37`	`41`	`"minecraft_version" to libs.versions.minecraft.get(),`
`38`	`42`	`"modmenu_version" to libs.versions.modmenu.get()`
`39`		`- ))`
	`43`	`+ )`
`40`	`44`	`}`
`41`	`45`	`}`
`42`	`46`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package de.fabiexe.clientspoofer.mixin.client;`
	`1`	`+package de.fabiexe.clientspoofer.mixin.brand;`
`2`	`2`
`3`	`3`	`import de.fabiexe.clientspoofer.ClientSpooferOptions;`
`4`	`4`	`import net.minecraft.client.ClientBrandRetriever;`