Merge branch '1.20.5' into 1.20.4

emilyploszaj · emilyploszaj · commit 1c00bdcef8da · 2025-04-13T22:18:41.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,9 @@
+### Additions
+* List ingredients can now be serialized (and can be coerced into other ingredients)
+
 ### Tweaks
-* Large amounts are now separated at and easier to read in EMI
-* Synthetic favorites no longer overlap with large counts, now use a microfont and display an approximate value
+* Recipe tree should be more conscious of catalyst ingredients, no longer requesting redundant tag ingredients
+* Empty/full search focus now does not trigger on random inputs
 
 ### Fixes
-* Fixed overlapping digits in synfavs #721
-* Fixed EMI on a server requiring clients to have EMI on NeoForge #889
-* Fixed overlap synfav count #905
-* Fixed recipe fill not respecting maximum stack size #906
+* Recipe fills no longer break when filling max stack size #915
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.20.4
 enabled_platforms=fabric,neoforge
 
 archives_base_name=emi
-mod_version=1.1.21
+mod_version=1.1.22
 maven_group=dev.emi
 
 architectury_version=4.9.83
diff --git a/xplat/src/main/java/dev/emi/emi/VanillaPlugin.java b/xplat/src/main/java/dev/emi/emi/VanillaPlugin.java
@@ -47,6 +47,7 @@
 import dev.emi.emi.api.stack.EmiStack;
 import dev.emi.emi.api.stack.FluidEmiStack;
 import dev.emi.emi.api.stack.ItemEmiStack;
+import dev.emi.emi.api.stack.ListEmiIngredient;
 import dev.emi.emi.api.stack.TagEmiIngredient;
 import dev.emi.emi.api.widget.Bounds;
 import dev.emi.emi.api.widget.GeneratedSlotWidget;
@@ -96,6 +97,7 @@
 import dev.emi.emi.runtime.EmiReloadLog;
 import dev.emi.emi.stack.serializer.FluidEmiStackSerializer;
 import dev.emi.emi.stack.serializer.ItemEmiStackSerializer;
+import dev.emi.emi.stack.serializer.ListEmiIngredientSerializer;
 import dev.emi.emi.stack.serializer.TagEmiIngredientSerializer;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
@@ -211,6 +213,7 @@ public void initialize(EmiInitRegistry registry) {
 		registry.addIngredientSerializer(ItemEmiStack.class, new ItemEmiStackSerializer());
 		registry.addIngredientSerializer(FluidEmiStack.class, new FluidEmiStackSerializer());
 		registry.addIngredientSerializer(TagEmiIngredient.class, new TagEmiIngredientSerializer());
+		registry.addIngredientSerializer(ListEmiIngredient.class, new ListEmiIngredientSerializer());
 
 		registry.addRegistryAdapter(EmiRegistryAdapter.simple(Item.class, EmiPort.getItemRegistry(), EmiStack::of));
 		registry.addRegistryAdapter(EmiRegistryAdapter.simple(Fluid.class, EmiPort.getFluidRegistry(), EmiStack::of));
diff --git a/xplat/src/main/java/dev/emi/emi/api/stack/ListEmiIngredient.java b/xplat/src/main/java/dev/emi/emi/api/stack/ListEmiIngredient.java
@@ -106,4 +106,9 @@ public List<TooltipComponent> getTooltip() {
 		tooltip.addAll(ingredients.get(item).copy().setAmount(amount).getTooltip());
 		return tooltip;
 	}
+
+	@ApiStatus.Internal
+	public List<? extends EmiIngredient> getIngredients() {
+		return ingredients;
+	}
 }
