-
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #12 from German-Immersive-Railroading-Community/op…
…timize1.17 Optimize 1.17
- Loading branch information
Showing
12 changed files
with
8 additions
and
112 deletions.
There are no files selected for viewing
11 changes: 1 addition & 10 deletions
11
src/main/resources/assets/gircredstone/blockstates/acceptor.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,10 +1 @@ | ||
| { | ||
| "variants": { | ||
| "power=false": { | ||
| "model": "gircredstone:block/acceptor_off" | ||
| }, | ||
| "power=true": { | ||
| "model": "gircredstone:block/acceptor_on" | ||
| } | ||
| } | ||
| } | ||
| {"variants": {"power=false": {"model": "gircredstone:acceptor_off"}, "power=true": {"model": "gircredstone:acceptor_on"}}} |
8 changes: 1 addition & 7 deletions
8
src/main/resources/assets/gircredstone/blockstates/emitter.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 @@ | ||
| { | ||
| "variants": { | ||
| "": { | ||
| "model": "gircredstone:block/emitter" | ||
| } | ||
| } | ||
| } | ||
| {"variants": {"normal": {"model": "gircredstone:emitter"}}} |
7 changes: 1 addition & 6 deletions
7
src/main/resources/assets/gircredstone/models/block/acceptor_off.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 @@ | ||
| { | ||
| "parent": "block/cube_all", | ||
| "textures": { | ||
| "all": "gircredstone:blocks/acceptor_off" | ||
| } | ||
| } | ||
| {"parent": "block/cube_all", "textures": {"all": "gircredstone:blocks/acceptor_off"}} |
7 changes: 1 addition & 6 deletions
7
src/main/resources/assets/gircredstone/models/block/acceptor_on.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 @@ | ||
| { | ||
| "parent": "block/cube_all", | ||
| "textures": { | ||
| "all": "gircredstone:blocks/acceptor_on" | ||
| } | ||
| } | ||
| {"parent": "block/cube_all", "textures": {"all": "gircredstone:blocks/acceptor_on"}} |
7 changes: 1 addition & 6 deletions
7
src/main/resources/assets/gircredstone/models/block/emitter.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 @@ | ||
| { | ||
| "parent": "block/cube_all", | ||
| "textures": { | ||
| "all": "gircredstone:blocks/emitter" | ||
| } | ||
| } | ||
| {"parent": "block/cube_all", "textures": {"all": "gircredstone:blocks/emitter"}} |
30 changes: 1 addition & 29 deletions
30
src/main/resources/assets/gircredstone/recipes/acceptor.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,29 +1 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "pattern": [ | ||
| "IiI", | ||
| "XYX", | ||
| "IZI" | ||
| ], | ||
| "key": { | ||
| "I": { | ||
| "item": "minecraft:redstone_block" | ||
| }, | ||
| "i": { | ||
| "item": "minecraft:redstone_torch" | ||
| }, | ||
| "X": { | ||
| "item": "minecraft:concrete", | ||
| "data": 0 | ||
| }, | ||
| "Y": { | ||
| "item": "minecraft:obsidian" | ||
| }, | ||
| "Z": { | ||
| "item": "minecraft:diamond" | ||
| } | ||
| }, | ||
| "result": { | ||
| "item": "gircredstone:acceptor" | ||
| } | ||
| } | ||
| {"type": "minecraft:crafting_shaped", "pattern": ["IiI", "XYX", "IZI"], "key": {"I": {"item": "minecraft:redstone_block"}, "i": {"item": "minecraft:redstone_torch"}, "X": {"item": "minecraft:concrete", "data": 0}, "Y": {"item": "minecraft:obsidian"}, "Z": {"item": "minecraft:diamond"}}, "result": {"item": "gircredstone:acceptor"}} |
30 changes: 1 addition & 29 deletions
30
src/main/resources/assets/gircredstone/recipes/emitter.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,29 +1 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "pattern": [ | ||
| "IiI", | ||
| "XYX", | ||
| "IZI" | ||
| ], | ||
| "key": { | ||
| "I": { | ||
| "item": "minecraft:redstone_block" | ||
| }, | ||
| "i": { | ||
| "item": "minecraft:redstone" | ||
| }, | ||
| "X": { | ||
| "item": "minecraft:concrete", | ||
| "data": 0 | ||
| }, | ||
| "Y": { | ||
| "item": "minecraft:obsidian" | ||
| }, | ||
| "Z": { | ||
| "item": "minecraft:diamond" | ||
| } | ||
| }, | ||
| "result": { | ||
| "item": "gircredstone:emitter" | ||
| } | ||
| } | ||
| {"type": "minecraft:crafting_shaped", "pattern": ["IiI", "XYX", "IZI"], "key": {"I": {"item": "minecraft:redstone_block"}, "i": {"item": "minecraft:redstone"}, "X": {"item": "minecraft:concrete", "data": 0}, "Y": {"item": "minecraft:obsidian"}, "Z": {"item": "minecraft:diamond"}}, "result": {"item": "gircredstone:emitter"}} |
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,19 +1 @@ | ||
| { | ||
| "type": "minecraft:crafting_shaped", | ||
| "pattern": [ | ||
| " ", | ||
| " I ", | ||
| " i " | ||
| ], | ||
| "key": { | ||
| "I": { | ||
| "item": "minecraft:quartz" | ||
| }, | ||
| "i": { | ||
| "item": "minecraft:redstone_torch" | ||
| } | ||
| }, | ||
| "result": { | ||
| "item": "gircredstone:linker" | ||
| } | ||
| } | ||
| {"type": "minecraft:crafting_shaped", "pattern": [" ", " I ", " i "], "key": {"I": {"item": "minecraft:quartz"}, "i": {"item": "minecraft:redstone_torch"}}, "result": {"item": "gircredstone:linker"}} |
Binary file modified
BIN
-2.48 KB
(14%)
src/main/resources/assets/gircredstone/textures/blocks/acceptor_off.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 modified
BIN
-2.49 KB
(14%)
src/main/resources/assets/gircredstone/textures/blocks/acceptor_on.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 modified
BIN
-2.48 KB
(14%)
src/main/resources/assets/gircredstone/textures/blocks/emitter.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 modified
BIN
-2.47 KB
(17%)
src/main/resources/assets/gircredstone/textures/items/linker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.