From fde807f8ff8fc92cf391a9251db88aedbb605bf3 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 11 Mar 2019 17:29:22 +0100 Subject: [PATCH] Fix pack.mcmeta for pre-1.13 versions --- src/main/resources/pack.mcmeta | 8 ++++++++ versions/preprocessor.gradle | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 6afaebbc..700d98b0 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,14 @@ { "pack": { "description": "ReplayMod resources", + //#if MC>=11300 "pack_format": 4 + //#else + //#if MC>=11002 + //$$ "pack_format": 2 + //#else + //$$ "pack_format": 1 + //#endif + //#endif } } diff --git a/versions/preprocessor.gradle b/versions/preprocessor.gradle index 44e1e9f2..b316eb59 100644 --- a/versions/preprocessor.gradle +++ b/versions/preprocessor.gradle @@ -146,7 +146,13 @@ static def convertFile(Map kws, Map vars, File project.ext.convertTree = { Map vars, String inName, String outName=inName -> def defaultKws = [if: '//#if ', ifdef: '//#ifdef ', else: '//#else', endif: '//#endif', eval: '//$$'] def cfgKws = [if: '##if ', ifdef: '##ifdef ', else: '##else', endif: '##endif', eval: '#$$'] - def extensions = ['.java': defaultKws, '.gradle': defaultKws, '.json': defaultKws, '.cfg': cfgKws] + def extensions = [ + '.java': defaultKws, + '.gradle': defaultKws, + '.json': defaultKws, + '.mcmeta': defaultKws, + '.cfg': cfgKws + ] def inPath = project.file(inName).toPath() def outPath = project.file(outName).toPath() def inPlace = inPath.toAbsolutePath().equals(outPath.toAbsolutePath())