Calcite and Tuff Quantum Singularities + client crash fix

src/main/java/com/cuboiddroid/cuboidmod/datagen/client/ModItemModelProvider.java

@@ -85,7 +85,10 @@ private void registerQuantumSingularityModels() {
                 "bronze",
                 "electrum",
                 "invar",
-                "platinum"
+                "platinum",
+
+                "tuff",
+                "calcite"
         };
 
         for (String name: singularities) {

src/main/java/com/cuboiddroid/cuboidmod/datagen/server/ModItemTagsProvider.java

@@ -337,6 +337,9 @@ private void addSingularityTags()
         tag(ModTags.Items.QUANTUM_SINGULARITIES_THATLDU).add(ModItems.THATLDU_QUANTUM_SINGULARITY.get());
         tag(ModTags.Items.QUANTUM_SINGULARITIES_WIKIDIUM).add(ModItems.WIKIDIUM_QUANTUM_SINGULARITY.get());
 
+        tag(ModTags.Items.QUANTUM_SINGULARITIES_TUFF).add(ModItems.TUFF_QUANTUM_SINGULARITY.get());
+        tag(ModTags.Items.QUANTUM_SINGULARITIES_CALCITE).add(ModItems.CALCITE_QUANTUM_SINGULARITY.get());
+
         tag(ModTags.Items.QUANTUM_SINGULARITIES_ENDSTONE).add(ModItems.ENDSTONE_QUANTUM_SINGULARITY.get());
         tag(ModTags.Items.QUANTUM_SINGULARITIES_NETHERRACK).add(ModItems.NETHERRACK_QUANTUM_SINGULARITY.get());
 
@@ -393,6 +396,10 @@ private void addSingularityTags()
                 ModTags.Items.QUANTUM_SINGULARITIES_THATLDU,
                 ModTags.Items.QUANTUM_SINGULARITIES_WIKIDIUM,
 
+                // xd
+                ModTags.Items.QUANTUM_SINGULARITIES_CALCITE,
+                ModTags.Items.QUANTUM_SINGULARITIES_TUFF,
+
                 ModTags.Items.QUANTUM_SINGULARITIES_ENDSTONE,
                 ModTags.Items.QUANTUM_SINGULARITIES_NETHERRACK,
 

src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/recipe/CollapsingRecipeData.java

@@ -17,6 +17,7 @@ public CollapsingRecipeData(String identifier, int recipeCount) {
         // this.recipeInputTag = TagKey.create(Registries.ITEM, tagIdentifier);
         this.recipeCount = recipeCount;
 
-        this.usesTag = (this.recipeInput == this.recipeInputTag);
+        // https://github.com/CuboidDroid/cuboidmod/pull/16 thanks to Yoshi72
+        this.usesTag = (this.recipeInput == null && this.recipeInputTag != null);
     }
 }

src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/registry/QuantumSingularityRegistry.java

@@ -398,7 +398,15 @@ private static List<QuantumSingularity> defaults() {
 
             defaultSingularity("zinc", new int[] { 0xB5D1BA, 0x6F7262 })
                 .setRecipe("#forge:ingots/zinc", INGOT_RECIPE_AMOUNT)
-                .setProduction("exnihilosequentia:raw_zinc", ORE_WORK_TIME, ORE_POWER_OUTPUT)
+                .setProduction("exnihilosequentia:raw_zinc", ORE_WORK_TIME, ORE_POWER_OUTPUT),
+
+            defaultSingularity("tuff", new int[]{0x4d4a53, 0x3b3846})
+                .setRecipe("minecraft:tuff", NATUAL_ITEM_RECIPE_AMOUNT)
+                .setProduction("minecraft:tuff", STONE_WORK_TIME, STONE_POWER_OUTPUT),
+
+            defaultSingularity("calcite", new int[]{0x4d4a53, 0x3b3846})
+                .setRecipe("minecraft:calcite", NATUAL_ITEM_RECIPE_AMOUNT)
+                .setProduction("minecraft:calcite", STONE_WORK_TIME, STONE_POWER_OUTPUT)
         );
     }
 

