-
Notifications
You must be signed in to change notification settings - Fork 27
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
Showing
23 changed files
with
126 additions
and
13 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
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
3 changes: 2 additions & 1 deletion
3
src/generated/resources/.cache/2cdab8a05c139b60806a3879962e52a7f2933554
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
3 changes: 2 additions & 1 deletion
3
src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
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
4 changes: 2 additions & 2 deletions
4
src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
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,2 +1,2 @@ | ||
| // 1.20.1 2023-10-28T16:34:56.705504 Languages: en_us | ||
| 7adeccca0263b927e5c267ee276d9052ba5d3a1c assets/deeperdarker/lang/en_us.json | ||
| // 1.20.1 2023-10-29T13:48:21.814529 Languages: en_us | ||
| 8a1cda8296f91906dfd5279c8e3db2d37bbb929b assets/deeperdarker/lang/en_us.json |
16 changes: 16 additions & 0 deletions
16
src/generated/resources/assets/deeperdarker/blockstates/blooming_stem.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,16 @@ | ||
| { | ||
| "variants": { | ||
| "axis=x": { | ||
| "model": "deeperdarker:block/blooming_stem", | ||
| "x": 90, | ||
| "y": 90 | ||
| }, | ||
| "axis=y": { | ||
| "model": "deeperdarker:block/blooming_stem" | ||
| }, | ||
| "axis=z": { | ||
| "model": "deeperdarker:block/blooming_stem", | ||
| "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/deeperdarker/models/block/blooming_stem.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": "deeperdarker:block/stem", | ||
| "textures": { | ||
| "stem": "deeperdarker:block/blooming_stem" | ||
| } | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/deeperdarker/models/item/blooming_stem.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,3 @@ | ||
| { | ||
| "parent": "deeperdarker:block/blooming_stem" | ||
| } |
21 changes: 21 additions & 0 deletions
21
src/generated/resources/data/deeperdarker/loot_tables/blocks/blooming_stem.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": "deeperdarker:blooming_stem" | ||
| } | ||
| ], | ||
| "rolls": 1.0 | ||
| } | ||
| ], | ||
| "random_sequence": "deeperdarker:blocks/blooming_stem" | ||
| } |
3 changes: 2 additions & 1 deletion
3
src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.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": [ | ||
| "deeperdarker:echo_log" | ||
| "deeperdarker:echo_log", | ||
| "deeperdarker:blooming_stem" | ||
| ] | ||
| } |
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
3 changes: 2 additions & 1 deletion
3
src/generated/resources/data/minecraft/tags/items/logs_that_burn.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": [ | ||
| "deeperdarker:echo_log" | ||
| "deeperdarker:echo_log", | ||
| "deeperdarker:blooming_stem" | ||
| ] | ||
| } |
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
28 changes: 28 additions & 0 deletions
28
src/main/java/com/kyanite/deeperdarker/content/blocks/flammable/BloomingStemBlock.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,28 @@ | ||
| package com.kyanite.deeperdarker.content.blocks.flammable; | ||
|
|
||
| import net.minecraft.core.BlockPos; | ||
| import net.minecraft.world.level.BlockGetter; | ||
| import net.minecraft.world.level.block.Block; | ||
| import net.minecraft.world.level.block.state.BlockState; | ||
| import net.minecraft.world.phys.shapes.CollisionContext; | ||
| import net.minecraft.world.phys.shapes.VoxelShape; | ||
|
|
||
| @SuppressWarnings("deprecation, NullableProblems") | ||
| public class BloomingStemBlock extends RotatedFlammableBlock { | ||
| private static final VoxelShape Y_AXIS = Block.box(5, 0, 5, 11, 16, 11); | ||
| private static final VoxelShape X_AXIS = Block.box(0, 5, 5, 16, 11, 11); | ||
| private static final VoxelShape Z_AXIS = Block.box(5, 5, 0, 11, 11, 16); | ||
|
|
||
| public BloomingStemBlock(Properties pProperties, int flammability, int spread) { | ||
| super(pProperties, flammability, spread); | ||
| } | ||
|
|
||
| @Override | ||
| public VoxelShape getShape(BlockState pState, BlockGetter pLevel, BlockPos pPos, CollisionContext pContext) { | ||
| return switch (pState.getValue(AXIS)) { | ||
| default -> Y_AXIS; | ||
| case X -> X_AXIS; | ||
| case Z -> Z_AXIS; | ||
| }; | ||
| } | ||
| } |
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
20 changes: 20 additions & 0 deletions
20
src/main/resources/assets/deeperdarker/models/block/stem.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,20 @@ | ||
| { | ||
| "parent": "block/block", | ||
| "textures": { | ||
| "particle": "#stem" | ||
| }, | ||
| "elements": [ | ||
| { | ||
| "from": [5, 0, 5], | ||
| "to": [11, 16, 11], | ||
| "faces": { | ||
| "north": {"uv": [0, 0, 6, 16], "texture": "#stem"}, | ||
| "east": {"uv": [0, 0, 6, 16], "texture": "#stem"}, | ||
| "south": {"uv": [0, 0, 6, 16], "texture": "#stem"}, | ||
| "west": {"uv": [0, 0, 6, 16], "texture": "#stem"}, | ||
| "up": {"uv": [6, 0, 12, 6], "texture": "#stem"}, | ||
| "down": {"uv": [6, 6, 12, 12], "texture": "#stem"} | ||
| } | ||
| } | ||
| ] | ||
| } |
Binary file added
BIN
+453 Bytes
src/main/resources/assets/deeperdarker/textures/block/blooming_stem.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.