Skip to content

Commit

Permalink
* updated to the latest farmersdelight
Browse files Browse the repository at this point in the history 
* made deinks always eatable
  • Loading branch information
@sergeycherepanov
sergeycherepanov committed Feb 25, 2024
1 parent a981316 commit 9af1c23
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ org.gradle.jvmargs=-Xmx8G
org.gradle.daemon=false

# Mod Info
mod_version=1.3.0-1
mod_version=1.3.0-2
mc_version=1.18.2
forge_version=40.2.14

# Dependency Info
jei_version=9.7.0.209
farmersdelight_version=3739914
farmersdelight_version=4679315
crafttweaker_version=7.1.0.354
crafttweaker_annotations_version=1.0.0.354
42 changes: 21 additions & 21 deletions src/main/java/com/farmersrespite/core/utility/FRFoods.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,49 +9,49 @@

public class FRFoods {
public static final FoodProperties GREEN_TEA = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(MobEffects.DIG_SPEED, 1800, 0), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(MobEffects.DIG_SPEED, 1800, 0), 1.0F).build();
public static final FoodProperties YELLOW_TEA = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, 1800, 0), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, 1800, 0), 1.0F).build();
public static final FoodProperties BLACK_TEA = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(FREffects.CAFFEINATED.get(), 1800, 0), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(FREffects.CAFFEINATED.get(), 1800, 0), 1.0F).build();
public static final FoodProperties ROSE_HIP_TEA = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(MobEffects.REGENERATION, 200, 0), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(MobEffects.REGENERATION, 200, 0), 1.0F).build();
public static final FoodProperties DANDELION_TEA = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(ModEffects.COMFORT.get(), 1800, 0), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(ModEffects.COMFORT.get(), 1800, 0), 1.0F).build();
public static final FoodProperties PURULENT_TEA = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(MobEffects.WEAKNESS, 600, 0), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(MobEffects.WEAKNESS, 600, 0), 1.0F).build();
public static final FoodProperties COFFEE = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(FREffects.CAFFEINATED.get(), 6000, 1), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(FREffects.CAFFEINATED.get(), 6000, 1), 1.0F).build();

public static final FoodProperties LONG_GREEN_TEA = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(MobEffects.DIG_SPEED, 3600, 0), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(MobEffects.DIG_SPEED, 3600, 0), 1.0F).build();
public static final FoodProperties LONG_YELLOW_TEA = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, 3600, 0), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, 3600, 0), 1.0F).build();
public static final FoodProperties LONG_BLACK_TEA = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(FREffects.CAFFEINATED.get(), 3600, 0), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(FREffects.CAFFEINATED.get(), 3600, 0), 1.0F).build();
public static final FoodProperties LONG_ROSE_HIP_TEA = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(MobEffects.REGENERATION, 400, 0), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(MobEffects.REGENERATION, 400, 0), 1.0F).build();
public static final FoodProperties LONG_DANDELION_TEA = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(ModEffects.COMFORT.get(), 3600, 0), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(ModEffects.COMFORT.get(), 3600, 0), 1.0F).build();
public static final FoodProperties LONG_COFFEE = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(FREffects.CAFFEINATED.get(), 12000, 0), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(FREffects.CAFFEINATED.get(), 12000, 0), 1.0F).build();
public static final FoodProperties LONG_APPLE_CIDER = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(MobEffects.ABSORPTION, 1200, 0), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(MobEffects.ABSORPTION, 1200, 0), 1.0F).build();

public static final FoodProperties STRONG_GREEN_TEA = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(MobEffects.DIG_SPEED, 1200, 1), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(MobEffects.DIG_SPEED, 1200, 1), 1.0F).build();
public static final FoodProperties STRONG_YELLOW_TEA = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, 1200, 1), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, 1200, 1), 1.0F).build();
public static final FoodProperties STRONG_BLACK_TEA = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(FREffects.CAFFEINATED.get(), 1200, 1), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(FREffects.CAFFEINATED.get(), 1200, 1), 1.0F).build();
public static final FoodProperties STRONG_ROSE_HIP_TEA = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(MobEffects.REGENERATION, 100, 1), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(MobEffects.REGENERATION, 100, 1), 1.0F).build();
public static final FoodProperties STRONG_PURULENT_TEA = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(MobEffects.WEAKNESS, 300, 1), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(MobEffects.WEAKNESS, 300, 1), 1.0F).build();
public static final FoodProperties STRONG_COFFEE = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(FREffects.CAFFEINATED.get(), 3000, 2), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(FREffects.CAFFEINATED.get(), 3000, 2), 1.0F).build();
public static final FoodProperties STRONG_APPLE_CIDER = (new FoodProperties.Builder())
.effect(() -> new MobEffectInstance(MobEffects.ABSORPTION, 600, 1), 1.0F).build();
.alwaysEat().effect(() -> new MobEffectInstance(MobEffects.ABSORPTION, 600, 1), 1.0F).build();


public static final FoodProperties ROSE_HIP_PIE_SLICE = (new FoodProperties.Builder())
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/farmersrespite/data/builder/FRCookingPotRecipeBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public ResourceLocation getId() {

@Override
public RecipeSerializer<?> getType() {
return CookingPotRecipe.SERIALIZER;
return new CookingPotRecipe.Serializer();
}

@Nullable
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/farmersrespite/data/builder/FRCuttingBoardRecipeBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public ResourceLocation getId() {


public RecipeSerializer<?> getType() {
return CuttingBoardRecipe.SERIALIZER;
return new CuttingBoardRecipe.Serializer();
}


Expand Down

0 comments on commit 9af1c23

Please sign in to comment.