Skip to content

Commit

Permalink
Tacos, Meals, and Bug Fixes
Browse files Browse the repository at this point in the history 
Tacos, Meals, and Bug Fixes
  • Loading branch information
@Nyancatpig
Nyancatpig committed Aug 22, 2022
1 parent fcc8fc8 commit a8480ef
Show file tree
Hide file tree
Showing 90 changed files with 296 additions and 174 deletions.
8 changes: 4 additions & 4 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ apply plugin: 'eclipse'
apply plugin: 'maven-publish'
apply plugin: "org.spongepowered.mixin"

version = '1.18.2-0.12'
version = '1.18.2-0.13'
group = 'com.ncpbails.culturaldelights' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'culturaldelights'

Expand Down Expand Up @@ -210,7 +210,7 @@ jar {
attributes([
"Specification-Title" : "culturaldelights",
"Specification-Vendor" : "ncpbails",
"Specification-Version" : "0.12", // We are version 1 of ourselves
"Specification-Version" : "0.13", // We are version 1 of ourselves
"Implementation-Title" : project.name,
"Implementation-Version" : project.jar.archiveVersion,
"Implementation-Vendor" : "ncpbails",
Expand All @@ -219,8 +219,8 @@ jar {
}
}

// Example configuration to allow publishing using the maven-publish plugin
// This is the preferred method to reobfuscate your jar file
// Example configuration to allow publishing using themaven-publish plugin
// This is the preferred method to reobfuscate your jar f ile
jar.finalizedBy('reobfJar')
// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
// publish.dependsOn('reobfJar')
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/ncpbails/culturaldelights/block/ModBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class ModBlocks {
@Override public int getFlammability(BlockState state, BlockGetter world, BlockPos pos, Direction face) { return 60; }
@Override public int getFireSpreadSpeed(BlockState state, BlockGetter world, BlockPos pos, Direction face) { return 30; }
@Nullable @Override public BlockState getToolModifiedState(BlockState state, Level world, BlockPos pos, Player player, ItemStack stack, ToolAction toolAction){
if(stack.getItem() instanceof AxeItem) { return Blocks.JUNGLE_LOG.defaultBlockState().setValue(AXIS, state.getValue(AXIS)); }
if(stack.getItem() instanceof AxeItem) { return Blocks.STRIPPED_JUNGLE_LOG.defaultBlockState().setValue(AXIS, state.getValue(AXIS)); }
return super.getToolModifiedState(state, world, pos, player, stack, toolAction); }
}, FarmersDelight.CREATIVE_TAB, true, 300);

Expand All @@ -63,7 +63,7 @@ public class ModBlocks {
@Override public int getFlammability(BlockState state, BlockGetter world, BlockPos pos, Direction face) { return 60; }
@Override public int getFireSpreadSpeed(BlockState state, BlockGetter world, BlockPos pos, Direction face) { return 30; }
@Nullable @Override public BlockState getToolModifiedState(BlockState state, Level world, BlockPos pos, Player player, ItemStack stack, ToolAction toolAction){
if(stack.getItem() instanceof AxeItem) { return Blocks.JUNGLE_WOOD.defaultBlockState().setValue(AXIS, state.getValue(AXIS)); }
if(stack.getItem() instanceof AxeItem) { return Blocks.STRIPPED_JUNGLE_WOOD.defaultBlockState().setValue(AXIS, state.getValue(AXIS)); }
return super.getToolModifiedState(state, world, pos, player, stack, toolAction); }
}, FarmersDelight.CREATIVE_TAB, true, 300);

Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/ncpbails/culturaldelights/block/custom/EggplantsBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import net.minecraft.world.level.ItemLike;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.CropBlock;
import net.minecraft.world.level.block.WitherRoseBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.block.state.properties.IntegerProperty;
Expand Down
53 changes: 25 additions & 28 deletions src/main/java/com/ncpbails/culturaldelights/item/ModFoods.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

