add waxed concrete powder to creative tab

Author: PssbleTrngle

settings.gradle.kts

@@ -7,5 +7,5 @@ pluginManagement {
 }
 
 plugins {
-    id("com.possible-triangle.packwiz") version ("0.3.0")
+    id("com.possible-triangle.packwiz") version ("1.0.43")
 }

src/main/java/galena/oreganized/OTabs.java

@@ -4,6 +4,7 @@
 import static galena.oreganized.ModCompat.NETHERS_DELIGHT_ID;
 import static galena.oreganized.ModCompat.SHIELD_EXPANSION_ID;
 
+import galena.oreganized.index.DyeColors;
 import galena.oreganized.index.OBlocks;
 import galena.oreganized.index.OItems;
 import java.util.Map;
@@ -75,13 +76,18 @@ public static void buildCreativeModeTabContents(BuildCreativeModeTabContentsEven
         if (tab == CreativeModeTabs.COLORED_BLOCKS) {
             OBlocks.CRYSTAL_GLASS.entrySet()
                     .stream()
-                    .sorted(Map.Entry.comparingByKey())
+                    .sorted(Map.Entry.comparingByKey(DyeColors.comparator()))
                     .forEach(entry -> putBefore(entries, Items.GLASS_PANE, entry.getValue()));
 
             OBlocks.CRYSTAL_GLASS_PANES.entrySet()
                     .stream()
-                    .sorted(Map.Entry.comparingByKey())
+                    .sorted(Map.Entry.comparingByKey(DyeColors.comparator()))
                     .forEach(entry -> putBefore(entries, Items.SHULKER_BOX, entry.getValue()));
+
+            OBlocks.WAXED_CONCRETE_POWDER.entrySet()
+                    .stream()
+                    .sorted(Map.Entry.comparingByKey(DyeColors.comparator()))
+                    .forEach(entry -> putBefore(entries, Items.WHITE_GLAZED_TERRACOTTA, entry.getValue()));
         }
 
         if (tab == CreativeModeTabs.NATURAL_BLOCKS) {

src/main/java/galena/oreganized/data/OBlockTags.java

@@ -22,6 +22,7 @@
 import static galena.oreganized.index.OTags.Blocks.STORAGE_BLOCKS_SILVER;
 
 import galena.oreganized.Oreganized;
+import galena.oreganized.index.DyeColors;
 import galena.oreganized.index.OBlocks;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -57,7 +58,7 @@ public OBlockTags(PackOutput output, CompletableFuture<HolderLookup.Provider> fu
     private void tag(TagKey<Block> key, Map<DyeColor, ? extends Supplier<? extends Block>> values) {
         var tag = tag(key);
         values.entrySet().stream()
-                .sorted(Map.Entry.comparingByKey())
+                .sorted(Map.Entry.comparingByKey(DyeColors.comparator()))
                 .map(it -> it.getValue().get())
                 .map(BuiltInRegistries.BLOCK::getKey)
                 .forEach(tag::addOptional);

src/main/java/galena/oreganized/index/DyeColors.java

@@ -1,5 +1,6 @@
 package galena.oreganized.index;
 
+import java.util.Comparator;
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Stream;
@@ -60,4 +61,8 @@ public static Stream<DyeColor> supported() {
         ).flatMap(Function.identity());
     }
 
+    public static Comparator<DyeColor> comparator() {
+        return Comparator.comparing(DyeColor::getId);
+    }
+
 }