mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-16 20:34:42 +02:00
Compare commits
1 Commits
fix/v7/ref
...
renovate/m
Author | SHA1 | Date | |
---|---|---|---|
bb577b8a3b |
2
.github/renovate.json
vendored
2
.github/renovate.json
vendored
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||||
"extends": [
|
"extends": [
|
||||||
"config:base",
|
"config:recommended",
|
||||||
":semanticCommitsDisabled"
|
":semanticCommitsDisabled"
|
||||||
],
|
],
|
||||||
"automerge": true,
|
"automerge": true,
|
||||||
|
@ -1171,9 +1171,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
|
|||||||
@Override
|
@Override
|
||||||
public @NonNull String serverNativePackage() {
|
public @NonNull String serverNativePackage() {
|
||||||
final String name = Bukkit.getServer().getClass().getPackage().getName();
|
final String name = Bukkit.getServer().getClass().getPackage().getName();
|
||||||
String ver = name.substring(name.lastIndexOf('.') + 1);
|
return name.substring(name.lastIndexOf('.') + 1);
|
||||||
// org.bukkit.craftbukkit is no longer suffixed by a version
|
|
||||||
return ver.equals("craftbukkit") ? "" : ver;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -49,14 +49,9 @@ public class SingleWorldListener implements Listener {
|
|||||||
this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle").getRealMethod();
|
this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle").getRealMethod();
|
||||||
} catch (NoSuchMethodException ignored) {
|
} catch (NoSuchMethodException ignored) {
|
||||||
try {
|
try {
|
||||||
String chunkStatus = PlotSquared.platform().serverVersion()[1] < 21
|
ReflectionUtils.RefClass classChunkStatus = getRefClass("net.minecraft.world.level.chunk.ChunkStatus");
|
||||||
? "net.minecraft.world.level.chunk" + ".ChunkStatus"
|
|
||||||
: "net.minecraft.world.level.chunk.status.ChunkStatus";
|
|
||||||
ReflectionUtils.RefClass classChunkStatus = getRefClass(chunkStatus);
|
|
||||||
this.objChunkStatusFull = classChunkStatus.getRealClass().getField("n").get(null);
|
this.objChunkStatusFull = classChunkStatus.getRealClass().getField("n").get(null);
|
||||||
this.methodGetHandleChunk = classCraftChunk
|
this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle", classChunkStatus.getRealClass()).getRealMethod();
|
||||||
.getMethod("getHandle", classChunkStatus.getRealClass())
|
|
||||||
.getRealMethod();
|
|
||||||
} catch (NoSuchMethodException ex) {
|
} catch (NoSuchMethodException ex) {
|
||||||
throw new RuntimeException(ex);
|
throw new RuntimeException(ex);
|
||||||
}
|
}
|
||||||
|
@ -206,8 +206,7 @@ public class PlotSquared {
|
|||||||
GlobalFlagContainer.setup();
|
GlobalFlagContainer.setup();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
String ver = this.platform.serverNativePackage();
|
new ReflectionUtils(this.platform.serverNativePackage());
|
||||||
new ReflectionUtils(ver.isEmpty() ? null : ver);
|
|
||||||
try {
|
try {
|
||||||
URL logurl = PlotSquared.class.getProtectionDomain().getCodeSource().getLocation();
|
URL logurl = PlotSquared.class.getProtectionDomain().getCodeSource().getLocation();
|
||||||
this.jarFile = new File(
|
this.jarFile = new File(
|
||||||
@ -215,7 +214,7 @@ public class PlotSquared {
|
|||||||
logurl.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file"))
|
logurl.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file"))
|
||||||
.getPath());
|
.getPath());
|
||||||
} catch (URISyntaxException | SecurityException e) {
|
} catch (URISyntaxException | SecurityException e) {
|
||||||
LOGGER.error(e);
|
e.printStackTrace();
|
||||||
this.jarFile = new File(this.platform.getDirectory().getParentFile(), "PlotSquared.jar");
|
this.jarFile = new File(this.platform.getDirectory().getParentFile(), "PlotSquared.jar");
|
||||||
if (!this.jarFile.exists()) {
|
if (!this.jarFile.exists()) {
|
||||||
this.jarFile = new File(
|
this.jarFile = new File(
|
||||||
@ -239,7 +238,7 @@ public class PlotSquared {
|
|||||||
copyFile("skyblock.template", Settings.Paths.TEMPLATES);
|
copyFile("skyblock.template", Settings.Paths.TEMPLATES);
|
||||||
showDebug();
|
showDebug();
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
LOGGER.error(e);
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ log4j = "2.19.0"
|
|||||||
|
|
||||||
# Plugins
|
# Plugins
|
||||||
worldedit = "7.2.20"
|
worldedit = "7.2.20"
|
||||||
fawe = "2.12.1"
|
fawe = "2.12.0"
|
||||||
placeholderapi = "2.11.6"
|
placeholderapi = "2.11.6"
|
||||||
luckperms = "5.4"
|
luckperms = "5.4"
|
||||||
essentialsx = "2.20.1"
|
essentialsx = "2.20.1"
|
||||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
Reference in New Issue
Block a user