Skip to content

Commit

Permalink
oak fixes, grass 32x; piston
Browse files Browse the repository at this point in the history
  • Loading branch information
null511 committed Feb 17, 2021
1 parent 3ae60b6 commit d60c7c4
Show file tree
Hide file tree
Showing 72 changed files with 210 additions and 40 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
alpha:
value: 255
height:
value: 0
texture-size: 64
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.
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/oak_button.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/button",
"textures": {
"texture": "block/stripped_oak_wood"
}
}
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/oak_button_inventory.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/button_inventory",
"textures": {
"texture": "block/stripped_oak_wood"
}
}
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/oak_button_pressed.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/button_pressed",
"textures": {
"texture": "block/stripped_oak_wood"
}
}
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/oak_fence_gate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/template_fence_gate",
"textures": {
"texture": "block/stripped_oak_wood"
}
}
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/oak_fence_gate_open.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/template_fence_gate_open",
"textures": {
"texture": "block/stripped_oak_wood"
}
}
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/oak_fence_gate_wall.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/template_fence_gate_wall",
"textures": {
"texture": "block/stripped_oak_wood"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/template_fence_gate_wall_open",
"textures": {
"texture": "block/stripped_oak_wood"
}
}
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/oak_fence_inventory.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/fence_inventory",
"textures": {
"texture": "block/stripped_oak_wood"
}
}
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/oak_fence_post.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/fence_post",
"textures": {
"texture": "block/stripped_oak_wood"
}
}
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/oak_fence_side.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/fence_side",
"textures": {
"texture": "block/stripped_oak_wood"
}
}
6 changes: 6 additions & 0 deletions src/assets/minecraft/models/block/oak_pressure_plate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/pressure_plate_up",
"textures": {
"texture": "block/stripped_oak_wood"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "block/pressure_plate_down",
"textures": {
"texture": "block/stripped_oak_wood"
}
}
24 changes: 24 additions & 0 deletions src/assets/minecraft/optifine/ctm/sandstone/0.pbr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
texture-size: 16
alpha:
value: 255
albedo:
value-red: 217
value-green: 205
value-blue: 159
height:
scale: 0.3
normal:
strength: 0.5
noise: 3
filter: sobel3
occlusion:
quality: 0.1
z-bias: 0.1
z-scale: 2
steps: 4
smooth:
value: 0.04
f0:
value: 0.05
porosity:
value: 0.6
Binary file added src/assets/minecraft/optifine/ctm/sandstone/0_h.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,4 @@
matchTiles=sandstone
connect=tile
method=top
tiles=0
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified src/assets/minecraft/textures/block/birch_planks/height.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.
4 changes: 0 additions & 4 deletions src/assets/minecraft/textures/block/birch_planks/pbr.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
alpha:
value: 255
albedo:
value-red: 196
value-green: 179
value-blue: 124
height:
scale: 0.12
normal:
Expand Down
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/textures/block/chain/height.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
Expand Up @@ -3,7 +3,10 @@ albedo:
value-green: 200
value-blue: 200
height:
value: 0
scale: 0.2
normal:
strength: 0.6
filter: sobel-low
occlusion:
value: 0
smooth:
Expand Down
Binary file modified src/assets/minecraft/textures/block/dark_oak_planks/height.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.
Binary file added src/assets/minecraft/textures/block/grass/alpha.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.
Binary file modified src/assets/minecraft/textures/block/oak_planks/height.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.
13 changes: 4 additions & 9 deletions src/assets/minecraft/textures/block/oak_planks/pbr.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
alpha:
value: 255
albedo:
value-red: 164
value-green: 133
value-blue: 80
height:
scale: 0.12
scale: 0.5
normal:
strength: 0.3
noise: 2
filter: sobel-low
occlusion:
quality: 0.1
z-bias: 0.2
z-bias: 0.1
z-scale: 3
steps: 6
smooth:
value: 0.08
steps: 4
smooth: {}
metal: {}
f0:
value: 0.04
Expand Down
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 src/assets/minecraft/textures/block/oak_trapdoor/height.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 9 additions & 4 deletions src/assets/minecraft/textures/block/oak_trapdoor/pbr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,18 @@ albedo:
value-green: 80
value-blue: 44
height:
scale: 0.2
scale: 0.4
normal:
strength: 0
noise: 1
filter: sobel-low
occlusion:
value: 0
quality: 0.1
z-bias: 0.1
z-scale: 4
steps: 4
smooth:
value: 0.39
value: 0.08
f0:
value: 0.03
porosity:
value: 0.2
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.
13 changes: 13 additions & 0 deletions src/assets/minecraft/textures/block/piston_bottom/pbr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
alpha:
value: 255
height:
scale: 0.5
normal:
filter: sobel-low
occlusion:
quality: 0.1
z-bias: 0.1
z-scale: 2
steps: 4
smooth: {}
porosity: {}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 0 additions & 14 deletions src/assets/minecraft/textures/block/piston_inner.pbr.yml

