mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-09-19 12:17:17 -04:00
Fix GT integration not working (#149)
Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com>
This commit is contained in:
miozune
GitHub
parent
72f4bf9810
commit
47c68a2bc1
27
.github/scripts/test-no-error-reports.sh
vendored
27
.github/scripts/test-no-error-reports.sh
vendored
@ -1,27 +0,0 @@
|
||||
if [[ -d "run/crash-reports" ]]; then
|
||||
echo "Crash reports detected:"
|
||||
cat $directory/*
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if grep --quiet "Fatal errors were detected" server.log; then
|
||||
echo "Fatal errors detected:"
|
||||
cat server.log
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" server.log; then
|
||||
echo "Server force stopped:"
|
||||
cat server.log
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if grep --quiet 'Done .+ For help, type "help" or "?"' server.log; then
|
||||
echo "Server didn't finish startup:"
|
||||
cat server.log
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "No crash reports detected"
|
||||
exit 0
|
||||
|
||||
9
.gitignore
vendored
9
.gitignore
vendored
@ -1,6 +1,7 @@
|
||||
.gradle
|
||||
.settings
|
||||
/.idea/
|
||||
/.vscode/
|
||||
/run/
|
||||
/build/
|
||||
/eclipse/
|
||||
@ -8,7 +9,6 @@
|
||||
.project
|
||||
/bin/
|
||||
/config/
|
||||
/classes/
|
||||
/crash-reports/
|
||||
/logs/
|
||||
options.txt
|
||||
@ -26,8 +26,13 @@ whitelist.json
|
||||
*.iml
|
||||
*.ipr
|
||||
*.iws
|
||||
src/main/resources/mixins.*.json
|
||||
src/main/resources/mixins.*([!.]).json
|
||||
*.bat
|
||||
*.DS_Store
|
||||
!gradlew.bat
|
||||
.factorypath
|
||||
addon.local.gradle
|
||||
addon.local.gradle.kts
|
||||
addon.late.local.gradle
|
||||
addon.late.local.gradle.kts
|
||||
layout.json
|
||||
|
||||
@ -5,63 +5,52 @@ dependencies {
|
||||
shadowImplementation name: 'OC-JNLua', version: '20230530.0', ext: 'jar'
|
||||
shadowImplementation name: 'OC-JNLua-Natives', version: '20220928.1', ext: 'jar'
|
||||
|
||||
compile("com.google.code.findbugs:jsr305:3.0.2")
|
||||
|
||||
compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-542-GTNH:dev") {transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:EnderStorage:1.7.2:dev") {transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.128:dev") {transitive = false }
|
||||
compile("com.github.GTNewHorizons:ForestryMC:4.10.1:dev") {transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:Railcraft:9.16.3:dev") {transitive = false }
|
||||
compile("com.github.GTNewHorizons:NotEnoughItems:2.7.29-GTNH:dev") {transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.6.2:dev") {transitive = false }
|
||||
compile("com.github.GTNewHorizons:CodeChickenCore:1.4.1:dev") {transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:waila:1.8.2:dev") {transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.4-GTNH:dev") {transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:TinkersMechworks:0.4.0:dev") {transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:ProjectRed:4.11.1-GTNH:dev") {transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.5:dev") {transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.7.6-GTNH:dev") {transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:ExtraCells2:2.5.35:dev") {transitive = false }
|
||||
compileOnly('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.28-gtnh:dev') {transitive = false }
|
||||
compile("com.github.GTNewHorizons:EnderIO:2.9.3:dev") {
|
||||
compile("com.github.GTNewHorizons:EnderCore:0.4.6:dev")
|
||||
transitive = false
|
||||
}
|
||||
compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.8.4-GTNH:dev") {transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:gendustry:1.9.1-GTNH:dev") {transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:WirelessRedstone-CBE:1.7.0:dev") {transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.42:dev") {transitive = false }
|
||||
compileOnly("appeng:RotaryCraft:V5c:api") {transitive = false }
|
||||
compileOnly("com.bluepowermod:BluePower:0.2.928:deobf") {transitive = false }
|
||||
compileOnly("igwmod:IGW-Mod-1.7.10:1.1.3-18:userdev") {transitive = false }
|
||||
compileOnly("li.cil.tis3d:TIS-3D:MC1.7.10-1.2.4.70:dev") {transitive = false }
|
||||
compileOnly("dev.modwarriors.notenoughkeys:NotEnoughKeys:1.7.10-2.0.0b4:deobf-dev") {transitive = false }
|
||||
compileOnly("qmunity:QmunityLib:0.1.105:deobf") {transitive = false }
|
||||
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {transitive = false }
|
||||
compileOnly("curse.maven:mekanism-268560:2475797") {transitive = false }
|
||||
compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") {transitive = false }
|
||||
compileOnly("curse.maven:minefactory-reloaded-66672:2366150") {transitive = false }
|
||||
compileOnly("curse.maven:computercraft-67504:2269339") {transitive = false }
|
||||
compile("curse.maven:cofh-core-69162:2388751")
|
||||
compileOnly("curse.maven:agricraft-225635:2284133") {transitive = false }
|
||||
compileOnly("curse.maven:stargatetech-2-226769:2230351") {transitive = false }
|
||||
|
||||
compileOnlyApi("com.github.GTNewHorizons:Angelica:1.0.0-beta33:api") { transitive = false }
|
||||
|
||||
compileOnly(deobf("https://immibis.com/mcmoddl/files/redlogic-59.1.13.jar"))
|
||||
compileOnly files("dependencies/ic2classic-api.zip") //curseforge one does NOT work ...
|
||||
compileOnly(deobf("https://github.com/purpleposeidon/fz_archive/raw/master/old/Factorization-1.7.10-0.8.108.jar"))
|
||||
compileOnly("api:coloredlightscore:1")
|
||||
compileOnly(deobf("http://immibis.com/mcmoddl/files/immibis-microblocks-59.1.2.jar"))
|
||||
|
||||
testCompile("org.mockito:mockito-all:1.10.19")
|
||||
testCompile("org.scalactic:scalactic_2.11:2.2.6")
|
||||
testCompile("org.scalatest:scalatest_2.11:2.2.6")
|
||||
testCompile "junit:junit:4.13"
|
||||
testCompile "org.mockito:mockito-all:1.10.19"
|
||||
testCompile "org.scalactic:scalactic_2.11:2.2.6"
|
||||
testCompile "org.scalatest:scalatest_2.11:2.2.6"
|
||||
|
||||
compileOnly("com.github.GTNewHorizons:ModularUI:1.2.17:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.30-gtnh:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:Angelica:1.0.0-beta35:api") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-547-GTNH:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:Avaritiaddons:1.8.4-GTNH:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.5:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.42:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.4.1:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:EnderCore:0.4.6:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:EnderIO:2.9.4:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:EnderStorage:1.7.2:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:ExtraCells2:2.5.35:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.3:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.6.2:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.4-GTNH:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.153:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:GTNHLib:0.5.23:dev") { transitive = false }
|
||||
compileOnly("com.github.GTNewHorizons:ModularUI:1.2.18:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.7.29-GTNH:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:ProjectRed:4.11.1-GTNH:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:Railcraft:9.16.3:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:StructureLib:1.4.2:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:ThaumicEnergistics:1.7.6-GTNH:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:TinkersMechworks:0.4.0:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:waila:1.8.2:dev") {transitive = false}
|
||||
compileOnly("com.github.GTNewHorizons:WirelessRedstone-CBE:1.7.0:dev") {transitive = false}
|
||||
|
||||
compileOnly("api:coloredlightscore:1")
|
||||
compileOnly("com.bluepowermod:BluePower:0.2.928:deobf") {transitive = false}
|
||||
compileOnly("curse.maven:agricraft-225635:2284133") {transitive = false}
|
||||
compileOnly("curse.maven:cofh-core-69162:2388751")
|
||||
compileOnly("curse.maven:mekanism-268560:2475797") {transitive = false}
|
||||
compileOnly("curse.maven:minefactory-reloaded-66672:2366150") {transitive = false}
|
||||
compileOnly("curse.maven:computercraft-67504:2269339") {transitive = false}
|
||||
compileOnly("curse.maven:stargatetech-2-226769:2230351") {transitive = false}
|
||||
compileOnly("dev.modwarriors.notenoughkeys:NotEnoughKeys:1.7.10-2.0.0b4:deobf-dev") {transitive = false}
|
||||
compileOnly("igwmod:IGW-Mod-1.7.10:1.1.3-18:userdev") {transitive = false}
|
||||
compileOnly("li.cil.tis3d:TIS-3D:MC1.7.10-1.2.4.70:dev") {transitive = false}
|
||||
compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") {transitive = false}
|
||||
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {transitive = false}
|
||||
compileOnly("qmunity:QmunityLib:0.1.105:deobf") {transitive = false}
|
||||
compileOnly(deobf("https://github.com/purpleposeidon/fz_archive/raw/master/old/Factorization-1.7.10-0.8.108.jar"))
|
||||
compileOnly(deobf("https://immibis.com/mcmoddl/files/immibis-microblocks-59.1.2.jar"))
|
||||
compileOnly(deobf("https://immibis.com/mcmoddl/files/redlogic-59.1.13.jar"))
|
||||
compileOnly(files("dependencies/ic2classic-api.zip")) // curseforge one does NOT work ...
|
||||
|
||||
testImplementation("org.mockito:mockito-all:1.10.19")
|
||||
testImplementation("org.scalatest:scalatest_2.11:2.2.6")
|
||||
testImplementation("junit:junit:4.13")
|
||||
}
|
||||
|
||||
@ -55,23 +55,6 @@ generateGradleTokenClass = li.cil.oc.Tags
|
||||
# Name of the token containing the project's current version to generate/replace.
|
||||
gradleTokenVersion = VERSION
|
||||
|
||||
# [DEPRECATED] Mod ID replacement token.
|
||||
gradleTokenModId =
|
||||
|
||||
# [DEPRECATED] Mod name replacement token.
|
||||
gradleTokenModName =
|
||||
|
||||
# [DEPRECATED] Mod Group replacement token.
|
||||
gradleTokenGroupName =
|
||||
|
||||
# [DEPRECATED]
|
||||
# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
|
||||
# public static final String VERSION = "GRADLETOKEN_VERSION";
|
||||
# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
|
||||
# version in @Mod([...], version = VERSION, [...]).
|
||||
# Leave these properties empty to skip individual token replacements.
|
||||
replaceGradleTokenInFile =
|
||||
|
||||
# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
|
||||
# leave this property empty.
|
||||
# Example value: (apiPackage = api) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.api
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
3
gradlew
vendored
3
gradlew
vendored
@ -86,8 +86,7 @@ done
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
||||
' "$PWD" ) || exit
|
||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
|
||||
@ -17,7 +17,7 @@ pluginManagement {
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.32'
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.33'
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -47,7 +47,7 @@ object Mods {
|
||||
val Forestry = new SimpleMod(IDs.Forestry, version = "@[4.0,)")
|
||||
val ForgeMultipart = new SimpleMod(IDs.ForgeMultipart)
|
||||
val Galacticraft = new SimpleMod(IDs.Galacticraft)
|
||||
val GregTech = new ClassBasedMod(IDs.GregTech, "gregtech.api.GregTech_API")
|
||||
val GregTech = new ClassBasedMod(IDs.GregTech, "gregtech.api.GregTechAPI")
|
||||
val IndustrialCraft2 = new SimpleMod(IDs.IndustrialCraft2)
|
||||
val IndustrialCraft2Classic = new SimpleMod(IDs.IndustrialCraft2Classic)
|
||||
val IngameWiki = new SimpleMod(IDs.IngameWiki, version = "@[1.1.3,)")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user