v0.8.2

build.gradle

@@ -1,12 +1,3 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath "com.guardsquare:proguard-gradle:7.4.2"
-    }
-}
-
 plugins {
     id 'base'
     id "fabric-loom" version "1.10-SNAPSHOT"
@@ -43,6 +34,10 @@ dependencies {
 
     // Meteor
     modImplementation "meteordevelopment:meteor-client:${project.minecraft_version}-SNAPSHOT"
+
+    // SnakeYaml
+    implementation 'org.yaml:snakeyaml:2.2'
+    include 'org.yaml:snakeyaml:2.2'
 }
 
 tasks {
@@ -64,10 +59,6 @@ tasks {
         }
     }
 
-    remapJar {
-        archiveClassifier.set('reobf') // my-mod-1.0.0-reobf.jar
-    }
-
     java {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
@@ -78,22 +69,3 @@ tasks {
         it.options.release = 21
     }
 }
-
-import net.fabricmc.loom.task.RemapJarTask
-import proguard.gradle.ProGuardTask
-
-tasks.register("proguardObf", ProGuardTask) { ProGuardTask t ->
-    description = "Obfuscate and shrink the reobf JAR"
-
-    dependsOn "remapJar"
-    def reobfJar = file("$buildDir/libs/${archivesBaseName}-${version}-reobf.jar")
-    inputs.file reobfJar
-    injars    reobfJar
-    outjars   file("$buildDir/libs/${archivesBaseName}-${version}-obf.jar")
-    libraryjars files(configurations.modImplementation)  // only your Meteor Client + other libs
-    configuration "proguard-rules.pro"
-}
-
-tasks.build {
-    dependsOn "proguardObf"
-}

gradle.properties

@@ -6,11 +6,9 @@ yarn_mappings=1.21.4+build.8
 loader_version=0.16.14
 
 # Mod Properties
-mod_version=0.8.1
+mod_version=0.8.2
 maven_group=com.genyo
 archives_base_name=genyo-addon
 
 # Dependencies
-
-# DiscordRPC (https://github.com/MeteorDevelopment/java-discord-rpc)
 discordipc_version=1.1

src/main/java/com/genyo/addon/GenyoAddon.java → src/main/java/com/genyo/GenyoAddon.java

@@ -1,19 +1,23 @@
-package com.genyo.addon;
-
-import com.genyo.addon.systems.hud.*;
-import com.genyo.addon.systems.modules.combat.*;
-import com.genyo.addon.systems.modules.misc.*;
-import com.genyo.addon.systems.modules.movement.GenyoPhase;
-import com.genyo.addon.systems.modules.movement.GenyoVelocity;
-import com.genyo.addon.systems.modules.visual.AngelSexHulkenberg;
-import com.genyo.addon.systems.modules.visual.GenyoCapes;
-import com.genyo.addon.systems.modules.visual.GenyoPenisESP;
-import com.genyo.addon.systems.enemies.EnemiesTab;
-import com.genyo.addon.managers.Managers;
-import com.genyo.addon.systems.enemies.Enemies;
-import com.genyo.addon.systems.incombat.InCombatSystem;
-import com.genyo.addon.systems.incombat.InCombatTab;
-import com.genyo.addon.systems.modules.world.*;
+package com.genyo;
+
+import com.genyo.systems.hud.*;
+import com.genyo.systems.modules.combat.*;
+import com.genyo.systems.modules.misc.*;
+import com.genyo.systems.hud.*;
+import com.genyo.systems.modules.combat.*;
+import com.genyo.systems.modules.misc.*;
+import com.genyo.systems.modules.movement.GenyoPhase;
+import com.genyo.systems.modules.movement.GenyoVelocity;
+import com.genyo.systems.modules.visual.AngelSexHulkenberg;
+import com.genyo.systems.modules.visual.GenyoCapes;
+import com.genyo.systems.modules.visual.GenyoPenisESP;
+import com.genyo.systems.enemies.EnemiesTab;
+import com.genyo.managers.Managers;
+import com.genyo.systems.enemies.Enemies;
+import com.genyo.systems.incombat.InCombatSystem;
+import com.genyo.systems.incombat.InCombatTab;
+import com.genyo.systems.modules.world.*;
+import com.genyo.systems.modules.world.*;
 import com.mojang.logging.LogUtils;
 import meteordevelopment.meteorclient.addons.GithubRepo;
 import meteordevelopment.meteorclient.addons.MeteorAddon;
@@ -30,8 +34,6 @@
 import net.minecraft.item.Items;
 import org.slf4j.Logger;
 
-import java.lang.annotation.Target;
-
 public class GenyoAddon extends MeteorAddon {
 
     public static final Logger LOG = LogUtils.getLogger();
@@ -128,6 +130,9 @@ private void initModules(Modules modules) {
         modules.add(new GenyoCapes());
         modules.add(new GenyoPhase());
         modules.add(new GenyoMainMenu());
+        modules.add(new GenyoTimer());
+        modules.add(new Sigma());
+        modules.add(new Einstein());
     }
 
     private void initHUD(Hud hud) {
@@ -150,7 +155,7 @@ public void onRegisterCategories() {
 
     @Override
     public String getPackage() {
-        return "com.genyo.addon";
+        return "com.genyo";
     }
 
     @Override

src/main/java/com/genyo/api/render/Interpolation.java

@@ -0,0 +1,97 @@
+package com.genyo.api.render;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.util.math.Box;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.Vec3d;
+
+import static meteordevelopment.meteorclient.MeteorClient.mc;
+
+public class Interpolation {
+
+    public static Vec3d getRenderPosition(Vec3d pos, Vec3d lastPos, float tickDelta)
+    {
+        return new Vec3d(pos.x - MathHelper.lerp(tickDelta, lastPos.x, pos.x),
+            pos.y - MathHelper.lerp(tickDelta, lastPos.y, pos.y),
+            pos.z - MathHelper.lerp(tickDelta, lastPos.z, pos.z));
+    }
+
+    /**
+     * Gets the interpolated {@link Vec3d} position of an entity (i.e. position
+     * based on render ticks)
+     *
+     * @param entity    The entity to get the position for
+     * @param tickDelta The render time
+     * @return The interpolated vector of an entity
+     */
+    public static Vec3d getRenderPosition(Entity entity, float tickDelta)
+    {
+        return new Vec3d(entity.getX() - MathHelper.lerp(tickDelta, entity.lastRenderX, entity.getX()),
+            entity.getY() - MathHelper.lerp(tickDelta, entity.lastRenderY, entity.getY()),
+            entity.getZ() - MathHelper.lerp(tickDelta, entity.lastRenderZ, entity.getZ()));
+    }
+
+    /**
+     * @param entity
+     * @param tickDelta
+     * @return
+     */
+    public static Vec3d getInterpolatedPosition(Entity entity, float tickDelta)
+    {
+        return new Vec3d(entity.prevX + ((entity.getX() - entity.prevX) * tickDelta),
+            entity.prevY + ((entity.getY() - entity.prevY) * tickDelta),
+            entity.prevZ + ((entity.getZ() - entity.prevZ) * tickDelta));
+    }
+
+    /**
+     * @param prev
+     * @param value
+     * @param factor
+     * @return
+     */
+    public static float interpolateFloat(float prev, float value, float factor)
+    {
+        return prev + ((value - prev) * factor);
+    }
+
+    /**
+     * @param prev
+     * @param value
+     * @param factor
+     * @return
+     */
+    public static double interpolateDouble(double prev, double value, double factor)
+    {
+        return prev + ((value - prev) * factor);
+    }
+
+    /**
+     * @param prevBox
+     * @param box
+     * @return
+     */
+    public static Box getInterpolatedBox(Box prevBox, Box box)
+    {
+
+        double delta = mc.isPaused() ? 1f : mc.getRenderTickCounter().getTickDelta(true);
+
+        return new Box(interpolateDouble(prevBox.minX, box.minX, delta),
+            interpolateDouble(prevBox.minY, box.minY, delta),
+            interpolateDouble(prevBox.minZ, box.minZ, delta),
+            interpolateDouble(prevBox.maxX, box.maxX, delta),
+            interpolateDouble(prevBox.maxY, box.maxY, delta),
+            interpolateDouble(prevBox.maxZ, box.maxZ, delta));
+    }
+
+    /**
+     * @param entity
+     * @return
+     */
+    public static Box getInterpolatedEntityBox(Entity entity)
+    {
+        Box box = entity.getBoundingBox();
+        Box prevBox = entity.getBoundingBox().offset(entity.prevX - entity.getX(), entity.prevY - entity.getY(), entity.prevZ - entity.getZ());
+        return getInterpolatedBox(prevBox, box);
+    }
+
+}

src/main/java/com/genyo/addon/render/RenderBuffers.java → src/main/java/com/genyo/api/render/RenderBuffers.java

@@ -1,4 +1,4 @@
-package com.genyo.addon.render;
+package com.genyo.api.render;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.MinecraftClient;
@@ -48,6 +48,18 @@ public static void postRender()
         postRenderCallbacks.clear();
     }
 
+    public static void post(Runnable callback)
+    {
+        if (isSetup)
+        {
+            postRenderCallbacks.add(callback);
+        }
+        else
+        {
+            callback.run();
+        }
+    }
+
     private static Matrix4d toMatrix4d(Matrix4f matrix4f)
     {
         return new Matrix4d(matrix4f.m00(), matrix4f.m01(), matrix4f.m02(), matrix4f.m03(),

src/main/java/com/genyo/api/render/ScissorStack.java

@@ -0,0 +1,48 @@
+package com.genyo.api.render;
+
+import net.minecraft.client.gui.ScreenRect;
+
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.Objects;
+
+public class ScissorStack {
+    //
+    private final Deque<ScreenRect> stack = new ArrayDeque<>();
+
+    /**
+     * @param rect
+     * @return
+     */
+    public ScreenRect push(ScreenRect rect)
+    {
+        ScreenRect screenRect = stack.peekLast();
+        if (screenRect != null)
+        {
+            ScreenRect screenRect2 = Objects.requireNonNullElse(rect.intersection(screenRect), ScreenRect.empty());
+            stack.addLast(screenRect2);
+            return screenRect2;
+        }
+        else
+        {
+            stack.addLast(rect);
+            return rect;
+        }
+    }
+
+    /**
+     * @return
+     */
+    public ScreenRect pop()
+    {
+        if (stack.isEmpty())
+        {
+            throw new IllegalStateException("Scissor stack underflow");
+        }
+        else
+        {
+            stack.removeLast();
+            return stack.peekLast();
+        }
+    }
+}

src/main/java/com/genyo/addon/events/AttackBlockEvent.java → src/main/java/com/genyo/events/AttackBlockEvent.java

@@ -1,4 +1,4 @@
-package com.genyo.addon.events;
+package com.genyo.events;
 
 import meteordevelopment.meteorclient.events.Cancellable;
 import net.minecraft.block.BlockState;

src/main/java/com/genyo/events/RunTickEvent.java

@@ -0,0 +1,4 @@
+package com.genyo.events;
+
+public class RunTickEvent {
+}

src/main/java/com/genyo/addon/events/StageEvent.java → src/main/java/com/genyo/events/StageEvent.java

@@ -1,4 +1,4 @@
-package com.genyo.addon.events;
+package com.genyo.events;
 
 public class StageEvent {
 

src/main/java/com/genyo/addon/events/TotemPopEvent.java → src/main/java/com/genyo/events/TotemPopEvent.java

@@ -1,4 +1,4 @@
-package com.genyo.addon.events;
+package com.genyo.events;
 
 import net.minecraft.entity.player.PlayerEntity;
 

src/main/java/com/genyo/addon/events/UnderCombatEvent.java → src/main/java/com/genyo/events/UnderCombatEvent.java

@@ -1,4 +1,4 @@
-package com.genyo.addon.events;
+package com.genyo.events;
 
 import net.minecraft.entity.player.PlayerEntity;
 

src/main/java/com/genyo/addon/events/entity/EntityDeathEvent.java → src/main/java/com/genyo/events/entity/EntityDeathEvent.java

@@ -1,4 +1,4 @@
-package com.genyo.addon.events.entity;
+package com.genyo.events.entity;
 
 import net.minecraft.entity.LivingEntity;