diff --git a/Common/src/main/java/terrablender/mixin/MixinMultiNoiseBiomeSource.java b/Common/src/main/java/terrablender/mixin/MixinMultiNoiseBiomeSource.java index 50faae0..1a77137 100644 --- a/Common/src/main/java/terrablender/mixin/MixinMultiNoiseBiomeSource.java +++ b/Common/src/main/java/terrablender/mixin/MixinMultiNoiseBiomeSource.java @@ -51,6 +51,6 @@ public void addDebugInfo(List debugLines, BlockPos pos, Climate.Sampler int qx = QuartPos.fromBlock(pos.getX()); int qz = QuartPos.fromBlock(pos.getZ()); IExtendedParameterList> extension = (IExtendedParameterList>) this.parameters(); - debugLines.add("Region: " + extension.getRegion(extension.getUniqueness(qx, 0, qz)).getName().toString()); + if (extension.isInitialized()) debugLines.add("Region: " + extension.getRegion(extension.getUniqueness(qx, 0, qz)).getName().toString()); } } diff --git a/Common/src/main/java/terrablender/mixin/MixinParameterList.java b/Common/src/main/java/terrablender/mixin/MixinParameterList.java index c26fdea..63020df 100644 --- a/Common/src/main/java/terrablender/mixin/MixinParameterList.java +++ b/Common/src/main/java/terrablender/mixin/MixinParameterList.java @@ -63,7 +63,7 @@ public void initializeForTerraBlender(RegistryAccess registryAccess, RegionType this.uniqueness = LayeredNoiseUtil.uniqueness(registryAccess, regionType, seed); this.uniqueTrees = new SearchTreeEntry[Regions.getCount(regionType)]; - Registry biomeRegistry = registryAccess.registryOrThrow(Registries.BIOME); + Registry biomeRegistry = registryAccess.lookupOrThrow(Registries.BIOME); for (Region region : Regions.get(regionType)) { @@ -76,10 +76,10 @@ public void initializeForTerraBlender(RegistryAccess registryAccess, RegionType } else { - List>> pairs = new ArrayList<>(); + List>> pairs = new ArrayList<>(); region.addBiomes(biomeRegistry, pair -> { - if (biomeRegistry.getHolder(pair.getSecond()).isPresent()) - pairs.add(pair.mapSecond(biomeRegistry::getHolderOrThrow)); + if (biomeRegistry.containsKey(pair.getSecond())) + pairs.add(pair.mapSecond(biomeRegistry::getOrThrow)); }); // We can't create an RTree if there are no values present. diff --git a/Common/src/main/java/terrablender/mixin/MixinTheEndBiomeSource.java b/Common/src/main/java/terrablender/mixin/MixinTheEndBiomeSource.java index 765963f..57427b5 100644 --- a/Common/src/main/java/terrablender/mixin/MixinTheEndBiomeSource.java +++ b/Common/src/main/java/terrablender/mixin/MixinTheEndBiomeSource.java @@ -71,7 +71,7 @@ public class MixinTheEndBiomeSource implements IExtendedTheEndBiomeSource @Override public void initializeForTerraBlender(RegistryAccess registryAccess, long seed) { - this.biomeRegistry = registryAccess.registryOrThrow(Registries.BIOME); + this.biomeRegistry = registryAccess.lookupOrThrow(Registries.BIOME); var highlands = EndBiomeRegistry.getHighlandsBiomes(); var midlands = EndBiomeRegistry.getMidlandsBiomes(); @@ -93,7 +93,7 @@ public void initializeForTerraBlender(RegistryAccess registryAccess, long seed) throw new RuntimeException("Biome " + key + " has not been registered!"); }); - this.tbPossibleBiomes = allBiomes.stream().map(biomeRegistry::getHolderOrThrow).collect(Collectors.toSet()); + this.tbPossibleBiomes = allBiomes.stream().map(biomeRegistry::getOrThrow).collect(Collectors.toSet()); this.highlandsArea = LayeredNoiseUtil.biomeArea(registryAccess, seed, TerraBlender.CONFIG.endHighlandsBiomeSize, highlands); this.midlandsArea = LayeredNoiseUtil.biomeArea(registryAccess, seed, TerraBlender.CONFIG.endMidlandsBiomeSize, midlands); this.edgeArea = LayeredNoiseUtil.biomeArea(registryAccess, seed, TerraBlender.CONFIG.endEdgeBiomeSize, edge); @@ -154,6 +154,6 @@ else if (heightNoise >= -0.0625) @Unique private Holder getBiomeHolder(int id) { - return this.biomeRegistry.getHolder(id).orElseThrow(); + return this.biomeRegistry.get(id).orElseThrow(); } } diff --git a/Common/src/main/java/terrablender/util/LevelUtils.java b/Common/src/main/java/terrablender/util/LevelUtils.java index eee1809..27a5bb4 100644 --- a/Common/src/main/java/terrablender/util/LevelUtils.java +++ b/Common/src/main/java/terrablender/util/LevelUtils.java @@ -47,7 +47,7 @@ public class LevelUtils public static void initializeOnServerStart(MinecraftServer server) { RegistryAccess registryAccess = server.registryAccess(); - Registry levelStemRegistry = registryAccess.registryOrThrow(Registries.LEVEL_STEM); + Registry levelStemRegistry = registryAccess.lookupOrThrow(Registries.LEVEL_STEM); long seed = server.getWorldData().worldGenOptions().seed(); for (Map.Entry, LevelStem> entry : levelStemRegistry.entrySet()) @@ -112,11 +112,11 @@ public static void initializeBiomes(RegistryAccess registryAccess, Holder biomeRegistry = registryAccess.registryOrThrow(Registries.BIOME); + Registry biomeRegistry = registryAccess.lookupOrThrow(Registries.BIOME); ImmutableList.Builder> builder = ImmutableList.builder(); Regions.get(regionType).forEach(region -> region.addBiomes(biomeRegistry, pair -> { - if (biomeRegistry.getHolder(pair.getSecond()).isPresent()) - builder.add(biomeRegistry.getHolderOrThrow(pair.getSecond())); + if (biomeRegistry.containsKey(pair.getSecond())) + builder.add(biomeRegistry.getOrThrow(pair.getSecond())); })); biomeSourceEx.appendDeferredBiomesList(builder.build()); diff --git a/Common/src/main/java/terrablender/worldgen/noise/BiomeInitialLayer.java b/Common/src/main/java/terrablender/worldgen/noise/BiomeInitialLayer.java index 55b546f..093cbb1 100644 --- a/Common/src/main/java/terrablender/worldgen/noise/BiomeInitialLayer.java +++ b/Common/src/main/java/terrablender/worldgen/noise/BiomeInitialLayer.java @@ -21,7 +21,7 @@ public class BiomeInitialLayer extends WeightedRandomLayer>> entries) { super(entries); - this.biomeRegistry = registryAccess.registryOrThrow(Registries.BIOME); + this.biomeRegistry = registryAccess.lookupOrThrow(Registries.BIOME); } @Override @@ -41,6 +41,6 @@ private int resolveId(ResourceKey key) if (!this.biomeRegistry.containsKey(key)) throw new RuntimeException("Attempted to resolve id for unregistered biome " + key); - return this.biomeRegistry.getId(this.biomeRegistry.get(key)); + return this.biomeRegistry.getId(this.biomeRegistry.get(key).get().value()); } } diff --git a/Common/src/main/java/terrablender/worldgen/noise/InitialLayer.java b/Common/src/main/java/terrablender/worldgen/noise/InitialLayer.java index d07aae1..6be3449 100644 --- a/Common/src/main/java/terrablender/worldgen/noise/InitialLayer.java +++ b/Common/src/main/java/terrablender/worldgen/noise/InitialLayer.java @@ -50,7 +50,7 @@ protected int getEntryIndex(WeightedEntry.Wrapper entry) private static List> createEntries(RegistryAccess registryAccess, RegionType regionType) { - Registry biomeRegistry = registryAccess.registryOrThrow(Registries.BIOME); + Registry biomeRegistry = registryAccess.lookupOrThrow(Registries.BIOME); return Regions.get(regionType).stream().filter(region -> { AtomicBoolean biomesAdded = new AtomicBoolean(false); region.addBiomes(biomeRegistry, pair -> biomesAdded.set(true)); diff --git a/Common/src/main/resources/data/terrablender/worldgen/biome/deferred_placeholder.json b/Common/src/main/resources/data/terrablender/worldgen/biome/deferred_placeholder.json index 3acb10c..699a21e 100644 --- a/Common/src/main/resources/data/terrablender/worldgen/biome/deferred_placeholder.json +++ b/Common/src/main/resources/data/terrablender/worldgen/biome/deferred_placeholder.json @@ -1,5 +1,5 @@ { - "carvers": {}, + "carvers": [], "downfall": 0.5, "effects": { "fog_color": 12638463, diff --git a/Fabric/build.gradle b/Fabric/build.gradle index 657f4d2..6d9ce41 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -1,5 +1,5 @@ plugins { - id "fabric-loom" version "1.6-SNAPSHOT" + id "fabric-loom" version "1.8-SNAPSHOT" id "com.matthewprenger.cursegradle" version "1.4.0" id "com.modrinth.minotaur" version "2.+" } diff --git a/gradle.properties b/gradle.properties index 29e750b..b6a59c1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,20 +3,20 @@ group=com.github.glitchfiend release_channel=beta # Common -minecraft_version=1.21.1 +minecraft_version=1.21.3 common_runs_enabled=false common_client_run_name=Common Client common_server_run_name=Common Server # Forge -forge_version=52.0.8 +forge_version=53.0.2 # NeoForge -neoforge_version=21.1.23 +neoforge_version=21.3.3-beta # Fabric -fabric_version=0.102.1+1.21.1 -fabric_loader_version=0.16.2 +fabric_version=0.107.0+1.21.3 +fabric_loader_version=0.16.8 # Mod options mod_name=TerraBlender diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a441313..9355b41 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.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME