Some fixes

igentuman · igentuman · commit 0267be19fe82 · 2025-04-15T19:01:12.000+02:00
diff --git a/src/generated/resources/data/nuclearcraft/recipes/alloy_smelter/dusts_manganese-dusts_graphite.json b/src/generated/resources/data/nuclearcraft/recipes/alloy_smelter/dusts_manganese-dusts_graphite.json
@@ -0,0 +1,20 @@
+{
+  "type": "nuclearcraft:alloy_smelter",
+  "input": [
+    {
+      "tag": "forge:dusts/manganese"
+    },
+    {
+      "tag": "forge:dusts/graphite"
+    }
+  ],
+  "output": [
+    {
+      "count": 2,
+      "item": "nuclearcraft:carbon_manganese_ingot"
+    }
+  ],
+  "powerModifier": 5.0,
+  "radiation": 1.0,
+  "timeModifier": 5.0
+}
diff --git a/src/generated/resources/data/nuclearcraft/recipes/fluid_infuser/dusts_manganese_oxide-oxygen.json b/src/generated/resources/data/nuclearcraft/recipes/fluid_infuser/dusts_manganese_oxide-oxygen.json
@@ -2,7 +2,7 @@
   "type": "nuclearcraft:fluid_infuser",
   "input": [
     {
-      "tag": "forge:dusts/manganese"
+      "tag": "forge:dusts/manganese_oxide"
     }
   ],
   "inputFluids": [
diff --git a/src/generated/resources/data/nuclearcraft/recipes/fluid_infuser/ingots_manganese_oxide-oxygen.json b/src/generated/resources/data/nuclearcraft/recipes/fluid_infuser/ingots_manganese_oxide-oxygen.json
@@ -2,7 +2,7 @@
   "type": "nuclearcraft:fluid_infuser",
   "input": [
     {
-      "tag": "forge:ingots/manganese"
+      "tag": "forge:ingots/manganese_oxide"
     }
   ],
   "inputFluids": [
diff --git a/src/generated/resources/data/nuclearcraft/recipes/manufactory/boron_chunk.json b/src/generated/resources/data/nuclearcraft/recipes/manufactory/boron_chunk.json
@@ -0,0 +1,17 @@
+{
+  "type": "nuclearcraft:manufactory",
+  "input": [
+    {
+      "item": "nuclearcraft:boron_chunk"
+    }
+  ],
+  "output": [
+    {
+      "count": 2,
+      "tag": "forge:dusts/boron"
+    }
+  ],
+  "powerModifier": 1.0,
+  "radiation": 1.0,
+  "timeModifier": 1.0
+}
diff --git a/src/generated/resources/data/nuclearcraft/recipes/manufactory/cobalt_chunk.json b/src/generated/resources/data/nuclearcraft/recipes/manufactory/cobalt_chunk.json
@@ -0,0 +1,17 @@
+{
+  "type": "nuclearcraft:manufactory",
+  "input": [
+    {
+      "item": "nuclearcraft:cobalt_chunk"
+    }
+  ],
+  "output": [
+    {
+      "count": 2,
+      "tag": "forge:dusts/cobalt"
+    }
+  ],
+  "powerModifier": 1.0,
+  "radiation": 1.0,
+  "timeModifier": 1.0
+}
diff --git a/src/generated/resources/data/nuclearcraft/recipes/manufactory/lead_chunk.json b/src/generated/resources/data/nuclearcraft/recipes/manufactory/lead_chunk.json
@@ -0,0 +1,17 @@
+{
+  "type": "nuclearcraft:manufactory",
+  "input": [
+    {
+      "item": "nuclearcraft:lead_chunk"
+    }
+  ],
+  "output": [
+    {
+      "count": 2,
+      "tag": "forge:dusts/lead"
+    }
+  ],
+  "powerModifier": 1.0,
+  "radiation": 1.0,
+  "timeModifier": 1.0
+}
diff --git a/src/generated/resources/data/nuclearcraft/recipes/manufactory/lithium_chunk.json b/src/generated/resources/data/nuclearcraft/recipes/manufactory/lithium_chunk.json
@@ -0,0 +1,17 @@
+{
+  "type": "nuclearcraft:manufactory",
+  "input": [
+    {
+      "item": "nuclearcraft:lithium_chunk"
+    }
+  ],
+  "output": [
+    {
+      "count": 2,
+      "tag": "forge:dusts/lithium"
+    }
+  ],
+  "powerModifier": 1.0,
+  "radiation": 1.0,
+  "timeModifier": 1.0
+}
diff --git a/src/generated/resources/data/nuclearcraft/recipes/manufactory/magnesium_chunk.json b/src/generated/resources/data/nuclearcraft/recipes/manufactory/magnesium_chunk.json
@@ -0,0 +1,17 @@
+{
+  "type": "nuclearcraft:manufactory",
+  "input": [
+    {
+      "item": "nuclearcraft:magnesium_chunk"
+    }
+  ],
+  "output": [
+    {
+      "count": 2,
+      "tag": "forge:dusts/magnesium"
+    }
+  ],
+  "powerModifier": 1.0,
+  "radiation": 1.0,
+  "timeModifier": 1.0
+}
diff --git a/src/generated/resources/data/nuclearcraft/recipes/manufactory/netherite_scrap.json b/src/generated/resources/data/nuclearcraft/recipes/manufactory/netherite_scrap.json
@@ -0,0 +1,17 @@
+{
+  "type": "nuclearcraft:manufactory",
+  "input": [
+    {
+      "item": "minecraft:netherite_scrap"
+    }
+  ],
+  "output": [
+    {
+      "count": 2,
+      "tag": "forge:dusts/netherite"
+    }
+  ],
+  "powerModifier": 1.0,
+  "radiation": 1.0,
+  "timeModifier": 1.0
+}
diff --git a/src/generated/resources/data/nuclearcraft/recipes/manufactory/platinum_chunk.json b/src/generated/resources/data/nuclearcraft/recipes/manufactory/platinum_chunk.json
@@ -0,0 +1,17 @@
+{
+  "type": "nuclearcraft:manufactory",
+  "input": [
+    {
+      "item": "nuclearcraft:platinum_chunk"
+    }
+  ],
+  "output": [
+    {
+      "count": 2,
+      "tag": "forge:dusts/platinum"
+    }
+  ],
+  "powerModifier": 1.0,
+  "radiation": 1.0,
+  "timeModifier": 1.0
+}
diff --git a/src/generated/resources/data/nuclearcraft/recipes/manufactory/raw_copper.json b/src/generated/resources/data/nuclearcraft/recipes/manufactory/raw_copper.json
@@ -0,0 +1,17 @@
+{
+  "type": "nuclearcraft:manufactory",
+  "input": [
+    {
+      "item": "minecraft:raw_copper"
+    }
+  ],
+  "output": [
+    {
+      "count": 2,
+      "tag": "forge:dusts/copper"
+    }
+  ],
+  "powerModifier": 1.0,
+  "radiation": 1.0,
+  "timeModifier": 1.0
+}
diff --git a/src/generated/resources/data/nuclearcraft/recipes/manufactory/raw_gold.json b/src/generated/resources/data/nuclearcraft/recipes/manufactory/raw_gold.json
@@ -0,0 +1,17 @@
+{
+  "type": "nuclearcraft:manufactory",
+  "input": [
+    {
+      "item": "minecraft:raw_gold"
+    }
+  ],
+  "output": [
+    {
+      "count": 2,
+      "tag": "forge:dusts/gold"
+    }
+  ],
+  "powerModifier": 1.0,
+  "radiation": 1.0,
+  "timeModifier": 1.0
+}
diff --git a/src/generated/resources/data/nuclearcraft/recipes/manufactory/raw_iron.json b/src/generated/resources/data/nuclearcraft/recipes/manufactory/raw_iron.json
@@ -0,0 +1,17 @@
+{
+  "type": "nuclearcraft:manufactory",
+  "input": [
+    {
+      "item": "minecraft:raw_iron"
+    }
+  ],
+  "output": [
+    {
+      "count": 2,
+      "tag": "forge:dusts/iron"
+    }
+  ],
+  "powerModifier": 1.0,
+  "radiation": 1.0,
+  "timeModifier": 1.0
+}
diff --git a/src/generated/resources/data/nuclearcraft/recipes/manufactory/silver_chunk.json b/src/generated/resources/data/nuclearcraft/recipes/manufactory/silver_chunk.json
@@ -0,0 +1,17 @@
+{
+  "type": "nuclearcraft:manufactory",
+  "input": [
+    {
+      "item": "nuclearcraft:silver_chunk"
+    }
+  ],
+  "output": [
+    {
+      "count": 2,
+      "tag": "forge:dusts/silver"
+    }
+  ],
+  "powerModifier": 1.0,
+  "radiation": 1.0,
+  "timeModifier": 1.0
+}
diff --git a/src/generated/resources/data/nuclearcraft/recipes/manufactory/thorium_chunk.json b/src/generated/resources/data/nuclearcraft/recipes/manufactory/thorium_chunk.json
@@ -0,0 +1,17 @@
+{
+  "type": "nuclearcraft:manufactory",
+  "input": [
+    {
+      "item": "nuclearcraft:thorium_chunk"
+    }
+  ],
+  "output": [
+    {
+      "count": 2,
+      "tag": "forge:dusts/thorium"
+    }
+  ],
+  "powerModifier": 1.0,
+  "radiation": 1.0,
+  "timeModifier": 1.0
+}
diff --git a/src/generated/resources/data/nuclearcraft/recipes/manufactory/tin_chunk.json b/src/generated/resources/data/nuclearcraft/recipes/manufactory/tin_chunk.json
@@ -0,0 +1,17 @@
+{
+  "type": "nuclearcraft:manufactory",
+  "input": [
+    {
+      "item": "nuclearcraft:tin_chunk"
+    }
+  ],
+  "output": [
+    {
+      "count": 2,
+      "tag": "forge:dusts/tin"
+    }
+  ],
+  "powerModifier": 1.0,
+  "radiation": 1.0,
+  "timeModifier": 1.0
+}
diff --git a/src/generated/resources/data/nuclearcraft/recipes/manufactory/uranium_chunk.json b/src/generated/resources/data/nuclearcraft/recipes/manufactory/uranium_chunk.json
@@ -0,0 +1,17 @@
+{
+  "type": "nuclearcraft:manufactory",
+  "input": [
+    {
+      "item": "nuclearcraft:uranium_chunk"
+    }
+  ],
+  "output": [
+    {
+      "count": 2,
+      "tag": "forge:dusts/uranium"
+    }
+  ],
+  "powerModifier": 1.0,
+  "radiation": 1.0,
+  "timeModifier": 1.0
+}
diff --git a/src/generated/resources/data/nuclearcraft/recipes/manufactory/zinc_chunk.json b/src/generated/resources/data/nuclearcraft/recipes/manufactory/zinc_chunk.json
@@ -0,0 +1,17 @@
+{
+  "type": "nuclearcraft:manufactory",
+  "input": [
+    {
+      "item": "nuclearcraft:zinc_chunk"
+    }
+  ],
+  "output": [
+    {
+      "count": 2,
+      "tag": "forge:dusts/zinc"
+    }
+  ],
+  "powerModifier": 1.0,
+  "radiation": 1.0,
+  "timeModifier": 1.0
+}
diff --git a/src/main/java/igentuman/nc/block/entity/kugelblitz/EXPLBE.java b/src/main/java/igentuman/nc/block/entity/kugelblitz/EXPLBE.java
@@ -2,14 +2,15 @@
 
 import igentuman.nc.block.entity.NuclearCraftBE;
 import igentuman.nc.handler.sided.SidedContentHandler;
-import igentuman.nc.handler.sided.SlotModePair;
 import igentuman.nc.util.CustomEnergyStorage;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.energy.IEnergyStorage;
 
+import static igentuman.nc.handler.sided.SlotModePair.SlotMode.INPUT;
+import static igentuman.nc.handler.sided.SlotModePair.SlotMode.OUTPUT;
 import static igentuman.nc.multiblock.kugelblitz.KugelblitzRegistration.EXPL_BE;
 
 public class EXPLBE extends NuclearCraftBE {
@@ -27,8 +28,8 @@ public EXPLBE(BlockPos pPos, BlockState pBlockState) {
                 0, 0,
                 1, 1, 10, 10);
         contentHandler().setBlockEntity(this);
-        contentHandler().fluidCapability.setGlobalMode(0, SlotModePair.SlotMode.INPUT);
-        contentHandler().fluidCapability.setGlobalMode(1, SlotModePair.SlotMode.OUTPUT);
+        contentHandler().fluidCapability.setGlobalMode(0, INPUT);
+        contentHandler().fluidCapability.setGlobalMode(1, OUTPUT);
     }
 
     public EXPLBE(BlockEntityType<?> pType, BlockPos pPos, BlockState pBlockState) {
diff --git a/src/main/java/igentuman/nc/datagen/recipes/recipes/AlloySmelterRecipes.java b/src/main/java/igentuman/nc/datagen/recipes/recipes/AlloySmelterRecipes.java
@@ -51,6 +51,8 @@ public static void generate(Consumer<FinishedRecipe> consumer) {
                 ingotStack(Materials.extreme, 2));
         doubleToItem(ID, gemIngredient(Materials.silicon), dustIngredient(Materials.graphite),
                 ingotStack(Materials.silicon_carbide, 2), 2d, 2d);
+        doubleToItem(ID, dustIngredient(Materials.manganese), dustIngredient(Materials.graphite),
+                ingotStack(Materials.carbon_manganese, 2), 5d, 5d);
         doubleToItem(ID, dustIngredient(Materials.zirconium, 7), dustIngredient(Materials.tin),
                 ingotStack(Materials.zircaloy, 8));
         doubleToItem(ID, dustIngredient(Materials.iron, 15), dustIngredient(Materials.carbon_manganese),
diff --git a/src/main/java/igentuman/nc/datagen/recipes/recipes/FluidInfuserRecipes.java b/src/main/java/igentuman/nc/datagen/recipes/recipes/FluidInfuserRecipes.java
@@ -61,13 +61,13 @@ public static void generate(Consumer<FinishedRecipe> consumer) {
 
         add(
                 fluidIngredient("oxygen", 1000),
-                ingotIngredient(Materials.manganese),
+                ingotIngredient(Materials.manganese_oxide),
                 ingotStack(Materials.manganese_dioxide)
         );
 
         add(
                 fluidIngredient("oxygen", 1000),
-                dustIngredient(Materials.manganese),
+                dustIngredient(Materials.manganese_oxide),
                 dustIngredient(Materials.manganese_dioxide)
         );
 
diff --git a/src/main/java/igentuman/nc/datagen/recipes/recipes/ManufactoryRecipes.java b/src/main/java/igentuman/nc/datagen/recipes/recipes/ManufactoryRecipes.java
diff --git a/src/main/java/igentuman/nc/item/QNP.java b/src/main/java/igentuman/nc/item/QNP.java
diff --git a/src/main/java/igentuman/nc/radiation/data/RadiationManager.java b/src/main/java/igentuman/nc/radiation/data/RadiationManager.java
diff --git a/src/main/java/igentuman/nc/recipes/ingredient/creator/IFluidStackIngredientCreator.java b/src/main/java/igentuman/nc/recipes/ingredient/creator/IFluidStackIngredientCreator.java
diff --git a/src/main/java/igentuman/nc/util/insitu_leaching/WorldVeinsProvider.java b/src/main/java/igentuman/nc/util/insitu_leaching/WorldVeinsProvider.java
diff --git a/src/main/resources/assets/nuclearcraft/lang/ru_ru.json b/src/main/resources/assets/nuclearcraft/lang/ru_ru.json

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"type": "nuclearcraft:fluid_infuser",`
`3`	`3`	`"input": [`
`4`	`4`	`{`
`5`		`- "tag": "forge:dusts/manganese"`
	`5`	`+ "tag": "forge:dusts/manganese_oxide"`
`6`	`6`	`}`
`7`	`7`	`],`
`8`	`8`	`"inputFluids": [`