Skip to content

Pull from upstream #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Pull from upstream #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e4199c7
A big giant commit. A bunch of page edits; added a slicing/replacing …
Deviouslrd Mar 25, 2021
45bbcb9
Update issue templates
Deviouslrd Mar 30, 2021
3831890
Main page upgrades, massive help page upgrades.Increased spacing in t…
Deviouslrd Mar 30, 2021
7d24419
Generator files folder reformat and proper template-ification; Added …
Deviouslrd Mar 31, 2021
b58537c
Merge branch 'main' of https://github.com/Deviouslrd/json-generator i…
Deviouslrd Mar 31, 2021
8a69a0e
Modified divspacing, background works, added some space between text …
Deviouslrd Apr 7, 2021
8423455
Don't question or ask this README.md update.
Deviouslrd May 25, 2021
a81adcf
Update README.md
Deviouslrd Jul 17, 2021
b71a005
Update README.md
Deviouslrd Aug 7, 2021
327edd3
Update README.md
Deviouslrd Aug 7, 2021
7c9de7d
Update README.md
Deviouslrd Sep 19, 2021
979d275
Update README.md
Fnige Aug 16, 2022
9b93369
Merge pull request #58 from FnigePython/main
Deviouslrd Aug 16, 2022
b90e044
Update README.md
Deviouslrd Nov 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions .github/ISSUE_TEMPLATE/feature_request.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@ assignees: ''

---

## **Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
## Description

## **Describe the solution you'd like**
A clear and concise description of what you want to happen.

## **Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

