revert redstone lamp overlay; fix chain, iron_bars, cut copper; add q…

…uartz bricks, purpur block, deepslate tiles; remove minecart model

src/Oversized-BlueMap.pack.yml

@@ -0,0 +1,34 @@
+edition: java
+format: 7
+description: CTM Expirement Pack
+tags: BlueMap
+encoding:
+  format: color
+  sampler: nearest
+  enable-palette: true
+  opacity: {}
+  color-red: {}
+  color-green: {}
+  color-blue: {}
+  height:
+    sampler: average
+  occlusion: {}
+  normal-x:
+    sampler: average
+  normal-y:
+    sampler: average
+  normal-z:
+    sampler: average
+  specular: {}
+  smooth: {}
+  rough: {}
+  metal: {}
+  f0: {}
+  porosity: {}
+  sss: {}
+  emissive: {}
+block-texture-size: 64
+item-texture-size: 64
+texture-scale: 0.125
+auto-generate-occlusion: false
+bake-occlusion-to-color: true

src/assets/minecraft/models/block/quartz_pillar.json

@@ -0,0 +1,48 @@
+{
+	"parent": "block/block",
+	"ambientOcclusion": true,
+	"textures": {
+		"sides": "block/quartz_pillar",
+		"particle": "block/quartz_pillar"
+	},
+	"elements": [
+		{
+			"name": "North-South",
+			"from": [4.685, 0, 0],
+			"to": [11.315, 16, 16],
+			"faces": {
+				"north": {"uv": [8, 0, 16, 16], "texture": "#sides"},
+				"south": {"uv": [8, 0, 16, 16], "texture": "#sides"}
+			}
+		},
+		{
+			"name": "West-East",
+			"from": [0, 0, 4.685],
+			"to": [16, 16, 11.315],
+			"faces": {
+				"east": {"uv": [8, 0, 16, 16], "texture": "#sides"},
+				"west": {"uv": [8, 0, 16, 16], "texture": "#sides"}
+			}
+		},
+		{
+			"name": "NE-SW",
+			"from": [0, 0, 4.685],
+			"to": [16, 16, 11.315],
+			"rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]},
+			"faces": {
+				"east": {"uv": [0, 0, 8, 16], "texture": "#sides"},
+				"west": {"uv": [0, 0, 8, 16], "texture": "#sides"}
+			}
+		},
+		{
+			"name": "NW-SE",
+			"from": [4.685, 0, 0],
+			"to": [11.315, 16, 16],
+			"rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]},
+			"faces": {
+				"north": {"uv": [0, 0, 8, 16], "texture": "#sides"},
+				"south": {"uv": [0, 0, 8, 16], "texture": "#sides"}
+			}
+		}
+	]
+}

src/assets/minecraft/models/item/redstone_lamp.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "block/redstone_lamp_on"
+  }
+}

src/assets/minecraft/optifine/colormap/blocks/glazed_terracotta.ignore/black_glazed_terracotta.properties

@@ -0,0 +1,2 @@
+format=fixed
+color=251710

src/assets/minecraft/optifine/colormap/blocks/glazed_terracotta.ignore/blue_glazed_terracotta.properties

@@ -0,0 +1,2 @@
+format=fixed
+color=4a3c5b

src/assets/minecraft/optifine/colormap/blocks/glazed_terracotta.ignore/brown_glazed_terracotta.properties

@@ -0,0 +1,2 @@
+format=fixed
+color=4d3324

src/assets/minecraft/optifine/colormap/blocks/glazed_terracotta.ignore/cyan_glazed_terracotta.properties

@@ -0,0 +1,2 @@
+format=fixed
+color=575b5b

src/assets/minecraft/optifine/colormap/blocks/glazed_terracotta.ignore/gray_glazed_terracotta.properties

@@ -0,0 +1,2 @@
+format=fixed
+color=3a2a24

src/assets/minecraft/optifine/colormap/blocks/glazed_terracotta.ignore/green_glazed_terracotta.properties

@@ -0,0 +1,2 @@
+format=fixed
+color=4c532a

src/assets/minecraft/optifine/colormap/blocks/glazed_terracotta.ignore/light_blue_glazed_terracotta.properties

@@ -0,0 +1,2 @@
+format=fixed
+color=716d8a

src/assets/minecraft/optifine/colormap/blocks/glazed_terracotta.ignore/light_gray_glazed_terracotta.properties

@@ -0,0 +1,2 @@
+format=fixed
+color=876b62

src/assets/minecraft/optifine/colormap/blocks/glazed_terracotta.ignore/lime_glazed_terracotta.properties

@@ -0,0 +1,2 @@
+format=fixed
+color=687635

src/assets/minecraft/optifine/colormap/blocks/glazed_terracotta.ignore/magenta_glazed_terracotta.properties

