-
Notifications
You must be signed in to change notification settings - Fork 86
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
oxygen collector and bubble distrinutor
- Loading branch information
1 parent
7ce7259
commit a802871
Showing
11 changed files
with
27 additions
and
5 deletions.
There are no files selected for viewing
5 changes: 4 additions & 1 deletion
5
src/main/generated/assets/galacticraft/blockstates/oxygen_bubble_distributor.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,10 @@ | ||
| { | ||
| "variants": { | ||
| "": { | ||
| "active=false": { | ||
| "model": "galacticraft:machine/oxygen_bubble_distributor" | ||
| }, | ||
| "active=true": { | ||
| "model": "galacticraft:machine/oxygen_bubble_distributor_active" | ||
| } | ||
| } | ||
| } |
5 changes: 4 additions & 1 deletion
5
src/main/generated/assets/galacticraft/blockstates/oxygen_collector.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,10 @@ | ||
| { | ||
| "variants": { | ||
| "": { | ||
| "active=false": { | ||
| "model": "galacticraft:machine/oxygen_collector" | ||
| }, | ||
| "active=true": { | ||
| "model": "galacticraft:machine/oxygen_collector_active" | ||
| } | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/main/resources/assets/galacticraft/models/machine/oxygen_bubble_distributor_active.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 @@ | ||
| { | ||
| "machinelib:generate": "machinelib:single", | ||
| "sprites": { | ||
| "sprite": "galacticraft:block/oxygen_bubble_distributor_active" | ||
| } | ||
| } |
3 changes: 1 addition & 2 deletions
3
src/main/resources/assets/galacticraft/models/machine/oxygen_collector.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,6 @@ | ||
| { | ||
| "machinelib:generate": "machinelib:single", | ||
| "sprites": { | ||
| "sprite": "galacticraft:block/oxygen_collector", | ||
| "particle": "galacticraft:block/oxygen_collector" | ||
| "sprite": "galacticraft:block/oxygen_collector" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/main/resources/assets/galacticraft/models/machine/oxygen_collector_active.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 @@ | ||
| { | ||
| "machinelib:generate": "machinelib:single", | ||
| "sprites": { | ||
| "sprite": "galacticraft:block/oxygen_collector_active" | ||
| } | ||
| } |
Binary file modified
BIN
-162 Bytes
(64%)
...main/resources/assets/galacticraft/textures/block/oxygen_bubble_distributor.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
+438 Bytes
...sources/assets/galacticraft/textures/block/oxygen_bubble_distributor_active.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion
2
...extures/block/oxygen_collector.png.mcmeta → ...ygen_bubble_distributor_active.png.mcmeta
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,5 @@ | ||
| { | ||
| "animation": { | ||
| "frametime": 0.5 | ||
| "frametime": 1 | ||
| } | ||
| } |
Binary file modified
BIN
-566 Bytes
(35%)
src/main/resources/assets/galacticraft/textures/block/oxygen_collector.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
+456 Bytes
src/main/resources/assets/galacticraft/textures/block/oxygen_collector_active.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions
5
src/main/resources/assets/galacticraft/textures/block/oxygen_collector_active.png.mcmeta
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,5 @@ | ||
| { | ||
| "animation": { | ||
| "frametime": 1 | ||
| } | ||
| } |