Skip to content

Commit 9c4ad64

Browse files
committed
Fixed crash while dependency using CoreAPI.
1 parent 03cc94d commit 9c4ad64

File tree

5 files changed

+20
-11
lines changed

5 files changed

+20
-11
lines changed

build.gradle

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ dokka {
110110

111111
project.tasks["jar"].dependsOn(project.tasks["dokka"])
112112

113-
task fatJar(type: Jar) {
113+
task modJar(type: Jar) {
114+
with tasks.jar
115+
from configurations.embed.collect { it.isDirectory() ? it : zipTree(it) }
114116
manifest {
115117
attributes([
116118
"Specification-Title" : projectEssentialsName,
@@ -122,12 +124,11 @@ task fatJar(type: Jar) {
122124
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
123125
])
124126
}
127+
//noinspection GrDeprecatedAPIUsage
125128
baseName = project.name + '-MOD'
126-
from configurations.embed.collect { it.isDirectory() ? it : zipTree(it) }
127-
with jar
128129
}
129130

130-
project.tasks["jar"].dependsOn(project.tasks["fatJar"])
131+
project.tasks["modJar"].dependsOn(project.tasks["jar"])
131132

132133
jar {
133134
manifest {
@@ -141,9 +142,17 @@ jar {
141142
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
142143
])
143144
}
145+
//noinspection GrDeprecatedAPIUsage
144146
baseName = project.name + '-API'
145147
}
146148

149+
reobf {
150+
modJar {
151+
dependsOn jar
152+
mappings = createMcpToSrg.outputs.files.singleFile
153+
}
154+
}
155+
147156
sourceCompatibility = targetCompatibility =
148157
compileJava.sourceCompatibility =
149158
compileJava.targetCompatibility = jvmVersionTarget

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ mappingsChannelVersion=20190719-1.14.3
1414
kotlinJdkVersionTarget=jdk8
1515
kotlinxSerializationVersion=0.12.0
1616
kotlinVersion=1.3.50
17-
projectEssentialsVersion=1.14.4-1.0.1.0
17+
projectEssentialsVersion=1.14.4-1.0.2.0
1818
projectEssentialsName=Project Essentials Core
1919
projectEssentialsId=project_essentials_core
2020
projectEssentialsVendor=MairwunNx (Pavel Erokhin)

src/main/kotlin/com/mairwunnx/projectessentialscore/EntryPoint.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import net.minecraftforge.fml.common.Mod
77
internal class EntryPoint : EssBase() {
88
init {
99
modInstance = this
10-
modVersion = "1.14.4-1.0.1.0"
10+
modVersion = "1.14.4-1.0.2.0"
1111
logBaseInfo()
1212
validateForgeVersion()
1313
}

src/main/resources/META-INF/mods.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ issueTrackerURL="https://github.com/ProjectEssentials/ProjectEssentials-Core/iss
44

55
[[mods]]
66
modId="project_essentials_core"
7-
version="1.14.4-1.0.1.0"
7+
version="1.14.4-1.0.2.0"
88
displayName="Project Essentials Core"
99
updateJSONURL="https://raw.githubusercontent.com/ProjectEssentials/ProjectEssentials-Core/MC-1.14.X/update.json"
1010
displayURL="https://github.com/ProjectEssentials/ProjectEssentials-Core"

update.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"homepage": "https://github.com/ProjectEssentials/ProjectEssentials-Core/releases/tag/v1.14.4-1.0.1.0",
2+
"homepage": "https://github.com/ProjectEssentials/ProjectEssentials-Core/releases/tag/v1.14.4-1.0.2.0",
33
"1.14.4": {
4-
"1.14.4-1.0.1.0": " - Added playerName extension in CommandContext."
4+
"1.14.4-1.0.2.0": " - Fixed crash while dependency using CoreAPI."
55
},
66
"promos": {
7-
"1.14.4-latest": "1.14.4-1.0.1.0",
8-
"1.14.4-recommended": "1.14.4-1.0.1.0"
7+
"1.14.4-latest": "1.14.4-1.0.2.0",
8+
"1.14.4-recommended": "1.14.4-1.0.2.0"
99
}
1010
}

0 commit comments

Comments
 (0)