From 3c13ffd1b91ae8e780c2d8cc447ec2d7ef7989fe Mon Sep 17 00:00:00 2001 From: IThundxr Date: Tue, 3 Sep 2024 12:50:51 -0400 Subject: [PATCH] misc changes --- .../base/data/NumismaticsTagGen.java | 8 ++--- .../salepoint/states/FluidSalepointState.java | 2 +- .../handler/ConditionalMixinHandler.java | 3 +- .../registry/NumismaticsCommands.java | 6 ++-- .../data/fabric/NumismaticsTagGenImpl.java | 29 ------------------- .../data/forge/NumismaticsTagGenImpl.java | 29 ------------------- 6 files changed, 9 insertions(+), 68 deletions(-) delete mode 100644 fabric/src/main/java/dev/ithundxr/createnumismatics/base/data/fabric/NumismaticsTagGenImpl.java delete mode 100644 forge/src/main/java/dev/ithundxr/createnumismatics/base/data/forge/NumismaticsTagGenImpl.java diff --git a/common/src/main/java/dev/ithundxr/createnumismatics/base/data/NumismaticsTagGen.java b/common/src/main/java/dev/ithundxr/createnumismatics/base/data/NumismaticsTagGen.java index 645f43ce..196d1bf6 100644 --- a/common/src/main/java/dev/ithundxr/createnumismatics/base/data/NumismaticsTagGen.java +++ b/common/src/main/java/dev/ithundxr/createnumismatics/base/data/NumismaticsTagGen.java @@ -50,6 +50,7 @@ public static void addOptionalTag(ResourceLocation id, TagKey... tags) { OPTIONAL_TAGS.computeIfAbsent(tag, (e) -> new ArrayList<>()).add(id); } } + public static void generateBlockTags(RegistrateTagsProvider tags) { addTagToAllInRegistry(tags, BuiltInRegistries.BLOCK, NumismaticsTags.AllBlockTags.NUMISMATICS_BLOCKS.tag); @@ -58,7 +59,7 @@ public static void generateBlockTags(RegistrateTagsProvider tags) { }); for (TagKey tag : OPTIONAL_TAGS.keySet()) { - var appender = tagAppender(tags, tag); + TagsProvider.TagAppender appender = tagAppender(tags, tag); for (ResourceLocation loc : OPTIONAL_TAGS.get(tag)) appender.addOptional(loc); } @@ -92,10 +93,9 @@ public static TagsProvider.TagAppender tagAppender(RegistrateItemTagsProvi public static TagsProvider.TagAppender tagAppender(RegistrateTagsProvider prov, AllBlockTags tag) { return tagAppender(prov, tag.tag); } - - @ExpectPlatform + public static TagsProvider.TagAppender tagAppender(RegistrateTagsProvider prov, TagKey tag) { - throw new AssertionError(); + return prov.addTag(tag); } @SuppressWarnings("unchecked") diff --git a/common/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/FluidSalepointState.java b/common/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/FluidSalepointState.java index 0941c9b8..c5bfe595 100644 --- a/common/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/FluidSalepointState.java +++ b/common/src/main/java/dev/ithundxr/createnumismatics/content/salepoint/states/FluidSalepointState.java @@ -91,7 +91,7 @@ public final boolean setFilter(MultiloaderFluidStack filter, Level salepointLeve if (!filter.isEmpty() && salepointLevel.getBlockEntity(salepointPos) instanceof SalepointBlockEntity salepointBE) { BlockPos targetedPos = salepointBE.getTargetedPos(); if (targetedPos != null) { - var behaviour = getBehaviour(salepointLevel, targetedPos); + SalepointTargetBehaviour behaviour = getBehaviour(salepointLevel, targetedPos); if (behaviour instanceof IFilteringSalepointBehaviour filteringSalepointBehaviour) { if (!filteringSalepointBehaviour.canSetFilter(filter)) { return false; diff --git a/common/src/main/java/dev/ithundxr/createnumismatics/handler/ConditionalMixinHandler.java b/common/src/main/java/dev/ithundxr/createnumismatics/handler/ConditionalMixinHandler.java index 7aced951..b634d7b9 100644 --- a/common/src/main/java/dev/ithundxr/createnumismatics/handler/ConditionalMixinHandler.java +++ b/common/src/main/java/dev/ithundxr/createnumismatics/handler/ConditionalMixinHandler.java @@ -33,6 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.event.Level; +import org.slf4j.spi.LoggingEventBuilder; import org.spongepowered.asm.service.MixinService; import org.spongepowered.asm.util.Annotations; @@ -43,7 +44,7 @@ public class ConditionalMixinHandler { public static final Logger LOGGER = LoggerFactory.getLogger("Numismatics/MixinPlugin"); public static boolean shouldApply(String className) { - var logger = LOGGER.atLevel(Utils.isDevEnv() ? Level.INFO : Level.DEBUG); + LoggingEventBuilder logger = LOGGER.atLevel(Utils.isDevEnv() ? Level.INFO : Level.DEBUG); try { List annotationNodes = MixinService.getService().getBytecodeProvider().getClassNode(className).visibleAnnotations; if (annotationNodes == null) return true; diff --git a/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsCommands.java b/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsCommands.java index 45ceefa8..0a5ff186 100644 --- a/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsCommands.java +++ b/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsCommands.java @@ -19,6 +19,7 @@ package dev.ithundxr.createnumismatics.registry; import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.tree.CommandNode; import com.mojang.brigadier.tree.LiteralCommandNode; import com.simibubi.create.infrastructure.command.AllCommands; @@ -32,16 +33,13 @@ public class NumismaticsCommands { public static void register(CommandDispatcher dispatcher, boolean dedicated) { - var numismaticsCommand = literal("numismatics") + LiteralArgumentBuilder numismaticsCommand = literal("numismatics") .requires(cs -> cs.hasPermission(0)) .then(PayCommand.register()) .then(DeductCommand.register()) .then(ViewCommand.register()) .then(PayAllCommand.register()) .then(ToggleAdminModeCommand.register()) - //.then(ClearCasingCacheCommand.register()) - //.then(SplitTrainCommand.register()) - //.then(TrainInfoCommand.register()); ; if (Utils.isDevEnv()) { diff --git a/fabric/src/main/java/dev/ithundxr/createnumismatics/base/data/fabric/NumismaticsTagGenImpl.java b/fabric/src/main/java/dev/ithundxr/createnumismatics/base/data/fabric/NumismaticsTagGenImpl.java deleted file mode 100644 index d3ed0cd3..00000000 --- a/fabric/src/main/java/dev/ithundxr/createnumismatics/base/data/fabric/NumismaticsTagGenImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Numismatics - * Copyright (c) 2023-2024 The Railways Team - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package dev.ithundxr.createnumismatics.base.data.fabric; - -import com.tterrag.registrate.providers.RegistrateTagsProvider; -import net.minecraft.data.tags.TagsProvider.TagAppender; -import net.minecraft.tags.TagKey; - -public class NumismaticsTagGenImpl { - public static TagAppender tagAppender(RegistrateTagsProvider prov, TagKey tag) { - return prov.addTag(tag); - } -} diff --git a/forge/src/main/java/dev/ithundxr/createnumismatics/base/data/forge/NumismaticsTagGenImpl.java b/forge/src/main/java/dev/ithundxr/createnumismatics/base/data/forge/NumismaticsTagGenImpl.java deleted file mode 100644 index 75644fdf..00000000 --- a/forge/src/main/java/dev/ithundxr/createnumismatics/base/data/forge/NumismaticsTagGenImpl.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Numismatics - * Copyright (c) 2023-2024 The Railways Team - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package dev.ithundxr.createnumismatics.base.data.forge; - -import com.tterrag.registrate.providers.RegistrateTagsProvider; -import net.minecraft.data.tags.TagsProvider.TagAppender; -import net.minecraft.tags.TagKey; - -public class NumismaticsTagGenImpl { - public static TagAppender tagAppender(RegistrateTagsProvider prov, TagKey tag) { - return prov.addTag(tag); - } -}