Cleanup, fixes

This commit is contained in:
paulevsGitch 2021-12-03 20:42:28 +03:00
parent a5e6344cdd
commit 17ded1bbcc

View file

@ -6,11 +6,8 @@ import net.minecraft.resources.ResourceKey;
import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.levelgen.SurfaceRules; import net.minecraft.world.level.levelgen.SurfaceRules;
import net.minecraft.world.level.levelgen.SurfaceRules.ConditionSource;
import net.minecraft.world.level.levelgen.SurfaceRules.RuleSource; import net.minecraft.world.level.levelgen.SurfaceRules.RuleSource;
import net.minecraft.world.level.levelgen.placement.CaveSurface; import net.minecraft.world.level.levelgen.placement.CaveSurface;
import ru.bclib.api.spawning.SpawnRuleBuilder;
import ru.bclib.api.spawning.SpawnRuleEntry;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -61,6 +58,7 @@ public class SurfaceRuleBuilder {
RuleSource rule = SurfaceRules.state(state); RuleSource rule = SurfaceRules.state(state);
return new SurfaceRuleEntry(1, SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, rule)); return new SurfaceRuleEntry(1, SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, rule));
}); });
rules.add(entryInstance);
return this; return this;
} }
@ -76,6 +74,7 @@ public class SurfaceRuleBuilder {
rule = SurfaceRules.ifTrue(SurfaceRules.stoneDepthCheck(depth, false, false, CaveSurface.FLOOR), rule); rule = SurfaceRules.ifTrue(SurfaceRules.stoneDepthCheck(depth, false, false, CaveSurface.FLOOR), rule);
return new SurfaceRuleEntry(2, SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, rule)); return new SurfaceRuleEntry(2, SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, rule));
}); });
rules.add(entryInstance);
return this; return this;
} }
@ -85,9 +84,8 @@ public class SurfaceRuleBuilder {
* @return same {@link SurfaceRuleBuilder} instance. * @return same {@link SurfaceRuleBuilder} instance.
*/ */
public SurfaceRuleBuilder filler(BlockState state) { public SurfaceRuleBuilder filler(BlockState state) {
entryInstance = getFromCache("fill_" + state.toString(), () -> { entryInstance = getFromCache("fill_" + state.toString(), () -> new SurfaceRuleEntry(3, SurfaceRules.state(state)));
return new SurfaceRuleEntry(3, SurfaceRules.state(state)); rules.add(entryInstance);
});
return this; return this;
} }