From 2427ce1ab614d610ce1cedb9c8b015291d3169fc Mon Sep 17 00:00:00 2001 From: Eli Orona Date: Sat, 30 Mar 2024 11:58:36 -0700 Subject: [PATCH] Add a way to get locations with the ID --- .../setting/api/RecipeRemainderLocation.java | 33 ++++++++----------- .../impl/RecipeRemainderLogicHandlerImpl.java | 7 ++-- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/library/item/item_setting/src/main/java/org/quiltmc/qsl/item/setting/api/RecipeRemainderLocation.java b/library/item/item_setting/src/main/java/org/quiltmc/qsl/item/setting/api/RecipeRemainderLocation.java index e13b8f9b8..e7e842bcd 100644 --- a/library/item/item_setting/src/main/java/org/quiltmc/qsl/item/setting/api/RecipeRemainderLocation.java +++ b/library/item/item_setting/src/main/java/org/quiltmc/qsl/item/setting/api/RecipeRemainderLocation.java @@ -27,7 +27,7 @@ /** * Contains the different recipe remainder locations that QSL supports. - * Calling {@link #register(Identifier)} allows mods to create their own remainder locations. + * Calling {@link #getOrCreate(Identifier)} allows mods to create their own remainder locations or get remainder locations without needing to compile against the other mod. * *

This class should not be extended. */ @@ -36,47 +36,47 @@ public interface RecipeRemainderLocation { /** * Remainder location for Vanilla crafting. Used in Crafting Tables and the inventory crafting screen. */ - RecipeRemainderLocation CRAFTING = register(new Identifier("minecraft:crafting")); + RecipeRemainderLocation CRAFTING = getOrCreate(new Identifier("minecraft:crafting")); /** * Remainder location for the furnace fuel slot in the different furnace types. */ - RecipeRemainderLocation FURNACE_FUEL = register(new Identifier("minecraft:furnace_fuel")); + RecipeRemainderLocation FURNACE_FUEL = getOrCreate(new Identifier("minecraft:furnace_fuel")); /** * Remainder location for the furnace ingredient slot in the different furnace types. */ - RecipeRemainderLocation FURNACE_INGREDIENT = register(new Identifier("minecraft:furnace_ingredient")); + RecipeRemainderLocation FURNACE_INGREDIENT = getOrCreate(new Identifier("minecraft:furnace_ingredient")); /** * Remainder location for the dye slot in looms. */ - RecipeRemainderLocation LOOM_DYE = register(new Identifier("minecraft:loom_dye")); + RecipeRemainderLocation LOOM_DYE = getOrCreate(new Identifier("minecraft:loom_dye")); /** * Remainder location for the potion addition in brewing stands. */ - RecipeRemainderLocation POTION_ADDITION = register(new Identifier("minecraft:potion_addition")); + RecipeRemainderLocation POTION_ADDITION = getOrCreate(new Identifier("minecraft:potion_addition")); /** * Remainder location for the input to the stone cutter. */ - RecipeRemainderLocation STONE_CUTTER_INPUT = register(new Identifier("minecraft:stone_cutter_input")); + RecipeRemainderLocation STONE_CUTTER_INPUT = getOrCreate(new Identifier("minecraft:stone_cutter_input")); /** * Remainder location for the smithing template slot. */ - RecipeRemainderLocation SMITHING_TEMPLATE = register(new Identifier("minecraft:smithing_template")); + RecipeRemainderLocation SMITHING_TEMPLATE = getOrCreate(new Identifier("minecraft:smithing_template")); /** * Remainder location for the smithing base slot. */ - RecipeRemainderLocation SMITHING_BASE = register(new Identifier("minecraft:smithing_base")); + RecipeRemainderLocation SMITHING_BASE = getOrCreate(new Identifier("minecraft:smithing_base")); /** * Remainder location for the smithing ingredient slot. */ - RecipeRemainderLocation SMITHING_INGREDIENT = register(new Identifier("minecraft:smithing_ingredient")); + RecipeRemainderLocation SMITHING_INGREDIENT = getOrCreate(new Identifier("minecraft:smithing_ingredient")); /** * The default locations for a recipe remainder. @@ -84,23 +84,18 @@ public interface RecipeRemainderLocation { RecipeRemainderLocation[] DEFAULT_LOCATIONS = {CRAFTING, FURNACE_FUEL}; /** - * Registers a new remainder location. + * Gets a new remainder location if it already exists, creating it otherwise. * @param id the id for the location - * @return a new remainder location + * @return the remainder location */ @Contract("null -> fail; _ -> new") - static RecipeRemainderLocation register(Identifier id) { + static RecipeRemainderLocation getOrCreate(Identifier id) { record RecipeRemainderLocationImpl(Identifier id) implements RecipeRemainderLocation { } Objects.requireNonNull(id, "`id` must not be null."); - var location = new RecipeRemainderLocationImpl(id); - if (!RecipeRemainderLogicHandlerImpl.LOCATIONS.add(location)) { - throw new IllegalArgumentException(String.format("Cannot add `%s` as a recipe remainder location twice!", id)); - } - - return location; + return RecipeRemainderLogicHandlerImpl.LOCATIONS.computeIfAbsent(id, RecipeRemainderLocationImpl::new); } /** diff --git a/library/item/item_setting/src/main/java/org/quiltmc/qsl/item/setting/impl/RecipeRemainderLogicHandlerImpl.java b/library/item/item_setting/src/main/java/org/quiltmc/qsl/item/setting/impl/RecipeRemainderLogicHandlerImpl.java index 4815f8b1d..94c1d637b 100644 --- a/library/item/item_setting/src/main/java/org/quiltmc/qsl/item/setting/impl/RecipeRemainderLogicHandlerImpl.java +++ b/library/item/item_setting/src/main/java/org/quiltmc/qsl/item/setting/impl/RecipeRemainderLogicHandlerImpl.java @@ -16,8 +16,8 @@ package org.quiltmc.qsl.item.setting.impl; -import java.util.HashSet; -import java.util.Set; +import java.util.HashMap; +import java.util.Map; import java.util.function.Consumer; import org.jetbrains.annotations.ApiStatus; @@ -29,13 +29,14 @@ import net.minecraft.recipe.Recipe; import net.minecraft.screen.slot.Slot; import net.minecraft.util.collection.DefaultedList; +import net.minecraft.util.Identifier; import org.quiltmc.qsl.item.setting.api.RecipeRemainderLocation; import org.quiltmc.qsl.item.setting.api.RecipeRemainderLogicHandler; @ApiStatus.Internal public final class RecipeRemainderLogicHandlerImpl implements RecipeRemainderLogicHandler { - public static final Set LOCATIONS = new HashSet<>(); + public static final Map LOCATIONS = new HashMap<>(); /** * @return {@code true} if returning the item to the inventory was successful, or {@code false} if additional handling for the remainder is needed