Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-25 08:28:34 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Ellpeck:718494a938482efa5336ea23ce6a997f885879ca
Branches Tags
Ellpeck:main
Ellpeck:1.21
Ellpeck:1.20.4
Ellpeck:1.20.1
Ellpeck:1.16
Ellpeck:clean-start
Ellpeck:1.12.2
Ellpeck:1.14-rewrite
Ellpeck:1.10.2
Ellpeck:1.11.2
Ellpeck:1.9.4
Ellpeck:1.9
Ellpeck:1.8.9
Ellpeck:1.7.10
Ellpeck:v1.3.10
Ellpeck:v1.3.9
Ellpeck:v1.3.8
Ellpeck:v1.3.7
..
compare: Ellpeck:f574925a47c2d9624b3bcc57a8515428c3c80f27
Branches Tags
Ellpeck:main
Ellpeck:1.21
Ellpeck:1.20.4
Ellpeck:1.20.1
Ellpeck:1.16
Ellpeck:clean-start
Ellpeck:1.12.2
Ellpeck:1.14-rewrite
Ellpeck:1.10.2
Ellpeck:1.11.2
Ellpeck:1.9.4
Ellpeck:1.9
Ellpeck:1.8.9
Ellpeck:1.7.10
Ellpeck:v1.3.10
Ellpeck:v1.3.9
Ellpeck:v1.3.8
Ellpeck:v1.3.7

No commits in common. "718494a938482efa5336ea23ce6a997f885879ca" and "f574925a47c2d9624b3bcc57a8515428c3c80f27" have entirely different histories.
718494a938 ... f574925a47

12 changed files with 137 additions and 23 deletions
Show stats Expand all files Collapse all files

20
src/generated/resources/.cache/cf73036c8429237f1243c873fdd92cabc277e5ec
View file

@ -1,10 +1,10 @@
// 1.21.1 2024-10-23T15:53:59.2712517 Coffee Ingredient Recipes // 1.21.1 2024-08-11T19:30:01.831319 Coffee Ingredient Recipes
c27e4fb15f6385f5e539ae481204836fb61b315b data/actuallyadditions/recipe/coffee_ingredient/blaze_powder.json 68a4a8ca4b24d8cc042c0a384069196f708a4dd9 data/actuallyadditions/recipe/coffee_ingredient/blaze_powder.json
58f717b91bb3bb0dd5cff8ebeb436062d45a2d0c data/actuallyadditions/recipe/coffee_ingredient/fermented_spider_eye.json f18e6b3fee9f1610c0366feabc0dd3ffe2455224 data/actuallyadditions/recipe/coffee_ingredient/fermented_spider_eye.json
4a528b8d95a7df8789f61d34f7253b71c164543b data/actuallyadditions/recipe/coffee_ingredient/ghast_tear.json 5402f0078e820175f117c4c3b63907f29daa6209 data/actuallyadditions/recipe/coffee_ingredient/ghast_tear.json
5b423115202fec7a2d68ac37cba54bfa61a94985 data/actuallyadditions/recipe/coffee_ingredient/golden_carrot.json 58f7831e3e547732cb9b0605334d21f45730b566 data/actuallyadditions/recipe/coffee_ingredient/golden_carrot.json
d30f3419c9c3bd2fc23bc0283c45c7c0106a7d3c data/actuallyadditions/recipe/coffee_ingredient/magma_cream.json 708f899155df8a114e30f15e7e5940f75fb2a9e9 data/actuallyadditions/recipe/coffee_ingredient/magma_cream.json
bcc38e8cce44fabc32911122306a631602618b84 data/actuallyadditions/recipe/coffee_ingredient/milk_bucket.json 113a26d8cd82641cf612e39e4bf026f769e4597b data/actuallyadditions/recipe/coffee_ingredient/milk_bucket.json
f8400141dd335ec5c9eec0015e622a33af249621 data/actuallyadditions/recipe/coffee_ingredient/milk_tagged.json 2869da64a7df293242e280a3e5c61fc3070f3c37 data/actuallyadditions/recipe/coffee_ingredient/milk_tagged.json
ac8015c1d6abdc0afc07332002dd56c6aee20172 data/actuallyadditions/recipe/coffee_ingredient/pufferfish.json 228b27e7fb0ea183b8c34561ceb6b7b6a48fc0fe data/actuallyadditions/recipe/coffee_ingredient/pufferfish.json
7f1611c9771254b5bd1d9451c942216a605b7dc5 data/actuallyadditions/recipe/coffee_ingredient/sugar.json 1f74a319b1677a66f1fc83ccc6c284dc51db88ef data/actuallyadditions/recipe/coffee_ingredient/sugar.json

