From 10403ff2713044d62a575aa75ec89f500ebc8205 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 12 Jan 2020 18:31:01 -0600 Subject: [PATCH 1/4] Fix forge 1.13.2 mappings --- forge-1.13.2/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-1.13.2/build.gradle b/forge-1.13.2/build.gradle index cc5e5c9e..2db388ac 100644 --- a/forge-1.13.2/build.gradle +++ b/forge-1.13.2/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'eclipse' dependencies { compile project(":DynmapCore") compile project(":DynmapCoreAPI") - minecraft 'net.minecraftforge:forge:1.13.2-25.0.215' + minecraft 'net.minecraftforge:forge:1.13.2-25.0.219' } sourceCompatibility = 1.8 @@ -33,7 +33,7 @@ repositories { } minecraft { - mappings channel: 'snapshot', version: '20190215-1.13.1' + mappings channel: 'stable', version: '47-1.13.2' runs { server { workingDirectory project.file('run').canonicalPath From 02f73e1a2882f5923daa98c9e5a865f6183f124e Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 12 Jan 2020 19:13:53 -0600 Subject: [PATCH 2/4] Drop Forge 1.13.2 build until it is fixed --- settings.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings.gradle b/settings.gradle index e4124566..ca9d2ac8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,7 +10,7 @@ include ':bukkit-helper' include ':dynmap-api' include ':DynmapCore' include ':DynmapCoreAPI' -include ':forge-1.13.2' +//include ':forge-1.13.2' include ':forge-1.12.2' include ':forge-1.11.2' include ':forge-1.10.2' @@ -28,7 +28,7 @@ project(':bukkit-helper').projectDir = "$rootDir/bukkit-helper" as File project(':dynmap-api').projectDir = "$rootDir/dynmap-api" as File project(':DynmapCore').projectDir = "$rootDir/DynmapCore" as File project(':DynmapCoreAPI').projectDir = "$rootDir/DynmapCoreAPI" as File -project(':forge-1.13.2').projectDir = "$rootDir/forge-1.13.2" as File +//project(':forge-1.13.2').projectDir = "$rootDir/forge-1.13.2" as File project(':forge-1.12.2').projectDir = "$rootDir/forge-1.12.2" as File project(':forge-1.11.2').projectDir = "$rootDir/forge-1.11.2" as File project(':forge-1.10.2').projectDir = "$rootDir/forge-1.10.2" as File From 30e31dcb0c3f3905f40efd064fba50123f1453c0 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 12 Jan 2020 19:15:19 -0600 Subject: [PATCH 3/4] Switch to SNAPSHOT --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 18e3b0df..12bcbadf 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ allprojects { apply plugin: 'java' group = 'us.dynmap' - version = '3.0-beta-9' + version = '3.0-SNAPSHOT' } From b11420f94b7678eb5634a9ff13d210e307aee60b Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 12 Jan 2020 20:17:22 -0600 Subject: [PATCH 4/4] Fix ladder model --- DynmapCore/src/main/resources/models_1.txt | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index b955297e..21cb863d 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -340,15 +340,11 @@ patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=4,data=10,pat # Activator Rail - ascending to west patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=5,data=11,patch0=SlopeXUpZTop@90 - -# Ladder - attached to east side of block -patchblock:id=ladder,data=2,patch0=VertX0In@270 -# Ladder - attached to west side of block -patchblock:id=ladder,data=3,patch0=VertX0In@90 -# Ladder - attached to north side of block -patchblock:id=ladder,data=4,patch0=VertX0In@180 -# Ladder - attached to south side of block -patchblock:id=ladder,data=5,patch0=VertX0In +# Ladder +patchblock:id=ladder,data=0,data=1,patch0=VertX0In@270 +patchblock:id=ladder,data=2,data=3,patch0=VertX0In@90 +patchblock:id=ladder,data=4,data=5,patch0=VertX0In@180 +patchblock:id=ladder,data=6,data=7,patch0=VertX0In # Wall sign - facing east [-1.13.2]patchblock:id=wall_sign,data=0-1,patch0=WSignFront,patch1=WSignBack,patch2=WSignTop,patch3=WSignBottom,patch4=WSignLeft,patch5=WSignRight [1.14-]patchblock:id=oak_wall_sign,id=birch_wall_sign,id=spruce_wall_sign,id=acacia_wall_sign,id=jungle_wall_sign,id=dark_oak_wall_sign,data=0-1,patch0=WSignFront,patch1=WSignBack,patch2=WSignTop,patch3=WSignBottom,patch4=WSignLeft,patch5=WSignRight