(trigger meta update)
This commit is contained in:
parent
3f53df3f83
commit
ea07128e6c
|
@ -7,7 +7,7 @@ plugins {
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "dev.frogmc"
|
group = "dev.frogmc"
|
||||||
version = "0.0.1-alpha.31"
|
version = "0.0.1-alpha.32"
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven {
|
maven {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[versions]
|
[versions]
|
||||||
|
|
||||||
thyroxine = "0.0.1-alpha.15"
|
thyroxine = "0.0.1-alpha.18"
|
||||||
nightconfig = "3.8.1"
|
nightconfig = "3.8.1"
|
||||||
mixin = "0.15.0+mixin.0.8.7"
|
mixin = "0.15.0+mixin.0.8.7"
|
||||||
annotations = "24.1.0"
|
annotations = "24.1.0"
|
||||||
|
|
|
@ -138,10 +138,11 @@ public class MinecraftGamePlugin implements GamePlugin {
|
||||||
String mappingPath = System.getProperty(SystemProperties.INTERMEDIARY_MAPPINGS);
|
String mappingPath = System.getProperty(SystemProperties.INTERMEDIARY_MAPPINGS);
|
||||||
try {
|
try {
|
||||||
if (mappingPath != null) {
|
if (mappingPath != null) {
|
||||||
mappings = readIntemediaryMappings(mappingPath);
|
mappings = readIntermediaryMappings(mappingPath);
|
||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
mappings = MojmapProvider.get(version, remappedGamePath.resolveSibling("client-" + version + ".txt"))
|
mappings = MojmapProvider.get(version, remappedGamePath.resolveSibling("client-" + version + ".txt"),
|
||||||
|
remappedGamePath.resolveSibling("server-" + version + ".txt"))
|
||||||
.flattenData().reverse();
|
.flattenData().reverse();
|
||||||
} catch (
|
} catch (
|
||||||
NullPointerException e) { // NPE is only thrown if the mappings for this version can't be found
|
NullPointerException e) { // NPE is only thrown if the mappings for this version can't be found
|
||||||
|
@ -159,7 +160,7 @@ public class MinecraftGamePlugin implements GamePlugin {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (mappings == null) {
|
if (mappings == null) {
|
||||||
mappings = readIntemediaryMappings("/mappings/mappings.tiny");
|
mappings = readIntermediaryMappings("/mappings/mappings.tiny");
|
||||||
}
|
}
|
||||||
if (mappings != null) {
|
if (mappings != null) {
|
||||||
Thyroxine.remap(mappings, gamePath, remappedGamePath, true, false);
|
Thyroxine.remap(mappings, gamePath, remappedGamePath, true, false);
|
||||||
|
@ -177,7 +178,7 @@ public class MinecraftGamePlugin implements GamePlugin {
|
||||||
FrogLoaderImpl.getInstance().getClassloader().addURL(runtimePath.toUri().toURL());
|
FrogLoaderImpl.getInstance().getClassloader().addURL(runtimePath.toUri().toURL());
|
||||||
}
|
}
|
||||||
|
|
||||||
private MappingData readIntemediaryMappings(String path) throws IOException {
|
private MappingData readIntermediaryMappings(String path) throws IOException {
|
||||||
URL resource = this.getClass().getResource(path);
|
URL resource = this.getClass().getResource(path);
|
||||||
String data;
|
String data;
|
||||||
if (resource != null) {
|
if (resource != null) {
|
||||||
|
|
Loading…
Reference in a new issue