Merge branch '1.19.4' into 1.19.3

emilyploszaj · Nov 6, 2023 · 106b871 · 106b871
2 parents 052acfa + b684a94
commit 106b871
Show file tree

Hide file tree

Showing 7 changed files with 684 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
+### Tweaks
+* Disabled stacks no longer appear as workstations #323
+
 ### Fixes
-* Fixed JEMI tooltips #330
-* Fixed slot highlight misalignment #328
-* Fixed slot highlight for mod search
+* Fixed "exception deserializing stack" and related resource oddities with a temporary workaround #257
+* Fixed typo in log #341
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.19.3
 enabled_platforms=fabric,forge
 
 archives_base_name=emi
-mod_version=1.0.23
+mod_version=1.0.24
 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
@@ -89,9 +89,6 @@
 import dev.emi.emi.runtime.EmiDrawContext;
 import dev.emi.emi.runtime.EmiLog;
 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.TagEmiIngredientSerializer;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
@@ -202,10 +199,6 @@ public class VanillaPlugin implements EmiPlugin {
 
 	@Override
 	public void register(EmiRegistry registry) {
-		registry.addIngredientSerializer(ItemEmiStack.class, new ItemEmiStackSerializer());
-		registry.addIngredientSerializer(FluidEmiStack.class, new FluidEmiStackSerializer());
-		registry.addIngredientSerializer(TagEmiIngredient.class, new TagEmiIngredientSerializer());
-
 		registry.addCategory(CRAFTING);
 		registry.addCategory(SMELTING);
 		registry.addCategory(BLASTING);

diff --git a/xplat/src/main/java/dev/emi/emi/jemi/JemiPlugin.java b/xplat/src/main/java/dev/emi/emi/jemi/JemiPlugin.java
@@ -217,7 +217,7 @@ public void register(EmiRegistry registry) {
 
 		List<IRecipeCategory<?>> categories = runtime.getRecipeManager().createRecipeCategoryLookup().includeHidden().get().toList();
 		for (IRecipeCategory<?> c : categories) {
-			EmiLog.info("[JEMI] Collecing data for " + c.getTitle().getString());
+			EmiLog.info("[JEMI] Collecting data for " + c.getTitle().getString());
 			EmiReloadManager.step(EmiPort.literal("Loading JEI data for ").append(c.getTitle()), 5_000);
 			try {
 				RecipeType type = c.getRecipeType();

diff --git a/xplat/src/main/java/dev/emi/emi/registry/EmiRecipes.java b/xplat/src/main/java/dev/emi/emi/registry/EmiRecipes.java
@@ -81,7 +81,14 @@ public static void bake() {
 			}
 			return true;
 		}).toList();
-		manager = new Manager(categories, workstations, filtered);
+		Map<EmiRecipeCategory, List<EmiIngredient>> filteredWorkstations = Maps.newHashMap();
+		for (Map.Entry<EmiRecipeCategory, List<EmiIngredient>> entry : workstations.entrySet()) {
+			List<EmiIngredient> w = entry.getValue().stream().filter(s -> !EmiHidden.isDisabled(s)).toList();
+			if (!w.isEmpty()) {
+				filteredWorkstations.put(entry.getKey(), w);
+			}
+		}
+		manager = new Manager(categories, filteredWorkstations, filtered);
 		EmiLog.info("Baked " + recipes.size() + " recipes in " + (System.currentTimeMillis() - start) + "ms");
 	}
 

diff --git a/xplat/src/main/java/dev/emi/emi/runtime/EmiReloadManager.java b/xplat/src/main/java/dev/emi/emi/runtime/EmiReloadManager.java
@@ -9,6 +9,9 @@
 import dev.emi.emi.EmiPort;
 import dev.emi.emi.api.EmiRegistry;
 import dev.emi.emi.api.recipe.EmiRecipe;
+import dev.emi.emi.api.stack.FluidEmiStack;
+import dev.emi.emi.api.stack.ItemEmiStack;
+import dev.emi.emi.api.stack.TagEmiIngredient;
 import dev.emi.emi.bom.BoM;
 import dev.emi.emi.jemi.JemiPlugin;
 import dev.emi.emi.platform.EmiAgnos;
@@ -25,6 +28,9 @@
 import dev.emi.emi.registry.EmiTags;
 import dev.emi.emi.screen.EmiScreenManager;
 import dev.emi.emi.search.EmiSearch;
+import dev.emi.emi.stack.serializer.FluidEmiStackSerializer;
+import dev.emi.emi.stack.serializer.ItemEmiStackSerializer;
+import dev.emi.emi.stack.serializer.TagEmiIngredientSerializer;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.Text;
 
@@ -137,7 +143,13 @@ public void run() {
 						EmiReloadLog.warn("Recipe Manager is null");
 						break;
 					}
-
+					{
+						// TODO temporary fix
+						EmiRegistry registry = new EmiRegistryImpl();
+						registry.addIngredientSerializer(ItemEmiStack.class, new ItemEmiStackSerializer());
+						registry.addIngredientSerializer(FluidEmiStack.class, new FluidEmiStackSerializer());
+						registry.addIngredientSerializer(TagEmiIngredient.class, new TagEmiIngredientSerializer());
+					}
 					EmiHidden.reload();
 
 					step(EmiPort.literal("Processing tags"));