Skip to content

Commit

Permalink
Beetroot gummy
Browse files Browse the repository at this point in the history
  • Loading branch information
@brnbrd
brnbrd committed Jun 18, 2024
1 parent 7a6cd88 commit 2ba8009
Show file tree
Hide file tree
Showing 16 changed files with 138 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/generated/resources/.cache/2e975a526352ade1ad4fb90b352cd5fb8d2e73d8
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// 1.20.1 2024-06-18T13:19:04.9513997 Tags for minecraft:item mod id collectorsreap
// 1.20.1 2024-06-18T13:29:29.218921 Tags for minecraft:item mod id collectorsreap
ae7e08f92dd075f34544c04d30c8a274b27bd792 data/atmospheric/tags/items/aloe_leaves.json
b1c02044b6eb4060b19a0ed4f40cbeaca19822c9 data/atmospheric/tags/items/passion_fruit.json
a740abeb613a7024a35910efe912a50a6ee62045 data/atmospheric/tags/items/yucca_fruit.json
2ce628f957306f810058f22bc2a9ab7e29296048 data/collectorsreap/tags/items/gummies.json
22441868a2c5fde8be95de5573f16aacdf8fecb2 data/collectorsreap/tags/items/gummies.json
88055c196d1b1d1dc8d81f028dba0bb58d473524 data/collectorsreap/tags/items/hot_nether_fruit.json
3aadbf88623a2fde7e33b2e4942a79d1e72c9cbf data/collectorsreap/tags/items/lime_or_slice.json
a8065ce90afaf0435704b6ddde9324fea9dd89e1 data/forge/tags/items/coffee_beans.json
Expand Down
4 changes: 3 additions & 1 deletion src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-06-18T13:19:04.9473958 Recipes
// 1.20.1 2024-06-18T13:29:29.2159182 Recipes
6bed5b7d715399840f10473875efca57540c42e3 data/collectorsreap/advancements/recipes/chiseled_urchin_test_bricks.json
ffff41205e9b83cc8ab9d38ce39c06fa7e8f6ae7 data/collectorsreap/advancements/recipes/cutting/chieftain_claw.json
51d613fd6d246740518e1ed57afea6e6deea518e data/collectorsreap/advancements/recipes/cutting/chieftain_crab.json
Expand Down Expand Up @@ -102,6 +102,7 @@ fdf8c58783a02bdf1ca88e7e4182c843e1f451be data/collectorsreap/advancements/recipe
2663ea104906f13881602b13e4ba7092098bd157 data/collectorsreap/advancements/recipes/gummy/adzuki.json
e470ab2d2e87ed0bc5c1c5363d50593f969715cd data/collectorsreap/advancements/recipes/gummy/apple.json
739f8b11a6fb2c487e04b316dee573da7f58468f data/collectorsreap/advancements/recipes/gummy/banana.json
67d5c0735f240b0da615c4b8bc00c12a3bf2c0f5 data/collectorsreap/advancements/recipes/gummy/beetroot.json
0108a259c0cbd905f0277973d992a2f06bb95a0a data/collectorsreap/advancements/recipes/gummy/black_tea.json
31050cca6c3ac3dd7b9fa96075b0c64bf2e9f059 data/collectorsreap/advancements/recipes/gummy/chocolate.json
ee4f61bf0047b68c3f96017e871627fee53b23fb data/collectorsreap/advancements/recipes/gummy/coffee.json
Expand Down Expand Up @@ -250,6 +251,7 @@ cac24001f72ec68a0d7f6c2769a73b1341100451 data/collectorsreap/recipes/food/stuffe
5418c8b45fe94ca81a89c41b00c410b5c67183ee data/collectorsreap/recipes/gummy/adzuki.json
5c68dcf977216f15659b75a81b08dd471f995dd4 data/collectorsreap/recipes/gummy/apple.json
4d6a170bbd22e316cbd9cd141e92b4ac6db4687b data/collectorsreap/recipes/gummy/banana.json
cae18ceb5d4020d854cd49b689c617d5a7f2ae8e data/collectorsreap/recipes/gummy/beetroot.json
6b203d3da60694c2b75d94d26ae28b50cffd288f data/collectorsreap/recipes/gummy/black_tea.json
5b4630e1468aab466317e34ae28fbdb4239d10c0 data/collectorsreap/recipes/gummy/chocolate.json
16313403906a36d85f223e1c4e44993ca612353a data/collectorsreap/recipes/gummy/coffee.json
Expand Down
4 changes: 2 additions & 2 deletions src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.1 2024-06-18T13:19:04.9513997 Languages: en_us
ea22cd6250829b21970ec3cfec70d49160031c7c assets/collectorsreap/lang/en_us.json
// 1.20.1 2024-06-18T13:29:29.218921 Languages: en_us
0760fa194c4b0a25cd1ef116eb5e3d074affdf3f assets/collectorsreap/lang/en_us.json
3 changes: 2 additions & 1 deletion src/generated/resources/.cache/fbd245114a09f38b156d9da7e5324fd159bd1a13
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
// 1.20.1 2024-06-18T13:19:04.9443934 Item Models: collectorsreap
// 1.20.1 2024-06-18T13:29:29.2129154 Item Models: collectorsreap
b183daae948efe76cbf209119af41701e5b72e95 assets/collectorsreap/models/item/adzuki_gummy.json
56db9a7317e6d5a63c63af71a4011b16c66c00e7 assets/collectorsreap/models/item/aloe_gummy.json
b27cb012c75da3137768f12a8074eab65874647a assets/collectorsreap/models/item/apple_gummy.json
5e9048f4721b73c750f56a005dda7ac5bf89e833 assets/collectorsreap/models/item/baked_portobello_cap.json
d21b85edd3ea1d80a88c37083c497e284699d2ec assets/collectorsreap/models/item/banana_gummy.json
8538c6c1f51f0d781ed9b820fc11fcf58fc66d4b assets/collectorsreap/models/item/beetroot_gummy.json
fc45d8ab3073b2ab60f474a8564d6daad48ce982 assets/collectorsreap/models/item/berry_limeade.json
d6a12c10796c966c37dab136a82c43c5cad439b1 assets/collectorsreap/models/item/big_rice_ball.json
1e35c6d50eec4fc0b02a7565b85accec5250d71a assets/collectorsreap/models/item/black_tea_gummy.json
Expand Down
1 change: 1 addition & 0 deletions src/generated/resources/assets/collectorsreap/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
"item.collectorsreap.apple_gummy": "Apple Gummy",
"item.collectorsreap.baked_portobello_cap": "Baked Portobello Cap",
"item.collectorsreap.banana_gummy": "Banana Gummy",
"item.collectorsreap.beetroot_gummy": "Beetroot Gummy",
"item.collectorsreap.berry_limeade": "Berry Limeade",
"item.collectorsreap.big_rice_ball": "Big Rice Ball",
"item.collectorsreap.black_tea_gummy": "Black Tea Gummy",
Expand Down
6 changes: 6 additions & 0 deletions src/generated/resources/assets/collectorsreap/models/item/beetroot_gummy.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "collectorsreap:item/beetroot_gummy"
}
}
56 changes: 56 additions & 0 deletions src/generated/resources/data/collectorsreap/advancements/recipes/gummy/beetroot.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"advancements": [
{
"advancement": {
"parent": "minecraft:recipes/root",
"criteria": {
"has_beetroot": {
"conditions": {
"items": [
{
"items": [
"minecraft:beetroot"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "collectorsreap:gummy/beetroot"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_beetroot",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"collectorsreap:gummy/beetroot"
]
},
"sends_telemetry_event": true
},
"conditions": [
{
"type": "forge:and",
"values": [
{
"type": "collectorsreap:enabled",
"value": "beetroot_gummy"
},
{
"type": "forge:mod_loaded",
"modid": "seasonals"
}
]
}
]
}
]
}
44 changes: 44 additions & 0 deletions src/generated/resources/data/collectorsreap/recipes/gummy/beetroot.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"type": "forge:conditional",
"recipes": [
{
"conditions": [
{
"type": "forge:and",
"values": [
{
"type": "collectorsreap:enabled",
"value": "beetroot_gummy"
},
{
"type": "forge:mod_loaded",
"modid": "seasonals"
}
]
}
],
"recipe": {
"type": "farmersdelight:cooking",
"cookingtime": 200,
"experience": 1.0,
"ingredients": [
{
"item": "minecraft:beetroot"
},
{
"item": "minecraft:sugar"
},
{
"item": "minecraft:honey_bottle"
},
{
"item": "minecraft:kelp"
}
],
"result": {
"item": "collectorsreap:beetroot_gummy"
}
}
}
]
}
1 change: 1 addition & 0 deletions src/generated/resources/data/collectorsreap/tags/items/gummies.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"collectorsreap:adzuki_gummy",
"collectorsreap:pumpkin_gummy",
"collectorsreap:sweet_berry_gummy",
"collectorsreap:beetroot_gummy",
"collectorsreap:aloe_gummy",
"collectorsreap:passion_fruit_gummy",
"collectorsreap:yucca_gummy"
Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/brdle/collectorsreap/common/item/CRItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ public class CRItems extends ModItems {
public static final RegistryObject<Item> ADZUKI_GUMMY = registerGummy("adzuki", Nutrition.ADZUKI_GUMMY, "neapolitan");
public static final RegistryObject<Item> PUMPKIN_GUMMY = registerGummy("pumpkin", Nutrition.PUMPKIN_GUMMY, "seasonals");
public static final RegistryObject<Item> SWEET_BERRY_GUMMY = registerGummy("sweet_berry", Nutrition.SWEET_BERRY_GUMMY, "seasonals");
public static final RegistryObject<Item> BEETROOT_GUMMY = registerGummy("beetroot", Nutrition.BEETROOT_GUMMY, "seasonals");
public static final RegistryObject<Item> ALOE_GUMMY = registerGummy("aloe", Nutrition.ALOE_GUMMY, "atmospheric");
public static final RegistryObject<Item> PASSION_FRUIT_GUMMY = registerGummy("passion_fruit", Nutrition.PASSION_FRUIT_GUMMY, "atmospheric");
public static final RegistryObject<Item> YUCCA_GUMMY = registerGummy("yucca", Nutrition.YUCCA_GUMMY, "atmospheric");
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/net/brdle/collectorsreap/common/item/food/Nutrition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,9 @@ public class Nutrition {
public static final FoodProperties SWEET_BERRY_GUMMY = (new FoodProperties.Builder())
.nutrition(2).saturationMod(0.0F).alwaysEat()
.effect(() -> new MobEffectInstance(ModCompat.getThornResistance().get(), 1200, 0), 1.0F).build();
public static final FoodProperties BEETROOT_GUMMY = (new FoodProperties.Builder())
.nutrition(2).saturationMod(0.0F).alwaysEat()
.effect(() -> new MobEffectInstance(ModCompat.getRooted().get(), 1200, 0), 1.0F).build();
public static final FoodProperties ALOE_GUMMY = (new FoodProperties.Builder())
.nutrition(2).saturationMod(0.0F).alwaysEat()
.effect(() -> new MobEffectInstance(ModCompat.getRelief().get(), 200, 3), 1.0F).build();
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/net/brdle/collectorsreap/compat/ModCompat.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ public static Supplier<MobEffect> getThornResistance() {
() -> MobEffects.FIRE_RESISTANCE;
}

public static Supplier<MobEffect> getRooted() {
return (ModList.get().isLoaded("seasonals")) ?
() -> ForgeRegistries.MOB_EFFECTS.getValue(Util.rl("seasonals", "rooted")) :
() -> MobEffects.DAMAGE_RESISTANCE;
}

public static Supplier<MobEffect> getVitality() {
return (ModList.get().isLoaded("respiteful")) ?
() -> ForgeRegistries.MOB_EFFECTS.getValue(Util.rl("respiteful", "vitality")) :
Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/brdle/collectorsreap/data/gen/CRItemTagProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public void addTags(HolderLookup.@NotNull Provider provider)
.add(CRItems.ADZUKI_GUMMY.get())
.add(CRItems.PUMPKIN_GUMMY.get())
.add(CRItems.SWEET_BERRY_GUMMY.get())
.add(CRItems.BEETROOT_GUMMY.get())
.add(CRItems.ALOE_GUMMY.get())
.add(CRItems.PASSION_FRUIT_GUMMY.get())
.add(CRItems.YUCCA_GUMMY.get());
Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/brdle/collectorsreap/data/gen/CRLanguageProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ private void addItems() {
addItem(CRItems.ADZUKI_GUMMY, "Adzuki Gummy");
addItem(CRItems.PUMPKIN_GUMMY, "Pumpkin Gummy");
addItem(CRItems.SWEET_BERRY_GUMMY, "Sweet Berry Gummy");
addItem(CRItems.BEETROOT_GUMMY, "Beetroot Gummy");
addItem(CRItems.ALOE_GUMMY, "Aloe Gummy");
addItem(CRItems.PASSION_FRUIT_GUMMY, "Passion Fruit Gummy");
addItem(CRItems.YUCCA_GUMMY, "Yucca Gummy");
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/net/brdle/collectorsreap/data/gen/CRRecipeProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,13 @@ protected void buildRecipes(@NotNull Consumer<FinishedRecipe> finished) {
.addIngredient(Items.KELP)
.unlockedBy("has_sweet_berries", has(Items.SWEET_BERRIES)),
"gummy/sweet_berries", finished, enabled(CRItems.SWEET_BERRY_GUMMY), modLoaded("seasonals"));
wrap(CookingPotRecipeBuilder.cookingPotRecipe(CRItems.BEETROOT_GUMMY.get(), 1, 200, 1.0F)
.addIngredient(Items.BEETROOT)
.addIngredient(Items.SUGAR)
.addIngredient(Items.HONEY_BOTTLE)
.addIngredient(Items.KELP)
.unlockedBy("has_beetroot", has(Items.BEETROOT)),
"gummy/beetroot", finished, enabled(CRItems.BEETROOT_GUMMY), modLoaded("seasonals"));
wrap(CookingPotRecipeBuilder.cookingPotRecipe(CRItems.BANANA_GUMMY.get(), 1, 200, 1.0F)
.addIngredient(CRItemTags.BANANA)
.addIngredient(Items.SUGAR)
Expand Down
3 changes: 2 additions & 1 deletion update.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"1.2.4": "Fixed crash with Seasonals."
},
"1.20.1": {
"1.3": "Added Chieftain Crab, Platinum Bass, Tide Clam, Tiger Prawn, Urchin and related foods. Added support for My Nether's Delight."
"1.3": "Added Chieftain Crab, Platinum Bass, Tide Clam, Tiger Prawn, Urchin and related foods. Added support for My Nether's Delight.",
"1.3.1": "Fix Lime, Pomegranate, and Portobello spawns. Added Gummies for Seasonals."
},
"promos": {
"1.19-latest": "1.2.4",
Expand Down

0 comments on commit 2ba8009

Please sign in to comment.