Skip to content

Commit

Permalink
add grass, blackstone, clay, iron_ore, magma, polished_blackstone_bri…
Browse files Browse the repository at this point in the history 
…cks, prismarine, sponge, stone_bricks; replace netherrack, cobblestone, sandstone
  • Loading branch information
@null511
null511 committed Dec 24, 2020
1 parent 61d632f commit 5c5d151
Show file tree
Hide file tree
Showing 150 changed files with 890 additions and 58 deletions.
12 changes: 12 additions & 0 deletions src/assets/minecraft/blockstates/grass.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"variants": {
"": [
{
"model": "block/grass1"
},
{
"model": "block/grass2"
}
]
}
}
55 changes: 55 additions & 0 deletions src/assets/minecraft/models/block/grass1.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"ambientocclusion": false,
"textures": {
"cross": "block/grass",
"particle": "block/grass"
},
"elements": [
{
"from": [ 0.8, 0, 8 ],
"to": [ 15.2, 16, 8 ],
"rotation": {
"origin": [ 8, 8, 8 ],
"axis": "y",
"angle": 45,
"rescale": true
},
"shade": false,
"faces": {
"north": {
"uv": [ 0, 0, 16, 16 ],
"texture": "#cross",
"tintindex": 0
},
"south": {
"uv": [ 0, 0, 16, 16 ],
"texture": "#cross",
"tintindex": 0
}
}
},
{
"from": [ 8, 0, 0.8 ],
"to": [ 8, 16, 15.2 ],
"rotation": {
"origin": [ 8, 8, 8 ],
"axis": "y",
"angle": 45,
"rescale": true
},
"shade": false,
"faces": {
"west": {
"uv": [ 0, 0, 16, 16 ],
"texture": "#cross",
"tintindex": 0
},
"east": {
"uv": [ 0, 0, 16, 16 ],
"texture": "#cross",
"tintindex": 0
}
}
}
]
}
55 changes: 55 additions & 0 deletions src/assets/minecraft/models/block/grass2.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"ambientocclusion": false,
"textures": {
"cross": "block/grass",
"particle": "block/grass"
},
"elements": [
{
"from": [ 0.8, 0, 8 ],
"to": [ 15.2, 16, 8 ],
"rotation": {
"origin": [ 8, 8, 8 ],
"axis": "y",
"angle": 22.5,
"rescale": true
},
"shade": false,
"faces": {
"north": {
"uv": [ 0, 0, 16, 16 ],
"texture": "#cross",
"tintindex": 0
},
"south": {
"uv": [ 0, 0, 16, 16 ],
"texture": "#cross",
"tintindex": 0
}
}
},
{
"from": [ 8, 0, 0.8 ],
"to": [ 8, 16, 15.2 ],
"rotation": {
"origin": [ 8, 8, 8 ],
"axis": "y",
"angle": 22.5,
"rescale": true
},
"shade": false,
"faces": {
"west": {
"uv": [ 0, 0, 16, 16 ],
"texture": "#cross",
"tintindex": 0
},
"east": {
"uv": [ 0, 0, 16, 16 ],
"texture": "#cross",
"tintindex": 0
}
}
}
]
}
2 changes: 2 additions & 0 deletions src/assets/minecraft/optifine/ctm/andesite/andesite.pbr.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ height:
scale: 0.25
edge-fade-size-x: 1000
edge-fade-size-y: 1000
smooth:
scale: 0.2
porosity:
value: 40
parts:
Expand Down
Binary file removed src/assets/minecraft/optifine/ctm/andesite/andesite_rough.png
View file
Binary file not shown.
Binary file added src/assets/minecraft/optifine/ctm/andesite/andesite_smooth.png
View file
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 src/assets/minecraft/optifine/ctm/blackstone/blackstone - Copy.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 55 additions & 0 deletions src/assets/minecraft/optifine/ctm/blackstone/blackstone.pbr.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
height:
shift: -40
scale: 0.2
edge-fade-size-x: 600
edge-fade-size-y: 600
smooth:
scale: 0.36
porosity:
value: 60
parts:
- name: 1
left: 0
top: 0
width: 512
height: 512
- name: 2
left: 512
top: 0
width: 512
height: 512
- name: 3
left: 1024
top: 0
width: 512
height: 512
- name: 4
left: 0
top: 512
width: 512
height: 512
- name: 5
left: 512
top: 512
width: 512
height: 512
- name: 6
left: 1024
top: 512
width: 512
height: 512
- name: 7
left: 0
top: 1024
width: 512
height: 512
- name: 8
left: 512
top: 1024
width: 512
height: 512
- name: 9
left: 1024
top: 1024
width: 512
height: 512
Binary file added src/assets/minecraft/optifine/ctm/blackstone/blackstone.png
View file
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 src/assets/minecraft/optifine/ctm/blackstone/blackstone.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
matchTiles=blackstone blackstone_top
method=repeat
width=3
height=3
tiles=1 2 3 4 5 6 7 8 9
Binary file added src/assets/minecraft/optifine/ctm/blackstone/blackstone_ao.png
View file
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 src/assets/minecraft/optifine/ctm/blackstone/blackstone_h.png
View file
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 src/assets/minecraft/optifine/ctm/blackstone/blackstone_n.png
View file
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 src/assets/minecraft/optifine/ctm/blackstone/blackstone_smooth.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
93 changes: 93 additions & 0 deletions src/assets/minecraft/optifine/ctm/clay/clay.pbr.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
height:
shift: -80
scale: 0.17
edge-fade-size-x: 1000
edge-fade-size-y: 1000
occlusion:
scale: 0.4
smooth:
scale: 1.5
porosity: {}
sss:
value: 30
parts:
- name: 1
left: 0
top: 0
width: 512
height: 512
- name: 2
left: 512
top: 0
width: 512
height: 512
- name: 3
left: 1024
top: 0
width: 512
height: 512
- name: 4
left: 1536
top: 0
width: 512
height: 512
- name: 5
left: 0
top: 512
width: 512
height: 512
- name: 6
left: 512
top: 512
width: 512
height: 512
- name: 7
left: 1024
top: 512
width: 512
height: 512
- name: 8
left: 1536
top: 512
width: 512
height: 512
- name: 9
left: 0
top: 1024
width: 512
height: 512
- name: 10
left: 512
top: 1024
width: 512
height: 512
- name: 11
left: 1024
top: 1024
width: 512
height: 512
- name: 12
left: 1536
top: 1024
width: 512
height: 512
- name: 13
left: 0
top: 1536
width: 512
height: 512
- name: 14
left: 512
top: 1536
width: 512
height: 512
- name: 15
left: 1024
top: 1536
width: 512
height: 512
- name: 16
left: 1536
top: 1536
width: 512
height: 512
Binary file added src/assets/minecraft/optifine/ctm/clay/clay.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/assets/minecraft/optifine/ctm/clay/clay.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
matchTiles=clay
method=repeat
width=4
height=4
tiles=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
symmetry=opposite
Binary file added src/assets/minecraft/optifine/ctm/clay/clay_ao.png
View file
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 src/assets/minecraft/optifine/ctm/clay/clay_h.png
View file
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 src/assets/minecraft/optifine/ctm/clay/clay_n.png
View file
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 src/assets/minecraft/optifine/ctm/clay/clay_smooth.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/minecraft/optifine/ctm/clay/source.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://cc0textures.com/view?id=Clay003
88 changes: 88 additions & 0 deletions src/assets/minecraft/optifine/ctm/cobblestone/cobblestone.pbr.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
height:
shift: -50
scale: 0.16
edge-fade-size-x: 400
edge-fade-size-y: 400
porosity:
value: 100
parts:
- name: 1
left: 0
top: 0
width: 512
height: 512
- name: 2
left: 512
top: 0
width: 512
height: 512
- name: 3
left: 1024
top: 0
width: 512
height: 512
- name: 4
left: 1536
top: 0
width: 512
height: 512
- name: 5
left: 0
top: 512
width: 512
height: 512
- name: 6
left: 512
top: 512
width: 512
height: 512
- name: 7
left: 1024
top: 512
width: 512
height: 512
- name: 8
left: 1536
top: 512
width: 512
height: 512
- name: 9
left: 0
top: 1024
width: 512
height: 512
- name: 10
left: 512
top: 1024
width: 512
height: 512
- name: 11
left: 1024
top: 1024
width: 512
height: 512
- name: 12
left: 1536
top: 1024
width: 512
height: 512
- name: 13
left: 0
top: 1536
width: 512
height: 512
- name: 14
left: 512
top: 1536
width: 512
height: 512
- name: 15
left: 1024
top: 1536
width: 512
height: 512
- name: 16
left: 1536
top: 1536
width: 512
height: 512
Binary file added src/assets/minecraft/optifine/ctm/cobblestone/cobblestone.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/assets/minecraft/optifine/ctm/cobblestone/cobblestone.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
matchTiles=cobblestone mossy_cobblestone
method=repeat
width=4
height=4
tiles=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
symmetry=opposite
Binary file added src/assets/minecraft/optifine/ctm/cobblestone/cobblestone_ao.png
View file
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 src/assets/minecraft/optifine/ctm/cobblestone/cobblestone_h.png
View file
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 src/assets/minecraft/optifine/ctm/cobblestone/cobblestone_n.png
View file
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 src/assets/minecraft/optifine/ctm/cobblestone/cobblestone_smooth.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5c5d151

Please sign in to comment.