-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
93e373e
commit 8b246d6
Showing
12 changed files
with
195 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
arcade-events-client/src/main/java/net/casual/arcade/events/client/mixins/GuiMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
package net.casual.arcade.events.client.mixins; | ||
|
||
import net.casual.arcade.events.BuiltInEventPhases; | ||
import net.casual.arcade.events.GlobalEventHandler; | ||
import net.casual.arcade.events.client.render.GuiRenderEvent; | ||
import net.minecraft.client.DeltaTracker; | ||
import net.minecraft.client.gui.Gui; | ||
import net.minecraft.client.gui.GuiGraphics; | ||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.injection.At; | ||
import org.spongepowered.asm.mixin.injection.Inject; | ||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
||
@Mixin(Gui.class) | ||
public class GuiMixin { | ||
@Inject( | ||
method = "render", | ||
at = @At("HEAD") | ||
) | ||
private void onPreRender(GuiGraphics graphics, DeltaTracker deltas, CallbackInfo ci) { | ||
GuiRenderEvent event = new GuiRenderEvent(graphics, deltas); | ||
GlobalEventHandler.Client.broadcast(event, BuiltInEventPhases.PRE_PHASES); | ||
} | ||
|
||
@Inject( | ||
method = "render", | ||
at = @At("TAIL") | ||
) | ||
private void onPostRender(GuiGraphics graphics, DeltaTracker deltas, CallbackInfo ci) { | ||
GuiRenderEvent event = new GuiRenderEvent(graphics, deltas); | ||
GlobalEventHandler.Client.broadcast(event, BuiltInEventPhases.POST_PHASES); | ||
} | ||
} |
64 changes: 64 additions & 0 deletions
64
...vents-client/src/main/java/net/casual/arcade/events/client/mixins/LevelRendererMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
package net.casual.arcade.events.client.mixins; | ||
|
||
import com.llamalad7.mixinextras.sugar.Local; | ||
import com.llamalad7.mixinextras.sugar.Share; | ||
import com.llamalad7.mixinextras.sugar.ref.LocalRef; | ||
import net.casual.arcade.events.GlobalEventHandler; | ||
import net.casual.arcade.events.client.render.LevelRenderEvent; | ||
import net.minecraft.client.DeltaTracker; | ||
import net.minecraft.client.renderer.LevelRenderer; | ||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.injection.At; | ||
import org.spongepowered.asm.mixin.injection.Inject; | ||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
||
import java.util.Set; | ||
|
||
@Mixin(LevelRenderer.class) | ||
public class LevelRendererMixin { | ||
@Inject( | ||
method = "method_62214", | ||
at = @At(value = "CONSTANT", args = "stringValue=terrain") | ||
) | ||
private void onTerrain( | ||
CallbackInfo ci, | ||
@Local(argsOnly = true) DeltaTracker deltas, | ||
@Share("event") LocalRef<LevelRenderEvent> eventRef | ||
) { | ||
LevelRenderEvent event = new LevelRenderEvent((LevelRenderer) (Object) this, deltas); | ||
GlobalEventHandler.Client.broadcast(event, Set.of(LevelRenderEvent.TERRAIN)); | ||
eventRef.set(event); | ||
} | ||
|
||
@Inject( | ||
method = "method_62214", | ||
at = @At(value = "CONSTANT", args = "stringValue=entities") | ||
) | ||
private void onEntities(CallbackInfo ci, @Share("event") LocalRef<LevelRenderEvent> eventRef) { | ||
GlobalEventHandler.Client.broadcast(eventRef.get(), Set.of(LevelRenderEvent.ENTITIES)); | ||
} | ||
|
||
@Inject( | ||
method = "method_62214", | ||
at = @At(value = "CONSTANT", args = "stringValue=blockentities") | ||
) | ||
private void onBlockEntities(CallbackInfo ci, @Share("event") LocalRef<LevelRenderEvent> eventRef) { | ||
GlobalEventHandler.Client.broadcast(eventRef.get(), Set.of(LevelRenderEvent.BLOCK_ENTITIES)); | ||
} | ||
|
||
@Inject( | ||
method = "method_62214", | ||
at = @At(value = "CONSTANT", args = "stringValue=debug") | ||
) | ||
private void onDebug(CallbackInfo ci, @Share("event") LocalRef<LevelRenderEvent> eventRef) { | ||
GlobalEventHandler.Client.broadcast(eventRef.get(), Set.of(LevelRenderEvent.DEBUG)); | ||
} | ||
|
||
@Inject( | ||
method = "method_62214", | ||
at = @At(value = "CONSTANT", args = "stringValue=translucent") | ||
) | ||
private void onTranslucent(CallbackInfo ci, @Share("event") LocalRef<LevelRenderEvent> eventRef) { | ||
GlobalEventHandler.Client.broadcast(eventRef.get(), Set.of(LevelRenderEvent.TRANSLUCENT)); | ||
} | ||
} |
31 changes: 31 additions & 0 deletions
31
...de-events-client/src/main/java/net/casual/arcade/events/client/mixins/MinecraftMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
package net.casual.arcade.events.client.mixins; | ||
|
||
import net.casual.arcade.events.BuiltInEventPhases; | ||
import net.casual.arcade.events.GlobalEventHandler; | ||
import net.casual.arcade.events.client.ClientTickEvent; | ||
import net.minecraft.client.Minecraft; | ||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.injection.At; | ||
import org.spongepowered.asm.mixin.injection.Inject; | ||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
||
@Mixin(Minecraft.class) | ||
public class MinecraftMixin { | ||
@Inject( | ||
method = "tick", | ||
at = @At("HEAD") | ||
) | ||
private void onPreTick(CallbackInfo ci) { | ||
ClientTickEvent event = new ClientTickEvent((Minecraft) (Object) this); | ||
GlobalEventHandler.Client.broadcast(event, BuiltInEventPhases.PRE_PHASES); | ||
} | ||
|
||
@Inject( | ||
method = "tick", | ||
at = @At("TAIL") | ||
) | ||
private void onPostTick(CallbackInfo ci) { | ||
ClientTickEvent event = new ClientTickEvent((Minecraft) (Object) this); | ||
GlobalEventHandler.Client.broadcast(event, BuiltInEventPhases.POST_PHASES); | ||
} | ||
} |
21 changes: 21 additions & 0 deletions
21
arcade-events-client/src/main/kotlin/net/casual/arcade/events/client/ClientTickEvent.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
package net.casual.arcade.events.client | ||
|
||
import net.casual.arcade.events.BuiltInEventPhases | ||
import net.casual.arcade.events.common.Event | ||
import net.minecraft.client.Minecraft | ||
|
||
public data class ClientTickEvent( | ||
val client: Minecraft | ||
): Event { | ||
public companion object { | ||
/** | ||
* Runs before the client has run the tick. | ||
*/ | ||
public const val PHASE_PRE: String = BuiltInEventPhases.PRE | ||
|
||
/** | ||
* Runs after the client has run the tick. | ||
*/ | ||
public const val PHASE_POST: String = BuiltInEventPhases.POST | ||
} | ||
} |
17 changes: 17 additions & 0 deletions
17
...de-events-client/src/main/kotlin/net/casual/arcade/events/client/render/GuiRenderEvent.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
package net.casual.arcade.events.client.render | ||
|
||
import net.casual.arcade.events.BuiltInEventPhases | ||
import net.casual.arcade.events.common.Event | ||
import net.minecraft.client.DeltaTracker | ||
import net.minecraft.client.gui.GuiGraphics | ||
|
||
public data class GuiRenderEvent( | ||
val graphics: GuiGraphics, | ||
val deltas: DeltaTracker | ||
): Event { | ||
public companion object { | ||
public const val PHASE_PRE: String = BuiltInEventPhases.PRE | ||
|
||
public const val PHASE_POST: String = BuiltInEventPhases.POST | ||
} | ||
} |
18 changes: 18 additions & 0 deletions
18
...-events-client/src/main/kotlin/net/casual/arcade/events/client/render/LevelRenderEvent.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package net.casual.arcade.events.client.render | ||
|
||
import net.casual.arcade.events.common.Event | ||
import net.minecraft.client.DeltaTracker | ||
import net.minecraft.client.renderer.LevelRenderer | ||
|
||
public data class LevelRenderEvent( | ||
val renderer: LevelRenderer, | ||
val deltas: DeltaTracker | ||
): Event { | ||
public companion object { | ||
public const val TERRAIN: String = "terrain" | ||
public const val ENTITIES: String = "entities" | ||
public const val BLOCK_ENTITIES: String = "block-entities" | ||
public const val DEBUG: String = "debug" | ||
public const val TRANSLUCENT: String = "translucent" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 0 additions & 17 deletions
17
arcade-events-server/src/main/kotlin/net/casual/arcade/events/server/ServerOffThreadEvent.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...er/src/main/kotlin/net/casual/arcade/events/server/player/PlayerClientboundPacketEvent.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
package net.casual.arcade.events.server.player | ||
|
||
import net.casual.arcade.events.common.CancellableEvent | ||
import net.casual.arcade.events.server.ServerOffThreadEvent | ||
import net.casual.arcade.events.common.MissingExecutorEvent | ||
import net.minecraft.network.protocol.Packet | ||
import net.minecraft.server.level.ServerPlayer | ||
|
||
public data class PlayerClientboundPacketEvent( | ||
override val player: ServerPlayer, | ||
var packet: Packet<*> | ||
): CancellableEvent.Default(), PlayerEvent, ServerOffThreadEvent | ||
): CancellableEvent.Default(), PlayerEvent, MissingExecutorEvent |