From 457673d7212d4417470365820ece690d9102d4a7 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 25 May 2023 00:15:14 +0200 Subject: [PATCH] Collission Changes --- .../bclib/behaviours/BehaviourBuilders.java | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/betterx/bclib/behaviours/BehaviourBuilders.java b/src/main/java/org/betterx/bclib/behaviours/BehaviourBuilders.java index 6409d0e4..3150cd44 100644 --- a/src/main/java/org/betterx/bclib/behaviours/BehaviourBuilders.java +++ b/src/main/java/org/betterx/bclib/behaviours/BehaviourBuilders.java @@ -14,11 +14,19 @@ public class BehaviourBuilders { } public static BlockBehaviour.Properties createPlant(MapColor color) { - return BlockBehaviour.Properties.of() - .mapColor(color) - .noCollission() - .instabreak() - .pushReaction(PushReaction.DESTROY); + return createPlant(color, false); + } + + //TODO: Remove this method, and call noCollision explicitly + public static BlockBehaviour.Properties createPlant(MapColor color, boolean collission) { + var p = BlockBehaviour.Properties.of() + .mapColor(color) + .instabreak() + .pushReaction(PushReaction.DESTROY); + if (!collission) + p.noCollission(); + + return p; } public static BlockBehaviour.Properties createGrass(MapColor color, boolean flammable) { @@ -45,11 +53,19 @@ public class BehaviourBuilders { } public static BlockBehaviour.Properties createWaterPlant() { - return BlockBehaviour.Properties.of() - .mapColor(MapColor.WATER) - .noCollission() - .instabreak() - .pushReaction(PushReaction.DESTROY); + return createWaterPlant(MapColor.WATER, false); + } + + //TODO: Remove this method, and call noCollision explicitly + public static BlockBehaviour.Properties createWaterPlant(MapColor color, boolean collission) { + var p = BlockBehaviour.Properties.of() + .mapColor(color) + .instabreak() + .pushReaction(PushReaction.DESTROY); + if (!collission) + p.noCollission(); + + return p; } public static BlockBehaviour.Properties createReplaceableWaterPlant() {