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-10-06 17:24:46 +03:00
parent b47607cb6a
commit d2148baf66
5 changed files with 52 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/ru/betterend/util/sdf/PosInfo.java
View file

@ -1,7 +1,6 @@
package ru.betterend.util.sdf; package ru.betterend.util.sdf;
import java.util.Map; import java.util.Map;
import java.util.Set;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
@ -11,15 +10,15 @@ import net.minecraft.util.math.Direction;
public class PosInfo implements Comparable<PosInfo> { public class PosInfo implements Comparable<PosInfo> {
private static final BlockState AIR = Blocks.AIR.getDefaultState(); private static final BlockState AIR = Blocks.AIR.getDefaultState();
private final Map<BlockPos, PosInfo> blocks; private final Map<BlockPos, PosInfo> blocks;
private final Set<PosInfo> add; private final Map<BlockPos, PosInfo> add;
private final BlockPos pos; private final BlockPos pos;
private BlockState state; private BlockState state;
public static PosInfo create(Map<BlockPos, PosInfo> blocks, Set<PosInfo> add, BlockPos pos) { public static PosInfo create(Map<BlockPos, PosInfo> blocks, Map<BlockPos, PosInfo> add, BlockPos pos) {
return new PosInfo(blocks, add, pos); return new PosInfo(blocks, add, pos);
} }
private PosInfo(Map<BlockPos, PosInfo> blocks, Set<PosInfo> add, BlockPos pos) { private PosInfo(Map<BlockPos, PosInfo> blocks, Map<BlockPos, PosInfo> add, BlockPos pos) {
this.blocks = blocks; this.blocks = blocks;
this.add = add; this.add = add;
this.pos = pos; this.pos = pos;
@ -37,7 +36,8 @@ public class PosInfo implements Comparable<PosInfo> {
public BlockState getState(Direction dir) { public BlockState getState(Direction dir) {
PosInfo info = blocks.get(pos.offset(dir)); PosInfo info = blocks.get(pos.offset(dir));
if (info == null) { if (info == null) {
return AIR; info = add.get(pos.offset(dir));
return info == null ? AIR : info.getState();
} }
return info.getState(); return info.getState();
} }
@ -83,6 +83,6 @@ public class PosInfo implements Comparable<PosInfo> {
public void setBlockPos(BlockPos pos, BlockState state) { public void setBlockPos(BlockPos pos, BlockState state) {
PosInfo info = new PosInfo(blocks, add, pos); PosInfo info = new PosInfo(blocks, add, pos);
info.state = state; info.state = state;
add.add(info); add.put(pos, info);
} }
} }

46
src/main/java/ru/betterend/util/sdf/SDF.java
View file

@ -41,7 +41,7 @@ public abstract class SDF {
public void fillRecursive(ServerWorldAccess world, BlockPos start, int dx, int dy, int dz) { public void fillRecursive(ServerWorldAccess world, BlockPos start, int dx, int dy, int dz) {
Map<BlockPos, PosInfo> mapWorld = Maps.newHashMap(); Map<BlockPos, PosInfo> mapWorld = Maps.newHashMap();
Set<PosInfo> addInfo = Sets.newHashSet(); Map<BlockPos, PosInfo> addInfo = Maps.newHashMap();
Set<BlockPos> blocks = Sets.newHashSet(); Set<BlockPos> blocks = Sets.newHashSet();
Set<BlockPos> ends = Sets.newHashSet(); Set<BlockPos> ends = Sets.newHashSet();
Set<BlockPos> add = Sets.newHashSet(); Set<BlockPos> add = Sets.newHashSet();
@ -85,19 +85,22 @@ public abstract class SDF {
BlockState state = postProcess.apply(info); BlockState state = postProcess.apply(info);
BlocksHelper.setWithoutUpdate(world, info.getPos(), state); BlocksHelper.setWithoutUpdate(world, info.getPos(), state);
}); });
}
addInfo.forEach((info) -> { infos.clear();
if (canReplace.apply(world.getBlockState(info.getPos()))) { infos.addAll(addInfo.values());
BlockState state = postProcess.apply(info); Collections.sort(infos);
BlocksHelper.setWithoutUpdate(world, info.getPos(), state); infos.forEach((info) -> {
} if (canReplace.apply(world.getBlockState(info.getPos()))) {
}); BlockState state = postProcess.apply(info);
BlocksHelper.setWithoutUpdate(world, info.getPos(), state);
}
});
}
} }
public void fillRecursive(ServerWorldAccess world, BlockPos start) { public void fillRecursive(ServerWorldAccess world, BlockPos start) {
Map<BlockPos, PosInfo> mapWorld = Maps.newHashMap(); Map<BlockPos, PosInfo> mapWorld = Maps.newHashMap();
Set<PosInfo> addInfo = Sets.newHashSet(); Map<BlockPos, PosInfo> addInfo = Maps.newHashMap();
Set<BlockPos> blocks = Sets.newHashSet(); Set<BlockPos> blocks = Sets.newHashSet();
Set<BlockPos> ends = Sets.newHashSet(); Set<BlockPos> ends = Sets.newHashSet();
Set<BlockPos> add = Sets.newHashSet(); Set<BlockPos> add = Sets.newHashSet();
@ -135,19 +138,22 @@ public abstract class SDF {
BlockState state = postProcess.apply(info); BlockState state = postProcess.apply(info);
BlocksHelper.setWithoutUpdate(world, info.getPos(), state); BlocksHelper.setWithoutUpdate(world, info.getPos(), state);
}); });
infos.clear();
infos.addAll(addInfo.values());
Collections.sort(infos);
infos.forEach((info) -> {
if (canReplace.apply(world.getBlockState(info.getPos()))) {
BlockState state = postProcess.apply(info);
BlocksHelper.setWithoutUpdate(world, info.getPos(), state);
}
});
} }
addInfo.forEach((info) -> {
if (canReplace.apply(world.getBlockState(info.getPos()))) {
BlockState state = postProcess.apply(info);
BlocksHelper.setWithoutUpdate(world, info.getPos(), state);
}
});
} }
public void fillRecursive(StructureWorld world, BlockPos start) { public void fillRecursive(StructureWorld world, BlockPos start) {
Map<BlockPos, PosInfo> mapWorld = Maps.newHashMap(); Map<BlockPos, PosInfo> mapWorld = Maps.newHashMap();
Set<PosInfo> addInfo = Sets.newHashSet(); Map<BlockPos, PosInfo> addInfo = Maps.newHashMap();
Set<BlockPos> blocks = Sets.newHashSet(); Set<BlockPos> blocks = Sets.newHashSet();
Set<BlockPos> ends = Sets.newHashSet(); Set<BlockPos> ends = Sets.newHashSet();
Set<BlockPos> add = Sets.newHashSet(); Set<BlockPos> add = Sets.newHashSet();
@ -179,14 +185,16 @@ public abstract class SDF {
} }
List<PosInfo> infos = new ArrayList<PosInfo>(mapWorld.values()); List<PosInfo> infos = new ArrayList<PosInfo>(mapWorld.values());
infos.addAll(addInfo);
Collections.sort(infos); Collections.sort(infos);
infos.forEach((info) -> { infos.forEach((info) -> {
BlockState state = postProcess.apply(info); BlockState state = postProcess.apply(info);
world.setBlock(info.getPos(), state); world.setBlock(info.getPos(), state);
}); });
addInfo.forEach((info) -> { infos.clear();
infos.addAll(addInfo.values());
Collections.sort(infos);
infos.forEach((info) -> {
BlockState state = postProcess.apply(info); BlockState state = postProcess.apply(info);
world.setBlock(info.getPos(), state); world.setBlock(info.getPos(), state);
}); });

2
src/main/java/ru/betterend/world/features/MossyGlowshroomFeature.java
View file

@ -139,7 +139,7 @@ public class MossyGlowshroomFeature extends DefaultFeature {
} }
} }
if (info.getStateDown() == AIR) { if (info.getStateDown().getBlock() != BlockRegistry.MOSSY_GLOWSHROOM_HYMENOPHORE) {
info.setBlockPos(info.getPos().down(), BlockRegistry.MOSSY_GLOWSHROOM_FUR.getDefaultState().with(BlockGlowingFur.FACING, Direction.DOWN)); info.setBlockPos(info.getPos().down(), BlockRegistry.MOSSY_GLOWSHROOM_FUR.getDefaultState().with(BlockGlowingFur.FACING, Direction.DOWN));
} }
} }

