Refactor: Moved client specific code to client module

Martomate · Jul 12, 2024 · 242b8aa · 242b8aa
1 parent a81a00f
commit 242b8aa
Show file tree

Hide file tree

Showing 68 changed files with 25 additions and 40 deletions.
diff --git a/build.sbt b/build.sbt
@@ -78,23 +78,23 @@ lazy val system = project
 
 lazy val game = project
   .in(file("game"))
-  .dependsOn(common, nbt, window, audio, fs, gpu, system)
+  .dependsOn(common, nbt, window, fs)
   .settings(commonSettings*)
   .settings(
     libraryDependencies ++= LwjglSystem ++ Seq(Joml, ZeroMQ) ++ Seq(MUnit, Mockito)
   )
 
 lazy val client = project
   .in(file("client"))
-  .dependsOn(common, game)
+  .dependsOn(game, audio, gpu)
   .settings(commonSettings*)
   .settings(
     libraryDependencies ++= Seq(Joml, ZeroMQ) :+ MUnit
   )
 
 lazy val server = project
   .in(file("server"))
-  .dependsOn(common, game % "compile->compile;test->test")
+  .dependsOn(game % "compile->compile;test->test")
   .settings(commonSettings*)
   .settings(
     libraryDependencies ++= Seq(Joml, ZeroMQ) :+ MUnit
@@ -103,15 +103,9 @@ lazy val server = project
 lazy val main = project
   .in(file("main"))
   .dependsOn(
-    common,
     game % "compile->compile;test->test",
     client % "compile->compile;test->test",
     server,
-    nbt,
-    window,
-    audio,
-    fs,
-    gpu,
     system
   )
   .settings(commonSettings*)

diff --git a/client/src/main/scala/hexacraft/client/GuiBlockRenderer.scala b/client/src/main/scala/hexacraft/client/GuiBlockRenderer.scala
@@ -1,11 +1,11 @@
 package hexacraft.client
 
+import hexacraft.client.render.BlockRenderer
 import hexacraft.gui.comp.GUITransformation
 import hexacraft.renderer.*
 import hexacraft.shaders.GuiBlockShader
 import hexacraft.world.CameraProjection
 import hexacraft.world.block.Block
-import hexacraft.world.render.BlockRenderer
 
 import org.joml.{Matrix4f, Vector2f}
 

diff --git a/client/src/main/scala/hexacraft/client/WorldRenderer.scala b/client/src/main/scala/hexacraft/client/WorldRenderer.scala
@@ -1,16 +1,16 @@
 package hexacraft.client
 
 import hexacraft.client.ClientWorld.WorldTickResult
+import hexacraft.client.render.*
 import hexacraft.infra.gpu.OpenGL
-import hexacraft.renderer.{GpuState, TextureArray, VAO}
+import hexacraft.renderer.{GpuState, TextureArray, TextureSingle, VAO}
 import hexacraft.shaders.*
 import hexacraft.util.TickableTimer
 import hexacraft.world.{BlocksInWorld, Camera, CylinderSize}
 import hexacraft.world.block.BlockState
 import hexacraft.world.chunk.Chunk
 import hexacraft.world.coord.{BlockRelWorld, ChunkRelWorld}
 import hexacraft.world.entity.{Entity, EntityModel}
-import hexacraft.world.render.*
 
 import org.joml.{Vector2ic, Vector3f}
 import org.lwjgl.BufferUtils
@@ -321,12 +321,14 @@ class WorldRenderer(
 
       entityDataList ++= EntityRenderDataFactory.getEntityRenderData(players, side, world)
 
-      for (texture, partLists) <- entityDataList.groupBy(_._1.texture) do {
+      for (textureName, partLists) <- entityDataList.groupBy(_._1.textureName) do {
         val data = partLists.flatMap(_._2)
 
         entityRenderers(side).setInstanceData(data.size): buf =>
           data.foreach(_.fill(buf))
 
+        val texture = TextureSingle.getTexture("textures/entities/" + textureName)
+
         texture.bind()
         sh.setTextureSize(texture.width)
         entityRenderers(side).render()

diff --git a/...world/render/BlockFaceBatchRenderer.scala → ...lient/render/BlockFaceBatchRenderer.scala b/...world/render/BlockFaceBatchRenderer.scala → ...lient/render/BlockFaceBatchRenderer.scala
@@ -1,4 +1,4 @@
-package hexacraft.world.render
+package hexacraft.client.render
 
 import hexacraft.util.{DenseKeyedSegmentStack, Segment, SegmentSet}
 import hexacraft.world.coord.ChunkRelWorld

diff --git a/...exacraft/world/render/BlockRenderer.scala → ...xacraft/client/render/BlockRenderer.scala b/...exacraft/world/render/BlockRenderer.scala → ...xacraft/client/render/BlockRenderer.scala
@@ -1,4 +1,4 @@
-package hexacraft.world.render
+package hexacraft.client.render
 
 import hexacraft.infra.gpu.OpenGL
 import hexacraft.renderer.{GpuState, InstancedRenderer, VAO}

diff --git a/...hexacraft/world/render/BlockVboData.scala → ...exacraft/client/render/BlockVboData.scala b/...hexacraft/world/render/BlockVboData.scala → ...exacraft/client/render/BlockVboData.scala
@@ -1,7 +1,7 @@
-package hexacraft.world.render
+package hexacraft.client.render
 
-import hexacraft.shaders.BlockShader.BlockVertexData
 import hexacraft.shaders.BlockShader
+import hexacraft.shaders.BlockShader.BlockVertexData
 import hexacraft.world.{BlocksInWorld, ChunkCache, CylinderSize}
 import hexacraft.world.block.{Block, BlockState}
 import hexacraft.world.chunk.LocalBlockState

diff --git a/...acraft/world/render/ChunkRenderData.scala → ...craft/client/render/ChunkRenderData.scala b/...acraft/world/render/ChunkRenderData.scala → ...craft/client/render/ChunkRenderData.scala
@@ -1,4 +1,4 @@
-package hexacraft.world.render
+package hexacraft.client.render
 
 import hexacraft.world.{BlocksInWorld, CylinderSize}
 import hexacraft.world.chunk.LocalBlockState

diff --git a/...world/render/ChunkRenderUpdateQueue.scala → ...lient/render/ChunkRenderUpdateQueue.scala b/...world/render/ChunkRenderUpdateQueue.scala → ...lient/render/ChunkRenderUpdateQueue.scala
@@ -1,4 +1,4 @@
-package hexacraft.world.render
+package hexacraft.client.render
 
 import hexacraft.util.UniquePQ
 import hexacraft.world.{Camera, CylinderSize, PosAndDir}

diff --git a/...orld/render/EntityRenderDataFactory.scala → ...ient/render/EntityRenderDataFactory.scala b/...orld/render/EntityRenderDataFactory.scala → ...ient/render/EntityRenderDataFactory.scala
@@ -1,4 +1,4 @@
-package hexacraft.world.render
+package hexacraft.client.render
 
 import hexacraft.shaders.EntityShader
 import hexacraft.world.{BlocksInWorld, ChunkCache, CylinderSize}

diff --git a/...acraft/world/render/MainFrameBuffer.scala → ...craft/client/render/MainFrameBuffer.scala b/...acraft/world/render/MainFrameBuffer.scala → ...craft/client/render/MainFrameBuffer.scala
@@ -1,4 +1,4 @@
-package hexacraft.world.render
+package hexacraft.client.render
 
 import hexacraft.infra.gpu.OpenGL
 import hexacraft.renderer.{FrameBuffer, TextureSingle}

diff --git a/...cala/hexacraft/world/render/buffers.scala → ...ala/hexacraft/client/render/buffers.scala b/...cala/hexacraft/world/render/buffers.scala → ...ala/hexacraft/client/render/buffers.scala
@@ -1,4 +1,4 @@
-package hexacraft.world.render
+package hexacraft.client.render
 
 import hexacraft.infra.gpu.OpenGL
 import hexacraft.renderer.{GpuState, Renderer, VAO, VBO}

diff --git a/.../src/main/scala/hexacraft/gui/Event.scala → .../src/main/scala/hexacraft/gui/Event.scala b/.../src/main/scala/hexacraft/gui/Event.scala → .../src/main/scala/hexacraft/gui/Event.scala
diff --git a/...in/scala/hexacraft/gui/LocationInfo.scala → ...in/scala/hexacraft/gui/LocationInfo.scala b/...in/scala/hexacraft/gui/LocationInfo.scala → ...in/scala/hexacraft/gui/LocationInfo.scala
diff --git a/...n/scala/hexacraft/gui/MousePosition.scala → ...n/scala/hexacraft/gui/MousePosition.scala b/...n/scala/hexacraft/gui/MousePosition.scala → ...n/scala/hexacraft/gui/MousePosition.scala
diff --git a/...n/scala/hexacraft/gui/RenderContext.scala → ...n/scala/hexacraft/gui/RenderContext.scala b/...n/scala/hexacraft/gui/RenderContext.scala → ...n/scala/hexacraft/gui/RenderContext.scala
diff --git a/.../src/main/scala/hexacraft/gui/Scene.scala → .../src/main/scala/hexacraft/gui/Scene.scala b/.../src/main/scala/hexacraft/gui/Scene.scala → .../src/main/scala/hexacraft/gui/Scene.scala
diff --git a/...ain/scala/hexacraft/gui/TickContext.scala → ...ain/scala/hexacraft/gui/TickContext.scala b/...ain/scala/hexacraft/gui/TickContext.scala → ...ain/scala/hexacraft/gui/TickContext.scala
diff --git a/...main/scala/hexacraft/gui/WindowSize.scala → ...main/scala/hexacraft/gui/WindowSize.scala b/...main/scala/hexacraft/gui/WindowSize.scala → ...main/scala/hexacraft/gui/WindowSize.scala
diff --git a/.../scala/hexacraft/gui/comp/Boundable.scala → .../scala/hexacraft/gui/comp/Boundable.scala b/.../scala/hexacraft/gui/comp/Boundable.scala → .../scala/hexacraft/gui/comp/Boundable.scala
diff --git a/...ain/scala/hexacraft/gui/comp/Button.scala → ...ain/scala/hexacraft/gui/comp/Button.scala b/...ain/scala/hexacraft/gui/comp/Button.scala → ...ain/scala/hexacraft/gui/comp/Button.scala
diff --git a/.../scala/hexacraft/gui/comp/Component.scala → .../scala/hexacraft/gui/comp/Component.scala b/.../scala/hexacraft/gui/comp/Component.scala → .../scala/hexacraft/gui/comp/Component.scala
diff --git a/...exacraft/gui/comp/GUITransformation.scala → ...exacraft/gui/comp/GUITransformation.scala b/...exacraft/gui/comp/GUITransformation.scala → ...exacraft/gui/comp/GUITransformation.scala
diff --git a/...main/scala/hexacraft/gui/comp/Label.scala → ...main/scala/hexacraft/gui/comp/Label.scala b/...main/scala/hexacraft/gui/comp/Label.scala → ...main/scala/hexacraft/gui/comp/Label.scala
diff --git a/...scala/hexacraft/gui/comp/ScrollPane.scala → ...scala/hexacraft/gui/comp/ScrollPane.scala b/...scala/hexacraft/gui/comp/ScrollPane.scala → ...scala/hexacraft/gui/comp/ScrollPane.scala
diff --git a/...la/hexacraft/gui/comp/SubComponents.scala → ...la/hexacraft/gui/comp/SubComponents.scala b/...la/hexacraft/gui/comp/SubComponents.scala → ...la/hexacraft/gui/comp/SubComponents.scala
diff --git a/.../scala/hexacraft/gui/comp/TextField.scala → .../scala/hexacraft/gui/comp/TextField.scala b/.../scala/hexacraft/gui/comp/TextField.scala → .../scala/hexacraft/gui/comp/TextField.scala
diff --git a/...cala/hexacraft/renderer/FrameBuffer.scala → ...cala/hexacraft/renderer/FrameBuffer.scala b/...cala/hexacraft/renderer/FrameBuffer.scala → ...cala/hexacraft/renderer/FrameBuffer.scala
diff --git a/...n/scala/hexacraft/renderer/GpuState.scala → ...n/scala/hexacraft/renderer/GpuState.scala b/...n/scala/hexacraft/renderer/GpuState.scala → ...n/scala/hexacraft/renderer/GpuState.scala
diff --git a/...scala/hexacraft/renderer/PixelArray.scala → ...scala/hexacraft/renderer/PixelArray.scala b/...scala/hexacraft/renderer/PixelArray.scala → ...scala/hexacraft/renderer/PixelArray.scala
diff --git a/.../scala/hexacraft/renderer/renderers.scala → .../scala/hexacraft/renderer/renderers.scala b/.../scala/hexacraft/renderer/renderers.scala → .../scala/hexacraft/renderer/renderers.scala
diff --git a/...ain/scala/hexacraft/renderer/shader.scala → ...ain/scala/hexacraft/renderer/shader.scala b/...ain/scala/hexacraft/renderer/shader.scala → ...ain/scala/hexacraft/renderer/shader.scala
diff --git a/...in/scala/hexacraft/renderer/texture.scala → ...in/scala/hexacraft/renderer/texture.scala b/...in/scala/hexacraft/renderer/texture.scala → ...in/scala/hexacraft/renderer/texture.scala
diff --git a/...c/main/scala/hexacraft/renderer/vao.scala → ...c/main/scala/hexacraft/renderer/vao.scala b/...c/main/scala/hexacraft/renderer/vao.scala → ...c/main/scala/hexacraft/renderer/vao.scala
diff --git a/...scala/hexacraft/shaders/BlockShader.scala → ...scala/hexacraft/shaders/BlockShader.scala b/...scala/hexacraft/shaders/BlockShader.scala → ...scala/hexacraft/shaders/BlockShader.scala
diff --git a/...scala/hexacraft/shaders/ColorShader.scala → ...scala/hexacraft/shaders/ColorShader.scala b/...scala/hexacraft/shaders/ColorShader.scala → ...scala/hexacraft/shaders/ColorShader.scala
diff --git a/...a/hexacraft/shaders/CrosshairShader.scala → ...a/hexacraft/shaders/CrosshairShader.scala b/...a/hexacraft/shaders/CrosshairShader.scala → ...a/hexacraft/shaders/CrosshairShader.scala
diff --git a/...cala/hexacraft/shaders/EntityShader.scala → ...cala/hexacraft/shaders/EntityShader.scala b/...cala/hexacraft/shaders/EntityShader.scala → ...cala/hexacraft/shaders/EntityShader.scala
diff --git a/...a/hexacraft/shaders/FancyRectShader.scala → ...a/hexacraft/shaders/FancyRectShader.scala b/...a/hexacraft/shaders/FancyRectShader.scala → ...a/hexacraft/shaders/FancyRectShader.scala
diff --git a/.../scala/hexacraft/shaders/FontShader.scala → .../scala/hexacraft/shaders/FontShader.scala b/.../scala/hexacraft/shaders/FontShader.scala → .../scala/hexacraft/shaders/FontShader.scala
diff --git a/...la/hexacraft/shaders/GuiBlockShader.scala → ...la/hexacraft/shaders/GuiBlockShader.scala b/...la/hexacraft/shaders/GuiBlockShader.scala → ...la/hexacraft/shaders/GuiBlockShader.scala
diff --git a/...scala/hexacraft/shaders/ImageShader.scala → ...scala/hexacraft/shaders/ImageShader.scala b/...scala/hexacraft/shaders/ImageShader.scala → ...scala/hexacraft/shaders/ImageShader.scala
diff --git a/...xacraft/shaders/SelectedBlockShader.scala → ...xacraft/shaders/SelectedBlockShader.scala b/...xacraft/shaders/SelectedBlockShader.scala → ...xacraft/shaders/SelectedBlockShader.scala
diff --git a/...n/scala/hexacraft/shaders/SkyShader.scala → ...n/scala/hexacraft/shaders/SkyShader.scala b/...n/scala/hexacraft/shaders/SkyShader.scala → ...n/scala/hexacraft/shaders/SkyShader.scala
diff --git a/...xacraft/shaders/WorldCombinerShader.scala → ...xacraft/shaders/WorldCombinerShader.scala b/...xacraft/shaders/WorldCombinerShader.scala → ...xacraft/shaders/WorldCombinerShader.scala
diff --git a/...n/scala/hexacraft/text/FontRenderer.scala → ...n/scala/hexacraft/text/FontRenderer.scala b/...n/scala/hexacraft/text/FontRenderer.scala → ...n/scala/hexacraft/text/FontRenderer.scala
diff --git a/...src/main/scala/hexacraft/text/Fonts.scala → ...src/main/scala/hexacraft/text/Fonts.scala b/...src/main/scala/hexacraft/text/Fonts.scala → ...src/main/scala/hexacraft/text/Fonts.scala
diff --git a/.../src/main/scala/hexacraft/text/Text.scala → .../src/main/scala/hexacraft/text/Text.scala b/.../src/main/scala/hexacraft/text/Text.scala → .../src/main/scala/hexacraft/text/Text.scala
diff --git a/...ain/scala/hexacraft/text/TextMaster.scala → ...ain/scala/hexacraft/text/TextMaster.scala b/...ain/scala/hexacraft/text/TextMaster.scala → ...ain/scala/hexacraft/text/TextMaster.scala
diff --git a/.../main/scala/hexacraft/text/TextMesh.scala → .../main/scala/hexacraft/text/TextMesh.scala b/.../main/scala/hexacraft/text/TextMesh.scala → .../main/scala/hexacraft/text/TextMesh.scala
diff --git a/...scala/hexacraft/text/font/Character.scala → ...scala/hexacraft/text/font/Character.scala b/...scala/hexacraft/text/font/Character.scala → ...scala/hexacraft/text/font/Character.scala
diff --git a/...n/scala/hexacraft/text/font/FntFile.scala → ...n/scala/hexacraft/text/font/FntFile.scala b/...n/scala/hexacraft/text/font/FntFile.scala → ...n/scala/hexacraft/text/font/FntFile.scala
diff --git a/...main/scala/hexacraft/text/font/Font.scala → ...main/scala/hexacraft/text/font/Font.scala b/...main/scala/hexacraft/text/font/Font.scala → ...main/scala/hexacraft/text/font/Font.scala
diff --git a/...la/hexacraft/text/font/FontMetaData.scala → ...la/hexacraft/text/font/FontMetaData.scala b/...la/hexacraft/text/font/FontMetaData.scala → ...la/hexacraft/text/font/FontMetaData.scala
diff --git a/...in/scala/hexacraft/text/layout/Line.scala → ...in/scala/hexacraft/text/layout/Line.scala b/...in/scala/hexacraft/text/layout/Line.scala → ...in/scala/hexacraft/text/layout/Line.scala
diff --git a/...a/hexacraft/text/layout/LineBreaker.scala → ...a/hexacraft/text/layout/LineBreaker.scala b/...a/hexacraft/text/layout/LineBreaker.scala → ...a/hexacraft/text/layout/LineBreaker.scala
diff --git a/...in/scala/hexacraft/text/layout/Word.scala → ...in/scala/hexacraft/text/layout/Word.scala b/...in/scala/hexacraft/text/layout/Word.scala → ...in/scala/hexacraft/text/layout/Word.scala
diff --git a/...d/render/BlockFaceBatchRendererTest.scala → ...t/render/BlockFaceBatchRendererTest.scala b/...d/render/BlockFaceBatchRendererTest.scala → ...t/render/BlockFaceBatchRendererTest.scala
@@ -1,4 +1,4 @@
-package hexacraft.world.render
+package hexacraft.client.render
 
 import hexacraft.world.CylinderSize
 import hexacraft.world.coord.ChunkRelWorld

diff --git a/...raft/world/render/BufferHandlerTest.scala → ...aft/client/render/BufferHandlerTest.scala b/...raft/world/render/BufferHandlerTest.scala → ...aft/client/render/BufferHandlerTest.scala
@@ -1,4 +1,4 @@
-package hexacraft.world.render
+package hexacraft.client.render
 
 import hexacraft.util.Segment
 

diff --git a/...cala/hexacraft/gui/LocationInfoTest.scala → ...cala/hexacraft/gui/LocationInfoTest.scala b/...cala/hexacraft/gui/LocationInfoTest.scala → ...cala/hexacraft/gui/LocationInfoTest.scala
diff --git a/...exacraft/renderer/ShaderBuilderTest.scala → ...exacraft/renderer/ShaderBuilderTest.scala b/...exacraft/renderer/ShaderBuilderTest.scala → ...exacraft/renderer/ShaderBuilderTest.scala
diff --git a/...st/scala/hexacraft/renderer/VaoTest.scala → ...st/scala/hexacraft/renderer/VaoTest.scala b/...st/scala/hexacraft/renderer/VaoTest.scala → ...st/scala/hexacraft/renderer/VaoTest.scala
diff --git a/...la/hexacraft/renderer/VboLayoutTest.scala → ...la/hexacraft/renderer/VboLayoutTest.scala b/...la/hexacraft/renderer/VboLayoutTest.scala → ...la/hexacraft/renderer/VboLayoutTest.scala
diff --git a/...ala/hexacraft/text/font/FntFileTest.scala → ...ala/hexacraft/text/font/FntFileTest.scala b/...ala/hexacraft/text/font/FntFileTest.scala → ...ala/hexacraft/text/font/FntFileTest.scala
diff --git a/...exacraft/text/font/FontMetaDataTest.scala → ...exacraft/text/font/FontMetaDataTest.scala b/...exacraft/text/font/FontMetaDataTest.scala → ...exacraft/text/font/FontMetaDataTest.scala
diff --git a/game/src/main/scala/hexacraft/world/entity/models.scala b/game/src/main/scala/hexacraft/world/entity/models.scala
@@ -1,14 +1,13 @@
 package hexacraft.world.entity
 
-import hexacraft.renderer.TextureSingle
 import hexacraft.world.HexBox
 import hexacraft.world.coord.CylCoords
 
 import org.joml.{Matrix4f, Vector3f}
 
 trait EntityModel {
   def parts: Seq[EntityPart]
-  def texture: TextureSingle
+  def textureName: String
   def tick(walking: Boolean): Unit
 }
 

diff --git a/game/src/main/scala/hexacraft/world/entity/player.scala b/game/src/main/scala/hexacraft/world/entity/player.scala
@@ -1,6 +1,5 @@
 package hexacraft.world.entity
 
-import hexacraft.renderer.TextureSingle
 import hexacraft.world.{CylinderSize, HexBox}
 import hexacraft.world.coord.BlockCoords
 
@@ -23,10 +22,6 @@ class PlayerEntityModel(
   override def tick(walking: Boolean): Unit = {
     animation.tick(walking)
   }
-
-  override def texture: TextureSingle = {
-    TextureSingle.getTexture("textures/entities/" + textureName)
-  }
 }
 
 class PlayerAnimation(model: PlayerEntityModel) {

diff --git a/game/src/main/scala/hexacraft/world/entity/sheep.scala b/game/src/main/scala/hexacraft/world/entity/sheep.scala
@@ -1,7 +1,6 @@
 package hexacraft.world.entity
 
-import hexacraft.renderer.TextureSingle
-import hexacraft.world.{BlocksInWorld, CollisionDetector, CylinderSize, HexBox}
+import hexacraft.world.{CylinderSize, HexBox}
 import hexacraft.world.coord.BlockCoords
 
 import org.joml.Vector3f
@@ -22,10 +21,6 @@ class SheepEntityModel(
   override def tick(walking: Boolean): Unit = {
     animation.tick(walking)
   }
-
-  override def texture: TextureSingle = {
-    TextureSingle.getTexture("textures/entities/" + textureName)
-  }
 }
 
 class SheepAnimation(model: SheepEntityModel) {

diff --git a/main/src/test/scala/hexacraft/RootArchTest.scala b/main/src/test/scala/hexacraft/RootArchTest.scala
@@ -9,7 +9,7 @@ class RootArchTest extends FunSuite {
   import ArchUnitHelpers.*
 
   private val allClasses = new ClassFileImporter()
-    .importPackages("hexacraft..")
+    .importPackages("hexacraft..", "com.martomate..")
     .ignoreScalaTests()
     .ignoreMTests()
 
@@ -22,7 +22,7 @@ class RootArchTest extends FunSuite {
   }
 
   test("Nbt library should only be used in Nbt module") {
-    Packages("com.flowpowered.nbt..").assertOnlyUsedIn() // not used in any package, only in nbt module
+    Packages("com.flowpowered.nbt..").assertOnlyUsedIn("com.martomate.nbt")
   }
 
   test("Glfw library should only be used in Glfw wrapper") {
@@ -125,7 +125,7 @@ class RootArchTest extends FunSuite {
       .where(Shaders, _.mayOnlyAccessLayers(Infra, Renderer, World, LWJGL, JOML))
       .where(Text, _.mayOnlyAccessLayers(Infra, Renderer, Shaders, JOML))
       .where(Util, _.mayOnlyAccessLayers(JOML, Nbt))
-      .where(World, _.mayOnlyAccessLayers(Math, Infra, Renderer, Shaders, Physics, Util, JOML, LWJGL, Nbt))
+      .where(World, _.mayOnlyAccessLayers(Infra, Math, Physics, Util, JOML, Nbt))
       .check(allClasses)
   }