public class ModFoods {

//FOODS
//INGREDIENTS
public static final FoodProperties AVOCADO = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.6F).build();
public static final FoodProperties CUCUMBER = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.5F).build();
public static final FoodProperties PICKLE = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.7F).build();
Expand All @@ -19,54 +19,51 @@ public class ModFoods {
public static final FoodProperties SMOKED_WHITE_EGGPLANT = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.5F).build();
public static final FoodProperties WHITE_EGGPLANT = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.1F).build();
public static final FoodProperties CORN_COB = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.4F).build();
public static final FoodProperties CORN_DOUGH = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.1F).build();
public static final FoodProperties TORTILLA = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.6F).build();
public static final FoodProperties SQUID = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.2F).build();
public static final FoodProperties COOKED_SQUID = (new FoodProperties.Builder()).nutrition(6).saturationMod(0.8F).build();
public static final FoodProperties GLOW_SQUID = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.2F)
.effect(() -> new MobEffectInstance(MobEffects.GLOWING, 40, 1), 1.0F).fast().build();
public static final FoodProperties RAW_CALAMARI = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.2F).build();
public static final FoodProperties COOKED_CALAMARI = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.5F).build();



public static final FoodProperties ELOTE = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.8F).build();
public static final FoodProperties BEEF_BURRITO = (new FoodProperties.Builder()).nutrition(14).saturationMod(0.7F).build();
public static final FoodProperties MUTTON_SANDWICH = (new FoodProperties.Builder()).nutrition(10).saturationMod(0.8F).build();
public static final FoodProperties AVOCADO_TOAST = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.5F).build();
public static final FoodProperties CREAMED_CORN = (new FoodProperties.Builder()).nutrition(6).saturationMod(0.8F).build();

//FAST TO EAT
public static final FoodProperties CUT_AVOCADO = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.3F).fast().build();
public static final FoodProperties CUT_CUCUMBER = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.3F).fast().build();
public static final FoodProperties CUT_PICKLE = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.5F).fast().build();
public static final FoodProperties CUT_EGGPLANT = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.1F).fast().build();
public static final FoodProperties SMOKED_CUT_EGGPLANT = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.4F).fast().build();
public static final FoodProperties POPCORN = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.2F).fast().build();
public static final FoodProperties TORTILLA_CHIPS = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.3F).fast().build();

public static final FoodProperties VEGETABLE_MAKI = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.4F).fast().build();
public static final FoodProperties TAMAGO = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.5F).fast().build();
public static final FoodProperties CHICKEN_MAKI = (new FoodProperties.Builder()).nutrition(10).saturationMod(1F).fast().build();
public static final FoodProperties COD_MAKI = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.5F).fast().build();
public static final FoodProperties PUFFERFISH_NIGIRI = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.5F)
//SUSHI
public static final FoodProperties VEGETABLE_ROLL = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.4F).fast().build();
public static final FoodProperties EGG_ROLL = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.5F).fast().build();
public static final FoodProperties CHICKEN_ROLL = (new FoodProperties.Builder()).nutrition(10).saturationMod(1F).fast().build();
public static final FoodProperties COD_ROLL = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.5F).fast().build();
public static final FoodProperties PUFFERFISH_ROLL = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.5F)
.effect(() -> new MobEffectInstance(MobEffects.CONFUSION, 200, 0), 1.0F)
.effect(() -> new MobEffectInstance(MobEffects.HUNGER, 200, 1), 1.0F).fast().build();
public static final FoodProperties SALMON_NIGIRI = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.6F).fast().build();
public static final FoodProperties TROPICAL_NIGIRI = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.15F).fast().build();
public static final FoodProperties ONIGIRI = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.5F).fast().build();
public static final FoodProperties CALAMARI_MAKI = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.5F).fast().build();


public static final FoodProperties SALMON_ROLL = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.6F).fast().build();
public static final FoodProperties TROPICAL_ROLL = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.15F).fast().build();
public static final FoodProperties RICE_BALL = (new FoodProperties.Builder()).nutrition(3).saturationMod(0.5F).fast().build();
public static final FoodProperties CALAMARI_ROLL = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.5F).fast().build();

