-
Notifications
You must be signed in to change notification settings - Fork 87
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix #438: add starter (LV) diesel generator
- Loading branch information
1 parent
bf174cf
commit 2b7075d
Showing
24 changed files
with
212 additions
and
9 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
7 changes: 7 additions & 0 deletions
7
...rated/resources/assets/modern_industrialization/blockstates/starter_diesel_generator.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 @@ | ||
| { | ||
| "variants": { | ||
| "": { | ||
| "model": "modern_industrialization:block/starter_diesel_generator" | ||
| } | ||
| } | ||
| } |
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
3 changes: 3 additions & 0 deletions
3
...rated/resources/assets/modern_industrialization/models/item/starter_diesel_generator.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": "modern_industrialization:block/starter_diesel_generator" | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/modern_industrialization/models/item/tin_gear.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": "modern_industrialization:item/tin_gear" | ||
| } | ||
| } |
13 changes: 13 additions & 0 deletions
13
...ed/resources/assets/modern_industrialization/models/machine/starter_diesel_generator.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,13 @@ | ||
| { | ||
| "default_overlays": { | ||
| "fluid_auto": "modern_industrialization:block/overlays/fluid_auto", | ||
| "front": "modern_industrialization:block/machines/diesel_generator/overlay_front", | ||
| "front_active": "modern_industrialization:block/machines/diesel_generator/overlay_front_active", | ||
| "item_auto": "modern_industrialization:block/overlays/item_auto", | ||
| "output": "modern_industrialization:block/overlays/output", | ||
| "side": "modern_industrialization:block/machines/diesel_generator/overlay_side", | ||
| "side_active": "modern_industrialization:block/machines/diesel_generator/overlay_side_active", | ||
| "top": "modern_industrialization:block/machines/diesel_generator/overlay_top", | ||
| "top_active": "modern_industrialization:block/machines/diesel_generator/overlay_top_active" | ||
| } | ||
| } |
Binary file added
BIN
+723 Bytes
src/generated/resources/assets/modern_industrialization/textures/item/tin_gear.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| "modern_industrialization:tin_gear" | ||
| ] | ||
| } |
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
.../resources/data/modern_industrialization/loot_tables/blocks/starter_diesel_generator.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 @@ | ||
| { | ||
| "type": "minecraft:block", | ||
| "pools": [ | ||
| { | ||
| "bonus_rolls": 0.0, | ||
| "conditions": [ | ||
| { | ||
| "condition": "minecraft:survives_explosion" | ||
| } | ||
| ], | ||
| "entries": [ | ||
| { | ||
| "type": "minecraft:item", | ||
| "name": "modern_industrialization:starter_diesel_generator" | ||
| } | ||
| ], | ||
| "rolls": 1.0 | ||
| } | ||
| ] | ||
| } |
33 changes: 33 additions & 0 deletions
33
...ialization/recipes/assembler_generated/electric_age/machine/starter_diesel_generator.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,33 @@ | ||
| { | ||
| "type": "modern_industrialization:assembler", | ||
| "duration": 200, | ||
| "eu": 8, | ||
| "item_inputs": [ | ||
| { | ||
| "amount": 1, | ||
| "item": "modern_industrialization:basic_machine_hull" | ||
| }, | ||
| { | ||
| "amount": 2, | ||
| "item": "modern_industrialization:pump" | ||
| }, | ||
| { | ||
| "amount": 2, | ||
| "tag": "c:tin_gears" | ||
| }, | ||
| { | ||
| "amount": 3, | ||
| "item": "modern_industrialization:tin_cable" | ||
| }, | ||
| { | ||
| "amount": 1, | ||
| "item": "modern_industrialization:analog_circuit" | ||
| } | ||
| ], | ||
| "item_outputs": [ | ||
| { | ||
| "amount": 1, | ||
| "item": "modern_industrialization:starter_diesel_generator" | ||
| } | ||
| ] | ||
| } |
27 changes: 27 additions & 0 deletions
27
...nerated/resources/data/modern_industrialization/recipes/materials/tin/assembler/gear.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,27 @@ | ||
| { | ||
| "type": "modern_industrialization:assembler", | ||
| "duration": 100, | ||
| "eu": 2, | ||
| "fluid_inputs": [ | ||
| { | ||
| "amount": 100, | ||
| "fluid": "modern_industrialization:soldering_alloy" | ||
| } | ||
| ], | ||
| "item_inputs": [ | ||
| { | ||
| "amount": 4, | ||
| "tag": "c:tin_plates" | ||
| }, | ||
| { | ||
| "amount": 1, | ||
| "item": "modern_industrialization:tin_ring" | ||
| } | ||
| ], | ||
| "item_outputs": [ | ||
| { | ||
| "amount": 2, | ||
| "item": "modern_industrialization:tin_gear" | ||
| } | ||
| ] | ||
| } |
23 changes: 23 additions & 0 deletions
23
src/generated/resources/data/modern_industrialization/recipes/materials/tin/craft/gear.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,23 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "key": { | ||
| "P": { | ||
| "tag": "c:tin_plates" | ||
| }, | ||
| "R": { | ||
| "item": "modern_industrialization:tin_ring" | ||
| }, | ||
| "b": { | ||
| "item": "modern_industrialization:tin_bolt" | ||
| } | ||
| }, | ||
| "pattern": [ | ||
| "PbP", | ||
| "bRb", | ||
| "PbP" | ||
| ], | ||
| "result": { | ||
| "count": 1, | ||
| "item": "modern_industrialization:tin_gear" | ||
| } | ||
| } |
17 changes: 17 additions & 0 deletions
17
...nerated/resources/data/modern_industrialization/recipes/materials/tin/macerator/gear.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,17 @@ | ||
| { | ||
| "type": "modern_industrialization:macerator", | ||
| "duration": 100, | ||
| "eu": 2, | ||
| "item_inputs": [ | ||
| { | ||
| "amount": 1, | ||
| "tag": "c:tin_gears" | ||
| } | ||
| ], | ||
| "item_outputs": [ | ||
| { | ||
| "amount": 2, | ||
| "item": "modern_industrialization:tin_dust" | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.