Enable max tier to appear both earlier and at end of tiering

Author: Ruling-0

src/main/java/blockrenderer6343/client/utils/ConstructableData.java

@@ -47,7 +47,7 @@ public boolean addItemTier(@NotNull ItemStack item, @NotNull String channel, int
         if (!channel.isEmpty()) {
             itemChannels.put(hash, channel);
         }
-        return itemTiers.putIfAbsent(hash, tier) == itemTiers.defaultReturnValue();
+        return itemTiers.put(hash, tier) == itemTiers.defaultReturnValue();
     }
 
     public void setMaxTier(int tier, @NotNull String channel) {

src/main/java/blockrenderer6343/integration/nei/StructureHacks.java

@@ -68,7 +68,7 @@ public class StructureHacks {
     /**
      * Add a tiered element that should be checked in
      * {@link #extractTieredBlocks(Object, IStructureElement, ConstructableData, String)}
-     * 
+     *
      * @param className The class name of the element
      */
     public static void addTieredElement(String className) {
@@ -115,6 +115,7 @@ private static <T> ObjectSet<ItemStack> extractTieredBlocks(T multi, IStructureE
         ObjectSet<ItemStack> result = new ObjectOpenHashSet<>();
         ItemStack holo = HOLO_STACK.copy();
         int tier = 0;
+        boolean doBreak = false;
 
         do {
             holo.stackSize = tier++ + 1;
@@ -125,17 +126,17 @@ private static <T> ObjectSet<ItemStack> extractTieredBlocks(T multi, IStructureE
             if (!iterator.hasNext()) break;
             ItemStack firstStack = iterator.next();
 
-            if (!data.addItemTier(firstStack, channel, tier)) break;
+            if (!data.addItemTier(firstStack, channel, tier)) doBreak = true;
             result.add(firstStack);
 
             while (iterator.hasNext()) {
                 ItemStack stack = iterator.next();
-                if (!data.addItemTier(stack, channel, tier)) break;
+                data.addItemTier(stack, channel, tier);
                 result.add(stack);
             }
-        } while (tier < MAX_TIERS_TO_CHECK);
+        } while (!doBreak && tier < MAX_TIERS_TO_CHECK);
 
-        data.setMaxTier(tier - 1, channel);
+        data.setMaxTier(tier, channel);
         return result;
     }