Skip to content

Commit c1047d5

Browse files
authored
Merge pull request #1 from tildejustin/1.16.1
supress logged errors
2 parents 77009c0 + fc492a9 commit c1047d5

21 files changed

+485
-366
lines changed

.gitignore

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,33 @@
11
# gradle
2-
32
.gradle/
4-
gradle/
53
build/
64
out/
75
classes/
86

97
# eclipse
10-
118
*.launch
129

1310
# idea
14-
1511
.idea/
1612
*.iml
1713
*.ipr
1814
*.iws
1915

2016
# vscode
21-
2217
.settings/
2318
.vscode/
2419
bin/
2520
.classpath
2621
.project
2722

28-
# fabric
23+
# macos
24+
*.DS_Store
2925

26+
# fabric
3027
run/
31-
logs/
28+
29+
# java
30+
hs_err_*.log
31+
replay_*.log
32+
*.hprof
33+
*.jfr

build.gradle

Lines changed: 36 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,60 @@
11
plugins {
2-
id 'fabric-loom' version '0.7.1'
3-
id 'maven-publish'
2+
alias libs.plugins.fabric.loom
3+
id "maven-publish"
44
}
55

6-
sourceCompatibility = JavaVersion.VERSION_1_8
7-
targetCompatibility = JavaVersion.VERSION_1_8
6+
version = "$mod_version+$target_version"
7+
group = maven_group
88

9-
archivesBaseName = project.archives_base_name
10-
version = project.mod_version
11-
group = project.maven_group
9+
base {
10+
archivesName = archives_name
11+
}
1212

13-
dependencies {
14-
//to change the versions see the gradle.properties file
15-
minecraft "com.mojang:minecraft:${project.minecraft_version}"
16-
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
17-
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
13+
repositories {
14+
maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots" }
15+
maven { url "https://jitpack.io" }
16+
}
1817

19-
// Fabric API. This is technically optional, but you probably want it anyway.
20-
// modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
18+
loom {
19+
decompilers {
20+
vineflower {
21+
options.putAll(["mark-corresponding-synthetics": "1", "ind": " "])
22+
}
23+
}
24+
mixin {
25+
useLegacyMixinAp = false
26+
}
27+
}
2128

22-
// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
23-
// You may need to force-disable transitiveness on them.
29+
dependencies {
30+
minecraft libs.minecraft
31+
mappings variantOf(libs.yarn.mappings) { classifier "v2" }
32+
modImplementation libs.fabric.loader
33+
vineflowerDecompilerClasspath libs.vineflower
2434
}
2535

2636
processResources {
27-
inputs.property "version", project.version
28-
filteringCharset "UTF-8"
29-
30-
filesMatching("fabric.mod.json") {
31-
expand "version": project.version
37+
filesMatching "fabric.mod.json", {
38+
expand "version": version
3239
}
3340
}
3441

35-
// ensure that the encoding is set to UTF-8, no matter what the system default is
36-
// this fixes some edge cases with special characters not displaying correctly
37-
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
38-
tasks.withType(JavaCompile) {
39-
options.encoding = "UTF-8"
42+
tasks.withType(JavaCompile).configureEach {
43+
it.options.encoding = "UTF-8"
44+
if (JavaVersion.current().isJava9Compatible()) it.options.release.set(8)
4045
}
4146

42-
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
43-
// if it is present.
44-
// If you remove this task, sources will not be generated.
45-
task sourcesJar(type: Jar, dependsOn: classes) {
46-
classifier = "sources"
47-
from sourceSets.main.allSource
47+
java {
48+
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
4849
}
4950

5051
jar {
5152
from "LICENSE"
5253
}
5354

54-
// configure the maven publication
5555
publishing {
56-
publications {
57-
mavenJava(MavenPublication) {
58-
// add all the jars that should be included when publishing to maven
59-
artifact(remapJar) {
60-
builtBy remapJar
61-
}
62-
artifact(sourcesJar) {
63-
builtBy remapSourcesJar
64-
}
65-
}
66-
}
67-
68-
// select the repositories you want to publish to
69-
repositories {
70-
// uncomment to publish to the local maven
71-
// mavenLocal()
56+
publications.create("mavenJava", MavenPublication) {
57+
from components.java
7258
}
59+
repositories {}
7360
}

gradle.properties

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
# Done to increase the memory available to gradle.
2-
org.gradle.jvmargs=-Xmx1G
3-
# Fabric Properties
4-
# check these on https://modmuss50.me/fabric.html
5-
minecraft_version=1.16.1
6-
yarn_mappings=1.16.1+build.21
7-
loader_version=0.11.3
8-
# Mod Properties
9-
mod_version=1.5
10-
maven_group=fast-reset-1.16.1-v
11-
archives_base_name=fast-reset-1.16.1-v
1+
org.gradle.jvmargs = -Xmx2G
2+
org.gradle.parallel = true
3+
org.gradle.caching = true
4+
5+
mod_version = 1.4.2
6+
target_version = 1.16.1
7+
archives_name = fast-reset
8+
maven_group = fast_reset.client

gradle/libs.versions.toml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[versions]
2+
minecraft = "1.16.1"
3+
yarn_mappings = "1.16.1.build.19"
4+
fabric_loader = "0.15.6"
5+
loom = "1.5-SNAPSHOT"
6+
vineflower = "1.10.0-SNAPSHOT"
7+
8+
[libraries]
9+
minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
10+
yarn_mappings = { module = "com.github.redlime:yarn", version.ref = "yarn_mappings" }
11+
fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_loader" }
12+
vineflower = { module = "org.vineflower:vineflower", version.ref = "vineflower" }
13+
14+
[plugins]
15+
fabric_loom = { id = "fabric-loom", version.ref = "loom" }

gradle/wrapper/gradle-wrapper.jar

42.4 KB
Binary file not shown.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
6+
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)