-
-
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
6effe6e
commit cfe166e
Showing
71 changed files
with
1,352 additions
and
226 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/malum/models/item/shielding_apparatus.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/shielding_apparatus" | ||
} | ||
} |
2 changes: 1 addition & 1 deletion
2
...sets/malum/models/item/wexing_engine.json → ...assets/malum/models/item/tuning_fork.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,6 +1,6 @@ | ||
{ | ||
"parent": "minecraft:item/generated", | ||
"textures": { | ||
"layer0": "malum:item/wexing_engine" | ||
"layer0": "malum:item/tuning_fork" | ||
} | ||
} |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/malum/models/item/warping_engine.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/warping_engine" | ||
} | ||
} |
34 changes: 34 additions & 0 deletions
34
src/generated/resources/data/malum/recipes/spirit_infusion/accelerating_inlay.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 @@ | ||
{ | ||
"type": "malum:spirit_infusion", | ||
"extra_items": [ | ||
{ | ||
"count": 4, | ||
"item": "malum:astral_weave" | ||
}, | ||
{ | ||
"count": 1, | ||
"tag": "forge:gems/diamond" | ||
}, | ||
{ | ||
"count": 2, | ||
"item": "malum:processed_soulstone" | ||
} | ||
], | ||
"input": { | ||
"count": 4, | ||
"item": "malum:alchemical_calx" | ||
}, | ||
"output": { | ||
"item": "malum:accelerating_inlay" | ||
}, | ||
"spirits": [ | ||
{ | ||
"type": "aerial", | ||
"count": 16 | ||
}, | ||
{ | ||
"type": "arcane", | ||
"count": 4 | ||
} | ||
] | ||
} |
34 changes: 34 additions & 0 deletions
34
src/generated/resources/data/malum/recipes/spirit_infusion/blazing_diode.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 @@ | ||
{ | ||
"type": "malum:spirit_infusion", | ||
"extra_items": [ | ||
{ | ||
"count": 4, | ||
"item": "malum:blazing_quartz" | ||
}, | ||
{ | ||
"count": 1, | ||
"item": "minecraft:blaze_powder" | ||
}, | ||
{ | ||
"count": 2, | ||
"item": "malum:processed_soulstone" | ||
} | ||
], | ||
"input": { | ||
"count": 4, | ||
"item": "malum:alchemical_calx" | ||
}, | ||
"output": { | ||
"item": "malum:blazing_diode" | ||
}, | ||
"spirits": [ | ||
{ | ||
"type": "infernal", | ||
"count": 16 | ||
}, | ||
{ | ||
"type": "arcane", | ||
"count": 4 | ||
} | ||
] | ||
} |
34 changes: 34 additions & 0 deletions
34
src/generated/resources/data/malum/recipes/spirit_infusion/intricate_assembly.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 @@ | ||
{ | ||
"type": "malum:spirit_infusion", | ||
"extra_items": [ | ||
{ | ||
"count": 4, | ||
"item": "malum:chunk_of_brilliance" | ||
}, | ||
{ | ||
"count": 1, | ||
"tag": "forge:gems/emerald" | ||
}, | ||
{ | ||
"count": 2, | ||
"item": "malum:processed_soulstone" | ||
} | ||
], | ||
"input": { | ||
"count": 4, | ||
"item": "malum:alchemical_calx" | ||
}, | ||
"output": { | ||
"item": "malum:intricate_assembly" | ||
}, | ||
"spirits": [ | ||
{ | ||
"type": "earthen", | ||
"count": 16 | ||
}, | ||
{ | ||
"type": "arcane", | ||
"count": 4 | ||
} | ||
] | ||
} |
30 changes: 30 additions & 0 deletions
30
src/generated/resources/data/malum/recipes/spirit_infusion/mending_diffuser.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,30 @@ | ||
{ | ||
"type": "malum:spirit_infusion", | ||
"extra_items": [ | ||
{ | ||
"count": 4, | ||
"item": "malum:living_flesh" | ||
}, | ||
{ | ||
"count": 2, | ||
"item": "malum:processed_soulstone" | ||
} | ||
], | ||
"input": { | ||
"count": 4, | ||
"item": "malum:alchemical_calx" | ||
}, | ||
"output": { | ||
"item": "malum:mending_diffuser" | ||
}, | ||
"spirits": [ | ||
{ | ||
"type": "sacred", | ||
"count": 16 | ||
}, | ||
{ | ||
"type": "arcane", | ||
"count": 4 | ||
} | ||
] | ||
} |
34 changes: 34 additions & 0 deletions
34
src/generated/resources/data/malum/recipes/spirit_infusion/prismatic_focus_lens.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 @@ | ||
{ | ||
"type": "malum:spirit_infusion", | ||
"extra_items": [ | ||
{ | ||
"count": 4, | ||
"tag": "forge:gems/prismarine" | ||
}, | ||
{ | ||
"count": 1, | ||
"item": "malum:spectral_lens" | ||
}, | ||
{ | ||
"count": 2, | ||
"item": "malum:processed_soulstone" | ||
} | ||
], | ||
"input": { | ||
"count": 4, | ||
"item": "malum:alchemical_calx" | ||
}, | ||
"output": { | ||
"item": "malum:prismatic_focus_lens" | ||
}, | ||
"spirits": [ | ||
{ | ||
"type": "aqueous", | ||
"count": 16 | ||
}, | ||
{ | ||
"type": "arcane", | ||
"count": 4 | ||
} | ||
] | ||
} |
26 changes: 26 additions & 0 deletions
26
src/generated/resources/data/malum/recipes/spirit_infusion/shielding_apparatus.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,26 @@ | ||
{ | ||
"type": "malum:spirit_infusion", | ||
"extra_items": [ | ||
{ | ||
"count": 4, | ||
"item": "malum:soul_stained_steel_plating" | ||
}, | ||
{ | ||
"count": 2, | ||
"item": "malum:processed_soulstone" | ||
} | ||
], | ||
"input": { | ||
"count": 4, | ||
"item": "malum:alchemical_calx" | ||
}, | ||
"output": { | ||
"item": "malum:shielding_apparatus" | ||
}, | ||
"spirits": [ | ||
{ | ||
"type": "arcane", | ||
"count": 16 | ||
} | ||
] | ||
} |
30 changes: 30 additions & 0 deletions
30
src/generated/resources/data/malum/recipes/spirit_infusion/tuning_fork.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,30 @@ | ||
{ | ||
"type": "malum:spirit_infusion", | ||
"extra_items": [ | ||
{ | ||
"count": 2, | ||
"item": "malum:runewood_planks" | ||
}, | ||
{ | ||
"count": 1, | ||
"item": "malum:processed_soulstone" | ||
} | ||
], | ||
"input": { | ||
"count": 2, | ||
"tag": "forge:ingots/iron" | ||
}, | ||
"output": { | ||
"item": "malum:tuning_fork" | ||
}, | ||
"spirits": [ | ||
{ | ||
"type": "arcane", | ||
"count": 8 | ||
}, | ||
{ | ||
"type": "aqueous", | ||
"count": 8 | ||
} | ||
] | ||
} |
30 changes: 30 additions & 0 deletions
30
src/generated/resources/data/malum/recipes/spirit_infusion/warping_engine.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,30 @@ | ||
{ | ||
"type": "malum:spirit_infusion", | ||
"extra_items": [ | ||
{ | ||
"count": 8, | ||
"item": "malum:hex_ash" | ||
}, | ||
{ | ||
"count": 2, | ||
"item": "malum:processed_soulstone" | ||
} | ||
], | ||
"input": { | ||
"count": 4, | ||
"item": "malum:alchemical_calx" | ||
}, | ||
"output": { | ||
"item": "malum:warping_engine" | ||
}, | ||
"spirits": [ | ||
{ | ||
"type": "eldritch", | ||
"count": 4 | ||
}, | ||
{ | ||
"type": "arcane", | ||
"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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
package com.sammy.malum.client; | ||
|
||
import com.mojang.blaze3d.vertex.*; | ||
import net.minecraft.client.renderer.*; | ||
import team.lodestar.lodestone.systems.rendering.rendeertype.*; | ||
|
||
import java.util.function.*; | ||
|
||
public class BufferWrapper implements MultiBufferSource { | ||
|
||
public final Function<RenderStateShard.EmptyTextureStateShard, RenderType> provider; | ||
public final MultiBufferSource buffer; | ||
|
||
public BufferWrapper(Function<RenderStateShard.EmptyTextureStateShard, RenderType> provider, MultiBufferSource buffer) { | ||
this.provider = provider; | ||
this.buffer = buffer; | ||
} | ||
|
||
@Override | ||
public VertexConsumer getBuffer(RenderType renderType) { | ||
if (renderType instanceof RenderType.CompositeRenderType composite) | ||
return buffer.getBuffer(provider.apply(composite.state.textureState)); | ||
return buffer.getBuffer(renderType); | ||
} | ||
} |
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
Oops, something went wrong.