UDOC-0 - Attempts to add metadata to fuel registry… (#98)

Author: telvarost

gradle.properties

@@ -34,6 +34,6 @@ fabric.loom.multiProjectOptimisation=true
 
 # Test properties
     gcapi_version = 1.3.1
-    hmi_version = 5.1.1
+    hmi_version = 5.2.1
     modmenu_version = v1.8.5-beta.3
     mojangfix_version = 0.5.2

src/test/java/net/modificationstation/sltest/recipe/RecipeListener.java

@@ -9,6 +9,7 @@
 import net.modificationstation.stationapi.api.event.recipe.RecipeRegisterEvent;
 import net.modificationstation.stationapi.api.item.StationItemNbt;
 import net.modificationstation.stationapi.api.recipe.CraftingRegistry;
+import net.modificationstation.stationapi.api.recipe.FuelRegistry;
 import net.modificationstation.stationapi.api.recipe.SmeltingRegistry;
 
 import static net.modificationstation.sltest.SLTest.NAMESPACE;
@@ -41,6 +42,7 @@ public void registerRecipes(RecipeRegisterEvent event) {
                 ItemStack itemInstance = new ItemStack(ItemListener.testNBTItem);
                 StationItemNbt.class.cast(itemInstance).getStationNbt().putInt(of(NAMESPACE, "rand_num").toString(), 10);
                 SmeltingRegistry.addSmeltingRecipe(ItemListener.testItem.id, itemInstance);
+                FuelRegistry.addFuelItem(Item.ITEMS[Block.LEAVES.id], 1, 500);
             }
         }
     }

station-recipes-v0/src/main/java/net/modificationstation/stationapi/api/recipe/FuelRegistry.java

@@ -1,27 +1,46 @@
 package net.modificationstation.stationapi.api.recipe;
 
-import it.unimi.dsi.fastutil.objects.Reference2IntMap;
-import it.unimi.dsi.fastutil.objects.Reference2IntMaps;
-import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap;
+import it.unimi.dsi.fastutil.ints.*;
+import it.unimi.dsi.fastutil.objects.*;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.modificationstation.stationapi.api.registry.ItemRegistry;
 import net.modificationstation.stationapi.api.registry.RegistryEntry;
 import net.modificationstation.stationapi.api.tag.TagKey;
 import net.modificationstation.stationapi.api.util.API;
 
+import java.util.Map;
+import java.util.OptionalInt;
+
 public class FuelRegistry {
 
     private static final Reference2IntMap<TagKey<Item>> TAG_FUEL_TIME = new Reference2IntOpenHashMap<>();
-    private static final Reference2IntMap<Item> ITEM_FUEL_TIME = new Reference2IntOpenHashMap<>();
+    /**
+     * Item > Metadata, which returns the smelt time.
+     */
+    private static final Reference2ObjectMap<Item, Int2IntMap> ITEM_FUEL_TIME = new Reference2ObjectOpenHashMap<>();
 
     private static final Reference2IntMap<ItemStack> FUELS = new Reference2IntOpenHashMap<>();
     private static final Reference2IntMap<ItemStack> FUELS_VIEW = Reference2IntMaps.unmodifiable(FUELS);
     private static boolean viewInvalidated;
 
     @API
     public static int getFuelTime(ItemStack stack) {
-        return stack == null ? 0 : stack.getRegistryEntry().streamTags().mapToInt(TAG_FUEL_TIME::getInt).filter(value -> value > 0).findFirst().orElseGet(() -> ITEM_FUEL_TIME.getInt(stack.getItem()));
+        if (stack == null)
+            return 0;
+
+        // First see if a tag matches, and if so, use that
+        OptionalInt foundKey = stack.getRegistryEntry().streamTags().mapToInt(TAG_FUEL_TIME::getInt).filter(value -> value > 0).findFirst();
+        if (foundKey.isPresent())
+            return foundKey.getAsInt();
+
+        // Then check if the item has a specific entry
+        int fuelTime = ITEM_FUEL_TIME.get(stack.getItem()).getOrDefault(stack.getDamage(), 0);
+        if (fuelTime != 0)
+            return fuelTime;
+
+        // Finally check if there's a wildcard
+        return ITEM_FUEL_TIME.get(stack.getItem()).getOrDefault(-1, 0);
     }
 
     @API
@@ -32,16 +51,25 @@ public static void addFuelTag(TagKey<Item> tag, int fuelTime) {
 
     @API
     public static void addFuelItem(Item item, int fuelTime) {
+        addFuelItem(item, -1, fuelTime);
+    }
+
+    @API
+    public static void addFuelItem(Item item, int metadata, int fuelTime) {
         viewInvalidated = true;
-        ITEM_FUEL_TIME.put(item, fuelTime);
+        ITEM_FUEL_TIME.computeIfAbsent(item, (o) -> new Int2IntOpenHashMap()).put(metadata, fuelTime);
     }
 
     @API
     public static Reference2IntMap<ItemStack> getFuelsView() {
         if (viewInvalidated) {
             FUELS.clear();
-            for (Reference2IntMap.Entry<TagKey<Item>> entry : TAG_FUEL_TIME.reference2IntEntrySet()) for (RegistryEntry<Item> item : ItemRegistry.INSTANCE.getOrCreateEntryList(entry.getKey())) FUELS.put(new ItemStack(item.value()), entry.getIntValue());
-            for (Reference2IntMap.Entry<Item> entry : ITEM_FUEL_TIME.reference2IntEntrySet()) FUELS.put(new ItemStack(entry.getKey()), entry.getIntValue());
+            for (Reference2IntMap.Entry<TagKey<Item>> entry : TAG_FUEL_TIME.reference2IntEntrySet())
+                for (RegistryEntry<Item> item : ItemRegistry.INSTANCE.getOrCreateEntryList(entry.getKey()))
+                    FUELS.put(new ItemStack(item.value()), entry.getIntValue());
+            for (Map.Entry<Item, Int2IntMap> item2Meta2FuelValues : ITEM_FUEL_TIME.reference2ObjectEntrySet())
+                for (Int2IntMap.Entry meta2FuelValues : item2Meta2FuelValues.getValue().int2IntEntrySet())
+                    FUELS.put(new ItemStack(item2Meta2FuelValues.getKey(), 1, meta2FuelValues.getIntKey()), meta2FuelValues.getIntValue());
             viewInvalidated = false;
         }
         return FUELS_VIEW;