From c64c4b3a580f2df186fcddebac5007cb54358f88 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 17 Apr 2020 23:17:46 +0200 Subject: [PATCH] ALL THE RECIPES --- .../java/de/ellpeck/prettypipes/Registry.java | 3 ++- .../assets/prettypipes/lang/en_us.json | 1 + .../prettypipes/models/item/blank_module.json | 6 +++++ .../textures/item/blank_module.png | Bin 0 -> 186 bytes .../prettypipes/recipes/blank_module.json | 22 +++++++++++++++ .../recipes/high_extraction_module.json | 22 +++++++++++++++ .../recipes/high_filter_module.json | 22 +++++++++++++++ .../recipes/high_low_priority_module.json | 19 +++++++++++++ .../recipes/high_retrieval_module.json | 25 ++++++++++++++++++ .../recipes/high_speed_module.json | 22 +++++++++++++++ .../recipes/low_extraction_module.json | 22 +++++++++++++++ .../recipes/low_filter_module.json | 22 +++++++++++++++ .../recipes/low_low_priority_module.json | 22 +++++++++++++++ .../recipes/low_retrieval_module.json | 25 ++++++++++++++++++ .../prettypipes/recipes/low_speed_module.json | 22 +++++++++++++++ .../recipes/medium_extraction_module.json | 19 +++++++++++++ .../recipes/medium_filter_module.json | 22 +++++++++++++++ .../recipes/medium_low_priority_module.json | 19 +++++++++++++ .../recipes/medium_retrieval_module.json | 22 +++++++++++++++ .../recipes/medium_speed_module.json | 22 +++++++++++++++ .../data/prettypipes/recipes/pipe.json | 22 +++++++++++++++ .../data/prettypipes/recipes/wrench.json | 22 +++++++++++++++ 22 files changed, 402 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/prettypipes/models/item/blank_module.json create mode 100644 src/main/resources/assets/prettypipes/textures/item/blank_module.png create mode 100644 src/main/resources/data/prettypipes/recipes/blank_module.json create mode 100644 src/main/resources/data/prettypipes/recipes/high_extraction_module.json create mode 100644 src/main/resources/data/prettypipes/recipes/high_filter_module.json create mode 100644 src/main/resources/data/prettypipes/recipes/high_low_priority_module.json create mode 100644 src/main/resources/data/prettypipes/recipes/high_retrieval_module.json create mode 100644 src/main/resources/data/prettypipes/recipes/high_speed_module.json create mode 100644 src/main/resources/data/prettypipes/recipes/low_extraction_module.json create mode 100644 src/main/resources/data/prettypipes/recipes/low_filter_module.json create mode 100644 src/main/resources/data/prettypipes/recipes/low_low_priority_module.json create mode 100644 src/main/resources/data/prettypipes/recipes/low_retrieval_module.json create mode 100644 src/main/resources/data/prettypipes/recipes/low_speed_module.json create mode 100644 src/main/resources/data/prettypipes/recipes/medium_extraction_module.json create mode 100644 src/main/resources/data/prettypipes/recipes/medium_filter_module.json create mode 100644 src/main/resources/data/prettypipes/recipes/medium_low_priority_module.json create mode 100644 src/main/resources/data/prettypipes/recipes/medium_retrieval_module.json create mode 100644 src/main/resources/data/prettypipes/recipes/medium_speed_module.json create mode 100644 src/main/resources/data/prettypipes/recipes/pipe.json create mode 100644 src/main/resources/data/prettypipes/recipes/wrench.json diff --git a/src/main/java/de/ellpeck/prettypipes/Registry.java b/src/main/java/de/ellpeck/prettypipes/Registry.java index bd074e3..3893f64 100644 --- a/src/main/java/de/ellpeck/prettypipes/Registry.java +++ b/src/main/java/de/ellpeck/prettypipes/Registry.java @@ -85,7 +85,8 @@ public final class Registry { public static void registerItems(RegistryEvent.Register event) { IForgeRegistry registry = event.getRegistry(); registry.registerAll( - wrenchItem = new WrenchItem().setRegistryName("wrench") + wrenchItem = new WrenchItem().setRegistryName("wrench"), + new Item(new Item.Properties().group(GROUP)).setRegistryName("blank_module") ); registry.registerAll(createTieredModule("extraction_module", ExtractionModuleItem::new)); registry.registerAll(createTieredModule("filter_module", FilterModuleItem::new)); diff --git a/src/main/resources/assets/prettypipes/lang/en_us.json b/src/main/resources/assets/prettypipes/lang/en_us.json index ad5f2b5..1f8af69 100644 --- a/src/main/resources/assets/prettypipes/lang/en_us.json +++ b/src/main/resources/assets/prettypipes/lang/en_us.json @@ -1,5 +1,6 @@ { "item.prettypipes.wrench": "Pipe Wrench", + "item.prettypipes.blank_module": "Blank Module", "item.prettypipes.low_extraction_module": "Low Extraction Module", "item.prettypipes.medium_extraction_module": "Medium Extraction Module", "item.prettypipes.high_extraction_module": "High Extraction Module", diff --git a/src/main/resources/assets/prettypipes/models/item/blank_module.json b/src/main/resources/assets/prettypipes/models/item/blank_module.json new file mode 100644 index 0000000..2cf743a --- /dev/null +++ b/src/main/resources/assets/prettypipes/models/item/blank_module.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "prettypipes:item/blank_module" + } +} diff --git a/src/main/resources/assets/prettypipes/textures/item/blank_module.png b/src/main/resources/assets/prettypipes/textures/item/blank_module.png new file mode 100644 index 0000000000000000000000000000000000000000..57617635a38bd131e4dc6bcc38c6cb607c5492ef GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|N<3X0Lo9le z6BY;<9Fn-bJ?Dpimz)252DcrIAkP0+XQL>vf&NaCLRaA_QsEg6wDZGCnhkz$TA30GHg>|u1L#Tv072n*wkdJ ffl!z$3j>4yLq&l%M_x<<+RxzW>gTe~DWM4fVf#NP literal 0 HcmV?d00001 diff --git a/src/main/resources/data/prettypipes/recipes/blank_module.json b/src/main/resources/data/prettypipes/recipes/blank_module.json new file mode 100644 index 0000000..47a3fb5 --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/blank_module.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " R ", + "SPS", + " R " + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "P": { + "item": "prettypipes:pipe" + }, + "S": { + "item": "minecraft:stone_slab" + } + }, + "result": { + "item": "prettypipes:blank_module" + } +} \ No newline at end of file diff --git a/src/main/resources/data/prettypipes/recipes/high_extraction_module.json b/src/main/resources/data/prettypipes/recipes/high_extraction_module.json new file mode 100644 index 0000000..c6b72a5 --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/high_extraction_module.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GDG", + "GMG", + "GGG" + ], + "key": { + "D": { + "item": "minecraft:diamond" + }, + "G": { + "item": "minecraft:gold_ingot" + }, + "M": { + "item": "prettypipes:medium_extraction_module" + } + }, + "result": { + "item": "prettypipes:high_extraction_module" + } +} \ No newline at end of file diff --git a/src/main/resources/data/prettypipes/recipes/high_filter_module.json b/src/main/resources/data/prettypipes/recipes/high_filter_module.json new file mode 100644 index 0000000..f16ca01 --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/high_filter_module.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GBG", + "BMB", + "GBG" + ], + "key": { + "G": { + "item": "minecraft:gold_ingot" + }, + "M": { + "item": "prettypipes:medium_filter_module" + }, + "B": { + "item": "minecraft:iron_bars" + } + }, + "result": { + "item": "prettypipes:high_filter_module" + } +} \ No newline at end of file diff --git a/src/main/resources/data/prettypipes/recipes/high_low_priority_module.json b/src/main/resources/data/prettypipes/recipes/high_low_priority_module.json new file mode 100644 index 0000000..1ecf199 --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/high_low_priority_module.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "CCC", + "CMC", + "CCC" + ], + "key": { + "C": { + "item": "minecraft:cobblestone" + }, + "M": { + "item": "prettypipes:medium_low_priority_module" + } + }, + "result": { + "item": "prettypipes:high_low_priority_module" + } +} \ No newline at end of file diff --git a/src/main/resources/data/prettypipes/recipes/high_retrieval_module.json b/src/main/resources/data/prettypipes/recipes/high_retrieval_module.json new file mode 100644 index 0000000..aa1a141 --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/high_retrieval_module.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "RDR", + "GMG", + "RGR" + ], + "key": { + "G": { + "item": "minecraft:gold_ingot" + }, + "M": { + "item": "prettypipes:medium_retrieval_module" + }, + "D": { + "item": "minecraft:diamond" + }, + "R": { + "item": "minecraft:redstone_block" + } + }, + "result": { + "item": "prettypipes:high_retrieval_module" + } +} \ No newline at end of file diff --git a/src/main/resources/data/prettypipes/recipes/high_speed_module.json b/src/main/resources/data/prettypipes/recipes/high_speed_module.json new file mode 100644 index 0000000..65b04b6 --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/high_speed_module.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GBG", + "BMB", + "GBG" + ], + "key": { + "G": { + "item": "minecraft:gold_ingot" + }, + "M": { + "item": "prettypipes:medium_speed_module" + }, + "B": { + "item": "minecraft:sugar" + } + }, + "result": { + "item": "prettypipes:high_speed_module" + } +} \ No newline at end of file diff --git a/src/main/resources/data/prettypipes/recipes/low_extraction_module.json b/src/main/resources/data/prettypipes/recipes/low_extraction_module.json new file mode 100644 index 0000000..74062ed --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/low_extraction_module.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " P ", + "RMR", + " R " + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "P": { + "item": "minecraft:piston" + }, + "M": { + "item": "prettypipes:blank_module" + } + }, + "result": { + "item": "prettypipes:low_extraction_module" + } +} \ No newline at end of file diff --git a/src/main/resources/data/prettypipes/recipes/low_filter_module.json b/src/main/resources/data/prettypipes/recipes/low_filter_module.json new file mode 100644 index 0000000..34b2e27 --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/low_filter_module.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " H ", + "RMR", + " R " + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "H": { + "item": "minecraft:hopper" + }, + "M": { + "item": "prettypipes:blank_module" + } + }, + "result": { + "item": "prettypipes:low_filter_module" + } +} \ No newline at end of file diff --git a/src/main/resources/data/prettypipes/recipes/low_low_priority_module.json b/src/main/resources/data/prettypipes/recipes/low_low_priority_module.json new file mode 100644 index 0000000..a220b1b --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/low_low_priority_module.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " C ", + "RMR", + " R " + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "C": { + "item": "minecraft:cobblestone" + }, + "M": { + "item": "prettypipes:blank_module" + } + }, + "result": { + "item": "prettypipes:low_low_priority_module" + } +} \ No newline at end of file diff --git a/src/main/resources/data/prettypipes/recipes/low_retrieval_module.json b/src/main/resources/data/prettypipes/recipes/low_retrieval_module.json new file mode 100644 index 0000000..54a18d4 --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/low_retrieval_module.json @@ -0,0 +1,25 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " P ", + "RMR", + " E " + ], + "key": { + "R": { + "item": "minecraft:redstone_block" + }, + "P": { + "item": "minecraft:sticky_piston" + }, + "M": { + "item": "prettypipes:blank_module" + }, + "E": { + "item": "minecraft:ender_pearl" + } + }, + "result": { + "item": "prettypipes:low_retrieval_module" + } +} \ No newline at end of file diff --git a/src/main/resources/data/prettypipes/recipes/low_speed_module.json b/src/main/resources/data/prettypipes/recipes/low_speed_module.json new file mode 100644 index 0000000..9ae0491 --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/low_speed_module.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + "RMR", + " R " + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "S": { + "item": "minecraft:sugar" + }, + "M": { + "item": "prettypipes:blank_module" + } + }, + "result": { + "item": "prettypipes:low_speed_module" + } +} \ No newline at end of file diff --git a/src/main/resources/data/prettypipes/recipes/medium_extraction_module.json b/src/main/resources/data/prettypipes/recipes/medium_extraction_module.json new file mode 100644 index 0000000..baf48ba --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/medium_extraction_module.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " I ", + "IMI", + " I " + ], + "key": { + "I": { + "item": "minecraft:iron_ingot" + }, + "M": { + "item": "prettypipes:low_extraction_module" + } + }, + "result": { + "item": "prettypipes:medium_extraction_module" + } +} \ No newline at end of file diff --git a/src/main/resources/data/prettypipes/recipes/medium_filter_module.json b/src/main/resources/data/prettypipes/recipes/medium_filter_module.json new file mode 100644 index 0000000..20bd606 --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/medium_filter_module.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " B ", + "IMI", + " B " + ], + "key": { + "I": { + "item": "minecraft:iron_ingot" + }, + "M": { + "item": "prettypipes:low_filter_module" + }, + "B": { + "item": "minecraft:iron_bars" + } + }, + "result": { + "item": "prettypipes:medium_filter_module" + } +} \ No newline at end of file diff --git a/src/main/resources/data/prettypipes/recipes/medium_low_priority_module.json b/src/main/resources/data/prettypipes/recipes/medium_low_priority_module.json new file mode 100644 index 0000000..2a1b3dd --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/medium_low_priority_module.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " C ", + "CMC", + " C " + ], + "key": { + "C": { + "item": "minecraft:cobblestone" + }, + "M": { + "item": "prettypipes:low_low_priority_module" + } + }, + "result": { + "item": "prettypipes:medium_low_priority_module" + } +} \ No newline at end of file diff --git a/src/main/resources/data/prettypipes/recipes/medium_retrieval_module.json b/src/main/resources/data/prettypipes/recipes/medium_retrieval_module.json new file mode 100644 index 0000000..827e88c --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/medium_retrieval_module.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "RRR", + "IMI", + " I " + ], + "key": { + "I": { + "item": "minecraft:gold_ingot" + }, + "M": { + "item": "prettypipes:low_retrieval_module" + }, + "R": { + "item": "minecraft:redstone_block" + } + }, + "result": { + "item": "prettypipes:medium_retrieval_module" + } +} \ No newline at end of file diff --git a/src/main/resources/data/prettypipes/recipes/medium_speed_module.json b/src/main/resources/data/prettypipes/recipes/medium_speed_module.json new file mode 100644 index 0000000..7e95139 --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/medium_speed_module.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "ISI", + "SMS", + "ISI" + ], + "key": { + "S": { + "item": "minecraft:sugar" + }, + "M": { + "item": "prettypipes:low_speed_module" + }, + "I": { + "item": "minecraft:iron_ingot" + } + }, + "result": { + "item": "prettypipes:medium_speed_module" + } +} \ No newline at end of file diff --git a/src/main/resources/data/prettypipes/recipes/pipe.json b/src/main/resources/data/prettypipes/recipes/pipe.json new file mode 100644 index 0000000..ed756b6 --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/pipe.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " R ", + "IGI" + ], + "key": { + "R": { + "item": "minecraft:redstone" + }, + "I": { + "item": "minecraft:iron_bars" + }, + "G": { + "item": "minecraft:glass" + } + }, + "result": { + "item": "prettypipes:pipe", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/prettypipes/recipes/wrench.json b/src/main/resources/data/prettypipes/recipes/wrench.json new file mode 100644 index 0000000..9996c9e --- /dev/null +++ b/src/main/resources/data/prettypipes/recipes/wrench.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "PI ", + "II ", + " R" + ], + "key": { + "P": { + "item": "prettypipes:pipe" + }, + "I": { + "item": "minecraft:iron_ingot" + }, + "R": { + "item": "minecraft:red_dye" + } + }, + "result": { + "item": "prettypipes:wrench" + } +} \ No newline at end of file