From b483cea5a1455cd030dc247a89170c3634cfa2c6 Mon Sep 17 00:00:00 2001 From: Szymson1717 <221184781+Szymson1717@users.noreply.github.com> Date: Fri, 18 Jul 2025 21:46:37 +0200 Subject: [PATCH 1/3] Yoshi72 recipes fix --- .../modules/collapser/recipe/CollapsingRecipeData.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/recipe/CollapsingRecipeData.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/recipe/CollapsingRecipeData.java index f1ca339..628bd30 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/recipe/CollapsingRecipeData.java +++ b/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); } } \ No newline at end of file From 443905206f7f36819e5341c5dbc86c4dc621797d Mon Sep 17 00:00:00 2001 From: Szymson1717 <221184781+Szymson1717@users.noreply.github.com> Date: Fri, 18 Jul 2025 21:48:36 +0200 Subject: [PATCH 2/3] client crash fix --- ...SingularityResourceGeneratorTileEntityBase.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/SingularityResourceGeneratorTileEntityBase.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/SingularityResourceGeneratorTileEntityBase.java index cbbe7b5..06992d6 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/resourcegen/tile/SingularityResourceGeneratorTileEntityBase.java +++ b/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(); From 81e82f045e7649dbf9cccb674da2c41dbc46d4a2 Mon Sep 17 00:00:00 2001 From: Szymson1717 <221184781+Szymson1717@users.noreply.github.com> Date: Fri, 18 Jul 2025 21:49:06 +0200 Subject: [PATCH 3/3] added tuff and calcite quantum singularities --- .../cuboidmod/datagen/client/ModItemModelProvider.java | 5 ++++- .../cuboidmod/datagen/server/ModItemTagsProvider.java | 7 +++++++ .../collapser/registry/QuantumSingularityRegistry.java | 10 +++++++++- .../java/com/cuboiddroid/cuboidmod/setup/ModItems.java | 8 ++++++++ .../java/com/cuboiddroid/cuboidmod/setup/ModTags.java | 3 +++ 5 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cuboiddroid/cuboidmod/datagen/client/ModItemModelProvider.java b/src/main/java/com/cuboiddroid/cuboidmod/datagen/client/ModItemModelProvider.java index 2a3b1a6..c61dd30 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/datagen/client/ModItemModelProvider.java +++ b/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) { diff --git a/src/main/java/com/cuboiddroid/cuboidmod/datagen/server/ModItemTagsProvider.java b/src/main/java/com/cuboiddroid/cuboidmod/datagen/server/ModItemTagsProvider.java index a30bff8..bf5a092 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/datagen/server/ModItemTagsProvider.java +++ b/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, diff --git a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/registry/QuantumSingularityRegistry.java b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/registry/QuantumSingularityRegistry.java index 98afd80..69b9f3a 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/registry/QuantumSingularityRegistry.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/modules/collapser/registry/QuantumSingularityRegistry.java @@ -398,7 +398,15 @@ private static List 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) ); } diff --git a/src/main/java/com/cuboiddroid/cuboidmod/setup/ModItems.java b/src/main/java/com/cuboiddroid/cuboidmod/setup/ModItems.java index 07fb403..b23883c 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/setup/ModItems.java +++ b/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 TUFF_QUANTUM_SINGULARITY = Registration.ITEMS.register( + "tuff_quantum_singularity", () -> new QuantumSingularityItem( + new ResourceLocation(CuboidMod.MOD_ID, "tuff"))); + + public static final RegistryObject CALCITE_QUANTUM_SINGULARITY = Registration.ITEMS.register( + "calcite_quantum_singularity", () -> new QuantumSingularityItem( + new ResourceLocation(CuboidMod.MOD_ID, "calcite"))); + public static final RegistryObject CARBON_NANOTUBE_QUANTUM_SINGULARITY = Registration.ITEMS.register( "carbon_nanotube_quantum_singularity", () -> new QuantumSingularityItem( new ResourceLocation(CuboidMod.MOD_ID, "carbon_nanotube"))); diff --git a/src/main/java/com/cuboiddroid/cuboidmod/setup/ModTags.java b/src/main/java/com/cuboiddroid/cuboidmod/setup/ModTags.java index 6dbb991..7b8af57 100644 --- a/src/main/java/com/cuboiddroid/cuboidmod/setup/ModTags.java +++ b/src/main/java/com/cuboiddroid/cuboidmod/setup/ModTags.java @@ -254,6 +254,9 @@ public static final class Items { public static final TagKey QUANTUM_SINGULARITIES_THATLDU = mod("quantum_singularities/thatldu"); public static final TagKey QUANTUM_SINGULARITIES_WIKIDIUM = mod("quantum_singularities/wikidium"); + public static final TagKey QUANTUM_SINGULARITIES_TUFF = mod("quantum_singularities/tuff"); + public static final TagKey QUANTUM_SINGULARITIES_CALCITE = mod("quantum_singularities/calcite"); + public static final TagKey QUANTUM_SINGULARITIES_ENDSTONE = mod("quantum_singularities/endstone"); public static final TagKey QUANTUM_SINGULARITIES_NETHERRACK = mod("quantum_singularities/netherrack");