MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed build errors

Browse source
This commit is contained in:
Frank 2021-12-09 23:03:45 +01:00
parent a27f3e35e2
commit f731351a6c
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/ru/betterend/world/biome/EndBiome.java
View file

@ -128,10 +128,7 @@ public class EndBiome extends BCLBiome implements SurfaceMaterialProvider {
} }
public static BlockState findTopMaterial(BCLBiome biome){ public static BlockState findTopMaterial(BCLBiome biome){
if (biome instanceof SurfaceMaterialProvider smp){ return BiomeAPI.findTopMaterial(biome).orElse(EndBiome.Config.DEFAULT_MATERIAL.getTopMaterial());
return smp.getTopMaterial();
}
return EndBiome.Config.DEFAULT_MATERIAL.getTopMaterial();
} }
public static BlockState findTopMaterial(Biome biome){ public static BlockState findTopMaterial(Biome biome){
@ -143,10 +140,7 @@ public class EndBiome extends BCLBiome implements SurfaceMaterialProvider {
} }
public static BlockState findUnderMaterial(BCLBiome biome){ public static BlockState findUnderMaterial(BCLBiome biome){
if (biome instanceof SurfaceMaterialProvider smp){ return BiomeAPI.findUnderMaterial(biome).orElse(EndBiome.Config.DEFAULT_MATERIAL.getUnderMaterial());
return smp.getTopMaterial();
}
return EndBiome.Config.DEFAULT_MATERIAL.getTopMaterial();
} }
public static BlockState findUnderMaterial(WorldGenLevel world, BlockPos pos){ public static BlockState findUnderMaterial(WorldGenLevel world, BlockPos pos){

9
src/main/java/ru/betterend/world/features/CrashedShipFeature.java
View file

@ -1,5 +1,7 @@
package ru.betterend.world.features; package ru.betterend.world.features;
import java.util.Random;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.LevelReader;
@ -23,14 +25,17 @@ import ru.bclib.util.MHelper;
import ru.bclib.util.StructureHelper; import ru.bclib.util.StructureHelper;
import ru.bclib.world.features.NBTStructureFeature; import ru.bclib.world.features.NBTStructureFeature;
import ru.betterend.util.BlockFixer; import ru.betterend.util.BlockFixer;
import ru.betterend.world.biome.EndBiome;
import java.util.Random;
public class CrashedShipFeature extends NBTStructureFeature { public class CrashedShipFeature extends NBTStructureFeature {
private static final StructureProcessor REPLACER; private static final StructureProcessor REPLACER;
private static final String STRUCTURE_PATH = "/data/minecraft/structures/end_city/ship.nbt"; private static final String STRUCTURE_PATH = "/data/minecraft/structures/end_city/ship.nbt";
private StructureTemplate structure; private StructureTemplate structure;
public CrashedShipFeature() {
super(EndBiome.Config.DEFAULT_MATERIAL.getTopMaterial());
}
@Override @Override
protected StructureTemplate getStructure(WorldGenLevel world, BlockPos pos, Random random) { protected StructureTemplate getStructure(WorldGenLevel world, BlockPos pos, Random random) {
if (structure == null) { if (structure == null) {