icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.17

Browse Source
This commit is contained in:
gnembon committed 2021-05-12 23:09:48 -03:00
2 parents 7ed96e22f1 15bba80cb5
commit 4542612bc8
5 files changed
+34 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/build-on-pr.yml
+5 -7
View File
@@ -3,10 +3,7 @@
name: Pull Request Builds
on:
pull_request:
paths:
- "src/**"
on: [pull_request]
jobs:
Build:
@@ -15,10 +12,11 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK 16
uses: actions/setup-java@v2
with:
java-version: 1.8
distribution: 'adopt'
java-version: 16
- name: Cache Gradle packages
uses: actions/cache@v2
with:
.github/workflows/devbuild.yml
+5 -7
View File
@@ -3,10 +3,7 @@
name: Development Builds
on:
push:
paths:
- "src/**"
on: [push]
jobs:
Build:
@@ -15,10 +12,11 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK 16
uses: actions/setup-java@v2
with:
java-version: 1.8
distribution: 'adopt'
java-version: 16
- name: Cache Gradle packages
uses: actions/cache@v2
with:
.github/workflows/publish-release.yml
+9 -7
View File
@@ -65,10 +65,11 @@ jobs:
uses: actions/checkout@v2
with:
ref: ${{ steps.getbranchinfo.outputs.branchname }}
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK 16
uses: actions/setup-java@v2
with:
java-version: 1.8
distribution: 'adopt'
java-version: 16
- name: Cache Gradle packages
uses: actions/cache@v2
with:
@@ -139,10 +140,11 @@ jobs:
steps:
- name: Checkout Carpet sources
uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK 16
uses: actions/setup-java@v2
with:
java-version: 1.8
distribution: 'adopt'
java-version: 16
- name: Cache Gradle packages
uses: actions/cache@v2
with:
@@ -157,7 +159,7 @@ jobs:
{
"schemaVersion": 1,
"id": "carpet",
"version": "1.4.11",
"version": "1.4.36",
"entrypoints": {
"server": [ "carpet.utils.CarpetRulePrinter" ],
"preLaunch": [ "carpet.utils.CarpetRulePrinter" ]
build.gradle
+14 -8
View File
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.5-SNAPSHOT'
id 'fabric-loom' version '0.8-SNAPSHOT'
id 'maven-publish'
}
@@ -18,7 +18,7 @@ dependencies {
// To change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
// Fabric API. This is technically optional, but you probably want it anyway.
// modCompile "net.fabricmc:fabric:${project.fabric_version}"
@@ -31,14 +31,17 @@ dependencies {
processResources {
inputs.property "version", project.version
from(sourceSets.main.resources.srcDirs) {
include "fabric.mod.json"
expand "version": project.mod_version
filesMatching("fabric.mod.json") {
expand "version": project.version
}
//from(sourceSets.main.resources.srcDirs) {
// include "fabric.mod.json"
// expand "version": project.mod_version
//}
from(sourceSets.main.resources.srcDirs) {
exclude "fabric.mod.json"
}
//from(sourceSets.main.resources.srcDirs) {
// exclude "fabric.mod.json"
//}
}
@@ -56,6 +59,9 @@ tasks.withType(JavaCompile).configureEach {
if (JavaVersion.current().isJava9Compatible()) {
it.options.release = targetVersion
}
// Minecraft 1.17 (21w19a) upwards uses Java 16.
//it.options.release = 16
}
java {
gradle/wrapper/gradle-wrapper.properties
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists