diff --git a/src/main/java/org/auioc/mods/arnicalib/common/command/argument/CreativeModeTabArgument.java b/src/main/java/org/auioc/mods/arnicalib/common/command/argument/CreativeModeTabArgument.java index 43d69c69..5a43d0c2 100644 --- a/src/main/java/org/auioc/mods/arnicalib/common/command/argument/CreativeModeTabArgument.java +++ b/src/main/java/org/auioc/mods/arnicalib/common/command/argument/CreativeModeTabArgument.java @@ -18,7 +18,7 @@ public class CreativeModeTabArgument implements ArgumentType { - private static final DynamicCommandExceptionType UNKNOWN_CREATIVE_MOD_TAB = new DynamicCommandExceptionType( + private static final DynamicCommandExceptionType UNKNOWN_CREATIVE_MODE_TAB = new DynamicCommandExceptionType( (langId) -> TextUtils.I18nText(ArnicaLib.i18n("argument.creative_mod_tab.unknown"), langId) ); @@ -33,7 +33,7 @@ public CreativeModeTab parse(StringReader reader) throws CommandSyntaxException .stream() .filter((tab) -> getLangId(tab).equals(langId)) .findAny() - .orElseThrow(() -> UNKNOWN_CREATIVE_MOD_TAB.create(langId)); + .orElseThrow(() -> UNKNOWN_CREATIVE_MODE_TAB.create(langId)); } @Override diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/game/EffectUtils.java b/src/main/java/org/auioc/mods/arnicalib/utils/game/EffectUtils.java index 4b8e0f43..c7e865a8 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/game/EffectUtils.java +++ b/src/main/java/org/auioc/mods/arnicalib/utils/game/EffectUtils.java @@ -163,10 +163,10 @@ static void removeEffect(LivingEntity entity, Predicate condi toRemove.forEach(effect -> entity.removeEffect(effect)); } - static Predicate IS_BENEFICIAL = (e) -> e.getEffect().isBeneficial(); - static Predicate IS_NOT_BENEFICIAL = (e) -> !e.getEffect().isBeneficial(); - static Predicate IS_HARMFUL = (e) -> e.getEffect().getCategory() == MobEffectCategory.HARMFUL; - static Predicate IS_NEUTRAL = (e) -> e.getEffect().getCategory() == MobEffectCategory.NEUTRAL; + Predicate IS_BENEFICIAL = (e) -> e.getEffect().isBeneficial(); + Predicate IS_NOT_BENEFICIAL = (e) -> !e.getEffect().isBeneficial(); + Predicate IS_HARMFUL = (e) -> e.getEffect().getCategory() == MobEffectCategory.HARMFUL; + Predicate IS_NEUTRAL = (e) -> e.getEffect().getCategory() == MobEffectCategory.NEUTRAL; static int getEffectLevel(LivingEntity entity, MobEffect effect) { diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/game/ItemUtils.java b/src/main/java/org/auioc/mods/arnicalib/utils/game/ItemUtils.java index cc025ea8..4bf7ab20 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/game/ItemUtils.java +++ b/src/main/java/org/auioc/mods/arnicalib/utils/game/ItemUtils.java @@ -36,11 +36,9 @@ static String getRegistryName(ItemStack itemStack) { return getRegistryName(itemStack.getItem()); } - static Predicate IS_VANILLA_ITEM = (itemStack) -> RegistryUtils.IS_VANILLA.test(itemStack.getItem()); - - static Predicate IS_AIR = (item) -> item == Items.AIR; - - static Predicate IS_CATEGORIZED = (item) -> item.getItemCategory() != null; + Predicate IS_VANILLA_ITEM = (itemStack) -> RegistryUtils.IS_VANILLA.test(itemStack.getItem()); + Predicate IS_AIR = (item) -> item == Items.AIR; + Predicate IS_CATEGORIZED = (item) -> item.getItemCategory() != null; @SuppressWarnings("deprecation") static int getMaxStackSize(Item item) { diff --git a/src/main/java/org/auioc/mods/arnicalib/utils/game/MCTimeUtils.java b/src/main/java/org/auioc/mods/arnicalib/utils/game/MCTimeUtils.java index bc12f7d0..011efb6b 100644 --- a/src/main/java/org/auioc/mods/arnicalib/utils/game/MCTimeUtils.java +++ b/src/main/java/org/auioc/mods/arnicalib/utils/game/MCTimeUtils.java @@ -4,11 +4,11 @@ public interface MCTimeUtils { - static final int ticksAtMidnight = 18000; - static final int ticksPerDay = 24000; - static final int ticksPerHour = 1000; - static final double ticksPerMinute = 1000d / 60d; - static final double ticksPerSecond = 1000d / 60d / 60d; + int ticksAtMidnight = 18000; + int ticksPerDay = 24000; + int ticksPerHour = 1000; + double ticksPerMinute = 1000d / 60d; + double ticksPerSecond = 1000d / 60d / 60d; static long[] getTime(Level level) { return new long[] {level.getDayTime(), level.getGameTime(), System.currentTimeMillis()};