-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactoring to dump itemSlugs/fluidSlugs instead of full items (70%-i…
…sh reduction in dump size)
- Loading branch information
Showing
6 changed files
with
290 additions
and
150 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
158 changes: 158 additions & 0 deletions
158
src/main/java/com/hermanoid/nerd/RecipeDumpContext.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| package com.hermanoid.nerd; | ||
|
|
||
| import codechicken.nei.util.NBTJson; | ||
| import com.google.gson.Gson; | ||
| import com.google.gson.JsonElement; | ||
| import com.google.gson.JsonObject; | ||
| import com.google.gson.JsonPrimitive; | ||
| import com.google.gson.reflect.TypeToken; | ||
| import com.hermanoid.nerd.info_extractors.GTRecipeGson; | ||
| import gregtech.common.fluid.GT_Fluid; | ||
| import net.minecraft.item.Item; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.nbt.NBTTagCompound; | ||
| import net.minecraft.util.RegistryNamespaced; | ||
| import net.minecraftforge.fluids.Fluid; | ||
| import net.minecraftforge.fluids.FluidStack; | ||
|
|
||
| import java.lang.reflect.Type; | ||
| import java.util.Arrays; | ||
| import java.util.HashMap; | ||
| import java.util.HashSet; | ||
| import java.util.Map; | ||
|
|
||
| public class RecipeDumpContext { | ||
|
|
||
| private static final RegistryNamespaced itemRegistry = Item.itemRegistry; | ||
| private static final Type fluidType = new TypeToken<Fluid>() {}.getType(); | ||
|
|
||
| public Map<String, JsonObject> dumpedItems = new HashMap<>(); | ||
| public Map<String, JsonObject> dumpedFluids = new HashMap<>(); | ||
| // AGH Circular Dependency Agh | ||
| // I can hear the police sirens already | ||
| public Gson gson = GTRecipeGson.buildGson(this); | ||
|
|
||
| private JsonObject stackToDetailedJson(ItemStack stack) { | ||
| JsonObject itemObj = new JsonObject(); | ||
| Item item = stack.getItem(); | ||
| itemObj.addProperty("id", itemRegistry.getIDForObject(item)); | ||
| itemObj.addProperty("regName", itemRegistry.getNameForObject(item)); | ||
| itemObj.addProperty("name", item != null ? stack.getUnlocalizedName() : "null"); | ||
| itemObj.addProperty("displayName", stack.getDisplayName()); | ||
|
|
||
| NBTTagCompound tag = stack.writeToNBT(new NBTTagCompound()); | ||
| itemObj.add("nbt", NBTJson.toJsonObject(tag)); | ||
|
|
||
| // I think there will be extra metadata/info here. | ||
| return itemObj; | ||
| } | ||
|
|
||
| public JsonObject fluidToDetailedJson(Fluid src) { | ||
| // Some fluids (like water) are defined using anonymous types | ||
| // I think that specifying the type as Fluid (not GT) in all cases could throw away information, | ||
| // but for non-GT_Fluids, we'll have to specify it to un-anonymize this beeswax. | ||
| JsonObject fluid; | ||
| if (src.getClass() | ||
| .equals(GT_Fluid.class)) { | ||
| fluid = (JsonObject) gson.toJsonTree(src); | ||
| } else { | ||
| fluid = (JsonObject) gson.toJsonTree(src, fluidType); | ||
| } | ||
| // Manually serialize rarity bc wierdness | ||
| fluid.addProperty( | ||
| "rarity", | ||
| src.getRarity() | ||
| .toString()); | ||
| // Slap on some info that's only available via method calls | ||
| fluid.addProperty("id", src.getID()); | ||
| return fluid; | ||
| } | ||
|
|
||
| private final static HashSet<String> standardNbtKeys; | ||
|
|
||
| static { | ||
| standardNbtKeys = new HashSet<>(Arrays.asList("id", "Count", "Damage")); | ||
| } | ||
|
|
||
| // Gets a minimal identifier for an item | ||
| // Most data (names, etc) is stored separately, once | ||
| // Only some stuff (count, a slug, rarely some extra NBT stuff) needs to be stored every time | ||
| // | ||
| // Format note: if the stack has no extra NBT and a count of 1, only the slug is returned | ||
| // this is a very common case so it's worth adding an exception for it to reduce dump sizes | ||
| // | ||
| // There is also the matter of how most (not all) fluids in this modpack have a corresponding item-based | ||
| // "FluidDisplay" provided by greg, sometimes as an ingredient and sometimes as an "otherStack" | ||
| // Some recipes have one or the other and I haven't a clue what decides it | ||
| // I'll leave resolving combining fluids+item displays to the consumer of the dump | ||
| // However, to (pretty dramatically) cut down on export size, I'll refer to the fluid slug (stored as Damage) | ||
| // instead of doing a normal NBT dump | ||
| public JsonElement getMinimalItemDump(ItemStack stack) { | ||
| // Damage is often used to differentiate items with the same name | ||
| // (e.g. all potions have the name "potion") | ||
| NBTTagCompound tag = new NBTTagCompound(); | ||
| stack.writeToNBT(tag); | ||
| // Fluid Display special case | ||
| if (itemRegistry.getIDForObject(stack.getItem()) == 4356) { | ||
| // ye olde bait-and-switch (lol noob you get a fluid instead) | ||
| // My apologies to whoever has to parse this json in the future (me) | ||
| // Note that we do rely on there being another actual fluid dump of this (not FluidDisplay) elsewhere | ||
| // We just don't have all the metadata available in this display item. | ||
| return buildMinimalFluidDump( | ||
| Short.toString(tag.getShort("Damage")), | ||
| (int) tag.getLong("mFluidDisplayAmount"), | ||
| null); | ||
| } | ||
| String slug = tag.getInteger("id") + "d" + tag.getShort("Damage"); | ||
| if (!dumpedItems.containsKey(slug)) { | ||
| dumpedItems.put(slug, stackToDetailedJson(stack)); | ||
| } | ||
|
|
||
| byte count = tag.getByte("Count"); | ||
| // func_150296_c = get HashSet of keys from NBT | ||
| // count is sometimes left as 0, we assume this implies 1 | ||
| if ((count == 0 || count == 1) && standardNbtKeys.containsAll(tag.func_150296_c())) { | ||
| // Shortened case (implied count of 1, no extra NBT) | ||
| return new JsonPrimitive(slug); | ||
| } else { | ||
| JsonObject itemObj = new JsonObject(); | ||
| itemObj.addProperty("itemSlug", slug); | ||
| itemObj.addProperty("count", count); | ||
| for (String key : standardNbtKeys) tag.removeTag(key); | ||
| itemObj.add("NBT", NBTJson.toJsonObject(tag)); | ||
| return itemObj; | ||
| } | ||
| } | ||
|
|
||
| // Similar to items, most of the time fluids aren't very unique, so we can mostly just store a slug | ||
| // A difference is that amounts vary a lot, no "implied count of 1" here. | ||
| // Also, so far as I can tell, there are no different-subitem-implied-by-Damage-or-otherwise situations, | ||
| // so the ID is enough to... IDentify... the fluid (:insert_mind_blown_emoji_here:) | ||
| public JsonObject getMinimalFluidDump(FluidStack fluid) { | ||
| String slug = Integer.toString(fluid.getFluidID()); | ||
| if (!dumpedFluids.containsKey(slug)) { | ||
| dumpedFluids.put(slug, fluidToDetailedJson(fluid.getFluid())); | ||
| } | ||
| // No special cases | ||
| // So far as I can tell, there's no special NBT values. If there's a tag, it's worth dumping all of it. | ||
| return buildMinimalFluidDump(slug, fluid.amount, fluid.tag); | ||
| } | ||
|
|
||
| // Making my code as DRY as the atmosphere in Minnesota right now (extremely) | ||
| private JsonObject buildMinimalFluidDump(String fluidSlug, int amount, NBTTagCompound tag) { | ||
| JsonObject fluidObj = new JsonObject(); | ||
| fluidObj.addProperty("fluidSlug", fluidSlug); | ||
| fluidObj.addProperty("amount", amount); | ||
| if (tag != null) { | ||
| fluidObj.add("NBT", NBTJson.toJsonObject(tag)); | ||
| } | ||
| return fluidObj; | ||
| } | ||
|
|
||
| public JsonObject dump() { | ||
| JsonObject root = new JsonObject(); | ||
| root.add("items", gson.toJsonTree(dumpedItems)); | ||
| root.add("fluids", gson.toJsonTree(dumpedFluids)); | ||
| return root; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.