4
src/main/java/ru/betterend/world/structures/features/StructureFeatureBase.java
View file

@ -2,6 +2,8 @@ package ru.betterend.world.structures.features;
import java.util.Random; import java.util.Random;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.util.BlockRotation; import net.minecraft.util.BlockRotation;
import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.Heightmap; import net.minecraft.world.Heightmap;
@ -13,6 +15,8 @@ import net.minecraft.world.gen.feature.DefaultFeatureConfig;
import net.minecraft.world.gen.feature.StructureFeature; import net.minecraft.world.gen.feature.StructureFeature;
public abstract class StructureFeatureBase extends StructureFeature<DefaultFeatureConfig> { public abstract class StructureFeatureBase extends StructureFeature<DefaultFeatureConfig> {
protected static final BlockState AIR = Blocks.AIR.getDefaultState();
public StructureFeatureBase() { public StructureFeatureBase() {
super(DefaultFeatureConfig.CODEC); super(DefaultFeatureConfig.CODEC);
} }

14
src/main/java/ru/betterend/world/structures/features/StructureGiantMossyGlowshroom.java
View file

@ -5,9 +5,12 @@ import java.util.Random;
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 ru.betterend.blocks.BlockMossyGlowshroomCap; import ru.betterend.blocks.BlockMossyGlowshroomCap;
import ru.betterend.blocks.basis.BlockGlowingFur;
import ru.betterend.noise.OpenSimplexNoise; import ru.betterend.noise.OpenSimplexNoise;
import ru.betterend.registry.BlockRegistry; import ru.betterend.registry.BlockRegistry;
import ru.betterend.util.BlocksHelper;
import ru.betterend.util.MHelper; import ru.betterend.util.MHelper;
import ru.betterend.util.SplineHelper; import ru.betterend.util.SplineHelper;
import ru.betterend.util.sdf.SDF; import ru.betterend.util.sdf.SDF;
@ -107,6 +110,17 @@ public class StructureGiantMossyGlowshroom extends SDFStructureFeature {
info.setState(BlockRegistry.MOSSY_GLOWSHROOM_CAP.getDefaultState()); info.setState(BlockRegistry.MOSSY_GLOWSHROOM_CAP.getDefaultState());
return info.getState(); return info.getState();
} }
else if (info.getState().getBlock() == BlockRegistry.MOSSY_GLOWSHROOM_HYMENOPHORE) {
for (Direction dir: BlocksHelper.HORIZONTAL) {
if (info.getState(dir) == AIR) {
info.setBlockPos(info.getPos().offset(dir), BlockRegistry.MOSSY_GLOWSHROOM_FUR.getDefaultState().with(BlockGlowingFur.FACING, dir));
}
}
if (info.getStateDown().getBlock() != BlockRegistry.MOSSY_GLOWSHROOM_HYMENOPHORE) {
info.setBlockPos(info.getPos().down(), BlockRegistry.MOSSY_GLOWSHROOM_FUR.getDefaultState().with(BlockGlowingFur.FACING, Direction.DOWN));
}
}
return info.getState(); return info.getState();
}); });
} }