Skip to content

feature/migrate-listeners-to-mixins #360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rettichlp wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

feature/migrate-listeners-to-mixins #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
afb7c7c
Remove IAbsorptionGetListener and related logic, implement absorption…
rettichlp May 7, 2026
613e3b0
Remove PlayerEnterVehicleCallback and IEnterVehicleListener, migrate …
rettichlp May 7, 2026
a08e6f2
Remove IMoveListener and related logic, integrate movement handling i…
rettichlp May 7, 2026
2b3e73e
Remove unused IEntityRightClickListener and IKeyPressListener
rettichlp May 7, 2026
730f7bd
Remove ICommandSendListener and migrate command send logic from Comma…
rettichlp May 7, 2026
ae3e751
Remove IMessageSendListener and migrate message send logic to ClientP…
rettichlp May 7, 2026
01cd5d3
Remove IHudRenderListener and RenderListener, migrate HUD rendering l…
rettichlp May 7, 2026
915a94d
Add UnicaCity check to various mixins to ensure feature execution onl…
rettichlp May 7, 2026
2015b23
Remove IScreenOpenListener and migrate logic to HandledScreenMixin
rettichlp May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions src/main/java/de/rettichlp/ucutils/common/Storage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,14 @@ public class Storage {
@Setter
private int activeServices = 0;

@Getter
@Setter
private String bombLocation;

@Getter
@Setter
private LocalDateTime bombPlantTimestamp;

@Getter
@Setter
private boolean carLocked = true;
Expand All @@ -104,19 +112,19 @@ public class Storage {

@Getter
@Setter
private int lastReceivedSmsNumber = -1;
private double hydration = -1.0;

@Getter
@Setter
private MinecartEntity minecartEntityToHighlight;
private int lastReceivedSmsNumber = -1;

@Getter
@Setter
private int moneyAtmAmount = 0;
private MinecartEntity minecartEntityToHighlight;

@Getter
@Setter
private double hydration = -1.0;
private int moneyAtmAmount = 0;

@Getter
@Setter
Expand Down Expand Up @@ -169,6 +177,10 @@ public void print() {
LOGGER.info("wantedEntries[{}]: {}", this.wantedEntries.size(), this.wantedEntries);
// activeServices
LOGGER.info("activeServices: {}", this.activeServices);
// bombLocation
LOGGER.info("bombLocation: {}", this.bombLocation);
// bombPlantTime
LOGGER.info("bombPlantTime: {}", this.bombPlantTimestamp);
// carLocked
LOGGER.info("carLocked: {}", this.carLocked);
// currentJob
Expand Down
83 changes: 0 additions & 83 deletions src/main/java/de/rettichlp/ucutils/common/registry/Registry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,28 @@
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import de.rettichlp.ucutils.common.models.Sound;
import de.rettichlp.ucutils.listener.IAbsorptionGetListener;
import de.rettichlp.ucutils.listener.IBlockRightClickListener;
import de.rettichlp.ucutils.listener.ICommandSendListener;
import de.rettichlp.ucutils.listener.IEnterVehicleListener;
import de.rettichlp.ucutils.listener.IEntityRenderListener;
import de.rettichlp.ucutils.listener.IEntityRightClickListener;
import de.rettichlp.ucutils.listener.IHudRenderListener;
import de.rettichlp.ucutils.listener.IKeyPressListener;
import de.rettichlp.ucutils.listener.IMessageReceiveListener;
import de.rettichlp.ucutils.listener.IMessageSendListener;
import de.rettichlp.ucutils.listener.IMoveListener;
import de.rettichlp.ucutils.listener.INaviSpotReachedListener;
import de.rettichlp.ucutils.listener.IScreenOpenListener;
import de.rettichlp.ucutils.listener.ITickListener;
import de.rettichlp.ucutils.listener.IUCUtilsListener;
import de.rettichlp.ucutils.listener.callback.PlayerEnterVehicleCallback;
import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
import net.fabricmc.fabric.api.client.message.v1.ClientSendMessageEvents;
import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
import net.fabricmc.fabric.api.client.rendering.v1.world.WorldRenderEvents;
import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
import net.fabricmc.fabric.api.event.player.UseBlockCallback;
import net.fabricmc.fabric.api.event.player.UseEntityCallback;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.util.math.BlockPos;
import org.jetbrains.annotations.NotNull;

import java.util.Objects;
import java.util.Set;

import static de.rettichlp.ucutils.UCUtils.LOGGER;
import static de.rettichlp.ucutils.UCUtils.player;
import static de.rettichlp.ucutils.UCUtils.storage;
import static java.util.Collections.emptySet;
import static java.util.Objects.isNull;
import static java.util.Optional.ofNullable;
import static java.util.stream.Collectors.toSet;
import static java.util.stream.StreamSupport.stream;
import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
import static net.minecraft.entity.effect.StatusEffects.ABSORPTION;
import static net.minecraft.registry.Registries.SOUND_EVENT;
import static net.minecraft.registry.Registry.register;
import static net.minecraft.util.ActionResult.PASS;
Expand All @@ -59,8 +38,6 @@ public class Registry {
private final Set<IUCUtilsListener> listenerInstances = getListenerInstances();

private boolean initialized = false;
private BlockPos lastPlayerPos = null;
private boolean lastAbsorptionState = false;

public void registerSounds() {
for (Sound value : Sound.values()) {
Expand Down Expand Up @@ -116,63 +93,11 @@ public void registerListeners() {
return showMessage;
});

ClientSendMessageEvents.ALLOW_CHAT.register(s -> {
boolean sendMessage = getListenersImplementing(IMessageSendListener.class).stream()
.allMatch(iMessageSendListener -> iMessageSendListener.onMessageSend(s));

if (!sendMessage) {
LOGGER.info("UCUtils blocked message sending: {}", s);
}

return sendMessage;
});

ClientSendMessageEvents.ALLOW_COMMAND.register(commandWithoutPrefix -> {
boolean executeCommand = getListenersImplementing(ICommandSendListener.class).stream()
.allMatch(iCommandSendListener -> iCommandSendListener.onCommandSend(commandWithoutPrefix));

if (!executeCommand) {
LOGGER.info("UCUtils blocked command execution: /{}", commandWithoutPrefix);
}

return executeCommand;
});

ClientTickEvents.END_CLIENT_TICK.register((server) -> {
// handle tick
getListenersImplementing(ITickListener.class).forEach(ITickListener::onTick);

// handle on move
BlockPos blockPos = player.getBlockPos();
if (isNull(this.lastPlayerPos) || !this.lastPlayerPos.equals(blockPos)) {
this.lastPlayerPos = blockPos;
getListenersImplementing(IMoveListener.class).forEach(iMoveListener -> iMoveListener.onMove(blockPos));
}

// handle absorption
boolean hasAbsorption = ofNullable(player)
.map(clientPlayerEntity -> clientPlayerEntity.hasStatusEffect(ABSORPTION))
.orElse(false);

if (!this.lastAbsorptionState && hasAbsorption) {
getListenersImplementing(IAbsorptionGetListener.class).forEach(IAbsorptionGetListener::onAbsorptionGet);
}

this.lastAbsorptionState = hasAbsorption;

// handle key press
KeyBinding swapHandsKey = MinecraftClient.getInstance().options.swapHandsKey;
if (swapHandsKey.isPressed()) {
getListenersImplementing(IKeyPressListener.class).forEach(IKeyPressListener::onSwapHandsKeyPress);
}
});

HudRenderCallback.EVENT.register((drawContext, tickCounter) -> getListenersImplementing(IHudRenderListener.class).forEach(iHudRenderListener -> iHudRenderListener.onHudRender(drawContext, tickCounter)));

PlayerEnterVehicleCallback.EVENT.register(vehicle -> getListenersImplementing(IEnterVehicleListener.class).forEach(iEnterVehicleListener -> iEnterVehicleListener.onEnterVehicle(vehicle)));

ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> getListenersImplementing(IScreenOpenListener.class).forEach(iScreenOpenListener -> iScreenOpenListener.onScreenOpen(screen, scaledWidth, scaledHeight)));

UseBlockCallback.EVENT.register((player, world, hand, hitResult) -> {
if (hand != OFF_HAND && world.isClient()) {
getListenersImplementing(IBlockRightClickListener.class).forEach(iBlockRightClickListener -> iBlockRightClickListener.onBlockRightClick(world, hand, hitResult));
Expand All @@ -181,14 +106,6 @@ public void registerListeners() {
return PASS;
});

UseEntityCallback.EVENT.register((player, world, hand, entity, hitResult) -> {
if (hand != OFF_HAND && world.isClient()) {
getListenersImplementing(IEntityRightClickListener.class).forEach(iEntityRightClickListener -> iEntityRightClickListener.onEntityRightClick(world, hand, entity, hitResult));
}

return PASS;
});

WorldRenderEvents.AFTER_ENTITIES.register(context -> getListenersImplementing(IEntityRenderListener.class).forEach(iEntityRenderListener -> iEntityRenderListener.onEntityRender(context)));

// prevent multiple registrations of listeners
Expand Down
Loading