Merge branch 'v3.0' into v3.0

This commit is contained in:
mikeprimm 2019-12-15 00:46:31 -06:00 committed by GitHub
commit d55eacb903
42 changed files with 2125 additions and 179 deletions

View file

@ -18,7 +18,7 @@ apply plugin: 'eclipse'
dependencies {
compile project(":DynmapCore")
compile project(":DynmapCoreAPI")
minecraft 'net.minecraftforge:forge:1.13.2-25.0.191'
minecraft 'net.minecraftforge:forge:1.13.2-25.0.219'
}
sourceCompatibility = 1.8
@ -33,7 +33,7 @@ repositories {
}
minecraft {
mappings channel: 'snapshot', version: '20190415-1.13.2'
mappings channel: 'snapshot', version: '20190215-1.13.1'
runs {
server {
workingDirectory project.file('run').canonicalPath

View file

@ -156,6 +156,9 @@ public class DynmapPlugin
private boolean isMCPC = false;
private boolean useSaveFolder = true;
private Field displayName = null; // MCPC+ display name
private static final int SIGNPOST_ID = 63;
private static final int WALLSIGN_ID = 68;
private static final int SIGNPOST_ID = 63;
private static final int WALLSIGN_ID = 68;
@ -516,6 +519,11 @@ public class DynmapPlugin
public int getBlockIDAt(String wname, int x, int y, int z) {
return -1;
}
@Override
public int isSignAt(String wname, int x, int y, int z) {
return -1;
}
@Override
public int isSignAt(String wname, int x, int y, int z) {

View file

@ -140,7 +140,7 @@ components:
messagettl: 5
# Optional: set number of lines in scrollable message history: if set, messagettl is not used to age out messages
#scrollback: 100
# Optiona; set maximum number of lines visible for chatbox
# Optional: set maximum number of lines visible for chatbox
#visiblelines: 10
# Optional: send push button
sendbutton: false