Skip to content

Commit

Permalink
add birch_planks, acacia_log, wools, item images; replace oak_planks
Browse files Browse the repository at this point in the history
  • Loading branch information
null511 committed Dec 27, 2020
1 parent 2c77657 commit b45df19
Show file tree
Hide file tree
Showing 87 changed files with 353 additions and 26 deletions.
19 changes: 19 additions & 0 deletions src/assets/minecraft/models/block/fence_post.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"textures": {
"particle": "#texture"
},
"elements": [
{ "from": [ 6, 0, 6 ],
"to": [ 10, 16, 10 ],
"faces": {
"down": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "cullface": "down" },
"up": { "uv": [ 6, 6, 10, 10 ], "texture": "#texture", "cullface": "up" },
"north": { "uv": [ 0, 0, 16, 4 ], "texture": "#texture", "rotation": 90 },
"west": { "uv": [ 0, 4, 16, 8 ], "texture": "#texture", "rotation": 90 },
"south": { "uv": [ 0, 8, 16, 12 ], "texture": "#texture", "rotation": 90 },
"east": { "uv": [ 0, 12, 16, 16 ], "texture": "#texture", "rotation": 90 }
},
"__comment": "Center post"
}
]
}
8 changes: 5 additions & 3 deletions src/assets/minecraft/optifine/ctm/andesite/andesite.pbr.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
height:
shift: -20
scale: 0.25
shift: -40
scale: 0.4
edge-fade-size-x: 1000
edge-fade-size-y: 1000
occlusion:
scale: 0.1
smooth:
scale: 0.2
scale: 0.4
porosity:
value: 40
parts:
Expand Down
Binary file modified src/assets/minecraft/optifine/ctm/andesite/andesite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
height:
shift: -40
scale: 0.2
smooth:
scale: 0.5
porosity:
value: 80
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
matchTiles=birch_planks
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/birch_planks/source.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://cc0textures.com/view?id=WoodFloor039
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/blue_carpet/source.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://3dtextures.me/2020/03/25/fabric-rug-006/
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
height:
shift: -50
scale: 0.22
shift: -40
scale: 0.4
edge-fade-size-x: 400
edge-fade-size-y: 400
occlusion:
scale: 0.1
smooth:
scale: 0.5
porosity:
value: 100
parts:
Expand Down
Binary file modified src/assets/minecraft/optifine/ctm/cobblestone/cobblestone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
height:
shift: -28
scale: 0.16
edge-fade-size-x: 400
normal: {}
occlusion:
scale: 0.16
smooth:
scale: 0.1
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: 0
top: 512
width: 512
height: 512
- name: 4
left: 512
top: 512
width: 512
height: 512
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
matchTiles=dark_oak_log
method=repeat
width=2
height=2
tiles=1 2 3 4
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/dark_oak_log/source.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://freepbr.com/materials/mature-oak-tree/
Binary file modified src/assets/minecraft/optifine/ctm/diorite/diorite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
wrap-x: true
wrap-y: true
height:
scale: 0.12
scale: 0.06
occlusion:
scale: 0.1
quality: 0.04
z-bias: 0.5
z-scale: 6
Expand Down
Binary file modified src/assets/minecraft/optifine/ctm/iron_block/iron_block.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/assets/minecraft/optifine/ctm/magma/magma.pbr.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
albedo: {}
height:
shift: -60
scale: 0.2
shift: -90
scale: 0.36
edge-fade-size-x: 900
edge-fade-size-y: 900
smooth:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
height:
shift: -30
scale: 0.75
edge-fade-size-x: 700
edge-fade-size-y: 700
shift: -40
scale: 0.9
edge-fade-size-x: 900
edge-fade-size-y: 900
smooth:
scale: 0.7
rough: {}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
72 changes: 67 additions & 5 deletions src/assets/minecraft/optifine/ctm/oak_planks/oak_planks.pbr.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
wrap-x: true
wrap-y: true
height:
shift: -40
scale: 0.2
occlusion:
scale: 0.2
quality: 0.05
z-scale: 16
steps: 20
smooth:
scale: 1.2
scale: 0.4
metal:
scale: 0.5
porosity:
value: 10
value: 100
parts:
- name: 1
left: 0
Expand All @@ -22,12 +24,72 @@ parts:
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: 4
- 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 modified src/assets/minecraft/optifine/ctm/oak_planks/oak_planks.png
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
matchTiles=oak_planks
method=repeat
width=2
height=2
tiles=1 2 3 4
symmetry=opposite
width=4
height=4
tiles=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
Binary file modified src/assets/minecraft/optifine/ctm/oak_planks/oak_planks_ao.png
Binary file modified src/assets/minecraft/optifine/ctm/oak_planks/oak_planks_h.png
Binary file modified src/assets/minecraft/optifine/ctm/oak_planks/oak_planks_n.png
Binary file modified src/assets/minecraft/optifine/ctm/oak_planks/oak_planks_smooth.png
1 change: 1 addition & 0 deletions src/assets/minecraft/optifine/ctm/oak_planks/source.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://cc0textures.com/view?id=Planks020
33 changes: 33 additions & 0 deletions src/assets/minecraft/optifine/ctm/red_wool/red_wool.pbr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
height:
shift: -30
scale: 0.1
edge-fade-size-x: 600
edge-fade-size-y: 600
occlusion:
scale: 0.2
smooth:
scale: 0.1
porosity: {}
sss:
value: 80
parts:
- name: 1
left: 0
top: 0
width: 512
height: 512
- name: 2
left: 512
top: 0
width: 512
height: 512
- name: 3
left: 0
top: 512
width: 512
height: 512
- name: 4
left: 512
top: 512
width: 512
height: 512
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
matchTiles=red_wool
method=repeat
width=2
height=2
tiles=1 2 3 4
1 change: 1 addition & 0 deletions src/assets/minecraft/optifine/ctm/red_wool/source.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
https://freepbr.com/materials/carpet1/
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
height:
shift: -80
scale: 0.28
edge-fade-size-x: 800
edge-fade-size-y: 200
shift: -100
scale: 0.3
edge-fade-size-x: 80
edge-fade-size-y: 80
occlusion:
scale: 0.3
smooth:
scale: 0.2
scale: 0.08
porosity:
value: 120
parts:
Expand Down
Loading

0 comments on commit b45df19

Please sign in to comment.