diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/block/BlockUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/game/block/BlockUtils.java index 29c75367..7e6b7a93 100644 --- a/src/main/java/org/auioc/mcmod/arnicalib/game/block/BlockUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/game/block/BlockUtils.java @@ -2,9 +2,9 @@ import net.minecraft.world.level.block.state.BlockState; -public interface BlockUtils { +public class BlockUtils { - static boolean canStandOn(BlockState blockStats) { + public static boolean canStandOn(BlockState blockStats) { return blockStats.getMaterial().blocksMotion(); } diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/chat/TextUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/game/chat/TextUtils.java index 9fe417c3..302eb71f 100644 --- a/src/main/java/org/auioc/mcmod/arnicalib/game/chat/TextUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/game/chat/TextUtils.java @@ -6,28 +6,28 @@ import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TranslatableComponent; -public interface TextUtils { +public class TextUtils { - Object[] NO_ARGS = new Object[0]; + public static final Object[] NO_ARGS = new Object[0]; - static TextComponent empty() { + public static TextComponent empty() { return new TextComponent(""); } - static TextComponent literal(String text) { + public static TextComponent literal(String text) { return new TextComponent(text); } - static TranslatableComponent translatable(String key) { + public static TranslatableComponent translatable(String key) { return new TranslatableComponent(key); } - static TranslatableComponent translatable(String key, Object... arguments) { + public static TranslatableComponent translatable(String key, Object... arguments) { return new TranslatableComponent(key, arguments); } - static MutableComponent join(List texts, Component separator) { + public static MutableComponent join(List texts, Component separator) { var r = empty(); if (texts.isEmpty()) return r; @@ -40,7 +40,7 @@ static MutableComponent join(List texts, Component separator) { return r; } - static MutableComponent join(List texts) { + public static MutableComponent join(List texts) { return join(texts, literal(", ")); } diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/command/action/BiCommandAction.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/action/BiCommandAction.java index ff719f6a..494c44ee 100644 --- a/src/main/java/org/auioc/mcmod/arnicalib/game/command/action/BiCommandAction.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/game/command/action/BiCommandAction.java @@ -6,11 +6,12 @@ public class BiCommandAction { - public static interface SingleSuccess extends FailableBiConsumer { + } public static interface MultiSuccess extends FailableToIntBiFunction { + } } diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/command/action/CommandAction.java b/src/main/java/org/auioc/mcmod/arnicalib/game/command/action/CommandAction.java index d31ed947..8e72a9a4 100644 --- a/src/main/java/org/auioc/mcmod/arnicalib/game/command/action/CommandAction.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/game/command/action/CommandAction.java @@ -6,11 +6,12 @@ public class CommandAction { - public static interface SingleSuccess extends FailableConsumer { + } public static interface MultiSuccess extends FailableToIntFunction { + } } diff --git a/src/main/java/org/auioc/mcmod/arnicalib/game/config/ConfigUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/game/config/ConfigUtils.java index adc4ae46..83712f76 100644 --- a/src/main/java/org/auioc/mcmod/arnicalib/game/config/ConfigUtils.java +++ b/src/main/java/org/auioc/mcmod/arnicalib/game/config/ConfigUtils.java @@ -4,26 +4,26 @@ import java.util.function.Consumer; import net.minecraftforge.common.ForgeConfigSpec.Builder; -public interface ConfigUtils { +public class ConfigUtils { - static void pushWithoutPop(Builder specBuilder, String path, Consumer subBuilder) { + public static void pushWithoutPop(Builder specBuilder, String path, Consumer subBuilder) { specBuilder.push(path); subBuilder.accept(specBuilder); } - static void push(Builder specBuilder, String path, Consumer subBuilder) { + public static void push(Builder specBuilder, String path, Consumer subBuilder) { specBuilder.push(path); subBuilder.accept(specBuilder); specBuilder.pop(); } - static boolean validateListSize(Object obj, int size) { + public static boolean validateListSize(Object obj, int size) { if (!(obj instanceof List)) return false; return (((List) obj).size() == size) ? true : false; } - static boolean validateListElements(Object obj, Class clazz) { + public static boolean validateListElements(Object obj, Class clazz) { if (!(obj instanceof List)) return false; for (Object e : (List) obj) {