diff --git a/Common/src/main/java/terrablender/mixin/MixinBiomeSource.java b/Common/src/main/java/terrablender/mixin/MixinBiomeSource.java index 30df4d4..fe30f1c 100644 --- a/Common/src/main/java/terrablender/mixin/MixinBiomeSource.java +++ b/Common/src/main/java/terrablender/mixin/MixinBiomeSource.java @@ -17,23 +17,20 @@ */ package terrablender.mixin; -import com.google.common.collect.ImmutableList; import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet; import net.minecraft.core.Holder; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.BiomeResolver; import net.minecraft.world.level.biome.BiomeSource; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import terrablender.worldgen.IExtendedBiomeSource; +import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.function.Supplier; +import java.util.stream.Collectors; @Mixin(BiomeSource.class) public abstract class MixinBiomeSource implements BiomeResolver, IExtendedBiomeSource @@ -51,12 +48,11 @@ public void appendDeferredBiomesList(List> biomesToAppend) return; } - ImmutableList.Builder> builder = ImmutableList.builder(); - builder.addAll(this.possibleBiomes.get()); - builder.addAll(biomesToAppend); - ImmutableList> biomeList = builder.build().stream().distinct().collect(ImmutableList.toImmutableList()); + List> possibleBiomes = new ArrayList<>(); + possibleBiomes.addAll(this.possibleBiomes.get()); + possibleBiomes.addAll(biomesToAppend); - this.possibleBiomes = () -> new ObjectLinkedOpenHashSet<>(biomeList); + this.possibleBiomes = () -> new ObjectLinkedOpenHashSet<>(possibleBiomes.stream().distinct().collect(Collectors.toList())); this.hasAppended = true; } } diff --git a/Common/src/main/java/terrablender/mixin/MixinBuiltInRegistries.java b/Common/src/main/java/terrablender/mixin/MixinBuiltInRegistries.java index c304cb9..5846fdd 100644 --- a/Common/src/main/java/terrablender/mixin/MixinBuiltInRegistries.java +++ b/Common/src/main/java/terrablender/mixin/MixinBuiltInRegistries.java @@ -17,14 +17,12 @@ */ package terrablender.mixin; -import com.mojang.serialization.Codec; import com.mojang.serialization.Lifecycle; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.levelgen.SurfaceRules; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/Common/src/main/java/terrablender/mixin/MixinMultiNoiseBiomeSource.java b/Common/src/main/java/terrablender/mixin/MixinMultiNoiseBiomeSource.java index fe97558..7370ad8 100644 --- a/Common/src/main/java/terrablender/mixin/MixinMultiNoiseBiomeSource.java +++ b/Common/src/main/java/terrablender/mixin/MixinMultiNoiseBiomeSource.java @@ -19,10 +19,8 @@ import net.minecraft.core.Holder; import net.minecraft.world.level.biome.Biome; -import net.minecraft.world.level.biome.BiomeSource; import net.minecraft.world.level.biome.Climate; import net.minecraft.world.level.biome.MultiNoiseBiomeSource; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -30,10 +28,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import terrablender.worldgen.IExtendedParameterList; -import java.util.List; -import java.util.Set; -import java.util.function.Supplier; - @Mixin(MultiNoiseBiomeSource.class) public abstract class MixinMultiNoiseBiomeSource { diff --git a/Common/src/main/java/terrablender/mixin/MixinNoiseGeneratorSettings.java b/Common/src/main/java/terrablender/mixin/MixinNoiseGeneratorSettings.java index fe7916b..125ff71 100644 --- a/Common/src/main/java/terrablender/mixin/MixinNoiseGeneratorSettings.java +++ b/Common/src/main/java/terrablender/mixin/MixinNoiseGeneratorSettings.java @@ -27,7 +27,6 @@ import terrablender.api.RegionType; import terrablender.api.SurfaceRuleManager; import terrablender.worldgen.IExtendedNoiseGeneratorSettings; -import terrablender.worldgen.surface.NamespacedSurfaceRuleSource; @Mixin(NoiseGeneratorSettings.class) public class MixinNoiseGeneratorSettings implements IExtendedNoiseGeneratorSettings diff --git a/Common/src/main/java/terrablender/mixin/MixinParameterList.java b/Common/src/main/java/terrablender/mixin/MixinParameterList.java index 4d941f3..553199e 100644 --- a/Common/src/main/java/terrablender/mixin/MixinParameterList.java +++ b/Common/src/main/java/terrablender/mixin/MixinParameterList.java @@ -17,7 +17,6 @@ */ package terrablender.mixin; -import com.google.common.collect.ImmutableList; import com.mojang.datafixers.util.Pair; import net.minecraft.core.Holder; import net.minecraft.core.Registry; @@ -35,6 +34,7 @@ import terrablender.worldgen.noise.Area; import terrablender.worldgen.noise.LayeredNoiseUtil; +import java.util.ArrayList; import java.util.List; @Mixin(Climate.ParameterList.class) @@ -75,13 +75,12 @@ public void initializeForTerraBlender(RegistryAccess registryAccess, RegionType } else { - ImmutableList.Builder>> builder = ImmutableList.builder(); - region.addBiomes(biomeRegistry, pair -> builder.add(pair.mapSecond(biomeRegistry::getHolderOrThrow))); - ImmutableList>> uniqueValues = builder.build(); + List>> pairs = new ArrayList<>(); + region.addBiomes(biomeRegistry, pair -> pairs.add(pair.mapSecond(biomeRegistry::getHolderOrThrow))); // We can't create an RTree if there are no values present. - if (!uniqueValues.isEmpty()) - this.uniqueTrees[regionIndex] = Climate.RTree.create(uniqueValues); + if (!pairs.isEmpty()) + this.uniqueTrees[regionIndex] = Climate.RTree.create(pairs); } } diff --git a/Common/src/main/java/terrablender/mixin/MixinWorldOpenFlows.java b/Common/src/main/java/terrablender/mixin/MixinWorldOpenFlows.java index de9e2d9..b96cfe6 100644 --- a/Common/src/main/java/terrablender/mixin/MixinWorldOpenFlows.java +++ b/Common/src/main/java/terrablender/mixin/MixinWorldOpenFlows.java @@ -25,7 +25,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(WorldOpenFlows.class) public class MixinWorldOpenFlows diff --git a/Forge/build.gradle b/Forge/build.gradle index 23329ba..29840e9 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '6.0.+', changing: true classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT' } } diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml index 15515e3..a125ffa 100644 --- a/Forge/src/main/resources/META-INF/mods.toml +++ b/Forge/src/main/resources/META-INF/mods.toml @@ -1,6 +1,6 @@ modLoader="javafml" license="LGPLv3" -loaderVersion="[47,)" +loaderVersion="[48,)" issueTrackerURL="https://github.com/Glitchfiend/TerraBlender/issues" displayURL="https://www.curseforge.com/minecraft/mc-mods/terrablender" logoFile="tb_logo.png" @@ -15,6 +15,6 @@ logoFile="tb_logo.png" [[dependencies.terrablender]] modId="forge" mandatory=true - versionRange="[47.1.0,)" + versionRange="[48.0.24,)" ordering="NONE" side="BOTH" \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 6e28607..9487d4f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ common_client_run_name=Common Client common_server_run_name=Common Server # Forge -forge_version=48.0.1 +forge_version=48.0.24 forge_ats_enabled=true # Fabric diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..943f0cb 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 ae04661..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index c53aefa..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015-2021 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. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # 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"' @@ -143,12 +143,16 @@ fi 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 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -205,6 +209,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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