Skip to content

Commit

Permalink
Initial 1.15.2 Forge build
Browse files Browse the repository at this point in the history
  • Loading branch information
mikeprimm committed May 24, 2020
1 parent 1d61efd commit 2be20f4
Show file tree
Hide file tree
Showing 25 changed files with 5,220 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ public boolean init(DynmapCore core) {
userid = core.configuration.getString("storage/userid", "dynmap");
password = core.configuration.getString("storage/password", "dynmap");
prefix = core.configuration.getString("storage/prefix", "");
flags = core.configuration.getString("storage/flags", "?allowReconnect=true");
flags = core.configuration.getString("storage/flags", "?allowReconnect=true&autoReconnect=true");
tableTiles = prefix + "Tiles";
tableMaps = prefix + "Maps";
tableFaces = prefix + "Faces";
Expand Down
4 changes: 2 additions & 2 deletions bukkit-helper/.settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
connection.project.dir=..
eclipse.preferences.version=1
connection.project.dir=..
eclipse.preferences.version=1
4 changes: 2 additions & 2 deletions forge-1.14.4/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
modLoader="javafml"
loaderVersion="[25,)"
loaderVersion="[28,)"
issueTrackerURL="https://github.com/webbukkit/dynmap/issues"
[[mods]]
modId="dynmap"
Expand All @@ -13,7 +13,7 @@ Dynamic, Google-maps style rendered maps for your Minecraft server
[[dependencies.dynmap]]
modId="forge"
mandatory=true
versionRange="[25,)"
versionRange="[28,)"
ordering="NONE"
# Side this dependency is applied on - BOTH, CLIENT or SERVER
side="SERVER"
Expand Down
4 changes: 0 additions & 4 deletions forge-1.14.4/src/main/resources/dynmap_at.cfg

This file was deleted.

1 change: 1 addition & 0 deletions forge-1.15.2/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build/
90 changes: 90 additions & 0 deletions forge-1.15.2/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
buildscript {
repositories {
maven { url = 'https://files.minecraftforge.net/maven' }
jcenter()
mavenCentral()
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
}
}
apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'eclipse'
apply plugin: 'com.github.johnrengelman.shadow'

sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.

ext.buildNumber = System.getenv().BUILD_NUMBER ?: "Dev"

minecraft {
mappings channel: 'snapshot', version: '20200514-1.15.1'
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
runs {
server {
workingDirectory project.file('run').canonicalPath
}
}
}

project.archivesBaseName = "${project.archivesBaseName}-forge-1.15.2"

dependencies {
compile project(path: ":DynmapCore", configuration: "shadow")
minecraft 'net.minecraftforge:forge:1.15.2-31.2.3'
}

processResources
{
inputs.property "version", project.version + '-' + project.ext.buildNumber

// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'META-INF/mods.toml'

// replace version and mcversion
expand(
version: project.version + '-' + project.ext.buildNumber,
mcversion: "1.15.2"
)
}

// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'META-INF/mods.toml'
}
}

shadowJar {
dependencies {
include(dependency(':DynmapCore'))
}
archiveName = "Dynmap-${parent.version}-forge-1.15.2.jar"
destinationDir = file '../target'
manifest {
attributes 'FMLAT': 'dynmap_at.cfg'
}
}

shadowJar.doLast {
task ->
ant.checksum file: task.archivePath
}

afterEvaluate {
reobf {
shadowJar {
mappings = createMcpToSrg.output
}
}
}

task deobfJar(type: Jar) {
from sourceSets.main.output
classifier = 'dev'
}

artifacts {
archives deobfJar
}

build.dependsOn(shadowJar)
Loading

0 comments on commit 2be20f4

Please sign in to comment.