ffffffffffffffffffffffffffffffuck

Signed-off-by: Type-32 <[email protected]>

gradle.properties

@@ -42,7 +42,7 @@ mod_name=Precise Manufacturing
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT
 # The mod version. See https://semver.org/
-mod_version=0.3.2-beta
+mod_version=0.3.6-beta
 
 is_nightly=true
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,4 +1,4 @@
-// 1.20.1	2024-07-24T17:57:12.455363	Recipes
+// 1.20.1	2024-08-25T02:29:17.0107748	Recipes
 325ccdbee3cfbf4fe1d7b498d197144ecfbcbc0f data/prma/advancements/recipes/decomponentalizing/decomponentalizing.json
 ec5c1934bad20eabfab0a5cd66ac9a3422cb0db4 data/prma/advancements/recipes/misc/blank_blueprint.json
 959f9b32fcf69f7553e26ba4e3a415b3115a8c9e data/prma/recipes/blank_blueprint.json
@@ -19,6 +19,7 @@ b6eca318317d29cfb79dc24d9de6ce9c7b739371 data/prma/recipes/compacting/cartridges
 a1f5663bbbb1fcc637db13e8f2f187bcd8b2885e data/prma/recipes/compacting/cartridges/762x54.json
 e3f39a359af0b80ae6cf62d986b4d0644e2f3b45 data/prma/recipes/compacting/cartridges/9mm.json
 abd6d51ceb29074ba0e92e10f89511a43f7f8b6b data/prma/recipes/compacting/cartridges/magnum_r.json
+394c3daa7d795f4d9fa179cd969318a7e262b58d data/prma/recipes/compacting/compacting_to_iron_pellet_cluster.json
 390c0ae521381b8308d6f97e20886f903e5a5a5e data/prma/recipes/crushing/basalt_to_powder.json
 646e727842fa6939e9608a1dc40d1c02efa5ea58 data/prma/recipes/crushing/crushed_basalt_to_powder.json
 9411138767e117acf3bc9cf8b86385bb3fe77069 data/prma/recipes/cutting/cutting/ammunition_modules/long_brass_casing_component_cast_cutting.json
@@ -100,7 +101,7 @@ f13513c7b29387b74fb8a6aa414785b4b26b0a4c data/prma/recipes/mixing/melting/iron_n
 f34ff6674c9b03583c92a89aeabe60f6ad144c76 data/prma/recipes/mixing/powders_to_gunpowder.json
 9de17f57eecbbf777a85f19ff54c3799739e8dd9 data/prma/recipes/mixing/small_ammunition_gunpowder_mixing.json
 fb1fe99754542c2baf363faba8a561ee2f50bb22 data/prma/recipes/mixing/solids/flint_and_rock_to_basalt_powder.json
-3f01b69fe643e7f8a0f3c52e123e3f7afbfd42f5 data/prma/recipes/mixing/wasted_cartridges_to_fluids.json
+5cc5073743a81cf936249ff7e2754e7fff67245b data/prma/recipes/mixing/wasted_cartridges_to_fluids.json
 7e31c0ae95e41d7768b77cad101fe3ebbb8da797 data/prma/recipes/shell_brass_casing_component_blueprint_from_decomp_with_12g.json
 ee5088aebe4c2fc420c66cbb98cd7fecac01a20e data/prma/recipes/shell_iron_pellets_component_blueprint_from_decomp_with_12g.json
 e41fb4c7c73a946c31677b07ae0322eef6e99f0f data/prma/recipes/small_brass_casing_component_blueprint_from_decomp_with_45acp.json

src/generated/resources/.cache/a30fdfad6d7990754d3b9814b1f4bee1e9626548

@@ -1,7 +1,7 @@
-// 1.20.1	2024-07-24T17:57:12.452118	Registrate Provider for prma [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
+// 1.20.1	2024-08-25T02:29:17.008767	Registrate Provider for prma [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
 73a5900c9e85fb6168ad8dacfd8196e1ab94a8d1 assets/prma/blockstates/decomponentalizer.json
-c6501ba0fbb3d2fbb2b12f01a5da5cc4be5d232f assets/prma/lang/en_ud.json
-82aec96b655e832c25979e723243101519d2888a assets/prma/lang/en_us.json
+604fc527dc3b08c37903f792ffe2c8a9e32162c2 assets/prma/lang/en_ud.json
+18ff2998374a5604fb8ac252f369115c9421e7db assets/prma/lang/en_us.json
 a643575ae10061b471b4f96e4c7bc1132ac6282a assets/prma/models/block/decomponentalizer.json
 549e0aa77abe655ce179df8e735861238d413b78 assets/prma/models/item/12g_blueprint.json
 83bea14d3f17971492b4e3195aa637f799df2273 assets/prma/models/item/308_blueprint.json
@@ -26,6 +26,7 @@ bdbc941a6a15d2a985e863311ee79aced97ee66b assets/prma/models/item/blank_cast.json
 ff0d3fcb8f3fd80542fa31d98acc84ddec8e220f assets/prma/models/item/decomponentalizer.json
 bb541097b08bf2bb552181c878448bc1c9c57861 assets/prma/models/item/flat_head_screw.json
 04f888166e347444e69a7032d8529ef4d256144a assets/prma/models/item/flint_powder.json
+12a63573c83e2f174313fc3d2fbae2ee22acf269 assets/prma/models/item/iron_pellet_cluster.json
 e7c15926ec1898a8d84f58207f9b120ed2b3238e assets/prma/models/item/locking_return_coil.json
 6d6933f1db070c36f25320270d1da32134a73163 assets/prma/models/item/long_ammunition_gunpowder.json
 720aa95a172bcdf62573e6e7caa1fa5d488c8062 assets/prma/models/item/long_brass_casing_component.json
@@ -37,7 +38,6 @@ a65da1a467a25e1b7d048dd52ffcef27add2f185 assets/prma/models/item/long_copper_hea
 fc7c148dff76bc85a412ade50407ac931e9d5193 assets/prma/models/item/long_iron_casing_component.json
 c9934300b79daa2d90783af872321fcb3e5e0212 assets/prma/models/item/long_iron_casing_component_blueprint.json
 aa1b4ac61ca937b98b9cd4c402a25fd32cec2c49 assets/prma/models/item/long_iron_casing_component_cast.json
-fc6eceed3c3bbbb606647cc5cb6a21a569e53b7a assets/prma/models/item/m_screw.json
 85b94f38131f99880060f11af3237ddcc71206e6 assets/prma/models/item/magnum_r_blueprint.json
 cd91cfbd57b3d28d6b07b19316c48c052c0f0e51 assets/prma/models/item/medium_ammunition_gunpowder.json
 5350cf50e189e7938e40f5d9cdd9a6e35a5901e6 assets/prma/models/item/medium_brass_casing_component.json
@@ -52,6 +52,7 @@ cf243dc1a3f53ac62c29b63b8a4892def41a7505 assets/prma/models/item/medium_iron_cas
 10691d437cf4c11318b625a4bb759a032025ed21 assets/prma/models/item/molten_basalt_infused_iron_bucket.json
 dd1f2581d991b793608fa3b5e60ccef0caa1848d assets/prma/models/item/molten_brass_bucket.json
 f9569df3e16a13bced8e37b0c68401e97e96c194 assets/prma/models/item/molten_copper_bucket.json
+fc6eceed3c3bbbb606647cc5cb6a21a569e53b7a assets/prma/models/item/m_screw.json
 8fd6c6ca2e3d5938aac611f3d52fb3a29007ab48 assets/prma/models/item/raw_copper_powder.json
 301c564aa0bb1c454b716bda05d33d46c2077351 assets/prma/models/item/raw_sulfur_powder.json
 38aecdc8cce08fdd857d9607d677b80410a8adbc assets/prma/models/item/raw_zinc_powder.json
@@ -84,9 +85,9 @@ b6bebd8a1a85ec9bf5c473d665f25403bea28ccb data/prma/loot_tables/blocks/decomponen
 d543cdda12aaa5fbc0ecb924ece8256cd640789f data/prma/tags/fluids/molten_copper_fluids.json
 ef7fb3bc80bdd95243e4e7b7335fa9c22474e6ee data/prma/tags/fluids/molten_iron_fluids.json
 14df200bc103e418be372f5069aab0c15bbad5db data/prma/tags/items/ammunition_casing_components.json
