Fix structure pattern check; Fix custom tooltips not displaying properly in some cases of JEI.

Author: KasumiNova

src/main/java/hellfirepvp/modularmachinery/common/integration/recipe/CategoryDynamicRecipe.java

@@ -101,22 +101,30 @@ private Point buildRecipeComponents() {
 
             int tipLength = 0;
             //Custom TooltipList
-            tipLength += RequirementTip.LINE_HEIGHT * recipe.getTooltipList().size();
             for (RequirementTip tip : RegistriesMM.REQUIREMENT_TIPS_REGISTRY) {
                 Collection<ComponentRequirement<?, ?>> requirements = tip.filterRequirements(recipe, recipe.getCraftingRequirements());
-                if (!requirements.isEmpty()) {
-                    List<String> tooltip = tip.buildTooltip(recipe, requirements);
-                    if (!tooltip.isEmpty()) {
-                        for (String tipString : tooltip) {
-                            int length = fr.getStringWidth(tipString);
-                            if (length > widestTooltip) {
-                                widestTooltip = length;
-                            }
-                        }
-                        tipLength += RequirementTip.LINE_HEIGHT * tooltip.size();
-                        tipLength += RequirementTip.SPLIT_HEIGHT;
+                if (requirements.isEmpty()) {
+                    continue;
+                }
+                List<String> tooltip = tip.buildTooltip(recipe, requirements);
+                if (tooltip.isEmpty()) {
+                    continue;
+                }
+                for (String tipString : tooltip) {
+                    int length = fr.getStringWidth(tipString);
+                    if (length > widestTooltip) {
+                        widestTooltip = length;
                     }
                 }
+                tipLength += RequirementTip.LINE_HEIGHT * tooltip.size();
+                tipLength += RequirementTip.SPLIT_HEIGHT;
+            }
+            for (String tipString : recipe.getTooltipList()) {
+                int length = fr.getStringWidth(tipString);
+                if (length > widestTooltip) {
+                    widestTooltip = length;
+                }
+                tipLength += RequirementTip.LINE_HEIGHT;
             }
             if (tipLength > longestTooltip) {
                 longestTooltip = tipLength;

src/main/java/hellfirepvp/modularmachinery/common/util/BlockArray.java

@@ -182,6 +182,7 @@ public List<ItemStack> getAsDescriptiveStacks(Optional<Long> snapSample) {
     }
 
     public boolean matches(World world, BlockPos center, boolean oldState, @Nullable Map<BlockPos, List<BlockInformation>> modifierReplacementPattern) {
+        patternCheck:
         for (Map.Entry<BlockPos, BlockInformation> entry : pattern.entrySet()) {
             BlockPos at = center.add(entry.getKey());
             // Block is matched, continue.
@@ -197,7 +198,7 @@ public boolean matches(World world, BlockPos center, boolean oldState, @Nullable
             // Check if the replacement block match.
             for (BlockInformation info : modifierReplacementPattern.get(entry.getKey())) {
                 if (info.matches(world, at, oldState)) {
-                    break;
+                    continue patternCheck;
                 }
             }