Added support for versions 1.19.4 through 1.21.7

.github/workflows/build.yml

@@ -2,7 +2,7 @@ name: Build
 
 on:
   push:
-    branches: [main]
+    branches: [ main ]
   pull_request:
 
 jobs:
@@ -20,6 +20,102 @@ jobs:
 
       - run: ./gradlew build
 
+      - uses: actions/upload-artifact@v7
+        with:
+          name: anarchymod-mc-1.19.4
+          path: mc-1.19.4/build/libs/anarchymod-mc-1.19.4-*.jar
+          if-no-files-found: error
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: anarchymod-mc-1.20
+          path: mc-1.20/build/libs/anarchymod-mc-1.20-*.jar
+          if-no-files-found: error
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: anarchymod-mc-1.20.1
+          path: mc-1.20.1/build/libs/anarchymod-mc-1.20.1-*.jar
+          if-no-files-found: error
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: anarchymod-mc-1.20.2
+          path: mc-1.20.2/build/libs/anarchymod-mc-1.20.2-*.jar
+          if-no-files-found: error
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: anarchymod-mc-1.20.3
+          path: mc-1.20.3/build/libs/anarchymod-mc-1.20.3-*.jar
+          if-no-files-found: error
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: anarchymod-mc-1.20.4
+          path: mc-1.20.4/build/libs/anarchymod-mc-1.20.4-*.jar
+          if-no-files-found: error
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: anarchymod-mc-1.20.5
+          path: mc-1.20.5/build/libs/anarchymod-mc-1.20.5-*.jar
+          if-no-files-found: error
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: anarchymod-mc-1.20.6
+          path: mc-1.20.6/build/libs/anarchymod-mc-1.20.6-*.jar
+          if-no-files-found: error
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: anarchymod-mc-1.21
+          path: mc-1.21/build/libs/anarchymod-mc-1.21-*.jar
+          if-no-files-found: error
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: anarchymod-mc-1.21.1
+          path: mc-1.21.1/build/libs/anarchymod-mc-1.21.1-*.jar
+          if-no-files-found: error
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: anarchymod-mc-1.21.2
+          path: mc-1.21.2/build/libs/anarchymod-mc-1.21.2-*.jar
+          if-no-files-found: error
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: anarchymod-mc-1.21.3
+          path: mc-1.21.3/build/libs/anarchymod-mc-1.21.3-*.jar
+          if-no-files-found: error
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: anarchymod-mc-1.21.4
+          path: mc-1.21.4/build/libs/anarchymod-mc-1.21.4-*.jar
+          if-no-files-found: error
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: anarchymod-mc-1.21.5
+          path: mc-1.21.5/build/libs/anarchymod-mc-1.21.5-*.jar
+          if-no-files-found: error
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: anarchymod-mc-1.21.6
+          path: mc-1.21.6/build/libs/anarchymod-mc-1.21.6-*.jar
+          if-no-files-found: error
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: anarchymod-mc-1.21.7
+          path: mc-1.21.7/build/libs/anarchymod-mc-1.21.7-*.jar
+          if-no-files-found: error
+
       - uses: actions/upload-artifact@v7
         with:
           name: anarchymod-mc-1.21.8

.github/workflows/release.yml

@@ -94,6 +94,22 @@ jobs:
 
           | Minecraft Version | Download |
           |---|---|
