Skip to content

Commit 909894c

Browse files
dashuaibiadashuaibia
committed
nutrition data
1 parent dbd082b commit 909894c

File tree

197 files changed

+348
-325
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+348
-325
lines changed

‎src/datagen/java/com/teammoeg/frostedheart/data/FHRecipeProvider.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,12 @@
2020
package com.teammoeg.frostedheart.data;
2121

2222
import java.io.File;
23-
import java.io.FileNotFoundException;
2423
import java.io.IOException;
2524
import java.io.InputStream;
26-
import java.io.PrintStream;
2725
import java.util.HashMap;
2826
import java.util.Map;
2927
import java.util.Map.Entry;
3028
import java.util.Optional;
31-
import java.util.Scanner;
3229
import java.util.function.Consumer;
3330

3431
import javax.annotation.Nonnull;
@@ -55,12 +52,9 @@
5552
import net.minecraft.data.DataGenerator;
5653
import net.minecraft.data.recipes.FinishedRecipe;
5754
import net.minecraft.data.recipes.RecipeProvider;
58-
import net.minecraft.world.food.FoodProperties;
5955
import net.minecraft.world.item.Equipable;
60-
import net.minecraft.world.item.Item;
6156
import net.minecraft.world.item.Items;
6257
import net.minecraft.world.level.ItemLike;
63-
import net.minecraft.world.level.block.Blocks;
6458
import net.minecraft.tags.ItemTags;
6559
import net.minecraft.resources.ResourceLocation;
6660
import net.minecraftforge.fml.loading.FMLPaths;
@@ -77,7 +71,7 @@ public FHRecipeProvider(DataGenerator generatorIn) {
7771
@Override
7872
protected void buildRecipes(@Nonnull Consumer<FinishedRecipe> out) {
7973

80-
try (PrintStream ps=new PrintStream(openDebugFile("food_healing.csv"));
74+
/*try (PrintStream ps=new PrintStream(openDebugFile("food_healing.csv"));
8175
Scanner sc = new Scanner(openDatagenResource("/data/frostedheart/data/food_values.csv"), "UTF-8")) {
8276
if(sc.hasNextLine()) {
8377
sc.nextLine();
@@ -112,7 +106,7 @@ protected void buildRecipes(@Nonnull Consumer<FinishedRecipe> out) {
112106
}
113107
catch (FileNotFoundException e) {
114108
e.printStackTrace();
115-
}
109+
}*/
116110

117111
//biome
118112
ExcelHelper.forEachRowExcludingHeaders(openWorkBook("/data/frostedheart/data/biome_temperature.xlsx"), m->{
@@ -152,6 +146,15 @@ protected void buildRecipes(@Nonnull Consumer<FinishedRecipe> out) {
152146
(float)ExcelHelper.getCellValueAsNumber(m.get("heat"))
153147
).toFinished(FHMain.rl("drink_temperature/"+block.getPath())));
154148
});
149+
150+
ExcelHelper.forEachRowExcludingHeaders(openWorkBook("/data/frostedheart/data/nutrition.xlsx"), m->{
151+
ResourceLocation itemid = new ResourceLocation(ExcelHelper.getCellValueAsString(m.get("ID")));
152+
NutritionRecipeBuilder dvb =new NutritionRecipeBuilder().ItemID(itemid);
153+
dvb.nutrition((float)ExcelHelper.getCellValueAsNumber(m.get("Gr2")),(float)ExcelHelper.getCellValueAsNumber(m.get("Va2")),
154+
(float)ExcelHelper.getCellValueAsNumber(m.get("Oi2")),(float)ExcelHelper.getCellValueAsNumber(m.get("Pt2")));
155+
dvb.save(out,new ResourceLocation(FHMain.MODID,"diet_value/"+ itemid.getNamespace()+ "/"+ itemid.getPath()));
156+
157+
});
155158
// CPFluids.getAll().filter(o->!Arrays.stream(ovride).anyMatch(CRegistries.getRegistryName(o).getPath()::equals)).forEach(f-> {
156159
//
157160
// out.accept(new WaterLevelFluidRecipe(new ResourceLocation(FHMain.MODID,"water_level/"+ CRegistries.getRegistryName(f).getPath()+"_thermos"),Ingredient.of(ItemTags.create(new ResourceLocation(FHMain.MODID,"thermos"))),f,2,2));

‎src/datagen/java/com/teammoeg/frostedheart/data/NutritionRecipeBuilder.java‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,22 @@ public class NutritionRecipeBuilder implements RecipeBuilder {
4545
// Pt=蛋白
4646
private float fat,carbohydrate,protein,vegetable;
4747
protected Item item;
48+
protected ResourceLocation itemID;
4849
private final Advancement.Builder advancement = Advancement.Builder.recipeAdvancement();
4950

5051
public NutritionRecipeBuilder () {
5152
}
5253

53-
public NutritionRecipeBuilder item(Item item) {
54+
public NutritionRecipeBuilder item(Item item) {
5455
this.item = item;
5556
return this;
5657
}
5758

59+
public NutritionRecipeBuilder ItemID(ResourceLocation resourceLocation) {
60+
this.itemID = resourceLocation;
61+
return this;
62+
}
63+
5864
public NutritionRecipeBuilder nutrition(float carbohydrate, float vegetable, float fat, float protein) {
5965
this.fat = fat;
6066
this.carbohydrate = carbohydrate;
@@ -102,17 +108,18 @@ public Item getResult() {
102108
@Override
103109
public void save(Consumer<FinishedRecipe> pFinishedRecipeConsumer, ResourceLocation pRecipeId) {
104110
this.advancement.parent(ROOT_RECIPE_ADVANCEMENT).addCriterion("has_the_recipe", RecipeUnlockedTrigger.unlocked(pRecipeId)).rewards(net.minecraft.advancements.AdvancementRewards.Builder.recipe(pRecipeId)).requirements(RequirementsStrategy.OR);
105-
pFinishedRecipeConsumer.accept(new Result(pRecipeId,fat,carbohydrate,protein,vegetable,item, this.advancement, pRecipeId.withPrefix("recipes/diet_value/")));
111+
pFinishedRecipeConsumer.accept(new Result(pRecipeId,fat,carbohydrate,protein,vegetable,item,itemID, this.advancement, pRecipeId.withPrefix("recipes/diet_value/")));
106112
}
107113
public static class Result implements FinishedRecipe {
108114

109115
private final float fat,carbohydrate,protein,vegetable;
110116
protected Item item;
117+
protected ResourceLocation itemID;
111118
private final ResourceLocation id;
112119
private final Advancement.Builder advancement;
113120
private final ResourceLocation advancementId;
114121

115-
public Result(ResourceLocation id,float fat,float carbohydrate,float protein,float vegetable, Item item,Advancement.Builder advancement, ResourceLocation advancementId) {
122+
public Result(ResourceLocation id,float fat,float carbohydrate,float protein,float vegetable, Item item,ResourceLocation itemID,Advancement.Builder advancement, ResourceLocation advancementId) {
116123
this.id = id;
117124
this.advancement = advancement;
118125
this.advancementId = advancementId;
@@ -121,6 +128,7 @@ public Result(ResourceLocation id,float fat,float carbohydrate,float protein,flo
121128
this.protein = protein;
122129
this.vegetable = vegetable;
123130
this.item = item;
131+
this.itemID = itemID;
124132
}
125133

126134
@Override
@@ -131,7 +139,9 @@ public void serializeRecipeData(JsonObject json) {
131139
group.addProperty("protein", this.protein);
132140
group.addProperty("vegetable", this.vegetable);
133141
json.add("group", group);
134-
json.addProperty("item", ForgeRegistries.ITEMS.getKey(this.item).toString());
142+
if (this.item!=null)
143+
json.addProperty("item", ForgeRegistries.ITEMS.getKey(this.item).toString());
144+
else json.addProperty("item", this.itemID.toString());
135145
}
136146

137147
@Override

‎src/datagen/resources/data/frostedheart/data/nutrition.xlsx‎

30.6 KB
Binary file not shown.

‎src/generated/resources/data/frostedheart/recipes/diet_value/charcoal_pit/cheese.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"group": {
44
"carbohydrate": 0.0,
55
"fat": 0.0,
6-
"protein": 0.0296434,
6+
"protein": 0.741085,
77
"vegetable": 0.0
88
},
9-
"item": "minecraft:air"
9+
"item": "charcoal_pit:cheese"
1010
}

‎src/generated/resources/data/frostedheart/recipes/diet_value/create/bar_of_chocolate.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"type": "frostedheart:diet_override",
33
"group": {
44
"carbohydrate": 0.0,
5-
"fat": 0.047920167,
5+
"fat": 1.1980044,
66
"protein": 0.0,
77
"vegetable": 0.0
88
},

‎src/generated/resources/data/frostedheart/recipes/diet_value/create/chocolate_glazed_berries.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"type": "frostedheart:diet_override",
33
"group": {
44
"carbohydrate": 0.0,
5-
"fat": 0.027953431,
5+
"fat": 0.69883585,
66
"protein": 0.0,
7-
"vegetable": 0.027953431
7+
"vegetable": 0.69883585
88
},
99
"item": "create:chocolate_glazed_berries"
1010
}

‎src/generated/resources/data/frostedheart/recipes/diet_value/create/honeyed_apple.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"carbohydrate": 0.0,
55
"fat": 0.0,
66
"protein": 0.0,
7-
"vegetable": 0.06389357
7+
"vegetable": 1.5973392
88
},
99
"item": "create:honeyed_apple"
1010
}

‎src/generated/resources/data/frostedheart/recipes/diet_value/create/sweet_roll.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"type": "frostedheart:diet_override",
33
"group": {
4-
"carbohydrate": 0.01778604,
4+
"carbohydrate": 0.444651,
55
"fat": 0.0,
6-
"protein": 0.01778604,
6+
"protein": 0.444651,
77
"vegetable": 0.0
88
},
99
"item": "create:sweet_roll"

‎src/generated/resources/data/frostedheart/recipes/diet_value/crockpot/asparagus.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"carbohydrate": 0.0,
55
"fat": 0.0,
66
"protein": 0.0,
7-
"vegetable": 0.013202921
7+
"vegetable": 0.33007312
88
},
9-
"item": "minecraft:air"
9+
"item": "crockpot:asparagus"
1010
}

‎src/generated/resources/data/frostedheart/recipes/diet_value/crockpot/asparagus_soup.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"carbohydrate": 0.0,
55
"fat": 0.0,
66
"protein": 0.0,
7-
"vegetable": 0.02492219
7+
"vegetable": 0.62305474
88
},
9-
"item": "minecraft:air"
9+
"item": "crockpot:asparagus_soup"
1010
}

0 commit comments

Comments
 (0)