Old event cleanup and removal

Hilligans · Dec 20, 2023 · ff11a46 · ff11a46
1 parent af19032
commit ff11a46
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 93 deletions.
diff --git a/src/main/java/dev/hilligans/ourcraft/client/Client.java b/src/main/java/dev/hilligans/ourcraft/client/Client.java
@@ -16,13 +16,11 @@
 import dev.hilligans.ourcraft.client.rendering.ScreenBuilder;
 import dev.hilligans.ourcraft.client.rendering.screens.container.screens.CreativeInventoryScreen;
 import dev.hilligans.ourcraft.client.rendering.screens.container.screens.InventoryScreen;
-import dev.hilligans.ourcraft.client.rendering.world.managers.ShaderManager;
 import dev.hilligans.ourcraft.ClientMain;
 import dev.hilligans.ourcraft.container.Container;
 import dev.hilligans.ourcraft.data.other.PlayerList;
 import dev.hilligans.ourcraft.GameInstance;
 import dev.hilligans.ourcraft.item.ItemStack;
-import dev.hilligans.ourcraft.mod.handler.events.client.ClientStartRenderingEvent;
 import dev.hilligans.ourcraft.mod.handler.events.client.OpenScreenEvent;
 import dev.hilligans.ourcraft.network.ClientNetwork;
 import dev.hilligans.ourcraft.network.IClientPacketHandler;
@@ -148,7 +146,6 @@ public void startClient() {
        // splitWindow.setRenderPipeline("ourcraft:split_window_pipeline");
        // splitWindow.addWindow(subWindow);
 
-        gameInstance.EVENT_BUS.postEvent(new ClientStartRenderingEvent());
         rWindow = window;
         System.err.println("Time to start running: " + (System.currentTimeMillis() - ClientMain.startTime));
         graphicsEngine.createRenderLoop(gameInstance, window).run();

diff --git a/src/main/java/dev/hilligans/ourcraft/client/input/key/KeyHandler.java b/src/main/java/dev/hilligans/ourcraft/client/input/key/KeyHandler.java
@@ -2,7 +2,6 @@
 
 import dev.hilligans.ourcraft.ClientMain;
 import dev.hilligans.ourcraft.data.primitives.Tuple;
-import dev.hilligans.ourcraft.mod.handler.events.client.GLInitEvent;
 import it.unimi.dsi.fastutil.ints.Int2CharOpenHashMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import org.lwjgl.glfw.GLFW;
@@ -119,10 +118,6 @@ public void invoke(long window, int key, int scancode, int action, int mods) {
         });
     }
 
-    private static void setCallback(GLInitEvent glInitEvent) {
-        setCallback(glInitEvent.window);
-    }
-
     private static void putKeyAndKey(int id, char key) {
         mappedKeys.put(id,key);
         namedKeys.put(id,key + "");

diff --git a/src/main/java/dev/hilligans/ourcraft/client/rendering/graphics/api/IGraphicsEngine.java b/src/main/java/dev/hilligans/ourcraft/client/rendering/graphics/api/IGraphicsEngine.java
@@ -3,12 +3,8 @@
 import dev.hilligans.ourcraft.client.MatrixStack;
 import dev.hilligans.ourcraft.client.rendering.graphics.GraphicsData;
 import dev.hilligans.ourcraft.client.rendering.graphics.RenderWindow;
-import dev.hilligans.ourcraft.client.rendering.graphics.opengl.OpenGLEngine;
-import dev.hilligans.ourcraft.client.rendering.graphics.opengl.OpenglDefaultImpl;
 import dev.hilligans.ourcraft.client.rendering.world.StringRenderer;
 import dev.hilligans.ourcraft.GameInstance;
-import dev.hilligans.ourcraft.mod.handler.events.client.RenderPostEvent;
-import dev.hilligans.ourcraft.mod.handler.events.client.RenderPreEvent;
 import dev.hilligans.ourcraft.util.Logger;
 import dev.hilligans.ourcraft.util.registry.IRegistryElement;
 import dev.hilligans.ourcraft.util.sections.ISection;

diff --git a/src/main/java/dev/hilligans/ourcraft/client/rendering/graphics/opengl/OpenGLEngine.java b/src/main/java/dev/hilligans/ourcraft/client/rendering/graphics/opengl/OpenGLEngine.java
@@ -5,11 +5,8 @@
 import dev.hilligans.ourcraft.client.rendering.graphics.RenderWindow;
 import dev.hilligans.ourcraft.client.rendering.graphics.api.GraphicsContext;
 import dev.hilligans.ourcraft.client.rendering.graphics.api.GraphicsEngineBase;
-import dev.hilligans.ourcraft.client.rendering.newrenderer.GLRenderer;
 import dev.hilligans.ourcraft.client.rendering.screens.JoinScreen;
-import dev.hilligans.ourcraft.client.rendering.world.managers.ShaderManager;
 import dev.hilligans.ourcraft.data.primitives.Tuple;
-import dev.hilligans.ourcraft.mod.handler.events.client.GLInitEvent;
 import dev.hilligans.ourcraft.util.Logger;
 import dev.hilligans.ourcraft.util.sections.ProfiledSection;
 import org.lwjgl.opengl.GL;
@@ -89,7 +86,6 @@ public OpenGLWindow setup() {
         GL.createCapabilities();
 
         client.glStarted = true;
-        client.gameInstance.EVENT_BUS.postEvent(new GLInitEvent(window));
         gameInstance.build(this, null);
 
         setupStringRenderer("");

diff --git a/...main/java/dev/hilligans/ourcraft/mod/handler/events/client/ClientStartRenderingEvent.java b/...main/java/dev/hilligans/ourcraft/mod/handler/events/client/ClientStartRenderingEvent.java
diff --git a/src/main/java/dev/hilligans/ourcraft/mod/handler/events/client/GLInitEvent.java b/src/main/java/dev/hilligans/ourcraft/mod/handler/events/client/GLInitEvent.java
diff --git a/src/main/java/dev/hilligans/ourcraft/mod/handler/events/client/RenderPostEvent.java b/src/main/java/dev/hilligans/ourcraft/mod/handler/events/client/RenderPostEvent.java
diff --git a/src/main/java/dev/hilligans/ourcraft/mod/handler/events/client/RenderPreEvent.java b/src/main/java/dev/hilligans/ourcraft/mod/handler/events/client/RenderPreEvent.java
diff --git a/src/main/java/dev/hilligans/ourcraft/mod/handler/events/client/RenderStartEvent.java b/src/main/java/dev/hilligans/ourcraft/mod/handler/events/client/RenderStartEvent.java
diff --git a/src/main/java/dev/hilligans/ourcraft/mod/handler/events/client/RenderWorldEvent.java b/src/main/java/dev/hilligans/ourcraft/mod/handler/events/client/RenderWorldEvent.java