@@ -0,0 +1,2 @@
+format=fixed
+color=96586d

src/assets/minecraft/optifine/colormap/blocks/glazed_terracotta.ignore/orange_glazed_terracotta.properties

@@ -0,0 +1,2 @@
+format=fixed
+color=a15426

src/assets/minecraft/optifine/colormap/blocks/glazed_terracotta.ignore/pink_glazed_terracotta.properties

@@ -0,0 +1,2 @@
+format=fixed
+color=a2304f

src/assets/minecraft/optifine/colormap/blocks/glazed_terracotta.ignore/purple_glazed_terracotta.properties

@@ -0,0 +1,2 @@
+format=fixed
+color=764656

src/assets/minecraft/optifine/colormap/blocks/glazed_terracotta.ignore/red_glazed_terracotta.properties

@@ -0,0 +1,2 @@
+format=fixed
+color=8f3d2f

src/assets/minecraft/optifine/colormap/blocks/glazed_terracotta.ignore/white_glazed_terracotta.properties

@@ -0,0 +1,2 @@
+format=fixed
+color=d1b2a1

src/assets/minecraft/optifine/colormap/blocks/glazed_terracotta.ignore/yellow_glazed_terracotta.properties

@@ -0,0 +1,2 @@
+format=fixed
+color=ba8523

src/assets/minecraft/optifine/ctm/oversized/cut_copper/mat.yml

@@ -1,7 +1,7 @@
 color:
-  scale-red: 0.8
-  scale-green: 0.8
-  scale-blue: 0.8
+  value-red: 207
+  value-green: 134
+  value-blue: 108
 height:
   shift: -0.2
   scale: 0.2

src/assets/minecraft/optifine/ctm/oversized/deepslate_tiles/mat.yml

@@ -0,0 +1,12 @@
+height:
+  shift: -0.5
+  scale: 0.8
+  auto-level: false
+  edge-fade-x: 1
+  edge-fade-y: 1
+ctm:
+  method: of-repeat
+  width: 4
+  height: 4
+  match-tiles: deepslate_tiles
+  placeholder: true

src/assets/minecraft/optifine/ctm/oversized/deepslate_tiles/source.txt

@@ -0,0 +1 @@
+https://www.texturecan.com/details/286/

src/assets/minecraft/optifine/ctm/oversized/glazed_terracotta.ignore/mat.yml

@@ -0,0 +1,16 @@
+color:
+  preview-tint: c4864f
+height:
+  shift: -0.4
+  scale: 0.18
+  edge-fade-x: 0.4
+  edge-fade-y: 0.4
+smooth:
+  scale: 0.6
+f0:
+  value: 0.053
+ctm:
+  method: of-repeat
+  width: 2
+  height: 2
+  match-tiles: white_glazed_terracotta orange_glazed_terracotta magenta_glazed_terracotta light_blue_glazed_terracotta yellow_glazed_terracotta lime_glazed_terracotta pink_glazed_terracotta gray_glazed_terracotta light_gray_glazed_terracotta cyan_glazed_terracotta purple_glazed_terracotta blue_glazed_terracotta brown_glazed_terracotta green_glazed_terracotta red_glazed_terracotta black_glazed_terracotta

src/assets/minecraft/optifine/ctm/oversized/glazed_terracotta.ignore/source.txt

@@ -0,0 +1 @@
+https://ambientcg.com/view?id=Tiles027

src/assets/minecraft/optifine/ctm/oversized/iron_bars/mat.yml

@@ -0,0 +1,19 @@
+height:
+  shift: -0.48
+  scale: 0.15
+  auto-level: false
+  edge-fade-x: 0.7
+  edge-fade-y: 0.7
+normal:
+  noise: 3
+occlusion:
+  step-distance: 0.05
+  z-bias: 0.2
+f0:
+  value: 0.03
+ctm:
+  method: of-repeat
+  width: 2
+  height: 2
+  match-tiles: iron_bars
+  placeholder: true

src/assets/minecraft/optifine/ctm/oversized/iron_bars/source.txt

@@ -0,0 +1 @@
+https://ambientcg.com/view?id=MetalWalkway007

src/assets/minecraft/optifine/ctm/oversized/iron_trapdoor/X/source.txt

@@ -0,0 +1 @@
+https://3dtextures.me/2019/05/15/metal-grill-003/

src/assets/minecraft/optifine/ctm/oversized/iron_trapdoor/mat.yml

@@ -1,11 +1,15 @@
 height:
-  scale: 0.2
+  scale: 0.1
   edge-fade-x: 0.1
   edge-fade-y: 0.1
+normal:
+  noise: 2
+  method: sobel5
+  strength: 2
 occlusion:
   z-scale: 10
