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

Fixes

Browse source
This commit is contained in:
paulevsGitch 2020-11-01 16:42:30 +03:00
parent 67faa4a1d0
commit d6d78925b7
3 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ru/betterend/world/biome/BiomeShadowForest.java
View file

@ -22,6 +22,7 @@ public class BiomeShadowForest extends EndBiome {
.addFeature(EndFeatures.DRAGON_TREE_BUSH) .addFeature(EndFeatures.DRAGON_TREE_BUSH)
.addFeature(EndFeatures.SHADOW_PLANT) .addFeature(EndFeatures.SHADOW_PLANT)
.addStructureFeature(ConfiguredStructureFeatures.END_CITY) .addStructureFeature(ConfiguredStructureFeatures.END_CITY)
.addMobSpawn(EntityType.ENDERMAN, 80, 1, 4)); .addMobSpawn(EntityType.ENDERMAN, 80, 1, 4)
.addMobSpawn(EntityType.PHANTOM, 1, 1, 2));
} }
} }

12
src/main/java/ru/betterend/world/features/DragonTreeFeature.java
View file

@ -117,6 +117,18 @@ public class DragonTreeFeature extends DefaultFeature {
sphere = new SDFScale3D().setScale(1, 0.5F, 1).setSource(sphere); sphere = new SDFScale3D().setScale(1, 0.5F, 1).setSource(sphere);
sphere = new SDFDisplacement().setFunction((vec) -> { return (float) noise.eval(vec.getX() * 0.2, vec.getY() * 0.2, vec.getZ() * 0.2) * 1.5F; }).setSource(sphere); sphere = new SDFDisplacement().setFunction((vec) -> { return (float) noise.eval(vec.getX() * 0.2, vec.getY() * 0.2, vec.getZ() * 0.2) * 1.5F; }).setSource(sphere);
sphere = new SDFDisplacement().setFunction((vec) -> { return random.nextFloat() * 3F - 1.5F; }).setSource(sphere); sphere = new SDFDisplacement().setFunction((vec) -> { return random.nextFloat() * 3F - 1.5F; }).setSource(sphere);
sphere.setPostProcess((info) -> {
if (random.nextInt(5) == 0) {
for (Direction dir: Direction.values()) {
BlockState state = info.getState(dir, 2);
if (state.isAir()) {
return info.getState();
}
}
return EndBlocks.DRAGON_TREE.bark.getDefaultState();
}
return info.getState();
});
sphere.fillRecursiveIgnore(world, pos, IGNORE); sphere.fillRecursiveIgnore(world, pos, IGNORE);
if (radius > 5) { if (radius > 5) {

21
src/main/java/ru/betterend/world/features/PythadendronTreeFeature.java
View file

@ -9,6 +9,7 @@ import net.minecraft.block.LeavesBlock;
import net.minecraft.block.Material; import net.minecraft.block.Material;
import net.minecraft.client.util.math.Vector3f; import net.minecraft.client.util.math.Vector3f;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.StructureWorldAccess;
import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.chunk.ChunkGenerator;
import net.minecraft.world.gen.feature.DefaultFeatureConfig; import net.minecraft.world.gen.feature.DefaultFeatureConfig;
@ -28,6 +29,7 @@ import ru.betterend.util.sdf.primitive.SDFSphere;
public class PythadendronTreeFeature extends DefaultFeature { public class PythadendronTreeFeature extends DefaultFeature {
private static final Function<BlockState, Boolean> REPLACE; private static final Function<BlockState, Boolean> REPLACE;
private static final Function<BlockState, Boolean> IGNORE;
private static final Function<PosInfo, BlockState> POST; private static final Function<PosInfo, BlockState> POST;
@Override @Override
@ -109,8 +111,19 @@ public class PythadendronTreeFeature extends DefaultFeature {
sphere = new SDFDisplacement().setFunction((vec) -> { return (float) noise.eval(vec.getX() * 0.2, vec.getY() * 0.2, vec.getZ() * 0.2) * 3; }).setSource(sphere); sphere = new SDFDisplacement().setFunction((vec) -> { return (float) noise.eval(vec.getX() * 0.2, vec.getY() * 0.2, vec.getZ() * 0.2) * 3; }).setSource(sphere);
sphere = new SDFDisplacement().setFunction((vec) -> { return random.nextFloat() * 3F - 1.5F; }).setSource(sphere); sphere = new SDFDisplacement().setFunction((vec) -> { return random.nextFloat() * 3F - 1.5F; }).setSource(sphere);
sphere = new SDFSubtraction().setSourceA(sphere).setSourceB(new SDFTranslate().setTranslate(0, -radius, 0).setSource(sphere)); sphere = new SDFSubtraction().setSourceA(sphere).setSourceB(new SDFTranslate().setTranslate(0, -radius, 0).setSource(sphere));
BlocksHelper.setWithoutUpdate(world, pos.up(), AIR); sphere.setPostProcess((info) -> {
sphere.fillRecursive(world, pos.up()); if (random.nextInt(5) == 0) {
for (Direction dir: Direction.values()) {
BlockState state = info.getState(dir, 2);
if (state.isAir()) {
return info.getState();
}
}
return EndBlocks.PYTHADENDRON.bark.getDefaultState();
}
return info.getState();
});
sphere.fillRecursiveIgnore(world, pos.up(), IGNORE);
if (radius > 5) { if (radius > 5) {
int count = (int) (radius * 2.5F); int count = (int) (radius * 2.5F);
@ -135,6 +148,10 @@ public class PythadendronTreeFeature extends DefaultFeature {
return state.getMaterial().isReplaceable(); return state.getMaterial().isReplaceable();
}; };
IGNORE = (state) -> {
return EndBlocks.PYTHADENDRON.isTreeLog(state);
};
POST = (info) -> { POST = (info) -> {
if (EndBlocks.PYTHADENDRON.isTreeLog(info.getStateUp()) && EndBlocks.PYTHADENDRON.isTreeLog(info.getStateDown())) { if (EndBlocks.PYTHADENDRON.isTreeLog(info.getStateUp()) && EndBlocks.PYTHADENDRON.isTreeLog(info.getStateDown())) {
return EndBlocks.PYTHADENDRON.log.getDefaultState(); return EndBlocks.PYTHADENDRON.log.getDefaultState();