diff --git a/.github/scripts/test_no_error_reports b/.github/scripts/test_no_error_reports deleted file mode 100755 index 1fcc739..0000000 --- a/.github/scripts/test_no_error_reports +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env bash - -# bashsupport disable=BP5006 # Global environment variables -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 -crash_reports=("$RUNDIR/$CRASH/crash"*.txt) - -# if array not empty there are crash_reports -if [ "${#crash_reports[@]}" -gt 0 ]; then - # get the latest crash_report from array - 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:\n' - 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 --perl-regexp --only-matching '.+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/.gitignore b/.gitignore index 75c41f6..38d39a4 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ src/main/resources/mixins.*.json *.bat *.DS_Store !gradlew.bat +layout.json diff --git a/dependencies.gradle b/dependencies.gradle index 9a49596..6b35e3d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,14 +1,14 @@ // Add your dependencies here dependencies { - compile('com.github.GTNewHorizons:ForestryMC:4.10.1:dev') + api('com.github.GTNewHorizons:ForestryMC:4.10.3:dev') - compileOnly('com.github.GTNewHorizons:BloodMagic:1.7.0:dev') - compileOnly('com.github.GTNewHorizons:ThaumicHorizons:1.6.5:dev') + compileOnly('com.github.GTNewHorizons:BloodMagic:1.7.5:dev') + compileOnly('com.github.GTNewHorizons:ThaumicHorizons:1.7.1:dev') compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:Botania:1.12.3-GTNH:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:Botania:1.12.5-GTNH:api') {transitive = false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.40:dev') - compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.0-GTNH:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.153:dev') + compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.6-GTNH:dev') } diff --git a/gradle.properties b/gradle.properties index 75937f3..d1a512f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -50,10 +50,10 @@ enableGenericInjection = false # Generate a class with a String field for the mod version named as defined below. # If generateGradleTokenClass is empty or not missing, no such class will be generated. # If gradleTokenVersion is empty or missing, the field will not be present in the class. -generateGradleTokenClass = +generateGradleTokenClass = magicbees.Tags # Name of the token containing the project's current version to generate/replace. -gradleTokenVersion = GRADLETOKEN_VERSION +gradleTokenVersion = VERSION # [DEPRECATED] Mod ID replacement token. gradleTokenModId = @@ -70,7 +70,7 @@ gradleTokenGroupName = # 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 = VersionInfo.java +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. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c8..e18bc25 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradlew b/gradlew index f5feea6..f3b75f3 100755 --- a/gradlew +++ b/gradlew @@ -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 diff --git a/jitpack.yml b/jitpack.yml deleted file mode 100644 index 09bbb51..0000000 --- a/jitpack.yml +++ /dev/null @@ -1,2 +0,0 @@ -before_install: - - ./gradlew setupCIWorkspace \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 0147a99..39d96f7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.33' } diff --git a/src/main/java/magicbees/main/utils/VersionInfo.java b/src/main/java/magicbees/main/utils/VersionInfo.java index 92ce70c..9aa5da1 100644 --- a/src/main/java/magicbees/main/utils/VersionInfo.java +++ b/src/main/java/magicbees/main/utils/VersionInfo.java @@ -1,5 +1,7 @@ package magicbees.main.utils; +import magicbees.Tags; + /** * Using some of the VersionInfo code from cofh. (Thanks, Lemming!) * @@ -8,7 +10,7 @@ package magicbees.main.utils; public class VersionInfo { public static final String ModName = "MagicBees"; - public static final String Version = "GRADLETOKEN_VERSION"; + public static final String Version = Tags.VERSION; public static final String GUI_FACTORY_CLASS = "magicbees.client.gui.GuiFactory"; public static final String Logo = "/gfx/magicbees/logo.png"; public static final String Depends = "required-after:Forestry@[4.2.5,);after:Baubles;after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:RedstoneArsenal;after:AWWayofTime;after:Botania;after:appliedenergistics2";