-
-
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
33fba34
commit 7667bfa
Showing
24 changed files
with
176 additions
and
60 deletions.
There are no files selected for viewing
56 changes: 56 additions & 0 deletions
56
src/generated/resources/assets/malum/blockstates/blazing_quartz_cluster.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,56 @@ | ||
{ | ||
"variants": { | ||
"facing=down,waterlogged=false": { | ||
"model": "malum:block/blazing_quartz_cluster", | ||
"x": 180 | ||
}, | ||
"facing=down,waterlogged=true": { | ||
"model": "malum:block/blazing_quartz_cluster", | ||
"x": 180 | ||
}, | ||
"facing=east,waterlogged=false": { | ||
"model": "malum:block/blazing_quartz_cluster", | ||
"x": 90, | ||
"y": 90 | ||
}, | ||
"facing=east,waterlogged=true": { | ||
"model": "malum:block/blazing_quartz_cluster", | ||
"x": 90, | ||
"y": 90 | ||
}, | ||
"facing=north,waterlogged=false": { | ||
"model": "malum:block/blazing_quartz_cluster", | ||
"x": 90 | ||
}, | ||
"facing=north,waterlogged=true": { | ||
"model": "malum:block/blazing_quartz_cluster", | ||
"x": 90 | ||
}, | ||
"facing=south,waterlogged=false": { | ||
"model": "malum:block/blazing_quartz_cluster", | ||
"x": 90, | ||
"y": 180 | ||
}, | ||
"facing=south,waterlogged=true": { | ||
"model": "malum:block/blazing_quartz_cluster", | ||
"x": 90, | ||
"y": 180 | ||
}, | ||
"facing=up,waterlogged=false": { | ||
"model": "malum:block/blazing_quartz_cluster" | ||
}, | ||
"facing=up,waterlogged=true": { | ||
"model": "malum:block/blazing_quartz_cluster" | ||
}, | ||
"facing=west,waterlogged=false": { | ||
"model": "malum:block/blazing_quartz_cluster", | ||
"x": 90, | ||
"y": 270 | ||
}, | ||
"facing=west,waterlogged=true": { | ||
"model": "malum:block/blazing_quartz_cluster", | ||
"x": 90, | ||
"y": 270 | ||
} | ||
} | ||
} |
11 changes: 10 additions & 1 deletion
11
src/generated/resources/assets/malum/blockstates/block_of_grim_talc.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,7 +1,16 @@ | ||
{ | ||
"variants": { | ||
"": { | ||
"axis=x": { | ||
"model": "malum:block/block_of_grim_talc_horizontal", | ||
"x": 90, | ||
"y": 90 | ||
}, | ||
"axis=y": { | ||
"model": "malum:block/block_of_grim_talc" | ||
}, | ||
"axis=z": { | ||
"model": "malum:block/block_of_grim_talc_horizontal", | ||
"x": 90 | ||
} | ||
} | ||
} |
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/block/blazing_quartz_cluster.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:block/cross", | ||
"textures": { | ||
"cross": "malum:block/ores/blazing_quartz_cluster" | ||
} | ||
} |
5 changes: 3 additions & 2 deletions
5
src/generated/resources/assets/malum/models/block/block_of_grim_talc.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,7 @@ | ||
{ | ||
"parent": "minecraft:block/cube_all", | ||
"parent": "minecraft:block/cube_column", | ||
"textures": { | ||
"all": "malum:block/storage_blocks/block_of_grim_talc" | ||
"end": "malum:block/storage_blocks/block_of_grim_talc_top", | ||
"side": "malum:block/storage_blocks/block_of_grim_talc" | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/malum/models/block/block_of_grim_talc_horizontal.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,7 @@ | ||
{ | ||
"parent": "minecraft:block/cube_column_horizontal", | ||
"textures": { | ||
"end": "malum:block/storage_blocks/block_of_grim_talc_top", | ||
"side": "malum:block/storage_blocks/block_of_grim_talc" | ||
} | ||
} |
1 change: 1 addition & 0 deletions
1
src/generated/resources/data/farmersdelight/tags/blocks/heat_sources.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,5 +1,6 @@ | ||
{ | ||
"values": [ | ||
"malum:blazing_quartz_cluster", | ||
"malum:block_of_blazing_quartz" | ||
] | ||
} |
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
21 changes: 21 additions & 0 deletions
21
src/generated/resources/data/malum/loot_tables/blocks/blazing_quartz_cluster.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,21 @@ | ||
{ | ||
"type": "minecraft:block", | ||
"pools": [ | ||
{ | ||
"bonus_rolls": 0.0, | ||
"conditions": [ | ||
{ | ||
"condition": "minecraft:survives_explosion" | ||
} | ||
], | ||
"entries": [ | ||
{ | ||
"type": "minecraft:item", | ||
"name": "malum:blazing_quartz" | ||
} | ||
], | ||
"rolls": 1.0 | ||
} | ||
], | ||
"random_sequence": "malum:blocks/blazing_quartz_cluster" | ||
} |
2 changes: 1 addition & 1 deletion
2
src/generated/resources/data/malum/recipes/blazing_quartz_from_blasting.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
2 changes: 1 addition & 1 deletion
2
src/generated/resources/data/malum/recipes/blazing_quartz_from_smelting.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
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
19 changes: 19 additions & 0 deletions
19
src/main/java/com/sammy/malum/common/item/misc/BlazingQuartzItem.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,19 @@ | ||
package com.sammy.malum.common.item.misc; | ||
|
||
import net.minecraft.world.item.*; | ||
import net.minecraft.world.item.crafting.*; | ||
import net.minecraft.world.level.block.*; | ||
|
||
import javax.annotation.*; | ||
|
||
public class BlazingQuartzItem extends ItemNameBlockItem { | ||
public final int fuel; | ||
public BlazingQuartzItem(Block pBlock, int fuel, Properties pProperties) { | ||
super(pBlock, pProperties); | ||
this.fuel = fuel; | ||
} | ||
@Override | ||
public int getBurnTime(ItemStack itemStack, @Nullable RecipeType<?> recipeType) { | ||
return fuel; | ||
} | ||
} |
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
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
Binary file modified
BIN
-237 Bytes
(51%)
...ain/resources/assets/malum/textures/block/storage_blocks/block_of_grim_talc.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
+336 Bytes
...resources/assets/malum/textures/block/storage_blocks/block_of_grim_talc_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.