diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index e8600949..d6be01c1 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -340,7 +340,7 @@ jobs: - name: Upload LabPbr 32x run: | curl -X POST \ - -F 'metadata={changelog: "Release ${{github.event.inputs.version}}", changelogType: "text", releaseType: "release", displayName: "LabPBR 32x v${{ github.event.inputs.version }}", gameVersions: [8203]}' \ + -F 'metadata={changelog: "Release ${{github.event.inputs.version}}", changelogType: "text", releaseType: "release", displayName: "LabPBR 32x v${{ github.event.inputs.version }}", gameVersions: [9008,8857,8830,8516,8203,8152,8134,8056,8010,7892,7890,7675,7664,7469,7413,7361,7344,7318,7132,7107,7081]}' \ -F 'file=@Textureless-LabPbr-32x-v${{ github.event.inputs.version }}.zip' 'https://minecraft.curseforge.com/api/projects/469686/upload-file?token=${{secrets.CF_API_TOKEN}}' Upload-Models-CurseForge: @@ -355,5 +355,5 @@ jobs: - name: Upload LabPbr Models 32x run: | curl -X POST \ - -F 'metadata={changelog: "Release ${{github.event.inputs.version}}", changelogType: "text", releaseType: "release", displayName: "LabPBR 32x v${{ github.event.inputs.version }}", gameVersions: [8203]}' \ + -F 'metadata={changelog: "Release ${{github.event.inputs.version}}", changelogType: "text", releaseType: "release", displayName: "LabPBR 32x v${{ github.event.inputs.version }}", gameVersions: [9008,8857,8830,8516,8203,8152,8134,8056,8010,7892,7890,7675,7664,7469,7413,7361,7344,7318,7132,7107,7081]}' \ -F 'file=@Textureless-Models-LabPbr-32x-v${{ github.event.inputs.version }}.zip' 'https://minecraft.curseforge.com/api/projects/582743/upload-file?token=${{secrets.CF_API_TOKEN}}' diff --git a/src-models/assets/minecraft/blockstates/nether_gold_ore.json b/src-models/assets/minecraft/blockstates/nether_gold_ore.json new file mode 100644 index 00000000..65b4d51e --- /dev/null +++ b/src-models/assets/minecraft/blockstates/nether_gold_ore.json @@ -0,0 +1,79 @@ +{ + "multipart": [ + { + "apply": { "model": "block/nether_gold_ore" } + }, + { + "apply": [ + { "model": "block/nether_gold_ore_end1", "weight": 1 }, + { "model": "block/nether_gold_ore_end1", "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_end1", "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_end1", "y": 270, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_end2", "weight": 1 }, + { "model": "block/nether_gold_ore_end2", "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_end2", "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_end2", "y": 270, "uvlock": true, "weight": 1 } + ] + }, + { + "apply": [ + { "model": "block/nether_gold_ore_end1", "x": 180, "weight": 1 }, + { "model": "block/nether_gold_ore_end1", "x": 180, "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_end1", "x": 180, "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_end1", "x": 180, "y": 270, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_end2", "x": 180, "weight": 1 }, + { "model": "block/nether_gold_ore_end2", "x": 180, "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_end2", "x": 180, "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_end2", "x": 180, "y": 270, "uvlock": true, "weight": 1 } + ] + }, + { + "apply": [ + { "model": "block/nether_gold_ore_side1", "weight": 1 }, + { "model": "block/nether_gold_ore_side1", "x": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side1", "x": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side1", "x": 270, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side2", "weight": 1 }, + { "model": "block/nether_gold_ore_side2", "x": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side2", "x": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side2", "x": 270, "uvlock": true, "weight": 1 } + ] + }, + { + "apply": [ + { "model": "block/nether_gold_ore_side1", "y": 90, "weight": 1 }, + { "model": "block/nether_gold_ore_side1", "x": 90, "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side1", "x": 180, "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side1", "x": 270, "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side2", "y": 90, "weight": 1 }, + { "model": "block/nether_gold_ore_side2", "x": 90, "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side2", "x": 180, "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side2", "x": 270, "y": 90, "uvlock": true, "weight": 1 } + ] + }, + { + "apply": [ + { "model": "block/nether_gold_ore_side1", "y": 180, "weight": 1 }, + { "model": "block/nether_gold_ore_side1", "x": 90, "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side1", "x": 180, "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side1", "x": 270, "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side2", "y": 180, "weight": 1 }, + { "model": "block/nether_gold_ore_side2", "x": 90, "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side2", "x": 180, "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side2", "x": 270, "y": 180, "uvlock": true, "weight": 1 } + ] + }, + { + "apply": [ + { "model": "block/nether_gold_ore_side1", "y": 270, "weight": 1 }, + { "model": "block/nether_gold_ore_side1", "x": 90, "y": 270, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side1", "x": 180, "y": 270, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side1", "x": 270, "y": 270, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side2", "y": 270, "weight": 1 }, + { "model": "block/nether_gold_ore_side2", "x": 90, "y": 270, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side2", "x": 180, "y": 270, "uvlock": true, "weight": 1 }, + { "model": "block/nether_gold_ore_side2", "x": 270, "y": 270, "uvlock": true, "weight": 1 } + ] + } + ] +} diff --git a/src-models/assets/minecraft/blockstates/nether_quartz_ore.json b/src-models/assets/minecraft/blockstates/nether_quartz_ore.json new file mode 100644 index 00000000..4a794ca0 --- /dev/null +++ b/src-models/assets/minecraft/blockstates/nether_quartz_ore.json @@ -0,0 +1,79 @@ +{ + "multipart": [ + { + "apply": { "model": "block/nether_quartz_ore" } + }, + { + "apply": [ + { "model": "block/nether_quartz_ore_end1", "weight": 1 }, + { "model": "block/nether_quartz_ore_end1", "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_end1", "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_end1", "y": 270, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_end2", "weight": 1 }, + { "model": "block/nether_quartz_ore_end2", "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_end2", "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_end2", "y": 270, "uvlock": true, "weight": 1 } + ] + }, + { + "apply": [ + { "model": "block/nether_quartz_ore_end1", "x": 180, "weight": 1 }, + { "model": "block/nether_quartz_ore_end1", "x": 180, "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_end1", "x": 180, "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_end1", "x": 180, "y": 270, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_end2", "x": 180, "weight": 1 }, + { "model": "block/nether_quartz_ore_end2", "x": 180, "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_end2", "x": 180, "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_end2", "x": 180, "y": 270, "uvlock": true, "weight": 1 } + ] + }, + { + "apply": [ + { "model": "block/nether_quartz_ore_side1", "weight": 1 }, + { "model": "block/nether_quartz_ore_side1", "x": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side1", "x": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side1", "x": 270, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side2", "weight": 1 }, + { "model": "block/nether_quartz_ore_side2", "x": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side2", "x": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side2", "x": 270, "uvlock": true, "weight": 1 } + ] + }, + { + "apply": [ + { "model": "block/nether_quartz_ore_side1", "y": 90, "weight": 1 }, + { "model": "block/nether_quartz_ore_side1", "x": 90, "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side1", "x": 180, "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side1", "x": 270, "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side2", "y": 90, "weight": 1 }, + { "model": "block/nether_quartz_ore_side2", "x": 90, "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side2", "x": 180, "y": 90, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side2", "x": 270, "y": 90, "uvlock": true, "weight": 1 } + ] + }, + { + "apply": [ + { "model": "block/nether_quartz_ore_side1", "y": 180, "weight": 1 }, + { "model": "block/nether_quartz_ore_side1", "x": 90, "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side1", "x": 180, "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side1", "x": 270, "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side2", "y": 180, "weight": 1 }, + { "model": "block/nether_quartz_ore_side2", "x": 90, "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side2", "x": 180, "y": 180, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side2", "x": 270, "y": 180, "uvlock": true, "weight": 1 } + ] + }, + { + "apply": [ + { "model": "block/nether_quartz_ore_side1", "y": 270, "weight": 1 }, + { "model": "block/nether_quartz_ore_side1", "x": 90, "y": 270, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side1", "x": 180, "y": 270, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side1", "x": 270, "y": 270, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side2", "y": 270, "weight": 1 }, + { "model": "block/nether_quartz_ore_side2", "x": 90, "y": 270, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side2", "x": 180, "y": 270, "uvlock": true, "weight": 1 }, + { "model": "block/nether_quartz_ore_side2", "x": 270, "y": 270, "uvlock": true, "weight": 1 } + ] + } + ] +} diff --git a/src-models/assets/minecraft/models/block/nether_gold_ore_end1.json b/src-models/assets/minecraft/models/block/nether_gold_ore_end1.json new file mode 100644 index 00000000..47e1ce75 --- /dev/null +++ b/src-models/assets/minecraft/models/block/nether_gold_ore_end1.json @@ -0,0 +1,6 @@ +{ + "parent":"block/ore_end1", + "textures": { + "ore":"block/raw_gold_block" + } +} diff --git a/src-models/assets/minecraft/models/block/nether_gold_ore_end2.json b/src-models/assets/minecraft/models/block/nether_gold_ore_end2.json new file mode 100644 index 00000000..daa132ab --- /dev/null +++ b/src-models/assets/minecraft/models/block/nether_gold_ore_end2.json @@ -0,0 +1,6 @@ +{ + "parent":"block/ore_end2", + "textures": { + "ore":"block/raw_gold_block" + } +} diff --git a/src-models/assets/minecraft/models/block/nether_gold_ore_side1.json b/src-models/assets/minecraft/models/block/nether_gold_ore_side1.json new file mode 100644 index 00000000..6ff2a850 --- /dev/null +++ b/src-models/assets/minecraft/models/block/nether_gold_ore_side1.json @@ -0,0 +1,6 @@ +{ + "parent":"block/ore_side1", + "textures": { + "ore":"block/raw_gold_block" + } +} diff --git a/src-models/assets/minecraft/models/block/nether_gold_ore_side2.json b/src-models/assets/minecraft/models/block/nether_gold_ore_side2.json new file mode 100644 index 00000000..e0d5557b --- /dev/null +++ b/src-models/assets/minecraft/models/block/nether_gold_ore_side2.json @@ -0,0 +1,6 @@ +{ + "parent":"block/ore_side2", + "textures": { + "ore":"block/raw_gold_block" + } +} diff --git a/src-models/assets/minecraft/models/block/nether_quartz_ore_end1.json b/src-models/assets/minecraft/models/block/nether_quartz_ore_end1.json new file mode 100644 index 00000000..c0ae48f6 --- /dev/null +++ b/src-models/assets/minecraft/models/block/nether_quartz_ore_end1.json @@ -0,0 +1,6 @@ +{ + "parent":"block/ore_end1", + "textures": { + "ore":"block/quartz_ore" + } +} diff --git a/src-models/assets/minecraft/models/block/nether_quartz_ore_end2.json b/src-models/assets/minecraft/models/block/nether_quartz_ore_end2.json new file mode 100644 index 00000000..8030c713 --- /dev/null +++ b/src-models/assets/minecraft/models/block/nether_quartz_ore_end2.json @@ -0,0 +1,6 @@ +{ + "parent":"block/ore_end2", + "textures": { + "ore":"block/quartz_ore" + } +} diff --git a/src-models/assets/minecraft/models/block/nether_quartz_ore_side1.json b/src-models/assets/minecraft/models/block/nether_quartz_ore_side1.json new file mode 100644 index 00000000..f0649e3b --- /dev/null +++ b/src-models/assets/minecraft/models/block/nether_quartz_ore_side1.json @@ -0,0 +1,6 @@ +{ + "parent":"block/ore_side1", + "textures": { + "ore":"block/quartz_ore" + } +} diff --git a/src-models/assets/minecraft/models/block/nether_quartz_ore_side2.json b/src-models/assets/minecraft/models/block/nether_quartz_ore_side2.json new file mode 100644 index 00000000..8d4821b4 --- /dev/null +++ b/src-models/assets/minecraft/models/block/nether_quartz_ore_side2.json @@ -0,0 +1,6 @@ +{ + "parent":"block/ore_side2", + "textures": { + "ore":"block/quartz_ore" + } +} diff --git a/src-models/assets/minecraft/models/block/ore_end1.json b/src-models/assets/minecraft/models/block/ore_end1.json new file mode 100644 index 00000000..5afa7a11 --- /dev/null +++ b/src-models/assets/minecraft/models/block/ore_end1.json @@ -0,0 +1,31 @@ +{ + "ambientocclusion": false, + "elements": [ + { + "from": [8, 13.8, 9], + "to": [12, 18.8, 13], + "shade": false, + "rotation": {"angle": 22.5, "axis": "x", "origin": [13, 16, 10]}, + "faces": { + "north": {"uv": [4, 7, 8, 12], "texture": "#ore", "cullface": "up"}, + "east": {"uv": [0, 7, 4, 12], "texture": "#ore", "cullface": "up"}, + "south": {"uv": [12, 7, 16, 12], "texture": "#ore", "cullface": "up"}, + "west": {"uv": [8, 7, 12, 12], "texture": "#ore", "cullface": "up"}, + "up": {"uv": [4, 3, 8, 7], "texture": "#ore", "cullface": "up"} + } + }, + { + "from": [3, 13.8, 3], + "to": [7, 17.8, 7], + "shade": false, + "rotation": {"angle": 22.5, "axis": "z", "origin": [2, 16, 5]}, + "faces": { + "north": {"uv": [4, 7, 8, 11], "texture": "#ore", "cullface": "up"}, + "east": {"uv": [0, 7, 4, 11], "texture": "#ore", "cullface": "up"}, + "south": {"uv": [12, 7, 16, 11], "texture": "#ore", "cullface": "up"}, + "west": {"uv": [8, 7, 12, 11], "texture": "#ore", "cullface": "up"}, + "up": {"uv": [4, 3, 8, 7], "texture": "#ore", "cullface": "up"} + } + } + ] +} \ No newline at end of file diff --git a/src-models/assets/minecraft/models/block/ore_end2.json b/src-models/assets/minecraft/models/block/ore_end2.json new file mode 100644 index 00000000..0c79f19c --- /dev/null +++ b/src-models/assets/minecraft/models/block/ore_end2.json @@ -0,0 +1,31 @@ +{ + "ambientocclusion": false, + "elements": [ + { + "from": [8, 13.8, 9], + "to": [12, 18.8, 13], + "shade": false, + "rotation": {"angle": -22.5, "axis": "z", "origin": [13, 16, 10]}, + "faces": { + "north": {"uv": [4, 7, 8, 12], "texture": "#ore", "cullface": "up"}, + "east": {"uv": [0, 7, 4, 12], "texture": "#ore", "cullface": "up"}, + "south": {"uv": [12, 7, 16, 12], "texture": "#ore", "cullface": "up"}, + "west": {"uv": [8, 7, 12, 12], "texture": "#ore", "cullface": "up"}, + "up": {"uv": [4, 3, 8, 7], "texture": "#ore", "cullface": "up"} + } + }, + { + "from": [3, 13.8, 3], + "to": [7, 17.8, 7], + "shade": false, + "rotation": {"angle": 22.5, "axis": "x", "origin": [2, 16, 5]}, + "faces": { + "north": {"uv": [4, 7, 8, 11], "texture": "#ore", "cullface": "up"}, + "east": {"uv": [0, 7, 4, 11], "texture": "#ore", "cullface": "up"}, + "south": {"uv": [12, 7, 16, 11], "texture": "#ore", "cullface": "up"}, + "west": {"uv": [8, 7, 12, 11], "texture": "#ore", "cullface": "up"}, + "up": {"uv": [4, 3, 8, 7], "texture": "#ore", "cullface": "up"} + } + } + ] +} \ No newline at end of file diff --git a/src-models/assets/minecraft/models/block/ore_side1.json b/src-models/assets/minecraft/models/block/ore_side1.json new file mode 100644 index 00000000..54c793e4 --- /dev/null +++ b/src-models/assets/minecraft/models/block/ore_side1.json @@ -0,0 +1,31 @@ +{ + "ambientocclusion": false, + "elements": [ + { + "from": [-2.8, 9, 9], + "to": [2.2, 13, 13], + "shade": false, + "rotation": {"angle": 22.5, "axis": "y", "origin": [0, 14, 10]}, + "faces": { + "north": {"uv": [4, 7, 8, 12], "rotation": 90, "texture": "#ore", "cullface": "west"}, + "south": {"uv": [12, 7, 16, 12], "rotation": 270, "texture": "#ore", "cullface": "west"}, + "west": {"uv": [4, 3, 8, 7], "rotation": 270, "texture": "#ore", "cullface": "west"}, + "up": {"uv": [0, 7, 4, 12], "rotation": 270, "texture": "#ore", "cullface": "west"}, + "down": {"uv": [8, 7, 12, 12], "rotation": 270, "texture": "#ore", "cullface": "west"} + } + }, + { + "from": [-1.8, 4, 3], + "to": [2.2, 8, 7], + "shade": false, + "rotation": {"angle": 22.5, "axis": "z", "origin": [0, 3, 5]}, + "faces": { + "north": {"uv": [4, 7, 8, 11], "rotation": 90, "texture": "#ore", "cullface": "west"}, + "south": {"uv": [12, 7, 16, 11], "rotation": 270, "texture": "#ore", "cullface": "west"}, + "west": {"uv": [4, 3, 8, 7], "rotation": 270, "texture": "#ore", "cullface": "west"}, + "up": {"uv": [0, 7, 4, 11], "rotation": 270, "texture": "#ore", "cullface": "west"}, + "down": {"uv": [8, 7, 12, 11], "rotation": 270, "texture": "#ore", "cullface": "west"} + } + } + ] +} \ No newline at end of file diff --git a/src-models/assets/minecraft/models/block/ore_side2.json b/src-models/assets/minecraft/models/block/ore_side2.json new file mode 100644 index 00000000..329a30e4 --- /dev/null +++ b/src-models/assets/minecraft/models/block/ore_side2.json @@ -0,0 +1,31 @@ +{ + "ambientocclusion": false, + "elements": [ + { + "from": [-2.8, 8, 9], + "to": [2.2, 12, 13], + "shade": false, + "rotation": {"angle": -22.5, "axis": "z", "origin": [0, 13, 10]}, + "faces": { + "north": {"uv": [4, 7, 8, 12], "rotation": 90, "texture": "#ore", "cullface": "west"}, + "south": {"uv": [12, 7, 16, 12], "rotation": 270, "texture": "#ore", "cullface": "west"}, + "west": {"uv": [4, 3, 8, 7], "rotation": 270, "texture": "#ore", "cullface": "west"}, + "up": {"uv": [0, 7, 4, 12], "rotation": 270, "texture": "#ore", "cullface": "west"}, + "down": {"uv": [8, 7, 12, 12], "rotation": 270, "texture": "#ore", "cullface": "west"} + } + }, + { + "from": [-1.8, 3, 3], + "to": [2.2, 7, 7], + "shade": false, + "rotation": {"angle": 22.5, "axis": "y", "origin": [0, 2, 5]}, + "faces": { + "north": {"uv": [4, 7, 8, 11], "rotation": 90, "texture": "#ore", "cullface": "west"}, + "south": {"uv": [12, 7, 16, 11], "rotation": 270, "texture": "#ore", "cullface": "west"}, + "west": {"uv": [4, 3, 8, 7], "rotation": 270, "texture": "#ore", "cullface": "west"}, + "up": {"uv": [0, 7, 4, 11], "rotation": 270, "texture": "#ore", "cullface": "west"}, + "down": {"uv": [8, 7, 12, 11], "rotation": 270, "texture": "#ore", "cullface": "west"} + } + } + ] +} \ No newline at end of file diff --git a/src-models/assets/minecraft/textures/block/quartz_ore/color.png b/src-models/assets/minecraft/textures/block/quartz_ore/color.png new file mode 100644 index 00000000..3619878b Binary files /dev/null and b/src-models/assets/minecraft/textures/block/quartz_ore/color.png differ diff --git a/src-models/assets/minecraft/textures/block/quartz_ore/height.png b/src-models/assets/minecraft/textures/block/quartz_ore/height.png new file mode 100644 index 00000000..bfd02c21 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/quartz_ore/height.png differ diff --git a/src-models/assets/minecraft/textures/block/quartz_ore/mat.yml b/src-models/assets/minecraft/textures/block/quartz_ore/mat.yml new file mode 100644 index 00000000..006f8d38 --- /dev/null +++ b/src-models/assets/minecraft/textures/block/quartz_ore/mat.yml @@ -0,0 +1,16 @@ +publish-item: false +height: + scale: 0.05 +normal: + noise: 12 + strength: 0.2 +occlusion: + step-distance: 0.1 + z-scale: 1 +f0: + value: 0.035 +porosity: + value: 0 +sss: + value: 0.6 +ctm: {} diff --git a/src-models/assets/minecraft/textures/block/quartz_ore/occlusion.png b/src-models/assets/minecraft/textures/block/quartz_ore/occlusion.png new file mode 100644 index 00000000..75c76126 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/quartz_ore/occlusion.png differ diff --git a/src-models/assets/minecraft/textures/block/quartz_ore/smooth.png b/src-models/assets/minecraft/textures/block/quartz_ore/smooth.png new file mode 100644 index 00000000..c7f7bdf6 Binary files /dev/null and b/src-models/assets/minecraft/textures/block/quartz_ore/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/gilded_blackstone/bump.png b/src/assets/minecraft/optifine/ctm/gilded_blackstone/bump.png new file mode 100644 index 00000000..ea2e6126 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gilded_blackstone/bump.png differ diff --git a/src/assets/minecraft/optifine/ctm/gilded_blackstone/color.png b/src/assets/minecraft/optifine/ctm/gilded_blackstone/color.png new file mode 100644 index 00000000..96680fdc Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gilded_blackstone/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/gilded_blackstone/height.png b/src/assets/minecraft/optifine/ctm/gilded_blackstone/height.png new file mode 100644 index 00000000..f3bffb00 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gilded_blackstone/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/gilded_blackstone/mat.yml b/src/assets/minecraft/optifine/ctm/gilded_blackstone/mat.yml new file mode 100644 index 00000000..cb4184f0 --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/gilded_blackstone/mat.yml @@ -0,0 +1,23 @@ +publish-item: true +height: + scale: 0.3 + edge-fade-x: 1 + edge-fade-y: 1 +normal: + noise: 2 + method: sobel5 + strength: 3 +occlusion: + step-distance: 0.15 + z-bias: 0 + z-scale: 14 +f0: + value: 0.04 +porosity: + value: 0.6 +ctm: + method: of-repeat + width: 4 + height: 4 + match-tiles: gilded_blackstone + placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/gilded_blackstone/metal.png b/src/assets/minecraft/optifine/ctm/gilded_blackstone/metal.png new file mode 100644 index 00000000..e20a36b8 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gilded_blackstone/metal.png differ diff --git a/src/assets/minecraft/optifine/ctm/gilded_blackstone/normal-src.png b/src/assets/minecraft/optifine/ctm/gilded_blackstone/normal-src.png new file mode 100644 index 00000000..22a2c3ae Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gilded_blackstone/normal-src.png differ diff --git a/src/assets/minecraft/optifine/ctm/gilded_blackstone/normal.png b/src/assets/minecraft/optifine/ctm/gilded_blackstone/normal.png new file mode 100644 index 00000000..d322c7a9 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gilded_blackstone/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/gilded_blackstone/occlusion.png b/src/assets/minecraft/optifine/ctm/gilded_blackstone/occlusion.png new file mode 100644 index 00000000..cbbb6cbb Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gilded_blackstone/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/gilded_blackstone/smooth.png b/src/assets/minecraft/optifine/ctm/gilded_blackstone/smooth.png new file mode 100644 index 00000000..7d8febbf Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gilded_blackstone/smooth.png differ diff --git a/src/assets/minecraft/textures/block/nether_gold_ore/albedo.png b/src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/albedo.png similarity index 100% rename from src/assets/minecraft/textures/block/nether_gold_ore/albedo.png rename to src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/albedo.png diff --git a/src/assets/minecraft/textures/block/nether_gold_ore/f0.png b/src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/f0.png similarity index 100% rename from src/assets/minecraft/textures/block/nether_gold_ore/f0.png rename to src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/f0.png diff --git a/src/assets/minecraft/textures/block/nether_gold_ore/height.png b/src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/height.png similarity index 100% rename from src/assets/minecraft/textures/block/nether_gold_ore/height.png rename to src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/height.png diff --git a/src/assets/minecraft/textures/block/nether_gold_ore/mat.yml b/src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/nether_gold_ore/mat.yml rename to src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/mat.yml diff --git a/src/assets/minecraft/textures/block/nether_gold_ore/metal.png b/src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/metal.png similarity index 100% rename from src/assets/minecraft/textures/block/nether_gold_ore/metal.png rename to src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/metal.png diff --git a/src/assets/minecraft/textures/block/nether_gold_ore/occlusion.png b/src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/occlusion.png similarity index 100% rename from src/assets/minecraft/textures/block/nether_gold_ore/occlusion.png rename to src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/occlusion.png diff --git a/src/assets/minecraft/textures/block/nether_gold_ore/porosity.png b/src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/porosity.png similarity index 100% rename from src/assets/minecraft/textures/block/nether_gold_ore/porosity.png rename to src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/porosity.png diff --git a/src/assets/minecraft/textures/block/nether_gold_ore/smooth.png b/src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/smooth.png similarity index 100% rename from src/assets/minecraft/textures/block/nether_gold_ore/smooth.png rename to src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/smooth.png diff --git a/src/assets/minecraft/textures/block/nether_gold_ore/sss.png b/src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/sss.png similarity index 100% rename from src/assets/minecraft/textures/block/nether_gold_ore/sss.png rename to src/assets/minecraft/optifine/ctm/nether_gold_ore/.ignore/sss.png diff --git a/src/assets/minecraft/optifine/ctm/nether_gold_ore/bump.png b/src/assets/minecraft/optifine/ctm/nether_gold_ore/bump.png new file mode 100644 index 00000000..ae8f24e2 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_gold_ore/bump.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_gold_ore/color.png b/src/assets/minecraft/optifine/ctm/nether_gold_ore/color.png new file mode 100644 index 00000000..c8fc0aa4 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_gold_ore/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_gold_ore/f0.png b/src/assets/minecraft/optifine/ctm/nether_gold_ore/f0.png new file mode 100644 index 00000000..e1f87afa Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_gold_ore/f0.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_gold_ore/height.png b/src/assets/minecraft/optifine/ctm/nether_gold_ore/height.png new file mode 100644 index 00000000..804eedbd Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_gold_ore/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_gold_ore/mat.yml b/src/assets/minecraft/optifine/ctm/nether_gold_ore/mat.yml new file mode 100644 index 00000000..7f48c862 --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/nether_gold_ore/mat.yml @@ -0,0 +1,16 @@ +publish-item: true +height: + shift: -0.04 + scale: 0.5 + edge-fade-x: 1 + edge-fade-y: 1 + edge-fade-strength: 0.7 +occlusion: + step-distance: 0.1 + z-bias: 1 +ctm: + method: of-repeat + width: 8 + height: 8 + match-tiles: nether_gold_ore + placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/nether_gold_ore/metal.png b/src/assets/minecraft/optifine/ctm/nether_gold_ore/metal.png new file mode 100644 index 00000000..4137a67a Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_gold_ore/metal.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_gold_ore/normal-2.png b/src/assets/minecraft/optifine/ctm/nether_gold_ore/normal-2.png new file mode 100644 index 00000000..105ed0f9 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_gold_ore/normal-2.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_gold_ore/normal.png b/src/assets/minecraft/optifine/ctm/nether_gold_ore/normal.png new file mode 100644 index 00000000..d7c2b46e Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_gold_ore/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_gold_ore/occlusion.png b/src/assets/minecraft/optifine/ctm/nether_gold_ore/occlusion.png new file mode 100644 index 00000000..d10bd098 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_gold_ore/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_gold_ore/smooth.png b/src/assets/minecraft/optifine/ctm/nether_gold_ore/smooth.png new file mode 100644 index 00000000..efe3cbe7 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_gold_ore/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/albedo.png b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/albedo.png new file mode 100644 index 00000000..1e8a0099 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/albedo.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/f0.png b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/f0.png new file mode 100644 index 00000000..fcf5f5ab Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/f0.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/height.png b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/height.png new file mode 100644 index 00000000..c496b9b5 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/height.png differ diff --git a/src/assets/minecraft/textures/block/nether_quartz_ore/mat.yml b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/mat.yml similarity index 100% rename from src/assets/minecraft/textures/block/nether_quartz_ore/mat.yml rename to src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/mat.yml diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/metal.png b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/metal.png new file mode 100644 index 00000000..4b50ed6a Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/metal.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/occlusion.png new file mode 100644 index 00000000..7b902bee Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/porosity.png b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/porosity.png new file mode 100644 index 00000000..b612ebfd Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/porosity.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/smooth.png new file mode 100644 index 00000000..efa1ecd7 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/sss.png b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/sss.png new file mode 100644 index 00000000..0d4d107f Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/.ignore/sss.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/bump.png b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/bump.png new file mode 100644 index 00000000..68d6611e Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/bump.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/color.png b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/color.png new file mode 100644 index 00000000..6eba9456 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/color.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/color.xcf b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/color.xcf new file mode 100644 index 00000000..e1342a35 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/color.xcf differ diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/f0.png b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/f0.png new file mode 100644 index 00000000..c378e804 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/f0.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/height.png b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/height.png new file mode 100644 index 00000000..e51fe028 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/height.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/mat.yml b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/mat.yml new file mode 100644 index 00000000..c640cab9 --- /dev/null +++ b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/mat.yml @@ -0,0 +1,21 @@ +publish-item: true +height: + shift: -0.04 + scale: 0.5 + edge-fade-x: 1 + edge-fade-y: 1 + edge-fade-strength: 0.7 +normal: + noise: 6 + method: sobel-low + strength: 5 +occlusion: + step-distance: 0.1 + z-bias: 1 + z-scale: 8 +ctm: + method: of-repeat + width: 8 + height: 8 + match-tiles: nether_quartz_ore + placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/normal-x.png b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/normal-x.png new file mode 100644 index 00000000..d7c2b46e Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/normal-x.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/normal.png b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/normal.png new file mode 100644 index 00000000..c3c5314b Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/normal.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/occlusion.png b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/occlusion.png new file mode 100644 index 00000000..30108387 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/occlusion.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/smooth.png b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/smooth.png new file mode 100644 index 00000000..f2f8c5db Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/smooth.png differ diff --git a/src/assets/minecraft/optifine/ctm/nether_quartz_ore/sss.png b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/sss.png new file mode 100644 index 00000000..4eab0b69 Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_quartz_ore/sss.png differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/color.png b/src/assets/minecraft/optifine/ctm/netherrack/.ignore/color.png deleted file mode 100644 index c54503dd..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/color.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/color.xcf b/src/assets/minecraft/optifine/ctm/netherrack/.ignore/color.xcf deleted file mode 100644 index 6f911fdb..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/color.xcf and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/f0.png b/src/assets/minecraft/optifine/ctm/netherrack/.ignore/f0.png deleted file mode 100644 index 80612b41..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/f0.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/height.png b/src/assets/minecraft/optifine/ctm/netherrack/.ignore/height.png deleted file mode 100644 index dd306bbd..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/height.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/height.xcf b/src/assets/minecraft/optifine/ctm/netherrack/.ignore/height.xcf deleted file mode 100644 index 5781c673..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/height.xcf and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/netherrack/.ignore/mat.yml deleted file mode 100644 index 26242023..00000000 --- a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/mat.yml +++ /dev/null @@ -1,21 +0,0 @@ -publish-item: true -height: - shift: -0.5 - scale: 0.5 - edge-fade-x: 0.6 - edge-fade-y: 0.6 -normal: - method: sobel5 - strength: 0.8 -occlusion: - step-distance: 0.1 - z-bias: 0.2 - z-scale: 6 -sss: - scale: 3 -ctm: - method: of-repeat - width: 8 - height: 8 - match-tiles: netherrack - placeholder: true diff --git a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/normal.png b/src/assets/minecraft/optifine/ctm/netherrack/.ignore/normal.png deleted file mode 100644 index d6582905..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/normal.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/netherrack/.ignore/occlusion.png deleted file mode 100644 index 060189d1..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/occlusion.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/porosity.png b/src/assets/minecraft/optifine/ctm/netherrack/.ignore/porosity.png deleted file mode 100644 index 75dc6be9..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/porosity.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/porosity.xcf b/src/assets/minecraft/optifine/ctm/netherrack/.ignore/porosity.xcf deleted file mode 100644 index e941eab3..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/porosity.xcf and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/netherrack/.ignore/smooth.png deleted file mode 100644 index 28e0b65f..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/smooth.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/smooth.xcf b/src/assets/minecraft/optifine/ctm/netherrack/.ignore/smooth.xcf deleted file mode 100644 index 6db5b384..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/smooth.xcf and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/source.xcf b/src/assets/minecraft/optifine/ctm/netherrack/.ignore/source.xcf deleted file mode 100644 index ee4bcccb..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/source.xcf and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/sss.png b/src/assets/minecraft/optifine/ctm/netherrack/.ignore/sss.png deleted file mode 100644 index c3da111b..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/sss.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/sss.xcf b/src/assets/minecraft/optifine/ctm/netherrack/.ignore/sss.xcf deleted file mode 100644 index 83aab36c..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/.ignore/sss.xcf and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_AmbientOcclusion.png b/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_AmbientOcclusion.png deleted file mode 100644 index fb1d6ef2..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_AmbientOcclusion.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_Color.png b/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_Color.png deleted file mode 100644 index 67577fbe..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_Color.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_Displacement.png b/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_Displacement.png deleted file mode 100644 index 7902a99e..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_Displacement.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_IdMask.png b/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_IdMask.png deleted file mode 100644 index a8c573d2..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_IdMask.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_NormalDX.png b/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_NormalDX.png deleted file mode 100644 index 4b1495e7..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_NormalDX.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_Roughness.png b/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_Roughness.png deleted file mode 100644 index e09ec49b..00000000 Binary files a/src/assets/minecraft/optifine/ctm/netherrack/Gravel021_1K_Roughness.png and /dev/null differ diff --git a/src/assets/minecraft/optifine/ctm/netherrack/mat.yml b/src/assets/minecraft/optifine/ctm/netherrack/mat.yml index b3fa70c0..6df2dbe0 100644 --- a/src/assets/minecraft/optifine/ctm/netherrack/mat.yml +++ b/src/assets/minecraft/optifine/ctm/netherrack/mat.yml @@ -5,6 +5,9 @@ height: edge-fade-x: 1 edge-fade-y: 1 edge-fade-strength: 0.7 +occlusion: + step-distance: 0.1 + z-bias: 1 ctm: method: of-repeat width: 8 diff --git a/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/albedo.png b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/albedo.png deleted file mode 100644 index 7087ae96..00000000 Binary files a/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/albedo.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/alpha.png b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/alpha.png deleted file mode 100644 index 28b42a3e..00000000 Binary files a/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/alpha.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/color.png b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/color.png new file mode 100644 index 00000000..a4d86600 Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/color.png differ diff --git a/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/f0.png b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/f0.png new file mode 100644 index 00000000..a8c1d7fd Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/f0.png differ diff --git a/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/height.png b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/height.png index bec9bd2e..30e16229 100644 Binary files a/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/height.png and b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/height.png differ diff --git a/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/mat.yml b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/mat.yml index d74b42cc..71124ae6 100644 --- a/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/mat.yml +++ b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/mat.yml @@ -1,20 +1,15 @@ -albedo: {} +publish-item: true +wrap-x: true +wrap-y: false +blend-mode: cutout height: scale: 0.32 normal: - strength: 0.6 noise: 5 - filter: sobel3 + method: sobel3 + strength: 0.6 occlusion: - quality: 0.1 + step-distance: 0.2 z-bias: 0 z-scale: 5 - step-distance: 0.2 -smooth: {} -f0: - value: 0.02 -sss: - value: 0.08 -create-inventory: true -wrap-x: true -wrap-y: false +ctm: {} diff --git a/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/normal.png b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/normal.png new file mode 100644 index 00000000..e8e4d718 Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/normal.png differ diff --git a/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/occlusion.png b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/occlusion.png index 9c033ea5..62a006ed 100644 Binary files a/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/occlusion.png and b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/opacity.png b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/opacity.png new file mode 100644 index 00000000..b1aff0eb Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/opacity.png differ diff --git a/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/smooth.png b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/smooth.png index fa6e0cc4..ea1de5bd 100644 Binary files a/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/smooth.png and b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/smooth.png differ diff --git a/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/sss.png b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/sss.png new file mode 100644 index 00000000..8c2e8a29 Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_nylium_side_overlay/sss.png differ diff --git a/src/assets/minecraft/textures/block/dripstone_block/mat.yml b/src/assets/minecraft/textures/block/dripstone_block/mat.yml index 1fa0245a..e04fdd78 100644 --- a/src/assets/minecraft/textures/block/dripstone_block/mat.yml +++ b/src/assets/minecraft/textures/block/dripstone_block/mat.yml @@ -1,3 +1,4 @@ +publish-item: true height: scale: 0.4 normal: @@ -9,3 +10,4 @@ smooth: scale: 0.6 f0: value: 0.05 +ctm: {} diff --git a/src/assets/minecraft/textures/block/gilded_blackstone/albedo.png b/src/assets/minecraft/textures/block/gilded_blackstone/albedo.png deleted file mode 100644 index aedf8791..00000000 Binary files a/src/assets/minecraft/textures/block/gilded_blackstone/albedo.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/gilded_blackstone/f0.png b/src/assets/minecraft/textures/block/gilded_blackstone/f0.png deleted file mode 100644 index 3e5537b1..00000000 Binary files a/src/assets/minecraft/textures/block/gilded_blackstone/f0.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/gilded_blackstone/height.png b/src/assets/minecraft/textures/block/gilded_blackstone/height.png deleted file mode 100644 index f1cb696c..00000000 Binary files a/src/assets/minecraft/textures/block/gilded_blackstone/height.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/gilded_blackstone/metal.png b/src/assets/minecraft/textures/block/gilded_blackstone/metal.png deleted file mode 100644 index f56848b0..00000000 Binary files a/src/assets/minecraft/textures/block/gilded_blackstone/metal.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/gilded_blackstone/occlusion.png b/src/assets/minecraft/textures/block/gilded_blackstone/occlusion.png deleted file mode 100644 index 2d162d61..00000000 Binary files a/src/assets/minecraft/textures/block/gilded_blackstone/occlusion.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/gilded_blackstone/porosity.png b/src/assets/minecraft/textures/block/gilded_blackstone/porosity.png deleted file mode 100644 index 4e83de5e..00000000 Binary files a/src/assets/minecraft/textures/block/gilded_blackstone/porosity.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/gilded_blackstone/smooth.png b/src/assets/minecraft/textures/block/gilded_blackstone/smooth.png deleted file mode 100644 index a3377271..00000000 Binary files a/src/assets/minecraft/textures/block/gilded_blackstone/smooth.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/nether_quartz_ore/albedo.png b/src/assets/minecraft/textures/block/nether_quartz_ore.ignore/albedo.png similarity index 100% rename from src/assets/minecraft/textures/block/nether_quartz_ore/albedo.png rename to src/assets/minecraft/textures/block/nether_quartz_ore.ignore/albedo.png diff --git a/src/assets/minecraft/textures/block/nether_quartz_ore/f0.png b/src/assets/minecraft/textures/block/nether_quartz_ore.ignore/f0.png similarity index 100% rename from src/assets/minecraft/textures/block/nether_quartz_ore/f0.png rename to src/assets/minecraft/textures/block/nether_quartz_ore.ignore/f0.png diff --git a/src/assets/minecraft/textures/block/nether_quartz_ore/height.png b/src/assets/minecraft/textures/block/nether_quartz_ore.ignore/height.png similarity index 100% rename from src/assets/minecraft/textures/block/nether_quartz_ore/height.png rename to src/assets/minecraft/textures/block/nether_quartz_ore.ignore/height.png diff --git a/src/assets/minecraft/textures/block/gilded_blackstone/mat.yml b/src/assets/minecraft/textures/block/nether_quartz_ore.ignore/mat.yml similarity index 72% rename from src/assets/minecraft/textures/block/gilded_blackstone/mat.yml rename to src/assets/minecraft/textures/block/nether_quartz_ore.ignore/mat.yml index a4773924..20d46826 100644 --- a/src/assets/minecraft/textures/block/gilded_blackstone/mat.yml +++ b/src/assets/minecraft/textures/block/nether_quartz_ore.ignore/mat.yml @@ -1,11 +1,11 @@ alpha: value: 255 height: - scale: 0.5 + scale: 0.6 normal: strength: 0.8 - noise: 6 - filter: sobel3 + noise: 3 + filter: sobel-low occlusion: z-bias: 0 z-scale: 10 @@ -13,4 +13,6 @@ occlusion: smooth: {} f0: {} porosity: {} +sss: + scale: 0.4 create-inventory: true diff --git a/src/assets/minecraft/textures/block/nether_quartz_ore/occlusion.png b/src/assets/minecraft/textures/block/nether_quartz_ore.ignore/occlusion.png similarity index 100% rename from src/assets/minecraft/textures/block/nether_quartz_ore/occlusion.png rename to src/assets/minecraft/textures/block/nether_quartz_ore.ignore/occlusion.png diff --git a/src/assets/minecraft/textures/block/nether_quartz_ore/porosity.png b/src/assets/minecraft/textures/block/nether_quartz_ore.ignore/porosity.png similarity index 100% rename from src/assets/minecraft/textures/block/nether_quartz_ore/porosity.png rename to src/assets/minecraft/textures/block/nether_quartz_ore.ignore/porosity.png diff --git a/src/assets/minecraft/textures/block/nether_quartz_ore/smooth.png b/src/assets/minecraft/textures/block/nether_quartz_ore.ignore/smooth.png similarity index 100% rename from src/assets/minecraft/textures/block/nether_quartz_ore/smooth.png rename to src/assets/minecraft/textures/block/nether_quartz_ore.ignore/smooth.png diff --git a/src/assets/minecraft/textures/block/nether_quartz_ore/sss.png b/src/assets/minecraft/textures/block/nether_quartz_ore.ignore/sss.png similarity index 100% rename from src/assets/minecraft/textures/block/nether_quartz_ore/sss.png rename to src/assets/minecraft/textures/block/nether_quartz_ore.ignore/sss.png diff --git a/src/assets/minecraft/textures/block/quartz_block_bottom/mat.yml b/src/assets/minecraft/textures/block/quartz_block_bottom/mat.yml index e7bf30e1..4525d8bd 100644 --- a/src/assets/minecraft/textures/block/quartz_block_bottom/mat.yml +++ b/src/assets/minecraft/textures/block/quartz_block_bottom/mat.yml @@ -1,17 +1,20 @@ -create-inventory: true -alpha: +publish-item: true +opacity: value: 255 -albedo: +color: value-red: 236 value-green: 232 value-blue: 226 height: value: 0 +normal: + noise: 1 occlusion: value: 0 smooth: - value: 0.1 + value: 0.6 f0: - value: 0.053 + value: 0.035 porosity: value: 0.1 +ctm: {} diff --git a/src/assets/minecraft/textures/block/quartz_block_side/mat.yml b/src/assets/minecraft/textures/block/quartz_block_side/mat.yml index 5892f3f0..08f5394b 100644 --- a/src/assets/minecraft/textures/block/quartz_block_side/mat.yml +++ b/src/assets/minecraft/textures/block/quartz_block_side/mat.yml @@ -1,17 +1,20 @@ -create-inventory: true -alpha: +publish-item: true +opacity: value: 255 -albedo: +color: value-red: 236 value-green: 232 value-blue: 226 height: value: 0 +normal: + noise: 1 occlusion: value: 0 smooth: - value: 0.1 + value: 0.6 f0: - value: 0.05 + value: 0.035 porosity: value: 0 +ctm: {} diff --git a/src/assets/minecraft/textures/block/quartz_block_top/mat.yml b/src/assets/minecraft/textures/block/quartz_block_top/mat.yml index 39b7624f..4525d8bd 100644 --- a/src/assets/minecraft/textures/block/quartz_block_top/mat.yml +++ b/src/assets/minecraft/textures/block/quartz_block_top/mat.yml @@ -1,17 +1,20 @@ -create-inventory: true -alpha: +publish-item: true +opacity: value: 255 -albedo: +color: value-red: 236 value-green: 232 value-blue: 226 height: value: 0 +normal: + noise: 1 occlusion: value: 0 smooth: - value: 0.3 + value: 0.6 f0: - value: 0.053 + value: 0.035 porosity: value: 0.1 +ctm: {} diff --git a/src/assets/minecraft/textures/block/warped_nylium_side_overlay/albedo.png b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/albedo.png deleted file mode 100644 index 6fed6413..00000000 Binary files a/src/assets/minecraft/textures/block/warped_nylium_side_overlay/albedo.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/warped_nylium_side_overlay/alpha.png b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/alpha.png deleted file mode 100644 index 28b42a3e..00000000 Binary files a/src/assets/minecraft/textures/block/warped_nylium_side_overlay/alpha.png and /dev/null differ diff --git a/src/assets/minecraft/textures/block/warped_nylium_side_overlay/color.png b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/color.png new file mode 100644 index 00000000..e59ed658 Binary files /dev/null and b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/color.png differ diff --git a/src/assets/minecraft/textures/block/warped_nylium_side_overlay/f0.png b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/f0.png new file mode 100644 index 00000000..a8c1d7fd Binary files /dev/null and b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/f0.png differ diff --git a/src/assets/minecraft/textures/block/warped_nylium_side_overlay/height.png b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/height.png index bec9bd2e..30e16229 100644 Binary files a/src/assets/minecraft/textures/block/warped_nylium_side_overlay/height.png and b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/height.png differ diff --git a/src/assets/minecraft/textures/block/warped_nylium_side_overlay/mat.yml b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/mat.yml index d74b42cc..71124ae6 100644 --- a/src/assets/minecraft/textures/block/warped_nylium_side_overlay/mat.yml +++ b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/mat.yml @@ -1,20 +1,15 @@ -albedo: {} +publish-item: true +wrap-x: true +wrap-y: false +blend-mode: cutout height: scale: 0.32 normal: - strength: 0.6 noise: 5 - filter: sobel3 + method: sobel3 + strength: 0.6 occlusion: - quality: 0.1 + step-distance: 0.2 z-bias: 0 z-scale: 5 - step-distance: 0.2 -smooth: {} -f0: - value: 0.02 -sss: - value: 0.08 -create-inventory: true -wrap-x: true -wrap-y: false +ctm: {} diff --git a/src/assets/minecraft/textures/block/warped_nylium_side_overlay/normal.png b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/normal.png new file mode 100644 index 00000000..e8e4d718 Binary files /dev/null and b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/normal.png differ diff --git a/src/assets/minecraft/textures/block/warped_nylium_side_overlay/occlusion.png b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/occlusion.png index 9c033ea5..62a006ed 100644 Binary files a/src/assets/minecraft/textures/block/warped_nylium_side_overlay/occlusion.png and b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/occlusion.png differ diff --git a/src/assets/minecraft/textures/block/warped_nylium_side_overlay/opacity.png b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/opacity.png new file mode 100644 index 00000000..b1aff0eb Binary files /dev/null and b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/opacity.png differ diff --git a/src/assets/minecraft/textures/block/warped_nylium_side_overlay/smooth.png b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/smooth.png index fa6e0cc4..ea1de5bd 100644 Binary files a/src/assets/minecraft/textures/block/warped_nylium_side_overlay/smooth.png and b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/smooth.png differ diff --git a/src/assets/minecraft/textures/block/warped_nylium_side_overlay/sss.png b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/sss.png new file mode 100644 index 00000000..8c2e8a29 Binary files /dev/null and b/src/assets/minecraft/textures/block/warped_nylium_side_overlay/sss.png differ