FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-15 00:14:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Fix checkstyle issues missed after merging.

Browse source
This commit is contained in:
modmuss50 2022-03-03 18:36:57 +00:00
parent ca4be9c944
commit 801ec85b51
2 changed files with 6 additions and 8 deletions
fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome
TheEndBiomeData.java
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader
ResourceManagerHelperImpl.java

10
fabric-biome-api-v1/src/main/java/net/fabricmc/fabric/impl/biome/TheEndBiomeData.java
View file

@ -114,7 +114,7 @@ public final class TheEndBiomeData {
private Map<RegistryEntry<Biome>, WeightedPicker<RegistryEntry<Biome>>> resolveOverrides(Registry<Biome> biomeRegistry, Map<RegistryKey<Biome>, WeightedPicker<RegistryKey<Biome>>> overrides) {
var result = new IdentityHashMap<RegistryEntry<Biome>, WeightedPicker<RegistryEntry<Biome>>>(overrides.size());
for (var entry : overrides.entrySet()) {
for (Map.Entry<RegistryKey<Biome>, WeightedPicker<RegistryKey<Biome>>> entry : overrides.entrySet()) {
result.put(biomeRegistry.entryOf(entry.getKey()), entry.getValue().map(biomeRegistry::entryOf));
}
@ -128,19 +128,19 @@ public final class TheEndBiomeData {
// seems to make custom biomes too hard to find.
if (vanillaBiome == endMidlands || vanillaBiome == endBarrens) {
// Since the highlands picker is statically populated by InternalBiomeData, picker will never be null.
var highlandsPicker = endBiomesMap.get(endHighlands);
WeightedPicker<RegistryEntry<Biome>> highlandsPicker = endBiomesMap.get(endHighlands);
RegistryEntry<Biome> highlandsKey = highlandsPicker.pickFromNoise(sampler, x / 64.0, 0, z / 64.0);
if (vanillaBiome == endMidlands) {
var midlandsPicker = endMidlandsMap.get(highlandsKey);
WeightedPicker<RegistryEntry<Biome>> midlandsPicker = endMidlandsMap.get(highlandsKey);
replacementKey = (midlandsPicker == null) ? vanillaBiome : midlandsPicker.pickFromNoise(sampler, x / 64.0, 0, z / 64.0);
} else {
var barrensPicker = endBarrensMap.get(highlandsKey);
WeightedPicker<RegistryEntry<Biome>> barrensPicker = endBarrensMap.get(highlandsKey);
replacementKey = (barrensPicker == null) ? vanillaBiome : barrensPicker.pickFromNoise(sampler, x / 64.0, 0, z / 64.0);
}
} else {
// Since the main island and small islands pickers are statically populated by InternalBiomeData, picker will never be null.
var picker = endBiomesMap.get(vanillaBiome);
WeightedPicker<RegistryEntry<Biome>> picker = endBiomesMap.get(vanillaBiome);
replacementKey = picker.pickFromNoise(sampler, x / 64.0, 0, z / 64.0);
}

4
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ResourceManagerHelperImpl.java
View file

@ -16,8 +16,6 @@
package net.fabricmc.fabric.impl.resource.loader;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@ -30,8 +28,8 @@ import java.util.Set;
import java.util.function.Consumer;
import com.google.common.collect.Lists;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.minecraft.resource.ResourcePackProfile;
import net.minecraft.resource.ResourcePackSource;