From 5ac69c5a2421367ade45d5ca4eb5db313a4ca831 Mon Sep 17 00:00:00 2001 From: Tobias Nett Date: Sat, 30 Jan 2021 16:25:39 +0100 Subject: [PATCH] feat(block/family): add default implementation forwarding to JOML API Contributes to #3832 --- .../terasology/world/block/family/MultiConnectFamily.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/engine/src/main/java/org/terasology/world/block/family/MultiConnectFamily.java b/engine/src/main/java/org/terasology/world/block/family/MultiConnectFamily.java index 7e602e225f4..d379bfe3f12 100644 --- a/engine/src/main/java/org/terasology/world/block/family/MultiConnectFamily.java +++ b/engine/src/main/java/org/terasology/world/block/family/MultiConnectFamily.java @@ -91,7 +91,9 @@ public MultiConnectFamily(BlockFamilyDefinition definition, BlockBuilderHelper b * Use the JOML implementation instead: {@link #connectionCondition(Vector3ic, Side)}. */ @Deprecated - protected abstract boolean connectionCondition(Vector3i blockLocation, Side connectSide); + protected boolean connectionCondition(Vector3i blockLocation, Side connectSide) { + return connectionCondition(JomlUtil.from(blockLocation), connectSide); + } /** * A condition to return true if the block should have a connection on the given side @@ -103,7 +105,6 @@ public MultiConnectFamily(BlockFamilyDefinition definition, BlockBuilderHelper b */ protected abstract boolean connectionCondition(Vector3ic blockLocation, Side connectSide); - /** * The sides of the block that can be connected to. * Example: In a family like RomanColumn, this method only returns SideBitFlag.getSides(Side.TOP, Side.BOTTOM)