Recipe fixes

igentuman · igentuman · commit fcdb3c699d77 · 2025-04-19T10:22:54.000+02:00
diff --git a/src/generated/resources/data/nuclearcraft/advancements/recipes/misc/spaxelhoe_thorium.json b/src/generated/resources/data/nuclearcraft/advancements/recipes/misc/spaxelhoe_thorium.json
@@ -11,7 +11,7 @@
       "conditions": {
         "items": [
           {
-            "tag": "forge:ingots/thorium"
+            "tag": "forge:plates/thorium"
           }
         ]
       },
diff --git a/src/generated/resources/data/nuclearcraft/recipes/assembler/plates_tough_alloy-ingots_iron.json b/src/generated/resources/data/nuclearcraft/recipes/assembler/plates_tough_alloy-ingots_iron.json
@@ -6,13 +6,8 @@
       "tag": "forge:plates/tough_alloy"
     },
     {
-      "item": "minecraft:netherite_axe"
-    },
-    {
-      "item": "minecraft:netherite_pickaxe"
-    },
-    {
-      "item": "minecraft:netherite_shovel"
+      "count": 2,
+      "tag": "forge:ingots/iron"
     }
   ],
   "output": [
diff --git a/src/generated/resources/data/nuclearcraft/recipes/decay_hastener/curium_246.json b/src/generated/resources/data/nuclearcraft/recipes/decay_hastener/curium_246.json
@@ -7,7 +7,7 @@
   ],
   "output": [
     {
-      "item": "nuclearcraft:plutonium_242"
+      "item": "nuclearcraft:americium_242"
     }
   ],
   "powerModifier": 1.0,