diff --git a/xplat/src/main/java/dev/emi/emi/bom/MaterialNode.java b/xplat/src/main/java/dev/emi/emi/bom/MaterialNode.java
@@ -19,6 +19,7 @@ public class MaterialNode {
 	public long amount = 1;
 	public long divisor = 1;
 	public long remainderAmount = 0;
+	public boolean catalyst = false;
 	// Should these be decoupled from material nodes?
 	public FoldState state = FoldState.EXPANDED;
 	public ProgressState progress = ProgressState.UNSTARTED;
@@ -34,6 +35,14 @@ public MaterialNode(EmiIngredient ingredient) {
 		} else {
 			this.remainder = EmiStack.EMPTY;
 		}
+		out: {
+			for (EmiStack stack : ingredient.getEmiStacks()) {
+				if (!stack.getRemainder().equals(stack)) {
+					break out;
+				}
+			}
+			catalyst = true;
+		}
 	}
 
 	public MaterialNode(MaterialNode node) {
diff --git a/xplat/src/main/java/dev/emi/emi/bom/TreeCost.java b/xplat/src/main/java/dev/emi/emi/bom/TreeCost.java
@@ -37,16 +37,6 @@ public void calculateProgress(MaterialNode node, long batches, EmiPlayerInventor
 		calculateCost(node, batches * node.amount, ChanceState.DEFAULT, true);
 	}
 
-	public static boolean isCatalyst(EmiIngredient ing) {
-		if (ing.getEmiStacks().size() == 1) {
-			EmiStack stack = ing.getEmiStacks().get(0);
-			if (stack.equals(stack.getRemainder())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
 	private void addCost(EmiIngredient stack, long amount, long minBatch, ChanceState chance) {
 		if (chance.chanced()) {
 			if (chanceCosts.containsKey(stack)) {
@@ -170,15 +160,18 @@ private void calculateCost(MaterialNode node, long amount, ChanceState chance, b
 			node.totalNeeded = 0;
 			node.neededBatches = 0;
 		}
+		boolean catalyst = node.catalyst;
+		if (catalyst) {
+			amount = node.amount;
+		}
 		EmiRecipe recipe = node.recipe;
-		if (recipe instanceof EmiResolutionRecipe) {
+		if (recipe instanceof EmiResolutionRecipe err) {
 			calculateCost(node.children.get(0), amount, chance, trackProgress);
+			if (catalyst) {
+				addRemainder(err.stack, amount, chance);
+			}
 			return;
 		}
-		boolean catalyst = isCatalyst(node.ingredient);
-		if (catalyst) {
-			amount = node.amount;
-		}
 		long original = amount;
 		List<EmiStack> ingredientStacks = node.ingredient.getEmiStacks();
 		for (int i = 0; i < ingredientStacks.size(); i++) {
@@ -229,7 +222,7 @@ private void calculateCost(MaterialNode node, long amount, ChanceState chance, b
 
 			for (MaterialNode n : node.children) {
 				if (!n.remainder.isEmpty() && n.remainderAmount > 0) {
-					if (isCatalyst(n.ingredient)) {
+					if (n.catalyst) {
 						addRemainder(n.remainder, n.remainderAmount, produced.consume(n.consumeChance));
 					} else {
 						addRemainder(n.remainder, minBatches * n.remainderAmount, produced.consume(n.consumeChance));
diff --git a/xplat/src/main/java/dev/emi/emi/network/FillRecipeC2SPacket.java b/xplat/src/main/java/dev/emi/emi/network/FillRecipeC2SPacket.java
@@ -134,7 +134,7 @@ public void apply(PlayerEntity player) {
 						return;
 					} else {
 						Slot s = crafting.get(i);
-						if (s != null && s.canInsert(stack) && stack.getCount() <= s.getMaxItemCount() && stack.getCount() < stack.getMaxCount()) {
+						if (s != null && s.canInsert(stack) && stack.getCount() <= s.getMaxItemCount() && stack.getCount() <= stack.getMaxCount()) {
 							s.setStack(stack);
 						} else {
 							player.getInventory().offerOrDrop(stack);
diff --git a/xplat/src/main/java/dev/emi/emi/registry/EmiIngredientSerializers.java b/xplat/src/main/java/dev/emi/emi/registry/EmiIngredientSerializers.java
@@ -63,6 +63,8 @@ public static EmiIngredient deserialize(JsonElement element) {
 					}
 				}
 				type = json.get("type").getAsString();
+			} else if (element.isJsonArray()) {
+				type = "list";
 			} else {
 				String[] split = element.getAsString().split(":");
 				type = split[0];
diff --git a/xplat/src/main/java/dev/emi/emi/screen/BoMScreen.java b/xplat/src/main/java/dev/emi/emi/screen/BoMScreen.java
@@ -309,7 +309,7 @@ public int getNodeHeight(MaterialNode node) {
 	}
 
 	public TreeVolume addNewNodes(MaterialNode node, long multiplier, long divisor, int depth, ChanceState chance) {
-		if (TreeCost.isCatalyst(node.ingredient)) {
+		if (node.catalyst) {
 			multiplier = node.amount;
 		} else {
 			multiplier = node.amount * (int) Math.ceil(multiplier / (float) divisor);
diff --git a/xplat/src/main/java/dev/emi/emi/screen/widget/EmiSearchWidget.java b/xplat/src/main/java/dev/emi/emi/screen/widget/EmiSearchWidget.java
@@ -146,6 +146,9 @@ public void swap() {
 
 	@Override
 	public void setFocused(boolean focused) {
+		if (focused == isFocused) {
+			return;
+		}
 		if (!focused) {
 			searchHistoryIndex = 0;
 			String currentSearch = getText();
diff --git a/xplat/src/main/java/dev/emi/emi/stack/serializer/ListEmiIngredientSerializer.java b/xplat/src/main/java/dev/emi/emi/stack/serializer/ListEmiIngredientSerializer.java
@@ -0,0 +1,76 @@
+package dev.emi.emi.stack.serializer;
+
+import net.minecraft.util.JsonHelper;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import dev.emi.emi.api.stack.EmiIngredient;
+import dev.emi.emi.api.stack.EmiStack;
+import dev.emi.emi.api.stack.ListEmiIngredient;
+import dev.emi.emi.api.stack.serializer.EmiIngredientSerializer;
+import dev.emi.emi.registry.EmiIngredientSerializers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ListEmiIngredientSerializer implements EmiIngredientSerializer<ListEmiIngredient> {
+    @Override
+    public String getType() {
+        return "list";
+    }
+
+    @Override
+    public EmiIngredient deserialize(JsonElement element) {
+        JsonArray ingredientsArray;
+        long amount;
+        float chance;
+        if (element.isJsonObject()) {
+            JsonObject json = element.getAsJsonObject();
+            amount = JsonHelper.getLong(json, "amount", 1);
+            chance = JsonHelper.getFloat(json, "chance", 1);
+            ingredientsArray = JsonHelper.getArray(json, "ingredients");
+        } else if (element.isJsonArray()) {
+            ingredientsArray = element.getAsJsonArray();
+            amount = 1;
+            chance = 1;
+        } else {
+            return EmiStack.EMPTY;
+        }
+        List<EmiIngredient> ingredients = new ArrayList<>();
+        for (JsonElement ingredientElement : ingredientsArray) {
+            ingredients.add(EmiIngredientSerializers.deserialize(ingredientElement));
+        }
+        EmiIngredient ingredient = EmiIngredient.of(ingredients, amount);
+        if (chance != 1) {
+            ingredient.setChance(chance);
+        }
+        return ingredient;
+    }
+
+    @Override
+    public JsonElement serialize(ListEmiIngredient stack) {
+        if (stack.getAmount() == 1 && stack.getChance() == 1) {
+            JsonArray array = new JsonArray();
+            for (EmiIngredient inner : stack.getIngredients()) {
+                array.add(EmiIngredientSerializers.serialize(inner));
+            }
+            return array;
+        } else {
+            JsonObject json = new JsonObject();
+            json.addProperty("type", getType());
+            if (stack.getAmount() != 1) {
+                json.addProperty("amount", stack.getAmount());
+            }
+            if (stack.getChance() != 1) {
+                json.addProperty("chance", stack.getChance());
+            }
+            JsonArray ingredients = new JsonArray();
+            for (EmiIngredient inner : stack.getIngredients()) {
+                ingredients.add(EmiIngredientSerializers.serialize(inner));
+            }
+            json.add("ingredients", ingredients);
+            return json;
+        }
+    }
+}
diff --git a/xplat/src/main/resources/assets/emi/lang/ru_ru.json b/xplat/src/main/resources/assets/emi/lang/ru_ru.json

Original file line number	Diff line number	Diff line change
`@@ -106,4 +106,9 @@ public List<TooltipComponent> getTooltip() {`
`106`	`106`	`tooltip.addAll(ingredients.get(item).copy().setAmount(amount).getTooltip());`
`107`	`107`	`return tooltip;`
`108`	`108`	`}`
	`109`	`+`
	`110`	`+ @ApiStatus.Internal`
	`111`	`+ public List<? extends EmiIngredient> getIngredients() {`
	`112`	`+ return ingredients;`
	`113`	`+ }`
`109`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,8 @@ public static EmiIngredient deserialize(JsonElement element) {`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`type = json.get("type").getAsString();`
	`66`	`+ } else if (element.isJsonArray()) {`
	`67`	`+ type = "list";`
`66`	`68`	`} else {`
`67`	`69`	`String[] split = element.getAsString().split(":");`
`68`	`70`	`type = split[0];`
Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ public int getNodeHeight(MaterialNode node) {`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`public TreeVolume addNewNodes(MaterialNode node, long multiplier, long divisor, int depth, ChanceState chance) {`
`312`		`- if (TreeCost.isCatalyst(node.ingredient)) {`
	`312`	`+ if (node.catalyst) {`
`313`	`313`	`multiplier = node.amount;`
`314`	`314`	`} else {`
`315`	`315`	`multiplier = node.amount * (int) Math.ceil(multiplier / (float) divisor);`