//MEALS
public static final FoodProperties CORN_DOUGH = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.1F).build();
public static final FoodProperties TORTILLA = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.6F).build();
public static final FoodProperties POPCORN = (new FoodProperties.Builder()).nutrition(1).saturationMod(0.2F).fast().build();
public static final FoodProperties TORTILLA_CHIPS = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.3F).fast().build();
public static final FoodProperties ELOTE = (new FoodProperties.Builder()).nutrition(6).saturationMod(0.8F).build();
public static final FoodProperties BEEF_BURRITO = (new FoodProperties.Builder()).nutrition(14).saturationMod(0.7F).build();
public static final FoodProperties MUTTON_SANDWICH = (new FoodProperties.Builder()).nutrition(10).saturationMod(0.8F).build();
public static final FoodProperties AVOCADO_TOAST = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.5F).build();
public static final FoodProperties CREAMED_CORN = (new FoodProperties.Builder()).nutrition(6).saturationMod(0.8F).build();
public static final FoodProperties CHICKEN_TACO = (new FoodProperties.Builder()).nutrition(10).saturationMod(0.8F).build();
public static final FoodProperties PORK_WRAP = (new FoodProperties.Builder()).nutrition(10).saturationMod(0.8F).build();
public static final FoodProperties FISH_TACO = (new FoodProperties.Builder()).nutrition(10).saturationMod(0.8F).build();
public static final FoodProperties HEARTY_SALAD = (new FoodProperties.Builder()).nutrition(7).saturationMod(0.7F)
.effect(() -> new MobEffectInstance(ModEffects.NOURISHMENT.get(), FoodValues.LONG_DURATION, 0), 1.0F).build();
public static final FoodProperties FRIED_EGGPLANT_PASTA = (new FoodProperties.Builder()).nutrition(12).saturationMod(0.9F)
.effect(() -> new MobEffectInstance(ModEffects.NOURISHMENT.get(), FoodValues.LONG_DURATION, 0), 1.0F).build();
public static final FoodProperties EGGPLANT_BURGER = (new FoodProperties.Builder()).nutrition(12).saturationMod(0.7F).build();



public static final FoodProperties SPICY_CURRY = (new FoodProperties.Builder()).nutrition(12).saturationMod(1.3F)
.effect(() -> new MobEffectInstance(ModEffects.NOURISHMENT.get(), FoodValues.LONG_DURATION, 0), 1.0F).build();

}
73 changes: 42 additions & 31 deletions src/main/java/com/ncpbails/culturaldelights/item/ModItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class ModItems {
new Item.Properties().tab(FarmersDelight.CREATIVE_TAB)));


//Foods
//Ingredients
public static final RegistryObject<Item> AVOCADO = ITEMS.register("avocado",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.AVOCADO)));

Expand Down Expand Up @@ -74,18 +74,6 @@ public class ModItems {
public static final RegistryObject<Item> CORN_COB = ITEMS.register("corn_cob",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.CORN_COB)));

public static final RegistryObject<Item> POPCORN = ITEMS.register("popcorn",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.POPCORN)));

public static final RegistryObject<Item> CORN_DOUGH = ITEMS.register("corn_dough",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.CORN_DOUGH)));

public static final RegistryObject<Item> TORTILLA = ITEMS.register("tortilla",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.TORTILLA)));

public static final RegistryObject<Item> TORTILLA_CHIPS = ITEMS.register("tortilla_chips",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.TORTILLA_CHIPS)));

public static final RegistryObject<Item> SQUID = ITEMS.register("squid",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.SQUID)));

Expand All @@ -102,6 +90,19 @@ public class ModItems {
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.COOKED_CALAMARI)));


//Meals
public static final RegistryObject<Item> POPCORN = ITEMS.register("popcorn",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.POPCORN)));

public static final RegistryObject<Item> CORN_DOUGH = ITEMS.register("corn_dough",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.CORN_DOUGH)));