## **Additional context**
Add any other context or screenshots about the feature request here.
## Method of achieving this
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ node_modules
builds
Git Image.png
package.json
useful logs
useful logs
Loading Gif
out
13 changes: 3 additions & 10 deletions Generator files/advancement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,8 @@
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"consistency_plus:smooth_andesite_slab",
"consistency_plus:smooth_andesite_slab_furnace",
"consistency_plus:smooth_andesite_slab_stonecutter",
"consistency_plus:smooth_andesite_stairs",
"consistency_plus:smooth_andesite_stairs_furnace",
"consistency_plus:smooth_andesite_stairs_stonecutter",
"consistency_plus:smooth_andesite_wall",
"consistency_plus:smooth_andesite_wall_furnace",
"consistency_plus:smooth_andesite_wall_stonecutter"
"[example_namespace]:[block_name]",
"[example_namespace]:[block_name]"
]
},
"criteria": {
Expand All @@ -19,7 +12,7 @@
"conditions": {
"items": [
{
"item": "consistency_plus:smooth_andesite"
"item": "[example_namespace]:[block_name"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion Generator files/block_models/bmodel_block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "consistency_plus:block/smooth_andesite"
"all": "[example_namespace]:block/[block_name]"
}
}
14 changes: 7 additions & 7 deletions Generator files/block_models/bmodel_diff_textures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"parent": "minecraft:block/cube",
"textures": {
"particle": "minecraft:block/crafting_table_front",
"north": "minecraft:block/crafting_table_front",
"south": "minecraft:block/crafting_table_side",
"east": "minecraft:block/crafting_table_side",
"west": "minecraft:block/crafting_table_front",
"up": "minecraft:block/crafting_table_top",
"down": "minecraft:block/oak_planks"
"particle": "[example_namespace]:block/[block_name]",
"north": "[example_namespace]:block/[block_name]",
"south": "[example_namespace]:block/[block_name]",
"east": "[example_namespace]:block/[block_name]",
"west": "[example_namespace]:block/[block_name]",
"up": "[example_namespace]:block/[block_name]",
"down": "[example_namespace]:block/[block_name]"
}
}
8 changes: 4 additions & 4 deletions Generator files/block_models/bmodel_front_diff.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"parent": "minecraft:block/orientable",
"textures": {
"top": "minecraft:block/furnace_top",
"bottom": "minecraft:block/furnace_bottom",
"front": "minecraft:block/furnace_front",
"side": "minecraft:block/furnace_side"
"top": "[example_namespace]:block/[block_name]",
"bottom": "[example_namespace]:block/[block_name]",
"front": "[example_namespace]:block/[block_name]",
"side": "[example_namespace]:block/[block_name]"
}
}
4 changes: 2 additions & 2 deletions Generator files/block_models/bmodel_pillar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "minecraft:block/cube_column",
"textures": {
"end": "consistency_plus:block/blackstone_brick_pillar_top",
"side": "consistency_plus:block/blackstone_brick_pillar"
"end": "[example_namespace]:block/[block_name]_pillar_top",
"side": "[example_namespace]:block/[block_name]_pillar"
}
}
4 changes: 2 additions & 2 deletions Generator files/block_models/bmodel_pillar_horizontal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "minecraft:block/cube_column_horizontal",
"textures": {
"end": "consistency_plus:block/blackstone_brick_pillar_top",
"side": "consistency_plus:block/blackstone_brick_pillar"
"end": "[example_namespace]:block/[block_name]",
"side": "[example_namespace]:block/[block_name]"
}
}
6 changes: 3 additions & 3 deletions Generator files/block_models/bmodel_slab.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"parent": "minecraft:block/slab",
"textures": {
"bottom": "consistency_plus:block/andesite_bricks",
"top": "consistency_plus:block/devin_blockera",
"side": "consistency_plus:block/cut_quartz"
"bottom": "[example_namespace]:block/[block_name]",
"top": "[example_namespace]:block/[block_name]",
"side": "[example_namespace]:block/[block_name]"
}
}
6 changes: 3 additions & 3 deletions Generator files/block_models/bmodel_slab_top.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"parent": "minecraft:block/slab_top",
"textures": {
"bottom": "consistency_plus:block/cut_granite",
"top": "consistency_plus:block/jack_o_soul",
"side": "consistency_plus:block/polished_stone"
"bottom": "[example_namespace]:block/[block_name]",
"top": "[example_namespace]:block/[block_name]",
"side": "[example_namespace]:block/[block_name]"
}
}
6 changes: 3 additions & 3 deletions Generator files/block_models/bmodel_stairs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"parent": "minecraft:block/stairs",
"textures": {
"bottom": "consistency_plus:block/smooth_andesite",
"top": "consistency_plus:block/smooth_andesite",
"side": "consistency_plus:block/smooth_andesite"
"bottom": "[example_namespace]:block/[block_name]",
"top": "[example_namespace]:block/[block_name]",
"side": "[example_namespace]:block/[block_name]"
}
}
6 changes: 3 additions & 3 deletions Generator files/block_models/bmodel_stairs_inner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"parent": "minecraft:block/inner_stairs",
"textures": {
"bottom": "consistency_plus:block/smooth_andesite",
"top": "consistency_plus:block/smooth_andesite",
"side": "consistency_plus:block/smooth_andesite"
"bottom": "[example_namespace]:block/[block_name]",
"top": "[example_namespace]:block/[block_name]",
"side": "[example_namespace]:block/[block_name]"
}
}
6 changes: 3 additions & 3 deletions Generator files/block_models/bmodel_stairs_outer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"parent": "minecraft:block/outer_stairs",
"textures": {
"bottom": "consistency_plus:block/smooth_andesite",
"top": "consistency_plus:block/smooth_andesite",
"side": "consistency_plus:block/smooth_andesite"
"bottom": "[example_namespace]:block/[block_name]",
"top": "[example_namespace]:block/[block_name]",
"side": "[example_namespace]:block/[block_name]"
}
}
2 changes: 1 addition & 1 deletion Generator files/block_models/bmodel_wall_post.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/template_wall_post",
"textures": {
"wall": "consistency_plus:block/smooth_andesite"
"wall": "[example_namespace]:block/[block_name]"
}
}
2 changes: 1 addition & 1 deletion Generator files/block_models/bmodel_wall_side.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/template_wall_side",
"textures": {
"wall": "consistency_plus:block/smooth_andesite"
"wall": "[example_namespace]:block/[block_name]"
}
}
2 changes: 1 addition & 1 deletion Generator files/block_models/bmodel_wall_side_top.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parent": "minecraft:block/template_wall_side_tall",
"textures": {
"wall": "consistency_plus:block/smooth_andesite"
"wall": "[example_namespace]:block/[block_name]"
}
}
7 changes: 0 additions & 7 deletions Generator files/blockstate_block.json
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions Generator files/blockstate_pillar.json
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions Generator files/blockstate_slab.json
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions Generator files/blockstates/blockstate_block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "[example_namespace]:block/[block_name]"
}
}
}
16 changes: 16 additions & 0 deletions Generator files/blockstates/blockstate_pillar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "[example_namespace]:block/[block_name]_pillar_horizontal",
"x": 90,
"y": 90
},
"axis=y": {
"model": "[example_namespace]:block/[block_name]_pillar"
},
"axis=z": {
"model": "[example_namespace]:block/[block_name]_pillar_horizontal",
"x": 90
}
}
}
13 changes: 13 additions & 0 deletions Generator files/blockstates/blockstate_slab.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"variants": {
"type=bottom": {
"model": "[example_namespace]:block/[block_name]_slab"
},
"type=double": {
"model": "[example_namespace]:block/[block_name]"
},
"type=top": {
"model": "[example_namespace]:block/[block_name]_slab_top"
}
}
}
Loading