diff --git a/build.gradle b/build.gradle index d53eaef..978ddf6 100644 --- a/build.gradle +++ b/build.gradle @@ -116,7 +116,7 @@ configurations { dependencies { implementation("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false } - implementation("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}") + implementation("net.createmod.ponder:ponder-neoforge:${ponder_version}+mc${minecraft_version}") compileOnly("dev.engine-room.flywheel:flywheel-neoforge-api-${minecraft_version}:${flywheel_version}") runtimeOnly("dev.engine-room.flywheel:flywheel-neoforge-${minecraft_version}:${flywheel_version}") implementation("com.tterrag.registrate:Registrate:${registrate_version}") diff --git a/gradle.properties b/gradle.properties index 879df7b..4a4813a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ minecraft_version=1.21.1 # as they do not follow standard versioning conventions. minecraft_version_range=[1.21.1, 1.22) # The Neo version must agree with the Minecraft version to get a valid artifact -neo_version=21.1.174 +neo_version=21.1.222 # The Neo version range can use any version of Neo as bounds neo_version_range=[21.1.0,) # The loader version range can only use the major version of FML as bounds @@ -34,7 +34,7 @@ mod_name=Create: Perfect Processing # 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=1.5.0 +mod_version=1.6.0 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html @@ -44,7 +44,7 @@ mod_authors=KalWantsPizza # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. mod_description=This mod provides recipe tweaks and renewable resources for Mr. Beardstone's Whiskers & Wonders patreon server on 1.21.1\nWith credit to Dragonll237, gunhippy, Doppel_R, and EsmeTH (Server Council) for recipe collaboration. -create_version = 6.0.6-98 -ponder_version = 1.0.59 -flywheel_version = 1.0.4 -registrate_version = MC1.21-1.3.0+62 \ No newline at end of file +create_version = 6.0.10-280 +ponder_version = 1.0.82 +flywheel_version = 1.0.6 +registrate_version = MC1.21-1.3.0+67 \ No newline at end of file diff --git a/src/main/resources/assets/perfectprocessing/lang/en_us.json b/src/main/resources/assets/perfectprocessing/lang/en_us.json new file mode 100644 index 0000000..5da156d --- /dev/null +++ b/src/main/resources/assets/perfectprocessing/lang/en_us.json @@ -0,0 +1,11 @@ +{ + "tag.item.perfectprocessing.copycat_scrap_large": "Large Copycat Scrap", + "tag.item.perfectprocessing.copycat_scrap_medium": "Medium Copycat Scrap", + "tag.item.perfectprocessing.copycat_scrap_normal": "Normal Copycat Scrap", + "tag.item.perfectprocessing.copycat_scrap_small": "Small Copycat Scrap", + "tag.item.perfectprocessing.copycat_scrap_mini": "Mini Copycat Scrap", + "tag.item.perfectprocessing.copycat_scrap_tiny": "Tiny Copycat Scrap", + "tag.item.perfectprocessing.copycat_scrap_cogwheels": "Cogwheel Copycat Scrap", + "tag.item.perfectprocessing.copycat_scrap_pipe": "Pipe Copycat Scrap", + "tag.item.perfectprocessing.copycat_scrap_iron_door": "Iron Door Copycat Scrap" +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/recipe/recycling/cogwheel_copycat_recycling.json b/src/main/resources/data/perfectprocessing/recipe/recycling/cogwheel_copycat_recycling.json new file mode 100644 index 0000000..131c1ce --- /dev/null +++ b/src/main/resources/data/perfectprocessing/recipe/recycling/cogwheel_copycat_recycling.json @@ -0,0 +1,31 @@ +{ + "type": "create:crushing", + "processing_time": 30, + "ingredients": [ + { + "tag": "perfectprocessing:copycat_scrap_cogwheels" + } + ], + "results": [ + { + "id": "create:zinc_nugget", + "chance": 0.45, + "count": 3 + }, + { + "id": "create:zinc_nugget", + "chance": 0.15, + "count": 2 + }, + { + "id": "create:andesite_alloy", + "chance": 0.5, + "count": 1 + }, + { + "id": "minecraft:oak_planks", + "chance": 0.25, + "count": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/recipe/recycling/iron_door_copycat_recycling.json b/src/main/resources/data/perfectprocessing/recipe/recycling/iron_door_copycat_recycling.json new file mode 100644 index 0000000..1ff7ee8 --- /dev/null +++ b/src/main/resources/data/perfectprocessing/recipe/recycling/iron_door_copycat_recycling.json @@ -0,0 +1,31 @@ +{ + "type": "create:crushing", + "processing_time": 30, + "ingredients": [ + { + "tag": "perfectprocessing:copycat_scrap_iron_door" + } + ], + "results": [ + { + "id": "create:zinc_nugget", + "chance": 0.75, + "count": 4 + }, + { + "id": "create:zinc_nugget", + "chance": 0.20, + "count": 3 + }, + { + "id": "minecraft:iron_ingot", + "chance": 0.56, + "count": 3 + }, + { + "id": "minecraft:iron_nugget", + "chance": 0.35, + "count": 5 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/recipe/recycling/large_copycat_recycling.json b/src/main/resources/data/perfectprocessing/recipe/recycling/large_copycat_recycling.json new file mode 100644 index 0000000..57b1dbf --- /dev/null +++ b/src/main/resources/data/perfectprocessing/recipe/recycling/large_copycat_recycling.json @@ -0,0 +1,21 @@ +{ + "type": "create:crushing", + "processing_time": 30, + "ingredients": [ + { + "tag": "perfectprocessing:copycat_scrap_large" + } + ], + "results": [ + { + "id": "create:zinc_nugget", + "chance": 0.75, + "count": 4 + }, + { + "id": "create:zinc_nugget", + "chance": 0.20, + "count": 3 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/recipe/recycling/medium_copycat_recycling.json b/src/main/resources/data/perfectprocessing/recipe/recycling/medium_copycat_recycling.json new file mode 100644 index 0000000..3bf1177 --- /dev/null +++ b/src/main/resources/data/perfectprocessing/recipe/recycling/medium_copycat_recycling.json @@ -0,0 +1,21 @@ +{ + "type": "create:crushing", + "processing_time": 30, + "ingredients": [ + { + "tag": "perfectprocessing:copycat_scrap_medium" + } + ], + "results": [ + { + "id": "create:zinc_nugget", + "chance": 0.65, + "count": 4 + }, + { + "id": "create:zinc_nugget", + "chance": 0.15, + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/recipe/recycling/mini_copycat_recycling.json b/src/main/resources/data/perfectprocessing/recipe/recycling/mini_copycat_recycling.json new file mode 100644 index 0000000..439c93e --- /dev/null +++ b/src/main/resources/data/perfectprocessing/recipe/recycling/mini_copycat_recycling.json @@ -0,0 +1,21 @@ +{ + "type": "create:crushing", + "processing_time": 30, + "ingredients": [ + { + "tag": "perfectprocessing:copycat_scrap_mini" + } + ], + "results": [ + { + "id": "create:zinc_nugget", + "chance": 0.35, + "count": 2 + }, + { + "id": "create:zinc_nugget", + "chance": 0.10, + "count": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/recipe/recycling/normal_copycat_recycling.json b/src/main/resources/data/perfectprocessing/recipe/recycling/normal_copycat_recycling.json new file mode 100644 index 0000000..eba1157 --- /dev/null +++ b/src/main/resources/data/perfectprocessing/recipe/recycling/normal_copycat_recycling.json @@ -0,0 +1,21 @@ +{ + "type": "create:crushing", + "processing_time": 30, + "ingredients": [ + { + "tag": "perfectprocessing:copycat_scrap_normal" + } + ], + "results": [ + { + "id": "create:zinc_nugget", + "chance": 0.45, + "count": 3 + }, + { + "id": "create:zinc_nugget", + "chance": 0.15, + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/recipe/recycling/pipe_copycat_recycling.json b/src/main/resources/data/perfectprocessing/recipe/recycling/pipe_copycat_recycling.json new file mode 100644 index 0000000..497abbd --- /dev/null +++ b/src/main/resources/data/perfectprocessing/recipe/recycling/pipe_copycat_recycling.json @@ -0,0 +1,31 @@ +{ + "type": "create:crushing", + "processing_time": 30, + "ingredients": [ + { + "tag": "perfectprocessing:copycat_scrap_pipe" + } + ], + "results": [ + { + "id": "create:zinc_nugget", + "chance": 0.45, + "count": 3 + }, + { + "id": "create:zinc_nugget", + "chance": 0.15, + "count": 2 + }, + { + "id": "create:copper_sheet", + "chance": 0.5, + "count": 1 + }, + { + "id": "minecraft:oak_planks", + "chance": 0.25, + "count": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/recipe/recycling/small_copycat_recycling.json b/src/main/resources/data/perfectprocessing/recipe/recycling/small_copycat_recycling.json new file mode 100644 index 0000000..baaeefe --- /dev/null +++ b/src/main/resources/data/perfectprocessing/recipe/recycling/small_copycat_recycling.json @@ -0,0 +1,21 @@ +{ + "type": "create:crushing", + "processing_time": 30, + "ingredients": [ + { + "tag": "perfectprocessing:copycat_scrap_small" + } + ], + "results": [ + { + "id": "create:zinc_nugget", + "chance": 0.45, + "count": 2 + }, + { + "id": "create:zinc_nugget", + "chance": 0.10, + "count": 2 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/recipe/recycling/tiny_copycat_recycling.json b/src/main/resources/data/perfectprocessing/recipe/recycling/tiny_copycat_recycling.json new file mode 100644 index 0000000..06319de --- /dev/null +++ b/src/main/resources/data/perfectprocessing/recipe/recycling/tiny_copycat_recycling.json @@ -0,0 +1,21 @@ +{ + "type": "create:crushing", + "processing_time": 30, + "ingredients": [ + { + "tag": "perfectprocessing:copycat_scrap_tiny" + } + ], + "results": [ + { + "id": "create:zinc_nugget", + "chance": 0.35, + "count": 1 + }, + { + "id": "create:zinc_nugget", + "chance": 0.05, + "count": 1 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_cogwheels.json b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_cogwheels.json new file mode 100644 index 0000000..50fbf92 --- /dev/null +++ b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_cogwheels.json @@ -0,0 +1,6 @@ +{ + "values": [ + "copycats:copycat_cogwheel", + "copycats:copycat_large_cogwheel" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_iron_door.json b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_iron_door.json new file mode 100644 index 0000000..5cc51dd --- /dev/null +++ b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_iron_door.json @@ -0,0 +1,5 @@ +{ + "values": [ + "copycats:copycat_iron_door" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_large.json b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_large.json new file mode 100644 index 0000000..847ad6e --- /dev/null +++ b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_large.json @@ -0,0 +1,14 @@ +{ + "values": [ + "copycats:copycat_block", + "copycats:copycat_door", + "copycats:copycat_fence", + "copycats:copycat_fence_gate", + "copycats:copycat_folding_door", + "copycats:copycat_ghost_block", + "copycats:copycat_sliding_door", + "copycats:copycat_vertical_stairs", + "copycats:copycat_stairs", + "copycats:copycat_wall" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_medium.json b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_medium.json new file mode 100644 index 0000000..77a413e --- /dev/null +++ b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_medium.json @@ -0,0 +1,10 @@ +{ + "values": [ + "copycats:copycat_heavy_weighted_pressure_plate", + "copycats:copycat_iron_trapdoor", + "copycats:copycat_slab", + "copycats:copycat_slope", + "copycats:copycat_vertical_slope", + "copycats:copycat_light_weighted_pressure_plate" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_mini.json b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_mini.json new file mode 100644 index 0000000..c001255 --- /dev/null +++ b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_mini.json @@ -0,0 +1,11 @@ +{ + "values": [ + "copycats:copycat_board", + "copycats:copycat_byte", + "copycats:copycat_flat_pane", + "copycats:copycat_half_panel", + "copycats:copycat_layer", + "copycats:copycat_pane", + "copycats:copycat_slope_layer" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_normal.json b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_normal.json new file mode 100644 index 0000000..5512fdb --- /dev/null +++ b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_normal.json @@ -0,0 +1,14 @@ +{ + "values": [ + "copycats:copycat_beam", + "copycats:copycat_shaft", + "create:copycat_panel", + "create:copycat_step", + "copycats:copycat_stone_button", + "copycats:copycat_stone_pressure_plate", + "copycats:copycat_trapdoor", + "copycats:copycat_vertical_step", + "copycats:copycat_wooden_button", + "copycats:copycat_wooden_pressure_plate" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_pipe.json b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_pipe.json new file mode 100644 index 0000000..1859dd9 --- /dev/null +++ b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_pipe.json @@ -0,0 +1,5 @@ +{ + "values": [ + "copycats:copycat_fluid_pipe" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_small.json b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_small.json new file mode 100644 index 0000000..4fe74b1 --- /dev/null +++ b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_small.json @@ -0,0 +1,5 @@ +{ + "values": [ + "copycats:copycat_ladder" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_tiny.json b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_tiny.json new file mode 100644 index 0000000..677f450 --- /dev/null +++ b/src/main/resources/data/perfectprocessing/tags/item/copycat_scrap_tiny.json @@ -0,0 +1,11 @@ +{ + "values": [ + "copycats:copycat_byte_panel", + "copycats:copycat_corner_slice", + "copycats:copycat_half_layer", + "copycats:copycat_slice", + "copycats:copycat_stacked_half_layer", + "copycats:copycat_vertical_half_layer", + "copycats:copycat_vertical_slice" + ] +} \ No newline at end of file