- Remove RequirementRandomItem and RequirementTypeRandomItemArray.

KasumiNova · KasumiNova · commit de11000b5d37 · 2023-12-29T21:09:59.000+08:00
- Add RequirementIngredientArray JEI output tips.
- RecipeCraftingContextPool now will clear POOL directly when reloaded.
diff --git a/src/main/java/github/kasuminova/mmce/common/concurrent/RecipeCraftingContextPool.java b/src/main/java/github/kasuminova/mmce/common/concurrent/RecipeCraftingContextPool.java
@@ -44,9 +44,7 @@ public static void returnCtx(@Nonnull RecipeCraftingContext ctx) {
     }
 
     public static void onReload() {
-        for (final Queue<RecipeCraftingContext> queue : POOL.values()) {
-            queue.clear();
-        }
+        POOL.clear();
 
         reloadCounter++;
     }
diff --git a/src/main/java/hellfirepvp/modularmachinery/common/crafting/helper/ComponentOutputRestrictor.java b/src/main/java/hellfirepvp/modularmachinery/common/crafting/helper/ComponentOutputRestrictor.java
@@ -18,8 +18,10 @@
  * Created by HellFirePvP
  * Date: 12.07.2017 / 21:19
  */
+@Deprecated
 public abstract class ComponentOutputRestrictor {
 
+    @Deprecated
     public static class RestrictionTank extends ComponentOutputRestrictor {
 
         public final HybridFluid inserted;
@@ -32,6 +34,7 @@ public RestrictionTank(HybridFluid inserted, ProcessingComponent<?> exactCompone
 
     }
 
+    @Deprecated
     public static class RestrictionInventory extends ComponentOutputRestrictor {
 
         public final ItemStack inserted;
diff --git a/src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/RequirementRandomItem.java b/src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/RequirementRandomItem.java
diff --git a/src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/jei/JEIComponentIngredientArray.java b/src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/jei/JEIComponentIngredientArray.java
@@ -5,6 +5,7 @@
 import hellfirepvp.modularmachinery.common.crafting.requirement.RequirementIngredientArray;
 import hellfirepvp.modularmachinery.common.integration.ingredient.IngredientItemStack;
 import hellfirepvp.modularmachinery.common.integration.recipe.RecipeLayoutPart;
+import hellfirepvp.modularmachinery.common.machine.IOType;
 import hellfirepvp.modularmachinery.common.util.ItemUtils;
 import hellfirepvp.modularmachinery.common.util.MiscUtils;
 import net.minecraft.client.resources.I18n;
@@ -69,34 +70,40 @@ public RecipeLayoutPart<IngredientItemStack> getLayoutPart(Point offset) {
     @Override
     public void onJEIHoverTooltip(int slotIndex, boolean input, IngredientItemStack ingredient, List<String> tooltip) {
         tooltip.add("");
-        tooltip.add(I18n.format("tooltip.machinery.ingredient_array_input"));
+        IOType actionType = requirement.getActionType();
+
+        switch (actionType) {
+            case INPUT -> tooltip.add(I18n.format("tooltip.machinery.ingredient_array_input"));
+            case OUTPUT -> tooltip.add(I18n.format("tooltip.machinery.ingredient_array_output"));
+        }
+
+        float totalChance = 1F;
+        if (actionType == IOType.OUTPUT) {
+            totalChance = 0;
+            for (final ChancedIngredientStack reqIngredient : requirement.getIngredients()) {
+                totalChance += reqIngredient.chance;
+            }
+        }
+
         StringBuilder tooltipBuilder = new StringBuilder();
         for (ChancedIngredientStack stack : requirement.getIngredients()) {
             switch (stack.ingredientType) {
-                case ITEMSTACK -> {
-                    ItemStack itemStack = stack.itemStack;
-                    tooltipBuilder.append(itemStack.getDisplayName());
-                }
-                case ORE_DICT -> {
-                    tooltipBuilder.append(stack.oreDictName);
-                }
+                case ITEMSTACK -> tooltipBuilder.append(stack.itemStack.getDisplayName());
+                case ORE_DICT -> tooltipBuilder.append(stack.oreDictName);
             }
 
             if (stack.minCount != stack.maxCount) {
                 tooltipBuilder.append(" * ").append(String.format("%d ~ %d", stack.minCount, stack.maxCount));
             } else {
-                switch (stack.ingredientType) {
-                    case ITEMSTACK -> tooltipBuilder.append(" * ").append(stack.itemStack.getCount());
-                    case ORE_DICT -> tooltipBuilder.append(" * ").append(stack.count);
-                }
+                tooltipBuilder.append(" * ").append(stack.count);
             }
 
-            float chance = stack.chance * requirement.chance;
+            float chance = actionType == IOType.OUTPUT ? stack.chance * requirement.chance : stack.chance / totalChance;
             if (chance < 1F && chance >= 0F) {
                 tooltipBuilder.append(" (");
 
                 String keyNever = input ? "tooltip.machinery.chance.in.never" : "tooltip.machinery.chance.out.never";
-                String keyChance = input ? "tooltip.machinery.chance.in" : "tooltip.machinery.chance.out";
+                String keyChance = input ? "tooltip.machinery.chance.in" : "tooltip.machinery.ingredient_array_output.weight";
 
                 if (chance == 0F) {
                     tooltipBuilder.append(I18n.format(keyNever));
diff --git a/src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/type/RequirementTypeRandomItemArray.java b/src/main/java/hellfirepvp/modularmachinery/common/crafting/requirement/type/RequirementTypeRandomItemArray.java
diff --git a/src/main/java/hellfirepvp/modularmachinery/common/lib/RequirementTypesMM.java b/src/main/java/hellfirepvp/modularmachinery/common/lib/RequirementTypesMM.java
@@ -23,7 +23,6 @@ public class RequirementTypesMM {
 
     public static final ResourceLocation KEY_REQUIREMENT_ITEM = new ResourceLocation(ModularMachinery.MODID, "item");
     public static final ResourceLocation KEY_REQUIREMENT_INGREDIENT_ARRAY = new ResourceLocation(ModularMachinery.MODID, "ingredient_array_input");
-    public static final ResourceLocation KEY_REQUIREMENT_RANDOM_ITEM_ARRAY = new ResourceLocation(ModularMachinery.MODID, "random_item_array");
     public static final ResourceLocation KEY_REQUIREMENT_FLUID = new ResourceLocation(ModularMachinery.MODID, "fluid");
     public static final ResourceLocation KEY_REQUIREMENT_FLUID_PERTICK = new ResourceLocation(ModularMachinery.MODID, "fluid_pertick");
     public static final ResourceLocation KEY_REQUIREMENT_GAS = new ResourceLocation(ModularMachinery.MODID, "gas");
@@ -34,7 +33,6 @@ public class RequirementTypesMM {
     public static final ResourceLocation KEY_INTERFACE_NUMBER_INPUT = new ResourceLocation(ModularMachinery.MODID, "interface_number_input");
     public static RequirementTypeItem REQUIREMENT_ITEM;
     public static RequirementTypeIngredientArray REQUIREMENT_INGREDIENT_ARRAY;
-    public static RequirementTypeRandomItemArray REQUIREMENT_RANDOM_ITEM_ARRAY;
     public static RequirementTypeFluid REQUIREMENT_FLUID;
     public static RequirementTypeFluidPerTick REQUIREMENT_FLUID_PERTICK;
     public static RequirementTypeEnergy REQUIREMENT_ENERGY;
diff --git a/src/main/java/hellfirepvp/modularmachinery/common/registry/RegistryRequirementTypes.java b/src/main/java/hellfirepvp/modularmachinery/common/registry/RegistryRequirementTypes.java
@@ -29,7 +29,6 @@ private RegistryRequirementTypes() {
     public static void initialize() {
         REQUIREMENT_ITEM = register(new RequirementTypeItem(), KEY_REQUIREMENT_ITEM);
         REQUIREMENT_INGREDIENT_ARRAY = register(new RequirementTypeIngredientArray(), KEY_REQUIREMENT_INGREDIENT_ARRAY);
-        REQUIREMENT_RANDOM_ITEM_ARRAY = register(new RequirementTypeRandomItemArray(), KEY_REQUIREMENT_RANDOM_ITEM_ARRAY);
         REQUIREMENT_FLUID = register(new RequirementTypeFluid(), KEY_REQUIREMENT_FLUID);
         REQUIREMENT_FLUID_PERTICK = register(new RequirementTypeFluidPerTick(), KEY_REQUIREMENT_FLUID_PERTICK);
         REQUIREMENT_ENERGY = register(new RequirementTypeEnergy(), KEY_REQUIREMENT_ENERGY);
diff --git a/src/main/resources/assets/modularmachinery/lang/en_US.lang b/src/main/resources/assets/modularmachinery/lang/en_US.lang
@@ -148,6 +148,8 @@ tooltip.item.controller.owner.not_self=§cYou are not the owner of the controlle
 tooltip.machinery.empty=Empty
 
 tooltip.machinery.ingredient_array_input=Accepts the following inputs (only one of them is consumed):
+tooltip.machinery.ingredient_array_output=Output the following items: %s
+tooltip.machinery.ingredient_array_output.weight=Weights: %s
 tooltip.machinery.catalyst=§aAs catalyst input. (optional input)
 tooltip.machinery.catalyst.effect=Catalytic effect:
 
diff --git a/src/main/resources/assets/modularmachinery/lang/zh_CN.lang b/src/main/resources/assets/modularmachinery/lang/zh_CN.lang
@@ -147,6 +147,8 @@ tooltip.item.controller.owner.not_self=§c你不是控制器的所有者。
 tooltip.machinery.empty=空
 
 tooltip.machinery.ingredient_array_input=接受以下输入（仅消耗其中一种）：
+tooltip.machinery.ingredient_array_output=输出以下物品：
+tooltip.machinery.ingredient_array_output.weight=权重：%s
 tooltip.machinery.catalyst=§a作为催化剂输入（可选输入）。
 tooltip.machinery.catalyst.effect=催化剂效果：
 

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,7 @@ public static void returnCtx(@Nonnull RecipeCraftingContext ctx) {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public static void onReload() {`
`47`		`- for (final Queue<RecipeCraftingContext> queue : POOL.values()) {`
`48`		`- queue.clear();`
`49`		`- }`
	`47`	`+ POOL.clear();`
`50`	`48`
`51`	`49`	`reloadCounter++;`
`52`	`50`	`}`