src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/SingularityResourceGeneratorTileEntityBase.java

@@ -223,13 +223,15 @@ protected void onContentsChanged(int slot) {
                 // mark it dirty every time the item handler changes
 
                 ItemStack stack = getStackInSlot(slot);
-                if (isItemValid(slot, stack) && !stack.is(ModItems.QUANTUM_SINGULARITY.get())) {
-                    QuantumSingularityItem singularityItem = (QuantumSingularityItem) stack.getItem();
-                    ResourceLocation quantumIdentifier = singularityItem.getQuantumIdentifier(stack);
 
-                    ItemStack newStack = new ItemStack(ModItems.QUANTUM_SINGULARITY.get(), stack.getCount(), stack.getOrCreateTag());
-                    newStack.getOrCreateTag().putString(QuantumSingularityItem.QUANTUM_ID, quantumIdentifier.toString());
-                    setStackInSlot(slot, newStack);
+                if (isItemValid(slot, stack) &&
+                    !stack.is(ModItems.QUANTUM_SINGULARITY.get()) &&
+                    stack.getItem() instanceof QuantumSingularityItem singularityItem) {
+                        ResourceLocation quantumIdentifier = singularityItem.getQuantumIdentifier(stack);
+
+                        ItemStack newStack = new ItemStack(ModItems.QUANTUM_SINGULARITY.get(), stack.getCount(), stack.getOrCreateTag());
+                        newStack.getOrCreateTag().putString(QuantumSingularityItem.QUANTUM_ID, quantumIdentifier.toString());
+                        setStackInSlot(slot, newStack);
                 }
 
                 setChanged();

src/main/java/com/cuboiddroid/cuboidmod/setup/ModItems.java

@@ -590,6 +590,14 @@ public class ModItems {
             "blackstone_quantum_singularity", () -> new QuantumSingularityItem(
                 new ResourceLocation(CuboidMod.MOD_ID, "blackstone")));
 
+    public static final RegistryObject<Item> TUFF_QUANTUM_SINGULARITY = Registration.ITEMS.register(
+            "tuff_quantum_singularity", () -> new QuantumSingularityItem(
+                new ResourceLocation(CuboidMod.MOD_ID, "tuff")));
+
+    public static final RegistryObject<Item> CALCITE_QUANTUM_SINGULARITY = Registration.ITEMS.register(
+            "calcite_quantum_singularity", () -> new QuantumSingularityItem(
+                new ResourceLocation(CuboidMod.MOD_ID, "calcite")));
+
     public static final RegistryObject<Item> CARBON_NANOTUBE_QUANTUM_SINGULARITY = Registration.ITEMS.register(
             "carbon_nanotube_quantum_singularity", () -> new QuantumSingularityItem(
                 new ResourceLocation(CuboidMod.MOD_ID, "carbon_nanotube")));

src/main/java/com/cuboiddroid/cuboidmod/setup/ModTags.java

@@ -254,6 +254,9 @@ public static final class Items {
         public static final TagKey<Item> QUANTUM_SINGULARITIES_THATLDU = mod("quantum_singularities/thatldu");
         public static final TagKey<Item> QUANTUM_SINGULARITIES_WIKIDIUM = mod("quantum_singularities/wikidium");
 
+        public static final TagKey<Item> QUANTUM_SINGULARITIES_TUFF = mod("quantum_singularities/tuff");
+        public static final TagKey<Item> QUANTUM_SINGULARITIES_CALCITE = mod("quantum_singularities/calcite");
+
         public static final TagKey<Item> QUANTUM_SINGULARITIES_ENDSTONE = mod("quantum_singularities/endstone");
         public static final TagKey<Item> QUANTUM_SINGULARITIES_NETHERRACK = mod("quantum_singularities/netherrack");