Merge pull request #7 from VittoriaAlata/feat

v1.13.0
VittoriaAlata · Jan 25, 2024 · 880b88f · 880b88f
2 parents 7105199 + a6e0131
commit 880b88f
Show file tree

Hide file tree

Showing 1,173 changed files with 306 additions and 34 deletions.
diff --git a/Samotracia.toml b/Samotracia.toml
@@ -0,0 +1,117 @@
+# Lines that start with # are comments, and PackSquash ignores them.
+# You can also start a comment in the middle of a line with #, that
+# spans until the end of the line
+
+# Global options
+pack_directory = 'C:\Users\pierl\Desktop\Samotracia'
+output_file_path = 'C:\Users\pierl\Desktop\Samotracia.zip'
+recompress_compressed_files = true
+zip_compression_iterations = 5
+automatic_minecraft_quirks_detection = true
+# The value of this option is ignored due to automatic quirk detection
+# being enabled, but this usually does not matter
+work_around_minecraft_quirks = ['grayscale_images_gamma_miscorrection', 'restrictive_banner_layer_texture_format_check', 'bad_entity_eye_layer_texture_transparency_blending', 'java8_zip_parsing', 'ogg_obfuscation_incompatibility']
+automatic_asset_types_mask_detection = true
+allow_mods = ['OptiFine', 'Minecraft Transit Railway 3']
+skip_pack_icon = false
+validate_pack_metadata_file = true
+ignore_system_and_hidden_files = true
+zip_spec_conformance_level = 'high'
+# These two are actually ignored due to the ZIP spec conformance level
+size_increasing_zip_obfuscation = true
+percentage_of_zip_structures_tuned_for_obfuscation_discretion = 100
+never_store_squash_times = true
+# System dependent values. PackSquash automatically uses appropriate
+# defaults for your system, so usually you should not need to set
+# these
+threads = 4
+spooling_buffers_size = 128 # MiB
+
+# Per-file options below
+
+# A special silence file that for some reason must be kept exactly as-is
+# (usually not the case)
+['assets/craftmine/sounds/special_silence.ogg']
+empty_audio_optimization = false
+
+# Audio several hours long that would take a lot of time to transcode,
+# optimize and validate
+['assets/craftmine/sounds/forest_soundscape.ogg']
+transcode_ogg = false
+two_pass_vorbis_optimization_and_validation = false
+
+# Other Ogg files do not get transcoded
+['**/*?.ogg']
+transcode_ogg = false
+
+# Lossless music files get pitch shifted, compressed with good quality,
+# and obfuscated if allowed by the target Minecraft version
+['**/*?.{flac,wav}']
+ogg_obfuscation = true
+channels = 2
+sampling_frequency = 44100
+target_pitch = 1.5
+bitrate_control_mode = 'VBR'
+target_bitrate_control_metric = 128
+
+# JSON files with comments get prettified and nothing is removed from them
+['**/*?.jsonc']
+minify_json = true
+delete_bloat_keys = false
+
+# Do not allow comments in any JSON file.
+# Comments may be an useful JSON extension for documentation purposes, so
+# please avoid blindly copying and pasting this unless you really want to
+# limit their usage to .jsonc, .jemc, .jpmc, .mcmetac and .bbmodelc files!
+['**/*?.{json,jem,jpm,mcmeta,bbmodel}']
+always_allow_json_comments = false
+
+# Quantize big natural-looking image, doing the highest quality dither
+['assets/craftmine/textures/landscape.png']
+color_quantization_target = 'eight_bit_depth'
+color_quantization_dithering_level = 1
+
+# Compress other textures losslessly no matter what. Keep them small,
+# but don't downsize them
+['**/*?.png']
+image_data_compression_iterations = 15
+color_quantization_target = 'none'
+maximum_width_and_height = 8192
+skip_alpha_optimizations = true
+downsize_if_single_color = false
+
+# Don't minify shaders
+['**/*?.{fsh,vsh,glsl}']
+shader_source_transformation_strategy = 'keep_as_is'
+# It usually is a bad idea to explicitly configure this option. Read
+# its documentation for more details
+#is_top_level_shader = true
+
+# Don't touch Minecraft 1.12.2 or older language files
+['**/*?.lang']
+minify_legacy_language = false
+strip_legacy_language_bom = false
+
+# Don't minify properties files
+['**/*?.properties']
+minify_properties = true
+
+# Don't minify an example command function.
+# Note that command functions are only accepted in data packs, and
+# data packs do not contain other file types shown throughout this
+# example file!
+['data/craftmine/functions/main.mcfunction']
+minify_command_function = false
+
+# Include copyright and authorship information files in any directory.
+# More information:
+# https://www.gnu.org/prep/maintain/html_node/License-Notices.html
+# https://www.gnu.org/prep/maintain/html_node/Recording-Contributors.html
+['**/{COPYING,AUTHORS}']
+force_include = true
+
+['*.png']
+force_include = true
+
+['*.zip']
+force_include = true
diff --git a/^VHS Add-on.zip b/^VHS Add-on.zip
diff --git a/assets/minecraft/lang/en_gb.json b/assets/minecraft/lang/en_gb.json
@@ -1,10 +1,22 @@
 {
   "menu.modded": " (Modded, §7Samotracia§r)",
-  "debug.prefix": "§r§3|Debug§r §7Samotracia v1.12.0§r >>",
-  "title.multiplayer.other": "Multiplayer 3rd-party Server, Samotracia v1.12.0",
-  "title.credits": "§7Samotracia v1.12.0, §rCopyright Mojang AB. Do not distribute!",
-  "title.multiplayer.lan": "Multiplayer (LAN), Samotracia v1.12.0",
-  "title.multiplayer.realms": "Multiplayer (Realms), Samotracia v1.12.0",
-  "title.singleplayer": "Singleplayer, Samotracia v1.12.0",
-  "menu.game": "Samotracia v1.12.0"
+  "debug.prefix": "§r§3|Debug§r §7Samotracia v1.13.0§r >>",
+  "title.multiplayer.other": "Multiplayer 3rd-party Server, Samotracia v1.13.0",
+  "title.credits": "§r© Mojang AB. © Vittoria 2023-2024",
+  "title.multiplayer.lan": "Multiplayer (LAN), Samotracia v1.13.0",
+  "title.multiplayer.realms": "Multiplayer (Realms), Samotracia v1.13.0",
+  "title.singleplayer": "Singleplayer, Samotracia v1.13.0",
+  "menu.game": "§5PAUSE",
+  "menu.multiplayer": "VERSUS BATTLE",
+  "menu.singleplayer": "GAME START",
+  "menu.online": "REALMS MODE",
+  "menu.options": "OPTION MODE",
+  "menu.quit": "QUIT TO DOS",
+  "menu.returnToGame": "BACK TO GAME",
+  "menu.returnToMenu": "SAVE",
+  "menu.sendFeedback": "FEEDBACK",
+  "menu.shareToLan": "LAN MODE",
+  "gui.stats": "STATISTICS",
+  "gui.advancements": "HIGHS",
+  "menu.reportBugs": "BUGS"
 }
diff --git a/assets/minecraft/lang/en_us.json b/assets/minecraft/lang/en_us.json
@@ -1,10 +1,22 @@
 {
   "menu.modded": " (Modded, §7Samotracia§r)",
-  "debug.prefix": "§r§3|Debug§r §7Samotracia v1.12.0§r >>",
-  "title.multiplayer.other": "Multiplayer 3rd-party Server, Samotracia v1.12.0",
-  "title.credits": "§7Samotracia v1.12.0, §rCopyright Mojang AB. Do not distribute!",
-  "title.multiplayer.lan": "Multiplayer (LAN), Samotracia v1.12.0",
-  "title.multiplayer.realms": "Multiplayer (Realms), Samotracia v1.12.0",
-  "title.singleplayer": "Singleplayer, Samotracia v1.12.0",
-  "menu.game": "Samotracia v1.12.0"
+  "debug.prefix": "§r§3|Debug§r §7Samotracia v1.13.0§r >>",
+  "title.multiplayer.other": "Multiplayer 3rd-party Server, Samotracia v1.13.0",
+  "title.credits": "§r© Mojang AB. © Vittoria 2023-2024",
+  "title.multiplayer.lan": "Multiplayer (LAN), Samotracia v1.13.0",
+  "title.multiplayer.realms": "Multiplayer (Realms), Samotracia v1.13.0",
+  "title.singleplayer": "Singleplayer, Samotracia v1.13.0",
+  "menu.game": "§5PAUSE",
+  "menu.multiplayer": "VERSUS BATTLE",
+  "menu.singleplayer": "GAME START",
+  "menu.online": "REALMS MODE",
+  "menu.options": "OPTION MODE",
+  "menu.quit": "QUIT TO DOS",
+  "menu.returnToGame": "BACK TO GAME",
+  "menu.returnToMenu": "SAVE",
+  "menu.sendFeedback": "FEEDBACK",
+  "menu.shareToLan": "LAN MODE",
+  "gui.stats": "STATISTICS",
+  "gui.advancements": "HIGHS",
+  "menu.reportBugs": "BUGS"
 }
diff --git a/assets/minecraft/optifine/color.properties b/assets/minecraft/optifine/color.properties
@@ -0,0 +1,29 @@
+# This file is a modified version of the 'color.properties' file available at
+# https://github.com/sp614x/optifine/tree/master/OptiFineDoc/doc
+
+
+
+###############################################################################
+# Sample configuration for OptiFine's Custom Colors feature.
+# Based on the configuration for MCPatcher's Custom Colors mod.
+#
+###############################################################################
+# color.properties
+###############################################################################
+#
+# You only need to provide values for the properties you wish to change.  The
+# default Minecraft values for each property are given below for convenience.
+#
+# All property names are case-sensitive.
+# All colors are in hex rgb format, 000000 to ffffff.
+# All paths are relative to assets/minecraft unless otherwise stated.
+###############################################################################
+
+###############################################################################
+# Resource loading screen
+###############################################################################
+# Background color
+screen.loading=000000
+# Loading bar background color
+screen.loading.bar=000000
+
diff --git a/assets/minecraft/shaders/core/position_color.fsh b/assets/minecraft/shaders/core/position_color.fsh
@@ -13,14 +13,59 @@ void main() {
     if (color.a == 0.0) {
         discard;
     }
+        if (color.r == 153/255.0 && color.g == 153/255.0 && color.b == 153/255.0 && color.a == 1) {
+color = vec4(0.0, 0.0, 0.0, 0.0); //Loading World Screen Chunks Structure Starts #999999
+}
+    if (color.r == 95/255.0 && color.g == 97/255.0 && color.b == 145/255.0 && color.a == 1) {
+color = vec4(0.0, 0.0, 0.0, 0.0); //Loading World Screen Chunks Structure References #5F6191
+}
+    if (color.r == 128/255.0 && color.g == 178/255.0 && color.b == 82/255.0 && color.a == 1) {
+color = vec4(0.0, 0.0, 0.0, 0.0); //Loading World Screen Chunks Biomes #80B252
+}
+    if (color.r == 209/255.0 && color.g == 209/255.0 && color.b == 209/255.0 && color.a == 1) {
+color = vec4(0.0, 0.0, 0.0, 0.0); //Loading World Screen Chunks Noise #D1D1D1
+}
+    if (color.r == 114/255.0 && color.g == 104/255.0 && color.b == 9/255.0 && color.a == 1) {
+color = vec4(0.0, 0.0, 0.0, 0.0); //Loading World Screen Chunks Surface #726809
+}
+    if (color.r == 109/255.0 && color.g == 102/255.0 && color.b == 92/255.0 && color.a == 1) {
+color = vec4(0.0, 0.0, 0.0, 0.0); //Loading World Screen Chunks Carvers #6D665C
+}
+    if (color.r == 48/255.0 && color.g == 53/255.0 && color.b == 114/255.0 && color.a == 1) {
+ color = vec4(0.0, 0.0, 0.0, 0.0); //Loading World Screen Chunks Liquid Carvers #303572
+}
+    if (color.r == 33/255.0 && color.g == 198/255.0 && color.b == 0/255.0 && color.a == 1) {
+color = vec4(0.0, 0.0, 0.0, 0.0); //Loading World Screen Chunks Features #21C600
+}
+    if (color.r == 204/255.0 && color.g == 204/255.0 && color.b == 204/255.0 && color.a == 1) {
+color = vec4(0.0, 0.0, 0.0, 0.0); //Loading World Screen Chunks Light #CCCCCC
+}
+    if (color.r == 242/255.0 && color.g == 96/255.0 && color.b == 96/255.0 && color.a == 1) {
+color = vec4(0.0, 0.0, 0.0, 0.0); //Loading World Screen Chunks Spawn #F26060
+}
+    if (color.r == 238/255.0 && color.g == 238/255.0 && color.b == 238/255.0 && color.a == 1) {
+color = vec4(0.0, 0.0, 0.0, 0.0); //Loading World Screen Chunks Heightmaps #EEEEEE
+}
+    if (color.r == 255/255.0 && color.g == 224/255.0 && color.b == 160/255.0 && color.a == 1) {
+color = vec4(0.0, 0.0, 0.0, 0.0); //Loading World Screen Chunks 1.20 color #ffe0a0
+}
+if (color.r == 0/255.0 && color.g == 0/255.0 && color.b == 0/255.0 && color.a == 1) {
+color = vec4(0.0, 0.0, 0.0, 0.0); //Isolating Black Line Scroll Bar & Advancement Lines & Loading World Screen Chunks
+}
+if (color.r == 160/255.0 && color.g == 160/255.0 && color.b == 160/255.0 && color.a == 1) {
+color = vec4(0.0, 0.0, 0.0, 0.0); //Isolating Black and White UI
+}
+if (color.r == 255/255.0 && color.g == 255/255.0 && color.b == 255/255.0 && color.a == 1) {
+color = vec4(0.0, 0.0, 0.0, 0.0); //Isolating Black and White UI
+}
     if (distance(color.rgb, vec3(16 / 255.0)) < 0.01) {
         vec4 textColor = mix(vec4(1), vertexColor, 0.0);
         vec4 backgroundColor = vertexColor;
 
         ivec2 pixel = ivec2(gl_FragCoord.xy);
         ivec2 offset = pixel - ivec2(10, 45);
         if (offset.x >= 0 && offset.y >= 0 && offset.x < 622 && offset.y < 12) {
-            uint[] TEXT = uint[](_C, _O, _P, _Y, _R, _I, _G, _H, _T, _SPACE, _PARENL, _C, _PARENR, _SPACE, _2, _0, _2, _3, _SPACE, _V, _I, _T, _T, _O, _R, _I, _A, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
+            uint[] TEXT = uint[](_C, _O, _P, _Y, _R, _I, _G, _H, _T, _SPACE, _PARENL, _C, _PARENR, _SPACE, _2, _0, _2, _3, _SCORE, _2, _0, _2, _4, _SPACE, _V, _I, _T, _T, _O, _R, _I, _A, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
             for (int i = 0; i < 52; i++) {
                 int startX = i * 12;
                 int endX = startX + 10;
@@ -73,7 +118,7 @@ void main() {
         }
         offset = pixel - ivec2(10, 85);
         if (offset.x >= 0 && offset.y >= 0 && offset.x < 514 && offset.y < 12) {
-            uint[] TEXT = uint[]( _V, _1, _DOT, _1, _2, _DOT, _0, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
+            uint[] TEXT = uint[]( _V, _1, _DOT, _1, _3, _DOT, _0, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
             for (int i = 0; i < 43; i++) {
                 int startX = i * 12;
                 int endX = startX + 10;
@@ -90,7 +135,7 @@ void main() {
         }
         offset = pixel - ivec2(10, 65);
         if (offset.x >= 0 && offset.y >= 0 && offset.x < 514 && offset.y < 12) {
-            uint[] TEXT = uint[]( _2, _7, _DOT, _1, _2, _DOT, _2, _0, _2, _3, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
+            uint[] TEXT = uint[]( _2, _5, _DOT, _0, _1, _DOT, _2, _0, _2, _4, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE, _SPACE);
             for (int i = 0; i < 43; i++) {
                 int startX = i * 12;
                 int endX = startX + 10;