Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mod to Minecraft 1.21 #1

Merged
merged 4 commits into from
Jul 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
matrix:
# Use these Java versions
java: [
16 # Minimum supported by Minecraft
21 # Minimum supported by Minecraft
]
# and run on both Linux and Windows
os: [ubuntu-20.04, windows-latest]
Expand All @@ -32,7 +32,7 @@ jobs:
- name: build
run: ./gradlew build
- name: capture build artifacts
if: ${{ runner.os == 'Linux' && matrix.java == '16' }} # Only upload artifacts built from latest java on one OS
if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
uses: actions/upload-artifact@v2
with:
name: Artifacts
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ Since clients need to predict their teleportation destination in order to make t

* Enforce that block*states* match, not only blocks. Will need to rotate them.
* (goofy idea) Make it so you can't teleport if other players in MP can see you
* I don't think it would hurt to improve the network consumption further by using raw packets + raw block IDs, instead of just "serialize to NBT and shove the tag into a packet".

# Blah

Expand Down
25 changes: 15 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
plugins {
id 'fabric-loom' version '0.8-SNAPSHOT'
id 'fabric-loom' version '1.7.+'
id 'maven-publish'
}

sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21

archivesBaseName = "${project.archives_base_name}-${project.minecraft_version}"
version = project.mod_version
group = project.maven_group

repositories {
maven {
name = "saiko"
url = "https://maven.dblsaiko.net"
name = "vram guild"
url = "https://maven.vram.io"
}

maven {
name = "terraformers"
url = "https://maven.terraformersmc.com/"
}

maven {
Expand All @@ -38,16 +43,16 @@ dependencies {

// Actually no, just gimme the modules I need
modImplementation fabricApi.module("fabric-networking-api-v1", project.fabric_version)
modImplementation fabricApi.module("fabric-object-builder-api-v1", project.fabric_version)
modImplementation fabricApi.module("fabric-lifecycle-events-v1", project.fabric_version)
modImplementation fabricApi.module("fabric-resource-loader-v0", project.fabric_version)
modImplementation fabricApi.module("fabric-tag-extensions-v0", project.fabric_version)

// and lifecycle-events transitive dep
modImplementation fabricApi.module("fabric-api-base", project.fabric_version)

// Literally so i can mix in to 1 class
modCompileOnly "grondag:frex-mc117:5.4.234"
modCompileOnly "grondag:canvas-mc117-1.17:1.0.1851"
//modCompileOnly "io.vram:frex-fabric:20.5.369"
//modCompileOnly "io.vram:canvas-fabric:20.5.2698"
}

processResources {
Expand All @@ -65,8 +70,8 @@ tasks.withType(JavaCompile).configureEach {
// If Javadoc is generated, this must be specified in that task too.
it.options.encoding = "UTF-8"

// Minecraft 1.17 (21w19a) upwards uses Java 16.
it.options.release = 16
// Minecraft 1.20.5 (24w14a) upwards uses Java 21.
it.options.release = 21
}

java {
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.17.1
yarn_mappings=1.17.1+build.31
loader_version=0.11.6
minecraft_version=1.21
yarn_mappings=1.21+build.7
loader_version=0.15.11

# Dependencies
fabric_version=0.37.1+1.17
fabric_version=0.100.4+1.21

# Mod Properties
mod_version = 1.0.2
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 2 additions & 0 deletions 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
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading