Skip to content
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
6 changes: 3 additions & 3 deletions .github/workflows/build_jar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: 🪛 Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 21
distribution: 'microsoft'
java-version: 21
- name: 🏗️ Build jars
run: |
chmod u+x gradlew
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/compile_jar_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: 🪛 Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 21
distribution: 'microsoft'
Expand Down
37 changes: 18 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,34 +1,31 @@
plugins {
id 'maven-publish'
id 'fabric-loom' version '1.7-SNAPSHOT'
id 'fabric-loom' version "${loom_version}"
}

sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21

archivesBaseName = project.archives_base_name
version = project.mod_version
group = project.maven_group
base {
archivesName = archives_base_name
}

project.ext.groupId = project.maven_group
project.ext.projectVersion = "${version}-fabric-${project.minecraft_version}"
version = "${mod_version}-fabric-${minecraft_version}"
group = maven_group

repositories {
}

dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
minecraft "com.mojang:minecraft:${minecraft_version}"
mappings "net.fabricmc:yarn:${yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${loader_version}"

modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
}

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

filesMatching("fabric.mod.json") {
expand "version": project.version
expand "version": mod_version
}
}

Expand All @@ -44,6 +41,8 @@ tasks.withType(JavaCompile).configureEach {
}

java {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this line, sources will not be generated.
Expand All @@ -58,9 +57,9 @@ jar {
publishing {
publications {
mavenJava(MavenPublication) {
groupId project.ext.groupId
artifactId project.artifactId
version project.ext.projectVersion
groupId = project.group
artifactId = project.artifactId
version = project.version
// add all the jars that should be included when publishing to maven
artifact(remapJar) {
builtBy remapJar
Expand All @@ -82,4 +81,4 @@ publishing {
}
}
}
}
}
13 changes: 7 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@ org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.21
yarn_mappings=1.21+build.9
loader_version=0.15.11
# check these on https://fabricmc.net/develop/
minecraft_version=1.21.4
yarn_mappings=1.21.4+build.8
loader_version=0.16.14
loom_version=1.10-SNAPSHOT

# Mod Properties
mod_version = 2.3.2
mod_version = 2.3.3
maven_group = fr.atesab.xray
archives_base_name = XrayMod
artifactId = xray

# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.100.6+1.21
fabric_version=0.119.2+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.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading