Merge branch 'hierachial_rewrite_improved_meshing' into mc_1215

src/main/resources/assets/voxy/lang/en_us.json

@@ -2,8 +2,6 @@
   "voxy.config.title": "Voxy config",
 
   "voxy.config.general": "General",
-  "voxy.config.threads": "Threads",
-  "voxy.config.storage": "Storage",
 
   "voxy.config.general.enabled": "Enable Voxy",
   "voxy.config.general.enabled.tooltip": "Fully enables or disables voxy",
@@ -18,5 +16,8 @@
   "voxy.config.general.serviceThreads.tooltip": "Number of threads the ServiceThreadPool can use",
 
   "voxy.config.general.subDivisionSize": "Pixels^2 of subdivision size",
-  "voxy.config.general.subDivisionSize.tooltip": "Maximum size in pixels (squared) of screenspace AABB before subdiving to smaller LoDs (Smaller being higher quality)"
+  "voxy.config.general.subDivisionSize.tooltip": "Maximum size in pixels (squared) of screenspace AABB before subdiving to smaller LoDs (Smaller being higher quality)",
+
+  "voxy.config.general.renderDistance": "Render distance",
+  "voxy.config.general.renderDistance.tooltip": "Render distance of voxy, each unit is equivalent to 32 chunks in vanilla (i.e. to get to vanilla render distance multiply by 32)"
 }

src/main/resources/assets/voxy/shaders/lod/block_model.glsl

@@ -1,4 +1,3 @@
-#line 1
 //TODO: FIXME: this isnt actually correct cause depending on the face (i think) it could be 1/64 th of a position off
 // but im going to assume that since we are dealing with huge render distances, this shouldent matter that much
 float extractFaceIndentation(uint faceData) {

src/main/resources/assets/voxy/shaders/lod/quad_format.glsl

@@ -1,4 +1,3 @@
-#line 1
 #ifdef GL_ARB_gpu_shader_int64
 #define Quad uint64_t
 

src/main/resources/assets/voxy/shaders/lod/section.glsl

@@ -1,4 +1,3 @@
-#line 1
 uint extractDetail(SectionMeta section) {
     return section.posA>>28;
 }

src/main/resources/client.voxy.mixins.json

@@ -8,6 +8,7 @@
     "minecraft.MixinDebugHud",
     "minecraft.MixinMinecraftClient",
     "minecraft.MixinThreadExecutor",
+    "minecraft.MixinWindow",
     "minecraft.MixinWorldRenderer",
     "sodium.MixinDefaultChunkRenderer",
     "sodium.MixinRenderSectionManager"