aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/scripts/test-no-crash-reports.sh9
-rwxr-xr-x.github/scripts/test-no-error-reports.sh45
-rw-r--r--.github/workflows/build-and-test.yml20
-rw-r--r--build.gradle149
-rw-r--r--dependencies.gradle60
-rw-r--r--repositories.gradle20
-rw-r--r--src/main/java/gtPlusPlus/core/lib/CORE.java6
-rw-r--r--src/main/resources/mcmod.info64
8 files changed, 220 insertions, 153 deletions
diff --git a/.github/scripts/test-no-crash-reports.sh b/.github/scripts/test-no-crash-reports.sh
deleted file mode 100644
index c67e342c06..0000000000
--- a/.github/scripts/test-no-crash-reports.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-directory="run/crash-reports"
-if [ -d $directory ]; then
- echo "Crash reports detected:"
- cat $directory/*
- exit 1
-else
- echo "No crash reports detected"
- exit 0
-fi
diff --git a/.github/scripts/test-no-error-reports.sh b/.github/scripts/test-no-error-reports.sh
new file mode 100755
index 0000000000..cfce0261a5
--- /dev/null
+++ b/.github/scripts/test-no-error-reports.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+
+RUNDIR="run"
+CRASH="crash-reports"
+SERVERLOG="server.log"
+
+# enable nullglob to get 0 results when no match rather than the pattern
+shopt -s nullglob
+# store matches in array (don't forget to double-quote variables expansion
+crash_reports=( "$RUNDIR/$CRASH/crash"*.txt )
+if [ "${#crash_reports[@]}" -gt 0 ]; then
+ latest_crash_report="${crash_reports[-1]}"
+ {
+ printf 'Latest crash report detected %s:\n' "${latest_crash_report##*/}"
+ cat "$latest_crash_report"
+ } >&2
+ exit 1
+fi
+
+if grep --quiet --fixed-strings 'Fatal errors were detected' "$SERVERLOG"; then
+ {
+ printf 'Fatal errors detected:'
+ cat server.log
+ } >&2
+ exit 1
+fi
+
+if grep --quiet --fixed-strings 'The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED' "$SERVERLOG"; then
+ {
+ printf 'Server force stopped:'
+ cat server.log
+ } >&2
+ exit 1
+fi
+
+if ! grep --quiet -Po '.+Done \(.+\)\! For help, type "help" or "\?"' "$SERVERLOG"; then
+ {
+ printf 'Server did not finish startup:'
+ cat server.log
+ } >&2
+ exit 1
+fi
+
+printf 'No crash reports detected'
+exit 0
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index a60a2b6468..2a74327ad6 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -14,32 +14,32 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- with:
+ with:
fetch-depth: 0
-
+
- name: Set up JDK 8
uses: actions/setup-java@v2
with:
java-version: '8'
distribution: 'adopt'
cache: gradle
-
+
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Setup the workspace
run: ./gradlew setupCIWorkspace
-
+
- name: Build the mod
run: ./gradlew build
- - name: Run server for 1 minute
+ - name: Run server for 1.5 minutes
run: |
mkdir run
- echo "eula=true" > run/eula.txt
- timeout 60 ./gradlew runServer || true
+ echo "eula=true" > run/eula.txt
+ timeout 90 ./gradlew runServer 2>&1 | tee -a server.log || true
- - name: Test no crashes happend
+ - name: Test no errors reported during server run
run: |
- chmod +x .github/scripts/test-no-crash-reports.sh
- .github/scripts/test-no-crash-reports.sh
+ chmod +x .github/scripts/test-no-error-reports.sh
+ .github/scripts/test-no-error-reports.sh
diff --git a/build.gradle b/build.gradle
index b85885a0e1..c8cf37cd1f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,14 @@
-//version: 1644278435
+//version: 1644894948
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
- */
+*/
+import org.gradle.internal.logging.text.StyledTextOutput
+import org.gradle.internal.logging.text.StyledTextOutputFactory
+import org.gradle.internal.logging.text.StyledTextOutput.Style
import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
@@ -15,20 +18,20 @@ import java.util.concurrent.TimeUnit
buildscript {
repositories {
maven {
- name = "forge"
- url = "https://maven.minecraftforge.net"
+ name 'forge'
+ url 'https://maven.minecraftforge.net'
}
maven {
- name = "sonatype"
- url = "https://oss.sonatype.org/content/repositories/snapshots/"
+ name 'sonatype'
+ url 'https://oss.sonatype.org/content/repositories/snapshots/'
}
maven {
- name = "Scala CI dependencies"
- url = "https://repo1.maven.org/maven2/"
+ name 'Scala CI dependencies'
+ url 'https://repo1.maven.org/maven2/'
}
maven {
- name = "jitpack"
- url = "https://jitpack.io"
+ name 'jitpack'
+ url 'https://jitpack.io'
}
}
dependencies {
@@ -37,21 +40,26 @@ buildscript {
}
plugins {
+ id 'java-library'
id 'idea'
id 'eclipse'
id 'scala'
- id('org.jetbrains.kotlin.jvm') version ('1.6.10') apply false
- id('org.ajoberstar.grgit') version('4.1.1')
- id('com.github.johnrengelman.shadow') version('4.0.4')
- id('com.palantir.git-version') version('0.13.0') apply false
- id('de.undercouch.download') version('5.0.1')
- id('maven-publish')
+ id 'maven-publish'
+ id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
+ id 'org.jetbrains.kotlin.kapt' version '1.5.30' apply false
+ id 'org.ajoberstar.grgit' version '4.1.1'
+ id 'com.github.johnrengelman.shadow' version '4.0.4'
+ id 'com.palantir.git-version' version '0.13.0' apply false
+ id 'de.undercouch.download' version '5.0.1'
+ id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false
}
if (project.file('.git/HEAD').isFile()) {
apply plugin: 'com.palantir.git-version'
}
+def out = services.get(StyledTextOutputFactory).create('an-output')
+
apply plugin: 'forge'
def projectJavaVersion = JavaLanguageVersion.of(8)
@@ -167,8 +175,8 @@ configurations.all {
try {
'git config core.fileMode false'.execute()
}
-catch (Exception e) {
- logger.error("\u001B[31mgit isn't installed at all\u001B[0m")
+catch (Exception ignored) {
+ out.style(Style.Failure).println("git isn't installed at all")
}
// Pulls version first from the VERSION env and then git tag
@@ -177,19 +185,22 @@ String versionOverride = System.getenv("VERSION") ?: null
try {
identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
}
-catch (Exception e) {
- logger.error("\n\u001B[1;31mThis mod must be version controlled by Git AND the repository must provide at least one tag,\n" +
- "or the VERSION override must be set! \u001B[32m(Don't download from GitHub using the ZIP option, instead\n" +
- "clone the repository, see\u001B[33m https://gtnh.miraheze.org/wiki/Development \u001B[32mfor details.)\u001B[0m\n");
+catch (Exception ignored) {
+ out.style(Style.Failure).text(
+ 'This mod must be version controlled by Git AND the repository must provide at least one tag,\n' +
+ 'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' +
+ 'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)'
+ )
versionOverride = 'NO-GIT-TAG-SET'
identifiedVersion = versionOverride
}
version = minecraftVersion + '-' + identifiedVersion
-String modVersion = identifiedVersion
+ext {
+ modVersion = identifiedVersion
+}
-if( identifiedVersion.equals(versionOverride) ) {
- logger.error('\u001B[31m\u001B[7mWe hope you know what you\'re doing using\u001B[0m\u001B[1;34m ' + modVersion + '\u001B[0m\n');
- logger.error('\7\u001B[31mGoing to blindly try to use\u001B[1;34m ' + modVersion + '\u001B[0m\u001B[31m, this probably won\'t work the way you expect!!\u001B[0m\n');
+if(identifiedVersion == versionOverride) {
+ out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
}
group = modGroup
@@ -200,7 +211,6 @@ else {
archivesBaseName = modId
}
-
def arguments = []
def jvmArguments = []
@@ -214,8 +224,8 @@ if(usesMixins.toBoolean()) {
}
minecraft {
- version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
- runDir = "run"
+ version = minecraftVersion + '-' + forgeVersion + '-' + minecraftVersion
+ runDir = 'run'
if (replaceGradleTokenInFile) {
replaceIn replaceGradleTokenInFile
@@ -248,8 +258,8 @@ minecraft {
}
}
-if(file("addon.gradle").exists()) {
- apply from: "addon.gradle"
+if(file('addon.gradle').exists()) {
+ apply from: 'addon.gradle'
}
apply from: 'repositories.gradle'
@@ -262,42 +272,42 @@ configurations {
repositories {
maven {
- name = "Overmind forge repo mirror"
- url = "https://gregtech.overminddl1.com/"
+ name 'Overmind forge repo mirror'
+ url 'https://gregtech.overminddl1.com/'
}
if(usesMixins.toBoolean()) {
maven {
- name = "sponge"
- url = "https://repo.spongepowered.org/repository/maven-public"
+ name 'sponge'
+ url 'https://repo.spongepowered.org/repository/maven-public'
}
maven {
- url = "https://jitpack.io"
+ url 'https://jitpack.io'
}
}
}
dependencies {
if(usesMixins.toBoolean()) {
- annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
- annotationProcessor("com.google.guava:guava:24.1.1-jre")
- annotationProcessor("com.google.code.gson:gson:2.8.6")
- annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT")
+ annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
+ annotationProcessor('com.google.guava:guava:24.1.1-jre')
+ annotationProcessor('com.google.code.gson:gson:2.8.6')
+ annotationProcessor('org.spongepowered:mixin:0.8-SNAPSHOT')
// using 0.8 to workaround a issue in 0.7 which fails mixin application
- compile("com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH") {
+ compile('com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH') {
// Mixin includes a lot of dependencies that are too up-to-date
- exclude module: "launchwrapper"
- exclude module: "guava"
- exclude module: "gson"
- exclude module: "commons-io"
- exclude module: "log4j-core"
+ exclude module: 'launchwrapper'
+ exclude module: 'guava'
+ exclude module: 'gson'
+ exclude module: 'commons-io'
+ exclude module: 'log4j-core'
}
- compile("com.github.GTNewHorizons:SpongeMixins:1.5.0")
+ compile('com.github.GTNewHorizons:SpongeMixins:1.5.0')
}
}
apply from: 'dependencies.gradle'
-def mixingConfigRefMap = "mixins." + modId + ".refmap.json"
+def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
@@ -401,17 +411,16 @@ tasks.withType(JavaExec).configureEach {
)
}
-processResources
-{
+processResources {
// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
-
+
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'
- // replace version and mcversion
+ // replace modVersion and minecraftVersion
expand "minecraftVersion": project.minecraft.version,
"modVersion": modVersion,
"modId": modId,
@@ -422,7 +431,7 @@ processResources
from refMap
}
- // copy everything else, thats not the mcmod.info
+ // copy everything else that's not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
@@ -430,7 +439,7 @@ processResources
def getManifestAttributes() {
def manifestAttributes = [:]
- if(containsMixinsAndOrCoreModOnly.toBoolean() == false && (usesMixins.toBoolean() || coreModClass)) {
+ if(!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) {
manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
}
@@ -446,7 +455,7 @@ def getManifestAttributes() {
manifestAttributes += [
"TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
"MixinConfigs" : "mixins." + modId + ".json",
- "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
+ "ForceLoadAsMod" : !containsMixinsAndOrCoreModOnly.toBoolean()
]
}
return manifestAttributes
@@ -533,14 +542,15 @@ artifacts {
}
}
-// The gradle metadata includes all of the additional deps that we disabled from POM generation (including forgeBin with no groupID),
+// The gradle metadata includes all of the additional deps that we disabled from POM generation (including forgeBin with no groupID),
// and isn't strictly needed with the POM so just disable it.
tasks.withType(GenerateModuleMetadata) {
enabled = false
}
+// workaround variable hiding in pom processing
+def projectConfigs = project.configurations
-// publishing
publishing {
publications {
maven(MavenPublication) {
@@ -560,14 +570,21 @@ publishing {
artifactId = System.getenv("ARTIFACT_ID") ?: project.name
// Using the identified version, not project.version as it has the prepended 1.7.10
version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
-
- // Remove all non GTNH deps here.
- // Original intention was to remove an invalid forgeBin being generated without a groupId (mandatory), but
- // it also removes all of the MC deps
+
+ // remove extra garbage from minecraft and minecraftDeps configuration
pom.withXml {
+ def badArtifacts = [:].withDefault {[] as Set<String>}
+ for (configuration in [projectConfigs.minecraft, projectConfigs.minecraftDeps]) {
+ for (dependency in configuration.allDependencies) {
+ badArtifacts[dependency.group == null ? "" : dependency.group] += dependency.name
+ }
+ }
+ // example for specifying extra stuff to ignore
+ // badArtifacts["org.example.group"] += "artifactName"
+
Node pomNode = asNode()
pomNode.dependencies.'*'.findAll() {
- it.groupId.text() != 'com.github.GTNewHorizons'
+ badArtifacts[it.groupId.text()].contains(it.artifactId.text())
}.each() {
it.parent().remove(it)
}
@@ -599,7 +616,7 @@ if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
if (autoUpdateBuildScript.toBoolean()) {
performBuildScriptUpdate(projectDir.toString())
} else {
- println("Build script update available! Run 'gradle updateBuildScript'")
+ out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'")
}
}
@@ -611,7 +628,7 @@ boolean performBuildScriptUpdate(String projectDir) {
if (isNewBuildScriptVersionAvailable(projectDir)) {
def buildscriptFile = getFile("build.gradle")
availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
- print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
+ out.style(Style.Success).print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
return true
}
return false
@@ -680,7 +697,7 @@ def deobf(String sourceURL, String fileName) {
String bon2File = bon2Dir + "/BON2-2.5.0.jar"
String obfFile = cacheDir + "modules-2/files-2.1/" + fileName + ".jar"
String deobfFile = cacheDir + "modules-2/files-2.1/" + fileName + "-deobf.jar"
-
+
if(file(deobfFile).exists()) {
return files(deobfFile)
}
@@ -711,7 +728,7 @@ def deobf(String sourceURL, String fileName) {
// Helper methods
def checkPropertyExists(String propertyName) {
- if (project.hasProperty(propertyName) == false) {
+ if (!project.hasProperty(propertyName)) {
throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
}
}
diff --git a/dependencies.gradle b/dependencies.gradle
index 917286f493..33a0a81ef5 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,48 +1,26 @@
// Add your dependencies here
dependencies {
- compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.40.32:dev")
- compile("com.github.GTNewHorizons:StructureLib:1.0.15:dev")
- compile("com.github.GTNewHorizons:NotEnoughItems:2.2.6-GTNH:dev")
- compile("com.github.GTNewHorizons:CodeChickenCore:1.1.3:dev")
- compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev")
- compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
+ compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.40.35:dev')
+ compile('com.github.GTNewHorizons:StructureLib:1.0.15:dev')
+ compile('com.github.GTNewHorizons:NotEnoughItems:2.2.7-GTNH:dev')
+ compile('com.github.GTNewHorizons:CodeChickenCore:1.1.4:dev')
+ compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev')
+ compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
- compile("curse.maven:cofh-core-69162:2388751")
- compile("curse.maven:advsolar-362768:2885953")
+ compile('curse.maven:cofh-core-69162:2388751')
+ compile('curse.maven:advsolar-362768:2885953')
- compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-75-GTNH:dev") {
- transitive = false
- }
- compileOnly("com.github.GTNewHorizons:Baubles:1.0.1.14:dev") {
- transitive = false
- }
- compileOnly("com.github.GTNewHorizons:ForestryMC:4.4.5:dev") {
- transitive = false
- }
- compileOnly("com.github.GTNewHorizons:Railcraft:9.13.6:dev") {
- transitive = false
- }
- compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.29:dev") {
- transitive = false
- }
- compileOnly("com.github.GTNewHorizons:EnderCore:0.2.6:dev") {
- transitive = false
- }
- compileOnly("com.github.GTNewHorizons:SC2:2.0.1:dev") {
- transitive = false
- }
+ compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-77-GTNH:dev') {transitive=false}
+ compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive=false}
+ compileOnly('com.github.GTNewHorizons:ForestryMC:4.4.6:dev') {transitive=false}
+ compileOnly('com.github.GTNewHorizons:Railcraft:9.13.6:dev') {transitive=false}
+ compileOnly('com.github.GTNewHorizons:EnderIO:2.3.1.30:dev') {transitive=false}
+ compileOnly('com.github.GTNewHorizons:EnderCore:0.2.6:dev') {transitive=false}
+ compileOnly('com.github.GTNewHorizons:SC2:2.0.1:dev') {transitive=false}
- compileOnly("player-api:PlayerAPI:1.7.10:1.4") {
- transitive = false
- }
- compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.26:dev") {
- transitive = false
- }
- compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {
- transitive = false
- }
- compileOnly("com.github.GTNewHorizons:Chisel:2.10.8-GTNH:dev") {
- transitive = false
- }
+ compileOnly('player-api:PlayerAPI:1.7.10:1.4') {transitive=false}
+ compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.27:dev') {transitive=false}
+ compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false}
+ compileOnly('com.github.GTNewHorizons:Chisel:2.10.8-GTNH:dev') {transitive=false}
}
diff --git a/repositories.gradle b/repositories.gradle
index 23d0667ab9..53f48ad9d7 100644
--- a/repositories.gradle
+++ b/repositories.gradle
@@ -2,29 +2,33 @@
repositories {
maven {
- name = "GTNH Maven"
- url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+ name 'GTNH Maven'
+ url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
+ allowInsecureProtocol
}
maven {
- name = "ic2"
- url = "http://maven.ic2.player.to/"
+ name 'ic2'
+ url 'http://maven.ic2.player.to/'
metadataSources {
mavenPom()
artifact()
}
}
maven {
- name "CurseForge Maven"
- url "https://minecraft.curseforge.com/api/maven/"
+ name 'CurseForge Maven'
+ url 'https://minecraft.curseforge.com/api/maven/'
metadataSources {
mavenPom()
artifact()
}
}
maven {
- url "https://cursemaven.com"
+ url 'https://cursemaven.com'
+ content {
+ includeGroup 'curse.maven'
+ }
}
maven {
- url = "https://jitpack.io"
+ url 'https://jitpack.io'
}
}
diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java
index 076616f569..8cb6a938b5 100644
--- a/src/main/java/gtPlusPlus/core/lib/CORE.java
+++ b/src/main/java/gtPlusPlus/core/lib/CORE.java
@@ -96,7 +96,7 @@ public class CORE {
public static List<Pair<Integer, ItemStack>> burnables = new ArrayList<Pair<Integer, ItemStack>>();
- //TesseractMapss
+ //TesseractMaps
public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> sTesseractGeneratorOwnershipMap = new HashMap<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>();
public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> sTesseractTerminalOwnershipMap = new HashMap<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>();
@@ -321,13 +321,13 @@ public class CORE {
public static class Everglades{
public static final String MODID = "ToxicEverglades";
public static final String NAME = "GT++ Toxic Everglades";
- public static final String VERSION = "0.1";
+ public static final String VERSION = "GRADLETOKEN_VERSION";
}
public static class Australia{
public static final String MODID = "Australia";
public static final String NAME = "GT++ Australia";
- public static final String VERSION = "0.1";
+ public static final String VERSION = "GRADLETOKEN_VERSION";
}
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index f9465a0258..b3cb2bf148 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -1,18 +1,50 @@
-[
{
- "modid": "${modId}",
- "name": "${modName}",
- "description": "Adds over 100 new Multiblocks, Machines, etc to Gregtech.",
- "credits": "",
- "logoFile": "",
- "version": "${modVersion}",
- "mcversion": "${minecraftVersion}",
- "url": "https://github.com/draknyte1/GTplusplus/wiki",
- "updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest",
- "authorList": [ "Alkalus/Draknyte1" ],
- "screenshots": [ "" ],
- "dependencies": [
- "mod_MinecraftForge"
- ]
+ "modListVersion": 2,
+ "modList": [{
+ "modid": "${modId}",
+ "name": "${modName}",
+ "description": "Adds over 100 new Multiblocks, Machines, etc to Gregtech.",
+ "credits": "",
+ "logoFile": "",
+ "version": "${modVersion}",
+ "mcversion": "${minecraftVersion}",
+ "url": "https://github.com/draknyte1/GTplusplus/wiki",
+ "updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest",
+ "authorList": ["Alkalus/Draknyte1"],
+ "screenshots": [""],
+ "requiredMods": ["Forge"],
+ "dependencies": [
+ "Forge", "TConstruct", "PlayerAPI", "dreamcraft", "IC2", "ihl", "psychedelicraft", "gregtech", "Forestry", "MagicBees", "CoFHCore", "Growthcraft", "Railcraft", "CompactWindmills",
+ "ForbiddenMagic", "MorePlanet", "PneumaticCraft", "ExtraUtilities", "Thaumcraft", "rftools", "simplyjetpacks", "BigReactors", "EnderIO", "tectech", "GTRedtech", "beyondrealitycore",
+ "OpenBlocks", "IC2NuclearControl", "TGregworks", "StevesCarts", "xreliquary"
+ ]
+ }, {
+ "modid": "Australia",
+ "name": "${modName} Australia",
+ "description": "Adds the land down under.",
+ "credits": "",
+ "logoFile": "",
+ "version": "${modVersion}",
+ "mcversion": "${minecraftVersion}",
+ "url": "https://github.com/draknyte1/GTplusplus/wiki",
+ "updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest",
+ "authorList": ["Alkalus/Draknyte1"],
+ "screenshots": [""],
+ "requiredMods": ["miscutils"],
+ "dependencies": ["miscutils"]
+ }, {
+ "modid": "ToxicEverglades",
+ "name": "${modName} ToxicEverglades",
+ "description": "Everglades, but toxic.",
+ "credits": "",
+ "logoFile": "",
+ "version": "${modVersion}",
+ "mcversion": "${minecraftVersion}",
+ "url": "https://github.com/draknyte1/GTplusplus/wiki",
+ "updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest",
+ "authorList": ["Alkalus/Draknyte1"],
+ "screenshots": [""],
+ "requiredMods": ["miscutils"],
+ "dependencies": ["miscutils"]
+ }]
}
-]
generated by cgit (git 2.46.0) at 2025-05-28 20:14:08 +0000