-
-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
bfd79db
commit ae4a7b1
Showing
46 changed files
with
524 additions
and
287 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
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/malum/models/item/ring_of_the_plentiful.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": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "malum:item/ring_of_the_plentiful" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/malum/models/item/stellar_mechanism.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": "minecraft:item/generated", | ||
| "textures": { | ||
| "layer0": "malum:item/stellar_mechanism" | ||
| } | ||
| } |
42 changes: 42 additions & 0 deletions
42
src/generated/resources/data/malum/recipes/spirit_infusion/belt_of_the_limitless.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,42 @@ | ||
| { | ||
| "type": "malum:spirit_infusion", | ||
| "extra_items": [ | ||
| { | ||
| "count": 1, | ||
| "item": "malum:fused_consciousness" | ||
| }, | ||
| { | ||
| "count": 16, | ||
| "item": "malum:void_salts" | ||
| }, | ||
| { | ||
| "count": 8, | ||
| "item": "malum:null_slate" | ||
| }, | ||
| { | ||
| "count": 4, | ||
| "item": "malum:mnemonic_fragment" | ||
| } | ||
| ], | ||
| "input": { | ||
| "count": 1, | ||
| "item": "malum:belt_of_the_magebane" | ||
| }, | ||
| "output": { | ||
| "item": "malum:belt_of_the_limitless" | ||
| }, | ||
| "spirits": [ | ||
| { | ||
| "type": "wicked", | ||
| "count": 32 | ||
| }, | ||
| { | ||
| "type": "arcane", | ||
| "count": 32 | ||
| }, | ||
| { | ||
| "type": "eldritch", | ||
| "count": 16 | ||
| } | ||
| ] | ||
| } |
38 changes: 38 additions & 0 deletions
38
src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_the_plentiful.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,38 @@ | ||
| { | ||
| "type": "malum:spirit_infusion", | ||
| "extra_items": [ | ||
| { | ||
| "count": 8, | ||
| "item": "malum:null_slate" | ||
| }, | ||
| { | ||
| "count": 8, | ||
| "item": "malum:mnemonic_fragment" | ||
| } | ||
| ], | ||
| "input": { | ||
| "count": 1, | ||
| "item": "malum:ring_of_esoteric_spoils" | ||
| }, | ||
| "output": { | ||
| "item": "malum:ring_of_the_plentiful" | ||
| }, | ||
| "spirits": [ | ||
| { | ||
| "type": "wicked", | ||
| "count": 32 | ||
| }, | ||
| { | ||
| "type": "arcane", | ||
| "count": 16 | ||
| }, | ||
| { | ||
| "type": "aqueous", | ||
| "count": 16 | ||
| }, | ||
| { | ||
| "type": "eldritch", | ||
| "count": 8 | ||
| } | ||
| ] | ||
| } |
38 changes: 38 additions & 0 deletions
38
src/generated/resources/data/malum/recipes/spirit_infusion/soul_stained_steel_staff.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,38 @@ | ||
| { | ||
| "type": "malum:spirit_infusion", | ||
| "extra_items": [ | ||
| { | ||
| "count": 8, | ||
| "item": "malum:mnemonic_fragment" | ||
| }, | ||
| { | ||
| "count": 4, | ||
| "item": "malum:soul_stained_steel_ingot" | ||
| } | ||
| ], | ||
| "input": { | ||
| "count": 2, | ||
| "item": "malum:soulwood_planks" | ||
| }, | ||
| "output": { | ||
| "item": "malum:soul_stained_steel_staff" | ||
| }, | ||
| "spirits": [ | ||
| { | ||
| "type": "wicked", | ||
| "count": 32 | ||
| }, | ||
| { | ||
| "type": "aerial", | ||
| "count": 16 | ||
| }, | ||
| { | ||
| "type": "aqueous", | ||
| "count": 16 | ||
| }, | ||
| { | ||
| "type": "eldritch", | ||
| "count": 8 | ||
| } | ||
| ] | ||
| } |
42 changes: 42 additions & 0 deletions
42
src/generated/resources/data/malum/recipes/spirit_infusion/staff_of_the_auric_flame.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,42 @@ | ||
| { | ||
| "type": "malum:spirit_infusion", | ||
| "extra_items": [ | ||
| { | ||
| "count": 1, | ||
| "item": "malum:fused_consciousness" | ||
| }, | ||
| { | ||
| "count": 8, | ||
| "item": "malum:auric_embers" | ||
| }, | ||
| { | ||
| "count": 8, | ||
| "item": "malum:void_salts" | ||
| } | ||
| ], | ||
| "input": { | ||
| "count": 1, | ||
| "item": "malum:soul_stained_steel_staff" | ||
| }, | ||
| "output": { | ||
| "item": "malum:staff_of_the_auric_flame" | ||
| }, | ||
| "spirits": [ | ||
| { | ||
| "type": "wicked", | ||
| "count": 32 | ||
| }, | ||
| { | ||
| "type": "arcane", | ||
| "count": 16 | ||
| }, | ||
| { | ||
| "type": "infernal", | ||
| "count": 16 | ||
| }, | ||
| { | ||
| "type": "eldritch", | ||
| "count": 16 | ||
| } | ||
| ] | ||
| } |
42 changes: 42 additions & 0 deletions
42
src/generated/resources/data/malum/recipes/spirit_infusion/stellar_mechanism.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,42 @@ | ||
| { | ||
| "type": "malum:spirit_infusion", | ||
| "extra_items": [ | ||
| { | ||
| "count": 1, | ||
| "item": "malum:fused_consciousness" | ||
| }, | ||
| { | ||
| "count": 2, | ||
| "item": "malum:null_slate" | ||
| } | ||
| ], | ||
| "input": { | ||
| "count": 4, | ||
| "item": "malum:alchemical_calx" | ||
| }, | ||
| "output": { | ||
| "item": "malum:stellar_mechanism" | ||
| }, | ||
| "spirits": [ | ||
| { | ||
| "type": "aerial", | ||
| "count": 4 | ||
| }, | ||
| { | ||
| "type": "aqueous", | ||
| "count": 4 | ||
| }, | ||
| { | ||
| "type": "earthen", | ||
| "count": 4 | ||
| }, | ||
| { | ||
| "type": "infernal", | ||
| "count": 4 | ||
| }, | ||
| { | ||
| "type": "eldritch", | ||
| "count": 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
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
29 changes: 29 additions & 0 deletions
29
...com/sammy/malum/common/block/curiosities/spirit_crucible/AugmentBlockEntityInventory.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,29 @@ | ||
| package com.sammy.malum.common.block.curiosities.spirit_crucible; | ||
|
|
||
| import com.sammy.malum.common.block.*; | ||
| import com.sammy.malum.common.item.augment.*; | ||
| import com.sammy.malum.common.item.augment.core.*; | ||
| import com.sammy.malum.registry.common.*; | ||
| import net.minecraft.sounds.*; | ||
| import net.minecraft.world.item.*; | ||
|
|
||
| import java.util.function.*; | ||
|
|
||
| public class AugmentBlockEntityInventory extends MalumBlockEntityInventory { | ||
| public AugmentBlockEntityInventory(int slotCount, int allowedItemSize) { | ||
| this(slotCount, allowedItemSize, t -> t.getItem() instanceof AbstractAugmentItem augmentItem && !(augmentItem instanceof CoreAugmentItem)); | ||
| } | ||
| public AugmentBlockEntityInventory(int slotCount, int allowedItemSize, Predicate<ItemStack> inputPredicate) { | ||
| super(slotCount, allowedItemSize, inputPredicate); | ||
| } | ||
|
|
||
| @Override | ||
| public SoundEvent getInsertSound(ItemStack stack) { | ||
| return SoundRegistry.APPLY_AUGMENT.get(); | ||
| } | ||
|
|
||
| @Override | ||
| public SoundEvent getExtractSound(ItemStack stack) { | ||
| return SoundRegistry.REMOVE_AUGMENT.get(); | ||
| } | ||
| } |
Oops, something went wrong.