Skip to content

Commit

Permalink
loaf completion
Browse files Browse the repository at this point in the history
  • Loading branch information
@khjxiaogu
khjxiaogu committed Sep 10, 2024
1 parent a8b1890 commit c106b37
Show file tree
Hide file tree
Showing 86 changed files with 511 additions and 46 deletions.
1 change: 1 addition & 0 deletions src/datagen/java/com/teammoeg/caupona/datagen/CPBlockTagGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ protected void addTags(Provider pProvider) {
}
tag(CPTags.Blocks.LOAF_HEATING_BLOCKS).add(rk(Blocks.FIRE)).add(rk(Blocks.CAMPFIRE)).add(rk(Blocks.LAVA)).add(rk(Blocks.LAVA_CAULDRON)).add(CPBlocks.FUMAROLE_VENT.getKey());
tag(CPTags.Blocks.LOAF_HEATING_IGNORE).addTags(BlockTags.ALL_SIGNS,BlockTags.ALL_HANGING_SIGNS,BlockTags.BANNERS,BlockTags.BUTTONS,BlockTags.FENCES,BlockTags.CROPS,CPTags.Blocks.PANS).add(CPBlocks.WOLF.getKey(),CPBlocks.LOAF.getKey(),CPBlocks.LOAF_DOUGH.getKey(),CPBlocks.PUMICE_BLOOM.getKey());
tag(BlockTags.CLIMBABLE).add(CPBlocks.LOAF_DOUGH.getKey()).add(CPBlocks.LOAF.getKey());
for (MaterialType tye : CPBlocks.all_materials) {
String str=tye.getName();
if(tye.isPillarMaterial())
Expand Down
6 changes: 3 additions & 3 deletions src/datagen/java/com/teammoeg/caupona/datagen/CPItemModelProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@ protected void registerModels() {

for (String s : CPItems.soups) {
simpleTexture(s, "soups/");
texture(s+"_loaf", "bread_bowls/"+s);

}
for(String s:CPItems.bread_bowls)
texture(s+"_loaf", "bread_bowls/"+s);
for (String s : CPItems.base_material)
texture(s);
for (FoodMaterialInfo s : CPItems.food_material)
texture(s.name);
simpleTexture("water", "soups/");
simpleTexture("milk", "soups/");
texture("water_loaf", "bread_bowls/water");
texture("milk_loaf", "bread_bowls/milk");
texture("loaf_bowl", "bread_bowl");
for (String s : CPItems.aspics)
simpleTexture(s, "aspics/");
Expand Down
8 changes: 7 additions & 1 deletion src/datagen/java/com/teammoeg/caupona/datagen/CPRecipeProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,14 @@ protected void buildRecipes(RecipeOutput outx) {
for (String s : CPFluids.getSoupfluids()) {
ResourceLocation fs = mrl(s);
out.accept(rl("bowl/" + s),new BowlContainingRecipe( item(fs), fluid(fs),BowlContainingRecipe.WOODEN_BOWL));
out.accept(rl("bowl/" + s),new BowlContainingRecipe( item(fs), fluid(fs),BowlContainingRecipe.BREAD_BOWL));

}
for (String s : CPItems.bread_bowls) {
ResourceLocation fs = mrl(s);
out.accept(rl("bowl/" + s+"_loaf"),new BowlContainingRecipe( item(fs), fluid(fs),BowlContainingRecipe.BREAD_BOWL));

}

// out.accept(dissolve(RankineItems.CORN_EAR.get()));
out.accept(rl("bowl_type/bowl"), new BowlTypeRecipe(BowlContainingRecipe.WOODEN_BOWL,Ingredient.of(Items.BOWL)));
out.accept(rl("bowl_type/loaf_bowl"), new BowlTypeRecipe(BowlContainingRecipe.WOODEN_BOWL,Ingredient.of(CPBlocks.LOAF_BOWL.get().asItem())));
Expand Down
6 changes: 6 additions & 0 deletions src/generated/resources/assets/caupona/models/item/bisque_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/bisque"
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/caupona/models/item/borscht_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/borscht"
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/caupona/models/item/egg_drop_soup_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/egg_drop_soup"
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/caupona/models/item/fish_soup_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/fish_soup"
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/caupona/models/item/goulash_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/goulash"
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/caupona/models/item/hodgepodge_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/hodgepodge"
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/caupona/models/item/loaf_bowl.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowl"
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/caupona/models/item/meat_soup_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/meat_soup"
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/caupona/models/item/mushroom_soup_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/mushroom_soup"
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/caupona/models/item/nettle_soup_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/nettle_soup"
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/caupona/models/item/poultry_soup_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/poultry_soup"
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/caupona/models/item/pumpkin_soup_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/pumpkin_soup"
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/caupona/models/item/seaweed_soup_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/seaweed_soup"
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/caupona/models/item/stock_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/stock"
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/caupona/models/item/stracciatella_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/stracciatella"
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/caupona/models/item/vegetable_soup_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "caupona:item/bread_bowls/vegetable_soup"
}
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/acquacotta.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:acquacotta"
},
"inType": "caupona:bowl",
"item": "caupona:acquacotta"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/bisque.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:bisque"
},
"inType": "caupona:bowl",
"item": "caupona:bisque"
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/caupona/recipe/bowl/bisque_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "caupona:bowl",
"fluid": {
"fluid": "caupona:bisque"
},
"inType": "caupona:loaf",
"item": "caupona:bisque"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/bone_gelatin.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:bone_gelatin"
},
"inType": "caupona:bowl",
"item": "caupona:bone_gelatin"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/borscht.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:borscht"
},
"inType": "caupona:bowl",
"item": "caupona:borscht"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/borscht_cream.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:borscht_cream"
},
"inType": "caupona:bowl",
"item": "caupona:borscht_cream"
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/caupona/recipe/bowl/borscht_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "caupona:bowl",
"fluid": {
"fluid": "caupona:borscht"
},
"inType": "caupona:loaf",
"item": "caupona:borscht"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/congee.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:congee"
},
"inType": "caupona:bowl",
"item": "caupona:congee"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/cream_of_meat_soup.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:cream_of_meat_soup"
},
"inType": "caupona:bowl",
"item": "caupona:cream_of_meat_soup"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/cream_of_mushroom_soup.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:cream_of_mushroom_soup"
},
"inType": "caupona:bowl",
"item": "caupona:cream_of_mushroom_soup"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/custard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:custard"
},
"inType": "caupona:bowl",
"item": "caupona:custard"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/dilute_soup.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:dilute_soup"
},
"inType": "caupona:bowl",
"item": "caupona:dilute_soup"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/egg_drop_soup.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:egg_drop_soup"
},
"inType": "caupona:bowl",
"item": "caupona:egg_drop_soup"
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/caupona/recipe/bowl/egg_drop_soup_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "caupona:bowl",
"fluid": {
"fluid": "caupona:egg_drop_soup"
},
"inType": "caupona:loaf",
"item": "caupona:egg_drop_soup"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/egg_tongsui.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:egg_tongsui"
},
"inType": "caupona:bowl",
"item": "caupona:egg_tongsui"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/fish_chowder.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:fish_chowder"
},
"inType": "caupona:bowl",
"item": "caupona:fish_chowder"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/fish_soup.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:fish_soup"
},
"inType": "caupona:bowl",
"item": "caupona:fish_soup"
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/caupona/recipe/bowl/fish_soup_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "caupona:bowl",
"fluid": {
"fluid": "caupona:fish_soup"
},
"inType": "caupona:loaf",
"item": "caupona:fish_soup"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/fricassee.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:fricassee"
},
"inType": "caupona:bowl",
"item": "caupona:fricassee"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/goji_tongsui.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:goji_tongsui"
},
"inType": "caupona:bowl",
"item": "caupona:goji_tongsui"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/goulash.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:goulash"
},
"inType": "caupona:bowl",
"item": "caupona:goulash"
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/caupona/recipe/bowl/goulash_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "caupona:bowl",
"fluid": {
"fluid": "caupona:goulash"
},
"inType": "caupona:loaf",
"item": "caupona:goulash"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/gruel.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:gruel"
},
"inType": "caupona:bowl",
"item": "caupona:gruel"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/hodgepodge.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:hodgepodge"
},
"inType": "caupona:bowl",
"item": "caupona:hodgepodge"
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/caupona/recipe/bowl/hodgepodge_loaf.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "caupona:bowl",
"fluid": {
"fluid": "caupona:hodgepodge"
},
"inType": "caupona:loaf",
"item": "caupona:hodgepodge"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/caupona/recipe/bowl/meat_soup.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"fluid": {
"fluid": "caupona:meat_soup"
},
"inType": "caupona:bowl",
"item": "caupona:meat_soup"
}
Loading

0 comments on commit c106b37

Please sign in to comment.