-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
burn items to ashes + terracotta crushing adjustment
- Loading branch information
Showing
14 changed files
with
98 additions
and
17 deletions.
There are no files selected for viewing
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
20 changes: 20 additions & 0 deletions
20
src/main/java/net/cr24/primeval/mixin/item/ItemStackMixin.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,20 @@ | ||
package net.cr24.primeval.mixin.item; | ||
|
||
import net.cr24.primeval.item.PrimevalItemTags; | ||
import net.cr24.primeval.item.PrimevalItems; | ||
import net.minecraft.entity.ItemEntity; | ||
import net.minecraft.item.ItemStack; | ||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.injection.At; | ||
import org.spongepowered.asm.mixin.injection.Inject; | ||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
||
@Mixin(ItemStack.class) | ||
public class ItemStackMixin { | ||
|
||
@Inject(method = "onItemEntityDestroyed", at = @At(value = "HEAD")) | ||
public void onItemEntityDestroyed(ItemEntity entity, CallbackInfo info) { | ||
ItemStack stack = entity.getStack(); | ||
if (stack.isIn(PrimevalItemTags.BURNS_TO_ASH)) entity.dropStack(new ItemStack(PrimevalItems.ASHES, stack.getCount())); | ||
} | ||
} |
11 changes: 0 additions & 11 deletions
11
src/main/resources/data/primeval/recipes/ashes_campfire_stick.json
This file was deleted.
Oops, something went wrong.
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 |
---|---|---|
|
@@ -7,5 +7,5 @@ | |
"item": "primeval:crushed_terracotta", | ||
"count": 1 | ||
}, | ||
"wheelDamage":2 | ||
"wheelDamage":1 | ||
} |
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 |
---|---|---|
|
@@ -7,5 +7,5 @@ | |
"item": "primeval:crushed_terracotta", | ||
"count": 6 | ||
}, | ||
"wheelDamage":2 | ||
"wheelDamage": 5 | ||
} |
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 |
---|---|---|
|
@@ -7,5 +7,5 @@ | |
"item": "primeval:crushed_terracotta", | ||
"count": 5 | ||
}, | ||
"wheelDamage":2 | ||
"wheelDamage":4 | ||
} |
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
9 changes: 9 additions & 0 deletions
9
src/main/resources/data/primeval/tags/items/burns_to_ash.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,9 @@ | ||
{ | ||
"replace": false, | ||
"values": [ | ||
"#primeval:burnable_long", | ||
"#primeval:burnable_short", | ||
"primeval:wheat", | ||
"primeval:cabbage" | ||
] | ||
} |
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,13 @@ | ||
{ | ||
"replace": false, | ||
"values": [ | ||
"primeval:daub", | ||
"primeval:framed_daub", | ||
"primeval:framed_pillar_daub", | ||
"primeval:framed_cross_daub", | ||
"primeval:framed_inverted_cross_daub", | ||
"primeval:framed_x_daub", | ||
"primeval:framed_plus_daub", | ||
"primeval:framed_divided_daub" | ||
] | ||
} |
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,13 @@ | ||
{ | ||
"replace": false, | ||
"values": [ | ||
"primeval:oak_door", | ||
"primeval:oak_trapdoor", | ||
"primeval:birch_door", | ||
"primeval:birch_trapdoor", | ||
"primeval:spruce_door", | ||
"primeval:spruce_trapdoor", | ||
"primeval:wicker_door", | ||
"primeval:wicker_trapdoor" | ||
] | ||
} |
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,8 @@ | ||
{ | ||
"replace": false, | ||
"values": [ | ||
"primeval:oak_fence_gate", | ||
"primeval:birch_fence_gate", | ||
"primeval:spruce_fence_gate" | ||
] | ||
} |
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,11 @@ | ||
{ | ||
"replace": false, | ||
"values": [ | ||
"primeval:oak_fence", | ||
"primeval:oak_log_fence", | ||
"primeval:birch_fence", | ||
"primeval:birch_log_fence", | ||
"primeval:spruce_fence", | ||
"primeval:spruce_log_fence" | ||
] | ||
} |
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