From 773bc0e8e612bd8ed93f5dc308e27504569d632c Mon Sep 17 00:00:00 2001 From: Nolij Date: Wed, 11 Oct 2023 09:31:49 -0400 Subject: [PATCH] remove disgusting antipattern --- .../java/io/github/unix_supremacist/interfaces/AreaBox.java | 6 +++--- .../io/github/unix_supremacist/item/DestructionItem.java | 5 +++-- .../github/unix_supremacist/item/PhilosophersStoneItem.java | 4 +++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/github/unix_supremacist/interfaces/AreaBox.java b/src/main/java/io/github/unix_supremacist/interfaces/AreaBox.java index 286ce56..dd0f4e8 100644 --- a/src/main/java/io/github/unix_supremacist/interfaces/AreaBox.java +++ b/src/main/java/io/github/unix_supremacist/interfaces/AreaBox.java @@ -6,8 +6,8 @@ import java.util.ArrayList; -public interface AreaBox { - default ArrayList getArea(Direction dir, BlockPos anchor, BlockPos negative, BlockPos positive){ +public final class AreaBox { + public static ArrayList getArea(Direction dir, BlockPos anchor, BlockPos negative, BlockPos positive){ ArrayList blocks = new ArrayList<>(); for(int x = negative.getX(); x <= positive.getX(); x++) @@ -17,7 +17,7 @@ default ArrayList getArea(Direction dir, BlockPos anchor, BlockPos neg return blocks; } - default ArrayList getAreaFromFacing(Direction dir, BlockPos anchor, int size, int depth){ + public static ArrayList getAreaFromFacing(Direction dir, BlockPos anchor, int size, int depth){ switch(dir) { case SOUTH: return getArea(dir, anchor, new BlockPos(-size, -size, -depth), new BlockPos(size, size, 0)); diff --git a/src/main/java/io/github/unix_supremacist/item/DestructionItem.java b/src/main/java/io/github/unix_supremacist/item/DestructionItem.java index e02c4cb..6102d07 100644 --- a/src/main/java/io/github/unix_supremacist/item/DestructionItem.java +++ b/src/main/java/io/github/unix_supremacist/item/DestructionItem.java @@ -1,6 +1,5 @@ package io.github.unix_supremacist.item; -import io.github.unix_supremacist.interfaces.AreaBox; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionResult; @@ -10,7 +9,9 @@ import java.util.ArrayList; -public class DestructionItem extends AbstractEmpowerableItem implements AreaBox { +import static io.github.unix_supremacist.interfaces.AreaBox.getAreaFromFacing; + +public class DestructionItem extends AbstractEmpowerableItem { protected final int[] MODES; private final int maxWidth; private final int maxDepth; diff --git a/src/main/java/io/github/unix_supremacist/item/PhilosophersStoneItem.java b/src/main/java/io/github/unix_supremacist/item/PhilosophersStoneItem.java index ba45617..eb53bdb 100644 --- a/src/main/java/io/github/unix_supremacist/item/PhilosophersStoneItem.java +++ b/src/main/java/io/github/unix_supremacist/item/PhilosophersStoneItem.java @@ -15,7 +15,9 @@ import java.util.ArrayList; -public class PhilosophersStoneItem extends AbstractEmpowerableItem implements AreaBox, TransmuteEntity { +import static io.github.unix_supremacist.interfaces.AreaBox.getAreaFromFacing; + +public class PhilosophersStoneItem extends AbstractEmpowerableItem implements TransmuteEntity { public PhilosophersStoneItem(Properties properties) { super(properties, 3); }