diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aa3b78e..5230205 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,124 +18,124 @@ jobs: - uses: gradle/actions/setup-gradle@v5 - - run: ./gradlew build + - run: ./gradlew chiseledBuild - 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 + path: versions/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 + path: versions/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 + path: versions/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 + path: versions/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 + path: versions/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 + path: versions/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 + path: versions/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 + path: versions/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 + path: versions/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 + path: versions/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 + path: versions/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 + path: versions/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 + path: versions/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 + path: versions/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 + path: versions/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 + path: versions/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 - path: mc-1.21.8/build/libs/anarchymod-mc-1.21.8-*.jar + path: versions/1.21.8/build/libs/anarchymod-mc-1.21.8-*.jar if-no-files-found: error - uses: actions/upload-artifact@v7 with: name: anarchymod-mc-1.21.9 - path: mc-1.21.9/build/libs/anarchymod-mc-1.21.9-*.jar + path: versions/1.21.9/build/libs/anarchymod-mc-1.21.9-*.jar if-no-files-found: error - uses: actions/upload-artifact@v7 with: name: anarchymod-mc-1.21.10 - path: mc-1.21.10/build/libs/anarchymod-mc-1.21.10-*.jar + path: versions/1.21.10/build/libs/anarchymod-mc-1.21.10-*.jar if-no-files-found: error - uses: actions/upload-artifact@v7 with: name: anarchymod-mc-1.21.11 - path: mc-1.21.11/build/libs/anarchymod-mc-1.21.11-*.jar + path: versions/1.21.11/build/libs/anarchymod-mc-1.21.11-*.jar if-no-files-found: error diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2cba5a7..922304b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: distribution: 'temurin' - name: Build with Gradle - run: ./gradlew build + run: ./gradlew chiseledBuild - name: Build Changelog id: changelog @@ -122,26 +122,26 @@ 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 \ - mc-1.21.11/build/libs/anarchymod-mc-1.21.11-${VERSION}.jar + versions/1.19.4/build/libs/anarchymod-mc-1.19.4-${VERSION}.jar \ + versions/1.20/build/libs/anarchymod-mc-1.20-${VERSION}.jar \ + versions/1.20.1/build/libs/anarchymod-mc-1.20.1-${VERSION}.jar \ + versions/1.20.2/build/libs/anarchymod-mc-1.20.2-${VERSION}.jar \ + versions/1.20.3/build/libs/anarchymod-mc-1.20.3-${VERSION}.jar \ + versions/1.20.4/build/libs/anarchymod-mc-1.20.4-${VERSION}.jar \ + versions/1.20.5/build/libs/anarchymod-mc-1.20.5-${VERSION}.jar \ + versions/1.20.6/build/libs/anarchymod-mc-1.20.6-${VERSION}.jar \ + versions/1.21/build/libs/anarchymod-mc-1.21-${VERSION}.jar \ + versions/1.21.1/build/libs/anarchymod-mc-1.21.1-${VERSION}.jar \ + versions/1.21.2/build/libs/anarchymod-mc-1.21.2-${VERSION}.jar \ + versions/1.21.3/build/libs/anarchymod-mc-1.21.3-${VERSION}.jar \ + versions/1.21.4/build/libs/anarchymod-mc-1.21.4-${VERSION}.jar \ + versions/1.21.5/build/libs/anarchymod-mc-1.21.5-${VERSION}.jar \ + versions/1.21.6/build/libs/anarchymod-mc-1.21.6-${VERSION}.jar \ + versions/1.21.7/build/libs/anarchymod-mc-1.21.7-${VERSION}.jar \ + versions/1.21.8/build/libs/anarchymod-mc-1.21.8-${VERSION}.jar \ + versions/1.21.9/build/libs/anarchymod-mc-1.21.9-${VERSION}.jar \ + versions/1.21.10/build/libs/anarchymod-mc-1.21.10-${VERSION}.jar \ + versions/1.21.11/build/libs/anarchymod-mc-1.21.11-${VERSION}.jar set-after-version: needs: build diff --git a/.github/workflows/set-version.yml b/.github/workflows/set-version.yml index fe35d3d..de558a4 100644 --- a/.github/workflows/set-version.yml +++ b/.github/workflows/set-version.yml @@ -27,7 +27,7 @@ jobs: ref: ${{ github.ref }} - name: Set Version - run: sed -i "s/version = \".*\"/version = \"${{ inputs.version }}\"/" build.gradle.kts + run: sed -i "s/mod_version=.*/mod_version=${{ inputs.version }}/" gradle.properties - name: Commit Version uses: stefanzweifel/git-auto-commit-action@v7 diff --git a/build.gradle.kts b/build.gradle.kts index 7280704..107de16 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,20 +1,79 @@ plugins { - id("java") + id("fabric-loom") version "1.15.4" + id("maven-publish") } -group = "net.blockhost" -version = "1.0.5-SNAPSHOT" +val minecraftVersion = stonecutter.current.project +val loaderVersion = property("loader_version") as String +val fabricApiVersion = property("fabric_api_version") as String +val javaVersion = (property("java_version") as String).toInt() -repositories { - mavenCentral() +version = property("mod_version")!! +group = property("maven_group")!! + +base { + archivesName.set("anarchymod-mc-${minecraftVersion}") } dependencies { - testImplementation(platform("org.junit:junit-bom:6.0.3")) - testImplementation("org.junit.jupiter:junit-jupiter") - testRuntimeOnly("org.junit.platform:junit-platform-launcher") + minecraft("com.mojang:minecraft:$minecraftVersion") + mappings(loom.officialMojangMappings()) + modImplementation("net.fabricmc:fabric-loader:$loaderVersion") + modImplementation("net.fabricmc.fabric-api:fabric-api:$fabricApiVersion") + implementation("com.google.code.gson:gson:2.13.2") } -tasks.test { - useJUnitPlatform() -} \ No newline at end of file +loom { + runConfigs.all { + ideConfigGenerated(true) + runDir = "../../run" + } +} + +tasks.processResources { + inputs.property("version", project.version) + inputs.property("minecraft_version", minecraftVersion) + inputs.property("loader_version", loaderVersion) + inputs.property("java_version", javaVersion) + filteringCharset = "UTF-8" + + filesMatching("fabric.mod.json") { + expand( + "version" to project.version, + "minecraft_version" to minecraftVersion, + "loader_version" to loaderVersion, + "java_version" to javaVersion + ) + } + + filesMatching("anarchymod.mixins.json") { + expand( + "java_version" to javaVersion + ) + } +} + +tasks.withType().configureEach { + options.encoding = "UTF-8" + options.release.set(javaVersion) +} + +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(javaVersion)) + withSourcesJar() +} + +tasks.jar { + from("LICENSE") { + rename { "${it}_${base.archivesName.get()}" } + } +} + +publishing { + publications { + create("mavenJava") { + artifactId = base.archivesName.get() + from(components["java"]) + } + } +} diff --git a/common/build.gradle.kts b/common/build.gradle.kts deleted file mode 100644 index b71d02f..0000000 --- a/common/build.gradle.kts +++ /dev/null @@ -1,18 +0,0 @@ -plugins { - id("java-library") -} - -group = rootProject.group -version = rootProject.version - -repositories { - mavenCentral() -} - -dependencies { - implementation("com.google.code.gson:gson:2.13.2") -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index f7c8378..0ac4431 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,3 @@ org.gradle.jvmargs=-Xmx1G +mod_version=1.0.5-SNAPSHOT +maven_group=net.blockhost diff --git a/mc-1.19.4/build.gradle.kts b/mc-1.19.4/build.gradle.kts deleted file mode 100644 index b35cefb..0000000 --- a/mc-1.19.4/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.19.4/gradle.properties b/mc-1.19.4/gradle.properties deleted file mode 100644 index af78a59..0000000 --- a/mc-1.19.4/gradle.properties +++ /dev/null @@ -1,10 +0,0 @@ -# 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 - diff --git a/mc-1.19.4/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.19.4/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index ddd26b6..0000000 --- a/mc-1.19.4/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,18 +0,0 @@ -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())); - }); - } -} diff --git a/mc-1.19.4/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.19.4/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index 12353c0..0000000 --- a/mc-1.19.4/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,8 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload { - - public static final ResourceLocation ID = new ResourceLocation("anarchymod", "join"); -} diff --git a/mc-1.19.4/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.19.4/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index 5a89365..0000000 --- a/mc-1.19.4/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 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)); - } - } - -} diff --git a/mc-1.19.4/src/main/resources/anarchymod.mixins.json b/mc-1.19.4/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index c01be5b..0000000 --- a/mc-1.19.4/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_17", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.19.4/src/main/resources/fabric.mod.json b/mc-1.19.4/src/main/resources/fabric.mod.json deleted file mode 100644 index 87c6d3f..0000000 --- a/mc-1.19.4/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=17" - } -} diff --git a/mc-1.20.1/build.gradle.kts b/mc-1.20.1/build.gradle.kts deleted file mode 100644 index b35cefb..0000000 --- a/mc-1.20.1/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.20.1/gradle.properties b/mc-1.20.1/gradle.properties deleted file mode 100644 index 7644a4a..0000000 --- a/mc-1.20.1/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.20.1 -loader_version=0.18.4 -fabric_api_version=0.92.7+1.20.1 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.20.1 diff --git a/mc-1.20.1/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.20.1/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index ddd26b6..0000000 --- a/mc-1.20.1/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,18 +0,0 @@ -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())); - }); - } -} diff --git a/mc-1.20.1/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.20.1/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index 12353c0..0000000 --- a/mc-1.20.1/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,8 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload { - - public static final ResourceLocation ID = new ResourceLocation("anarchymod", "join"); -} diff --git a/mc-1.20.1/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.20.1/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.20.1/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.20.1/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.20.1/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index 5a89365..0000000 --- a/mc-1.20.1/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 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)); - } - } - -} diff --git a/mc-1.20.2/build.gradle.kts b/mc-1.20.2/build.gradle.kts deleted file mode 100644 index b35cefb..0000000 --- a/mc-1.20.2/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.20.2/gradle.properties b/mc-1.20.2/gradle.properties deleted file mode 100644 index dc65e94..0000000 --- a/mc-1.20.2/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.20.2 -loader_version=0.18.4 -fabric_api_version=0.91.6+1.20.2 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.20.2 diff --git a/mc-1.20.2/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.20.2/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index ddd26b6..0000000 --- a/mc-1.20.2/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,18 +0,0 @@ -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())); - }); - } -} diff --git a/mc-1.20.2/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.20.2/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index 12353c0..0000000 --- a/mc-1.20.2/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,8 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload { - - public static final ResourceLocation ID = new ResourceLocation("anarchymod", "join"); -} diff --git a/mc-1.20.2/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.20.2/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.20.2/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.20.2/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.20.2/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index f2bc1b8..0000000 --- a/mc-1.20.2/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 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", ServerData.Type.OTHER)); - } - } - -} diff --git a/mc-1.20.2/src/main/resources/anarchymod.mixins.json b/mc-1.20.2/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index c01be5b..0000000 --- a/mc-1.20.2/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_17", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.20.2/src/main/resources/fabric.mod.json b/mc-1.20.2/src/main/resources/fabric.mod.json deleted file mode 100644 index 87c6d3f..0000000 --- a/mc-1.20.2/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=17" - } -} diff --git a/mc-1.20.3/build.gradle.kts b/mc-1.20.3/build.gradle.kts deleted file mode 100644 index b35cefb..0000000 --- a/mc-1.20.3/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.20.3/gradle.properties b/mc-1.20.3/gradle.properties deleted file mode 100644 index 23b7785..0000000 --- a/mc-1.20.3/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.20.3 -loader_version=0.18.4 -fabric_api_version=0.91.1+1.20.3 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.20.3 diff --git a/mc-1.20.3/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.20.3/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index ddd26b6..0000000 --- a/mc-1.20.3/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,18 +0,0 @@ -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())); - }); - } -} diff --git a/mc-1.20.3/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.20.3/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index 12353c0..0000000 --- a/mc-1.20.3/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,8 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload { - - public static final ResourceLocation ID = new ResourceLocation("anarchymod", "join"); -} diff --git a/mc-1.20.3/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.20.3/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.20.3/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.20.3/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.20.3/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index f2bc1b8..0000000 --- a/mc-1.20.3/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 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", ServerData.Type.OTHER)); - } - } - -} diff --git a/mc-1.20.3/src/main/resources/anarchymod.mixins.json b/mc-1.20.3/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index c01be5b..0000000 --- a/mc-1.20.3/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_17", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.20.3/src/main/resources/fabric.mod.json b/mc-1.20.3/src/main/resources/fabric.mod.json deleted file mode 100644 index 87c6d3f..0000000 --- a/mc-1.20.3/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=17" - } -} diff --git a/mc-1.20.4/build.gradle.kts b/mc-1.20.4/build.gradle.kts deleted file mode 100644 index b35cefb..0000000 --- a/mc-1.20.4/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.20.4/gradle.properties b/mc-1.20.4/gradle.properties deleted file mode 100644 index eeb0d60..0000000 --- a/mc-1.20.4/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.20.4 -loader_version=0.18.4 -fabric_api_version=0.97.3+1.20.4 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.20.4 diff --git a/mc-1.20.4/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.20.4/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index ddd26b6..0000000 --- a/mc-1.20.4/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,18 +0,0 @@ -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())); - }); - } -} diff --git a/mc-1.20.4/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.20.4/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index 12353c0..0000000 --- a/mc-1.20.4/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,8 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload { - - public static final ResourceLocation ID = new ResourceLocation("anarchymod", "join"); -} diff --git a/mc-1.20.4/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.20.4/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.20.4/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.20.4/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.20.4/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index f2bc1b8..0000000 --- a/mc-1.20.4/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 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", ServerData.Type.OTHER)); - } - } - -} diff --git a/mc-1.20.4/src/main/resources/anarchymod.mixins.json b/mc-1.20.4/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index c01be5b..0000000 --- a/mc-1.20.4/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_17", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.20.4/src/main/resources/fabric.mod.json b/mc-1.20.4/src/main/resources/fabric.mod.json deleted file mode 100644 index 87c6d3f..0000000 --- a/mc-1.20.4/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=17" - } -} diff --git a/mc-1.20.5/build.gradle.kts b/mc-1.20.5/build.gradle.kts deleted file mode 100644 index 0e631ec..0000000 --- a/mc-1.20.5/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().configureEach { - options.encoding = "UTF-8" - options.release.set(21) -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) - 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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.20.5/gradle.properties b/mc-1.20.5/gradle.properties deleted file mode 100644 index ae2ae6e..0000000 --- a/mc-1.20.5/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.20.5 -loader_version=0.18.4 -fabric_api_version=0.97.8+1.20.5 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.20.5 diff --git a/mc-1.20.5/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.20.5/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index ff2f8a7..0000000 --- a/mc-1.20.5/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload implements CustomPacketPayload { - - public static final ResourceLocation ID = ResourceLocation.tryBuild("anarchymod", "join"); - - public static final StreamCodec CODEC = - StreamCodec.of( - (payload, buf) -> { - }, - buf -> new JoinPayload() - ); - - public static final Type TYPE = - new Type<>(ID); - - @Override - public Type type() { - return TYPE; - } -} diff --git a/mc-1.20.5/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.20.5/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.20.5/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.20.5/src/main/resources/anarchymod.mixins.json b/mc-1.20.5/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index 88503bf..0000000 --- a/mc-1.20.5/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_21", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.20.5/src/main/resources/fabric.mod.json b/mc-1.20.5/src/main/resources/fabric.mod.json deleted file mode 100644 index 3a41f8d..0000000 --- a/mc-1.20.5/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=21" - } -} diff --git a/mc-1.20.6/build.gradle.kts b/mc-1.20.6/build.gradle.kts deleted file mode 100644 index 0e631ec..0000000 --- a/mc-1.20.6/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().configureEach { - options.encoding = "UTF-8" - options.release.set(21) -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) - 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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.20.6/gradle.properties b/mc-1.20.6/gradle.properties deleted file mode 100644 index dd6492b..0000000 --- a/mc-1.20.6/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.20.6 -loader_version=0.18.4 -fabric_api_version=0.100.8+1.20.6 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.20.6 diff --git a/mc-1.20.6/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.20.6/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index a30c897..0000000 --- a/mc-1.20.6/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.blockhost.anarchymod; - -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; -import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; - -public class AnarchyMod implements ClientModInitializer { - - @Override - public void onInitializeClient() { - PayloadTypeRegistry.playC2S().register(JoinPayload.TYPE, JoinPayload.CODEC); - ClientPlayConnectionEvents.JOIN.register((listener, sender, client) -> { - if (client.getCurrentServer() != null && Domains.contains(client.getCurrentServer().ip)) - sender.sendPacket(new JoinPayload()); - }); - } - - -} diff --git a/mc-1.20.6/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.20.6/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index ff2f8a7..0000000 --- a/mc-1.20.6/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload implements CustomPacketPayload { - - public static final ResourceLocation ID = ResourceLocation.tryBuild("anarchymod", "join"); - - public static final StreamCodec CODEC = - StreamCodec.of( - (payload, buf) -> { - }, - buf -> new JoinPayload() - ); - - public static final Type TYPE = - new Type<>(ID); - - @Override - public Type type() { - return TYPE; - } -} diff --git a/mc-1.20.6/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.20.6/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.20.6/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.20.6/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.20.6/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index d326a67..0000000 --- a/mc-1.20.6/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 serverList; - - @Inject(method = "load", at = @At("RETURN")) - public void afterLoad(CallbackInfo ci) { - if (serverList.stream().noneMatch(data -> Domains.contains(data.ip))) { - serverList.addFirst(new ServerData("6b6t", "6b6t.org", ServerData.Type.OTHER)); - } - } - -} diff --git a/mc-1.20.6/src/main/resources/anarchymod.mixins.json b/mc-1.20.6/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index 88503bf..0000000 --- a/mc-1.20.6/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_21", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.20.6/src/main/resources/fabric.mod.json b/mc-1.20.6/src/main/resources/fabric.mod.json deleted file mode 100644 index 3a41f8d..0000000 --- a/mc-1.20.6/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=21" - } -} diff --git a/mc-1.20/build.gradle.kts b/mc-1.20/build.gradle.kts deleted file mode 100644 index b35cefb..0000000 --- a/mc-1.20/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.20/gradle.properties b/mc-1.20/gradle.properties deleted file mode 100644 index 24bf45e..0000000 --- a/mc-1.20/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.20 -loader_version=0.18.4 -fabric_api_version=0.83.0+1.20 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.20 diff --git a/mc-1.20/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.20/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index ddd26b6..0000000 --- a/mc-1.20/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,18 +0,0 @@ -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())); - }); - } -} diff --git a/mc-1.20/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.20/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index 12353c0..0000000 --- a/mc-1.20/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,8 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload { - - public static final ResourceLocation ID = new ResourceLocation("anarchymod", "join"); -} diff --git a/mc-1.20/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.20/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.20/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.20/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.20/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index 5a89365..0000000 --- a/mc-1.20/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 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)); - } - } - -} diff --git a/mc-1.20/src/main/resources/anarchymod.mixins.json b/mc-1.20/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index c01be5b..0000000 --- a/mc-1.20/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_17", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.20/src/main/resources/fabric.mod.json b/mc-1.20/src/main/resources/fabric.mod.json deleted file mode 100644 index 87c6d3f..0000000 --- a/mc-1.20/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=17" - } -} diff --git a/mc-1.21.1/build.gradle.kts b/mc-1.21.1/build.gradle.kts deleted file mode 100644 index 0e631ec..0000000 --- a/mc-1.21.1/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().configureEach { - options.encoding = "UTF-8" - options.release.set(21) -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) - 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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.21.1/gradle.properties b/mc-1.21.1/gradle.properties deleted file mode 100644 index ea6789f..0000000 --- a/mc-1.21.1/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.1 -loader_version=0.18.4 -fabric_api_version=0.116.9+1.21.1 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.21.1 diff --git a/mc-1.21.1/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.21.1/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index a30c897..0000000 --- a/mc-1.21.1/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.blockhost.anarchymod; - -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; -import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; - -public class AnarchyMod implements ClientModInitializer { - - @Override - public void onInitializeClient() { - PayloadTypeRegistry.playC2S().register(JoinPayload.TYPE, JoinPayload.CODEC); - ClientPlayConnectionEvents.JOIN.register((listener, sender, client) -> { - if (client.getCurrentServer() != null && Domains.contains(client.getCurrentServer().ip)) - sender.sendPacket(new JoinPayload()); - }); - } - - -} diff --git a/mc-1.21.1/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.21.1/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index ff2f8a7..0000000 --- a/mc-1.21.1/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload implements CustomPacketPayload { - - public static final ResourceLocation ID = ResourceLocation.tryBuild("anarchymod", "join"); - - public static final StreamCodec CODEC = - StreamCodec.of( - (payload, buf) -> { - }, - buf -> new JoinPayload() - ); - - public static final Type TYPE = - new Type<>(ID); - - @Override - public Type type() { - return TYPE; - } -} diff --git a/mc-1.21.1/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.21.1/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.21.1/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.21.1/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.21.1/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index d326a67..0000000 --- a/mc-1.21.1/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 serverList; - - @Inject(method = "load", at = @At("RETURN")) - public void afterLoad(CallbackInfo ci) { - if (serverList.stream().noneMatch(data -> Domains.contains(data.ip))) { - serverList.addFirst(new ServerData("6b6t", "6b6t.org", ServerData.Type.OTHER)); - } - } - -} diff --git a/mc-1.21.1/src/main/resources/anarchymod.mixins.json b/mc-1.21.1/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index 88503bf..0000000 --- a/mc-1.21.1/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_21", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.21.1/src/main/resources/fabric.mod.json b/mc-1.21.1/src/main/resources/fabric.mod.json deleted file mode 100644 index 3a41f8d..0000000 --- a/mc-1.21.1/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=21" - } -} diff --git a/mc-1.21.10/build.gradle.kts b/mc-1.21.10/build.gradle.kts deleted file mode 100644 index 0e631ec..0000000 --- a/mc-1.21.10/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().configureEach { - options.encoding = "UTF-8" - options.release.set(21) -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) - 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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.21.10/gradle.properties b/mc-1.21.10/gradle.properties deleted file mode 100644 index c8627f0..0000000 --- a/mc-1.21.10/gradle.properties +++ /dev/null @@ -1,10 +0,0 @@ -# Done to increase the memory available to gradle. -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.10 -loader_version=0.18.4 -fabric_api_version=0.138.4+1.21.10 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.21.10 - diff --git a/mc-1.21.10/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.21.10/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index a30c897..0000000 --- a/mc-1.21.10/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.blockhost.anarchymod; - -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; -import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; - -public class AnarchyMod implements ClientModInitializer { - - @Override - public void onInitializeClient() { - PayloadTypeRegistry.playC2S().register(JoinPayload.TYPE, JoinPayload.CODEC); - ClientPlayConnectionEvents.JOIN.register((listener, sender, client) -> { - if (client.getCurrentServer() != null && Domains.contains(client.getCurrentServer().ip)) - sender.sendPacket(new JoinPayload()); - }); - } - - -} diff --git a/mc-1.21.10/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.21.10/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index 5613cdc..0000000 --- a/mc-1.21.10/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload implements CustomPacketPayload { - - public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath("anarchymod", "join"); - - public static final StreamCodec CODEC = - StreamCodec.of( - (payload, buf) -> { - }, - buf -> new JoinPayload() - ); - - public static final Type TYPE = - new Type<>(ID); - - @Override - public Type type() { - return TYPE; - } -} diff --git a/mc-1.21.10/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.21.10/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.21.10/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.21.10/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.21.10/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index d326a67..0000000 --- a/mc-1.21.10/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 serverList; - - @Inject(method = "load", at = @At("RETURN")) - public void afterLoad(CallbackInfo ci) { - if (serverList.stream().noneMatch(data -> Domains.contains(data.ip))) { - serverList.addFirst(new ServerData("6b6t", "6b6t.org", ServerData.Type.OTHER)); - } - } - -} diff --git a/mc-1.21.10/src/main/resources/anarchymod.mixins.json b/mc-1.21.10/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index 88503bf..0000000 --- a/mc-1.21.10/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_21", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.21.10/src/main/resources/fabric.mod.json b/mc-1.21.10/src/main/resources/fabric.mod.json deleted file mode 100644 index 3a41f8d..0000000 --- a/mc-1.21.10/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=21" - } -} diff --git a/mc-1.21.11/build.gradle.kts b/mc-1.21.11/build.gradle.kts deleted file mode 100644 index 0e631ec..0000000 --- a/mc-1.21.11/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().configureEach { - options.encoding = "UTF-8" - options.release.set(21) -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) - 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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.21.11/gradle.properties b/mc-1.21.11/gradle.properties deleted file mode 100644 index 242cae3..0000000 --- a/mc-1.21.11/gradle.properties +++ /dev/null @@ -1,10 +0,0 @@ -# Done to increase the memory available to gradle. -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.11 -loader_version=0.18.4 -fabric_api_version=0.141.3+1.21.11 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.21.11 - diff --git a/mc-1.21.11/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.21.11/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index a30c897..0000000 --- a/mc-1.21.11/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.blockhost.anarchymod; - -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; -import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; - -public class AnarchyMod implements ClientModInitializer { - - @Override - public void onInitializeClient() { - PayloadTypeRegistry.playC2S().register(JoinPayload.TYPE, JoinPayload.CODEC); - ClientPlayConnectionEvents.JOIN.register((listener, sender, client) -> { - if (client.getCurrentServer() != null && Domains.contains(client.getCurrentServer().ip)) - sender.sendPacket(new JoinPayload()); - }); - } - - -} diff --git a/mc-1.21.11/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.21.11/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.21.11/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.21.11/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.21.11/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index d326a67..0000000 --- a/mc-1.21.11/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 serverList; - - @Inject(method = "load", at = @At("RETURN")) - public void afterLoad(CallbackInfo ci) { - if (serverList.stream().noneMatch(data -> Domains.contains(data.ip))) { - serverList.addFirst(new ServerData("6b6t", "6b6t.org", ServerData.Type.OTHER)); - } - } - -} diff --git a/mc-1.21.11/src/main/resources/anarchymod.mixins.json b/mc-1.21.11/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index 88503bf..0000000 --- a/mc-1.21.11/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_21", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.21.11/src/main/resources/fabric.mod.json b/mc-1.21.11/src/main/resources/fabric.mod.json deleted file mode 100644 index 3a41f8d..0000000 --- a/mc-1.21.11/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=21" - } -} diff --git a/mc-1.21.2/build.gradle.kts b/mc-1.21.2/build.gradle.kts deleted file mode 100644 index 0e631ec..0000000 --- a/mc-1.21.2/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().configureEach { - options.encoding = "UTF-8" - options.release.set(21) -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) - 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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.21.2/gradle.properties b/mc-1.21.2/gradle.properties deleted file mode 100644 index 508da3a..0000000 --- a/mc-1.21.2/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.2 -loader_version=0.18.4 -fabric_api_version=0.106.1+1.21.2 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.21.2 diff --git a/mc-1.21.2/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.21.2/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index a30c897..0000000 --- a/mc-1.21.2/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.blockhost.anarchymod; - -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; -import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; - -public class AnarchyMod implements ClientModInitializer { - - @Override - public void onInitializeClient() { - PayloadTypeRegistry.playC2S().register(JoinPayload.TYPE, JoinPayload.CODEC); - ClientPlayConnectionEvents.JOIN.register((listener, sender, client) -> { - if (client.getCurrentServer() != null && Domains.contains(client.getCurrentServer().ip)) - sender.sendPacket(new JoinPayload()); - }); - } - - -} diff --git a/mc-1.21.2/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.21.2/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index ff2f8a7..0000000 --- a/mc-1.21.2/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload implements CustomPacketPayload { - - public static final ResourceLocation ID = ResourceLocation.tryBuild("anarchymod", "join"); - - public static final StreamCodec CODEC = - StreamCodec.of( - (payload, buf) -> { - }, - buf -> new JoinPayload() - ); - - public static final Type TYPE = - new Type<>(ID); - - @Override - public Type type() { - return TYPE; - } -} diff --git a/mc-1.21.2/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.21.2/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.21.2/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.21.2/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.21.2/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index d326a67..0000000 --- a/mc-1.21.2/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 serverList; - - @Inject(method = "load", at = @At("RETURN")) - public void afterLoad(CallbackInfo ci) { - if (serverList.stream().noneMatch(data -> Domains.contains(data.ip))) { - serverList.addFirst(new ServerData("6b6t", "6b6t.org", ServerData.Type.OTHER)); - } - } - -} diff --git a/mc-1.21.2/src/main/resources/anarchymod.mixins.json b/mc-1.21.2/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index 88503bf..0000000 --- a/mc-1.21.2/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_21", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.21.2/src/main/resources/fabric.mod.json b/mc-1.21.2/src/main/resources/fabric.mod.json deleted file mode 100644 index 3a41f8d..0000000 --- a/mc-1.21.2/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=21" - } -} diff --git a/mc-1.21.3/build.gradle.kts b/mc-1.21.3/build.gradle.kts deleted file mode 100644 index 0e631ec..0000000 --- a/mc-1.21.3/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().configureEach { - options.encoding = "UTF-8" - options.release.set(21) -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) - 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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.21.3/gradle.properties b/mc-1.21.3/gradle.properties deleted file mode 100644 index 92e59a1..0000000 --- a/mc-1.21.3/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.3 -loader_version=0.18.4 -fabric_api_version=0.114.1+1.21.3 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.21.3 diff --git a/mc-1.21.3/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.21.3/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index a30c897..0000000 --- a/mc-1.21.3/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.blockhost.anarchymod; - -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; -import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; - -public class AnarchyMod implements ClientModInitializer { - - @Override - public void onInitializeClient() { - PayloadTypeRegistry.playC2S().register(JoinPayload.TYPE, JoinPayload.CODEC); - ClientPlayConnectionEvents.JOIN.register((listener, sender, client) -> { - if (client.getCurrentServer() != null && Domains.contains(client.getCurrentServer().ip)) - sender.sendPacket(new JoinPayload()); - }); - } - - -} diff --git a/mc-1.21.3/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.21.3/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index ff2f8a7..0000000 --- a/mc-1.21.3/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload implements CustomPacketPayload { - - public static final ResourceLocation ID = ResourceLocation.tryBuild("anarchymod", "join"); - - public static final StreamCodec CODEC = - StreamCodec.of( - (payload, buf) -> { - }, - buf -> new JoinPayload() - ); - - public static final Type TYPE = - new Type<>(ID); - - @Override - public Type type() { - return TYPE; - } -} diff --git a/mc-1.21.3/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.21.3/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.21.3/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.21.3/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.21.3/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index d326a67..0000000 --- a/mc-1.21.3/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 serverList; - - @Inject(method = "load", at = @At("RETURN")) - public void afterLoad(CallbackInfo ci) { - if (serverList.stream().noneMatch(data -> Domains.contains(data.ip))) { - serverList.addFirst(new ServerData("6b6t", "6b6t.org", ServerData.Type.OTHER)); - } - } - -} diff --git a/mc-1.21.3/src/main/resources/anarchymod.mixins.json b/mc-1.21.3/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index 88503bf..0000000 --- a/mc-1.21.3/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_21", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.21.3/src/main/resources/fabric.mod.json b/mc-1.21.3/src/main/resources/fabric.mod.json deleted file mode 100644 index 3a41f8d..0000000 --- a/mc-1.21.3/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=21" - } -} diff --git a/mc-1.21.4/build.gradle.kts b/mc-1.21.4/build.gradle.kts deleted file mode 100644 index 0e631ec..0000000 --- a/mc-1.21.4/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().configureEach { - options.encoding = "UTF-8" - options.release.set(21) -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) - 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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.21.4/gradle.properties b/mc-1.21.4/gradle.properties deleted file mode 100644 index 2457916..0000000 --- a/mc-1.21.4/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.4 -loader_version=0.18.4 -fabric_api_version=0.119.4+1.21.4 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.21.4 diff --git a/mc-1.21.4/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.21.4/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index a30c897..0000000 --- a/mc-1.21.4/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.blockhost.anarchymod; - -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; -import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; - -public class AnarchyMod implements ClientModInitializer { - - @Override - public void onInitializeClient() { - PayloadTypeRegistry.playC2S().register(JoinPayload.TYPE, JoinPayload.CODEC); - ClientPlayConnectionEvents.JOIN.register((listener, sender, client) -> { - if (client.getCurrentServer() != null && Domains.contains(client.getCurrentServer().ip)) - sender.sendPacket(new JoinPayload()); - }); - } - - -} diff --git a/mc-1.21.4/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.21.4/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index ff2f8a7..0000000 --- a/mc-1.21.4/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload implements CustomPacketPayload { - - public static final ResourceLocation ID = ResourceLocation.tryBuild("anarchymod", "join"); - - public static final StreamCodec CODEC = - StreamCodec.of( - (payload, buf) -> { - }, - buf -> new JoinPayload() - ); - - public static final Type TYPE = - new Type<>(ID); - - @Override - public Type type() { - return TYPE; - } -} diff --git a/mc-1.21.4/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.21.4/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.21.4/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.21.4/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.21.4/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index d326a67..0000000 --- a/mc-1.21.4/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 serverList; - - @Inject(method = "load", at = @At("RETURN")) - public void afterLoad(CallbackInfo ci) { - if (serverList.stream().noneMatch(data -> Domains.contains(data.ip))) { - serverList.addFirst(new ServerData("6b6t", "6b6t.org", ServerData.Type.OTHER)); - } - } - -} diff --git a/mc-1.21.4/src/main/resources/anarchymod.mixins.json b/mc-1.21.4/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index 88503bf..0000000 --- a/mc-1.21.4/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_21", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.21.4/src/main/resources/fabric.mod.json b/mc-1.21.4/src/main/resources/fabric.mod.json deleted file mode 100644 index 3a41f8d..0000000 --- a/mc-1.21.4/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=21" - } -} diff --git a/mc-1.21.5/build.gradle.kts b/mc-1.21.5/build.gradle.kts deleted file mode 100644 index 0e631ec..0000000 --- a/mc-1.21.5/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().configureEach { - options.encoding = "UTF-8" - options.release.set(21) -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) - 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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.21.5/gradle.properties b/mc-1.21.5/gradle.properties deleted file mode 100644 index 1187ba6..0000000 --- a/mc-1.21.5/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.5 -loader_version=0.18.4 -fabric_api_version=0.128.2+1.21.5 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.21.5 diff --git a/mc-1.21.5/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.21.5/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index a30c897..0000000 --- a/mc-1.21.5/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.blockhost.anarchymod; - -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; -import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; - -public class AnarchyMod implements ClientModInitializer { - - @Override - public void onInitializeClient() { - PayloadTypeRegistry.playC2S().register(JoinPayload.TYPE, JoinPayload.CODEC); - ClientPlayConnectionEvents.JOIN.register((listener, sender, client) -> { - if (client.getCurrentServer() != null && Domains.contains(client.getCurrentServer().ip)) - sender.sendPacket(new JoinPayload()); - }); - } - - -} diff --git a/mc-1.21.5/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.21.5/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index ff2f8a7..0000000 --- a/mc-1.21.5/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload implements CustomPacketPayload { - - public static final ResourceLocation ID = ResourceLocation.tryBuild("anarchymod", "join"); - - public static final StreamCodec CODEC = - StreamCodec.of( - (payload, buf) -> { - }, - buf -> new JoinPayload() - ); - - public static final Type TYPE = - new Type<>(ID); - - @Override - public Type type() { - return TYPE; - } -} diff --git a/mc-1.21.5/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.21.5/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.21.5/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.21.5/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.21.5/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index d326a67..0000000 --- a/mc-1.21.5/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 serverList; - - @Inject(method = "load", at = @At("RETURN")) - public void afterLoad(CallbackInfo ci) { - if (serverList.stream().noneMatch(data -> Domains.contains(data.ip))) { - serverList.addFirst(new ServerData("6b6t", "6b6t.org", ServerData.Type.OTHER)); - } - } - -} diff --git a/mc-1.21.5/src/main/resources/anarchymod.mixins.json b/mc-1.21.5/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index 88503bf..0000000 --- a/mc-1.21.5/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_21", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.21.5/src/main/resources/fabric.mod.json b/mc-1.21.5/src/main/resources/fabric.mod.json deleted file mode 100644 index 3a41f8d..0000000 --- a/mc-1.21.5/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=21" - } -} diff --git a/mc-1.21.6/build.gradle.kts b/mc-1.21.6/build.gradle.kts deleted file mode 100644 index 0e631ec..0000000 --- a/mc-1.21.6/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().configureEach { - options.encoding = "UTF-8" - options.release.set(21) -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) - 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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.21.6/gradle.properties b/mc-1.21.6/gradle.properties deleted file mode 100644 index 967527b..0000000 --- a/mc-1.21.6/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.6 -loader_version=0.18.4 -fabric_api_version=0.128.2+1.21.6 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.21.6 diff --git a/mc-1.21.6/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.21.6/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index a30c897..0000000 --- a/mc-1.21.6/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.blockhost.anarchymod; - -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; -import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; - -public class AnarchyMod implements ClientModInitializer { - - @Override - public void onInitializeClient() { - PayloadTypeRegistry.playC2S().register(JoinPayload.TYPE, JoinPayload.CODEC); - ClientPlayConnectionEvents.JOIN.register((listener, sender, client) -> { - if (client.getCurrentServer() != null && Domains.contains(client.getCurrentServer().ip)) - sender.sendPacket(new JoinPayload()); - }); - } - - -} diff --git a/mc-1.21.6/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.21.6/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index ff2f8a7..0000000 --- a/mc-1.21.6/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload implements CustomPacketPayload { - - public static final ResourceLocation ID = ResourceLocation.tryBuild("anarchymod", "join"); - - public static final StreamCodec CODEC = - StreamCodec.of( - (payload, buf) -> { - }, - buf -> new JoinPayload() - ); - - public static final Type TYPE = - new Type<>(ID); - - @Override - public Type type() { - return TYPE; - } -} diff --git a/mc-1.21.6/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.21.6/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.21.6/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.21.6/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.21.6/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index d326a67..0000000 --- a/mc-1.21.6/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 serverList; - - @Inject(method = "load", at = @At("RETURN")) - public void afterLoad(CallbackInfo ci) { - if (serverList.stream().noneMatch(data -> Domains.contains(data.ip))) { - serverList.addFirst(new ServerData("6b6t", "6b6t.org", ServerData.Type.OTHER)); - } - } - -} diff --git a/mc-1.21.6/src/main/resources/anarchymod.mixins.json b/mc-1.21.6/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index 88503bf..0000000 --- a/mc-1.21.6/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_21", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.21.6/src/main/resources/fabric.mod.json b/mc-1.21.6/src/main/resources/fabric.mod.json deleted file mode 100644 index 3a41f8d..0000000 --- a/mc-1.21.6/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=21" - } -} diff --git a/mc-1.21.7/build.gradle.kts b/mc-1.21.7/build.gradle.kts deleted file mode 100644 index 0e631ec..0000000 --- a/mc-1.21.7/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().configureEach { - options.encoding = "UTF-8" - options.release.set(21) -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) - 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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.21.7/gradle.properties b/mc-1.21.7/gradle.properties deleted file mode 100644 index 016fce2..0000000 --- a/mc-1.21.7/gradle.properties +++ /dev/null @@ -1,10 +0,0 @@ -# Done to increase the memory available to gradle. -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.7 -loader_version=0.18.4 -fabric_api_version=0.129.0+1.21.7 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.21.7 - diff --git a/mc-1.21.7/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.21.7/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index a30c897..0000000 --- a/mc-1.21.7/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.blockhost.anarchymod; - -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; -import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; - -public class AnarchyMod implements ClientModInitializer { - - @Override - public void onInitializeClient() { - PayloadTypeRegistry.playC2S().register(JoinPayload.TYPE, JoinPayload.CODEC); - ClientPlayConnectionEvents.JOIN.register((listener, sender, client) -> { - if (client.getCurrentServer() != null && Domains.contains(client.getCurrentServer().ip)) - sender.sendPacket(new JoinPayload()); - }); - } - - -} diff --git a/mc-1.21.7/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.21.7/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index 5613cdc..0000000 --- a/mc-1.21.7/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload implements CustomPacketPayload { - - public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath("anarchymod", "join"); - - public static final StreamCodec CODEC = - StreamCodec.of( - (payload, buf) -> { - }, - buf -> new JoinPayload() - ); - - public static final Type TYPE = - new Type<>(ID); - - @Override - public Type type() { - return TYPE; - } -} diff --git a/mc-1.21.7/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.21.7/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.21.7/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.21.7/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.21.7/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index d326a67..0000000 --- a/mc-1.21.7/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 serverList; - - @Inject(method = "load", at = @At("RETURN")) - public void afterLoad(CallbackInfo ci) { - if (serverList.stream().noneMatch(data -> Domains.contains(data.ip))) { - serverList.addFirst(new ServerData("6b6t", "6b6t.org", ServerData.Type.OTHER)); - } - } - -} diff --git a/mc-1.21.7/src/main/resources/anarchymod.mixins.json b/mc-1.21.7/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index 88503bf..0000000 --- a/mc-1.21.7/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_21", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.21.7/src/main/resources/fabric.mod.json b/mc-1.21.7/src/main/resources/fabric.mod.json deleted file mode 100644 index 3a41f8d..0000000 --- a/mc-1.21.7/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=21" - } -} diff --git a/mc-1.21.8/build.gradle.kts b/mc-1.21.8/build.gradle.kts deleted file mode 100644 index 0e631ec..0000000 --- a/mc-1.21.8/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().configureEach { - options.encoding = "UTF-8" - options.release.set(21) -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) - 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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.21.8/gradle.properties b/mc-1.21.8/gradle.properties deleted file mode 100644 index 9f96f5f..0000000 --- a/mc-1.21.8/gradle.properties +++ /dev/null @@ -1,10 +0,0 @@ -# Done to increase the memory available to gradle. -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.8 -loader_version=0.18.4 -fabric_api_version=0.136.1+1.21.8 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.21.8 - diff --git a/mc-1.21.8/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.21.8/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index a30c897..0000000 --- a/mc-1.21.8/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.blockhost.anarchymod; - -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; -import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; - -public class AnarchyMod implements ClientModInitializer { - - @Override - public void onInitializeClient() { - PayloadTypeRegistry.playC2S().register(JoinPayload.TYPE, JoinPayload.CODEC); - ClientPlayConnectionEvents.JOIN.register((listener, sender, client) -> { - if (client.getCurrentServer() != null && Domains.contains(client.getCurrentServer().ip)) - sender.sendPacket(new JoinPayload()); - }); - } - - -} diff --git a/mc-1.21.8/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.21.8/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index 5613cdc..0000000 --- a/mc-1.21.8/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload implements CustomPacketPayload { - - public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath("anarchymod", "join"); - - public static final StreamCodec CODEC = - StreamCodec.of( - (payload, buf) -> { - }, - buf -> new JoinPayload() - ); - - public static final Type TYPE = - new Type<>(ID); - - @Override - public Type type() { - return TYPE; - } -} diff --git a/mc-1.21.8/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.21.8/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.21.8/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.21.8/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.21.8/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index d326a67..0000000 --- a/mc-1.21.8/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 serverList; - - @Inject(method = "load", at = @At("RETURN")) - public void afterLoad(CallbackInfo ci) { - if (serverList.stream().noneMatch(data -> Domains.contains(data.ip))) { - serverList.addFirst(new ServerData("6b6t", "6b6t.org", ServerData.Type.OTHER)); - } - } - -} diff --git a/mc-1.21.8/src/main/resources/anarchymod.mixins.json b/mc-1.21.8/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index 88503bf..0000000 --- a/mc-1.21.8/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_21", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.21.8/src/main/resources/fabric.mod.json b/mc-1.21.8/src/main/resources/fabric.mod.json deleted file mode 100644 index 3a41f8d..0000000 --- a/mc-1.21.8/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=21" - } -} diff --git a/mc-1.21.9/build.gradle.kts b/mc-1.21.9/build.gradle.kts deleted file mode 100644 index 0e631ec..0000000 --- a/mc-1.21.9/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().configureEach { - options.encoding = "UTF-8" - options.release.set(21) -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) - 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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.21.9/gradle.properties b/mc-1.21.9/gradle.properties deleted file mode 100644 index f7b8e1f..0000000 --- a/mc-1.21.9/gradle.properties +++ /dev/null @@ -1,10 +0,0 @@ -# Done to increase the memory available to gradle. -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.9 -loader_version=0.18.4 -fabric_api_version=0.134.1+1.21.9 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.21.9 - diff --git a/mc-1.21.9/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.21.9/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index a30c897..0000000 --- a/mc-1.21.9/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.blockhost.anarchymod; - -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; -import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; - -public class AnarchyMod implements ClientModInitializer { - - @Override - public void onInitializeClient() { - PayloadTypeRegistry.playC2S().register(JoinPayload.TYPE, JoinPayload.CODEC); - ClientPlayConnectionEvents.JOIN.register((listener, sender, client) -> { - if (client.getCurrentServer() != null && Domains.contains(client.getCurrentServer().ip)) - sender.sendPacket(new JoinPayload()); - }); - } - - -} diff --git a/mc-1.21.9/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.21.9/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index 5613cdc..0000000 --- a/mc-1.21.9/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload implements CustomPacketPayload { - - public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath("anarchymod", "join"); - - public static final StreamCodec CODEC = - StreamCodec.of( - (payload, buf) -> { - }, - buf -> new JoinPayload() - ); - - public static final Type TYPE = - new Type<>(ID); - - @Override - public Type type() { - return TYPE; - } -} diff --git a/mc-1.21.9/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.21.9/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.21.9/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.21.9/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.21.9/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index d326a67..0000000 --- a/mc-1.21.9/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 serverList; - - @Inject(method = "load", at = @At("RETURN")) - public void afterLoad(CallbackInfo ci) { - if (serverList.stream().noneMatch(data -> Domains.contains(data.ip))) { - serverList.addFirst(new ServerData("6b6t", "6b6t.org", ServerData.Type.OTHER)); - } - } - -} diff --git a/mc-1.21.9/src/main/resources/anarchymod.mixins.json b/mc-1.21.9/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index 88503bf..0000000 --- a/mc-1.21.9/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_21", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.21.9/src/main/resources/fabric.mod.json b/mc-1.21.9/src/main/resources/fabric.mod.json deleted file mode 100644 index 3a41f8d..0000000 --- a/mc-1.21.9/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=21" - } -} diff --git a/mc-1.21/build.gradle.kts b/mc-1.21/build.gradle.kts deleted file mode 100644 index 0e631ec..0000000 --- a/mc-1.21/build.gradle.kts +++ /dev/null @@ -1,75 +0,0 @@ -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().configureEach { - options.encoding = "UTF-8" - options.release.set(21) -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of(21)) - 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("mavenJava") { - artifactId = base.archivesName.get() - from(components["java"]) - } - } -} diff --git a/mc-1.21/gradle.properties b/mc-1.21/gradle.properties deleted file mode 100644 index 6dc5fe2..0000000 --- a/mc-1.21/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Fabric Properties -# check these on https://modmuss50.me/fabric.html -minecraft_version=1.21 -loader_version=0.18.4 -fabric_api_version=0.102.0+1.21 -# Mod Properties -maven_group=net.blockhost -archives_base_name=mc-1.21 diff --git a/mc-1.21/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/mc-1.21/src/main/java/net/blockhost/anarchymod/AnarchyMod.java deleted file mode 100644 index a30c897..0000000 --- a/mc-1.21/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.blockhost.anarchymod; - -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; -import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; - -public class AnarchyMod implements ClientModInitializer { - - @Override - public void onInitializeClient() { - PayloadTypeRegistry.playC2S().register(JoinPayload.TYPE, JoinPayload.CODEC); - ClientPlayConnectionEvents.JOIN.register((listener, sender, client) -> { - if (client.getCurrentServer() != null && Domains.contains(client.getCurrentServer().ip)) - sender.sendPacket(new JoinPayload()); - }); - } - - -} diff --git a/mc-1.21/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/mc-1.21/src/main/java/net/blockhost/anarchymod/JoinPayload.java deleted file mode 100644 index ff2f8a7..0000000 --- a/mc-1.21/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.blockhost.anarchymod; - -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; - -public class JoinPayload implements CustomPacketPayload { - - public static final ResourceLocation ID = ResourceLocation.tryBuild("anarchymod", "join"); - - public static final StreamCodec CODEC = - StreamCodec.of( - (payload, buf) -> { - }, - buf -> new JoinPayload() - ); - - public static final Type TYPE = - new Type<>(ID); - - @Override - public Type type() { - return TYPE; - } -} diff --git a/mc-1.21/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/mc-1.21/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java deleted file mode 100644 index 3881394..0000000 --- a/mc-1.21/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ /dev/null @@ -1,21 +0,0 @@ -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 cir) { - boolean contains = Domains.contains(server); - if (contains) { - cir.setReturnValue(false); - } - } - -} diff --git a/mc-1.21/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/mc-1.21/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java deleted file mode 100644 index d326a67..0000000 --- a/mc-1.21/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -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 serverList; - - @Inject(method = "load", at = @At("RETURN")) - public void afterLoad(CallbackInfo ci) { - if (serverList.stream().noneMatch(data -> Domains.contains(data.ip))) { - serverList.addFirst(new ServerData("6b6t", "6b6t.org", ServerData.Type.OTHER)); - } - } - -} diff --git a/mc-1.21/src/main/resources/anarchymod.mixins.json b/mc-1.21/src/main/resources/anarchymod.mixins.json deleted file mode 100644 index 88503bf..0000000 --- a/mc-1.21/src/main/resources/anarchymod.mixins.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_21", - "client": [ - "BlockedServersMixin", - "ServerListMixin" - ], - "injectors": { - "defaultRequire": 1 - }, - "overwrites": { - "requireAnnotations": true - } -} diff --git a/mc-1.21/src/main/resources/fabric.mod.json b/mc-1.21/src/main/resources/fabric.mod.json deleted file mode 100644 index 3a41f8d..0000000 --- a/mc-1.21/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schemaVersion": 1, - "id": "anarchymod", - "version": "${version}", - "name": "AnarchyMod", - "description": "Bypass a potential Mojang blacklist of 6b6t - the biggest anarchy server in the world.", - "authors": [ - "6b6t" - ], - "contact": { - "homepage": "https://www.6b6t.org/?utm_source=anarchymod&utm_medium=mod_menu&utm_campaign=evergreen_website&utm_content=description_link", - "issues": "https://github.com/6b6t/AnarchyMod/issues", - "sources": "https://github.com/6b6t/AnarchyMod" - }, - "license": "MIT", - "icon": "assets/anarchymod/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "net.blockhost.anarchymod.AnarchyMod" - ] - }, - "mixins": [ - "anarchymod.mixins.json" - ], - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://6b6t.org/discord" - } - } - }, - "depends": { - "fabric": "*", - "fabricloader": ">=${loader_version}", - "minecraft": "${minecraft_version}", - "java": ">=21" - } -} diff --git a/settings.gradle.kts b/settings.gradle.kts index d0c9e59..17feaef 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,33 +1,23 @@ -rootProject.name = "AnarchyMod" - pluginManagement { repositories { - maven { - url = uri("https://maven.fabricmc.net/") - } + maven("https://maven.fabricmc.net/") + maven("https://maven.kikugie.dev/releases") gradlePluginPortal() } } +plugins { + id("dev.kikugie.stonecutter") version "0.8.3" +} -include("common") -include("mc-1.19.4") -include("mc-1.20") -include("mc-1.20.1") -include("mc-1.20.2") -include("mc-1.20.3") -include("mc-1.20.4") -include("mc-1.20.5") -include("mc-1.20.6") -include("mc-1.21") -include("mc-1.21.1") -include("mc-1.21.2") -include("mc-1.21.3") -include("mc-1.21.4") -include("mc-1.21.5") -include("mc-1.21.6") -include("mc-1.21.7") -include("mc-1.21.8") -include("mc-1.21.9") -include("mc-1.21.10") -include("mc-1.21.11") +stonecutter { + create(rootProject) { + versions( + "1.19.4", "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", + "1.20.5", "1.20.6", + "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", + "1.21.5", "1.21.6", "1.21.7", + "1.21.8", "1.21.9", "1.21.10", "1.21.11" + ) + } +} diff --git a/mc-1.20.5/src/main/java/net/blockhost/anarchymod/AnarchyMod.java b/src/main/java/net/blockhost/anarchymod/AnarchyMod.java similarity index 62% rename from mc-1.20.5/src/main/java/net/blockhost/anarchymod/AnarchyMod.java rename to src/main/java/net/blockhost/anarchymod/AnarchyMod.java index a30c897..f2bc05a 100644 --- a/mc-1.20.5/src/main/java/net/blockhost/anarchymod/AnarchyMod.java +++ b/src/main/java/net/blockhost/anarchymod/AnarchyMod.java @@ -1,19 +1,29 @@ package net.blockhost.anarchymod; +//? if <1.20.5 { +/*import io.netty.buffer.Unpooled; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.minecraft.network.FriendlyByteBuf; +*///?} else { +import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; +//?} import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; -import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; public class AnarchyMod implements ClientModInitializer { @Override public void onInitializeClient() { + //? if >=1.20.5 { PayloadTypeRegistry.playC2S().register(JoinPayload.TYPE, JoinPayload.CODEC); + //?} ClientPlayConnectionEvents.JOIN.register((listener, sender, client) -> { if (client.getCurrentServer() != null && Domains.contains(client.getCurrentServer().ip)) + //? if <1.20.5 { + /*ClientPlayNetworking.send(JoinPayload.ID, new FriendlyByteBuf(Unpooled.buffer())); + *///?} else { sender.sendPacket(new JoinPayload()); + //?} }); } - - } diff --git a/common/src/main/java/net/blockhost/anarchymod/Domains.java b/src/main/java/net/blockhost/anarchymod/Domains.java similarity index 100% rename from common/src/main/java/net/blockhost/anarchymod/Domains.java rename to src/main/java/net/blockhost/anarchymod/Domains.java diff --git a/mc-1.21.11/src/main/java/net/blockhost/anarchymod/JoinPayload.java b/src/main/java/net/blockhost/anarchymod/JoinPayload.java similarity index 56% rename from mc-1.21.11/src/main/java/net/blockhost/anarchymod/JoinPayload.java rename to src/main/java/net/blockhost/anarchymod/JoinPayload.java index fd38119..cd4fe00 100644 --- a/mc-1.21.11/src/main/java/net/blockhost/anarchymod/JoinPayload.java +++ b/src/main/java/net/blockhost/anarchymod/JoinPayload.java @@ -1,13 +1,31 @@ package net.blockhost.anarchymod; +//? if <1.20.5 { +/*import net.minecraft.resources.ResourceLocation; + +public class JoinPayload { + + public static final ResourceLocation ID = new ResourceLocation("anarchymod", "join"); +} +*///?} else { import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +//? if >=1.21.11 { import net.minecraft.resources.Identifier; +//? } else { +/*import net.minecraft.resources.ResourceLocation; +*///?} public class JoinPayload implements CustomPacketPayload { + //? if >=1.21.11 { public static final Identifier ID = Identifier.fromNamespaceAndPath("anarchymod", "join"); + //? } elif >=1.21.7 { + /*public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath("anarchymod", "join"); + *///?} else { + /*public static final ResourceLocation ID = ResourceLocation.tryBuild("anarchymod", "join"); + *///?} public static final StreamCodec CODEC = StreamCodec.of( @@ -24,3 +42,4 @@ public class JoinPayload implements CustomPacketPayload { return TYPE; } } +//?} diff --git a/mc-1.19.4/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java b/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java similarity index 99% rename from mc-1.19.4/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java rename to src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java index 3881394..91ae415 100644 --- a/mc-1.19.4/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java +++ b/src/main/java/net/blockhost/anarchymod/mixin/BlockedServersMixin.java @@ -17,5 +17,4 @@ public class BlockedServersMixin { cir.setReturnValue(false); } } - } diff --git a/mc-1.20.5/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java b/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java similarity index 76% rename from mc-1.20.5/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java rename to src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java index d326a67..db7c2ab 100644 --- a/mc-1.20.5/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java +++ b/src/main/java/net/blockhost/anarchymod/mixin/ServerListMixin.java @@ -22,8 +22,13 @@ public class ServerListMixin { @Inject(method = "load", at = @At("RETURN")) public void afterLoad(CallbackInfo ci) { if (serverList.stream().noneMatch(data -> Domains.contains(data.ip))) { + //? if <1.20.2 { + /*serverList.add(0, new ServerData("6b6t", "6b6t.org", false)); + *///? } elif <1.20.5 { + /*serverList.add(0, new ServerData("6b6t", "6b6t.org", ServerData.Type.OTHER)); + *///?} else { serverList.addFirst(new ServerData("6b6t", "6b6t.org", ServerData.Type.OTHER)); + //?} } } - } diff --git a/mc-1.20.1/src/main/resources/anarchymod.mixins.json b/src/main/resources/anarchymod.mixins.json similarity index 84% rename from mc-1.20.1/src/main/resources/anarchymod.mixins.json rename to src/main/resources/anarchymod.mixins.json index c01be5b..4c8acde 100644 --- a/mc-1.20.1/src/main/resources/anarchymod.mixins.json +++ b/src/main/resources/anarchymod.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "net.blockhost.anarchymod.mixin", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_${java_version}", "client": [ "BlockedServersMixin", "ServerListMixin" diff --git a/common/src/main/resources/assets/anarchymod/icon.png b/src/main/resources/assets/anarchymod/icon.png similarity index 100% rename from common/src/main/resources/assets/anarchymod/icon.png rename to src/main/resources/assets/anarchymod/icon.png diff --git a/mc-1.20.1/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json similarity index 96% rename from mc-1.20.1/src/main/resources/fabric.mod.json rename to src/main/resources/fabric.mod.json index 87c6d3f..b49ec11 100644 --- a/mc-1.20.1/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -34,6 +34,6 @@ "fabric": "*", "fabricloader": ">=${loader_version}", "minecraft": "${minecraft_version}", - "java": ">=17" + "java": ">=${java_version}" } } diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts new file mode 100644 index 0000000..8450af7 --- /dev/null +++ b/stonecutter.gradle.kts @@ -0,0 +1,10 @@ +plugins { + id("dev.kikugie.stonecutter") +} + +stonecutter active "1.21.11" + +tasks.register("chiseledBuild") { + group = "project" + dependsOn(stonecutter.tasks.named("build")) +} diff --git a/versions/1.19.4/gradle.properties b/versions/1.19.4/gradle.properties new file mode 100644 index 0000000..81196c5 --- /dev/null +++ b/versions/1.19.4/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.19.4 +loader_version=0.14.21 +fabric_api_version=0.76.0+1.19.4 +java_version=17 diff --git a/versions/1.20.1/gradle.properties b/versions/1.20.1/gradle.properties new file mode 100644 index 0000000..7768e48 --- /dev/null +++ b/versions/1.20.1/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.20.1 +loader_version=0.18.4 +fabric_api_version=0.92.7+1.20.1 +java_version=17 diff --git a/versions/1.20.2/gradle.properties b/versions/1.20.2/gradle.properties new file mode 100644 index 0000000..04c0c71 --- /dev/null +++ b/versions/1.20.2/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.20.2 +loader_version=0.18.4 +fabric_api_version=0.91.6+1.20.2 +java_version=17 diff --git a/versions/1.20.3/gradle.properties b/versions/1.20.3/gradle.properties new file mode 100644 index 0000000..304ad7a --- /dev/null +++ b/versions/1.20.3/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.20.3 +loader_version=0.18.4 +fabric_api_version=0.91.1+1.20.3 +java_version=17 diff --git a/versions/1.20.4/gradle.properties b/versions/1.20.4/gradle.properties new file mode 100644 index 0000000..530f881 --- /dev/null +++ b/versions/1.20.4/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.20.4 +loader_version=0.18.4 +fabric_api_version=0.97.3+1.20.4 +java_version=17 diff --git a/versions/1.20.5/gradle.properties b/versions/1.20.5/gradle.properties new file mode 100644 index 0000000..d8e03a2 --- /dev/null +++ b/versions/1.20.5/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.20.5 +loader_version=0.18.4 +fabric_api_version=0.97.8+1.20.5 +java_version=21 diff --git a/versions/1.20.6/gradle.properties b/versions/1.20.6/gradle.properties new file mode 100644 index 0000000..2726903 --- /dev/null +++ b/versions/1.20.6/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.20.6 +loader_version=0.18.4 +fabric_api_version=0.100.8+1.20.6 +java_version=21 diff --git a/versions/1.20/gradle.properties b/versions/1.20/gradle.properties new file mode 100644 index 0000000..7d76dfb --- /dev/null +++ b/versions/1.20/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.20 +loader_version=0.18.4 +fabric_api_version=0.83.0+1.20 +java_version=17 diff --git a/versions/1.21.1/gradle.properties b/versions/1.21.1/gradle.properties new file mode 100644 index 0000000..7a0eccd --- /dev/null +++ b/versions/1.21.1/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.21.1 +loader_version=0.18.4 +fabric_api_version=0.116.9+1.21.1 +java_version=21 diff --git a/versions/1.21.10/gradle.properties b/versions/1.21.10/gradle.properties new file mode 100644 index 0000000..2fb5b3d --- /dev/null +++ b/versions/1.21.10/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.21.10 +loader_version=0.18.4 +fabric_api_version=0.138.4+1.21.10 +java_version=21 diff --git a/versions/1.21.11/gradle.properties b/versions/1.21.11/gradle.properties new file mode 100644 index 0000000..cadf83f --- /dev/null +++ b/versions/1.21.11/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.21.11 +loader_version=0.18.4 +fabric_api_version=0.141.3+1.21.11 +java_version=21 diff --git a/versions/1.21.2/gradle.properties b/versions/1.21.2/gradle.properties new file mode 100644 index 0000000..7604e9a --- /dev/null +++ b/versions/1.21.2/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.21.2 +loader_version=0.18.4 +fabric_api_version=0.106.1+1.21.2 +java_version=21 diff --git a/versions/1.21.3/gradle.properties b/versions/1.21.3/gradle.properties new file mode 100644 index 0000000..9e153a3 --- /dev/null +++ b/versions/1.21.3/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.21.3 +loader_version=0.18.4 +fabric_api_version=0.114.1+1.21.3 +java_version=21 diff --git a/versions/1.21.4/gradle.properties b/versions/1.21.4/gradle.properties new file mode 100644 index 0000000..20df7e2 --- /dev/null +++ b/versions/1.21.4/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.21.4 +loader_version=0.18.4 +fabric_api_version=0.119.4+1.21.4 +java_version=21 diff --git a/versions/1.21.5/gradle.properties b/versions/1.21.5/gradle.properties new file mode 100644 index 0000000..9e4084f --- /dev/null +++ b/versions/1.21.5/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.21.5 +loader_version=0.18.4 +fabric_api_version=0.128.2+1.21.5 +java_version=21 diff --git a/versions/1.21.6/gradle.properties b/versions/1.21.6/gradle.properties new file mode 100644 index 0000000..04a2da0 --- /dev/null +++ b/versions/1.21.6/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.21.6 +loader_version=0.18.4 +fabric_api_version=0.128.2+1.21.6 +java_version=21 diff --git a/versions/1.21.7/gradle.properties b/versions/1.21.7/gradle.properties new file mode 100644 index 0000000..73022a8 --- /dev/null +++ b/versions/1.21.7/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.21.7 +loader_version=0.18.4 +fabric_api_version=0.129.0+1.21.7 +java_version=21 diff --git a/versions/1.21.8/gradle.properties b/versions/1.21.8/gradle.properties new file mode 100644 index 0000000..3807589 --- /dev/null +++ b/versions/1.21.8/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.21.8 +loader_version=0.18.4 +fabric_api_version=0.136.1+1.21.8 +java_version=21 diff --git a/versions/1.21.9/gradle.properties b/versions/1.21.9/gradle.properties new file mode 100644 index 0000000..86f753f --- /dev/null +++ b/versions/1.21.9/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.21.9 +loader_version=0.18.4 +fabric_api_version=0.134.1+1.21.9 +java_version=21 diff --git a/versions/1.21/gradle.properties b/versions/1.21/gradle.properties new file mode 100644 index 0000000..237fc21 --- /dev/null +++ b/versions/1.21/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.21 +loader_version=0.18.4 +fabric_api_version=0.102.0+1.21 +java_version=21