From f731351a6c568fd89eeafdf0eeef0978dbdc6f26 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 9 Dec 2021 23:03:45 +0100 Subject: [PATCH] Fixed build errors --- src/main/java/ru/betterend/world/biome/EndBiome.java | 10 ++-------- .../betterend/world/features/CrashedShipFeature.java | 11 ++++++++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/ru/betterend/world/biome/EndBiome.java b/src/main/java/ru/betterend/world/biome/EndBiome.java index eae4816c..cc2a654e 100644 --- a/src/main/java/ru/betterend/world/biome/EndBiome.java +++ b/src/main/java/ru/betterend/world/biome/EndBiome.java @@ -128,10 +128,7 @@ public class EndBiome extends BCLBiome implements SurfaceMaterialProvider { } public static BlockState findTopMaterial(BCLBiome biome){ - if (biome instanceof SurfaceMaterialProvider smp){ - return smp.getTopMaterial(); - } - return EndBiome.Config.DEFAULT_MATERIAL.getTopMaterial(); + return BiomeAPI.findTopMaterial(biome).orElse(EndBiome.Config.DEFAULT_MATERIAL.getTopMaterial()); } public static BlockState findTopMaterial(Biome biome){ @@ -143,10 +140,7 @@ public class EndBiome extends BCLBiome implements SurfaceMaterialProvider { } public static BlockState findUnderMaterial(BCLBiome biome){ - if (biome instanceof SurfaceMaterialProvider smp){ - return smp.getTopMaterial(); - } - return EndBiome.Config.DEFAULT_MATERIAL.getTopMaterial(); + return BiomeAPI.findUnderMaterial(biome).orElse(EndBiome.Config.DEFAULT_MATERIAL.getUnderMaterial()); } public static BlockState findUnderMaterial(WorldGenLevel world, BlockPos pos){ diff --git a/src/main/java/ru/betterend/world/features/CrashedShipFeature.java b/src/main/java/ru/betterend/world/features/CrashedShipFeature.java index 185c0901..ff989a45 100644 --- a/src/main/java/ru/betterend/world/features/CrashedShipFeature.java +++ b/src/main/java/ru/betterend/world/features/CrashedShipFeature.java @@ -1,5 +1,7 @@ package ru.betterend.world.features; +import java.util.Random; + import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.LevelReader; @@ -23,14 +25,17 @@ import ru.bclib.util.MHelper; import ru.bclib.util.StructureHelper; import ru.bclib.world.features.NBTStructureFeature; import ru.betterend.util.BlockFixer; - -import java.util.Random; +import ru.betterend.world.biome.EndBiome; public class CrashedShipFeature extends NBTStructureFeature { private static final StructureProcessor REPLACER; private static final String STRUCTURE_PATH = "/data/minecraft/structures/end_city/ship.nbt"; private StructureTemplate structure; - + + public CrashedShipFeature() { + super(EndBiome.Config.DEFAULT_MATERIAL.getTopMaterial()); + } + @Override protected StructureTemplate getStructure(WorldGenLevel world, BlockPos pos, Random random) { if (structure == null) {