Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import net.minecraft.data.recipes.*;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.crafting.Ingredient;
import net.satisfy.farm_and_charm.core.registry.ObjectRegistry;

import java.util.function.Consumer;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,17 @@ public void generateTranslations(TranslationBuilder tb) {
tb.add(CornExpansionObjects.BUTTERY_POLENTA.get(), "Buttery Polenta");
tb.add(CornExpansionObjects.CHEESY_POLENTA.get(), "Cheesy Polenta");

tb.add(CornExpansionObjects.CORN_PANCAKE.get(), "Corn Pancake");
tb.add(CornExpansionObjects.CORN_SALSA.get(), "Corn Salsa");
tb.add(CornExpansionObjects.CHICKEN_CORN_CHOWDER.get(), "Chicken Corn Chowder");
tb.add(CornExpansionObjects.BACON_CORN_CASSEROLE.get(), "Bacon Corn Casserole");
tb.add(CornExpansionObjects.CORN_SALAD.get(), "Corn Salad");
tb.add(CornExpansionObjects.BACON_WRAPPED_CORN.get(), "Bacon-Wrapped Corn on the Cob");
tb.add(CornExpansionObjects.CREAMY_CORN_PASTA.get(), "Creamy Corn Pasta");
tb.add(CornExpansionObjects.CHAMPURRADO.get(), "Champurrado");
tb.add(CornExpansionObjects.ATOLE.get(), "Atole");


// Blocks
tb.add(CornExpansionObjects.POPCORN_TIN_BLOCK.get(), "Popcorn Tin");
tb.add(CornExpansionObjects.SWEET_POPCORN_TIN_BLOCK.get(), "Sweet Popcorn Tin");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,26 @@ public class CornExpansionObjects {
getFoodItemSettings(FoodUtils.createFood(4, 0.4F, MobEffectRegistry.SUSTENANCE, CornExpansionFoodProperties.SHORT_DURATION, false, false))));


// ROASTER UPDATE!
public static final RegistrySupplier<Item> CORN_PANCAKE = registerItem("corn_pancake", () -> new EffectItem(
getFoodItemSettings(FoodUtils.createFood(14, 0.8F, MobEffectRegistry.SATIATION, CornExpansionFoodProperties.LONG_DURATION, false, false))));
public static final RegistrySupplier<Item> CORN_SALSA = registerItem("corn_salsa", () -> new EffectItem(
getFoodItemSettings(FoodUtils.createFood(6, 0.3F, MobEffectRegistry.RESTED, CornExpansionFoodProperties.SHORT_DURATION, false, false))));
public static final RegistrySupplier<Item> CHICKEN_CORN_CHOWDER = registerItem("chicken_corn_chowder", () -> new EffectItem(
getFoodItemSettings(FoodUtils.createFood(10, 0.6F, MobEffectRegistry.SUSTENANCE, CornExpansionFoodProperties.MEDIUM_DURATION, false, false))));
public static final RegistrySupplier<Item> BACON_CORN_CASSEROLE = registerItem("bacon_corn_casserole", () -> new EffectItem(
getFoodItemSettings(FoodUtils.createFood(8, 0.6F, MobEffectRegistry.SATIATION, CornExpansionFoodProperties.MEDIUM_DURATION, false, false))));
public static final RegistrySupplier<Item> CORN_SALAD = registerItem("corn_salad", () -> new EffectItem(
getFoodItemSettings(FoodUtils.createFood(7, 0.4F, MobEffectRegistry.SUSTENANCE, CornExpansionFoodProperties.SHORT_DURATION, false, false))));
public static final RegistrySupplier<Item> BACON_WRAPPED_CORN = registerItem("bacon_wrapped_corn", () -> new StickFoodItem(
getFoodItemSettings(FoodUtils.createFood(8, 0.4F, MobEffectRegistry.RESTED, CornExpansionFoodProperties.SHORT_DURATION, false, false)).stacksTo(16)));
public static final RegistrySupplier<Item> CREAMY_CORN_PASTA = registerItem("creamy_corn_pasta", () -> new EffectItem(
getFoodItemSettings(FoodUtils.createFood(10, 0.6F, MobEffectRegistry.SATIATION, CornExpansionFoodProperties.MEDIUM_DURATION, false, false))));
public static final RegistrySupplier<Item> CHAMPURRADO = registerItem("champurrado", () -> new HoneyBottleItem(
getFoodItemSettings(FoodUtils.createFood(7, 0.6F, MobEffectRegistry.SWEETS, CornExpansionFoodProperties.MEDIUM_DURATION, true, true)).stacksTo(16).craftRemainder(Items.GLASS_BOTTLE)));
public static final RegistrySupplier<Item> ATOLE = registerItem("atole", () -> new EffectItem(
getFoodItemSettings(FoodUtils.createFood(7, 0.6F, MobEffectRegistry.SUSTENANCE, CornExpansionFoodProperties.MEDIUM_DURATION, true, true)).stacksTo(16).craftRemainder(Items.GLASS_BOTTLE)));

public static void init() {
ITEMS.register();
BLOCKS.register();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"tag": "farm_and_charm:corn"
},
{
"tag": "farm_and_charm:corn"
},
{
"item": "farm_and_charm:lettuce"
},
{
"tag": "farm_and_charm:onion"
},
{
"item": "minecraft:carrot"
},
{
"item": "minecraft:beetroot"
},
{
"item": "minecraft:bowl"
}
],
"result": {
"item": "cornexpansion:corn_salad",
"count": 3
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"type": "farm_and_charm:crafting_bowl",
"ingredients": [
{
"tag": "farm_and_charm:corn"
},
{
"tag": "farm_and_charm:onion"
},
{
"tag": "farm_and_charm:tomato"
},
{
"item": "minecraft:bowl"
}
],
"result": {
"item": "cornexpansion:corn_salsa",
"count": 3
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"type": "farm_and_charm:pot_cooking",
"ingredients": [
{
"tag": "farm_and_charm:milk"
},
{
"tag": "cornexpansion:sweet_ingredient"
},
{
"tag": "farm_and_charm:corn"
},
{
"item": "cornexpansion:cornmeal"
}
],
"container": {
"required": true,
"item": {
"item": "minecraft:glass_bottle"
}
},
"result": {
"item": "cornexpansion:atole",
"count": 2
},
"requiresLearning": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"type": "farm_and_charm:pot_cooking",
"ingredients": [
{
"tag": "farm_and_charm:water_bottles"
},
{
"tag": "cornexpansion:sweet_ingredient"
},
{
"tag": "cornexpansion:candied_ingredient"
},
{
"tag": "cornexpansion:candied_ingredient"
},
{
"item": "cornexpansion:corn_flour"
},
{
"item": "cornexpansion:corn_flour"
}
],
"container": {
"required": true,
"item": {
"item": "minecraft:glass_bottle"
}
},
"result": {
"item": "cornexpansion:champurrado",
"count": 2
},
"requiresLearning": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"type": "farm_and_charm:roaster",
"ingredients": [
{
"tag": "farm_and_charm:raw_bacon"
},
{
"tag": "farm_and_charm:raw_bacon"
},
{
"tag": "farm_and_charm:corn"
},
{
"tag": "farm_and_charm:corn"
},
{
"tag": "farm_and_charm:corn"
},
{
"tag": "farm_and_charm:butter"
}
],
"container": {
"item": "minecraft:bowl"
},
"result": {
"item": "cornexpansion:bacon_corn_casserole",
"count": 3
},
"requiresLearning": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"type": "farm_and_charm:roaster",
"ingredients": [
{
"tag": "farm_and_charm:raw_bacon"
},
{
"tag": "farm_and_charm:corn"
},
{
"tag": "farm_and_charm:butter"
}
],
"container": {
"item": "minecraft:stick"
},
"result": {
"item": "cornexpansion:bacon_wrapped_corn",
"count": 1
},
"requiresLearning": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"type": "farm_and_charm:roaster",
"ingredients": [
{
"tag": "farm_and_charm:raw_chicken"
},
{
"tag": "farm_and_charm:raw_chicken"
},
{
"tag": "farm_and_charm:corn"
},
{
"tag": "farm_and_charm:corn"
},
{
"tag": "farm_and_charm:corn"
},
{
"tag": "farm_and_charm:milk"
}
],
"container": {
"item": "minecraft:bowl"
},
"result": {
"item": "cornexpansion:chicken_corn_chowder",
"count": 3
},
"requiresLearning": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"type": "farm_and_charm:roaster",
"ingredients": [
{
"tag": "farm_and_charm:corn"
},
{
"tag": "farm_and_charm:corn"
},
{
"tag": "farm_and_charm:corn"
},
{
"item": "cornexpansion:corn_dough"
},
{
"tag": "farm_and_charm:butter"
},
{
"tag": "farm_and_charm:strawberries"
}
],
"container": {
"item": "minecraft:bowl"
},
"result": {
"item": "cornexpansion:corn_pancake",
"count": 3
},
"requiresLearning": false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"type": "farm_and_charm:roaster",
"ingredients": [
{
"tag": "farm_and_charm:pasta"
},
{
"tag": "farm_and_charm:pasta"
},
{
"tag": "farm_and_charm:corn"
},
{
"tag": "farm_and_charm:corn"
},
{
"tag": "farm_and_charm:corn"
},
{
"tag": "farm_and_charm:milk"
}
],
"container": {
"item": "minecraft:bowl"
},
"result": {
"item": "cornexpansion:creamy_corn_pasta",
"count": 3
},
"requiresLearning": false
}