9 files changed, 10 insertions, 81 deletions
diff --git a/src/main/java/com/dulkirfabric/mixin/ItemStackMixin.java b/src/main/java/com/dulkirfabric/mixin/ItemStackMixin.java
index 5fdd7f5..7820bf3 100644
--- a/src/main/java/com/dulkirfabric/mixin/ItemStackMixin.java
+++ b/src/main/java/com/dulkirfabric/mixin/ItemStackMixin.java
@@ -1,6 +1,6 @@
 package com.dulkirfabric.mixin;
 
-import com.dulkirfabric.util.ItemChangeHandler;
+import com.dulkirfabric.util.render.ItemChangeHandler;
 import net.minecraft.client.item.TooltipContext;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
@@ -11,7 +11,6 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.List;
diff --git a/src/main/java/com/dulkirfabric/mixin/render/KeyboardMixin.java b/src/main/java/com/dulkirfabric/mixin/io/KeyboardMixin.java
index c2c5a45..47decc6 100644
--- a/src/main/java/com/dulkirfabric/mixin/render/KeyboardMixin.java
+++ b/src/main/java/com/dulkirfabric/mixin/io/KeyboardMixin.java
@@ -1,4 +1,4 @@
-package com.dulkirfabric.mixin.render;
+package com.dulkirfabric.mixin.io;
 
 import com.dulkirfabric.events.WorldKeyPressEvent;
 import net.minecraft.client.Keyboard;
diff --git a/src/main/java/com/dulkirfabric/mixin/MouseMixin.java b/src/main/java/com/dulkirfabric/mixin/io/MouseMixin.java
index d86985d..76dd828 100644
--- a/src/main/java/com/dulkirfabric/mixin/MouseMixin.java
+++ b/src/main/java/com/dulkirfabric/mixin/io/MouseMixin.java
@@ -1,4 +1,4 @@
-package com.dulkirfabric.mixin;
+package com.dulkirfabric.mixin.io;
 
 import com.dulkirfabric.features.InventoryScale;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
diff --git a/src/main/java/com/dulkirfabric/mixin/SoundSystemMixin.java b/src/main/java/com/dulkirfabric/mixin/io/SoundSystemMixin.java
index 3f4c0af..e28d133 100644
--- a/src/main/java/com/dulkirfabric/mixin/SoundSystemMixin.java
+++ b/src/main/java/com/dulkirfabric/mixin/io/SoundSystemMixin.java
@@ -1,4 +1,4 @@
-package com.dulkirfabric.mixin;
+package com.dulkirfabric.mixin.io;
 
 import com.dulkirfabric.events.PlaySoundEvent;
 import net.minecraft.client.sound.SoundInstance;
diff --git a/src/main/java/com/dulkirfabric/mixin/render/DrawContextMixin.java b/src/main/java/com/dulkirfabric/mixin/render/DrawContextMixin.java
index 79a71b2..958a1bf 100644
--- a/src/main/java/com/dulkirfabric/mixin/render/DrawContextMixin.java
+++ b/src/main/java/com/dulkirfabric/mixin/render/DrawContextMixin.java
@@ -1,10 +1,8 @@
 package com.dulkirfabric.mixin.render;
 
 import com.dulkirfabric.config.DulkirConfig;
-import com.dulkirfabric.events.TooltipRenderChangeEvent;
 import com.dulkirfabric.features.InventoryScale;
 import com.dulkirfabric.features.TooltipImpl;
-import com.dulkirfabric.util.ItemChangeHandler;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.client.MinecraftClient;
diff --git a/src/main/java/com/dulkirfabric/mixin/io/HandledScreenMixin.java b/src/main/java/com/dulkirfabric/mixin/render/HandledScreenMixin.java
index dbf8dbd..97d9552 100644
--- a/src/main/java/com/dulkirfabric/mixin/io/HandledScreenMixin.java
+++ b/src/main/java/com/dulkirfabric/mixin/render/HandledScreenMixin.java
@@ -1,4 +1,4 @@
-package com.dulkirfabric.mixin.io;
+package com.dulkirfabric.mixin.render;
 
 import com.dulkirfabric.events.InventoryKeyPressEvent;
 import com.dulkirfabric.events.SlotRenderEvent;
diff --git a/src/main/java/com/dulkirfabric/mixin/render/LivingEntityMixin.java b/src/main/java/com/dulkirfabric/mixin/render/LivingEntityMixin.java
index b615136..d375709 100644
--- a/src/main/java/com/dulkirfabric/mixin/render/LivingEntityMixin.java
+++ b/src/main/java/com/dulkirfabric/mixin/render/LivingEntityMixin.java
@@ -1,11 +1,8 @@
 package com.dulkirfabric.mixin.render;
 
 import com.dulkirfabric.config.DulkirConfig;