+c7d32053c13baa89aae88d964464ec3058db10fa data/prma/tags/items/ammunition_components.json
 0964761be85d222ffa02694779686a627a640616 data/prma/tags/items/ammunition_component_blueprints.json
 c5285326b6662fea096405b1d17d9734f359e18d data/prma/tags/items/ammunition_component_casts.json
-c7d32053c13baa89aae88d964464ec3058db10fa data/prma/tags/items/ammunition_components.json
 6bdbdc7b49aea9610c8ccbbe5294bdc0751aa7d3 data/prma/tags/items/ammunition_head_components.json
 007dd417091188f2796cabcef116fac73b03be5c data/prma/tags/items/ammunition_pellets_components.json
 45063d7057c64e8534f9d406b16128f354289ddc data/prma/tags/items/brass_ammunition_components.json
@@ -96,7 +97,7 @@ c7d32053c13baa89aae88d964464ec3058db10fa data/prma/tags/items/ammunition_compone
 6b4ecac70eae826f5bcac85e6df878c5c6517df8 data/prma/tags/items/iron_ammunition_components.json
 ef75a14704279402ef9ca23fd44890ff81381b80 data/prma/tags/items/long_ammunition_components.json
 b91927e1694a811dcdf2854e9be9f7d80fa1ea5a data/prma/tags/items/long_ammunition_gunpowders.json
-904a64b394244204197c8582d9edea8085c0f1c1 data/prma/tags/items/materials.json
+897092c41bc4658d98d4dd58cde68a9d1586cacf data/prma/tags/items/materials.json
 a7fbba7c4046950beae619622a9d4ff501de8983 data/prma/tags/items/medium_ammunition_components.json
 af2dec40756d7d7178a6ef6de2765b3276f19781 data/prma/tags/items/medium_ammunition_gunpowders.json
 91f0dc1c5998ca3d51a362409c79fa786b732928 data/prma/tags/items/shell_ammunition_components.json

src/generated/resources/assets/prma/lang/en_ud.json

@@ -25,6 +25,7 @@
   "item.prma.crushed_basalt": "ʇןɐsɐᗺ pǝɥsnɹƆ",
   "item.prma.flat_head_screw": "ʍǝɹɔS pɐǝH ʇɐןℲ",
   "item.prma.flint_powder": "ɹǝpʍoԀ ʇuıןℲ",
+  "item.prma.iron_pellet_cluster": "ɹǝʇsnןƆ ʇǝןןǝԀ uoɹI",
   "item.prma.locking_return_coil": "ןıoƆ uɹnʇǝᴚ buıʞɔoꞀ",
   "item.prma.long_ammunition_gunpowder": "ɹǝpʍodun⅁ uoıʇıunɯɯⱯ buoꞀ",
   "item.prma.long_brass_casing_component": "ʇuǝuodɯoƆ buısɐƆ ssɐɹᗺ buoꞀ",

src/generated/resources/assets/prma/models/item/iron_pellet_cluster.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "prma:item/iron_pellet_cluster"
+  }
+}

src/generated/resources/data/prma/recipes/compacting/compacting_to_iron_pellet_cluster.json

@@ -0,0 +1,5 @@
+{
+  "type": "create:compacting",
+  "ingredients": [],
+  "results": []
+}

src/generated/resources/data/prma/recipes/mixing/wasted_cartridges_to_fluids.json

