refactor: Put events into their own packages for organization
This commit is contained in:
xgraza
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.alpha432.oyvey.event.impl;
|
||||
package me.alpha432.oyvey.event.impl.entity;
|
||||
|
||||
import me.alpha432.oyvey.event.Event;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.alpha432.oyvey.event.impl;
|
||||
package me.alpha432.oyvey.event.impl.entity.player;
|
||||
|
||||
import me.alpha432.oyvey.event.Event;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.alpha432.oyvey.event.impl;
|
||||
package me.alpha432.oyvey.event.impl.entity.player;
|
||||
|
||||
import me.alpha432.oyvey.event.Event;
|
||||
import me.alpha432.oyvey.event.Stage;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.alpha432.oyvey.event.impl;
|
||||
package me.alpha432.oyvey.event.impl.input;
|
||||
|
||||
import me.alpha432.oyvey.event.Event;
|
||||
|
||||
+3
-3
@@ -1,12 +1,12 @@
|
||||
package me.alpha432.oyvey.event.impl;
|
||||
package me.alpha432.oyvey.event.impl.input;
|
||||
|
||||
import me.alpha432.oyvey.event.Event;
|
||||
|
||||
public class MouseEvent extends Event {
|
||||
public class MouseInputEvent extends Event {
|
||||
private final int button;
|
||||
private final int action;
|
||||
|
||||
public MouseEvent(int button, int action) {
|
||||
public MouseInputEvent(int button, int action) {
|
||||
this.button = button;
|
||||
this.action = action;
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.alpha432.oyvey.event.impl;
|
||||
package me.alpha432.oyvey.event.impl.network;
|
||||
|
||||
import me.alpha432.oyvey.event.Event;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.alpha432.oyvey.event.impl;
|
||||
package me.alpha432.oyvey.event.impl.network;
|
||||
|
||||
import me.alpha432.oyvey.event.Event;
|
||||
import net.minecraft.network.protocol.Packet;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.alpha432.oyvey.event.impl;
|
||||
package me.alpha432.oyvey.event.impl.render;
|
||||
|
||||
import me.alpha432.oyvey.event.Event;
|
||||
import net.minecraft.client.gui.GuiGraphics;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.alpha432.oyvey.event.impl;
|
||||
package me.alpha432.oyvey.event.impl.render;
|
||||
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import me.alpha432.oyvey.event.Event;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package me.alpha432.oyvey.event.impl;
|
||||
package me.alpha432.oyvey.event.impl.render;
|
||||
|
||||
import me.alpha432.oyvey.event.Event;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package me.alpha432.oyvey.features.commands.impl;
|
||||
|
||||
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
||||
import me.alpha432.oyvey.event.impl.KeyInputEvent;
|
||||
import me.alpha432.oyvey.event.impl.input.KeyInputEvent;
|
||||
import me.alpha432.oyvey.event.system.Subscribe;
|
||||
import me.alpha432.oyvey.features.commands.Command;
|
||||
import me.alpha432.oyvey.features.modules.Module;
|
||||
|
||||
@@ -4,8 +4,8 @@ import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import me.alpha432.oyvey.OyVey;
|
||||
import me.alpha432.oyvey.event.impl.ClientEvent;
|
||||
import me.alpha432.oyvey.event.impl.Render2DEvent;
|
||||
import me.alpha432.oyvey.event.impl.Render3DEvent;
|
||||
import me.alpha432.oyvey.event.impl.render.Render2DEvent;
|
||||
import me.alpha432.oyvey.event.impl.render.Render3DEvent;
|
||||
import me.alpha432.oyvey.features.Feature;
|
||||
import me.alpha432.oyvey.features.commands.Command;
|
||||
import me.alpha432.oyvey.features.settings.Bind;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package me.alpha432.oyvey.features.modules.client;
|
||||
|
||||
import me.alpha432.oyvey.OyVey;
|
||||
import me.alpha432.oyvey.event.impl.MouseEvent;
|
||||
import me.alpha432.oyvey.event.impl.Render2DEvent;
|
||||
import me.alpha432.oyvey.event.impl.input.MouseInputEvent;
|
||||
import me.alpha432.oyvey.event.impl.render.Render2DEvent;
|
||||
import me.alpha432.oyvey.event.system.Subscribe;
|
||||
import me.alpha432.oyvey.features.gui.HudEditorScreen;
|
||||
import me.alpha432.oyvey.features.modules.Module;
|
||||
@@ -44,7 +44,7 @@ public abstract class HudModule extends Module {
|
||||
}
|
||||
|
||||
@Subscribe
|
||||
public void onMouse(MouseEvent e) {
|
||||
public void onMouse(MouseInputEvent e) {
|
||||
if (!(mc.screen instanceof HudEditorScreen) || nullCheck()) return;
|
||||
|
||||
if (e.getAction() == 0) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package me.alpha432.oyvey.features.modules.combat;
|
||||
|
||||
import me.alpha432.oyvey.event.impl.PacketEvent;
|
||||
import me.alpha432.oyvey.event.impl.network.PacketEvent;
|
||||
import me.alpha432.oyvey.event.system.Subscribe;
|
||||
import me.alpha432.oyvey.features.modules.Module;
|
||||
import net.minecraft.network.protocol.game.ServerboundInteractPacket;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package me.alpha432.oyvey.features.modules.hud;
|
||||
|
||||
import me.alpha432.oyvey.event.impl.Render2DEvent;
|
||||
import me.alpha432.oyvey.event.impl.render.Render2DEvent;
|
||||
import me.alpha432.oyvey.features.modules.client.HudModule;
|
||||
import me.alpha432.oyvey.features.settings.Setting;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package me.alpha432.oyvey.features.modules.hud;
|
||||
|
||||
import me.alpha432.oyvey.event.impl.Render2DEvent;
|
||||
import me.alpha432.oyvey.event.impl.render.Render2DEvent;
|
||||
import me.alpha432.oyvey.features.modules.client.HudModule;
|
||||
import me.alpha432.oyvey.features.settings.Setting;
|
||||
import me.alpha432.oyvey.util.BuildConfig;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package me.alpha432.oyvey.features.modules.player;
|
||||
|
||||
import me.alpha432.oyvey.event.impl.PacketEvent;
|
||||
import me.alpha432.oyvey.event.impl.network.PacketEvent;
|
||||
import me.alpha432.oyvey.event.system.Subscribe;
|
||||
import me.alpha432.oyvey.features.modules.Module;
|
||||
import net.minecraft.network.protocol.game.ClientboundExplodePacket;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package me.alpha432.oyvey.features.modules.render;
|
||||
|
||||
import me.alpha432.oyvey.event.impl.Render3DEvent;
|
||||
import me.alpha432.oyvey.event.impl.RenderBlockOutlineEvent;
|
||||
import me.alpha432.oyvey.event.impl.render.Render3DEvent;
|
||||
import me.alpha432.oyvey.event.impl.render.RenderBlockOutlineEvent;
|
||||
import me.alpha432.oyvey.event.system.Subscribe;
|
||||
import me.alpha432.oyvey.features.modules.Module;
|
||||
import me.alpha432.oyvey.features.settings.Setting;
|
||||
|
||||
@@ -2,7 +2,14 @@ package me.alpha432.oyvey.manager;
|
||||
|
||||
import me.alpha432.oyvey.OyVey;
|
||||
import me.alpha432.oyvey.event.Stage;
|
||||
import me.alpha432.oyvey.event.impl.*;
|
||||
import me.alpha432.oyvey.event.impl.entity.DeathEvent;
|
||||
import me.alpha432.oyvey.event.impl.entity.player.TickEvent;
|
||||
import me.alpha432.oyvey.event.impl.entity.player.UpdateWalkingPlayerEvent;
|
||||
import me.alpha432.oyvey.event.impl.input.KeyInputEvent;
|
||||
import me.alpha432.oyvey.event.impl.network.ChatEvent;
|
||||
import me.alpha432.oyvey.event.impl.network.PacketEvent;
|
||||
import me.alpha432.oyvey.event.impl.render.Render2DEvent;
|
||||
import me.alpha432.oyvey.event.impl.render.Render3DEvent;
|
||||
import me.alpha432.oyvey.event.system.Subscribe;
|
||||
import me.alpha432.oyvey.features.Feature;
|
||||
import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package me.alpha432.oyvey.manager;
|
||||
|
||||
import me.alpha432.oyvey.event.impl.TickEvent;
|
||||
import me.alpha432.oyvey.event.impl.entity.player.TickEvent;
|
||||
import me.alpha432.oyvey.event.system.Subscribe;
|
||||
import me.alpha432.oyvey.features.Feature;
|
||||
import net.minecraft.core.BlockPos;
|
||||
|
||||
@@ -3,8 +3,8 @@ package me.alpha432.oyvey.manager;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import me.alpha432.oyvey.OyVey;
|
||||
import me.alpha432.oyvey.event.impl.Render2DEvent;
|
||||
import me.alpha432.oyvey.event.impl.Render3DEvent;
|
||||
import me.alpha432.oyvey.event.impl.render.Render2DEvent;
|
||||
import me.alpha432.oyvey.event.impl.render.Render3DEvent;
|
||||
import me.alpha432.oyvey.features.Feature;
|
||||
import me.alpha432.oyvey.features.commands.CommandModule;
|
||||
import me.alpha432.oyvey.features.modules.Module;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package me.alpha432.oyvey.manager;
|
||||
|
||||
import me.alpha432.oyvey.event.Stage;
|
||||
import me.alpha432.oyvey.event.impl.UpdateWalkingPlayerEvent;
|
||||
import me.alpha432.oyvey.event.impl.entity.player.UpdateWalkingPlayerEvent;
|
||||
import me.alpha432.oyvey.event.system.Subscribe;
|
||||
import me.alpha432.oyvey.features.Feature;
|
||||
import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package me.alpha432.oyvey.mixin.entity;
|
||||
|
||||
import me.alpha432.oyvey.event.Stage;
|
||||
import me.alpha432.oyvey.event.impl.TickEvent;
|
||||
import me.alpha432.oyvey.event.impl.UpdateWalkingPlayerEvent;
|
||||
import me.alpha432.oyvey.event.impl.entity.player.TickEvent;
|
||||
import me.alpha432.oyvey.event.impl.entity.player.UpdateWalkingPlayerEvent;
|
||||
import net.minecraft.client.player.LocalPlayer;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package me.alpha432.oyvey.mixin.input;
|
||||
|
||||
import me.alpha432.oyvey.event.impl.KeyInputEvent;
|
||||
import me.alpha432.oyvey.event.impl.input.KeyInputEvent;
|
||||
import net.minecraft.client.KeyboardHandler;
|
||||
import net.minecraft.client.input.KeyEvent;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package me.alpha432.oyvey.mixin.input;
|
||||
|
||||
import me.alpha432.oyvey.event.impl.MouseEvent;
|
||||
import me.alpha432.oyvey.event.impl.input.MouseInputEvent;
|
||||
import net.minecraft.client.MouseHandler;
|
||||
import net.minecraft.client.input.MouseButtonInfo;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
@@ -14,7 +14,7 @@ import static me.alpha432.oyvey.util.traits.Util.EVENT_BUS;
|
||||
public class MixinMouse {
|
||||
@Inject(method = "onButton", at = @At("HEAD"), cancellable = true)
|
||||
private void onMouseButton(long window, MouseButtonInfo input, int action, CallbackInfo ci) {
|
||||
if (EVENT_BUS.post(new MouseEvent(input.button(), action))) {
|
||||
if (EVENT_BUS.post(new MouseInputEvent(input.button(), action))) {
|
||||
ci.cancel();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ package me.alpha432.oyvey.mixin.network;
|
||||
import io.netty.channel.Channel;
|
||||
import io.netty.channel.ChannelFutureListener;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import me.alpha432.oyvey.event.impl.PacketEvent;
|
||||
import me.alpha432.oyvey.event.impl.network.PacketEvent;
|
||||
import net.minecraft.network.Connection;
|
||||
import net.minecraft.network.protocol.Packet;
|
||||
import net.minecraft.network.protocol.PacketFlow;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package me.alpha432.oyvey.mixin.network;
|
||||
|
||||
import me.alpha432.oyvey.event.impl.ChatEvent;
|
||||
import me.alpha432.oyvey.event.impl.network.ChatEvent;
|
||||
import net.minecraft.client.multiplayer.ClientPacketListener;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package me.alpha432.oyvey.mixin.render;
|
||||
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import me.alpha432.oyvey.event.impl.RenderBlockOutlineEvent;
|
||||
import me.alpha432.oyvey.event.impl.render.RenderBlockOutlineEvent;
|
||||
import net.minecraft.client.renderer.LevelRenderer;
|
||||
import net.minecraft.client.renderer.MultiBufferSource;
|
||||
import net.minecraft.client.renderer.state.LevelRenderState;
|
||||
|
||||
@@ -5,7 +5,7 @@ import com.mojang.blaze3d.buffers.GpuBufferSlice;
|
||||
import com.mojang.blaze3d.resource.GraphicsResourceAllocator;
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import com.mojang.math.Axis;
|
||||
import me.alpha432.oyvey.event.impl.Render3DEvent;
|
||||
import me.alpha432.oyvey.event.impl.render.Render3DEvent;
|
||||
import net.minecraft.client.Camera;
|
||||
import net.minecraft.client.DeltaTracker;
|
||||
import net.minecraft.client.renderer.LevelRenderer;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package me.alpha432.oyvey.mixin.render.gui;
|
||||
|
||||
import me.alpha432.oyvey.event.impl.Render2DEvent;
|
||||
import me.alpha432.oyvey.event.impl.render.Render2DEvent;
|
||||
import net.minecraft.client.DeltaTracker;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.Gui;
|
||||
|
||||
Reference in New Issue
Block a user