fixes (#246)

* fix oven hatch rendering + auto output * Update MachineRenderer.java * fix ingredient copy + fast gtrecipe copy * fix bolt name * parallel searching
GregTechCEu · Aug 1, 2023 · f646830 · f646830
1 parent 3514d21
commit f646830
Show file tree

Hide file tree

Showing 15 changed files with 79 additions and 71 deletions.
diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/ItemRecipeCapability.java b/common/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/ItemRecipeCapability.java
@@ -3,7 +3,6 @@
 import com.gregtechceu.gtceu.api.recipe.content.ContentModifier;
 import com.gregtechceu.gtceu.api.recipe.content.SerializerIngredient;
 import com.gregtechceu.gtceu.api.recipe.ingredient.SizedIngredient;
-import com.gregtechceu.gtceu.core.mixins.IngredientAccessor;
 import net.minecraft.world.item.crafting.Ingredient;
 
 import java.util.Arrays;
@@ -26,10 +25,7 @@ public Ingredient copyInner(Ingredient content) {
         if (content instanceof SizedIngredient sizedIngredient) {
             return SizedIngredient.copy(sizedIngredient);
         }
-        if (content.getClass() == Ingredient.class) {
-            return IngredientAccessor.create(Arrays.stream(((IngredientAccessor) content).getValues()));
-        }
-        return super.copyInner(content);
+        return SizedIngredient.create(content, 1);
     }
 
     @Override

diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMultiPart.java b/common/src/main/java/com/gregtechceu/gtceu/api/machine/feature/multiblock/IMultiPart.java
@@ -57,6 +57,13 @@ default boolean canShared() {
      */
     List<IRecipeHandlerTrait> getRecipeHandlers();
 
+    /**
+     * whether its base model can be replaced by controller when it is formed.
+     */
+    default boolean replacePartModelWhenFormed() {
+        return true;
+    }
+
     /**
      * get part's Appearance. same as IForgeBlock.getAppearance() / IFabricBlock.getAppearance()
      */

diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableFluidTank.java b/common/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableFluidTank.java
@@ -89,8 +89,8 @@ public ManagedFieldHolder getFieldHolder() {
     @Override
     public List<FluidStack> handleRecipeInner(IO io, GTRecipe recipe, List<FluidStack> left, @Nullable String slotName, boolean simulate) {
         if (io != this.handlerIO) return left;
-        var lastStatus = simulate ? Arrays.stream(storages).map(FluidStorage::serializeNBT).toArray(CompoundTag[]::new) : null;
-        for (FluidStorage capability : storages) {
+        var capabilities = simulate ? Arrays.stream(storages).map(FluidStorage::copy).toArray(FluidStorage[]::new) : storages;
+        for (FluidStorage capability : capabilities) {
             Iterator<FluidStack> iterator = left.iterator();
             if (io == IO.IN) {
                 while (iterator.hasNext()) {
@@ -133,14 +133,6 @@ public List<FluidStack> handleRecipeInner(IO io, GTRecipe recipe, List<FluidStac
             }
             if (left.isEmpty()) break;
         }
-        if (lastStatus != null) {
-            for (int i = 0; i < storages.length; i++) {
-                var lastOnChange = storages[i].getOnContentsChanged();
-                storages[i].setOnContentsChanged(() -> {});
-                storages[i].deserializeNBT(lastStatus[i]);
-                storages[i].setOnContentsChanged(lastOnChange);
-            }
-        }
         return left.isEmpty() ? null : left;
     }
 

diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableItemStackHandler.java b/common/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableItemStackHandler.java
@@ -21,9 +21,7 @@
 
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 /**
  * @author KilaBash
@@ -79,9 +77,8 @@ public ManagedFieldHolder getFieldHolder() {
     @Override
     public List<Ingredient> handleRecipeInner(IO io, GTRecipe recipe, List<Ingredient> left, @Nullable String slotName, boolean simulate) {
         if (io != this.handlerIO) return left;
-        var capability = storage;
+        var capability = simulate ? storage.copy() : storage;
         Iterator<Ingredient> iterator = left.iterator();
-        var lastStatus = simulate ? storage.serializeNBT() : null;
         if (io == IO.IN) {
             while (iterator.hasNext()) {
                 Ingredient ingredient = iterator.next();
@@ -120,12 +117,6 @@ public List<Ingredient> handleRecipeInner(IO io, GTRecipe recipe, List<Ingredien
                 if (output.isEmpty()) iterator.remove();
             }
         }
-        if (lastStatus != null) {
-            var lastOnChange = storage.getOnContentsChanged();
-            storage.setOnContentsChanged(() -> {});
-            storage.deserializeNBT(lastStatus);
-            storage.setOnContentsChanged(lastOnChange);
-        }
         return left.isEmpty() ? null : left;
     }
 

diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipe.java b/common/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipe.java
@@ -10,10 +10,8 @@
 import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
 import com.gregtechceu.gtceu.api.recipe.content.Content;
 import com.gregtechceu.gtceu.api.recipe.content.ContentModifier;
-import io.netty.buffer.Unpooled;
 import lombok.Getter;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.Tuple;
@@ -61,10 +59,24 @@ public GTRecipe(GTRecipeType recipeType, ResourceLocation id, Map<RecipeCapabili
         this.isFuel = isFuel;
     }
 
+    public Map<RecipeCapability<?>, List<Content>> copyContents(Map<RecipeCapability<?>, List<Content>> contents) {
+        Map<RecipeCapability<?>, List<Content>> copyContents = new HashMap<>();
+        for (var entry : contents.entrySet()) {
+            var contentList = entry.getValue();
+            var cap = entry.getKey();
+            if (contentList != null && !contentList.isEmpty()) {
+                List<Content> contentsCopy = new ArrayList<>();
+                for (Content content : contentList) {
+                    contentsCopy.add(content.copy(cap));
+                }
+                copyContents.put(entry.getKey(), contentsCopy);
+            }
+        }
+        return copyContents;
+    }
+
     public GTRecipe copy() {
-        FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer());
-        GTRecipeSerializer.SERIALIZER.toNetwork(buf, this);
-        return GTRecipeSerializer.SERIALIZER.fromNetwork(id, buf);
+        return new GTRecipe(recipeType, id, copyContents(inputs), copyContents(outputs), copyContents(tickInputs), copyContents(tickOutputs), conditions, data, duration, isFuel);
     }
 
     public GTRecipe copy(ContentModifier modifier) {

diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipeType.java b/common/src/main/java/com/gregtechceu/gtceu/api/recipe/GTRecipeType.java
@@ -59,6 +59,7 @@
 import java.io.InputStream;
 import java.util.*;
 import java.util.function.*;
+import java.util.stream.Collectors;
 
 /**
  * @author KilaBash
@@ -210,18 +211,14 @@ public List<GTRecipe> searchFuelRecipe(RecipeManager recipeManager, IRecipeCapab
 
     public List<GTRecipe> searchRecipe(RecipeManager recipeManager, IRecipeCapabilityHolder holder) {
         if (!holder.hasProxies()) return Collections.emptyList();
-        List<GTRecipe> matches = new ArrayList<>();
-        for (var recipe : recipeManager.getAllRecipesFor(this)) {
-            if (!recipe.isFuel && recipe.matchRecipe(holder).isSuccess() && recipe.matchTickRecipe(holder).isSuccess()) {
-                matches.add(recipe);
-            }
-        }
+        List<GTRecipe> matches = recipeManager.getAllRecipesFor(this).parallelStream()
+                .filter(recipe -> !recipe.isFuel && recipe.matchRecipe(holder).isSuccess() && recipe.matchTickRecipe(holder).isSuccess())
+                .collect(Collectors.toList());
         for (List<GTRecipe> recipes : proxyRecipes.values()) {
-            for (GTRecipe recipe : recipes) {
-                if (!recipe.isFuel && recipe.matchRecipe(holder).isSuccess() && recipe.matchTickRecipe(holder).isSuccess()) {
-                    matches.add(recipe);
-                }
-            }
+            var found = recipes.parallelStream()
+                    .filter(recipe -> !recipe.isFuel && recipe.matchRecipe(holder).isSuccess() && recipe.matchTickRecipe(holder).isSuccess())
+                    .toList();
+            matches.addAll(found);
         }
         return matches;
     }

diff --git a/common/src/main/java/com/gregtechceu/gtceu/api/recipe/content/Content.java b/common/src/main/java/com/gregtechceu/gtceu/api/recipe/content/Content.java
@@ -1,5 +1,6 @@
 package com.gregtechceu.gtceu.api.recipe.content;
 
+import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability;
 import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture;
 import com.lowdragmc.lowdraglib.utils.LocalizationUtils;
 import com.mojang.blaze3d.systems.RenderSystem;
@@ -32,6 +33,10 @@ public Object getContent() {
         return content;
     }
 
+    public Content copy(RecipeCapability<?> capability) {
+        return new Content(capability.copyContent(content), chance, tierChanceBoost, slotName, uiName);
+    }
+
     public IGuiTexture createOverlay(boolean perTick) {
         return new IGuiTexture() {
             @Override

diff --git a/common/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/MachineRenderer.java b/common/src/main/java/com/gregtechceu/gtceu/client/renderer/machine/MachineRenderer.java
@@ -160,7 +160,7 @@ public void renderBaseModel(List<BakedQuad> quads, MachineDefinition definition,
      */
     @Environment(EnvType.CLIENT)
     public void renderMachine(List<BakedQuad> quads, MachineDefinition definition, @Nullable MetaMachine machine, Direction frontFacing, @Nullable Direction side, RandomSource rand, @Nullable Direction modelFacing, ModelState modelState) {
-        if (!(machine instanceof IMultiPart part) || !renderReplacedPartMachine(quads, part, frontFacing, side, rand, modelFacing, modelState)) {
+        if (!(machine instanceof IMultiPart part) || !part.replacePartModelWhenFormed() || !renderReplacedPartMachine(quads, part, frontFacing, side, rand, modelFacing, modelState)) {
             renderBaseModel(quads, definition, machine, frontFacing, side, rand);
         }
     }

diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java b/common/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java
@@ -265,7 +265,7 @@ public static void generateTools() {
         SHAPE_EXTRUDERS[1] = SHAPE_EXTRUDER_ROD = REGISTRATE.item("rod_extruder_mold", Item::new)
                 .lang("Extruder Mold (Rod)").onRegister(materialInfo(new ItemMaterialInfo(new MaterialStack(GTMaterials.Steel, GTValues.M * 4)))).register();
         SHAPE_EXTRUDERS[2] = SHAPE_EXTRUDER_BOLT = REGISTRATE.item("bolt_extruder_mold", Item::new)
-                .lang("Extruder Mold (Bold)").onRegister(materialInfo(new ItemMaterialInfo(new MaterialStack(GTMaterials.Steel, GTValues.M * 4)))).register();
+                .lang("Extruder Mold (Bolt)").onRegister(materialInfo(new ItemMaterialInfo(new MaterialStack(GTMaterials.Steel, GTValues.M * 4)))).register();
         SHAPE_EXTRUDERS[3] = SHAPE_EXTRUDER_RING = REGISTRATE.item("ring_extruder_mold", Item::new)
                 .lang("Extruder Mold (Ring)").onRegister(materialInfo(new ItemMaterialInfo(new MaterialStack(GTMaterials.Steel, GTValues.M * 4)))).register();
         SHAPE_EXTRUDERS[4] = SHAPE_EXTRUDER_CELL = REGISTRATE.item("cell_extruder_mold", Item::new)

diff --git a/common/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/CokeOvenHatch.java b/common/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/CokeOvenHatch.java
@@ -8,7 +8,6 @@
 import com.gregtechceu.gtceu.api.machine.trait.FluidTankProxyTrait;
 import com.gregtechceu.gtceu.api.machine.trait.ItemHandlerProxyTrait;
 import com.gregtechceu.gtceu.common.machine.multiblock.primitive.CokeOvenMachine;
-import com.lowdragmc.lowdraglib.misc.ItemTransferList;
 import com.lowdragmc.lowdraglib.side.fluid.FluidTransferHelper;
 import com.lowdragmc.lowdraglib.side.item.ItemTransferHelper;
 import com.lowdragmc.lowdraglib.syncdata.ISubscription;
@@ -34,17 +33,18 @@
 public class CokeOvenHatch extends MultiblockPartMachine {
     protected static final ManagedFieldHolder MANAGED_FIELD_HOLDER = new ManagedFieldHolder(CokeOvenHatch.class, MultiblockPartMachine.MANAGED_FIELD_HOLDER);
 
-    public final ItemHandlerProxyTrait inventory;
+    public final ItemHandlerProxyTrait inputInventory, outputInventory;
     public final FluidTankProxyTrait tank;
     @Nullable
     protected TickableSubscription autoIOSubs;
     @Nullable
-    protected ISubscription inventorySubs, tankSubs;
+    protected ISubscription outputInventorySubs, outputTankSubs;
 
 
     public CokeOvenHatch(IMachineBlockEntity holder, Object... args) {
         super(holder);
-        this.inventory = new ItemHandlerProxyTrait(this, IO.BOTH);
+        this.inputInventory = new ItemHandlerProxyTrait(this, IO.IN);
+        this.outputInventory = new ItemHandlerProxyTrait(this, IO.OUT);
         this.tank = new FluidTankProxyTrait(this, IO.BOTH);
     }
 
@@ -59,41 +59,44 @@ public ManagedFieldHolder getFieldHolder() {
     @Override
     public void onUnload() {
         super.onUnload();
-        inventory.setProxy(null);
+        inputInventory.setProxy(null);
+        outputInventory.setProxy(null);
         tank.setProxy(null);
-        if (inventorySubs != null) {
-            inventorySubs.unsubscribe();
-            inventorySubs = null;
+        if (outputInventorySubs != null) {
+            outputInventorySubs.unsubscribe();
+            outputInventorySubs = null;
         }
-        if (tankSubs != null) {
-            tankSubs.unsubscribe();
-            tankSubs = null;
+        if (outputTankSubs != null) {
+            outputTankSubs.unsubscribe();
+            outputTankSubs = null;
         }
     }
 
     @Override
     public void addedToController(IMultiController controller) {
         super.addedToController(controller);
         if (controller instanceof CokeOvenMachine cokeOven) {
-            inventorySubs = cokeOven.exportItems.addChangedListener(this::updateAutoIOSubscription);
-            tankSubs = cokeOven.exportFluids.addChangedListener(this::updateAutoIOSubscription);
-            inventory.setProxy(new ItemTransferList(cokeOven.importItems, cokeOven.exportItems));
+            outputInventorySubs = cokeOven.exportItems.addChangedListener(this::updateAutoIOSubscription);
+            outputTankSubs = cokeOven.exportFluids.addChangedListener(this::updateAutoIOSubscription);
+            inputInventory.setProxy(cokeOven.importItems);
+            outputInventory.setProxy(cokeOven.exportItems);
             tank.setProxy(cokeOven.exportFluids);
         }
     }
 
     @Override
     public void removedFromController(IMultiController controller) {
         super.removedFromController(controller);
-        inventory.setProxy(null);
+        inputInventory.setProxy(null);
+        outputInventory.setProxy(null);
         tank.setProxy(null);
-        if (inventorySubs != null) {
-            inventorySubs.unsubscribe();
-            inventorySubs = null;
+        if (outputInventorySubs != null) {
+            outputInventorySubs.unsubscribe();
+            outputInventorySubs = null;
         }
-        if (tankSubs != null) {
-            tankSubs.unsubscribe();
-            tankSubs = null;
+        if (outputTankSubs != null) {
+            outputTankSubs.unsubscribe();
+            outputTankSubs = null;
         }
     }
 
@@ -102,6 +105,11 @@ public boolean canShared() {
         return false;
     }
 
+    @Override
+    public boolean replacePartModelWhenFormed() {
+        return false;
+    }
+
     //////////////////////////////////////
     //********     Auto IO     *********//
     //////////////////////////////////////
@@ -119,7 +127,7 @@ public void onRotated(Direction oldFacing, Direction newFacing) {
     }
 
     protected void updateAutoIOSubscription() {
-        if ((!inventory.isEmpty() && ItemTransferHelper.getItemTransfer(getLevel(), getPos().relative(getFrontFacing()), getFrontFacing().getOpposite()) != null) ||
+        if ((!outputInventory.isEmpty() && ItemTransferHelper.getItemTransfer(getLevel(), getPos().relative(getFrontFacing()), getFrontFacing().getOpposite()) != null) ||
                 (!tank.isEmpty() && FluidTransferHelper.getFluidTransfer(getLevel(), getPos().relative(getFrontFacing()), getFrontFacing().getOpposite()) != null)) {
             autoIOSubs = subscribeServerTick(autoIOSubs, this::autoIO);
         } else if (autoIOSubs != null) {
@@ -130,7 +138,7 @@ protected void updateAutoIOSubscription() {
 
     protected void autoIO() {
         if (getOffsetTimer() % 5 == 0) {
-            inventory.exportToNearby(getFrontFacing());
+            outputInventory.exportToNearby(getFrontFacing());
             tank.exportToNearby(getFrontFacing());
             updateAutoIOSubscription();
         }

diff --git a/fabric/src/generated/resources/assets/gtceu/lang/en_ud.json b/fabric/src/generated/resources/assets/gtceu/lang/en_ud.json
@@ -2562,7 +2562,7 @@
   "item.gtceu.board.phenolic.tooltip": "pɹɐoᗺ poo⅁ Ɐㄥ§",
   "item.gtceu.board.plastic.tooltip": "pɹɐoᗺ poo⅁ Ɐㄥ§",
   "item.gtceu.board.wetware.tooltip": "ǝɟıן sdǝǝʞ ʇɐɥʇ pɹɐoᗺ ǝɥ⟘ㄥ§",
-  "item.gtceu.bolt_extruder_mold": ")pןoᗺ( pןoW ɹǝpnɹʇxƎ",
+  "item.gtceu.bolt_extruder_mold": ")ʇןoᗺ( pןoW ɹǝpnɹʇxƎ",
   "item.gtceu.bottle.purple.drink.tooltip": "¡ʞuıɹᗡ ǝןdɹnԀ ʇob I ¿ɐǝ⟘ ǝɔI ǝɯos ɹO ˙ǝpɐuoɯǝꞀ ʇnoqɐ ʍoHㄥ§",
   "item.gtceu.bottle_casting_mold": ")ǝןʇʇoᗺ( pןoW buıʇsɐƆ",
   "item.gtceu.bottle_extruder_mold": ")ǝןʇʇoᗺ( pןoW ɹǝpnɹʇxƎ",

diff --git a/fabric/src/generated/resources/assets/gtceu/lang/en_us.json b/fabric/src/generated/resources/assets/gtceu/lang/en_us.json
@@ -2562,7 +2562,7 @@
   "item.gtceu.board.phenolic.tooltip": "§7A Good Board",
   "item.gtceu.board.plastic.tooltip": "§7A Good Board",
   "item.gtceu.board.wetware.tooltip": "§7The Board that keeps life",
-  "item.gtceu.bolt_extruder_mold": "Extruder Mold (Bold)",
+  "item.gtceu.bolt_extruder_mold": "Extruder Mold (Bolt)",
   "item.gtceu.bottle.purple.drink.tooltip": "§7How about Lemonade. Or some Ice Tea? I got Purple Drink!",
   "item.gtceu.bottle_casting_mold": "Casting Mold (Bottle)",
   "item.gtceu.bottle_extruder_mold": "Extruder Mold (Bottle)",

diff --git a/forge/src/generated/resources/assets/gtceu/lang/en_ud.json b/forge/src/generated/resources/assets/gtceu/lang/en_ud.json
@@ -2562,7 +2562,7 @@
   "item.gtceu.board.phenolic.tooltip": "pɹɐoᗺ poo⅁ Ɐㄥ§",
   "item.gtceu.board.plastic.tooltip": "pɹɐoᗺ poo⅁ Ɐㄥ§",
   "item.gtceu.board.wetware.tooltip": "ǝɟıן sdǝǝʞ ʇɐɥʇ pɹɐoᗺ ǝɥ⟘ㄥ§",
-  "item.gtceu.bolt_extruder_mold": ")pןoᗺ( pןoW ɹǝpnɹʇxƎ",
+  "item.gtceu.bolt_extruder_mold": ")ʇןoᗺ( pןoW ɹǝpnɹʇxƎ",
   "item.gtceu.bottle.purple.drink.tooltip": "¡ʞuıɹᗡ ǝןdɹnԀ ʇob I ¿ɐǝ⟘ ǝɔI ǝɯos ɹO ˙ǝpɐuoɯǝꞀ ʇnoqɐ ʍoHㄥ§",
   "item.gtceu.bottle_casting_mold": ")ǝןʇʇoᗺ( pןoW buıʇsɐƆ",
   "item.gtceu.bottle_extruder_mold": ")ǝןʇʇoᗺ( pןoW ɹǝpnɹʇxƎ",

diff --git a/forge/src/generated/resources/assets/gtceu/lang/en_us.json b/forge/src/generated/resources/assets/gtceu/lang/en_us.json
@@ -2562,7 +2562,7 @@
   "item.gtceu.board.phenolic.tooltip": "§7A Good Board",
   "item.gtceu.board.plastic.tooltip": "§7A Good Board",
   "item.gtceu.board.wetware.tooltip": "§7The Board that keeps life",
-  "item.gtceu.bolt_extruder_mold": "Extruder Mold (Bold)",
+  "item.gtceu.bolt_extruder_mold": "Extruder Mold (Bolt)",
   "item.gtceu.bottle.purple.drink.tooltip": "§7How about Lemonade. Or some Ice Tea? I got Purple Drink!",
   "item.gtceu.bottle_casting_mold": "Casting Mold (Bottle)",
   "item.gtceu.bottle_extruder_mold": "Extruder Mold (Bottle)",

diff --git a/settings.gradle b/settings.gradle
@@ -57,7 +57,7 @@ dependencyResolutionManagement {
         def architecturyLoomVersion = "1.0-SNAPSHOT"
         def vineFlowerVersion = "1.+"
         def macheteVersion = "1.+"
-        def ldLibVersion = "1.0.16"
+        def ldLibVersion = "1.0.16.a"
 
         fabric {
             def parchment = version("parchment", parchmentVersion)