-smooth:
-  scale: 0.85
+metal:
+  value: 230
 ctm:
   method: of-repeat
   width: 2

src/assets/minecraft/optifine/ctm/oversized/purpur_block/mat.yml

@@ -0,0 +1,13 @@
+height:
+  scale: 0.8
+  auto-level: true
+smooth:
+  scale: 1.1
+f0:
+  value: 0.087
+ctm:
+  method: of-repeat
+  width: 2
+  height: 2
+  match-tiles: purpur_block
+  placeholder: true

src/assets/minecraft/optifine/ctm/oversized/purpur_block/source.txt

@@ -0,0 +1 @@
+https://www.texturecan.com/details/293/

src/assets/minecraft/optifine/ctm/oversized/quartz_block/mat.yml

@@ -5,9 +5,11 @@ rough:
   scale: 2
 f0:
   value: 0.035
+sss:
+  value: 0.06
 ctm:
-  type: of-repeat
-  count-x: 2
-  count-y: 2
+  method: of-repeat
+  width: 2
+  height: 2
   match-tiles: quartz_block_top quartz_block_bottom quartz_block_side
   placeholder: true

src/assets/minecraft/optifine/ctm/oversized/quartz_bricks/mat.yml

@@ -0,0 +1,18 @@
+height:
+  value: 0
+  auto-level: false
+normal:
+  noise: 0.8
+smooth:
+  shift: -0.2
+  scale: 1.8
+f0:
+  value: 0.05
+sss:
+  value: 0.06
+ctm:
+  method: of-repeat
+  width: 2
+  height: 2
+  match-tiles: quartz_bricks
+  placeholder: true

src/assets/minecraft/optifine/ctm/oversized/wool/mat.yml

@@ -8,7 +8,7 @@ normal:
 occlusion:
   scale: 0.2
 smooth:
-  scale: 0.1
+  scale: 2.5
 ctm:
   method: of-repeat
   width: 2

src/assets/minecraft/optifine/ctm/oversized/yellow_glazed_terracotta/mat.yml

@@ -0,0 +1,15 @@
+height:
+  shift: -0.3
+  scale: 0.1
+  edge-fade-x: 1
+  edge-fade-y: 1
+smooth:
+  scale: 0.9
+f0:
+  value: 0.053
+ctm:
+  method: of-repeat
+  width: 2
+  height: 2
+  match-tiles: yellow_glazed_terracotta
+  placeholder: true

src/assets/minecraft/optifine/ctm/oversized/yellow_glazed_terracotta/source.txt

@@ -0,0 +1 @@
+https://ambientcg.com/view?id=Tiles027

src/assets/minecraft/textures/block/chain/mat.yml

@@ -1,18 +1,18 @@
 wrap-x: false
 wrap-y: true
-alpha:
-  input:
-    texture: alpha
-    color: red
-    sampler: nearest
 height:
-  value: 0
+  scale: 0
 normal:
-  strength: 2
+  noise: 8
+  method: sobel3
+  strength: 3
 occlusion:
-  z-bias: 0.8
-  z-scale: 5
+  step-distance: 0.04
+  z-bias: 0.2
+  z-scale: 8
 smooth:
-  scale: 0.5
-porosity:
-  value: 0
+  shift: -0.4
+  scale: 0.9
+metal:
+  value: 230
+ctm: {}

src/assets/minecraft/textures/block/quartz_pillar/mat.yml

@@ -1,5 +1,3 @@
-opacity:
-  value: 255
 height:
   shift: -0.1
   scale: 0.24
@@ -11,3 +9,11 @@ f0:
 porosity:
   value: 0.3
 ctm: {}
+filters:
+- name: left
+  width: 0.5
+  normal-curve-x: 90
+- name: right
+  left: 0.5
+  width: 0.5
+  normal-curve-x: 90

src/assets/minecraft/textures/block/redstone_lamp/.ignore/mat.yml

@@ -0,0 +1,14 @@
+color:
+  value-red: 250
+  value-green: 250
+  value-blue: 250
+height:
+  scale: 1.2
+  auto-level: false
+normal:
+  method: sobel9
+smooth:
+  value: 0.65
+metal:
+  value: 230
+ctm: {}

src/assets/minecraft/textures/block/redstone_lamp/mat.yml

@@ -1,11 +1,5 @@
-color:
-  value-red: 250
-  value-green: 250
-  value-blue: 250
-normal:
-  method: sobel9
-smooth:
-  value: 0.65
-metal:
-  value: 230
+height:
+  scale: 0.1
+f0:
+  value: 0.04
 ctm: {}

src/assets/minecraft/textures/block/redstone_lamp/source.txt

@@ -0,0 +1 @@
+https://ambientcg.com/view?id=OfficeCeiling004