Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

More 1.13.2 forge work

Browse source
This commit is contained in:
Mike Primm 2020-04-25 19:50:23 -05:00
parent 1a2e1d904d
commit 17c624952b
3 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
forge-1.13.2/build.gradle
View file

@ -14,10 +14,10 @@ buildscript {
apply plugin: 'net.minecraftforge.gradle' apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'eclipse' apply plugin: 'eclipse'
apply plugin: 'com.github.johnrengelman.shadow'
dependencies { dependencies {
compile project(":DynmapCore") compile project(path: ":DynmapCore", configuration: "shadow")
compile project(":DynmapCoreAPI")
minecraft 'net.minecraftforge:forge:1.13.2-25.0.219' minecraft 'net.minecraftforge:forge:1.13.2-25.0.219'
} }
@ -63,21 +63,13 @@ processResources
shadowJar { shadowJar {
dependencies { dependencies {
include(dependency('com.googlecode.json-simple:json-simple:'))
include(dependency('org.yaml:snakeyaml:'))
include(dependency('com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:'))
include(dependency('org.eclipse.jetty::'))
include(dependency('org.eclipse.jetty.orbit:javax.servlet:'))
include(dependency(':DynmapCore')) include(dependency(':DynmapCore'))
include(dependency(':DynmapCoreAPI')) }
}
relocate('org.json.simple', 'org.dynmap.json.simple')
relocate('org.yaml.snakeyaml', 'org.dynmap.snakeyaml')
relocate('org.eclipse.jetty', 'org.dynmap.jetty')
relocate('org.owasp.html', 'org.dynmap.org.owasp.html')
relocate('javax.servlet', 'org.dynmap.javax.servlet' )
archiveName = "Dynmap-${parent.version}-forge-1.13.2.jar" archiveName = "Dynmap-${parent.version}-forge-1.13.2.jar"
destinationDir = file '../target' destinationDir = file '../target'
manifest {
attributes 'FMLAT': 'dynmap_at.cfg'
}
} }
shadowJar.doLast { shadowJar.doLast {

4
forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/DynmapPlugin.java
View file

@ -195,10 +195,10 @@ public class DynmapPlugin
stateByID = Arrays.copyOf(stateByID, idx+1); stateByID = Arrays.copyOf(stateByID, idx+1);
Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR); Arrays.fill(stateByID, plen, stateByID.length, DynmapBlockState.AIR);
} }
Block b = bs.getBlock(); Block b = bs.getBlock();
// If this is new block vs last, it's the base block state // If this is new block vs last, it's the base block state
if (b != baseb) { if (b != baseb) {
basebs = null; basebs = b;
baseidx = idx; baseidx = idx;
} }

4
settings.gradle
View file

@ -10,7 +10,7 @@ include ':bukkit-helper'
include ':dynmap-api' include ':dynmap-api'
include ':DynmapCore' include ':DynmapCore'
include ':DynmapCoreAPI' include ':DynmapCoreAPI'
//include ':forge-1.13.2' include ':forge-1.13.2'
include ':forge-1.12.2' include ':forge-1.12.2'
include ':forge-1.11.2' include ':forge-1.11.2'
include ':forge-1.10.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(':dynmap-api').projectDir = "$rootDir/dynmap-api" as File
project(':DynmapCore').projectDir = "$rootDir/DynmapCore" as File project(':DynmapCore').projectDir = "$rootDir/DynmapCore" as File
project(':DynmapCoreAPI').projectDir = "$rootDir/DynmapCoreAPI" 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.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.11.2').projectDir = "$rootDir/forge-1.11.2" as File
project(':forge-1.10.2').projectDir = "$rootDir/forge-1.10.2" as File project(':forge-1.10.2').projectDir = "$rootDir/forge-1.10.2" as File