This file was deleted.

13 changes: 13 additions & 0 deletions src/assets/minecraft/textures/block/piston_inner/pbr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
alpha:
value: 255
height:
scale: 0.5
normal:
filter: sobel-low
occlusion:
quality: 0.1
z-bias: 0.1
z-scale: 2
steps: 4
smooth: {}
porosity: {}
Binary file modified src/assets/minecraft/textures/block/piston_side/albedo.png
Binary file modified src/assets/minecraft/textures/block/piston_side/f0.png
Binary file modified src/assets/minecraft/textures/block/piston_side/metal.png
12 changes: 9 additions & 3 deletions src/assets/minecraft/textures/block/piston_side/pbr.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
wrap-y: false
alpha:
value: 255
height:
value: 0
normal: {}
scale: 0.5
normal:
filter: sobel-low
occlusion:
quality: 0.1
z-bias: 0.1
z-scale: 4
steps: 4
smooth: {}
porosity: {}
wrap-y: false
Binary file modified src/assets/minecraft/textures/block/piston_side/porosity.png
Binary file modified src/assets/minecraft/textures/block/piston_side/smooth.png
10 changes: 8 additions & 2 deletions src/assets/minecraft/textures/block/piston_top/pbr.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
alpha:
value: 255
height:
value: 0
scale: 0.6
normal:
strength: 0.6
filter: sobel-high
occlusion:
value: 0
quality: 0.1
z-bias: 0.1
z-scale: 2
steps: 4
smooth: {}
porosity: {}
6 changes: 4 additions & 2 deletions src/assets/minecraft/textures/block/redstone_torch/pbr.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
wrap-x: false
wrap-y: false
albedo: {}
height:
value: 0
Expand All @@ -12,3 +10,7 @@ occlusion:
f0:
value: 0.04
porosity: {}
emissive:
scale: 0.3
wrap-x: false
wrap-y: false
24 changes: 24 additions & 0 deletions src/assets/minecraft/textures/block/stripped_oak_wood/pbr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
wrap-x: false
alpha:
value: 255
albedo:
value-red: 177
value-green: 144
value-blue: 86
height:
scale: 0.3
normal:
strength: 0.5
noise: 2
filter: sobel-low
occlusion:
quality: 0.1
z-bias: 0.2
z-scale: 4
steps: 6
smooth:
value: 0.1
f0:
value: 0.04
porosity:
value: 0.35
2 changes: 1 addition & 1 deletion src/lab13-overlay-16x.pack.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
edition: Java
format: 6
description: Place above Default textures! PBR shader required.
description: Place above Default textures!
tags: 16x LabPBR
encoding:
format: lab-1.3
Expand Down
16 changes: 16 additions & 0 deletions src/lab13-overlay-32x.pack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
edition: Java
format: 6
description: Place above Default textures!
tags: 32x LabPBR
encoding:
format: lab-1.3
alpha:
texture: none
albedo-red:
texture: none
albedo-green:
texture: none
albedo-blue:
texture: none
block-texture-size: 32
texture-scale: 2

0 comments on commit d60c7c4

Please sign in to comment.