Skip to content

Commit

Permalink
updated to MC 1.18
Browse files Browse the repository at this point in the history
  • Loading branch information
Flourick committed Dec 1, 2021
1 parent 1d092a5 commit e1bb4d7
Show file tree
Hide file tree
Showing 10 changed files with 180 additions and 140 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
name: build
on: [pull_request, push]
on:
push:
paths-ignore:
- 'README.md'
- 'LICENSE'

jobs:
build:
strategy:
matrix:
java: [
16 # Minimum supported by Minecraft
17, # Minimum supported by Minecraft
]
os: [ubuntu-20.04, windows-latest]
os: [ubuntu-20.04, windows-2022]

runs-on: ${{ matrix.os }}

Expand All @@ -27,7 +31,7 @@ jobs:
- name: build
run: ./gradlew build
# - name: capture build artifacts
# if: ${{ runner.os == 'Linux' && matrix.java == '16' }}
# if: ${{ runner.os == 'Linux' && matrix.java == '17' }}
# uses: actions/upload-artifact@v2
# with:
# name: Artifacts
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 Flourick
Copyright (c) 2021 Flourick

Copyright (c) 2019 Clayborn

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

sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

archivesBaseName = project.archives_base_name
version = project.mod_version
Expand Down Expand Up @@ -37,14 +37,8 @@ processResources {
}

tasks.withType(JavaCompile).configureEach {
// ensure that the encoding is set to UTF-8, no matter what the system default is
// this fixes some edge cases with special characters not displaying correctly
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
// If Javadoc is generated, this must be specified in that task too.
it.options.encoding = "UTF-8"

// since 1.17, Minecraft requires Java 16
it.options.release = 16
// since 1.18, Minecraft requires Java 17
it.options.release = 17
}

java {
Expand All @@ -64,13 +58,7 @@ jar {
publishing {
publications {
mavenJava(MavenPublication) {
// add all the jars that should be included when publishing to maven
artifact(remapJar) {
builtBy remapJar
}
artifact(sourcesJar) {
builtBy remapSourcesJar
}
from components.java
}
}

Expand Down
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx3G
org.gradle.jvmargs=-Xmx4G

# Fabric Properties (https://fabricmc.net/versions.html)
minecraft_version=1.17.1
yarn_mappings=1.17.1+build.11
loader_version=0.11.6
minecraft_version=1.18
yarn_mappings=1.18+build.1
loader_version=0.12.6

# Mod Properties
mod_version = 1.0.10
mod_version = 1.0.11
maven_group = net.clayborn
archives_base_name = accurate-block-placement

# Dependencies
fabric_version=0.37.0+1.17
fabric_version=0.43.1+1.18
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit e1bb4d7

Please sign in to comment.