-
Notifications
You must be signed in to change notification settings - Fork 196
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
make "natural" decor blocks obtainable (#1187)
* remove accidental accesswidener file * fix the damn treated wood textures. again. also add the windmill blocks. * run data * fix ignores * fix ignores, recipe IDs * remove now unused void ore values in GTOreDefinition, make it use IntProviders for size to allow for min & max size. * add stone blobs * fix? wood recipes * cap Z size to make cylinder a ball * fix some lang & other issues with the new wood things, add biome modifier for stone blobs * run datagen * remove "smooth" block type as it's unused and useless and has the same texture as the normal block * add red granite & marble ores
- Loading branch information
Showing
119 changed files
with
1,110 additions
and
458 deletions.
There are no files selected for viewing
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/gtceu/blockstates/dark_concrete_windmill_a.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": "gtceu:block/dark_concrete_windmill_a" | ||
| } | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/gtceu/blockstates/dark_concrete_windmill_b.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": "gtceu:block/dark_concrete_windmill_b" | ||
| } | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/gtceu/blockstates/light_concrete_windmill_a.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": "gtceu:block/light_concrete_windmill_a" | ||
| } | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/gtceu/blockstates/light_concrete_windmill_b.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": "gtceu:block/light_concrete_windmill_b" | ||
| } | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/gtceu/blockstates/marble_windmill_a.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": "gtceu:block/marble_windmill_a" | ||
| } | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/gtceu/blockstates/marble_windmill_b.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": "gtceu:block/marble_windmill_b" | ||
| } | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/gtceu/blockstates/red_granite_windmill_a.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": "gtceu:block/red_granite_windmill_a" | ||
| } | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/gtceu/blockstates/red_granite_windmill_b.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": "gtceu:block/red_granite_windmill_b" | ||
| } | ||
| } | ||
| } |
65 changes: 63 additions & 2 deletions
65
src/generated/resources/assets/gtceu/blockstates/rubber_trapdoor.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,68 @@ | ||
| { | ||
| "variants": { | ||
| "": { | ||
| "model": "gtceu:block/rubber_trapdoor" | ||
| "facing=east,half=bottom,open=false": { | ||
| "model": "gtceu:block/rubber_trapdoor_bottom", | ||
| "y": 90 | ||
| }, | ||
| "facing=east,half=bottom,open=true": { | ||
| "model": "gtceu:block/rubber_trapdoor_open", | ||
| "y": 90 | ||
| }, | ||
| "facing=east,half=top,open=false": { | ||
| "model": "gtceu:block/rubber_trapdoor_top", | ||
| "y": 90 | ||
| }, | ||
| "facing=east,half=top,open=true": { | ||
| "model": "gtceu:block/rubber_trapdoor_open", | ||
| "x": 180, | ||
| "y": 270 | ||
| }, | ||
| "facing=north,half=bottom,open=false": { | ||
| "model": "gtceu:block/rubber_trapdoor_bottom" | ||
| }, | ||
| "facing=north,half=bottom,open=true": { | ||
| "model": "gtceu:block/rubber_trapdoor_open" | ||
| }, | ||
| "facing=north,half=top,open=false": { | ||
| "model": "gtceu:block/rubber_trapdoor_top" | ||
| }, | ||
| "facing=north,half=top,open=true": { | ||
| "model": "gtceu:block/rubber_trapdoor_open", | ||
| "x": 180, | ||
| "y": 180 | ||
| }, | ||
| "facing=south,half=bottom,open=false": { | ||
| "model": "gtceu:block/rubber_trapdoor_bottom", | ||
| "y": 180 | ||
| }, | ||
| "facing=south,half=bottom,open=true": { | ||
| "model": "gtceu:block/rubber_trapdoor_open", | ||
| "y": 180 | ||
| }, | ||
| "facing=south,half=top,open=false": { | ||
| "model": "gtceu:block/rubber_trapdoor_top", | ||
| "y": 180 | ||
| }, | ||
| "facing=south,half=top,open=true": { | ||
| "model": "gtceu:block/rubber_trapdoor_open", | ||
| "x": 180 | ||
| }, | ||
| "facing=west,half=bottom,open=false": { | ||
| "model": "gtceu:block/rubber_trapdoor_bottom", | ||
| "y": 270 | ||
| }, | ||
| "facing=west,half=bottom,open=true": { | ||
| "model": "gtceu:block/rubber_trapdoor_open", | ||
| "y": 270 | ||
| }, | ||
| "facing=west,half=top,open=false": { | ||
| "model": "gtceu:block/rubber_trapdoor_top", | ||
| "y": 270 | ||
| }, | ||
| "facing=west,half=top,open=true": { | ||
| "model": "gtceu:block/rubber_trapdoor_open", | ||
| "x": 180, | ||
| "y": 90 | ||
| } | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/generated/resources/assets/gtceu/blockstates/rubber_wall_sign.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,7 @@ | ||
| { | ||
| "variants": { | ||
| "": { | ||
| "model": "gtceu:block/rubber_wall_sign" | ||
| "model": "gtceu:block/rubber_sign" | ||
| } | ||
| } | ||
| } |
65 changes: 63 additions & 2 deletions
65
src/generated/resources/assets/gtceu/blockstates/treated_wood_trapdoor.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,68 @@ | ||
| { | ||
| "variants": { | ||
| "": { | ||
| "model": "gtceu:block/treated_wood_trapdoor" | ||
| "facing=east,half=bottom,open=false": { | ||
| "model": "gtceu:block/treated_wood_trapdoor_bottom", | ||
| "y": 90 | ||
| }, | ||
| "facing=east,half=bottom,open=true": { | ||
| "model": "gtceu:block/treated_wood_trapdoor_open", | ||
| "y": 90 | ||
| }, | ||
| "facing=east,half=top,open=false": { | ||
| "model": "gtceu:block/treated_wood_trapdoor_top", | ||
| "y": 90 | ||
| }, | ||
| "facing=east,half=top,open=true": { | ||
| "model": "gtceu:block/treated_wood_trapdoor_open", | ||
| "x": 180, | ||
| "y": 270 | ||
| }, | ||
| "facing=north,half=bottom,open=false": { | ||
| "model": "gtceu:block/treated_wood_trapdoor_bottom" | ||
| }, | ||
| "facing=north,half=bottom,open=true": { | ||
| "model": "gtceu:block/treated_wood_trapdoor_open" | ||
| }, | ||
| "facing=north,half=top,open=false": { | ||
| "model": "gtceu:block/treated_wood_trapdoor_top" | ||
| }, | ||
| "facing=north,half=top,open=true": { | ||
| "model": "gtceu:block/treated_wood_trapdoor_open", | ||
| "x": 180, | ||
| "y": 180 | ||
| }, | ||
| "facing=south,half=bottom,open=false": { | ||
| "model": "gtceu:block/treated_wood_trapdoor_bottom", | ||
| "y": 180 | ||
| }, | ||
| "facing=south,half=bottom,open=true": { | ||
| "model": "gtceu:block/treated_wood_trapdoor_open", | ||
| "y": 180 | ||
| }, | ||
| "facing=south,half=top,open=false": { | ||
| "model": "gtceu:block/treated_wood_trapdoor_top", | ||
| "y": 180 | ||
| }, | ||
| "facing=south,half=top,open=true": { | ||
| "model": "gtceu:block/treated_wood_trapdoor_open", | ||
| "x": 180 | ||
| }, | ||
| "facing=west,half=bottom,open=false": { | ||
| "model": "gtceu:block/treated_wood_trapdoor_bottom", | ||
| "y": 270 | ||
| }, | ||
| "facing=west,half=bottom,open=true": { | ||
| "model": "gtceu:block/treated_wood_trapdoor_open", | ||
| "y": 270 | ||
| }, | ||
| "facing=west,half=top,open=false": { | ||
| "model": "gtceu:block/treated_wood_trapdoor_top", | ||
| "y": 270 | ||
| }, | ||
| "facing=west,half=top,open=true": { | ||
| "model": "gtceu:block/treated_wood_trapdoor_open", | ||
| "x": 180, | ||
| "y": 90 | ||
| } | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
src/generated/resources/assets/gtceu/blockstates/treated_wood_wall_sign.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,7 @@ | ||
| { | ||
| "variants": { | ||
| "": { | ||
| "model": "gtceu:block/treated_wood_wall_sign" | ||
| "model": "gtceu:block/treated_wood_sign" | ||
| } | ||
| } | ||
| } |
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
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/gtceu/models/block/dark_concrete_windmill_a.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:block/cube_all", | ||
| "textures": { | ||
| "all": "gtceu:block/stones/dark_concrete/windmill_a" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/gtceu/models/block/dark_concrete_windmill_b.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:block/cube_all", | ||
| "textures": { | ||
| "all": "gtceu:block/stones/dark_concrete/windmill_b" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/gtceu/models/block/light_concrete_windmill_a.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:block/cube_all", | ||
| "textures": { | ||
| "all": "gtceu:block/stones/light_concrete/windmill_a" | ||
| } | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/assets/gtceu/models/block/light_concrete_windmill_b.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:block/cube_all", | ||
| "textures": { | ||
| "all": "gtceu:block/stones/light_concrete/windmill_b" | ||
| } | ||
| } |
Oops, something went wrong.