fix itemstack decoder, make Deserializer action a sorted list instead of a set

Author: Ecdcaeb

src/main/java/rml/deserializer/DeserializerBuilder.java

@@ -10,8 +10,8 @@
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.function.Function;
 
 /**
@@ -22,11 +22,11 @@
 
 @EarlyClass
 @PublicAPI
-public class DeserializerBuilder<T> {
-    private DeserializerManager manager;
-    private Class<T> clazz;
-    private ResourceLocation resourceLocation;
-    private HashSet<IAction> actions = new HashSet<>();
+public final class DeserializerBuilder<T> {
+    private final DeserializerManager manager;
+    private final Class<T> clazz;
+    private final ResourceLocation resourceLocation;
+    private final ArrayList<IAction> actions = new ArrayList<>();
     private IJsonObjectFunction<T> function = (context) -> null;
     private boolean isDefault = false;
     public DeserializerBuilder(DeserializerManager manager, Class<T> clazz, ResourceLocation resourceLocation){
@@ -181,7 +181,7 @@ public DeserializerBuilder<T> markDefault(){
     public AbstractDeserializer<T> build(){
         final DeserializerManager managerIn = this.manager;
         final IJsonObjectFunction<T> function = this.function;
-        final HashSet<IAction> actions = this.actions;
+        final ArrayList<IAction> actions = this.actions;
         AbstractDeserializer<T> deserializer = new AbstractDeserializer<>(resourceLocation, clazz,
                 (jsonElement)->{
                     if (!jsonElement.isJsonObject()) throw new JsonDeserializeException(jsonElement, "Only Support JsonObject.");
@@ -200,6 +200,28 @@ public AbstractDeserializer<T> build(){
         return deserializer;
     }
 
+    public <K> AbstractDeserializer<T> remappingBuild(final Class<K> cls, final Function<K, T> mapper, boolean isDefault){
+        final DeserializerManager managerIn = this.manager;
+        AbstractDeserializer<T> deserializer = new AbstractDeserializer<>(resourceLocation, clazz,
+                (jsonElement) -> {
+                    if (jsonElement.isJsonObject()) {
+                        JsonObject jsonObject = jsonElement.getAsJsonObject();
+                        if (jsonObject.has("value")) {
+                            return mapper.apply(managerIn.decode(cls, jsonObject.get("value")));
+                        } else {
+                            throw new JsonDeserializeException(jsonElement, "Missing field `value`");
+                        }
+                    } else {
+                        return mapper.apply(managerIn.decode(cls, jsonElement));
+                    }
+                }
+        );
+        if (isDefault) managerIn.addDefaultEntry(deserializer);
+        else managerIn.addEntry(deserializer);
+        return deserializer;
+    }
+
+
     public static class Context{
         public JsonObject jsonObject;
         public HashMap<String, Object> environments;

src/main/java/rml/loader/api/event/CraftingHelperInitEvent.java

@@ -9,6 +9,7 @@
 import net.minecraftforge.common.crafting.IIngredientFactory;
 import net.minecraftforge.common.crafting.IRecipeFactory;
 import net.minecraftforge.fml.common.eventhandler.Event;
+import rml.loader.core.RMLFMLLoadingPlugin;
 
 /**
  * @Project ResourceModLoader

src/main/java/rml/loader/core/RMLModDiscover.java

@@ -64,7 +64,6 @@ public static void inject(List<ModContainer> modContainers){
                     URL url = moduleFiles.nextElement();
                     try (InputStream inputStream = url.openStream()) {
                         JsonElement element = JsonHelper.parse(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
-                        RMLFMLLoadingPlugin.LOGGER.info("json rml : {}", element);
                         if (element.isJsonArray()) {
                             for (JsonElement jsonElement : element.getAsJsonArray()) {
                                 ModuleType.decodeAndRegister(jsonElement);

src/main/java/rml/loader/deserialize/RMLForgeEventHandler.java

@@ -73,9 +73,9 @@ public static void registerLootTable(LootTableRegistryEvent event){
 
     @SubscribeEvent
     public static void registerRecipeFactory(CraftingHelperInitEvent event){
-        event.register(new ResourceLocation("rml","smelt"),new SmeltRecipe.Factory());
-        event.register(new ResourceLocation("rml","brew"),new SimpleBrewRecipe.Factory());
-        event.register(new ResourceLocation("rml","anvil"),new SimpleAnvilRecipe.Factory());
+        event.register(new ResourceLocation("rml","smelt"), new SmeltRecipe.Factory());
+        event.register(new ResourceLocation("rml","brew"), new SimpleBrewRecipe.Factory());
+        event.register(new ResourceLocation("rml","anvil"), new SimpleAnvilRecipe.Factory());
     }
 
     @SubscribeEvent(priority = EventPriority.LOWEST)

src/main/java/rml/loader/deserialize/craft/recipe/NamedEmptyRecipeImpl.java

@@ -16,7 +16,7 @@
  **/
 @PrivateAPI
 public class NamedEmptyRecipeImpl extends IForgeRegistryEntry.Impl<IRecipe>  implements IRecipe {
-    public static HashSet<NamedEmptyRecipeImpl> removeCaches=new HashSet<>();
+    public static HashSet<NamedEmptyRecipeImpl> removeCaches = new HashSet<>();
     public NamedEmptyRecipeImpl(){
         removeCaches.add(this);
     }

src/main/java/rml/loader/deserialize/world/item/ItemDeserializer.java

@@ -10,6 +10,7 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.util.EnumHelper;
 import rml.deserializer.AbstractDeserializer;
+import rml.deserializer.DeserializerBuilder;
 import rml.deserializer.JsonDeserializeException;
 import rml.loader.api.utils.RandomHolder;
 import rml.loader.api.utils.values.RandomIntSupplier;
@@ -30,16 +31,15 @@ public static class EnchantmentDataDeserializer {
     public static class ItemStackDeserializer {
         public static final AbstractDeserializer<ItemStack> ITEM_STACK_DEFAULT = Deserializer.named(ItemStack.class, new ResourceLocation("minecraft", "item"))
                 .require(Item.class, "item")
-                .optionalWhen(Integer.class, "data", context -> context.get(Item.class, "item").getHasSubtypes())
+                .optionalWhen(Integer.class, "data",
+                        context -> {
+                            Item item = context.get(Item.class, "item");
+                            return item == null || !item.getHasSubtypes();
+                        })
                 .check((context -> {if (!context.ifPresent("data")) context.put("data", 0); return null;}))
                 .optional(NBTTagCompound.class, "nbt")
                 .optionalDefault(Integer.class, "count", 1)
                 .decode((context -> {
-                    RMLFMLLoadingPlugin.LOGGER.info("Decodeing ItemStack");
-                    for (Map.Entry<String, ?> entry : context.environments.entrySet()) {
-                        RMLFMLLoadingPlugin.LOGGER.info("Data : {} : {}", entry.getKey(), entry.getValue());
-                    }
-                    RMLFMLLoadingPlugin.LOGGER.info("End Item Stack");
                     Item item = context.get(Item.class, "item");
                     int data = context.get(Integer.class, "data");
                     int count = context.get(Integer.class, "count");