diff --git a/src/LabPbr-128x-LIN.pack.yml b/src/LabPbr-128x-LIN.pack.yml new file mode 100644 index 00000000..10c0a1f3 --- /dev/null +++ b/src/LabPbr-128x-LIN.pack.yml @@ -0,0 +1,34 @@ +edition: java +format: 8 +name: Textureless-LabPbr-128x +description: No Textures! PBR shader required. +tags: 128x LabPBR +encoding: + format: lab-1.3 + sampler: nearest + opacity: {} + color-red: {} + color-green: {} + color-blue: {} + height: {} + occlusion: {} + normal-x: {} + normal-y: {} + normal-z: {} + specular: {} + smooth: {} + rough: {} + metal: + sampler: nearest + f0: + sampler: nearest + hcm: {} + porosity: {} + sss: {} + emissive: {} +block-texture-size: 128 +item-texture-size: 128 +texture-scale: 4 +auto-generate-occlusion: false +occlusion-quality: 0.1 +occlusion-power: 0.5 diff --git a/src/LabPbr-128x.pack.yml b/src/LabPbr-128x.pack.yml index 2a84132b..30972103 100644 --- a/src/LabPbr-128x.pack.yml +++ b/src/LabPbr-128x.pack.yml @@ -5,7 +5,7 @@ description: No Textures! PBR shader required. tags: 128x LabPBR encoding: format: lab-1.3 - sampler: bicubic + sampler: bilinear opacity: {} color-red: {} color-green: {} @@ -22,6 +22,7 @@ encoding: sampler: nearest f0: sampler: nearest + hcm: {} porosity: {} sss: {} emissive: {} diff --git a/src/assets/minecraft/optifine/cem/bed.jem b/src/assets/minecraft/optifine/cem/bed.jem index fcf8c25f..f01e4ef0 100644 --- a/src/assets/minecraft/optifine/cem/bed.jem +++ b/src/assets/minecraft/optifine/cem/bed.jem @@ -1,5 +1,4 @@ { - "texture": "textures/entity/bed/blue.png", "textureSize": [64, 64], "models": [ { diff --git a/src/assets/minecraft/optifine/ctm/concrete/mat.yml b/src/assets/minecraft/optifine/ctm/concrete/mat.yml index 1634a93a..e0ee4772 100644 --- a/src/assets/minecraft/optifine/ctm/concrete/mat.yml +++ b/src/assets/minecraft/optifine/ctm/concrete/mat.yml @@ -2,20 +2,17 @@ publish-item: true color: value: '#949494' height: + texture: bump.png shift: -0.04 scale: 0.06 auto-level: true normal: - noise: 3 + noise: 4 method: sobel-high - strength: 2 occlusion: - scale: 0.6 - step-distance: 0.1 + step-distance: 0.2 z-bias: 2 - z-scale: 20 -smooth: - scale: 0.35 + z-scale: 4 f0: value: 0.072 ctm: diff --git a/src/assets/minecraft/optifine/ctm/concrete/normal.png b/src/assets/minecraft/optifine/ctm/concrete/normal.png index 629112e4..5b72c3f8 100644 Binary files a/src/assets/minecraft/optifine/ctm/concrete/normal.png and b/src/assets/minecraft/optifine/ctm/concrete/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/concrete/occlusion.png b/src/assets/minecraft/optifine/ctm/concrete/occlusion.png index c4210b55..1b09b8fb 100644 Binary files a/src/assets/minecraft/optifine/ctm/concrete/occlusion.png and b/src/assets/minecraft/optifine/ctm/concrete/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/cut_copper/mat.yml b/src/assets/minecraft/optifine/ctm/cut_copper/mat.yml index 3e1b7fdf..c007bfa8 100644 --- a/src/assets/minecraft/optifine/ctm/cut_copper/mat.yml +++ b/src/assets/minecraft/optifine/ctm/cut_copper/mat.yml @@ -6,7 +6,7 @@ height: occlusion: z-scale: 4 smooth: - shift: 0.1548 + scale: 0.7523 hcm: value: 234 ctm: diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/height.png b/src/assets/minecraft/optifine/ctm/stone_bricks/height.png index 6333760a..629d4c46 100644 Binary files a/src/assets/minecraft/optifine/ctm/stone_bricks/height.png and b/src/assets/minecraft/optifine/ctm/stone_bricks/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/color.png b/src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/color.png similarity index 100% rename from src/assets/minecraft/optifine/ctm/stone_bricks/color.png rename to src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/color.png diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/height.png b/src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/height.png new file mode 100644 index 00000000..6333760a Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/height.xcf b/src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/height.xcf similarity index 100% rename from src/assets/minecraft/optifine/ctm/stone_bricks/height.xcf rename to src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/height.xcf diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/height2.xcf b/src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/height2.xcf similarity index 100% rename from src/assets/minecraft/optifine/ctm/stone_bricks/height2.xcf rename to src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/height2.xcf diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/mat.yml b/src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/mat.yml similarity index 100% rename from src/assets/minecraft/optifine/ctm/stone_bricks/mat.yml rename to src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/mat.yml diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/normal.png b/src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/normal.png similarity index 100% rename from src/assets/minecraft/optifine/ctm/stone_bricks/normal.png rename to src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/normal.png diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/occlusion.png b/src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/occlusion.png similarity index 100% rename from src/assets/minecraft/optifine/ctm/stone_bricks/occlusion.png rename to src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/occlusion.png diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/porosity.png b/src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/porosity.png similarity index 100% rename from src/assets/minecraft/optifine/ctm/stone_bricks/porosity.png rename to src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/porosity.png diff --git a/src/assets/minecraft/optifine/ctm/stone_bricks/smooth.png b/src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/smooth.png similarity index 100% rename from src/assets/minecraft/optifine/ctm/stone_bricks/smooth.png rename to src/assets/minecraft/optifine/ctm/stone_bricks/v1.ignore/smooth.png diff --git a/src/assets/minecraft/textures/block/beacon/mat.yml b/src/assets/minecraft/textures/block/beacon/mat.yml index fafe6d69..b6edc669 100644 --- a/src/assets/minecraft/textures/block/beacon/mat.yml +++ b/src/assets/minecraft/textures/block/beacon/mat.yml @@ -1,15 +1,11 @@ -publish-inventory: true +publish-item: true opacity: value: 255 color: - value-red: 73 - value-green: 213 - value-blue: 204 + value: '#49D5CC' normal: curve-x: 90 curve-y: 90 - radius-x: 0.25 - radius-y: 0.25 method: sobel3 occlusion: value: 0 diff --git a/src/assets/minecraft/textures/block/cauldron_side/mat.yml b/src/assets/minecraft/textures/block/cauldron_side/mat.yml index 1e28f1dd..164a76f2 100644 --- a/src/assets/minecraft/textures/block/cauldron_side/mat.yml +++ b/src/assets/minecraft/textures/block/cauldron_side/mat.yml @@ -3,12 +3,12 @@ wrap-y: false color: value: '#555353' height: - value: 0 - scale: 0.8 + scale: 0 normal: noise: 3 + curve-x: 60 method: sobel3 - strength: 1.5 + strength: 5 occlusion: step-distance: 0.2 z-bias: 0 diff --git a/src/assets/minecraft/textures/block/cauldron_top/mat.yml b/src/assets/minecraft/textures/block/cauldron_top/mat.yml index 5b4f8c6f..337c8d92 100644 --- a/src/assets/minecraft/textures/block/cauldron_top/mat.yml +++ b/src/assets/minecraft/textures/block/cauldron_top/mat.yml @@ -3,10 +3,11 @@ wrap-y: false color: value: '#555353' height: - value: 0 + scale: 0 normal: noise: 3 method: sobel-high + strength: 2 occlusion: step-distance: 0.2 z-bias: 0 diff --git a/src/assets/minecraft/textures/block/cave_vines/mat.yml b/src/assets/minecraft/textures/block/cave_vines/mat.yml index a3f4386e..2274f7f7 100644 --- a/src/assets/minecraft/textures/block/cave_vines/mat.yml +++ b/src/assets/minecraft/textures/block/cave_vines/mat.yml @@ -9,4 +9,5 @@ height: normal: noise: 4 method: sobel5 -ctm: {} +smooth: + scale: 0.5 diff --git a/src/assets/minecraft/textures/block/cave_vines_lit/mat.yml b/src/assets/minecraft/textures/block/cave_vines_lit/mat.yml index 9c7f7ab8..84b5d065 100644 --- a/src/assets/minecraft/textures/block/cave_vines_lit/mat.yml +++ b/src/assets/minecraft/textures/block/cave_vines_lit/mat.yml @@ -9,6 +9,7 @@ height: normal: noise: 4 method: sobel5 +smooth: + scale: 0.5 emissive: scale: 0.2 -ctm: {} diff --git a/src/assets/minecraft/textures/block/cave_vines_plant/mat.yml b/src/assets/minecraft/textures/block/cave_vines_plant/mat.yml index e168804c..0e333681 100644 --- a/src/assets/minecraft/textures/block/cave_vines_plant/mat.yml +++ b/src/assets/minecraft/textures/block/cave_vines_plant/mat.yml @@ -7,4 +7,5 @@ height: normal: noise: 4 method: sobel5 -ctm: {} +smooth: + scale: 0.5 diff --git a/src/assets/minecraft/textures/block/cave_vines_plant_lit/mat.yml b/src/assets/minecraft/textures/block/cave_vines_plant_lit/mat.yml index 7582c44e..7fce1f39 100644 --- a/src/assets/minecraft/textures/block/cave_vines_plant_lit/mat.yml +++ b/src/assets/minecraft/textures/block/cave_vines_plant_lit/mat.yml @@ -7,8 +7,9 @@ height: normal: noise: 4 method: sobel5 +smooth: + scale: 0.5 sss: scale: 1.6 emissive: scale: 0.2 -ctm: {} diff --git a/src/assets/minecraft/textures/block/dirt_path_side_overlay/mat.yml b/src/assets/minecraft/textures/block/dirt_path_side_overlay/mat.yml index 222d1342..7bf4f607 100644 --- a/src/assets/minecraft/textures/block/dirt_path_side_overlay/mat.yml +++ b/src/assets/minecraft/textures/block/dirt_path_side_overlay/mat.yml @@ -1,10 +1,9 @@ publish-item: true wrap-x: true wrap-y: false +blend-mode: cutout color: - value-red: 113 - value-green: 94 - value-blue: 63 + value: '#715E3F' height: shift: -0.1 scale: 0.2 diff --git a/src/assets/minecraft/textures/block/weeping_vines/alpha.png b/src/assets/minecraft/textures/block/weeping_vines/alpha.png deleted file mode 100644 index 915a3121..00000000 Binary files a/src/assets/minecraft/textures/block/weeping_vines/alpha.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/weeping_vines/color.png b/src/assets/minecraft/textures/block/weeping_vines/color.png new file mode 100644 index 00000000..e86660fb Binary files /dev/null and b/src/assets/minecraft/textures/block/weeping_vines/color.png differ diff --git a/src/assets/minecraft/textures/block/weeping_vines/height.png b/src/assets/minecraft/textures/block/weeping_vines/height.png new file mode 100644 index 00000000..1c377bcc Binary files /dev/null and b/src/assets/minecraft/textures/block/weeping_vines/height.png differ diff --git a/src/assets/minecraft/textures/block/weeping_vines/mat.yml b/src/assets/minecraft/textures/block/weeping_vines/mat.yml index f4b2b512..4c307b85 100644 --- a/src/assets/minecraft/textures/block/weeping_vines/mat.yml +++ b/src/assets/minecraft/textures/block/weeping_vines/mat.yml @@ -1,13 +1,14 @@ -create-inventory: true -albedo: - value-red: 109 - value-green: 2 - value-blue: 0 +publish-item: true +wrap-x: false +model: cross height: - value: 0 + scale: 0 +normal: + method: sobel3 + strength: 1.5 smooth: - value: 0.47 + value: 0.3090 +f0: + value: 0.03 sss: value: 0.6 -occlusion: - value: 0 diff --git a/src/assets/minecraft/textures/block/weeping_vines/opacity.png b/src/assets/minecraft/textures/block/weeping_vines/opacity.png new file mode 100644 index 00000000..5fd92892 Binary files /dev/null and b/src/assets/minecraft/textures/block/weeping_vines/opacity.png differ diff --git a/src/assets/minecraft/textures/block/weeping_vines/sss.png b/src/assets/minecraft/textures/block/weeping_vines/sss.png new file mode 100644 index 00000000..b37c38d9 Binary files /dev/null and b/src/assets/minecraft/textures/block/weeping_vines/sss.png differ diff --git a/src/assets/minecraft/textures/block/weeping_vines/weeping_vines.png b/src/assets/minecraft/textures/block/weeping_vines/weeping_vines.png deleted file mode 100644 index 5a862856..00000000 Binary files a/src/assets/minecraft/textures/block/weeping_vines/weeping_vines.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/weeping_vines_plant/alpha.png b/src/assets/minecraft/textures/block/weeping_vines_plant/alpha.png deleted file mode 100644 index 6fa30261..00000000 Binary files a/src/assets/minecraft/textures/block/weeping_vines_plant/alpha.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/weeping_vines_plant/color.png b/src/assets/minecraft/textures/block/weeping_vines_plant/color.png new file mode 100644 index 00000000..22042461 Binary files /dev/null and b/src/assets/minecraft/textures/block/weeping_vines_plant/color.png differ diff --git a/src/assets/minecraft/textures/block/weeping_vines_plant/emissive.png b/src/assets/minecraft/textures/block/weeping_vines_plant/emissive.png new file mode 100644 index 00000000..674bc496 Binary files /dev/null and b/src/assets/minecraft/textures/block/weeping_vines_plant/emissive.png differ diff --git a/src/assets/minecraft/textures/block/weeping_vines_plant/height.png b/src/assets/minecraft/textures/block/weeping_vines_plant/height.png new file mode 100644 index 00000000..1c377bcc Binary files /dev/null and b/src/assets/minecraft/textures/block/weeping_vines_plant/height.png differ diff --git a/src/assets/minecraft/textures/block/weeping_vines_plant/mat.yml b/src/assets/minecraft/textures/block/weeping_vines_plant/mat.yml index 0651d394..4c307b85 100644 --- a/src/assets/minecraft/textures/block/weeping_vines_plant/mat.yml +++ b/src/assets/minecraft/textures/block/weeping_vines_plant/mat.yml @@ -1,14 +1,14 @@ publish-item: true -model-type: cross -color: - value-red: 109 - value-green: 2 - value-blue: 0 +wrap-x: false +model: cross height: - value: 0 -occlusion: - value: 0 + scale: 0 +normal: + method: sobel3 + strength: 1.5 smooth: - value: 0.47 + value: 0.3090 +f0: + value: 0.03 sss: value: 0.6 diff --git a/src/assets/minecraft/textures/block/weeping_vines_plant/opacity.png b/src/assets/minecraft/textures/block/weeping_vines_plant/opacity.png new file mode 100644 index 00000000..ccb63462 Binary files /dev/null and b/src/assets/minecraft/textures/block/weeping_vines_plant/opacity.png differ diff --git a/src/assets/minecraft/textures/block/weeping_vines_plant/sss.png b/src/assets/minecraft/textures/block/weeping_vines_plant/sss.png new file mode 100644 index 00000000..b37c38d9 Binary files /dev/null and b/src/assets/minecraft/textures/block/weeping_vines_plant/sss.png differ diff --git a/src/assets/minecraft/textures/block/weeping_vines_plant/weeping_vines_plant.png b/src/assets/minecraft/textures/block/weeping_vines_plant/weeping_vines_plant.png deleted file mode 100644 index 6ce50a77..00000000 Binary files a/src/assets/minecraft/textures/block/weeping_vines_plant/weeping_vines_plant.png and /dev/null differ diff --git a/src/assets/minecraft/textures/entity/bear/polarbear/mat.yml b/src/assets/minecraft/textures/entity/bear/polarbear/mat.yml index e657edd0..2abde5c3 100644 --- a/src/assets/minecraft/textures/entity/bear/polarbear/mat.yml +++ b/src/assets/minecraft/textures/entity/bear/polarbear/mat.yml @@ -2,6 +2,8 @@ texture-width: 256 texture-height: 128 wrap-x: false wrap-y: false +opacity: + value: 255 height: scale: 0 normal: @@ -16,7 +18,6 @@ smooth: value: 0.08 sss: value: 0.24 -ctm: {} filters: - name: head-up left: 0.0546875 diff --git a/src/assets/minecraft/textures/entity/fox/fox.png b/src/assets/minecraft/textures/entity/fox/fox_color.png similarity index 100% rename from src/assets/minecraft/textures/entity/fox/fox.png rename to src/assets/minecraft/textures/entity/fox/fox_color.png diff --git a/src/assets/minecraft/textures/entity/fox/fox_ao.png b/src/assets/minecraft/textures/entity/fox/fox_occlusion.png similarity index 100% rename from src/assets/minecraft/textures/entity/fox/fox_ao.png rename to src/assets/minecraft/textures/entity/fox/fox_occlusion.png diff --git a/src/assets/minecraft/textures/entity/fox/fox_sleep.png b/src/assets/minecraft/textures/entity/fox/fox_sleep_color.png similarity index 100% rename from src/assets/minecraft/textures/entity/fox/fox_sleep.png rename to src/assets/minecraft/textures/entity/fox/fox_sleep_color.png diff --git a/src/assets/minecraft/textures/entity/fox/snow_fox.png b/src/assets/minecraft/textures/entity/fox/snow_fox_color.png similarity index 100% rename from src/assets/minecraft/textures/entity/fox/snow_fox.png rename to src/assets/minecraft/textures/entity/fox/snow_fox_color.png diff --git a/src/assets/minecraft/textures/entity/fox/snow_fox_sleep.png b/src/assets/minecraft/textures/entity/fox/snow_fox_sleep_color.png similarity index 100% rename from src/assets/minecraft/textures/entity/fox/snow_fox_sleep.png rename to src/assets/minecraft/textures/entity/fox/snow_fox_sleep_color.png diff --git a/src/assets/minecraft/textures/entity/snow_golem/mat.yml b/src/assets/minecraft/textures/entity/snow_golem/mat.yml index 2c466ef1..f3c97145 100644 --- a/src/assets/minecraft/textures/entity/snow_golem/mat.yml +++ b/src/assets/minecraft/textures/entity/snow_golem/mat.yml @@ -11,7 +11,8 @@ occlusion: step-distance: 0.05 z-bias: 4 z-scale: 4 -ctm: {} +smooth: + shift: -0.3613 filters: - name: head-up left: 0.125 diff --git a/src/assets/minecraft/textures/entity/witch/height.png b/src/assets/minecraft/textures/entity/witch/height.png index 6c9737ca..11761b4d 100644 Binary files a/src/assets/minecraft/textures/entity/witch/height.png and b/src/assets/minecraft/textures/entity/witch/height.png differ diff --git a/src/assets/minecraft/textures/entity/witch/mat.yml b/src/assets/minecraft/textures/entity/witch/mat.yml index 1381954e..f0034eb0 100644 --- a/src/assets/minecraft/textures/entity/witch/mat.yml +++ b/src/assets/minecraft/textures/entity/witch/mat.yml @@ -8,14 +8,11 @@ height: scale: 0 normal: method: sobel-low - strength: 5 + strength: 4 occlusion: z-scale: 3 -smooth: - scale: 0.6 emissive: scale: 0.2 -ctm: {} filters: - name: Head-Up left: 0.125 diff --git a/src/assets/minecraft/textures/entity/witch/smooth.png b/src/assets/minecraft/textures/entity/witch/smooth.png index 28400c28..508c6221 100644 Binary files a/src/assets/minecraft/textures/entity/witch/smooth.png and b/src/assets/minecraft/textures/entity/witch/smooth.png differ diff --git a/src/assets/minecraft/textures/entity/wolf/wolf/mat.yml b/src/assets/minecraft/textures/entity/wolf/wolf/mat.yml index d2fcbf8f..ac9b12d8 100644 --- a/src/assets/minecraft/textures/entity/wolf/wolf/mat.yml +++ b/src/assets/minecraft/textures/entity/wolf/wolf/mat.yml @@ -10,6 +10,8 @@ normal: occlusion: step-distance: 0.15 z-scale: 3 +smooth: + scale: 0.6 f0: value: 0.04 sss: diff --git a/src/assets/minecraft/textures/entity/wolf/wolf_angry/mat.yml b/src/assets/minecraft/textures/entity/wolf/wolf_angry/mat.yml index d2fcbf8f..ac9b12d8 100644 --- a/src/assets/minecraft/textures/entity/wolf/wolf_angry/mat.yml +++ b/src/assets/minecraft/textures/entity/wolf/wolf_angry/mat.yml @@ -10,6 +10,8 @@ normal: occlusion: step-distance: 0.15 z-scale: 3 +smooth: + scale: 0.6 f0: value: 0.04 sss: diff --git a/src/assets/minecraft/textures/entity/wolf/wolf_tame/mat.yml b/src/assets/minecraft/textures/entity/wolf/wolf_tame/mat.yml index d2fcbf8f..ac9b12d8 100644 --- a/src/assets/minecraft/textures/entity/wolf/wolf_tame/mat.yml +++ b/src/assets/minecraft/textures/entity/wolf/wolf_tame/mat.yml @@ -10,6 +10,8 @@ normal: occlusion: step-distance: 0.15 z-scale: 3 +smooth: + scale: 0.6 f0: value: 0.04 sss: