Skip to content

Commit

Permalink
Pelmeni! (woo)
Browse files Browse the repository at this point in the history
  • Loading branch information
bruberu committed Sep 14, 2023
1 parent 083763e commit 8629fd7
Show file tree
Hide file tree
Showing 16 changed files with 122 additions and 4 deletions.
4 changes: 2 additions & 2 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {
implementation 'zone.rong:mixinbooter:7.0'

implementation "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.554"
implementation rfg.deobf("curse.maven:gregtech-ce-unofficial-557242:4701483")
//implementation rfg.deobf("curse.maven:gregtech-ce-unofficial-557242:4701483")
implementation "team.chisel.ctm:CTM:MC${project.minecraft.version}-1.0.2.31"
//provided files("libs/gregicality-1.12.2-0.23.1.jar")
implementation "codechicken:ChickenASM:1.12-1.0.2.9"
Expand All @@ -55,7 +55,7 @@ dependencies {

//compile "curse.maven:spiceoflife-220811:2571951"

//implementation files("libs/gregtech-1.12.2-2.6.2-beta-dev.jar")
implementation files("libs/gregtech-1.12.2-2.7.3-beta-dev.jar")
implementation files("libs/AppleSkin-mc1.12-1.0.9.jar")
implementation files("libs/groovyscript-0.6.1.jar")
implementation files("libs/NuclearCraft-2o.6.0-1.12.2.jar")
Expand Down
Binary file added libs/gregtech-1.12.2-2.7.3-beta-dev.jar
Binary file not shown.
8 changes: 6 additions & 2 deletions src/main/java/gregtechfoodoption/GTFOMaterialHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,12 @@ public class GTFOMaterialHandler {
.color(0xCA190F)
.build();



public static final Material SourCream = fluidBuilder(21612, "sour_cream")
.color(0xe3de9d)
.build();
public static final Material LacticAcidBacteria = fluidBuilder(21613, "lactic_acid_bacteria")
.color(0x371040)
.build();

public static final Material SweetenedDilutedCaneSyrupMixture = fluidBuilder(21970, "sweetened_diluted_cane_syrup_mixture")
.color(0xdedcc8)
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/gregtechfoodoption/item/GTFOMetaItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,11 @@ public class GTFOMetaItem extends MetaItem<GTFOMetaItem.GTFOMetaValueItem> imple

public static MetaItem<?>.MetaValueItem EMERGENCY_RATIONS;

public static MetaItem<?>.MetaValueItem UNCOOKED_PELMENI;
public static MetaItem<?>.MetaValueItem UNCOOKED_SEASONED_PELMENI;
public static MetaItem<?>.MetaValueItem PELMENI;
public static MetaItem<?>.MetaValueItem SEASONED_PELMENI;

public GTFOMetaItem() {
super((short) 0);
}
Expand Down Expand Up @@ -585,6 +590,9 @@ public void registerSubItems() {
UNFIRED_PLATE = addItem(322, "component.unfired_plate");
UNFIRED_BOWL = addItem(323, "component.unfired_bowl");

UNCOOKED_PELMENI = addItem(338, "component.pelmeni_uncooked");
UNCOOKED_SEASONED_PELMENI = addItem(339, "component.pelmeni_uncooked_seasoned");

POPCORN_BAG = addItem(0, "food.popcorn_bag").addComponents(new GTFOFoodStats(GTFOConfig.gtfoFoodConfig.popcornHunger, GTFOConfig.gtfoFoodConfig.popcornSaturation, false, true, PAPER_BAG.getStackForm(1),
new RandomPotionEffect(getPotionById(10), 300, 1, 0)));
MINERAL_WATER = addItem(12, "food.mineral_water").addComponents(new GTFOFoodStats(GTFOConfig.gtfoFoodConfig.mineralWaterHunger, GTFOConfig.gtfoFoodConfig.mineralWaterSaturation, true, true, USED_THERMOS.getStackForm(1),
Expand Down Expand Up @@ -865,6 +873,9 @@ public void registerSubItems() {
EMERGENCY_RATIONS = addItem(325, "food.emergency_rations").addComponents(new GTFOFoodStats(5, 1.0f, false, true)
.setPotionEffects(new RandomPotionEffect(MobEffects.NAUSEA, 400, 0, 100 - 10)).setEatingDuration(60));

PELMENI = addItem(340, "food.pelmeni").addComponents(new GTFOFoodStats(5, 0.5f));
SEASONED_PELMENI = addItem(341, "food.pelmeni_seasoned").addComponents(new GTFOFoodStats(7, 1f).setEatingDuration(24));

UNKNOWN_SEED = addItem(158, "seed.unknown");
ONION_SEED = addItem(159, "seed.onion");
ONION_SEED.addComponents(new GTFOCropSeedBehaviour(GTFOCrops.CROP_ONION, ONION_SEED.getStackForm(), ONION.getStackForm()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public static void init() {
PastaChain.init();
PlateChain.init();
LithiumChain.init();
RussianChain.init();

if (Loader.isModLoaded(GTFOValues.MODID_GCYS)) {
PopcornChain.init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ public static void init() {
.buildAndRegister();
CENTRIFUGE_RECIPES.recipeBuilder().EUt(24).duration(100)
.fluidInputs(Milk.getFluid(1000))
.circuitMeta(1)
.fluidOutputs(UnpasteurizedSkimmedMilk.getFluid(800))
.buildAndRegister();
if (!GTFOConfig.gtfoChainsConfig.makeChainsHarder) {
Expand Down
68 changes: 68 additions & 0 deletions src/main/java/gregtechfoodoption/recipe/chain/RussianChain.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package gregtechfoodoption.recipe.chain;

import gregtech.api.recipes.ModHandler;
import gregtech.api.recipes.RecipeMaps;
import gregtech.api.unification.OreDictUnifier;
import gregtech.api.unification.material.Materials;
import gregtech.api.unification.ore.OrePrefix;
import gregtechfoodoption.GTFOMaterialHandler;
import gregtechfoodoption.item.GTFOMetaItem;
import gregtechfoodoption.recipe.GTFORecipeMaps;
import gregtechfoodoption.utils.GTFOUtils;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;

public class RussianChain {
public static void init() {
ModHandler.addShapelessRecipe("pelmeni_hand", GTFOMetaItem.UNCOOKED_PELMENI.getStackForm(), GTFOMetaItem.DOUGH.getStackForm(), OreDictUnifier.get(OrePrefix.dust, Materials.Meat));
ModHandler.addShapelessRecipe("pelmeni_hand_3", GTFOMetaItem.UNCOOKED_PELMENI.getStackForm(3), GTFOMetaItem.DOUGH.getStackForm(3), OreDictUnifier.get(OrePrefix.dust, Materials.Meat), new ItemStack(Blocks.BROWN_MUSHROOM));


GTFORecipeMaps.CUISINE_ASSEMBLER_RECIPES.recipeBuilder().EUt(24).duration(100)
.inputs(GTFOMetaItem.DOUGH.getStackForm())
.input(OrePrefix.dust, Materials.Meat)
.circuitMeta(1)
.outputs(GTFOMetaItem.UNCOOKED_PELMENI.getStackForm())
.buildAndRegister();
GTFORecipeMaps.CUISINE_ASSEMBLER_RECIPES.recipeBuilder().EUt(24).duration(100)
.inputs(GTFOMetaItem.DOUGH.getStackForm(3))
.input(OrePrefix.dust, Materials.Meat)
.input(Blocks.BROWN_MUSHROOM)
.circuitMeta(2)
.outputs(GTFOMetaItem.UNCOOKED_PELMENI.getStackForm(3))
.buildAndRegister();

RecipeMaps.CENTRIFUGE_RECIPES.recipeBuilder().EUt(16).duration(1600)
.fluidInputs(Materials.Milk.getFluid(8000))
.circuitMeta(2)
.fluidOutputs(GTFOMaterialHandler.LacticAcidBacteria.getFluid(2))
.buildAndRegister();


RecipeMaps.MIXER_RECIPES.recipeBuilder().EUt(4).duration(12000)
.fluidInputs(GTFOMaterialHandler.PasteurizedMilk.getFluid(8000))
.notConsumable(GTFOMaterialHandler.LacticAcidBacteria.getFluid(8))
.fluidOutputs(GTFOMaterialHandler.SourCream.getFluid(8000))
.buildAndRegister();

GTFORecipeMaps.CUISINE_ASSEMBLER_RECIPES.recipeBuilder().EUt(24).duration(100)
.inputs(GTFOMetaItem.UNCOOKED_PELMENI.getStackForm(), GTFOMaterialHandler.GratedHorseradishRoot.getItemStack(), GTFOMaterialHandler.BlackPepper.getItemStack())
.fluidInputs(GTFOMaterialHandler.SourCream.getFluid(100))
.outputs(GTFOMetaItem.UNCOOKED_PELMENI.getStackForm())
.buildAndRegister();

GTFORecipeMaps.MULTICOOKER_RECIPES.recipeBuilder().EUt(24).duration(2000)
.inputs(GTFOMetaItem.UNCOOKED_PELMENI.getStackForm())
.fluidInputs(Materials.Water.getFluid(500))
.outputs(GTFOMetaItem.PELMENI.getStackForm())
.circuitMeta(1)
.buildAndRegister();
GTFORecipeMaps.MULTICOOKER_RECIPES.recipeBuilder().EUt(24).duration(2000)
.inputs(GTFOMetaItem.UNCOOKED_SEASONED_PELMENI.getStackForm(8))
.fluidInputs(Materials.Water.getFluid(1000))
.outputs(GTFOMetaItem.SEASONED_PELMENI.getStackForm(8))
.circuitMeta(2)
.buildAndRegister();

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/metaitems/component/pelmeni_uncooked"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/metaitems/component/pelmeni_uncooked_seasoned"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/metaitems/food/pelmeni"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/metaitems/food/pelmeni_seasoned"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/main/resources/assets/gregtechfoodoption/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -1093,3 +1093,12 @@ gregtechfoodoption.lacing.info.2=Lasts %s ticks
gregtechfoodoption.potion.cyanidepoisoning=Cyanide Poisoning
gregtechfoodoption.potion.antischizo=Schizophrenia Meds
eating.output.name=Eating Recipe

metaitem.component.pelmeni_uncooked.name=Uncooked Pelmeni
metaitem.component.pelmeni_uncooked_seasoned.name=Seasoned Uncooked Pelmeni
metaitem.food.pelmeni.name=Pelmeni
metaitem.food.pelmeni.tooltip=Better than PelmeniCraft
metaitem.food.pelmeni_seasoned.name=Seasoned Pelmeni
metaitem.food.pelmeni_seasoned.tooltip=With a side of Sour Cream
gregtech.material.gtfo_sour_cream=Sour Cream
gregtech.material.gtfo_lactic_acid_bacteria=Lactic Acid Bacteria

0 comments on commit 8629fd7

Please sign in to comment.