Merge pull request #61 from Merennor/1.21.11

1.21.11 Update

Author: Nekiplay

.github/workflows/dev_build.yml

@@ -26,8 +26,8 @@ jobs:
         uses: marvinpinto/action-automatic-releases@latest
         with:
           repo_token: '${{ secrets.GITHUB_TOKEN }}'
-          automatic_release_tag: "1.21.10_1.0.9.5"
+          automatic_release_tag: "1.21.11_1.0.9.5"
           prerelease: true
-          title: "1.21.10 | 1.0.9.5"
+          title: "1.21.11 | 1.0.9.5"
           files: |
             ./build/libs/*.jar

README.md

@@ -9,7 +9,7 @@
 	<a href="https://www.minecraft.net/"><img src="https://img.shields.io/github/license/MeteorClientPlus/MeteorPlus?logo=mdBook&color=FF8C00" alt="Minecraft version"/></a>
 	<br>
 	<a href="https://www.meteoraddons.com/?addon=MeteorClientPlus%2FMeteorPlus"><img src="https://img.shields.io/badge/verified%20addon-yes-brightgreen" alt="Verified Addon"></a>
-	<a href="https://www.minecraft.net/"><img src="https://img.shields.io/badge/minecraft%20version-1.20.4 -- 1.21.10-brightgreen" alt="Minecraft version"/></a>
+	<a href="https://www.minecraft.net/"><img src="https://img.shields.io/badge/minecraft%20version-1.20.4 -- 1.21.11-brightgreen" alt="Minecraft version"/></a>
 	<a href="https://github.com/Nekiplay/MeteorClientPlus/releases"><img src="https://img.shields.io/github/downloads/MeteorClientPlus/MeteorPlus/total" alt="Downloads"/></a>
 	<a href="https://github.com/Nekiplay/MeteorClientPlus/stargazers"><img src="https://badgen.net/github/stars/MeteorClientPlus/MeteorPlus" alt="GitHub stars"/></a>
 	<br>
@@ -30,7 +30,7 @@
 | **Spider+**            | **Spider for Anti-Cheats**                    | **Matrix, Vulcan**            |
 | **Jesus+**             | **Jesus for Anti-Cheats**                     | **Matrix, Vulcan**            |
 | **No Slow+**           | **No Slow for Anti-Cheats**                   | **Matrix, Vulcan, Grim, NCP** |
-| **Fast Climb+** 	      | **Fast Climb for Anti-Cheats**                | **Spartan**                   |
+| **Fast Climb+** 	     | **Fast Climb for Anti-Cheats**                | **Spartan**                   |
 | **Gui Move+**          | **Gui Move for Anti-Cheats**                  | **Matrix, NCP**               |
 | **Timer+**             | **Timer for Anti-Cheats**                     | **NCP, Intave, Vulcan**       |
 | **Safe mine**          | **Prevents player from lava**                 | **Matrix**                    |
@@ -46,16 +46,15 @@
 | **Teams**     | **Does not beat teammates on BedWars and other modes** |                      |
 
 ## Integrations
-| Module              | Description                                       |
-|---------------------|---------------------------------------------------|
-| **Chest Tracker**   | **Colors support, background disabler, y offset** |
-| **Xaero's MiniMap** | **Support baritone control on context**           |
+| Module              					| Description                                       |
+|---------------------------------------|---------------------------------------------------|
+| **Chest Tracker (Unofficial Port)**   | **Colors support, background disabler, y offset** |
+| **Xaero's MiniMap** 					| **Support baritone control on context**           |
 
 ## Commands
 | Command        | Description                                       | Bypasses anti cheats                    |
 |----------------|---------------------------------------------------|-----------------------------------------|
 | **eclip**      | **Vertical clip**                                 | **Matrix, Wraith, Spartan, Negativity** |
-| **gpt**        | **Use ChatGPT module**                            |                                         |
 | **clearinv**   | **Clear inventory exploit not work after 1.20.3** | **NCP**                                 |
 | **rawitemid**  | **Get raw item id for holograms module**          |                                         |
 | **rawblockid** | **Get raw block id for custom blocks module**     |                                         |
@@ -77,10 +76,10 @@
 | **KeyBinds**  | **Now allow binding function to LMB, RMB, ESC** |
 
 # Installation Guide
-1. Install [minecraft](https://www.minecraft.net)
-2. Install [fabric](https://fabricmc.net) and [fabric api](https://www.curseforge.com/minecraft/mc-mods/fabric-api) for your version of minecraft
-3. Download [meteor client](https://meteorclient.com) for your version of minecraft
-4. Download [meteor plus](https://github.com/MeteorClientPlus/MeteorPlus/releases) for your version of minecraft
-5. Place the meteor client and meteor plus in your mods folder
+1. Install [Minecraft](https://www.minecraft.net)
+2. Install [Fabric](https://fabricmc.net) and [Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api) for your version of minecraft
+3. Download [Meteor Client](https://meteorclient.com) for your version of minecraft
+4. Download [Meteor Plus](https://github.com/MeteorClientPlus/MeteorPlus/releases) for your version of minecraft
+5. Place the Meteor Client and Meteor Plus in your mods folder
 
     A: Make Commit we welcome anyone who makes a useful contribution to our free open source product

build.gradle

@@ -0,0 +1,119 @@
+plugins {
+	alias(libs.plugins.fabric.loom)
+	id("maven-publish")
+}
+
+base {
+    archivesName = properties["archives_name"] as String
+    version = libs.versions.mod.version.get()
+    group = properties["maven_group"] as String
+}
+
+configurations.all {
+	// Check for snapshots more frequently than Gradle's default of 1 day. 0 = every build.
+	resolutionStrategy.cacheChangingModulesFor(0, "seconds")
+}
+
+repositories {
+	maven {
+		url = uri("https://jm.gserv.me/repository/maven-public/")
+		content {
+			includeGroup("info.journeymap")
+		}
+	}
+	maven {
+		url = uri("https://api.modrinth.com/maven/")
+		content {
+			includeGroup("maven.modrinth")
+		}
+	}
+	maven {
+        url = uri("https://www.cursemaven.com") 
+    }
+	maven { 
+        url = uri("https://masa.dy.fi/maven") 
+        }
+	// YACL
+	maven {
+		url = uri("https://maven.isxander.dev/releases")
+	}
+	// YACL Snapshots
+	maven {
+		name = "Xander Snapshot Maven"
+		url = uri("https://maven.isxander.dev/snapshots")
+	}
+	// Where Is It, JackFredLib
+	maven {
+		url = uri("https://maven.jackf.red/releases/")
+	}
+	// Meteor Client
+	maven {
+        name = "meteor-maven"
+        url = uri("https://maven.meteordev.org/releases")
+    }
+	maven {
+        name = "meteor-maven-snapshots"
+        url = uri("https://maven.meteordev.org/snapshots")
+    }
+	mavenCentral()
+	gradlePluginPortal()
+}
+
+dependencies {
+	// Fabric
+	minecraft(libs.minecraft)
+	mappings(variantOf(libs.yarn) { classifier("v2") })
+	modImplementation(libs.fabric.loader)
+
+	// Fabric API
+	modImplementation(libs.fabric.api)
+
+	// Mixin extras
+	annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.5.0")
+
+	// Meteor Client
+	modImplementation(files("libs\\baritone-unoptimized-fabric-1.15.0-2-gf7a53504.jar"))
+	modImplementation(libs.meteor.client)
+	implementation(libs.starscript)
+	implementation(libs.orbit)
+
+	// Xaero's Mods
+	modCompileOnly(libs.xwm) // Xaero's World Map
+	modCompileOnly(libs.xmm) // Xaero's Minimap
+	modCompileOnly(files("libs\\xaerolib-fabric-1.21.11-1.0.38.jar"))
+
+	// Chest Tracker
+	modImplementation(libs.whereisit)
+}
+
+loom {
+	accessWidenerPath = file("src/main/resources/meteorplus.accesswidener")
+}
+
+tasks {
+    processResources {
+        val propertyMap = mapOf(
+            "version" to project.version,
+            "mc_version" to libs.versions.minecraft.get(),
+            "gh_hash" to (System.getenv("GITHUB_SHA") ?: ""),
+        )
+        
+	    filesMatching("fabric.mod.json") {
+		    expand (propertyMap)
+        }
+	}
+    jar {
+        val licenseSuffix = project.base.archivesName.get()
+        from("LICENSE") {
+            rename { "${it}_${licenseSuffix}" }
+        }
+    }
+    java {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
+    withType<JavaCompile> {
+        options.encoding = "UTF-8"
+        options.release = 21
+    }
+}

build.gradle.kts

@@ -1,32 +1,5 @@
 org.gradle.jvmargs=-Xmx4G
 
-# Fabric (https://fabricmc.net/versions.html)
-minecraft_version=1.21.10
-yarn_mappings=1.21.10+build.2
-loader_version=0.17.3
-loom_version=1.13-SNAPSHOT
-
-# Fabric API
-fabric_version=0.135.0+1.21.10
-
 # Mod Properties
-mod_version=1.21.10_1.0.9.5
 maven_group=nekiplay.meteorplus
-archives_name=meteor-plus
-
-# Dependency Versions
-
-# Xaero's Mods
-# Xaero's World Map (https://modrinth.com/mod/xaeros-world-map/versions)
-xwm_fabric_version=1.39.17_Fabric_1.21.9
-# Xaero's Minimap (https://modrinth.com/mod/xaeros-minimap/versions)
-xmm_fabric_version=25.2.15_Fabric_1.21.9
-
-# Where Is It (https://modrinth.com/mod/where-is-it/versions)
-where_is_it_version=2.6.4+1.21.2
-# YetAnotherConfigLib (https://github.com/JackFred2/WhereIsIt/blob/1.20.6/gradle.properties)
-yacl_version=3.3.2+1.20.4+update.1.20.5-SNAPSHOT+update.1.20.5-SNAPSHOT
-
-# MaLiLib (https://www.curseforge.com/minecraft/mc-mods/malilib/files/all?page=1&pageSize=20)
-malilib_fileid=4946328
-malilib_projectid=303119
+archives_name=meteor-plus

gradle.properties

@@ -0,0 +1,62 @@
+[versions]
+mod-version = "1.21.11_1.0.9.5"
+
+# Fabric (https://fabricmc.net/develop)
+minecraft = "1.21.11"
+yarn-mappings = "1.21.11+build.3"
+fabric-loader = "0.18.4"
+fabric-api = "0.140.2+1.21.11"
+
+# Plugins
+# Loom (https://github.com/FabricMC/fabric-loom)
+loom = "1.14-SNAPSHOT"
+
+# Meteor (https://github.com/MeteorDevelopment/meteor-client)
+meteor = "1.21.11-SNAPSHOT"
+# Starscript (https://github.com/MeteorDevelopment/starscript)
+starscript = "0.2.5"
+# Orbit (https://github.com/MeteorDevelopment/orbit)
+orbit = "0.2.4"
+
+# Xaero's Mods
+# Xaero's World Map (https://modrinth.com/mod/xaeros-world-map/versions)
+xwm = "1.40.1_Fabric_1.21.11"
+# Xaero's Minimap (https://modrinth.com/mod/xaeros-minimap/versions)
+xmm = "25.3.1_Fabric_1.21.11"
+
+# Where Is It (https://modrinth.com/mod/where-is-it-port/versions)
+whereisit = "2.6.8+1.21.11"
+# YetAnotherConfigLib (https://github.com/ponuing/WhereIsIt/blob/1.21.11/gradle.properties)
+yacl = "3.8.1+1.21.11-fabric"
+
+# MaLiLib (https://www.curseforge.com/minecraft/mc-mods/malilib)
+malilib = "7130809"
+
+[libraries]
+# Fabric base
+minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
+yarn = { module = "net.fabricmc:yarn", version.ref = "yarn-mappings" }
+fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }
+
+# Fabric API
+fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric-api" }
+
+# Meteor Client
+meteor-client = { module = "meteordevelopment:meteor-client", version.ref = "meteor" }
+starscript = { module = "org.meteordev:starscript", version.ref = "starscript" }
+orbit = { module = "meteordevelopment:orbit", version.ref = "orbit" }
+
+# Xaero's Mods
+xwm = { module = "maven.modrinth:xaeros-world-map", version.ref = "xwm" }
+xmm = { module = "maven.modrinth:xaeros-minimap", version.ref = "xmm" }
+
+# Where Is It
+whereisit = { module = "maven.modrinth:where-is-it-port", version.ref = "whereisit" }
+# YetAnotherConfigLib
+yacl = { module = "dev.isxander.yacl:yet-another-config-lib-fabric", version.ref = "yacl" }
+
+# MaLiLib
+malilib = { module = "curse.maven:malilib-303119", version.ref = "malilib" }
+
+[plugins]
+fabric-loom = { id = "fabric-loom", version.ref = "loom" }

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME