Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Priority in the Resource Pack json files, used to edit Stack Visibility #337

Merged
merged 3 commits into from
Nov 11, 2023
Merged

Add support for Priority in the Resource Pack json files, used to edit Stack Visibility #337

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d08876c
Add Priority support for resource pack json files.
Kanzaji Nov 1, 2023
e87ae4e
Optimize imports
Kanzaji Nov 1, 2023
03300c0
Rework EmiData json Sorting with the Emily Idea :D
Kanzaji Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 52 additions & 42 deletions xplat/src/main/java/dev/emi/emi/data/EmiData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
package dev.emi.emi.data;

import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.regex.Pattern;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;

import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;

import dev.emi.emi.EmiPort;
import dev.emi.emi.api.recipe.EmiInfoRecipe;
import dev.emi.emi.api.recipe.EmiRecipe;
Expand All @@ -28,6 +18,16 @@
import net.minecraft.util.Identifier;
import net.minecraft.util.JsonHelper;

import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.regex.Pattern;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;

public class EmiData {
public static Map<String, EmiRecipeCategoryProperties> categoryPriorities = Map.of();
public static List<Predicate<EmiRecipe>> recipeFilters = List.of();
Expand Down Expand Up @@ -134,46 +134,56 @@ public static void init(Consumer<EmiResourceReloadListener> register) {
}
}, list -> recipeFilters = list));
register.accept(
new EmiDataLoader<List<Supplier<IndexStackData>>>(
new EmiDataLoader<List<Map<Integer, Supplier<IndexStackData>>>>(
new Identifier("emi:index_stacks"), "index/stacks", Lists::newArrayList,
(list, json, oid) -> list.add(() -> {
List<IndexStackData.Added> added = Lists.newArrayList();
List<EmiIngredient> removed = Lists.newArrayList();
List<IndexStackData.Filter> filters = Lists.newArrayList();
if (JsonHelper.hasArray(json, "added")) {
for (JsonElement el : json.getAsJsonArray("added")) {
if (el.isJsonObject()) {
JsonObject obj = el.getAsJsonObject();
EmiIngredient stack = EmiIngredientSerializer.getDeserialized(obj.get("stack"));
EmiIngredient after = EmiStack.EMPTY;
if (obj.has("after")) {
after = EmiIngredientSerializer.getDeserialized(obj.get("after"));
(list, json, oid) -> {
Map<Integer, Supplier<IndexStackData>> map = Maps.newHashMap();
map.put(JsonHelper.getInt(json, "priority", 0), () -> {
List<IndexStackData.Added> added = Lists.newArrayList();
List<EmiIngredient> removed = Lists.newArrayList();
List<IndexStackData.Filter> filters = Lists.newArrayList();
if (JsonHelper.hasArray(json, "added")) {
for (JsonElement el : json.getAsJsonArray("added")) {
if (el.isJsonObject()) {
JsonObject obj = el.getAsJsonObject();
EmiIngredient stack = EmiIngredientSerializer.getDeserialized(obj.get("stack"));
EmiIngredient after = EmiStack.EMPTY;
if (obj.has("after")) {
after = EmiIngredientSerializer.getDeserialized(obj.get("after"));
}
added.add(new IndexStackData.Added(stack, after));
}
added.add(new IndexStackData.Added(stack, after));
}
}
}
if (JsonHelper.hasArray(json, "removed")) {
for (JsonElement el : json.getAsJsonArray("removed")) {
removed.add(EmiIngredientSerializer.getDeserialized(el));
if (JsonHelper.hasArray(json, "removed")) {
for (JsonElement el : json.getAsJsonArray("removed")) {
removed.add(EmiIngredientSerializer.getDeserialized(el));
}
}
}
if (JsonHelper.hasArray(json, "filters")) {
for (JsonElement el : json.getAsJsonArray("filters")) {
if (JsonHelper.isString(el)) {
String id = el.getAsString();
if (id.startsWith("/") && id.endsWith("/")) {
Pattern pat = Pattern.compile(id.substring(1, id.length() - 1));
filters.add(new IndexStackData.Filter(s -> pat.matcher(s).find()));
} else {
filters.add(new IndexStackData.Filter(s -> s.equals(id)));
if (JsonHelper.hasArray(json, "filters")) {
for (JsonElement el : json.getAsJsonArray("filters")) {
if (JsonHelper.isString(el)) {
String id = el.getAsString();
if (id.startsWith("/") && id.endsWith("/")) {
Pattern pat = Pattern.compile(id.substring(1, id.length() - 1));
filters.add(new IndexStackData.Filter(s -> pat.matcher(s).find()));
} else {
filters.add(new IndexStackData.Filter(s -> s.equals(id)));
}
}
}
}
}
boolean disable = JsonHelper.getBoolean(json, "disable", false);
return new IndexStackData(disable, added, removed, filters);
}), list -> stackData = list));
boolean disable = JsonHelper.getBoolean(json, "disable", false);
return new IndexStackData(disable, added, removed, filters);
});
list.add(map);
},
supplierList -> {
supplierList.sort(Comparator.comparingInt((Map<Integer, Supplier<IndexStackData>> map) -> map.keySet().iterator().next()));
List<Supplier<IndexStackData>> result = Lists.newArrayList();
supplierList.forEach(map -> result.addAll(map.values()));
stackData = result;
}));
register.accept(
new EmiDataLoader<List<Supplier<EmiAlias>>>(
new Identifier("emi:aliases"), "aliases", Lists::newArrayList,
Expand Down