Merge branch 'master' into dependabot/github_actions/actions/setup-ja…

…va-3.13.0

.github/workflows/gradle.yml

@@ -3,27 +3,27 @@
 
 name: Java CI with Gradle
 
-concurrency: 
-  group: "build-1.20"
+concurrency:
+  group: "build"
   cancel-in-progress: true
 
 on:
   push:
     branches: [ master ]
     paths-ignore:
       - '*.md'
-      
+
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK 17
       uses: actions/[email protected]
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'zulu'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
@@ -34,9 +34,9 @@ jobs:
     - uses: "marvinpinto/action-automatic-releases@latest"
       with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "latest-1.20.1"
+          automatic_release_tag: "latest-1.21"
           prerelease: false
-          title: "1.20.1 Build"
+          title: "1.21 Build"
           files: |
             ./build/libs/*.jar
-    
+

.github/workflows/pull_request.yml

@@ -10,11 +10,11 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK 17
       uses: actions/[email protected]
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'zulu'
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew

README.md

@@ -8,7 +8,7 @@
   <a href="https://anticope.ml/pages/MeteorAddons.html"><img src="https://img.shields.io/badge/Verified%20Addon-Yes-blueviolet" alt="Verified Addon"></a>
   <a href="https://github.com/AntiCope/meteor-rejects/releases"><img src="https://img.shields.io/badge/Version-v0.1-orange" alt="Version"></a>
   <img src="https://img.shields.io/badge/spaghetti%20code-yes-success?logo=java" alt="Spagetti code: yes">
-  <img src="https://img.shields.io/badge/Minecraft%20Version-1.19-blue" alt="Minecraft Version">
+  <img src="https://img.shields.io/badge/Minecraft%20Version-1.20.6-blue" alt="Minecraft Version">
   <a href="https://github.com/AntiCope/meteor-rejects/commits/master"><img src="https://img.shields.io/github/last-commit/AntiCope/meteor-rejects?logo=git" alt="Last commit"></a>
   <img src="https://img.shields.io/github/workflow/status/AntiCope/meteor-rejects/Java%20CI%20with%20Gradle?logo=github" alt="build status">
   <img src="https://img.shields.io/github/languages/code-size/AntiCope/meteor-rejects" alt="Code Size">
@@ -39,6 +39,7 @@
 - ArrowDmg (Ported from [Wurst](https://github.com/Wurst-Imperium/Wurst7/tree))
 - AutoBedTrap (Ported from [BleachHack-CupEdition](https://github.com/CUPZYY/BleachHack-CupEdition/blob/master/CupEdition-1.17/src/main/java/bleach/hack/module/mods/AutoBedtrap.java))
 - AutoCraft (More generalized version of [AutoBedCraft](https://github.com/Anticope/orion/blob/main/src/main/java/me/ghosttypes/orion/modules/main/AutoBedCraft.java) from orion)
+- AutoEnchant
 - AutoExtinguish
 - AutoFarm
 - AutoGrind
@@ -69,6 +70,7 @@
 - Jetpack
 - KnockbackPlus
 - Lavacast
+- LawnBot (Ported from [JexClient](https://github.com/DustinRepo/JexClient/blob/main/src/main/java/me/dustin/jex/feature/mod/impl/world/LawnBot.java))
 - MossBot (Ported from [BleachHack](https://github.com/BleachDrinker420/BleachHack/pull/211))
 - NewChunks (Ported from [BleachHack](https://github.com/BleachDrinker420/BleachHack/blob/master/BleachHack-Fabric-1.17/src/main/java/bleach/hack/module/mods/NewChunks.java))
 - NoJumpDelay

build.gradle

@@ -1,8 +1,8 @@
 plugins {
-	id 'fabric-loom' version '1.1-SNAPSHOT'
+	id 'fabric-loom' version '1.9-SNAPSHOT'
 }
 
-sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -16,6 +16,11 @@ repositories {
 	maven { url "https://maven.seedfinding.com/" }
 	maven { url "https://maven-snapshots.seedfinding.com/" }
 	maven { url 'https://jitpack.io' }
+	maven { url 'https://maven.duti.dev/releases' }
+}
+
+loom {
+	accessWidenerPath = file("src/main/resources/meteor-rejects.accesswidener")
 }
 
 configurations {
@@ -24,13 +29,18 @@ configurations {
 }
 
 dependencies {
+	// This will make it work on most platforms. It automatically chooses the right dependencies at runtime.
+	extraLibs('dev.duti.acheong:cubiomes:1.22.3') { transitive = false }
+	extraLibs('dev.duti.acheong:cubiomes:1.22.3:linux64') { transitive = false }
+	extraLibs('dev.duti.acheong:cubiomes:1.22.3:osx') { transitive = false }
+	extraLibs('dev.duti.acheong:cubiomes:1.22.3:windows64') { transitive = false }
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_version}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-	modImplementation("meteordevelopment:meteor-client:${project.meteor_version}-SNAPSHOT")
-	modImplementation "baritone:fabric:${project.minecraft_version}-SNAPSHOT"
+	modImplementation("meteordevelopment:meteor-client:${project.minecraft_version}-SNAPSHOT")
+    modCompileOnly "meteordevelopment:baritone:${project.baritone_version}-SNAPSHOT"
 
 	// seed .locate and ore sim
 	extraLibs('com.seedfinding:mc_math:ffd2edcfcc0d18147549c88cc7d8ec6cf21b5b91') { transitive = false }
@@ -40,18 +50,14 @@ dependencies {
 	extraLibs('com.seedfinding:mc_biome:41a42cb9019a552598f12089059538853e18ec78') { transitive = false }
 	extraLibs('com.seedfinding:mc_terrain:b4246cbd5880c4f8745ccb90e1b102bde3448126') { transitive = false }
 	extraLibs('com.seedfinding:mc_feature:919b7e513cc1e87e029a9cd703fc4e2dc8686229') { transitive = false }
-	
+
 	// seedcracker api
 	implementation (include('com.github.19MisterX98.SeedcrackerX:seedcrackerx-api:2.10.1')) {transitive = false}
 //	implementation (include('com.github.19MisterX98.SeedcrackerX:seedcrackerx-api:master-SNAPSHOT')) {transitive = false}
 
 	configurations.implementation.extendsFrom(configurations.extraLibs)
 }
 
-loom {
-    accessWidenerPath = file("src/main/resources/meteor-rejects.accesswidener")
-}
-
 processResources {
 	inputs.property "version", project.version
 
@@ -65,7 +71,7 @@ processResources {
 
 jar {
 	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
+		rename { "${it}_${project.archivesBaseName}" }
 	}
 	from {
 		configurations.extraLibs.collect { it.isDirectory() ? it : zipTree(it) }
@@ -85,7 +91,7 @@ tasks.withType(JavaCompile).configureEach {
 	// The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
 	// JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
 	// We'll use that if it's available, but otherwise we'll use the older option.
-	def targetVersion = 17
+	def targetVersion = 21
 	if (JavaVersion.current().isJava9Compatible()) {
 		 it.options.release = targetVersion
 	}

gradle.properties

@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
-minecraft_version=1.20.1
-yarn_version=1.20.1+build.1
-loader_version=0.14.21
+minecraft_version=1.21.4
+yarn_version=1.21.4+build.8
+loader_version=0.16.9
 
 # Mod Properties
 mod_version = 0.3
 maven_group = anticope.rejects
 archives_base_name = meteor-rejects-addon
 
-meteor_version=0.5.4
+baritone_version=1.21.4

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists