Merge pull request #17 from kyrkis/main

kyrkis · web-flow · commit 7f034af4903a · 2025-06-15T20:58:09.000+02:00
1.21.6 update
diff --git a/assets/minecraft/items/birch_trapdoor.json b/assets/minecraft/items/birch_trapdoor.json
@@ -22,5 +22,6 @@
             "type": "minecraft:model",
             "model": "item/birch_trapdoor"
         }
-    }
+    },
+    "oversized_in_gui":true
 }
diff --git a/assets/minecraft/items/black_dye.json b/assets/minecraft/items/black_dye.json
@@ -113,5 +113,6 @@
             "type": "minecraft:model",
             "model": "item/black_dye"
         }
-    }
+    },
+    "oversized_in_gui":true
 }
diff --git a/assets/minecraft/items/brown_dye.json b/assets/minecraft/items/brown_dye.json
@@ -197,5 +197,6 @@
             "type": "minecraft:model",
             "model": "item/brown_dye"
         }
-    }
+    },
+    "oversized_in_gui":true
 }
diff --git a/assets/minecraft/items/carved_pumpkin.json b/assets/minecraft/items/carved_pumpkin.json
@@ -22,5 +22,6 @@
             "type": "minecraft:model",
             "model": "item/carved_pumpkin"
         }
-    }
+    },
+    "oversized_in_gui":true
 }
diff --git a/assets/minecraft/items/chainmail_boots.json b/assets/minecraft/items/chainmail_boots.json
@@ -29,5 +29,6 @@
             "type": "minecraft:model",
             "model": "item/chainmail_boots"
         }
-    }
+    },
+    "oversized_in_gui": true
 }
diff --git a/assets/minecraft/items/chainmail_chestplate.json b/assets/minecraft/items/chainmail_chestplate.json
@@ -22,5 +22,6 @@
             "type": "minecraft:model",
             "model": "item/chainmail_chestplate"
         }
-    }
+    },
+    "oversized_in_gui":true
 }
diff --git a/assets/minecraft/items/ender_eye.json b/assets/minecraft/items/ender_eye.json
@@ -205,5 +205,6 @@
             "model": "item/ender_eye"
         }
     },
-    "hand_animation_on_swap": false
+    "hand_animation_on_swap": false,
+    "oversized_in_gui": true
 }
diff --git a/assets/minecraft/items/flowering_azalea_leaves.json b/assets/minecraft/items/flowering_azalea_leaves.json
@@ -2,5 +2,6 @@
   "model": {
     "type": "minecraft:model",
     "model": "minecraft:item/flowering_azalea_leaves"
-  }
+  },
+    "oversized_in_gui": true
 }
diff --git a/assets/minecraft/items/gray_dye.json b/assets/minecraft/items/gray_dye.json
@@ -155,5 +155,6 @@
             "type": "minecraft:model",
             "model": "item/gray_dye"
         }
-    }
+    },
+    "oversized_in_gui": true
 }
diff --git a/assets/minecraft/items/green_dye.json b/assets/minecraft/items/green_dye.json
@@ -36,5 +36,6 @@
             "type": "minecraft:model",
             "model": "item/green_dye"
         }
-    }
+    },
+    "oversized_in_gui": true
 }
diff --git a/assets/minecraft/items/grindstone.json b/assets/minecraft/items/grindstone.json
@@ -2,5 +2,6 @@
   "model": {
     "type": "minecraft:model",
     "model": "minecraft:item/grindstone"
-  }
+  },
+    "oversized_in_gui": true
 }
diff --git a/assets/minecraft/items/leather_horse_armor.json b/assets/minecraft/items/leather_horse_armor.json
@@ -203,5 +203,6 @@
             "type": "minecraft:model",
             "model": "item/leather_horse_armor"
         }
-    }
+    },
+    "oversized_in_gui": true
 }
diff --git a/assets/minecraft/items/light_gray_dye.json b/assets/minecraft/items/light_gray_dye.json
@@ -764,5 +764,6 @@
             "type": "minecraft:model",
             "model": "item/light_gray_dye"
         }
-    }
+    },
+    "oversized_in_gui": true
 }
diff --git a/assets/minecraft/items/lime_dye.json b/assets/minecraft/items/lime_dye.json
@@ -148,5 +148,6 @@
             "type": "minecraft:model",
             "model": "item/lime_dye"
         }
-    }
+    },
+    "oversized_in_gui": true
 }
diff --git a/assets/minecraft/items/purple_dye.json b/assets/minecraft/items/purple_dye.json
@@ -99,5 +99,6 @@
             "type": "minecraft:model",
             "model": "item/purple_dye"
         }
-    }
+    },
+    "oversized_in_gui": true
 }
diff --git a/assets/minecraft/items/red_dye.json b/assets/minecraft/items/red_dye.json
@@ -344,5 +344,6 @@
             "type": "minecraft:model",
             "model": "item/red_dye"
         }
-    }
+    },
+    "oversized_in_gui": true
 }
diff --git a/assets/minecraft/shaders/include/fog.glsl b/assets/minecraft/shaders/include/fog.glsl
@@ -1,19 +1,34 @@
 #version 150
 
-vec4 linear_fog(vec4 inColor, float vertexDistance, float fogStart, float fogEnd, vec4 fogColor) {
-  return inColor;
+layout(std140) uniform Fog {
+    vec4 FogColor;
+    float FogEnvironmentalStart;
+    float FogEnvironmentalEnd;
+    float FogRenderDistanceStart;
+    float FogRenderDistanceEnd;
+    float FogSkyEnd;
+    float FogCloudsEnd;
+};
+
+float linear_fog_value(float vertexDistance, float fogStart, float fogEnd) {
+    return 0.0;
+}
+
+float total_fog_value(float sphericalVertexDistance, float cylindricalVertexDistance, float environmentalStart, float environmantalEnd, float renderDistanceStart, float renderDistanceEnd) {
+    return max(linear_fog_value(sphericalVertexDistance, environmentalStart, environmantalEnd), linear_fog_value(cylindricalVertexDistance, renderDistanceStart, renderDistanceEnd));
 }
 
-float linear_fog_fade(float vertexDistance, float fogStart, float fogEnd) {
-    return 1.0;
+vec4 apply_fog(vec4 inColor, float sphericalVertexDistance, float cylindricalVertexDistance, float environmentalStart, float environmantalEnd, float renderDistanceStart, float renderDistanceEnd, vec4 fogColor) {
+    float fogValue = total_fog_value(sphericalVertexDistance, cylindricalVertexDistance, environmentalStart, environmantalEnd, renderDistanceStart, renderDistanceEnd);
+    return vec4(mix(inColor.rgb, fogColor.rgb, fogValue * fogColor.a), inColor.a);
 }
 
-float fog_distance(vec3 pos, int shape) {
-    if (shape == 0) {
-        return length(pos);
-    } else {
-        float distXZ = length(pos.xz);
-        float distY = abs(pos.y);
-        return max(distXZ, distY);
-    }
-}
+float fog_spherical_distance(vec3 pos) {
+    return 0;
+}
+
+float fog_cylindrical_distance(vec3 pos) {
+    float distXZ = length(pos.xz);
+    float distY = abs(pos.y);
+    return max(distXZ, distY);
+}
diff --git a/assets/minecraft/textures/gui/sprites/container/misc/advancement.json b/assets/minecraft/textures/gui/sprites/container/misc/advancement.json
@@ -0,0 +1,21 @@
+{
+	"parent": "item/custom/lit",
+	"textures": {
+		"0": "puzzle_boxes:item/misc/advancement",
+		"particle": "puzzle_boxes:item/misc/advancement"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 8],
+			"to": [16, 16, 8],
+			"faces": {
+				"south": {"uv": [0, 0, 16, 16], "texture": "#0"}
+			}
+		}
+	],
+	"display": {
+		"gui": {
+			"scale": [1.75, 1.75, 1.75]
+		}
+	}
+}
diff --git a/assets/minecraft/textures/gui/sprites/container/misc/black_wall.json b/assets/minecraft/textures/gui/sprites/container/misc/black_wall.json
@@ -0,0 +1,15 @@
+{
+	"textures": {
+		"0": "puzzle_boxes:item/misc/black_wall",
+		"particle": "puzzle_boxes:item/misc/black_wall"
+	},
+	"elements": [
+		{
+			"from": [-16, -16, 8],
+			"to": [32, 32, 8],
+			"faces": {
+				"north": {"uv": [0, 0, 16, 16], "texture": "#0"}
+			}
+		}
+	]
+}
diff --git a/assets/minecraft/textures/gui/sprites/container/misc/hint_lever_middle.json b/assets/minecraft/textures/gui/sprites/container/misc/hint_lever_middle.json
@@ -0,0 +1,21 @@
+{
+	"parent": "item/custom/lit",
+	"textures": {
+		"0": "puzzle_boxes:item/misc/hint_lever_middle",
+		"particle": "puzzle_boxes:item/misc/hint_lever_middle"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 8],
+			"to": [16.0001, 16.0001, 8],
+			"faces": {
+				"south": {"uv": [0, 0, 16, 16], "texture": "#0"}
+			}
+		}
+	],
+	"display": {
+		"gui": {
+			"translation": [-4, 0, 0]
+		}
+	}
+}
diff --git a/assets/minecraft/textures/gui/sprites/container/misc/hint_lever_off.json b/assets/minecraft/textures/gui/sprites/container/misc/hint_lever_off.json
@@ -0,0 +1,21 @@
+{
+	"parent": "item/custom/lit",
+	"textures": {
+		"0": "puzzle_boxes:item/misc/hint_lever_off",
+		"particle": "puzzle_boxes:item/misc/hint_lever_off"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 8],
+			"to": [16.0001, 16.0001, 8],
+			"faces": {
+				"south": {"uv": [0, 0, 16, 16], "texture": "#0"}
+			}
+		}
+	],
+	"display": {
+		"gui": {
+			"translation": [-4, 5, 0]
+		}
+	}
+}
diff --git a/assets/minecraft/textures/gui/sprites/container/misc/hint_lever_on.json b/assets/minecraft/textures/gui/sprites/container/misc/hint_lever_on.json
@@ -0,0 +1,21 @@
+{
+	"parent": "item/custom/lit",
+	"textures": {
+		"0": "puzzle_boxes:item/misc/hint_lever_on",
+		"particle": "puzzle_boxes:item/misc/hint_lever_on"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 8],
+			"to": [16.0001, 16.0001, 8],
+			"faces": {
+				"south": {"uv": [0, 0, 16, 16], "texture": "#0"}
+			}
+		}
+	],
+	"display": {
+		"gui": {
+			"translation": [-4, 0, 0]
+		}
+	}
+}
diff --git a/assets/minecraft/textures/gui/sprites/container/misc/player_ghost.json b/assets/minecraft/textures/gui/sprites/container/misc/player_ghost.json
@@ -0,0 +1,82 @@
+{
+	"textures": {
+		"0": "puzzle_boxes:item/misc/player_ghost",
+		"particle": "puzzle_boxes:item/misc/player_ghost"
+	},
+	"elements": [
+		{
+			"from": [4, 0, 6],
+			"to": [8, 12, 10],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 7.23463]},
+			"faces": {
+				"north": {"uv": [0, 0, 4, 12], "texture": "#0"},
+				"east": {"uv": [0, 0, 4, 12], "texture": "#0"},
+				"south": {"uv": [0, 0, 4, 12], "texture": "#0"},
+				"west": {"uv": [0, 0, 4, 12], "texture": "#0"},
+				"down": {"uv": [0, 0, 4, 4], "texture": "#0"}
+			}
+		},
+		{
+			"from": [12, 11.91229, 4.02832],
+			"to": [16, 23.91229, 8.02832],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 17, 7.23463]},
+			"faces": {
+				"north": {"uv": [0, 0, 4, 12], "texture": "#0"},
+				"east": {"uv": [0, 0, 4, 12], "texture": "#0"},
+				"south": {"uv": [0, 0, 4, 12], "texture": "#0"},
+				"west": {"uv": [0, 0, 4, 12], "texture": "#0"},
+				"up": {"uv": [0, 0, 4, 4], "texture": "#0"},
+				"down": {"uv": [0, 0, 4, 4], "texture": "#0"}
+			}
+		},
+		{
+			"from": [0, 11.91229, 4.02832],
+			"to": [4, 23.91229, 8.02832],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [8, 17, 7.23463]},
+			"faces": {
+				"north": {"uv": [0, 0, 4, 12], "texture": "#0"},
+				"east": {"uv": [0, 0, 4, 12], "texture": "#0"},
+				"south": {"uv": [0, 0, 4, 12], "texture": "#0"},
+				"west": {"uv": [0, 0, 4, 12], "texture": "#0"},
+				"up": {"uv": [0, 0, 4, 4], "texture": "#0"},
+				"down": {"uv": [0, 0, 4, 4], "texture": "#0"}
+			}
+		},
+		{
+			"from": [8, 0, 6],
+			"to": [12, 12, 10],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 7.23463]},
+			"faces": {
+				"north": {"uv": [0, 0, 4, 12], "texture": "#0"},
+				"east": {"uv": [0, 0, 4, 12], "texture": "#0"},
+				"south": {"uv": [0, 0, 4, 12], "texture": "#0"},
+				"west": {"uv": [0, 0, 4, 12], "texture": "#0"},
+				"down": {"uv": [0, 0, 4, 4], "texture": "#0"}
+			}
+		},
+		{
+			"from": [4, 12, 6],
+			"to": [12, 24, 10],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 7.23463]},
+			"faces": {
+				"north": {"uv": [0, 0, 8, 12], "texture": "#0"},
+				"east": {"uv": [0, 0, 4, 12], "texture": "#0"},
+				"south": {"uv": [0, 0, 8, 12], "texture": "#0"},
+				"west": {"uv": [0, 0, 4, 12], "texture": "#0"}
+			}
+		},
+		{
+			"from": [4, 24, 4],
+			"to": [12, 32, 12],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 7.23463]},
+			"faces": {
+				"north": {"uv": [0, 0, 8, 8], "texture": "#0"},
+				"east": {"uv": [0, 0, 8, 8], "texture": "#0"},
+				"south": {"uv": [0, 0, 8, 8], "texture": "#0"},
+				"west": {"uv": [0, 0, 8, 8], "texture": "#0"},
+				"up": {"uv": [0, 0, 8, 8], "texture": "#0"},
+				"down": {"uv": [0, 0, 8, 8], "texture": "#0"}
+			}
+		}
+	]
+}
diff --git a/assets/minecraft/textures/gui/sprites/container/misc/question_mark.json b/assets/minecraft/textures/gui/sprites/container/misc/question_mark.json
@@ -0,0 +1,11 @@
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "puzzle_boxes:item/misc/question_mark"
+	},
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 4, 0]
+		}
+	}
+}
diff --git a/assets/minecraft/textures/gui/sprites/container/misc/stats_tab.json b/assets/minecraft/textures/gui/sprites/container/misc/stats_tab.json
diff --git a/assets/minecraft/textures/gui/sprites/container/misc/titlecard.json b/assets/minecraft/textures/gui/sprites/container/misc/titlecard.json
diff --git a/assets/puzzle_boxes/models/item/misc/hint_lever_middle.json b/assets/puzzle_boxes/models/item/misc/hint_lever_middle.json
diff --git a/assets/puzzle_boxes/models/item/misc/hint_lever_off.json b/assets/puzzle_boxes/models/item/misc/hint_lever_off.json
diff --git a/assets/puzzle_boxes/models/item/misc/hint_lever_on.json b/assets/puzzle_boxes/models/item/misc/hint_lever_on.json
diff --git a/assets/puzzle_boxes/models/item/misc/stats_tab.json b/assets/puzzle_boxes/models/item/misc/stats_tab.json
diff --git a/pack.mcmeta b/pack.mcmeta

Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,6 @@`
`22`	`22`	`"type": "minecraft:model",`
`23`	`23`	`"model": "item/birch_trapdoor"`
`24`	`24`	`}`
`25`		`- }`
	`25`	`+ },`
	`26`	`+ "oversized_in_gui":true`
`26`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,5 +113,6 @@`
`113`	`113`	`"type": "minecraft:model",`
`114`	`114`	`"model": "item/black_dye"`
`115`	`115`	`}`
`116`		`- }`
	`116`	`+ },`
	`117`	`+ "oversized_in_gui":true`
`117`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -197,5 +197,6 @@`
`197`	`197`	`"type": "minecraft:model",`
`198`	`198`	`"model": "item/brown_dye"`
`199`	`199`	`}`
`200`		`- }`
	`200`	`+ },`
	`201`	`+ "oversized_in_gui":true`
`201`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,6 @@`
`29`	`29`	`"type": "minecraft:model",`
`30`	`30`	`"model": "item/chainmail_boots"`
`31`	`31`	`}`
`32`		`- }`
	`32`	`+ },`
	`33`	`+ "oversized_in_gui": true`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -205,5 +205,6 @@`
`205`	`205`	`"model": "item/ender_eye"`
`206`	`206`	`}`
`207`	`207`	`},`
`208`		`- "hand_animation_on_swap": false`
	`208`	`+ "hand_animation_on_swap": false,`
	`209`	`+ "oversized_in_gui": true`
`209`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,6 @@`
`2`	`2`	`"model": {`
`3`	`3`	`"type": "minecraft:model",`
`4`	`4`	`"model": "minecraft:item/flowering_azalea_leaves"`
`5`		`- }`
	`5`	`+ },`
	`6`	`+ "oversized_in_gui": true`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,5 +155,6 @@`
`155`	`155`	`"type": "minecraft:model",`
`156`	`156`	`"model": "item/gray_dye"`
`157`	`157`	`}`
`158`		`- }`
	`158`	`+ },`
	`159`	`+ "oversized_in_gui": true`
`159`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,5 +36,6 @@`
`36`	`36`	`"type": "minecraft:model",`
`37`	`37`	`"model": "item/green_dye"`
`38`	`38`	`}`
`39`		`- }`
	`39`	`+ },`
	`40`	`+ "oversized_in_gui": true`
`40`	`41`	`}`