2
src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/blaze_powder.json
View file

@ -10,5 +10,5 @@
"ingredient": { "ingredient": {
"item": "minecraft:blaze_powder" "item": "minecraft:blaze_powder"
}, },
"max_amplifier": 4 "maxAmplifier": 4
} }

2
src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/fermented_spider_eye.json
View file

@ -10,5 +10,5 @@
"ingredient": { "ingredient": {
"item": "minecraft:fermented_spider_eye" "item": "minecraft:fermented_spider_eye"
}, },
"max_amplifier": 2 "maxAmplifier": 2
} }

2
src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/ghast_tear.json
View file

@ -10,5 +10,5 @@
"ingredient": { "ingredient": {
"item": "minecraft:ghast_tear" "item": "minecraft:ghast_tear"
}, },
"max_amplifier": 3 "maxAmplifier": 3
} }

2
src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/golden_carrot.json
View file

@ -10,5 +10,5 @@
"ingredient": { "ingredient": {
"item": "minecraft:golden_carrot" "item": "minecraft:golden_carrot"
}, },
"max_amplifier": 2 "maxAmplifier": 2
} }

2
src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/magma_cream.json
View file

@ -10,5 +10,5 @@
"ingredient": { "ingredient": {
"item": "minecraft:magma_cream" "item": "minecraft:magma_cream"
}, },
"max_amplifier": 2 "maxAmplifier": 2
} }

4
src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/milk_bucket.json
View file

@ -1,8 +1,8 @@
{ {
"type": "actuallyadditions:coffee_ingredient", "type": "actuallyadditions:coffee_ingredient",
"extra_text": "jei.actuallyadditions.coffee.extra.milk", "extraText": "jei.actuallyadditions.coffee.extra.milk",
"ingredient": { "ingredient": {
"item": "minecraft:milk_bucket" "item": "minecraft:milk_bucket"
}, },
"max_amplifier": 0 "maxAmplifier": 0
} }

4
src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/milk_tagged.json
View file

@ -9,9 +9,9 @@
} }
], ],
"type": "actuallyadditions:coffee_ingredient", "type": "actuallyadditions:coffee_ingredient",
"extra_text": "jei.actuallyadditions.coffee.extra.milk", "extraText": "jei.actuallyadditions.coffee.extra.milk",
"ingredient": { "ingredient": {
"tag": "c:milk" "tag": "c:milk"
}, },
"max_amplifier": 0 "maxAmplifier": 0
} }

2
src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/pufferfish.json
View file

@ -10,5 +10,5 @@
"ingredient": { "ingredient": {
"item": "minecraft:pufferfish" "item": "minecraft:pufferfish"
}, },
"max_amplifier": 2 "maxAmplifier": 2
} }

2
src/generated/resources/data/actuallyadditions/recipe/coffee_ingredient/sugar.json
View file

@ -10,5 +10,5 @@
"ingredient": { "ingredient": {
"item": "minecraft:sugar" "item": "minecraft:sugar"
}, },
"max_amplifier": 4 "maxAmplifier": 4
} }

4
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CoffeeIngredientRecipe.java
View file

@ -164,8 +164,8 @@ public class CoffeeIngredientRecipe implements Recipe<RecipeInput> {
DataResult::success DataResult::success
) )
.forGetter(recipe -> recipe.instances), .forGetter(recipe -> recipe.instances),
Codec.INT.fieldOf("max_amplifier").forGetter(recipe -> recipe.maxAmplifier), Codec.INT.fieldOf("maxAmplifier").forGetter(recipe -> recipe.maxAmplifier),
Codec.STRING.optionalFieldOf("extra_text", "").forGetter(recipe -> recipe.extraText) Codec.STRING.optionalFieldOf("extraText", "").forGetter(recipe -> recipe.extraText)
) )
.apply(instance, CoffeeIngredientRecipe::new) .apply(instance, CoffeeIngredientRecipe::new)
); );

