-
Notifications
You must be signed in to change notification settings - Fork 115
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added Ice Cream and Charc-O's, non-nutritional foods that provide tem…
…porary cooling/heating when consumed. Increased default length of Internal Warmth/Chill effect.
- Loading branch information
Showing
20 changed files
with
223 additions
and
24 deletions.
There are no files selected for viewing
6 changes: 3 additions & 3 deletions
6
common/src/generated/resources/.cache/9dc2e1bbb6dbc88d629e62ed955e4c156b6652a3
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
common/src/generated/resources/data/toughasnails/advancements/recipes/food/charc_os.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_charcoal": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "minecraft:charcoal" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "toughasnails:charc_os" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_the_recipe", | ||
| "has_charcoal" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "toughasnails:charc_os" | ||
| ] | ||
| } | ||
| } |
34 changes: 34 additions & 0 deletions
34
common/src/generated/resources/data/toughasnails/advancements/recipes/food/ice_cream.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_snowball": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "items": [ | ||
| "minecraft:snowball" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "toughasnails:ice_cream" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_the_recipe", | ||
| "has_snowball" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "toughasnails:ice_cream" | ||
| ] | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
common/src/generated/resources/data/toughasnails/recipes/charc_os.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "category": "misc", | ||
| "key": { | ||
| "#": { | ||
| "item": "minecraft:charcoal" | ||
| }, | ||
| "B": { | ||
| "item": "minecraft:bowl" | ||
| }, | ||
| "S": { | ||
| "item": "minecraft:sugar" | ||
| } | ||
| }, | ||
| "pattern": [ | ||
| " # ", | ||
| "#S#", | ||
| " B " | ||
| ], | ||
| "result": { | ||
| "item": "toughasnails:charc_os" | ||
| } | ||
| } |
23 changes: 23 additions & 0 deletions
23
common/src/generated/resources/data/toughasnails/recipes/ice_cream.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "category": "misc", | ||
| "key": { | ||
| "#": { | ||
| "item": "minecraft:snowball" | ||
| }, | ||
| "B": { | ||
| "item": "minecraft:bowl" | ||
| }, | ||
| "S": { | ||
| "item": "minecraft:sugar" | ||
| } | ||
| }, | ||
| "pattern": [ | ||
| " # ", | ||
| "#S#", | ||
| " B " | ||
| ], | ||
| "result": { | ||
| "item": "toughasnails:ice_cream" | ||
| } | ||
| } |
4 changes: 3 additions & 1 deletion
4
common/src/generated/resources/data/toughasnails/tags/items/cooling_consumed_items.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| { | ||
| "values": [] | ||
| "values": [ | ||
| "toughasnails:ice_cream" | ||
| ] | ||
| } |
4 changes: 3 additions & 1 deletion
4
common/src/generated/resources/data/toughasnails/tags/items/heating_consumed_items.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| { | ||
| "values": [] | ||
| "values": [ | ||
| "toughasnails:charc_os" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
common/src/main/java/toughasnails/item/StackableBowlFoodItem.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /******************************************************************************* | ||
| * Copyright 2021, the Glitchfiend Team. | ||
| * All rights reserved. | ||
| ******************************************************************************/ | ||
| package toughasnails.item; | ||
|
|
||
| import net.minecraft.advancements.CriteriaTriggers; | ||
| import net.minecraft.server.level.ServerPlayer; | ||
| import net.minecraft.stats.Stats; | ||
| import net.minecraft.world.entity.LivingEntity; | ||
| import net.minecraft.world.entity.player.Player; | ||
| import net.minecraft.world.item.Item; | ||
| import net.minecraft.world.item.ItemStack; | ||
| import net.minecraft.world.item.Items; | ||
| import net.minecraft.world.level.Level; | ||
|
|
||
| public class StackableBowlFoodItem extends Item | ||
| { | ||
| public StackableBowlFoodItem(Properties properties) | ||
| { | ||
| super(properties); | ||
| } | ||
|
|
||
| @Override | ||
| public ItemStack finishUsingItem(ItemStack stack, Level worldIn, LivingEntity entityLiving) | ||
| { | ||
| Player player = entityLiving instanceof Player ? (Player)entityLiving : null; | ||
|
|
||
| // Do nothing if this isn't a player | ||
| if (player == null) | ||
| return stack; | ||
|
|
||
| if (player instanceof ServerPlayer) | ||
| { | ||
| CriteriaTriggers.CONSUME_ITEM.trigger((ServerPlayer)player, stack); | ||
| } | ||
|
|
||
| player.awardStat(Stats.ITEM_USED.get(this)); | ||
|
|
||
| if (!player.getAbilities().instabuild) | ||
| { | ||
| stack.shrink(1); | ||
|
|
||
| if (stack.isEmpty()) | ||
| { | ||
| return new ItemStack(Items.BOWL); | ||
| } | ||
|
|
||
| player.getInventory().add(new ItemStack(Items.BOWL)); | ||
| } | ||
|
|
||
| return stack; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
common/src/main/resources/assets/toughasnails/models/item/charc_os.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "item/generated", | ||
| "textures": { | ||
| "layer0": "toughasnails:item/charc_os" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
common/src/main/resources/assets/toughasnails/models/item/ice_cream.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "parent": "item/generated", | ||
| "textures": { | ||
| "layer0": "toughasnails:item/ice_cream" | ||
| } | ||
| } |
Binary file added
BIN
+265 Bytes
common/src/main/resources/assets/toughasnails/textures/item/charc_os.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+306 Bytes
common/src/main/resources/assets/toughasnails/textures/item/ice_cream.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters