Skip to content

Commit

Permalink
Update to 1.21.3/1.21.4 (#399)
Browse files Browse the repository at this point in the history
* Update to 1.21.3 part 1

Don't expect it to work anytime soon.

* Update to 1.21.3 part 2

* Gradle 8.8 -> 8.12

* Working Build 1.21.3

Had to revert gradle to 8.10 due to unforseen issues.

* Removed Unused Imports

* Small rendering fixes (hopefully)

* 1.21.4 port

* Use Utils.canUpdate in AutoCraft

* Intellij code fixes

---------

Co-authored-by: crazymoose77756 <[email protected]>
Co-authored-by: SByte <[email protected]>
  • Loading branch information
3 people authored Jan 25, 2025
1 parent 5049f5f commit 0dcf1a2
Show file tree
Hide file tree
Showing 51 changed files with 425 additions and 341 deletions.
15 changes: 8 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.7-SNAPSHOT'
id 'fabric-loom' version '1.9-SNAPSHOT'
}

sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21
Expand All @@ -18,6 +18,11 @@ repositories {
maven { url 'https://jitpack.io' }
maven { url 'https://maven.duti.dev/releases' }
}

loom {
accessWidenerPath = file("src/main/resources/meteor-rejects.accesswidener")
}

configurations {
// configuration that holds jars to include in the jar
extraLibs
Expand All @@ -34,7 +39,7 @@ dependencies {
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("meteordevelopment:meteor-client:${project.minecraft_version}-SNAPSHOT")
modCompileOnly "meteordevelopment:baritone:${project.baritone_version}-SNAPSHOT"

// seed .locate and ore sim
Expand All @@ -53,10 +58,6 @@ dependencies {
configurations.implementation.extendsFrom(configurations.extraLibs)
}

loom {
accessWidenerPath = file("src/main/resources/meteor-rejects.accesswidener")
}

processResources {
inputs.property "version", project.version

Expand All @@ -70,7 +71,7 @@ processResources {

jar {
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}"}
rename { "${it}_${project.archivesBaseName}" }
}
from {
configurations.extraLibs.collect { it.isDirectory() ? it : zipTree(it) }
Expand Down
9 changes: 4 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
org.gradle.jvmargs=-Xmx2G

# Fabric Properties
minecraft_version=1.21
yarn_version=1.21+build.2
loader_version=0.15.11
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.8
baritone_version=1.20.6
baritone_version=1.21.4
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 0dcf1a2

Please sign in to comment.