diff --git a/src/generated/resources/data/nuclearcraft/recipes/spaxelhoe_thorium.json b/src/generated/resources/data/nuclearcraft/recipes/spaxelhoe_thorium.json
@@ -6,7 +6,7 @@
       "tag": "forge:ingots/iron"
     },
     "T": {
-      "tag": "forge:ingots/thorium"
+      "tag": "forge:plates/thorium"
     }
   },
   "pattern": [
diff --git a/src/main/java/igentuman/nc/block/ContainerBlock.java b/src/main/java/igentuman/nc/block/ContainerBlock.java
@@ -152,7 +152,6 @@ public void playerDestroy(Level pLevel, Player pPlayer, BlockPos pPos, BlockStat
         pPlayer.causeFoodExhaustion(0.005F);
         ContainerBE ContainerBE = (ContainerBE) pBlockEntity;
         CompoundTag data = ContainerBE.getUpdateTag();
-
         ItemStack drop = new ItemStack(this);
         drop.setTag(data);
         if (!pLevel.isClientSide()) {
diff --git a/src/main/java/igentuman/nc/datagen/recipes/NCRecipes.java b/src/main/java/igentuman/nc/datagen/recipes/NCRecipes.java
@@ -823,9 +823,9 @@ private void parts(Consumer<FinishedRecipe> consumer) {
                 .pattern("TTT")
                 .pattern("TIT")
                 .pattern(" I ")
-                .define('T', forgeIngot(Materials.thorium))
+                .define('T', forgePlate(Materials.thorium))
                 .define('I', forgeIngot("iron"))
-                .unlockedBy("item", has(forgeIngot(Materials.thorium)))
+                .unlockedBy("item", has(forgePlate(Materials.thorium)))
                 .save(consumer, new ResourceLocation(MODID, "spaxelhoe_thorium"));
 
         ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ALL_NC_ITEMS.get("upgrade_speed").get())
diff --git a/src/main/java/igentuman/nc/datagen/recipes/recipes/AssemblerRecipes.java b/src/main/java/igentuman/nc/datagen/recipes/recipes/AssemblerRecipes.java
@@ -53,9 +53,7 @@ public static void generate(Consumer<FinishedRecipe> consumer) {
         itemsToItems(
                 List.of(
                         plateIngredient(Materials.tough_alloy, 5),
-                        ingredient(NETHERITE_AXE),
-                        ingredient(NETHERITE_PICKAXE),
-                        ingredient(NETHERITE_SHOVEL)
+                        ingotIngredient("iron", 2)
                 ),
                 List.of(ingredient(SPAXELHOE_TOUGH.get()))
         );
diff --git a/src/main/java/igentuman/nc/datagen/recipes/recipes/DecayHastenerRecipes.java b/src/main/java/igentuman/nc/datagen/recipes/recipes/DecayHastenerRecipes.java
@@ -37,7 +37,7 @@ public static void generate(Consumer<FinishedRecipe> consumer) {
         itemToItem(isotopeIngredient(Materials.americium243), isotopeStack(Materials.plutonium238));
         itemToItem(isotopeIngredient(Materials.curium243), isotopeStack(Materials.plutonium239));
         itemToItem(isotopeIngredient(Materials.curium245), isotopeStack(Materials.plutonium241));
-        itemToItem(isotopeIngredient(Materials.curium246), isotopeStack(Materials.plutonium242));
+        itemToItem(isotopeIngredient(Materials.curium246), isotopeStack(Materials.americium242));
         itemToItem(isotopeIngredient(Materials.curium247), isotopeStack(Materials.americium243));
         itemToItem(isotopeIngredient(Materials.berkelium247), isotopeStack(Materials.americium243));
         itemToItem(isotopeIngredient(Materials.berkelium248), dustIngredient(Materials.thorium));
diff --git a/src/main/java/igentuman/nc/datagen/recipes/recipes/FuelReprocessorRecipes.java b/src/main/java/igentuman/nc/datagen/recipes/recipes/FuelReprocessorRecipes.java
@@ -25,7 +25,7 @@ public static void generate(Consumer<FinishedRecipe> consumer) {
             add(
                     fuelIngredient(List.of("depleted", "americium", "hea-242", type), 1),
                     List.of(
-                            isotopeStack(Materials.americium243, 3), isotopeStack(Materials.curium243),
+                            isotopeStack(Materials.americium243, 3), isotopeStack(Materials.americium242),
                             isotopeStack(Materials.curium246, 2), isotopeStack(Materials.berkelium247),
                             dustIngredient(Materials.molybdenum), dustIngredient(Materials.promethium_147)
                     ), 1.5D
diff --git a/src/main/java/igentuman/nc/item/QNP.java b/src/main/java/igentuman/nc/item/QNP.java
@@ -107,8 +107,6 @@ public void setDamage(ItemStack stack, int damage)
 	{
 	}
 
-
-
 	@Override
 	public boolean isBarVisible(@NotNull ItemStack pStack) {
 		return true;
@@ -163,6 +161,10 @@ public boolean mineBlock(@NotNull ItemStack stack, @NotNull Level worldIn, @NotN
 		if (entityLiving instanceof Player) {
 			HitResult rayTraceResult = RayTraceUtils.rayTraceSimple(worldIn, entityLiving, 16, 0);
 			if (rayTraceResult.getType() == HitResult.Type.BLOCK) {
+				BlockEntity be = worldIn.getExistingBlockEntity(pos);
+				if(be != null) {
+					return super.mineBlock(stack, worldIn, state, pos, entityLiving);
+				}
 				BlockHitResult blockResult = (BlockHitResult) rayTraceResult;
 				List<ItemStack> totalDrops = new ArrayList<>();
 				if(getMode(stack) == Mode.VEIN_MINER) {
@@ -171,7 +173,7 @@ public boolean mineBlock(@NotNull ItemStack stack, @NotNull Level worldIn, @NotN
 					mineArea(pos, worldIn, entityLiving, blockResult, stack, totalDrops);
 				}
 				totalDrops.forEach(itemStack -> {
-					Block.popResource(worldIn, entityLiving.blockPosition().relative(entityLiving.getDirection(), 1), itemStack);
+					Block.popResource(worldIn, entityLiving.blockPosition().relative(entityLiving.getDirection(), 2), itemStack);
 				});
 			}
 		}
@@ -186,7 +188,8 @@ private List<ItemStack> harvestBlock(BlockPos pos, @NotNull Level worldIn, Livin
 		int xp = ForgeHooks.onBlockBreakEvent(worldIn, ((ServerPlayer) entityLiving).gameMode.getGameModeForPlayer(), (ServerPlayer) entityLiving, pos);
 		if (xp >= 0 && block.onDestroyedByPlayer(tempState, worldIn, pos, (ServerPlayer) entityLiving, true, tempState.getFluidState())) {
 			block.destroy(worldIn, pos, tempState);
-			Block.getDrops(tempState, (ServerLevel) worldIn, pos, null, entityLiving, tool).forEach(itemStack -> {
+			//block.playerDestroy(worldIn, (Player) entityLiving, pos, tempState, worldIn.getExistingBlockEntity(pos), tool);
+			Block.getDrops(tempState, (ServerLevel) worldIn, pos, worldIn.getExistingBlockEntity(pos), entityLiving, tool).forEach(itemStack -> {
 				boolean combined = false;
 				for (ItemStack drop : totalDrops) {
 					if (ItemHandlerHelper.canItemStacksStack(drop, itemStack)) {
diff --git a/src/main/java/igentuman/nc/setup/registration/NCItems.java b/src/main/java/igentuman/nc/setup/registration/NCItems.java
@@ -4,8 +4,6 @@
 import igentuman.nc.content.materials.*;
 import igentuman.nc.item.*;
 import igentuman.nc.item.Tiers;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.TagKey;
 import net.minecraft.world.food.FoodProperties;
 import net.minecraft.world.item.*;
 import net.minecraftforge.registries.RegistryObject;
@@ -16,7 +14,6 @@
 
 import static igentuman.nc.setup.registration.NCSounds.SOUND_MAP;
 import static igentuman.nc.setup.registration.Registries.ITEMS;
-import static igentuman.nc.setup.registration.Registries.ITEM_REGISTRY;
 import static igentuman.nc.setup.registration.Tags.*;
 
 public class NCItems {
@@ -41,7 +38,8 @@ public class NCItems {
     public static HashMap<String, RegistryObject<Item>> MULTIBLOCK_ITEMS = new HashMap<>();
     public static final Item.Properties ITEM_PROPERTIES = new Item.Properties();
     public static final Item.Properties ONE_ITEM_PROPERTIES = new Item.Properties().stacksTo(1);
-    public static final Item.Properties PAXEL_PROPS = new Item.Properties().stacksTo(1).durability(5000).fireResistant();
+    public static final Item.Properties THORIUM_PAXEL_PROPS = new Item.Properties().stacksTo(1).durability(5000).fireResistant();
+    public static final Item.Properties TOUGH_PAXEL_PROPS = new Item.Properties().stacksTo(1).durability(9000).fireResistant();
     public static final Item.Properties HAZMAT_PROPS = new Item.Properties().stacksTo(1).durability(250);
     public static final Item.Properties TOUGH_PROPS = new Item.Properties().stacksTo(1).durability(2500).fireResistant();
     public static final Item.Properties HEV_PROPS = new Item.Properties().stacksTo(1).durability(5500).fireResistant();
@@ -76,8 +74,8 @@ public class NCItems {
 
     public static final RegistryObject<Item> GEIGER_COUNTER = ITEMS.register("geiger_counter", () -> new GeigerCounterItem(ONE_ITEM_PROPERTIES));
     public static final RegistryObject<Item> LITHIUM_ION_CELL = ITEMS.register("lithium_ion_cell", () -> new BatteryItem(ONE_ITEM_PROPERTIES));
-    public static final RegistryObject<Item> SPAXELHOE_TOUGH = ITEMS.register("spaxelhoe_tough", () -> new PaxelItem(7, 2, Tiers.TOUGH, PAXEL_PROPS));
-    public static final RegistryObject<Item> SPAXELHOE_THORIUM = ITEMS.register("spaxelhoe_thorium", () -> new PaxelItem(3, 1, Tiers.THORIUM, PAXEL_PROPS));
+    public static final RegistryObject<Item> SPAXELHOE_TOUGH = ITEMS.register("spaxelhoe_tough", () -> new PaxelItem(7, 2, Tiers.TOUGH, TOUGH_PAXEL_PROPS));
+    public static final RegistryObject<Item> SPAXELHOE_THORIUM = ITEMS.register("spaxelhoe_thorium", () -> new PaxelItem(3, 1, Tiers.THORIUM, THORIUM_PAXEL_PROPS));
     public static final RegistryObject<Item> QNP = ITEMS.register("qnp", () -> new QNP(Tiers.QNP, 11, 2F, ONE_ITEM_PROPERTIES));
     public static final RegistryObject<Item> MULTITOOL = ITEMS.register("multitool", () -> new MultitoolItem(ONE_ITEM_PROPERTIES));
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`"conditions": {`
`12`	`12`	`"items": [`
`13`	`13`	`{`
`14`		`- "tag": "forge:ingots/thorium"`
	`14`	`+ "tag": "forge:plates/thorium"`
`15`	`15`	`}`
`16`	`16`	`]`
`17`	`17`	`},`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`],`
`8`	`8`	`"output": [`
`9`	`9`	`{`
`10`		`- "item": "nuclearcraft:plutonium_242"`
	`10`	`+ "item": "nuclearcraft:americium_242"`
`11`	`11`	`}`
`12`	`12`	`],`
`13`	`13`	`"powerModifier": 1.0,`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"tag": "forge:ingots/iron"`
`7`	`7`	`},`
`8`	`8`	`"T": {`
`9`		`- "tag": "forge:ingots/thorium"`
	`9`	`+ "tag": "forge:plates/thorium"`
`10`	`10`	`}`
`11`	`11`	`},`
`12`	`12`	`"pattern": [`