From 30e3d8ebb5f278068b4fa953ebbbcb1168ee9637 Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 14 Nov 2018 23:58:54 +0200 Subject: [PATCH] Use the existing json files (probably breaks gradle) --- build.gradle | 27 +-------------------------- skins | 2 +- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index 04a58154..2d2b6981 100644 --- a/build.gradle +++ b/build.gradle @@ -115,10 +115,9 @@ task copyBGPones(type: Copy) { def illegals = /[^a-z0-9_\/.-]/ from "skins/Background Ponies" + // TODO: What is tempDir???? into temporaryDir - include '**/*.png' - eachFile { if (it.name =~ illegals){ logger.warn("Sanitizing file with illegal characters: ${it.path}") @@ -127,27 +126,6 @@ task copyBGPones(type: Copy) { } } -import groovy.json.JsonBuilder - -task genPoniesJson(dependsOn: copyBGPones) { - // loop through the background ponies to create the bgponies.json - - def bgponies = 'bgponies.json' - - def json = file("$temporaryDir/$bgponies") - - inputs.dir copyBGPones.outputs - outputs.file json - - doFirst { - json.text = new JsonBuilder( - override: false, - imports: [], - ponies: fileTree(copyBGPones.outputs.files.singleFile).filter { it.file }.collect { it.name.replace(".png", "") } - ).toPrettyString() - } -} - shadowJar { extension 'litemod' classifier "mc$minecraft.version" @@ -159,9 +137,6 @@ shadowJar { from(copyBGPones) { into "/assets/minelittlepony/textures/entity/pony" } - from (genPoniesJson){ - into "/assets/minelittlepony/textures/entity/pony" - } dependencies { exclude dependency('deobf.com.mumfrey:liteloader:') diff --git a/skins b/skins index e1d59da0..288d9e16 160000 --- a/skins +++ b/skins @@ -1 +1 @@ -Subproject commit e1d59da0684e8f82cd4422338efbe5b58b8f80ae +Subproject commit 288d9e1697f9b7c7bfb0795f7cafa5bd583f8748