@@ -1,6 +1,10 @@
 {
   "type": "create:mixing",
-  "ingredients": [],
+  "ingredients": [
+    {
+      "tag": "prma:ammunition_waste_components"
+    }
+  ],
   "processingTime": 200,
   "results": [
     {

src/generated/resources/data/prma/tags/items/materials.json

@@ -9,6 +9,7 @@
     "prma:rock_powder",
     "prma:small_ammunition_gunpowder",
     "prma:medium_ammunition_gunpowder",
-    "prma:long_ammunition_gunpowder"
+    "prma:long_ammunition_gunpowder",
+    "prma:iron_pellet_cluster"
   ]
 }

src/main/java/cn/crtlprototypestudios/precisemanufacturing/foundation/ModItems.java

@@ -79,7 +79,8 @@ public static RegistryEntry<Item> addToList(RegistryEntry<Item> entry, ModCreati
             THIN_SMALL_ROD = addToList(Main.REGISTRATE.item("thin_small_rod", Item::new).tag(ModTags.componentsTag()).register()),
             THICK_SMALL_ROD = addToList(Main.REGISTRATE.item("thick_small_rod", Item::new).tag(ModTags.componentsTag()).register()),
             BLANK_BLUEPRINT = addToList(Main.REGISTRATE.item("blank_blueprint", Item::new).register(), ModCreativeModTabs.Tabs.Blueprints),
-            BLANK_CAST = addToList(Main.REGISTRATE.item("blank_cast", Item::new).register(), ModCreativeModTabs.Tabs.Casts);
+            BLANK_CAST = addToList(Main.REGISTRATE.item("blank_cast", Item::new).register(), ModCreativeModTabs.Tabs.Casts),
+            IRON_PELLET_CLUSTER = addToList(Main.REGISTRATE.item("iron_pellet_cluster", Item::new).tag(ModTags.materialsTag()).register());
 
 
     // Buckets

src/main/java/cn/crtlprototypestudios/precisemanufacturing/foundation/data/generators/recipe/ModRecipesGen.java

@@ -14,6 +14,7 @@
 import com.simibubi.create.content.kinetics.crusher.CrushingRecipe;
 import com.simibubi.create.content.kinetics.fan.processing.SplashingRecipe;
 import com.simibubi.create.content.kinetics.millstone.MillingRecipe;
+import com.simibubi.create.content.kinetics.mixer.CompactingRecipe;
 import com.simibubi.create.content.kinetics.mixer.MixingRecipe;
 import com.simibubi.create.content.kinetics.saw.CuttingRecipe;
 import com.simibubi.create.content.processing.recipe.HeatCondition;
@@ -196,6 +197,7 @@ public static void register(Consumer<FinishedRecipe> pFinishedRecipeConsumer){
                 .output(ModFluids.MOLTEN_COPPER.get(), 50)
                 .output(ModFluids.MOLTEN_BASALT_INFUSED_IRON.get(), 50)
                 .duration(200)
+                .require(ModTags.ammunitionWasteComponentsTag())
                 .output(ModFluids.MOLTEN_BRASS.get(), 50));
 
         // Craft Blank Blueprint from Paper and Dye
@@ -270,5 +272,8 @@ public static void register(Consumer<FinishedRecipe> pFinishedRecipeConsumer){
                 .require(ModItems.RAW_ZINC_POWDER.get())
                 .duration(200)
                 .require(Items.IRON_NUGGET));
+
+        // Compacting Pellets
+        ModRecipeProvider.addCreateRecipeBuilder(new ProcessingRecipeBuilder<>(CompactingRecipe::new, ResourceHelper.find("compacting_to_iron_pellet_cluster")));
     }
 }

src/main/resources/assets/prma/lang/en_us.json

@@ -36,6 +36,7 @@
   "item.prma.straight_small_coil": "Straight Small Coil",
   "item.prma.thick_small_rod": "Thick Small Rod",
   "item.prma.thin_small_rod": "Thin Small Rod",
+  "item.prma.iron_pellet_cluster": "A Cluster of Iron Pellets",
 
 
   "item.prma.9mm_blueprint": "9mm Cartridge Blueprint",
@@ -90,6 +91,9 @@
   "item.prma.small_copper_head_component": "Small Copper Head Component",
   "item.prma.small_copper_head_component_blueprint": "Small Copper Head Component Blueprint",
   "item.prma.small_copper_head_component_cast": "Small Copper Head Component Cast",
+  "item.prma.small_iron_head_component": "Small Iron Head Component",
+  "item.prma.small_iron_head_component_blueprint": "Small Iron Head Component Blueprint",
+  "item.prma.small_iron_head_component_cast": "Small Iron Head Component Cast",
 
 
   "fluid.prma.molten_copper": "Molten Copper",