-import com.dulkirfabric.util.GlowingEntityInterface;
-import net.minecraft.client.MinecraftClient;
+import com.dulkirfabric.util.render.GlowingEntityInterface;
 import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.text.Text;
 import net.minecraft.util.Hand;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -34,10 +31,9 @@ public class LivingEntityMixin implements GlowingEntityInterface {
     private boolean shouldESP_DulkirMod;
 
     @Override
-    public void setDulkirEntityGlow(boolean shouldGlow, @NotNull Color glowColor, boolean shouldESP) {
+    public void setDulkirEntityGlow(boolean shouldGlow, @NotNull Color glowColor) {
         this.shouldGlow_DulkirMod = shouldGlow;
         this.glowColor_DulkirMod = glowColor;
-        this.shouldESP_DulkirMod = shouldESP;
     }
 
     @Override
@@ -51,11 +47,6 @@ public class LivingEntityMixin implements GlowingEntityInterface {
         return glowColor_DulkirMod;
     }
 
-    @Override
-    public boolean shouldDulkirEntityESP() {
-        return shouldESP_DulkirMod;
-    }
-
     @Inject(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;tickNewAi()V",
     shift = At.Shift.AFTER))
     public void onWhatever(CallbackInfo ci) {
diff --git a/src/main/java/com/dulkirfabric/mixin/render/MinecraftClientMixin.java b/src/main/java/com/dulkirfabric/mixin/render/MinecraftClientMixin.java
index 13285e3..7535b67 100644
--- a/src/main/java/com/dulkirfabric/mixin/render/MinecraftClientMixin.java
+++ b/src/main/java/com/dulkirfabric/mixin/render/MinecraftClientMixin.java
@@ -1,10 +1,9 @@
 package com.dulkirfabric.mixin.render;
 
-import com.dulkirfabric.util.GlowingEntityInterface;
+import com.dulkirfabric.util.render.GlowingEntityInterface;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
diff --git a/src/main/java/com/dulkirfabric/mixin/render/WorldRendererMixin.java b/src/main/java/com/dulkirfabric/mixin/render/WorldRendererMixin.java
index 03ffbd0..58558e0 100644
--- a/src/main/java/com/dulkirfabric/mixin/render/WorldRendererMixin.java
+++ b/src/main/java/com/dulkirfabric/mixin/render/WorldRendererMixin.java
@@ -1,42 +1,16 @@
 package com.dulkirfabric.mixin.render;
 
-import com.dulkirfabric.util.GlowingEntityInterface;
+import com.dulkirfabric.util.render.GlowingEntityInterface;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.sugar.Local;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gl.Framebuffer;
-import net.minecraft.client.gl.SimpleFramebuffer;
-import net.minecraft.client.render.*;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.entity.Entity;
-import org.jetbrains.annotations.Nullable;
-import org.joml.Matrix4f;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import static com.dulkirfabric.DulkirModFabric.mc;
 
 @Mixin(WorldRenderer.class)
 public class WorldRendererMixin {
 
-    @Shadow
-    private @Nullable Framebuffer entityOutlinesFramebuffer;
-    @Shadow
-    @Final
-    public BufferBuilderStorage bufferBuilders;
-    @Shadow @Final private MinecraftClient client;
-    @Unique
-    boolean shouldRenderOutlinesDirect = false;
-
-    @Unique
-    Framebuffer defaultEntityOutlineBuffer;
-
     @ModifyExpressionValue(method = "render(Lnet/minecraft/client/util/math/MatrixStack;FJZLnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/GameRenderer;Lnet/minecraft/client/render/LightmapTextureManager;Lorg/joml/Matrix4f;)V",
             at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;getTeamColorValue()I"))
     public int getGlowColor(int existing, @Local Entity entity) {
@@ -48,36 +22,4 @@ public class WorldRendererMixin {
         return existing;
     }
 
-    @Inject(method = "onResized", at = @At("HEAD"))
-    public void onResized(int width, int height, CallbackInfo ci) {
-        if (defaultEntityOutlineBuffer == null) {
-            defaultEntityOutlineBuffer = new SimpleFramebuffer(width, height, true, false);
-            defaultEntityOutlineBuffer.setClearColor(0, 0, 0, 0);
-        } else {
-            defaultEntityOutlineBuffer.resize(width, height, false);
-        }
-    }
-
-    @Inject(method = "render(Lnet/minecraft/client/util/math/MatrixStack;FJZLnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/GameRenderer;Lnet/minecraft/client/render/LightmapTextureManager;Lorg/joml/Matrix4f;)V",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/BufferBuilderStorage;getEntityVertexConsumers()Lnet/minecraft/client/render/VertexConsumerProvider$Immediate;", shift = At.Shift.AFTER))
-    public void saveDefaultBufferESP(MatrixStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f positionMatrix, CallbackInfo ci) {
-        if (defaultEntityOutlineBuffer != null) {
-            defaultEntityOutlineBuffer.copyDepthFrom(this.entityOutlinesFramebuffer);
-        }
-    }
-
-    @Inject(method = "render(Lnet/minecraft/client/util/math/MatrixStack;FJZLnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/GameRenderer;Lnet/minecraft/client/render/LightmapTextureManager;Lorg/joml/Matrix4f;)V",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/EntityRenderDispatcher;shouldRender(Lnet/minecraft/entity/Entity;Lnet/minecraft/client/render/Frustum;DDD)Z"))
-    public void setOutlineESP(MatrixStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f positionMatrix, CallbackInfo ci, @Local Entity entity) {
-        this.bufferBuilders.getEntityVertexConsumers().drawCurrentLayer();
-        if (entity instanceof GlowingEntityInterface dEntity && dEntity.shouldDulkirEntityGlow() && !dEntity.shouldDulkirEntityESP()) {
-            if (this.entityOutlinesFramebuffer != null)
-                this.entityOutlinesFramebuffer.copyDepthFrom(mc.getFramebuffer());
-        } else {
-            // give esp back here
-            if (this.entityOutlinesFramebuffer != null)
-                this.entityOutlinesFramebuffer.copyDepthFrom(defaultEntityOutlineBuffer);
-        }
-        this.client.getFramebuffer().beginWrite(false);
-    }
 }