diff --git a/build.gradle b/build.gradle index 22536ea2d2..4a8a4a50d1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java-library' id 'maven-publish' - id 'net.neoforged.moddev' version '2.0.141' + id 'net.neoforged.moddev' version '2.0.148' id 'idea' id 'org.moddedmc.wiki.toolkit' version '0.4.1' id "me.modmuss50.mod-publish-plugin" version "2.2.0" diff --git a/gradle.properties b/gradle.properties index c59e62bb94..1ca687785e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ minecraft_version=26.1.2 # as they do not follow standard versioning conventions. minecraft_version_range=[26.1.2] # The Neo version must agree with the Minecraft version to get a valid artifact -neo_version=26.1.2.109 +neo_version=26.1.2.114 ## Mod Properties @@ -42,7 +42,7 @@ space_age_mod_group_id=rearth.oritech.spaceage geckolib_version = 5.5.1 # runtime testing mods -jei_version = 29.20.0.53 +jei_version = 29.43.0.106 wiki_exporter_version = 2.3.0+26.1.2 # datagen dep mods diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55baa..b1b8ef56b4 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 a351597e62..a9db11550c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,6 +2,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 23d15a9367..249efbb032 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index db3a6ac207..a51ec4f588 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -19,12 +19,12 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,30 +65,18 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line -set CLASSPATH= -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/space-age/build.gradle b/space-age/build.gradle index cf74047307..bfce96ca54 100644 --- a/space-age/build.gradle +++ b/space-age/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java-library' id 'maven-publish' - id 'net.neoforged.moddev' version '2.0.141' + id 'net.neoforged.moddev' version '2.0.148' id 'idea' id 'checkstyle' } diff --git a/src/main/java/rearth/oritech/init/compat/jei/OritechJeiAtomicForgeRecipe.java b/src/main/java/rearth/oritech/init/compat/jei/OritechJeiAtomicForgeRecipe.java index e15dac7b9d..d1ef9036f2 100644 --- a/src/main/java/rearth/oritech/init/compat/jei/OritechJeiAtomicForgeRecipe.java +++ b/src/main/java/rearth/oritech/init/compat/jei/OritechJeiAtomicForgeRecipe.java @@ -39,13 +39,13 @@ final class OritechJeiAtomicForgeRecipe extends AbstractRecipeCategory holder, IFocusGroup focuses) { // Show the forge being charged from both sides. One laser is enough; additional input only makes it faster. - builder.addDrawable(endericLaser, 45, 3); + builder.addDrawableWidget(endericLaser).setPosition(45, 3); builder.addText(Component.literal("→"), 10, 10).setPosition(64, 6); - builder.addDrawable(atomicForge, 77, 3); + builder.addDrawableWidget(atomicForge).setPosition(77, 3); builder.addText(Component.literal("←"), 10, 10).setPosition(97, 6); - builder.addDrawable(endericLaser, 109, 3); + builder.addDrawableWidget(endericLaser).setPosition(109, 3); - builder.addAnimatedRecipeArrow(40).setPosition(70, 37); + builder.addAnimatedRecipeArrowWidget(40).setPosition(70, 37); var totalEnergy = (long) OritechConfig.processingMachines.atomicForgeData.energyPerTick.get() * holder.value().time(); diff --git a/src/main/java/rearth/oritech/init/compat/jei/OritechJeiBedrockExtractorRecipe.java b/src/main/java/rearth/oritech/init/compat/jei/OritechJeiBedrockExtractorRecipe.java index 326cad9867..581aa4011b 100644 --- a/src/main/java/rearth/oritech/init/compat/jei/OritechJeiBedrockExtractorRecipe.java +++ b/src/main/java/rearth/oritech/init/compat/jei/OritechJeiBedrockExtractorRecipe.java @@ -29,7 +29,7 @@ final class OritechJeiBedrockExtractorRecipe extends AbstractRecipeCategory recipe, IFocusGroup focuses) { - builder.addAnimatedRecipeArrow(40).setPosition(65, 20); + builder.addAnimatedRecipeArrowWidget(40).setPosition(65, 20); builder.addText(Component.translatable("emi.title.oritech.bedrock_extractor_placement"), WIDTH - 4, 10) .setPosition(2, 60); builder.addText(Component.translatable("emi.title.oritech.bedrock_extractor_infinite"), WIDTH - 4, 10) diff --git a/src/main/java/rearth/oritech/init/compat/jei/OritechJeiLaserRecipe.java b/src/main/java/rearth/oritech/init/compat/jei/OritechJeiLaserRecipe.java index 23eb28a1ec..4d4ca052a4 100644 --- a/src/main/java/rearth/oritech/init/compat/jei/OritechJeiLaserRecipe.java +++ b/src/main/java/rearth/oritech/init/compat/jei/OritechJeiLaserRecipe.java @@ -39,8 +39,8 @@ final class OritechJeiLaserRecipe extends AbstractRecipeCategory recipe, IFocusGroup focuses) { - builder.addDrawable(laserBackground, 10, 5); - builder.addAnimatedRecipeArrow(40).setPosition(105, 15); + builder.addDrawableWidget(laserBackground).setPosition(10, 5); + builder.addAnimatedRecipeArrowWidget(40).setPosition(105, 15); } @Override diff --git a/src/main/java/rearth/oritech/init/compat/jei/OritechJeiParticleCollisionRecipe.java b/src/main/java/rearth/oritech/init/compat/jei/OritechJeiParticleCollisionRecipe.java index 9b0b94f39c..9320002838 100644 --- a/src/main/java/rearth/oritech/init/compat/jei/OritechJeiParticleCollisionRecipe.java +++ b/src/main/java/rearth/oritech/init/compat/jei/OritechJeiParticleCollisionRecipe.java @@ -29,7 +29,7 @@ final class OritechJeiParticleCollisionRecipe extends AbstractRecipeCategory holder, IFocusGroup focuses) { - builder.addAnimatedRecipeArrow(40).setPosition(57, 24); + builder.addAnimatedRecipeArrowWidget(40).setPosition(57, 24); builder.addText( Component.translatable("emi.title.oritech.collisionspeed", holder.value().time()), WIDTH - 4, 10 diff --git a/src/main/java/rearth/oritech/init/compat/jei/OritechJeiRecipeCategory.java b/src/main/java/rearth/oritech/init/compat/jei/OritechJeiRecipeCategory.java index 4ed95ebbd5..271ea58cf5 100644 --- a/src/main/java/rearth/oritech/init/compat/jei/OritechJeiRecipeCategory.java +++ b/src/main/java/rearth/oritech/init/compat/jei/OritechJeiRecipeCategory.java @@ -98,7 +98,7 @@ private static MachineBlockEntity createScreenProvider(Class holder, IFocusGroup focuses) { var recipe = holder.value(); - builder.addAnimatedRecipeArrow(40) + builder.addAnimatedRecipeArrowWidget(40) .setPosition(indicator.x() - GUI_SLOT_OFFSET_X, indicator.y() - GUI_SLOT_OFFSET_Y); var seconds = String.format("%.0f", recipe.time() / 20f); diff --git a/src/main/java/rearth/oritech/init/compat/jei/OritechJeiTaintedRefineryCreation.java b/src/main/java/rearth/oritech/init/compat/jei/OritechJeiTaintedRefineryCreation.java index bfe8ae02ff..f4e6da4549 100644 --- a/src/main/java/rearth/oritech/init/compat/jei/OritechJeiTaintedRefineryCreation.java +++ b/src/main/java/rearth/oritech/init/compat/jei/OritechJeiTaintedRefineryCreation.java @@ -25,7 +25,7 @@ final class OritechJeiTaintedRefineryCreation @Override public void createRecipeExtras(IRecipeExtrasBuilder builder, CreationInfo recipe, IFocusGroup focuses) { - builder.addAnimatedRecipeArrow(40).setPosition(50, 22); + builder.addAnimatedRecipeArrowWidget(40).setPosition(50, 22); builder.addText(Component.translatable("emi.title.oritech.tainted_creation_hint"), 156, 10) .setPosition(2, 62); builder.addText(Component.translatable("emi.title.oritech.tainted_creation_hint2"), 156, 10)