diff --git a/build.gradle b/build.gradle index d228b10d0..3f8d259e4 100644 --- a/build.gradle +++ b/build.gradle @@ -6,22 +6,32 @@ buildscript repositories { jcenter() - maven { url = "http://files.minecraftforge.net/maven" } + maven { url = 'https://maven.minecraftforge.net/' } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true classpath 'org.yaml:snakeyaml:1.18' } } -apply plugin: 'net.minecraftforge.gradle.forge' +apply plugin: 'net.minecraftforge.gradle' + +repositories { + maven { + url "https://cursemaven.com" + content { + includeGroup "curse.maven" + } + } +} if (project.hasProperty("dev")) { version += "-dev" + dev } +version = project.version group = "mchorse.blockbuster" archivesBaseName = "blockbuster" sourceCompatibility = targetCompatibility = "1.8" @@ -35,27 +45,28 @@ compileJava minecraft { - version = "${mc_version}-${forge_version}" - runDir = "run" - mappings = snapshot - - clientJvmArgs = ["-Xmx5G", "-Dfml.coreMods.load=" + coremodPath] - serverJvmArgs = ["-Xmx5G"] - - replace "%VERSION%", project.version - replace "%METAMORPH%", project.metamorph - replace "%MCLIB%", project.mclib - replace "%APERTURE%", project.aperture - replace "%EMOTICONS%", project.emoticons - replace "%MINEMA%", project.minema + mappings channel: 'snapshot', version: project.snapshot + + runs { + client { + workingDirectory project.file('run') + jvmArgs(["-Dfml.coreMods.load=" + coremodPath]) + } + + server { + + } + } + } dependencies { - compile files("run/libs/mclib-${mclib}-${project.minecraft.version}-dev.jar") - compile files("run/libs/metamorph-${metamorph}-${project.minecraft.version}-dev.jar") - compile files("run/libs/aperture-${aperture}-${project.minecraft.version}-dev.jar") - compile files("run/libs/Minema-${minema}-${project.minecraft.version}-dev.jar") + minecraft "net.minecraftforge:forge:${project.mc_version}-${project.forge_version}" + implementation fg.deobf("curse.maven:mclib-304750:4044267") + implementation fg.deobf("curse.maven:metamorph-256932:4044182") + implementation fg.deobf("curse.maven:aperture-271561:4044181") + implementation fg.deobf("curse.maven:Minema-645749:3884808") } jar { @@ -64,17 +75,17 @@ jar { } } -eclipse +/*eclipse { classpath { file { whenMerged - { classpath -> - def ver = project.minecraft.version - /* Fucking gradle 2.14 doesn't have fileReference() method, - * screw you piece of shit */ + { classpath -> + def ver = project.mc_version + *//* Fucking gradle 2.14 doesn't have fileReference() method, + * screw you piece of shit *//* def getMeReference = { File file -> return [ getFile: { return file }, @@ -83,31 +94,31 @@ eclipse isRelativeToPathVariable: { return false } ] as org.gradle.plugins.ide.eclipse.model.FileReference } - + def lib = entries.find { it.path.contains "metamorph-${metamorph}" } lib.sourcePath = getMeReference(file("run/libs/metamorph-${metamorph}-${ver}-sources.jar")) - - lib = entries.find { it.path.contains "aperture-${aperture}" } + + lib = entries.find { it.path.contains "aperture-${aperture}" } lib.sourcePath = getMeReference(file("run/libs/aperture-${aperture}-${ver}-sources.jar")) - - lib = entries.find { it.path.contains "mclib-${mclib}" } + + lib = entries.find { it.path.contains "mclib-${mclib}" } lib.sourcePath = getMeReference(file("run/libs/mclib-${mclib}-${ver}-sources.jar")) } } } -} +}*/ processResources { inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version + inputs.property "mcversion", project.mc_version - project.version += "-" + project.minecraft.version + project.version += "-" + project.mc_version from(sourceSets.main.resources.srcDirs) { include 'mcmod.info' - expand 'version':project.version, 'mcversion':project.minecraft.version + expand 'version':project.version, 'mcversion':project.mc_version } from(sourceSets.main.resources.srcDirs) { @@ -115,6 +126,29 @@ processResources } } + +import org.apache.tools.ant.filters.ReplaceTokens +def copyDir = "$compileJava.temporaryDir/replaced" + +task tokenReplace(type:Copy){ + var test = sourceSets.main.java.sourceDirectories; + from(sourceSets.main.java.sourceDirectories) + into copyDir + filter(ReplaceTokens, tokens: [ + VERSION: project.version, + METAMORPH: project.metamorph, + MCLIB: project.mclib, + APERTURE: project.aperture, + EMOTICONS: project.emoticons, + MINEMA: project.minema + ]) +} + +compileJava.setSource(copyDir) + +compileJava.dependsOn(tokenReplace) + + /* Dev build */ task deobfJar(type: Jar) { from sourceSets.main.output diff --git a/gradle.properties b/gradle.properties index 78e417ed3..6fbc4ba5d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,5 +8,6 @@ minema=3.7 coremodPath=mchorse.blockbuster.core.BBCoreMod mc_version=1.12.2 -forge_version=14.23.5.2799 -snapshot=snapshot_20171003 \ No newline at end of file +forge_version=14.23.5.2860 +snapshot=20171003-1.12 +vendor=McHorse \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index deedc7fa5..41d9927a4 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6adb4dbec..aa991fcea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Jul 31 22:56:16 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip diff --git a/src/main/java/mchorse/blockbuster/Blockbuster.java b/src/main/java/mchorse/blockbuster/Blockbuster.java index 5735e93c7..04ce47a95 100644 --- a/src/main/java/mchorse/blockbuster/Blockbuster.java +++ b/src/main/java/mchorse/blockbuster/Blockbuster.java @@ -75,7 +75,7 @@ * of custom models) * */ -@Mod(modid = Blockbuster.MOD_ID, name = Blockbuster.MODNAME, version = Blockbuster.VERSION, dependencies = "after:minema@[%MINEMA%,);before:aperture@[%APERTURE%,);before:emoticons@[%EMOTICONS%,);required-after:metamorph@[%METAMORPH%,);required-after:mclib@[%MCLIB%,);required-after:forge@[14.23.2.2638,)", updateJSON = "https://raw.githubusercontent.com/mchorse/blockbuster/1.12/version.json") +@Mod(modid = Blockbuster.MOD_ID, name = Blockbuster.MODNAME, version = Blockbuster.VERSION, dependencies = "after:minema@[@MINEMA@,);before:aperture@[@APERTURE@,);before:emoticons@[@EMOTICONS@,);required-after:metamorph@[@METAMORPH@,);required-after:mclib@[%MCLIB%,);required-after:forge@[14.23.2.2638,)", updateJSON = "https://raw.githubusercontent.com/mchorse/blockbuster/1.12/version.json") public class Blockbuster { /* Mod info */ diff --git a/src/main/java/mchorse/blockbuster/core/BBCoreModInfo.java b/src/main/java/mchorse/blockbuster/core/BBCoreModInfo.java index 84f33c6e5..bdc5fd67a 100644 --- a/src/main/java/mchorse/blockbuster/core/BBCoreModInfo.java +++ b/src/main/java/mchorse/blockbuster/core/BBCoreModInfo.java @@ -25,6 +25,6 @@ public Object getMod() @Override public String getVersion() { - return "%VERSION%"; + return "@VERSION@"; } } \ No newline at end of file diff --git a/src/main/java/mchorse/blockbuster/recording/actions/ChatAction.java b/src/main/java/mchorse/blockbuster/recording/actions/ChatAction.java index a1eb18acd..b4ff2a895 100644 --- a/src/main/java/mchorse/blockbuster/recording/actions/ChatAction.java +++ b/src/main/java/mchorse/blockbuster/recording/actions/ChatAction.java @@ -33,7 +33,7 @@ public String getMessage(EntityLivingBase actor) if (!prefix.isEmpty()) { - message = prefix.replace("%NAME%", actor == null ? "Player" : actor.getName()) + message; + message = prefix.replace("@NAME@", actor == null ? "Player" : actor.getName()) + message; } return TextUtils.processColoredText(message);