diff --git a/.gitignore b/.gitignore index 92da0b3..be880e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,37 @@ -build .gradle -.vs -.git -.idea - +.settings +/.idea/ +/.vscode/ +/run/ +/build/ +/eclipse/ +.classpath +.project +/bin/ +/config/ +/crash-reports/ +/logs/ +options.txt +/saves/ +usernamecache.json +banned-ips.json +banned-players.json +eula.txt +ops.json +server.properties +servers.dat +usercache.json +whitelist.json +/out/ +*.iml +*.ipr +*.iws +*.bat +*.DS_Store +!gradlew.bat +.factorypath +addon.local.gradle +addon.local.gradle.kts +addon.late.local.gradle +addon.late.local.gradle.kts +layout.json diff --git a/CODEOWNERS b/CODEOWNERS deleted file mode 100644 index a6b5f68..0000000 --- a/CODEOWNERS +++ /dev/null @@ -1,3 +0,0 @@ -# Any Github changes require admin approval -/.github/** @GTNewHorizons/admin - diff --git a/LICENSE b/LICENSE index 0e259d4..6ca207e 100644 --- a/LICENSE +++ b/LICENSE @@ -119,3 +119,4 @@ express Statement of Purpose. d. Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work. + diff --git a/LICENSE-template b/LICENSE-template deleted file mode 100644 index 242da62..0000000 --- a/LICENSE-template +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/README.md b/README.md index 005797a..2b09d9b 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # CinderLoE + diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 9c58100..0000000 --- a/build.gradle +++ /dev/null @@ -1,159 +0,0 @@ -buildscript { - repositories { - mavenCentral() - maven { url "https://maven.minecraftforge.net" } - maven { - name = "GTNH Maven" - url = uri("https://nexus.gtnewhorizons.com/repository/public/") - } - maven { - name = "LegacyModdingMC" - url = uri("https://maven.legacy-modding.dev/releases") - } - } -} - -plugins { - id 'java' - id 'com.gtnewhorizons.retrofuturagradle' version '1.3.24' -} - -group = modGroup -version = modVersion -archivesBaseName = modName - -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) - } -} - -if (enableModernJavaSyntax.toBoolean()) { - dependencies { - annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0' - compileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') { - transitive = false - } - } - - tasks.withType(JavaCompile).configureEach { - sourceCompatibility = 17 - options.release.set(8) - - javaCompiler.set(javaToolchains.compilerFor { - languageVersion.set(JavaLanguageVersion.of(17)) - }) - } -} - -if (generateGradleTokenClass) { - tasks.named("injectTags").configure { - outputClassName.set(generateGradleTokenClass) - } - tasks.named("compileJava").configure { - dependsOn("injectTags") - } -} - -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - -minecraft { - mcVersion = minecraftVersion - username = developmentEnvironmentUserName - - if (gradleTokenModId) { - injectedTags.put gradleTokenModId, modId - } - if (gradleTokenModName) { - injectedTags.put gradleTokenModName, modName - } - if (gradleTokenVersion) { - injectedTags.put gradleTokenVersion, modVersion - } - if (gradleTokenGroupName) { - injectedTags.put gradleTokenGroupName, modGroup - } - - if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - extraRunJvmArguments.add("-Dmixin.env.disableRefMap=true ") - } - - if (coreModClass) { - extraRunJvmArguments.add("-Dfml.coreMods.load=${modGroup}.${coreModClass}") - } -} - -tasks.withType(JavaCompile).configureEach { - options.fork = true - - options.forkOptions.jvmArgs += [ - "-Dmixin.env.verbose=false", - "-Dmixin.debug=false" - ] - - options.compilerArgs += [ - "-AdisableOverwriteChecker=true", - "-Xlint:-deprecation", - "-Xlint:-unchecked" - ] -} - -repositories { - flatDir { dirs 'libs' } - - mavenCentral() - - maven { - url = uri("https://maven.minecraftforge.net") - } - - maven { - name = "GTNH Maven" - url = uri("https://nexus.gtnewhorizons.com/repository/public/") - } - - maven { - name = "LegacyModdingMC" - url = uri("https://maven.legacy-modding.dev/releases") - } -} - -dependencies { - implementation name: 'cindercore' - implementation name: 'lotr' - implementation name: 'optifine' - implementation name: 'variabletriggers' - implementation name: 'metweaks' - - if (usesMixins.toBoolean()) { - annotationProcessor("io.github.legacymoddingmc:unimixins:0.1.13:dev") - implementation(modUtils.enableMixins("io.github.legacymoddingmc:unimixins:0.1.13:dev", "mixins.${modId}.refmap.json")) - } -} - -jar { - manifest { - attributes( - "FMLCorePlugin": "${modGroup}.${coreModClass}", - "FMLCorePluginContainsFMLMod": "true", - "TweakClass": "org.spongepowered.asm.launch.MixinTweaker", - "MixinConfigs": "mixins.${modId}.json", - "ForceLoadAsMod": "true" - ) - } -} - -tasks.processResources { - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.mcVersion - - filesMatching("mcmod.info") { - expand( - "minecraftVersion": project.minecraft.mcVersion, - "modVersion": modVersion, - "modId": modId, - "modName": modName - ) - } -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..944a269 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,4 @@ + +plugins { + id("com.gtnewhorizons.gtnhconvention") +} diff --git a/dependencies.gradle b/dependencies.gradle new file mode 100644 index 0000000..b2a104b --- /dev/null +++ b/dependencies.gradle @@ -0,0 +1,42 @@ +/* + * Add your dependencies here. Supported configurations: + * - api("group:name:version:classifier"): if you use the types from this dependency in the public API of this mod + * Available at runtime and compiletime for mods depending on this mod + * - implementation("g:n:v:c"): if you need this for internal implementation details of the mod, but none of it is visible via the public API + * Available at runtime but not compiletime for mods depending on this mod + * - compileOnly("g:n:v:c"): if the mod you're building doesn't need this dependency during runtime at all, e.g. for optional mods + * Not available at all for mods depending on this mod, only visible at compiletime for this mod + * - compileOnlyApi("g:n:v:c"): like compileOnly, but also visible at compiletime for mods depending on this mod + * Available at compiletime but not runtime for mods depending on this mod + * - runtimeOnlyNonPublishable("g:n:v:c"): if you want to include a mod in this mod's runClient/runServer runs, but not publish it as a dependency + * Not available at all for mods depending on this mod, only visible at runtime for this mod + * - devOnlyNonPublishable("g:n:v:c"): a combination of runtimeOnlyNonPublishable and compileOnly for dependencies present at both compiletime and runtime, + * but not published as Maven dependencies - useful for RFG-deobfuscated dependencies or local testing + * - runtimeOnly("g:n:v:c"): if you don't need this at compile time, but want it to be present at runtime + * Available at runtime for mods depending on this mod + * - annotationProcessor("g:n:v:c"): mostly for java compiler plugins, if you know you need this, use it, otherwise don't worry + * - testCONFIG("g:n:v:c") - replace CONFIG by one of the above (except api), same as above but for the test sources instead of main + * + * - shadowImplementation("g:n:v:c"): effectively the same as API, but the dependency is included in your jar under a renamed package name + * Requires you to enable usesShadowedDependencies in gradle.properties + * + * - compile("g:n:v:c"): deprecated, replace with "api" (works like the old "compile") or "implementation" (can be more efficient) + * + * You can exclude transitive dependencies (dependencies of the chosen dependency) by appending { transitive = false } if needed, + * but use this sparingly as it can break using your mod as another mod's dependency if you're not careful. + * + * To depend on obfuscated jars you can use `devOnlyNonPublishable(rfg.deobf("dep:spec:1.2.3"))` to fetch an obfuscated jar from maven, + * or `devOnlyNonPublishable(rfg.deobf(project.files("libs/my-mod-jar.jar")))` to use a file. + * + * Gradle names for some of the configuration can be misleading, compileOnlyApi and runtimeOnly both get published as dependencies in Maven, but compileOnly does not. + * The buildscript adds runtimeOnlyNonPublishable to also have a runtime dependency that's not published. + * + * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph + */ +dependencies { + devOnlyNonPublishable(rfg.deobf(project.files("libs/lotr.jar"))) + devOnlyNonPublishable(rfg.deobf(project.files("libs/cindercore.jar"))) + devOnlyNonPublishable(rfg.deobf(project.files("libs/metweaks.jar"))) + devOnlyNonPublishable(rfg.deobf(project.files("libs/optifine.jar"))) + devOnlyNonPublishable(rfg.deobf(project.files("libs/variabletriggers.jar"))) +} diff --git a/gradle.properties b/gradle.properties index 024bb8e..a359726 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,11 @@ modName = CinderLoE modVersion = 1.6.0 +version = 1.6.0 modId = cinder_loe modGroup = com.zivilon.cinder_loe minecraftVersion = 1.7.10 +forgeVersion = 10.13.4.1614 developmentEnvironmentUserName = Developer @@ -29,3 +31,39 @@ forceEnableMixins = false # Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older # projects. New projects should not use this parameter. customArchiveBaseName = CinderLoE + +mixinsPackage = mixins +coreModClass = coremod.CoreMod + +disableSpotless = true +disableCheckstyle = true + +gtnh.settings.blowdryerTag = 0.2.2 +useModGroupForPublishing = false +autoUpdateBuildScript = false +channel = stable +mappingsVersion = 12 +remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/ +developmentEnvironmentUserName = Developer +enableModernJavaSyntax = true +enableGenericInjection = true +replaceGradleTokenInFile = +apiPackage = +accessTransformersFile = +separateMixinSourceSet = +usesMixinDebug = false +mixinPlugin = +containsMixinsAndOrCoreModOnly = false +forceEnableMixins = false +usesShadowedDependencies = false +minimizeShadowedDependencies = true +relocateShadowedDependencies = true +includeWellKnownRepositories = false +excludeWellKnownRepositories = +usesMavenPublishing = false +modrinthProjectId = +modrinthRelations = +curseForgeProjectId = +curseForgeRelations = +org.gradle.configuration-cache = true +org.gradle.parallel = true diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties new file mode 100644 index 0000000..b30b550 --- /dev/null +++ b/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,12 @@ +#This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/46949723aaa20c7b64d7ecfed7207034/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d6690dfd71c4c91e08577437b5b2beb0/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3cd7045fca9a72cd9bc7d14a385e594c/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/552c7bffe0370c66410a51c55985b511/redirect +toolchainVersion=25 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 033e24c..f8e1ee3 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 9f4197d..23449a2 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.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index fcb6fca..adff685 100755 --- 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. @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/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/. @@ -83,7 +85,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# 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\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -111,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -144,7 +146,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +154,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -169,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" ) @@ -201,16 +202,15 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..c4bdd3a 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +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 @@ -57,22 +59,21 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +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 :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/repositories.gradle b/repositories.gradle index c884390..7e002f2 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -1,4 +1,4 @@ -// Add any additional repositories for your dependencies here +// Add any additional repositories for your dependencies here. repositories { diff --git a/run/natives/lwjgl2/OpenAL32.dll b/run/natives/lwjgl2/OpenAL32.dll deleted file mode 100644 index 1f69e94..0000000 Binary files a/run/natives/lwjgl2/OpenAL32.dll and /dev/null differ diff --git a/run/natives/lwjgl2/OpenAL64.dll b/run/natives/lwjgl2/OpenAL64.dll deleted file mode 100644 index 6f2a2fe..0000000 Binary files a/run/natives/lwjgl2/OpenAL64.dll and /dev/null differ diff --git a/run/natives/lwjgl2/avutil-ttv-51.dll b/run/natives/lwjgl2/avutil-ttv-51.dll deleted file mode 100644 index fc9a3a5..0000000 Binary files a/run/natives/lwjgl2/avutil-ttv-51.dll and /dev/null differ diff --git a/run/natives/lwjgl2/libmfxsw64.dll b/run/natives/lwjgl2/libmfxsw64.dll deleted file mode 100644 index 8314f02..0000000 Binary files a/run/natives/lwjgl2/libmfxsw64.dll and /dev/null differ diff --git a/run/natives/lwjgl2/libmp3lame-ttv.dll b/run/natives/lwjgl2/libmp3lame-ttv.dll deleted file mode 100644 index 803ad5a..0000000 Binary files a/run/natives/lwjgl2/libmp3lame-ttv.dll and /dev/null differ diff --git a/run/natives/lwjgl2/lwjgl.dll b/run/natives/lwjgl2/lwjgl.dll deleted file mode 100644 index 6e9b49d..0000000 Binary files a/run/natives/lwjgl2/lwjgl.dll and /dev/null differ diff --git a/run/natives/lwjgl2/lwjgl64.dll b/run/natives/lwjgl2/lwjgl64.dll deleted file mode 100644 index 3c9b8e9..0000000 Binary files a/run/natives/lwjgl2/lwjgl64.dll and /dev/null differ diff --git a/run/natives/lwjgl2/swresample-ttv-0.dll b/run/natives/lwjgl2/swresample-ttv-0.dll deleted file mode 100644 index a7729c1..0000000 Binary files a/run/natives/lwjgl2/swresample-ttv-0.dll and /dev/null differ diff --git a/run/natives/lwjgl2/twitchsdk.dll b/run/natives/lwjgl2/twitchsdk.dll deleted file mode 100644 index f21d426..0000000 Binary files a/run/natives/lwjgl2/twitchsdk.dll and /dev/null differ diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index e334397..0000000 --- a/settings.gradle +++ /dev/null @@ -1,28 +0,0 @@ - -pluginManagement { - repositories { - maven { - // RetroFuturaGradle - name "GTNH Maven" - url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" - allowInsecureProtocol = true - mavenContent { - includeGroup("com.gtnewhorizons.retrofuturagradle") - } - } - gradlePluginPortal() - mavenCentral() - mavenLocal() - } -} - -plugins { - id 'com.diffplug.blowdryerSetup' version '1.6.0' - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0' // Provides java toolchains -} - -blowdryerSetup { - repoSubfolder 'gtnhShared' - github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.2') - //devLocal '.' // Use this when testing config updates locally -} diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..7239a9e --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,21 @@ + +pluginManagement { + repositories { + maven { + // RetroFuturaGradle + name = "GTNH Maven" + url = uri("https://nexus.gtnewhorizons.com/repository/public/") + mavenContent { + includeGroup("com.gtnewhorizons") + includeGroupByRegex("com\\.gtnewhorizons\\..+") + } + } + gradlePluginPortal() + mavenCentral() + mavenLocal() + } +} + +plugins { + id("com.gtnewhorizons.gtnhsettingsconvention") version("2.0.7") +} diff --git a/src/main/java/com/zivilon/cinder_loe/blocks/MistBlock.java b/src/main/java/com/zivilon/cinder_loe/blocks/MistBlock.java index 80fe590..100c792 100644 --- a/src/main/java/com/zivilon/cinder_loe/blocks/MistBlock.java +++ b/src/main/java/com/zivilon/cinder_loe/blocks/MistBlock.java @@ -50,7 +50,6 @@ public class MistBlock extends LOTRBlockUtumnoPortal { return (TileEntity)new TileEntityMistBlock(color_red, color_green, color_blue); } - @Override public void func_149670_a(World world, int i, int j, int k, Entity entity) {} } diff --git a/src/main/java/com/zivilon/cinder_loe/mixins/lotr/client/render/tileentity/MixinLOTRRenderArmorStand.java b/src/main/java/com/zivilon/cinder_loe/mixins/lotr/client/render/tileentity/MixinLOTRRenderArmorStand.java index aab91db..e3c9840 100644 --- a/src/main/java/com/zivilon/cinder_loe/mixins/lotr/client/render/tileentity/MixinLOTRRenderArmorStand.java +++ b/src/main/java/com/zivilon/cinder_loe/mixins/lotr/client/render/tileentity/MixinLOTRRenderArmorStand.java @@ -79,7 +79,7 @@ public abstract class MixinLOTRRenderArmorStand extends TileEntitySpecialRendere LOTRArmorModels.INSTANCE.setupModelForRender(modelBipedMain, null, (EntityLivingBase)fakeArmorStandEntity); GL11.glTranslatef(0.0F, -0.1875F, 0.0F); for (int slot = 0; slot < 4; slot++) { - ItemStack itemstack = armorStand.func_70301_a(slot); + ItemStack itemstack = armorStand.getStackInSlot(slot); if (itemstack != null && (itemstack.getItem() instanceof ItemArmor || itemstack.getItem() instanceof lotr.common.item.LOTRItemPlate)) { boolean isArmor = itemstack.getItem() instanceof ItemArmor; if (isArmor) diff --git a/src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/inventory/MixinLOTRContainerAnvil.java b/src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/inventory/MixinLOTRContainerAnvil.java index 813f13a..baf5dea 100644 --- a/src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/inventory/MixinLOTRContainerAnvil.java +++ b/src/main/java/com/zivilon/cinder_loe/mixins/lotr/common/inventory/MixinLOTRContainerAnvil.java @@ -191,7 +191,7 @@ public abstract class MixinLOTRContainerAnvil { ItemStack inputCopy = inputItem.copy(); ItemStack combinerItem = this.invInput.getStackInSlot(1); ItemStack materialItem = this.isTrader ? null : this.invInput.getStackInSlot(2); - Map inputEnchants = EnchantmentHelper.getEnchantments(inputCopy); + Map inputEnchants = EnchantmentHelper.getEnchantments(inputCopy); boolean enchantingWithBook = false; List inputModifiers = LOTREnchantmentHelper.getEnchantList(inputCopy); baseAnvilCost = LOTREnchantmentHelper.getAnvilCost(inputItem) + ((combinerItem == null) ? 0 : LOTREnchantmentHelper.getAnvilCost(combinerItem)); @@ -294,7 +294,7 @@ public abstract class MixinLOTRContainerAnvil { this.materialCost = 0; return; } - Map outputEnchants = new HashMap(inputEnchants); + Map outputEnchants = new HashMap(inputEnchants); if (LOTRConfig.enchantingVanilla) { Map combinerEnchants = EnchantmentHelper.getEnchantments(combinerItem); for (Object obj : combinerEnchants.keySet()) { diff --git a/src/main/java/com/zivilon/cinder_loe/tileentity/TileEntityMistBlock.java b/src/main/java/com/zivilon/cinder_loe/tileentity/TileEntityMistBlock.java index 0f2f3c2..116a069 100644 --- a/src/main/java/com/zivilon/cinder_loe/tileentity/TileEntityMistBlock.java +++ b/src/main/java/com/zivilon/cinder_loe/tileentity/TileEntityMistBlock.java @@ -54,7 +54,6 @@ public class TileEntityMistBlock extends LOTRTileEntityUtumnoPortal { this.color_blue = nbt.getFloat("blue"); } - @Override public void func_145845_h() {} @Override