From 24ff5a04bfa14b771acae4de085e3a8fd174520b Mon Sep 17 00:00:00 2001 From: SD Date: Thu, 20 Aug 2020 16:20:09 +0530 Subject: [PATCH] Disabled blank biomes (for now) Changes to be committed: modified: src/main/java/org/dimdev/dimdoors/util/BlankBiomeBuilder.java modified: src/main/java/org/dimdev/dimdoors/world/ModBiomes.java modified: src/main/resources/data/dimdoors/dimension/dungeon_pockets.json modified: src/main/resources/data/dimdoors/dimension/personal_pockets.json modified: src/main/resources/data/dimdoors/dimension/public_pockets.json --- .../dimdoors/util/BlankBiomeBuilder.java | 18 +++++------ .../org/dimdev/dimdoors/world/ModBiomes.java | 30 +++++++++---------- .../dimdoors/dimension/dungeon_pockets.json | 2 +- .../dimdoors/dimension/personal_pockets.json | 2 +- .../dimdoors/dimension/public_pockets.json | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/main/java/org/dimdev/dimdoors/util/BlankBiomeBuilder.java b/src/main/java/org/dimdev/dimdoors/util/BlankBiomeBuilder.java index 88f5f455..23f458e7 100644 --- a/src/main/java/org/dimdev/dimdoors/util/BlankBiomeBuilder.java +++ b/src/main/java/org/dimdev/dimdoors/util/BlankBiomeBuilder.java @@ -20,24 +20,24 @@ public class BlankBiomeBuilder extends Biome.Builder { this.generationSettings(new GenerationSettings.Builder().surfaceBuilder(SurfaceBuilder.DEFAULT.method_30478(new TernarySurfaceConfig(Blocks.AIR.getDefaultState(), Blocks.AIR.getDefaultState(), Blocks.VOID_AIR.getDefaultState()))).build()) .precipitation(Biome.Precipitation.NONE) .category(Biome.Category.NONE) - .depth(0) + .depth(0.0F) .temperatureModifier(Biome.TemperatureModifier.NONE) - .downfall(0) - .effects(this.createEffect(this.white)) + .downfall(0.0F) + .effects(this.createEffect()) .scale(0) .temperature(0.8f) .temperatureModifier(null) .spawnSettings(new SpawnSettings.Builder().build()); } - private BiomeEffects createEffect(boolean white) { + private BiomeEffects createEffect() { BiomeEffects.Builder builder = new BiomeEffects.Builder() - .waterColor(white ? 0xFFFFFF : 0x000000) - .waterFogColor(white ? 0xFFFFFF : 0x000000) - .fogColor(white ? 0xFFFFFF : 0x000000) - .skyColor(white ? 0xFFFFFF : 0x808080) + .waterColor(this.white ? 0xFFFFFF : 0x000000) + .waterFogColor(this.white ? 0xFFFFFF : 0x000000) + .fogColor(this.white ? 0xFFFFFF : 0x000000) + .skyColor(this.white ? 0xFFFFFF : 0x808080) .grassColorModifier(BiomeEffects.GrassColorModifier.NONE); - if (white) builder.loopSound(ModSoundEvents.WHITE_VOID); +// if (this.white) builder.loopSound(ModSoundEvents.WHITE_VOID); return builder.build(); } } diff --git a/src/main/java/org/dimdev/dimdoors/world/ModBiomes.java b/src/main/java/org/dimdev/dimdoors/world/ModBiomes.java index a9c42676..dff45ed6 100644 --- a/src/main/java/org/dimdev/dimdoors/world/ModBiomes.java +++ b/src/main/java/org/dimdev/dimdoors/world/ModBiomes.java @@ -19,32 +19,32 @@ import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder; import net.minecraft.world.gen.surfacebuilder.TernarySurfaceConfig; public final class ModBiomes { - public static final RegistryKey PERSONAL_WHITE_VOID_KEY; - public static final RegistryKey PUBLIC_BLACK_VOID_KEY; - public static final RegistryKey DUNGEON_DANGEROUS_BLACK_VOID_KEY; +// public static final RegistryKey PERSONAL_WHITE_VOID_KEY; +// public static final RegistryKey PUBLIC_BLACK_VOID_KEY; +// public static final RegistryKey DUNGEON_DANGEROUS_BLACK_VOID_KEY; public static final RegistryKey LIMBO_KEY; - public static final Biome WHITE_VOID_BIOME; - public static final Biome BLACK_VOID_BIOME; - public static final Biome DANGEROUS_BLACK_VOID_BIOME; +// public static final Biome WHITE_VOID_BIOME; +// public static final Biome BLACK_VOID_BIOME; +// public static final Biome DANGEROUS_BLACK_VOID_BIOME; public static final Biome LIMBO_BIOME; public static void init() { int id = 1; id += BuiltinRegistries.BIOME.stream().count(); BuiltinBiomesAccessor.invokeRegister(id + 1, LIMBO_KEY, LIMBO_BIOME); - BuiltinBiomesAccessor.invokeRegister(id + 2, PERSONAL_WHITE_VOID_KEY, WHITE_VOID_BIOME); - BuiltinBiomesAccessor.invokeRegister(id + 3, PUBLIC_BLACK_VOID_KEY, BLACK_VOID_BIOME); - BuiltinBiomesAccessor.invokeRegister(id + 4, DUNGEON_DANGEROUS_BLACK_VOID_KEY, DANGEROUS_BLACK_VOID_BIOME); +// BuiltinBiomesAccessor.invokeRegister(id + 2, PERSONAL_WHITE_VOID_KEY, WHITE_VOID_BIOME); +// BuiltinBiomesAccessor.invokeRegister(id + 3, PUBLIC_BLACK_VOID_KEY, BLACK_VOID_BIOME); +// BuiltinBiomesAccessor.invokeRegister(id + 4, DUNGEON_DANGEROUS_BLACK_VOID_KEY, DANGEROUS_BLACK_VOID_BIOME); } static { - PERSONAL_WHITE_VOID_KEY = RegistryKey.of(Registry.BIOME_KEY, new Identifier("dimdoors:white_void")); - PUBLIC_BLACK_VOID_KEY = RegistryKey.of(Registry.BIOME_KEY, new Identifier("dimdoors:black_void")); - DUNGEON_DANGEROUS_BLACK_VOID_KEY = RegistryKey.of(Registry.BIOME_KEY, new Identifier("dimdoors:dangerous_black_void")); +// PERSONAL_WHITE_VOID_KEY = RegistryKey.of(Registry.BIOME_KEY, new Identifier("dimdoors:white_void")); +// PUBLIC_BLACK_VOID_KEY = RegistryKey.of(Registry.BIOME_KEY, new Identifier("dimdoors:black_void")); +// DUNGEON_DANGEROUS_BLACK_VOID_KEY = RegistryKey.of(Registry.BIOME_KEY, new Identifier("dimdoors:dangerous_black_void")); LIMBO_KEY = RegistryKey.of(Registry.BIOME_KEY, new Identifier("dimdoors", "limbo")); - WHITE_VOID_BIOME = new BlankBiomeBuilder(true, false).build(); - BLACK_VOID_BIOME = new BlankBiomeBuilder(false, false).build(); - DANGEROUS_BLACK_VOID_BIOME = new BlankBiomeBuilder(false, true).build(); +// WHITE_VOID_BIOME = new BlankBiomeBuilder(true, false).build(); +// BLACK_VOID_BIOME = new BlankBiomeBuilder(false, false).build(); +// DANGEROUS_BLACK_VOID_BIOME = new BlankBiomeBuilder(false, true).build(); LIMBO_BIOME = new Biome.Builder() .category(Biome.Category.NONE) .depth(0.1f) diff --git a/src/main/resources/data/dimdoors/dimension/dungeon_pockets.json b/src/main/resources/data/dimdoors/dimension/dungeon_pockets.json index fd1475ef..af57e9c8 100644 --- a/src/main/resources/data/dimdoors/dimension/dungeon_pockets.json +++ b/src/main/resources/data/dimdoors/dimension/dungeon_pockets.json @@ -3,7 +3,7 @@ "type": "dimdoors:blank", "biome_source": { "type": "minecraft:fixed", - "biome": "dimdoors:dangerous_black_void" + "biome": "dimdoors:limbo" } }, "type": "dimdoors:pocket" diff --git a/src/main/resources/data/dimdoors/dimension/personal_pockets.json b/src/main/resources/data/dimdoors/dimension/personal_pockets.json index a914fb50..af57e9c8 100644 --- a/src/main/resources/data/dimdoors/dimension/personal_pockets.json +++ b/src/main/resources/data/dimdoors/dimension/personal_pockets.json @@ -3,7 +3,7 @@ "type": "dimdoors:blank", "biome_source": { "type": "minecraft:fixed", - "biome": "dimdoors:white_void" + "biome": "dimdoors:limbo" } }, "type": "dimdoors:pocket" diff --git a/src/main/resources/data/dimdoors/dimension/public_pockets.json b/src/main/resources/data/dimdoors/dimension/public_pockets.json index c45c3dd0..af57e9c8 100644 --- a/src/main/resources/data/dimdoors/dimension/public_pockets.json +++ b/src/main/resources/data/dimdoors/dimension/public_pockets.json @@ -3,7 +3,7 @@ "type": "dimdoors:blank", "biome_source": { "type": "minecraft:fixed", - "biome": "dimdoors:black_void" + "biome": "dimdoors:limbo" } }, "type": "dimdoors:pocket"