fix duplicate assembly line research entries (GregTechCEu#2584)

Irgendwer01 · Aug 22, 2024 · 518a896 · 518a896
1 parent 3aee29a
commit 518a896
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/gregtech/api/recipes/RecipeMap.java b/src/main/java/gregtech/api/recipes/RecipeMap.java
@@ -437,7 +437,7 @@ public boolean removeRecipe(@NotNull Recipe recipe) {
      * @see GTRecipeHandler#removeAllRecipes(RecipeMap)
      */
     @ApiStatus.Internal
-    void removeAllRecipes() {
+    protected void removeAllRecipes() {
         if (GroovyScriptModule.isCurrentlyRunning()) {
             this.lookup.getRecipes(false).forEach(this.getGroovyScriptRecipeMap()::addBackup);
         }

diff --git a/src/main/java/gregtech/api/recipes/machines/RecipeMapAssemblyLine.java b/src/main/java/gregtech/api/recipes/machines/RecipeMapAssemblyLine.java
@@ -61,6 +61,12 @@ public boolean removeRecipe(@NotNull Recipe recipe) {
         return true;
     }
 
+    @Override
+    protected void removeAllRecipes() {
+        super.removeAllRecipes();
+        researchEntries.clear();
+    }
+
     @Override
     public void addDataStickEntry(@NotNull String researchId, @NotNull Recipe recipe) {
         if (researchId.contains("xmetaitem.")) {

diff --git a/src/main/java/gregtech/common/items/behaviors/DataItemBehavior.java b/src/main/java/gregtech/common/items/behaviors/DataItemBehavior.java
@@ -6,11 +6,12 @@
 import gregtech.api.recipes.RecipeMaps;
 import gregtech.api.recipes.machines.IResearchRecipeMap;
 import gregtech.api.util.AssemblyLineManager;
+import gregtech.api.util.ItemStackHashStrategy;
 
 import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 
-import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
+import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
@@ -41,7 +42,7 @@ public void addInformation(@NotNull ItemStack itemStack, List<String> lines) {
                 .getDataStickEntry(researchId);
         if (recipes != null && !recipes.isEmpty()) {
             lines.add(I18n.format("behavior.data_item.assemblyline.title"));
-            Collection<ItemStack> added = new ObjectOpenHashSet<>();
+            Collection<ItemStack> added = new ObjectOpenCustomHashSet<>(ItemStackHashStrategy.comparingAllButCount());
             for (Recipe recipe : recipes) {
                 ItemStack output = recipe.getOutputs().get(0);
                 if (added.add(output)) {