diff --git a/build.gradle b/build.gradle index 67d18a8..ff7516a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,6 @@ buildscript { repositories { - maven { - url = "https://maven.aliyun.com/repository/public" - } + mavenCentral() maven { name = "forge" url = "http://files.minecraftforge.net/maven" @@ -19,15 +17,11 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.70" classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' - classpath 'co.riiid:gradle-github-plugin:0.4.2' - classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.4.0' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.70' } } apply plugin: "net.minecraftforge.gradle.forge" -apply plugin: 'co.riiid.gradle' -apply plugin: "com.matthewprenger.cursegradle" apply plugin: 'kotlin' compileJava.options.encoding = "UTF-8" diff --git a/gradle.properties b/gradle.properties index 7ce04d0..551c4de 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G # FoodCraft Reloaded Mod Properties mod_id = foodcraftreloaded -mod_version = 1.0.4-EA +mod_version = 1.0.5 mod_group = com.projecturanus.foodcraft # Minecraft & Forge diff --git a/src/main/java/com/projecturanus/foodcraft/common/init/RegisterHandler.kt b/src/main/java/com/projecturanus/foodcraft/common/init/RegisterHandler.kt index 19ac068..2cf2f5d 100644 --- a/src/main/java/com/projecturanus/foodcraft/common/init/RegisterHandler.kt +++ b/src/main/java/com/projecturanus/foodcraft/common/init/RegisterHandler.kt @@ -407,16 +407,16 @@ object RegisterHandler { // Crops // Staples - food(event.registry, "rice_porridge", 7) { creativeTab = FcTabStaple; STAPLES += this } - food(event.registry, "egg_custard", 8) { creativeTab = FcTabStaple; STAPLES += this } - food(event.registry, "mushroom_egg_soup", 7) { creativeTab = FcTabStaple; STAPLES += this } - food(event.registry, "mushroom_chicken_soup", 9) { creativeTab = FcTabStaple; STAPLES += this } - food(event.registry, "noodles", 7) { creativeTab = FcTabStaple; STAPLES += this } - food(event.registry, "crossing_bridge_noodles", 7) { creativeTab = FcTabStaple; STAPLES += this } - food(event.registry, "pasta", 7) { creativeTab = FcTabStaple; STAPLES += this } - food(event.registry, "preserved_egg_porridge", 7) { creativeTab = FcTabStaple; STAPLES += this } - food(event.registry, "changfen", 7) { creativeTab = FcTabStaple; STAPLES += this } - food(event.registry, "laba_porridge", 9) { creativeTab = FcTabStaple; STAPLES += this } + staple("rice_porridge", 7) + staple("egg_custard", 8) + staple("mushroom_egg_soup", 7) + staple("mushroom_chicken_soup", 9) + staple("noodles", 7) + staple("crossing_bridge_noodles", 7) + staple("pasta", 7, oreDictNames = *arrayOf("foodPasta")) + staple("preserved_egg_porridge", 7) + staple("changfen", 7) + staple("laba_porridge", 9) staple("tomato_fried_egg_rice", 18) staple("disanxian_rice", 18) @@ -598,7 +598,7 @@ object RegisterHandler { } iceCream("carrot_ice_cream", Color(0xf4872f), "foodCarroticecream", "listAllicecream").apply { - realTranslationKey = "item.carrot.name" + realTranslationKey = "item.carrots.name" hasSuffix = true baseTranslationKey = "item.$MODID.ice_cream.name" } @@ -608,7 +608,7 @@ object RegisterHandler { baseTranslationKey = "item.$MODID.ice_cream.name" } iceCream("melon_ice_cream", Color(0xe848b9), "foodMelonicecream", "listAllicecream").apply { - realTranslationKey = "tile.melon_block.name" + realTranslationKey = "tile.melon.name" hasSuffix = true baseTranslationKey = "item.$MODID.ice_cream.name" } diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/apple_ice_cream.json b/src/main/resources/assets/foodcraftreloaded/recipes/apple_ice_cream.json new file mode 100644 index 0000000..d9e3510 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/apple_ice_cream.json @@ -0,0 +1,16 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "item": "foodcraftreloaded:original_ice_cream" + }, + { + "type": "forge:ore_dict", + "ore": "foodApplejuice" + } + ], + "result": { + "item": "foodcraftreloaded:apple_ice_cream" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/banana_ice_cream.json b/src/main/resources/assets/foodcraftreloaded/recipes/banana_ice_cream.json new file mode 100644 index 0000000..3ea6f32 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/banana_ice_cream.json @@ -0,0 +1,16 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "item": "foodcraftreloaded:original_ice_cream" + }, + { + "type": "forge:ore_dict", + "ore": "foodBananajuice" + } + ], + "result": { + "item": "foodcraftreloaded:banana_ice_cream" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/beverage_making/coconut_juice_milk.json b/src/main/resources/assets/foodcraftreloaded/recipes/beverage_making/coconut_juice_milk.json new file mode 100644 index 0000000..d0f1e4a --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/beverage_making/coconut_juice_milk.json @@ -0,0 +1,15 @@ +{ + "type": "foodcraftreloaded:beverage_making", + "ingredient": { + "type": "forge:ore_dict", + "ore": "cropCoconut" + }, + "cool": false, + "fluidInput": { + "fluid": "milk", + "amount": 1000 + }, + "result": { + "item": "foodcraftreloaded:coconut_juice_milk" + } +} diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/beverage_making/melon_juice.json b/src/main/resources/assets/foodcraftreloaded/recipes/beverage_making/melon_juice.json new file mode 100644 index 0000000..4fd2d31 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/beverage_making/melon_juice.json @@ -0,0 +1 @@ +{"type":"foodcraftreloaded:beverage_making","ingredient":{"item": "minecraft:melon"},"cool":true,"fluidInput":{"fluid":"water","amount":1000},"result":{"item":"foodcraftreloaded:melon_juice"}} diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/beverage_making/soybean_milk.json b/src/main/resources/assets/foodcraftreloaded/recipes/beverage_making/soybean_milk.json new file mode 100644 index 0000000..c10f107 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/beverage_making/soybean_milk.json @@ -0,0 +1,15 @@ +{ + "type": "foodcraftreloaded:beverage_making", + "ingredient": { + "type": "forge:ore_dict", + "ore": "cropSoybean" + }, + "cool": false, + "fluidInput": { + "fluid": "milk", + "amount": 1000 + }, + "result": { + "item": "foodcraftreloaded:soybean_milk" + } +} diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/carrot_ice_cream.json b/src/main/resources/assets/foodcraftreloaded/recipes/carrot_ice_cream.json new file mode 100644 index 0000000..46c15da --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/carrot_ice_cream.json @@ -0,0 +1,16 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "item": "foodcraftreloaded:original_ice_cream" + }, + { + "type": "forge:ore_dict", + "ore": "foodCarrotjuice" + } + ], + "result": { + "item": "foodcraftreloaded:carrot_ice_cream" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/coconut_ice_cream.json b/src/main/resources/assets/foodcraftreloaded/recipes/coconut_ice_cream.json new file mode 100644 index 0000000..c695178 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/coconut_ice_cream.json @@ -0,0 +1,16 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "item": "foodcraftreloaded:original_ice_cream" + }, + { + "type": "forge:ore_dict", + "ore": "foodCoconutjuice" + } + ], + "result": { + "item": "foodcraftreloaded:coconut_ice_cream" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/dumpling.json b/src/main/resources/assets/foodcraftreloaded/recipes/dumpling.json new file mode 100644 index 0000000..6886e5e --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/dumpling.json @@ -0,0 +1,16 @@ +{ + "type": "crafting_shapeless", + "ingredients": [ + { + "type": "forge:ore_dict", + "ore": "foodDumplingmeat" + }, + { + "type": "forge:ore_dict", + "ore": "foodDough" + } + ], + "result": { + "item": "foodcraftreloaded:dumpling" + } +} diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/lemon_ice_cream.json b/src/main/resources/assets/foodcraftreloaded/recipes/lemon_ice_cream.json new file mode 100644 index 0000000..577d1b5 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/lemon_ice_cream.json @@ -0,0 +1,16 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "item": "foodcraftreloaded:original_ice_cream" + }, + { + "type": "forge:ore_dict", + "ore": "foodLemonjuice" + } + ], + "result": { + "item": "foodcraftreloaded:lemon_ice_cream" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/litchi_ice_cream.json b/src/main/resources/assets/foodcraftreloaded/recipes/litchi_ice_cream.json new file mode 100644 index 0000000..778eb16 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/litchi_ice_cream.json @@ -0,0 +1,16 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "item": "foodcraftreloaded:original_ice_cream" + }, + { + "type": "forge:ore_dict", + "ore": "foodLitchijuice" + } + ], + "result": { + "item": "foodcraftreloaded:litchi_ice_cream" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/mango_ice_cream.json b/src/main/resources/assets/foodcraftreloaded/recipes/mango_ice_cream.json new file mode 100644 index 0000000..01242f8 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/mango_ice_cream.json @@ -0,0 +1,16 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "item": "foodcraftreloaded:original_ice_cream" + }, + { + "type": "forge:ore_dict", + "ore": "foodMangojuice" + } + ], + "result": { + "item": "foodcraftreloaded:mango_ice_cream" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/melon_ice_cream.json b/src/main/resources/assets/foodcraftreloaded/recipes/melon_ice_cream.json new file mode 100644 index 0000000..3864b51 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/melon_ice_cream.json @@ -0,0 +1,16 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "item": "foodcraftreloaded:original_ice_cream" + }, + { + "type": "forge:ore_dict", + "ore": "foodMelonjuice" + } + ], + "result": { + "item": "foodcraftreloaded:melon_ice_cream" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/orange_ice_cream.json b/src/main/resources/assets/foodcraftreloaded/recipes/orange_ice_cream.json new file mode 100644 index 0000000..6bbc927 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/orange_ice_cream.json @@ -0,0 +1,16 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "item": "foodcraftreloaded:original_ice_cream" + }, + { + "type": "forge:ore_dict", + "ore": "foodOrangejuice" + } + ], + "result": { + "item": "foodcraftreloaded:orange_ice_cream" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/papaya_ice_cream.json b/src/main/resources/assets/foodcraftreloaded/recipes/papaya_ice_cream.json new file mode 100644 index 0000000..741f2d4 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/papaya_ice_cream.json @@ -0,0 +1,16 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "item": "foodcraftreloaded:original_ice_cream" + }, + { + "type": "forge:ore_dict", + "ore": "foodPapayajuice" + } + ], + "result": { + "item": "foodcraftreloaded:papaya_ice_cream" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/peach_ice_cream.json b/src/main/resources/assets/foodcraftreloaded/recipes/peach_ice_cream.json new file mode 100644 index 0000000..a7115ea --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/peach_ice_cream.json @@ -0,0 +1,16 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "item": "foodcraftreloaded:original_ice_cream" + }, + { + "type": "forge:ore_dict", + "ore": "foodPeachjuice" + } + ], + "result": { + "item": "foodcraftreloaded:peach_ice_cream" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/peanut_tangyuan_stuffing.json b/src/main/resources/assets/foodcraftreloaded/recipes/peanut_tangyuan_stuffing.json index 12504de..6259a37 100644 --- a/src/main/resources/assets/foodcraftreloaded/recipes/peanut_tangyuan_stuffing.json +++ b/src/main/resources/assets/foodcraftreloaded/recipes/peanut_tangyuan_stuffing.json @@ -5,12 +5,16 @@ "type": "forge:ore_dict", "ore": "cropPeanut" }, + { + "type": "forge:ore_dict", + "ore": "cropPeanut" + }, { "type": "forge:ore_dict", "ore": "listAllsugar" } ], "result": { - "item": "foodcraftreloaded:sticky_rice_dough" + "item": "foodcraftreloaded:peanut_tangyuan_stuffing" } } diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/pear_ice_cream.json b/src/main/resources/assets/foodcraftreloaded/recipes/pear_ice_cream.json new file mode 100644 index 0000000..bed6ecf --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/pear_ice_cream.json @@ -0,0 +1,16 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "item": "foodcraftreloaded:original_ice_cream" + }, + { + "type": "forge:ore_dict", + "ore": "foodPearjuice" + } + ], + "result": { + "item": "foodcraftreloaded:pear_ice_cream" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/persimmon_ice_cream.json b/src/main/resources/assets/foodcraftreloaded/recipes/persimmon_ice_cream.json new file mode 100644 index 0000000..84a71da --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/persimmon_ice_cream.json @@ -0,0 +1,16 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "item": "foodcraftreloaded:original_ice_cream" + }, + { + "type": "forge:ore_dict", + "ore": "foodPersimmonjuice" + } + ], + "result": { + "item": "foodcraftreloaded:persimmon_ice_cream" + } + } + \ No newline at end of file diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/pressure_cooking/mushroom_egg_soup.json b/src/main/resources/assets/foodcraftreloaded/recipes/pressure_cooking/mushroom_egg_soup.json new file mode 100644 index 0000000..01480d9 --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/pressure_cooking/mushroom_egg_soup.json @@ -0,0 +1,25 @@ +{ + "type": "foodcraftreloaded:pressure_cooking", + "ingredients": [ + { + "type": "forge:ore_dict", + "ore": "listAllmushroom" + }, + { + "type": "forge:ore_dict", + "ore": "listAllegg" + }, + { + "type": "forge:ore_dict", + "ore": "dustSalt" + } + ], + "fluidInput": { + "fluid": "water", + "amount": 1000 + }, + "result": { + "item": "foodcraftreloaded:mushroom_egg_soup", + "count": 1 + } +} diff --git a/src/main/resources/assets/foodcraftreloaded/recipes/strawberry_ice_cream.json b/src/main/resources/assets/foodcraftreloaded/recipes/strawberry_ice_cream.json new file mode 100644 index 0000000..fa5d0ae --- /dev/null +++ b/src/main/resources/assets/foodcraftreloaded/recipes/strawberry_ice_cream.json @@ -0,0 +1,16 @@ +{ + "type": "forge:ore_shapeless", + "ingredients": [ + { + "item": "foodcraftreloaded:original_ice_cream" + }, + { + "type": "forge:ore_dict", + "ore": "foodStrawberryjuice" + } + ], + "result": { + "item": "foodcraftreloaded:strawberry_ice_cream" + } + } + \ No newline at end of file