public static final RegistryObject<Item> TORTILLA = ITEMS.register("tortilla",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.TORTILLA)));

public static final RegistryObject<Item> TORTILLA_CHIPS = ITEMS.register("tortilla_chips",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.TORTILLA_CHIPS)));

public static final RegistryObject<Item> ELOTE = ITEMS.register("elote",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.ELOTE)));

Expand All @@ -126,34 +127,44 @@ public class ModItems {
public static final RegistryObject<Item> CREAMED_CORN = ITEMS.register("creamed_corn",
() -> new BowlFoodItem(new Item.Properties().stacksTo(16).tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.CREAMED_CORN)));

public static final RegistryObject<Item> CHICKEN_TACO = ITEMS.register("chicken_taco",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.CHICKEN_TACO)));

public static final RegistryObject<Item> SPICY_CURRY = ITEMS.register("spicy_curry",
() -> new BowlFoodItem(new Item.Properties().stacksTo(16).tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.SPICY_CURRY)));

public static final RegistryObject<Item> PORK_WRAP = ITEMS.register("pork_wrap",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.PORK_WRAP)));

public static final RegistryObject<Item> FISH_TACO = ITEMS.register("fish_taco",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.FISH_TACO)));

public static final RegistryObject<Item> VEGETABLE_MAKI = ITEMS.register("vegetable_maki",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.VEGETABLE_MAKI)));
public static final RegistryObject<Item> VEGETABLE_ROLL = ITEMS.register("vegetable_roll",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.VEGETABLE_ROLL)));

public static final RegistryObject<Item> TAMAGO = ITEMS.register("tamago",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.TAMAGO)));
public static final RegistryObject<Item> EGG_ROLL = ITEMS.register("egg_roll",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.EGG_ROLL)));

public static final RegistryObject<Item> CHICKEN_MAKI = ITEMS.register("chicken_maki",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.CHICKEN_MAKI)));
public static final RegistryObject<Item> CHICKEN_ROLL = ITEMS.register("chicken_roll",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.CHICKEN_ROLL)));

public static final RegistryObject<Item> COD_MAKI = ITEMS.register("cod_maki",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.COD_MAKI)));
public static final RegistryObject<Item> COD_ROLL = ITEMS.register("cod_roll",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.COD_ROLL)));

public static final RegistryObject<Item> PUFFERFISH_NIGIRI = ITEMS.register("pufferfish_nigiri",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.PUFFERFISH_NIGIRI)));
public static final RegistryObject<Item> PUFFERFISH_ROLL = ITEMS.register("pufferfish_roll",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.PUFFERFISH_ROLL)));

public static final RegistryObject<Item> SALMON_NIGIRI = ITEMS.register("salmon_nigiri",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.SALMON_NIGIRI)));
public static final RegistryObject<Item> SALMON_ROLL = ITEMS.register("salmon_roll",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.SALMON_ROLL)));

public static final RegistryObject<Item> TROPICAL_NIGIRI = ITEMS.register("tropical_nigiri",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.TROPICAL_NIGIRI)));
public static final RegistryObject<Item> TROPICAL_ROLL = ITEMS.register("tropical_roll",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.TROPICAL_ROLL)));

public static final RegistryObject<Item> ONIGIRI = ITEMS.register("onigiri",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.ONIGIRI)));
public static final RegistryObject<Item> RICE_BALL = ITEMS.register("rice_ball",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.RICE_BALL)));

public static final RegistryObject<Item> CALAMARI_MAKI = ITEMS.register("calamari_maki",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.CALAMARI_MAKI)));
public static final RegistryObject<Item> CALAMARI_ROLL = ITEMS.register("calamari_roll",
() -> new Item(new Item.Properties().tab(FarmersDelight.CREATIVE_TAB).food(ModFoods.CALAMARI_ROLL)));


public static void register(IEventBus eventBus) {
Expand Down
Loading

0 comments on commit a8480ef

Please sign in to comment.