114
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FoodCrafting.java Normal file
View file

@ -0,0 +1,114 @@
/*
* This file ("FoodCrafting.java") is part of the Actually Additions mod for Minecraft.
* It is created and owned by Ellpeck and distributed
* under the Actually Additions License to be found at
* http://ellpeck.de/actaddlicense
* View the source code at https://github.com/Ellpeck/ActuallyAdditions
*
* © 2015-2017 Ellpeck
*/
package de.ellpeck.actuallyadditions.mod.crafting;
// TODO: [port] MOVE TO DATA_GENERATOR
@Deprecated
public final class FoodCrafting {
//
// public static IRecipe recipePizza;
// public static IRecipe recipeHamburger;
// public static IRecipe recipeBigCookie;
// public static IRecipe recipeSubSandwich;
// public static IRecipe recipeFrenchFry;
// public static IRecipe recipeFrenchFries;
// public static IRecipe recipeFishNChips;
// public static IRecipe recipeCheese;
// public static IRecipe recipePumpkinStew;
// public static IRecipe recipeCarrotJuice;
// public static IRecipe recipeSpaghetti;
// public static IRecipe recipeNoodle;
// public static IRecipe recipeChocolate;
// public static IRecipe recipeChocolateCake;
// public static IRecipe recipeToast;
// public static IRecipe recipeChocolateToast;
// public static IRecipe recipeBacon;
//
// public static void init() {
//
// Ingredient knife = Ingredient.fromItem(InitItems.itemKnife);
//
// //Rice Bread
// GameRegistry.addSmelting(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RICE_DOUGH.ordinal()), new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE_BREAD.ordinal()), 1F);
//
// //Bacon
// RecipeHandler.addShapelessOreDictRecipe(new ItemStack(InitItems.itemFoods, 3, TheFoods.BACON.ordinal()), knife, new ItemStack(Items.COOKED_PORKCHOP));
// recipeBacon = RecipeUtil.lastIRecipe();
//
// //Baguette
// GameRegistry.addSmelting(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DOUGH.ordinal()), new ItemStack(InitItems.itemFoods, 1, TheFoods.BAGUETTE.ordinal()), 1F);
//
// //Pizza
// RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.PIZZA.ordinal()), "HKH", "MCF", " D ", 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DOUGH.ordinal()), 'M', new ItemStack(Blocks.BROWN_MUSHROOM), 'C', "cropCarrot", 'F', new ItemStack(Items.COOKED_FISH, 1, Util.WILDCARD), 'K', knife, 'H', new ItemStack(InitItems.itemFoods, 1, TheFoods.CHEESE.ordinal()));
// recipePizza = RecipeUtil.lastIRecipe();
//
// //Hamburger
// RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.HAMBURGER.ordinal()), "KT ", "CB ", " T ", 'T', new ItemStack(InitItems.itemFoods, 1, TheFoods.TOAST.ordinal()), 'C', new ItemStack(InitItems.itemFoods, 1, TheFoods.CHEESE.ordinal()), 'K', knife, 'B', new ItemStack(Items.COOKED_BEEF));
// recipeHamburger = RecipeUtil.lastIRecipe();
//
// //Big Cookie
// RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.BIG_COOKIE.ordinal()), "DCD", "CDC", "DCD", 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DOUGH.ordinal()), 'C', new ItemStack(Items.DYE, 1, 3));
// recipeBigCookie = RecipeUtil.lastIRecipe();
//
// //Sub Sandwich
// RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.SUBMARINE_SANDWICH.ordinal()), "KCP", "FB ", "PCP", 'P', new ItemStack(Items.PAPER), 'C', new ItemStack(InitItems.itemFoods, 1, TheFoods.CHEESE.ordinal()), 'F', new ItemStack(Items.COOKED_BEEF, 1, Util.WILDCARD), 'B', new ItemStack(InitItems.itemFoods, 1, TheFoods.BAGUETTE.ordinal()), 'K', knife);
// recipeSubSandwich = RecipeUtil.lastIRecipe();
//
// //French Fry
// RecipeHandler.addShapelessOreDictRecipe(new ItemStack(InitItems.itemFoods, 2, TheFoods.FRENCH_FRY.ordinal()), new ItemStack(Items.BAKED_POTATO), knife);
// recipeFrenchFry = RecipeUtil.lastIRecipe();
//
// //French Fries
// RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.FRENCH_FRIES.ordinal()), "FFF", " P ", 'P', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.PAPER_CONE.ordinal()), 'F', new ItemStack(InitItems.itemFoods, 1, TheFoods.FRENCH_FRY.ordinal()));
// recipeFrenchFries = RecipeUtil.lastIRecipe();
//
// //Fish N Chips
// RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.FISH_N_CHIPS.ordinal()), "FIF", " P ", 'I', new ItemStack(Items.COOKED_FISH, 1, Util.WILDCARD), 'P', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.PAPER_CONE.ordinal()), 'F', new ItemStack(InitItems.itemFoods, 1, TheFoods.FRENCH_FRY.ordinal()));
// recipeFishNChips = RecipeUtil.lastIRecipe();
//
// //Cheese
// RecipeHandler.addShapelessRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.CHEESE.ordinal()), new ItemStack(Items.MILK_BUCKET), new ItemStack(Items.EGG)); //I don't know if this makes any actual sense, but whatever
// recipeCheese = RecipeUtil.lastIRecipe();
//
// //Pumpkin Stew
// RecipeHandler.addShapedRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.PUMPKIN_STEW.ordinal()), "P", "B", 'P', new ItemStack(Blocks.PUMPKIN), 'B', new ItemStack(Items.BOWL));
// recipePumpkinStew = RecipeUtil.lastIRecipe();
//
// //Carrot Juice
// RecipeHandler.addShapelessOreDictRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.CARROT_JUICE.ordinal()), new ItemStack(Items.GLASS_BOTTLE), "cropCarrot", knife);
// recipeCarrotJuice = RecipeUtil.lastIRecipe();
//
// //Spaghetti
// RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.SPAGHETTI.ordinal()), "NNN", " B ", 'N', new ItemStack(InitItems.itemFoods, 1, TheFoods.NOODLE.ordinal()), 'B', new ItemStack(Items.BOWL));
// recipeSpaghetti = RecipeUtil.lastIRecipe();
//
// //Noodle
// RecipeHandler.addShapelessOreDictRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.NOODLE.ordinal()), "cropWheat", knife);
// recipeNoodle = RecipeUtil.lastIRecipe();
//
// //Chocolate
// RecipeHandler.addShapedRecipe(new ItemStack(InitItems.itemFoods, 3, TheFoods.CHOCOLATE.ordinal()), "C C", "CMC", "C C", 'C', new ItemStack(Items.DYE, 1, 3), 'M', new ItemStack(Items.MILK_BUCKET));
// recipeChocolate = RecipeUtil.lastIRecipe();
//
// //Chocolate Cake
// RecipeHandler.addOreDictRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.CHOCOLATE_CAKE.ordinal()), "MMM", "CCC", "EDS", 'M', new ItemStack(Items.MILK_BUCKET), 'E', new ItemStack(Items.EGG), 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DOUGH.ordinal()), 'S', new ItemStack(Items.SUGAR), 'C', new ItemStack(Items.DYE, 1, 3));
// recipeChocolateCake = RecipeUtil.lastIRecipe();
//
// //Toast
// RecipeHandler.addShapelessRecipe(new ItemStack(InitItems.itemFoods, 2, TheFoods.TOAST.ordinal()), new ItemStack(Items.BREAD));
// recipeToast = RecipeUtil.lastIRecipe();
//
// //Chocolate Toast
// RecipeHandler.addShapelessRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.CHOCOLATE_TOAST.ordinal()), new ItemStack(InitItems.itemFoods, 1, TheFoods.TOAST.ordinal()), new ItemStack(InitItems.itemFoods, 1, TheFoods.CHOCOLATE.ordinal()));
// recipeChocolateToast = RecipeUtil.lastIRecipe();
// }
}