diff --git a/src/main/java/org/dimdev/dimdoors/client/CustomSkyProvider.java b/src/main/java/org/dimdev/dimdoors/client/CustomSkyProvider.java index a459ed62..44684b47 100644 --- a/src/main/java/org/dimdev/dimdoors/client/CustomSkyProvider.java +++ b/src/main/java/org/dimdev/dimdoors/client/CustomSkyProvider.java @@ -43,7 +43,7 @@ public class CustomSkyProvider implements SkyRenderer { Matrix4f matrix4f2 = matrices.peek().getModel(); float s = 30.0F; - client.getTextureManager().bindTexture(sun); + client.getTextureManager().bindTexture(this.sun); bufferBuilder.begin(7, VertexFormats.POSITION_TEXTURE); bufferBuilder.vertex(matrix4f2, -s, 100.0F, -s).texture(0.0F, 0.0F).next(); bufferBuilder.vertex(matrix4f2, s, 100.0F, -s).texture(1.0F, 0.0F).next(); @@ -52,7 +52,7 @@ public class CustomSkyProvider implements SkyRenderer { bufferBuilder.end(); BufferRenderer.draw(bufferBuilder); - client.getTextureManager().bindTexture(moon); + client.getTextureManager().bindTexture(this.moon); bufferBuilder.begin(7, VertexFormats.POSITION_TEXTURE); bufferBuilder.vertex(matrix4f2, -s, -100.0F, s).texture(0f, 0f).next(); bufferBuilder.vertex(matrix4f2, s, -100.0F, s).texture(1f, 0f).next(); @@ -68,7 +68,7 @@ public class CustomSkyProvider implements SkyRenderer { RenderSystem.disableBlend(); RenderSystem.enableAlphaTest(); - renderSkyBox(matrices); + this.renderSkyBox(matrices); } private void renderSkyBox(MatrixStack matrices) { @@ -103,10 +103,10 @@ public class CustomSkyProvider implements SkyRenderer { Matrix4f matrix4f = matrices.peek().getModel(); bufferBuilder.begin(7, VertexFormats.POSITION_COLOR); - bufferBuilder.vertex(matrix4f, -100.0F, -100.0F, -100.0F).color(color.getX(), color.getY(), color.getZ(), 255).next(); - bufferBuilder.vertex(matrix4f, -100.0F, -100.0F, 100.0F).color(color.getX(), color.getY(), color.getZ(), 255).next(); - bufferBuilder.vertex(matrix4f, 100.0F, -100.0F, 100.0F).color(color.getX(), color.getY(), color.getZ(), 255).next(); - bufferBuilder.vertex(matrix4f, 100.0F, -100.0F, -100.0F).color(color.getX(), color.getY(), color.getZ(), 255).next(); + bufferBuilder.vertex(matrix4f, -100.0F, -100.0F, -100.0F).color(this.color.getX(), this.color.getY(), this.color.getZ(), 255).next(); + bufferBuilder.vertex(matrix4f, -100.0F, -100.0F, 100.0F).color(this.color.getX(), this.color.getY(), this.color.getZ(), 255).next(); + bufferBuilder.vertex(matrix4f, 100.0F, -100.0F, 100.0F).color(this.color.getX(), this.color.getY(), this.color.getZ(), 255).next(); + bufferBuilder.vertex(matrix4f, 100.0F, -100.0F, -100.0F).color(this.color.getX(), this.color.getY(), this.color.getZ(), 255).next(); tessellator.draw(); matrices.pop(); } diff --git a/src/main/java/org/dimdev/dimdoors/client/ModRendering.java b/src/main/java/org/dimdev/dimdoors/client/ModRendering.java index 8c4415fc..dd4dbdd6 100644 --- a/src/main/java/org/dimdev/dimdoors/client/ModRendering.java +++ b/src/main/java/org/dimdev/dimdoors/client/ModRendering.java @@ -35,7 +35,6 @@ public class ModRendering { OpenWorlds.registerSkyRenderer(ModDimensions.LIMBO_TYPE_KEY, new LimboSkyProvider()); OpenWorlds.registerCloudRenderer(ModDimensions.LIMBO_TYPE_KEY, (minecraftClient, matrixStack, v, v1, v2, v3) -> { }); - OpenWorlds.registerSkyProperty(ModDimensions.LIMBO_TYPE_KEY, LimboSkyProperties.INSTANCE); setupFluidRendering(ModFluids.ETERNAL_FLUID, ModFluids.FLOWING_ETERNAL_FLUID, new Identifier("dimdoors:eternal_fluid")); } diff --git a/src/main/java/org/dimdev/dimdoors/world/ModBiomes.java b/src/main/java/org/dimdev/dimdoors/world/ModBiomes.java index 23388d9b..7a1ff64e 100644 --- a/src/main/java/org/dimdev/dimdoors/world/ModBiomes.java +++ b/src/main/java/org/dimdev/dimdoors/world/ModBiomes.java @@ -2,6 +2,7 @@ package org.dimdev.dimdoors.world; import org.dimdev.dimdoors.block.ModBlocks; import org.dimdev.dimdoors.entity.ModEntityTypes; +import org.dimdev.dimdoors.mixin.BuiltinBiomesAccessor; import org.dimdev.dimdoors.sound.ModSoundEvents; import net.minecraft.block.Blocks; @@ -33,6 +34,10 @@ public final class ModBiomes { Registry.register(BuiltinRegistries.BIOME, PERSONAL_WHITE_VOID_KEY.getValue(), PERSONAL_WHITE_VOID_BIOME); Registry.register(BuiltinRegistries.BIOME, PUBLIC_BLACK_VOID_KEY.getValue(), PUBLIC_BLACK_VOID_BIOME); Registry.register(BuiltinRegistries.BIOME, DUNGEON_DANGEROUS_BLACK_VOID_KEY.getValue(), DUNGEON_DANGEROUS_BLACK_VOID_BIOME); + BuiltinBiomesAccessor.getIdMap().put(BuiltinRegistries.BIOME.getRawId(LIMBO_BIOME), LIMBO_KEY); + BuiltinBiomesAccessor.getIdMap().put(BuiltinRegistries.BIOME.getRawId(PERSONAL_WHITE_VOID_BIOME), PERSONAL_WHITE_VOID_KEY); + BuiltinBiomesAccessor.getIdMap().put(BuiltinRegistries.BIOME.getRawId(PUBLIC_BLACK_VOID_BIOME), PUBLIC_BLACK_VOID_KEY); + BuiltinBiomesAccessor.getIdMap().put(BuiltinRegistries.BIOME.getRawId(DUNGEON_DANGEROUS_BLACK_VOID_BIOME), DUNGEON_DANGEROUS_BLACK_VOID_KEY); } private static BiomeEffects createEffect(boolean white) { @@ -40,7 +45,7 @@ public final class ModBiomes { .waterColor(white ? 0xFFFFFF : 0x000000) .waterFogColor(white ? 0xFFFFFF : 0x000000) .fogColor(white ? 0xFFFFFF : 0x000000) - .skyColor(white ? 0xFFFFFF : 0x808080) + .skyColor(white ? 0xFFFFFF : 0x000000) .grassColorModifier(BiomeEffects.GrassColorModifier.NONE); if (white) { builder.loopSound(ModSoundEvents.WHITE_VOID); diff --git a/src/main/java/org/dimdev/dimdoors/world/ModDimensions.java b/src/main/java/org/dimdev/dimdoors/world/ModDimensions.java index 46efcc8b..c725e0ff 100644 --- a/src/main/java/org/dimdev/dimdoors/world/ModDimensions.java +++ b/src/main/java/org/dimdev/dimdoors/world/ModDimensions.java @@ -42,6 +42,7 @@ public final class ModDimensions { public static final ChunkGeneratorSettings LIMBO_CHUNK_GENERATOR_SETTINGS; + // TODO: move pocket dimension generation settings to code public static final BiomeSource PERSONAL_BIOME_SOURCE = new FixedBiomeSource(() -> ModBiomes.PERSONAL_WHITE_VOID_BIOME); public static final BiomeSource PUBLIC_BIOME_SOURCE = new FixedBiomeSource(() -> ModBiomes.PUBLIC_BLACK_VOID_BIOME); public static final BiomeSource DUNGEON_BIOME_SOURCE = new FixedBiomeSource(() -> ModBiomes.DUNGEON_DANGEROUS_BLACK_VOID_BIOME); @@ -83,29 +84,31 @@ public final class ModDimensions { ImmutableMap.of() ); GenerationShapeConfig limboShapeConfig = new GenerationShapeConfig( - 128, + 178, new NoiseSamplingConfig( - 0.94213419649817745, - 1.102539814507745, - 80, 120 + 1.000009876543, + 2.9999876545678, + 60, + 240 ), new SlideConfig( - 20, + -10, 3, 0 ), new SlideConfig( - 60, - 2, - 2 - ), 2, + -30, + 0, + 0 + ), + 1, 4, 1, - -0.16875, + -0.26875, + false, true, - true, - true, - true + false, + false ); LIMBO_CHUNK_GENERATOR_SETTINGS = ChunkGeneratorSettingsAccessor.invokeInit( limboStructuresConfig,