+          | 1.19.4 | [\`anarchymod-mc-1.19.4-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.19.4-${VERSION}.jar) |
+          | 1.20 | [\`anarchymod-mc-1.20-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.20-${VERSION}.jar) |
+          | 1.20.1 | [\`anarchymod-mc-1.20.1-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.20.1-${VERSION}.jar) |
+          | 1.20.2 | [\`anarchymod-mc-1.20.2-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.20.2-${VERSION}.jar) |
+          | 1.20.3 | [\`anarchymod-mc-1.20.3-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.20.3-${VERSION}.jar) |
+          | 1.20.4 | [\`anarchymod-mc-1.20.4-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.20.4-${VERSION}.jar) |
+          | 1.20.5 | [\`anarchymod-mc-1.20.5-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.20.5-${VERSION}.jar) |
+          | 1.20.6 | [\`anarchymod-mc-1.20.6-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.20.6-${VERSION}.jar) |
+          | 1.21 | [\`anarchymod-mc-1.21-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.21-${VERSION}.jar) |
+          | 1.21.1 | [\`anarchymod-mc-1.21.1-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.21.1-${VERSION}.jar) |
+          | 1.21.2 | [\`anarchymod-mc-1.21.2-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.21.2-${VERSION}.jar) |
+          | 1.21.3 | [\`anarchymod-mc-1.21.3-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.21.3-${VERSION}.jar) |
+          | 1.21.4 | [\`anarchymod-mc-1.21.4-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.21.4-${VERSION}.jar) |
+          | 1.21.5 | [\`anarchymod-mc-1.21.5-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.21.5-${VERSION}.jar) |
+          | 1.21.6 | [\`anarchymod-mc-1.21.6-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.21.6-${VERSION}.jar) |
+          | 1.21.7 | [\`anarchymod-mc-1.21.7-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.21.7-${VERSION}.jar) |
           | 1.21.8 | [\`anarchymod-mc-1.21.8-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.21.8-${VERSION}.jar) |
           | 1.21.9 | [\`anarchymod-mc-1.21.9-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.21.9-${VERSION}.jar) |
           | 1.21.10 | [\`anarchymod-mc-1.21.10-${VERSION}.jar\`](${DOWNLOAD_URL}/anarchymod-mc-1.21.10-${VERSION}.jar) |
@@ -106,6 +122,22 @@ jobs:
           gh release create "${VERSION}" \
             --title "AnarchyMod ${VERSION}" \
             --notes "${NOTES}" \
+            mc-1.19.4/build/libs/anarchymod-mc-1.19.4-${VERSION}.jar \
+            mc-1.20/build/libs/anarchymod-mc-1.20-${VERSION}.jar \
+            mc-1.20.1/build/libs/anarchymod-mc-1.20.1-${VERSION}.jar \
+            mc-1.20.2/build/libs/anarchymod-mc-1.20.2-${VERSION}.jar \
+            mc-1.20.3/build/libs/anarchymod-mc-1.20.3-${VERSION}.jar \
+            mc-1.20.4/build/libs/anarchymod-mc-1.20.4-${VERSION}.jar \
+            mc-1.20.5/build/libs/anarchymod-mc-1.20.5-${VERSION}.jar \
+            mc-1.20.6/build/libs/anarchymod-mc-1.20.6-${VERSION}.jar \
+            mc-1.21/build/libs/anarchymod-mc-1.21-${VERSION}.jar \
+            mc-1.21.1/build/libs/anarchymod-mc-1.21.1-${VERSION}.jar \
+            mc-1.21.2/build/libs/anarchymod-mc-1.21.2-${VERSION}.jar \
+            mc-1.21.3/build/libs/anarchymod-mc-1.21.3-${VERSION}.jar \
+            mc-1.21.4/build/libs/anarchymod-mc-1.21.4-${VERSION}.jar \
+            mc-1.21.5/build/libs/anarchymod-mc-1.21.5-${VERSION}.jar \
+            mc-1.21.6/build/libs/anarchymod-mc-1.21.6-${VERSION}.jar \
+            mc-1.21.7/build/libs/anarchymod-mc-1.21.7-${VERSION}.jar \
             mc-1.21.8/build/libs/anarchymod-mc-1.21.8-${VERSION}.jar \
             mc-1.21.9/build/libs/anarchymod-mc-1.21.9-${VERSION}.jar \
             mc-1.21.10/build/libs/anarchymod-mc-1.21.10-${VERSION}.jar \

README.md

@@ -15,14 +15,31 @@
 
 | Minecraft | Module       |
 |-----------|--------------|
+| 1.19.4    | `mc-1.19.4`  |
+| 1.20      | `mc-1.20`    |
+| 1.20.1    | `mc-1.20.1`  |
+| 1.20.2    | `mc-1.20.2`  |
+| 1.20.3    | `mc-1.20.3`  |
+| 1.20.4    | `mc-1.20.4`  |
+| 1.20.5    | `mc-1.20.5`  |
+| 1.20.6    | `mc-1.20.6`  |
+| 1.21      | `mc-1.21`    |
+| 1.21.1    | `mc-1.21.1`  |
+| 1.21.2    | `mc-1.21.2`  |
+| 1.21.3    | `mc-1.21.3`  |
+| 1.21.4    | `mc-1.21.4`  |
+| 1.21.5    | `mc-1.21.5`  |
+| 1.21.6    | `mc-1.21.6`  |
+| 1.21.7    | `mc-1.21.7`  |
 | 1.21.8    | `mc-1.21.8`  |
 | 1.21.9    | `mc-1.21.9`  |
 | 1.21.10   | `mc-1.21.10` |
 | 1.21.11   | `mc-1.21.11` |
 
 ## Installation
 
-1. Install [Fabric Loader](https://fabricmc.net/) and [Fabric API](https://modrinth.com/mod/fabric-api) for your Minecraft version
+1. Install [Fabric Loader](https://fabricmc.net/) and [Fabric API](https://modrinth.com/mod/fabric-api) for your
+   Minecraft version
 2. Download the matching JAR from [Releases](https://github.com/6b6t/AnarchyMod/releases)
 3. Place the JAR in your `.minecraft/mods` folder
 

common/build.gradle.kts

@@ -14,5 +14,5 @@ dependencies {
 }
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 }

common/src/main/java/net/blockhost/anarchymod/Domains.java

@@ -34,7 +34,8 @@ public class Domains {
     }
 
     private static void loadRemote() {
-        try (HttpClient client = HttpClient.newHttpClient()) {
+        try {
+            HttpClient client = HttpClient.newHttpClient();
             HttpRequest request = HttpRequest.newBuilder()
                 .uri(URI.create(DOMAINS_URL))
                 .timeout(Duration.ofSeconds(15))

desktop.ini

@@ -0,0 +1,2 @@
+[.ShellClassInfo]
+LocalizedResourceName=AnarchyMod

mc-1.19.4/build.gradle.kts

@@ -0,0 +1,75 @@
+plugins {
+    id("fabric-loom") version "1.15.4"
+    id("maven-publish")
+}
+
+val minecraftVersion = property("minecraft_version") as String
+val loaderVersion = property("loader_version") as String
+val fabricApiVersion = property("fabric_api_version") as String
+
+version = rootProject.version
+group = property("maven_group")!!
+
+base {
+    archivesName.set("anarchymod-${project.name}")
+}
+
+repositories {
+}
+
+sourceSets {
+    main {
+        resources.srcDir(project(":common").sourceSets["main"].resources.srcDirs)
+    }
+}
+
+dependencies {
+    minecraft("com.mojang:minecraft:$minecraftVersion")
+    mappings(loom.officialMojangMappings())
+    modImplementation("net.fabricmc:fabric-loader:$loaderVersion")
+    modImplementation("net.fabricmc.fabric-api:fabric-api:$fabricApiVersion")
+    implementation(project(":common"))
+}
+
+tasks.processResources {
+    inputs.property("version", project.version)
+    inputs.property("minecraft_version", minecraftVersion)
+    inputs.property("loader_version", loaderVersion)
+    filteringCharset = "UTF-8"
+
+    filesMatching("fabric.mod.json") {
+        expand(
+            "version" to project.version,
+            "minecraft_version" to minecraftVersion,
+            "loader_version" to loaderVersion,
+            "fabric_api_version" to fabricApiVersion
+        )
+    }
+}
+
+tasks.withType<JavaCompile>().configureEach {
+    options.encoding = "UTF-8"
+    options.release.set(17)
+}
+
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    withSourcesJar()
+}
+
+tasks.jar {
+    dependsOn(project(":common").tasks.named("classes"))
+    from(project(":common").sourceSets["main"].output.classesDirs)
+    from("LICENSE") {
+        rename { "${it}_${base.archivesName.get()}" }
+    }
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("mavenJava") {
+            artifactId = base.archivesName.get()
+            from(components["java"])
+        }
+    }
+}

mc-1.19.4/gradle.properties

@@ -0,0 +1,10 @@
+# Done to increase the memory available to gradle.
+# Fabric Properties
+# check these on https://modmuss50.me/fabric.html
+minecraft_version=1.19.4
+loader_version=0.14.21
+fabric_api_version=0.76.0+1.19.4
+# Mod Properties
+maven_group=net.blockhost
+archives_base_name=mc-1.19.4
+

mc-1.19.4/src/main/java/net/blockhost/anarchymod/AnarchyMod.java

@@ -0,0 +1,18 @@
+package net.blockhost.anarchymod;
+
+import io.netty.buffer.Unpooled;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.minecraft.network.FriendlyByteBuf;
+
+public class AnarchyMod implements ClientModInitializer {
+
+    @Override
+    public void onInitializeClient() {
+        ClientPlayConnectionEvents.JOIN.register((listener, sender, client) -> {
+            if (client.getCurrentServer() != null && Domains.contains(client.getCurrentServer().ip))
+                ClientPlayNetworking.send(JoinPayload.ID, new FriendlyByteBuf(Unpooled.buffer()));
+        });
+    }
+}

mc-1.19.4/src/main/java/net/blockhost/anarchymod/JoinPayload.java

@@ -0,0 +1,8 @@
+package net.blockhost.anarchymod;
+
+import net.minecraft.resources.ResourceLocation;
+
+public class JoinPayload {
+
+    public static final ResourceLocation ID = new ResourceLocation("anarchymod", "join");
+}

mc-1.19.4/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java

@@ -0,0 +1,21 @@
+package net.blockhost.anarchymod.mixin;
+
+import com.mojang.patchy.BlockedServers;
+import net.blockhost.anarchymod.Domains;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(BlockedServers.class)
+public class BlockedServersMixin {
+
+    @Inject(method = "isBlockedServerHostName", at = @At("RETURN"), cancellable = true, remap = false)
+    public void isBlockedServerHostName(String server, CallbackInfoReturnable<Boolean> cir) {
+        boolean contains = Domains.contains(server);
+        if (contains) {
+            cir.setReturnValue(false);
+        }
+    }
+
+}

mc-1.19.4/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java

@@ -0,0 +1,29 @@
+package net.blockhost.anarchymod.mixin;
+
+import net.blockhost.anarchymod.Domains;
+import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.client.multiplayer.ServerList;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.List;
+
+@Mixin(ServerList.class)
+public class ServerListMixin {
+
+    @Shadow
+    @Final
+    private List<ServerData> serverList;
+
+    @Inject(method = "load", at = @At("RETURN"))
+    public void afterLoad(CallbackInfo ci) {
+        if (serverList.stream().noneMatch(data -> Domains.contains(data.ip))) {
+            serverList.add(0, new ServerData("6b6t", "6b6t.org", false));
+        }
+    }
+
+}

mc-1.19.4/src/main/resources/anarchymod.mixins.json

@@ -0,0 +1,16 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "net.blockhost.anarchymod.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "client": [
+    "BlockedServersMixin",
+    "ServerListMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "overwrites": {
+    "requireAnnotations": true
+  }
+}