diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index bacf396..6939294 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -8,8 +8,8 @@ assignees: '' --- **Version** -- Minecraft Version [e.g. 1.2.3] -- Mod Version [e.g. 1.0.0+1.21.4-1.21.8] + - Mod Version [e.g. 1.21.1] + - Minecraft Version [e.g. 1.2.3] **Describe the bug** A clear and concise description of what the bug is. diff --git a/build.gradle b/build.gradle index d184aaf..0784e65 100644 --- a/build.gradle +++ b/build.gradle @@ -6,29 +6,32 @@ plugins { def targetJavaVersion = 21 -def isSnapshot = System.getenv('SNAPSHOT_BUILD')?.toBoolean() ?: false +def isSnapshot = providers.environmentVariable("SNAPSHOT_BUILD").map { it.toBoolean() }.orElse(false).get() def buildNumber = System.getenv('BUILD_NUMBER') ?: 'dev' group = maven_group -archivesBaseName = archives_base_name version = "${mod_version}+${minecraft_version}-${max_minecraft_version}" + (isSnapshot ? "-SNAPSHOT+${buildNumber}" : "") +base { + archivesName = archives_base_name +} + repositories { maven { - name = "pietrSpaceRepositoryReleases" - url = uri("https://maven.pietr.space/releases") + name "Pietr Space Releases" + url "https://maven.pietr.space/releases" } } dependencies { - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + minecraft "com.mojang:minecraft:${minecraft_version}" + mappings "net.fabricmc:yarn:${yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${loader_version}" - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" - implementation "nl.devpieter:sees:1.1.0" - include "nl.devpieter:sees:1.1.0" + implementation "nl.devpieter:sees:1.2.1" + include "nl.devpieter:sees:1.2.1" } preprocess { @@ -52,8 +55,7 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" - it.options.release.set(targetJavaVersion) + options.encoding = "UTF-8" } java { @@ -64,7 +66,7 @@ java { jar { from("LICENSE") { - rename { "${it}_${project.archivesBaseName}" } + rename { "${it}_${base.archivesName.get()}" } } } @@ -77,10 +79,10 @@ publishing { } repositories { maven { - url = findProperty('mavenRepositoryUrl') + url = uri(providers.gradleProperty("mavenRepositoryUrl").orNull ?: "http://localhost:8081/releases/nl/devpieter/utilize") credentials { - username = findProperty('mavenRepositoryUsername') - password = findProperty('mavenRepositoryPassword') + username = providers.gradleProperty("mavenRepositoryUsername").orNull + password = providers.gradleProperty("mavenRepositoryPassword").orNull } } } diff --git a/gradle.properties b/gradle.properties index bfc3d12..658e81a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -loader_version=0.16.10 +loader_version=0.18.4 # Mod Properties artifact_id=utilize -mod_version=1.0.12 +mod_version=1.1.1 maven_group=nl.devpieter archives_base_name=Utilize diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca025c8..23449a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/root.gradle b/root.gradle index 0820ee6..565ff69 100644 --- a/root.gradle +++ b/root.gradle @@ -1,17 +1,16 @@ plugins { - id 'fabric-loom' version '1.11-SNAPSHOT' apply false - id 'com.replaymod.preprocess' version '79307437eb' + id 'fabric-loom' version '1.14-SNAPSHOT' apply false +// id 'com.replaymod.preprocess' version '79307437eb' + id 'com.replaymod.preprocess' version '521df70941' } preprocess { - def mc12109 = createNode('1.21.9', 12109, "yarn") - def mc12106 = createNode('1.21.6', 12106, "yarn") - def mc12105 = createNode('1.21.5', 12105, "yarn") - def mc12102 = createNode('1.21.2', 12102, "yarn") - def mc12100 = createNode('1.21.0', 12100, "yarn") +// def mc12105 = createNode('1.21.5', 12105, "yarn") +// def mc12102 = createNode('1.21.2', 12102, "yarn") +// def mc12100 = createNode('1.21.0', 12100, "yarn") + +// mc12105.link(mc12102, null) +// mc12102.link(mc12100, null) - mc12109.link(mc12106, null) - mc12106.link(mc12105, null) - mc12105.link(mc12102, null) - mc12102.link(mc12100, null) + def mc12109 = createNode('1.21.9', 12109, "yarn") } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 8bfc5d8..99ee0aa 100644 --- a/settings.gradle +++ b/settings.gradle @@ -23,11 +23,7 @@ pluginManagement { rootProject.buildFileName = "root.gradle" var versions = [ - "1.21.9", - "1.21.6", - "1.21.5", - "1.21.2", - "1.21.0" + "1.21.9" ] versions.forEach { version -> diff --git a/src/main/java/nl/devpieter/utilize/Utilize.java b/src/main/java/nl/devpieter/utilize/Utilize.java index 8b6258d..82a703a 100644 --- a/src/main/java/nl/devpieter/utilize/Utilize.java +++ b/src/main/java/nl/devpieter/utilize/Utilize.java @@ -5,113 +5,106 @@ import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.ModContainer; import net.minecraft.SharedConstants; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.ClientPlayerEntity; import nl.devpieter.utilize.http.AsyncRequest; -import nl.devpieter.utilize.listeners.packet.EntityTrackerUpdatePacketListener; -import nl.devpieter.utilize.listeners.packet.OpenScreenPacketListener; -import nl.devpieter.utilize.listeners.packet.SetTradeOffersPacketListener; -import nl.devpieter.utilize.managers.PacketManager; import nl.devpieter.utilize.setting.SettingManager; -import nl.devpieter.utilize.utils.ClientUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.List; - public class Utilize implements ClientModInitializer { private static Utilize INSTANCE; - private static boolean INITIALIZED = false; - - private static final ModContainer MOD_CONTAINER = FabricLoader.getInstance().getModContainer("utilize").orElseThrow(); - @Deprecated(since = "1.0.11", forRemoval = true) - public static final Logger LOGGER = LoggerFactory.getLogger("Utilize"); + private final Logger logger = LoggerFactory.getLogger("Utilize"); + private final ModContainer modContainer = FabricLoader.getInstance().getModContainer("utilize").orElseThrow(); - private static boolean BLOCK_SWING_HAND_ONCE = false; - private static final List BLOCK_SCREEN_IDS = new ArrayList<>(); + private boolean isInitialized; @Override public void onInitializeClient() { INSTANCE = this; - PacketManager packetManager = PacketManager.getInstance(); - packetManager.subscribe(new EntityTrackerUpdatePacketListener()); - packetManager.subscribe(new OpenScreenPacketListener()); - packetManager.subscribe(new SetTradeOffersPacketListener()); - ClientLifecycleEvents.CLIENT_STOPPING.register((client) -> { - LOGGER.info("Shutting down Utilize..."); + logger.info("Shutting down Utilize..."); SettingManager.shutdown(); AsyncRequest.shutdown(); }); - INITIALIZED = true; - } - - public static Utilize getInstance() { - if (INSTANCE == null) throw new IllegalStateException("Utilize has not been initialized yet!"); - return INSTANCE; - } - - public static boolean isInitialized() { - return INITIALIZED; + logger.info("Utilize initialized successfully! Version: {}", getUtilizeVersion()); + isInitialized = true; } - @Deprecated(since = "1.0.11", forRemoval = true) - public static boolean shouldBlockSwingHandOnce() { - return BLOCK_SWING_HAND_ONCE; + /** + * Checks if Utilize has been initialized. + * + * @return true if the mod instance exists and is initialized, false otherwise + */ + public static boolean initialized() { + return INSTANCE != null && INSTANCE.isInitialized; } - @Deprecated(since = "1.0.11", forRemoval = true) - public static void blockSwingHandOnce() { - BLOCK_SWING_HAND_ONCE = true; - } + /** + * Returns the singleton instance of Utilize. + * + * @return the initialized Utilize instance + * @throws IllegalStateException if Utilize has not been initialized yet + */ + public static Utilize getInstance() { + if (INSTANCE == null || !INSTANCE.isInitialized) { + throw new IllegalStateException("Utilize has not been initialized yet!"); + } - @Deprecated(since = "1.0.11", forRemoval = true) - public static void blockedSwingHandOnce() { - BLOCK_SWING_HAND_ONCE = false; + return INSTANCE; } - @Deprecated(since = "1.0.11, refactor", forRemoval = true) - public static boolean shouldBlockScreenId(int screenId) { - return BLOCK_SCREEN_IDS.contains(screenId); + /** + * Indicates whether this Utilize instance has completed initialization. + * + * @return true if initialized, false otherwise + */ + public boolean isInitialized() { + return isInitialized; } - @Deprecated(since = "1.0.11, refactor", forRemoval = true) - public static void blockScreenId(int screenId) { - if (BLOCK_SCREEN_IDS.contains(screenId)) return; - BLOCK_SCREEN_IDS.add(screenId); - - if (!ClientUtils.hasPlayer()) return; - MinecraftClient client = MinecraftClient.getInstance(); - ClientPlayerEntity player = ClientUtils.getPlayer(); - - client.execute(() -> { - if (player == null || player.currentScreenHandler.syncId != screenId) return; - - player.closeHandledScreen(); - blockedScreenId(screenId); - }); + public String getUtilizeVersion() { + return modContainer.getMetadata().getVersion().getFriendlyString(); } - @Deprecated(since = "1.0.11, refactor", forRemoval = true) - public static void blockedScreenId(int screenId) { - BLOCK_SCREEN_IDS.removeIf(id -> id == screenId); + public String getMinecraftVersion() { + return SharedConstants.getGameVersion().name(); } - public static String getUtilizeVersion() { - return MOD_CONTAINER.getMetadata().getVersion().getFriendlyString(); + /** + * Constructs a default User-Agent string for Utilize. + * The format is: "Utilize/{utilizeVersion} (Mc/{minecraftVersion}; Java/{javaVersion})" + * + * @return the User-Agent string containing Utilize, Minecraft, and Java versions + */ + public String getUserAgent() { + return String.format( + "Utilize/%s (Mc/%s; Java/%s)", + getUtilizeVersion(), + getMinecraftVersion(), + System.getProperty("java.version") + ); } - public static String getMinecraftVersion() { - //#if MC>=12106 - return SharedConstants.getGameVersion().name(); - //#else - //$$ return SharedConstants.getGameVersion().getName(); - //#endif + /** + * Constructs a custom User-Agent string with the provided name and version. + * The format is: "{name}/{version} (Utilize/{utilizeVersion}; Mc/{minecraftVersion}; Java/{javaVersion})" + * + * @param name the name to include in the User-Agent + * @param version the version to include in the User-Agent + * @return the User-Agent string containing the custom name/version, Utilize, Minecraft, and Java versions + */ + public String getUserAgent(String name, String version) { + return String.format( + "%s/%s (Utilize/%s; Mc/%s; Java/%s)", + name, + version, + getUtilizeVersion(), + getMinecraftVersion(), + System.getProperty("java.version") + ); } } diff --git a/src/main/java/nl/devpieter/utilize/enums/KeyActionOverride.java b/src/main/java/nl/devpieter/utilize/enums/KeyActionOverride.java new file mode 100644 index 0000000..e8b4dd3 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/enums/KeyActionOverride.java @@ -0,0 +1,7 @@ +package nl.devpieter.utilize.enums; + +public enum KeyActionOverride { + NONE, + FORCE_PRESS, + FORCE_RELEASE +} diff --git a/src/main/java/nl/devpieter/utilize/events/chat/ReceiveMessageEvent.java b/src/main/java/nl/devpieter/utilize/events/chat/ReceiveMessageEvent.java index a0cb52f..a4f2590 100644 --- a/src/main/java/nl/devpieter/utilize/events/chat/ReceiveMessageEvent.java +++ b/src/main/java/nl/devpieter/utilize/events/chat/ReceiveMessageEvent.java @@ -1,55 +1,27 @@ package nl.devpieter.utilize.events.chat; import net.minecraft.text.Text; -import nl.devpieter.sees.Event.CancelableEventBase; -import nl.devpieter.sees.Event.ReturnableEvent; +import nl.devpieter.sees.event.SCancelableEventBase; +import nl.devpieter.sees.event.SReturnableEvent; -/** - * Event fired when a chat message ({@link Text}) is received by the client. - *

- * This event is cancelable and allows modification of the message before display. - */ -public class ReceiveMessageEvent extends CancelableEventBase implements ReturnableEvent { +public class ReceiveMessageEvent extends SCancelableEventBase implements SReturnableEvent { - /** - * The chat message, which may be modified by event listeners. - */ private Text message; - /** - * Constructs a new ReceiveMessageEvent with the given message. - * - * @param message The received chat message. - */ public ReceiveMessageEvent(Text message) { this.message = message; } - /** - * Gets the current message result. - * - * @return The current chat message. - */ @Override public Text getResult() { return this.message; } - /** - * Sets the message result. - * - * @param message The new chat message to set. - */ @Override public void setResult(Text message) { this.message = message; } - /** - * Alias for {@link #getResult()}. - * - * @return The chat message. - */ public Text message() { return this.message; } diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/AttackBlockEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/AttackBlockEvent.java deleted file mode 100644 index bd1e6c8..0000000 --- a/src/main/java/nl/devpieter/utilize/events/interaction/AttackBlockEvent.java +++ /dev/null @@ -1,52 +0,0 @@ -package nl.devpieter.utilize.events.interaction; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import nl.devpieter.sees.Event.CancelableEventBase; - -/** - * Event fired when a block is attacked by the player. - *

- * This event is cancelable. - */ -public class AttackBlockEvent extends CancelableEventBase { - - /** - * The position of the block being attacked. - */ - private final BlockPos blockPos; - - /** - * The direction from which the block is attacked. - */ - private final Direction direction; - - /** - * Constructs a new AttackBlockEvent with the specified block position and direction. - * - * @param blockPos The position of the block being attacked. - * @param direction The direction from which the block is attacked. - */ - public AttackBlockEvent(BlockPos blockPos, Direction direction) { - this.blockPos = blockPos; - this.direction = direction; - } - - /** - * Gets the position of the block being attacked. - * - * @return The position of the block. - */ - public BlockPos blockPos() { - return blockPos; - } - - /** - * Gets the direction from which the block is attacked. - * - * @return The direction of the attack. - */ - public Direction direction() { - return direction; - } -} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/AttackEntityEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/AttackEntityEvent.java deleted file mode 100644 index 78a19d0..0000000 --- a/src/main/java/nl/devpieter/utilize/events/interaction/AttackEntityEvent.java +++ /dev/null @@ -1,53 +0,0 @@ -package nl.devpieter.utilize.events.interaction; - -import net.minecraft.client.MinecraftClient; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import nl.devpieter.sees.Event.CancelableEventBase; - -/** - * Event fired when an entity is attacked by the player. - *

- * This event is cancelable. - */ -public class AttackEntityEvent extends CancelableEventBase { - - /** - * The entity being attacked. - */ - private final Entity target; - - /** - * Constructs a new AttackEntityEvent with the specified player and target entity. - * - * @param player The player who is attacking the entity. - * @param target The entity being attacked. - */ - @Deprecated(since = "1.0.9", forRemoval = true) - public AttackEntityEvent(PlayerEntity player, Entity target) { - this.target = target; - } - - /** - * Constructs a new AttackEntityEvent with the specified target entity. - * - * @param target The entity being attacked. - */ - public AttackEntityEvent(Entity target) { - this.target = target; - } - - @Deprecated(since = "1.0.9", forRemoval = true) - public PlayerEntity player() { - return MinecraftClient.getInstance().player; - } - - /** - * Gets the entity being attacked. - * - * @return The target entity. - */ - public Entity target() { - return target; - } -} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/BreakBlockEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/BreakBlockEvent.java deleted file mode 100644 index 95e4dc4..0000000 --- a/src/main/java/nl/devpieter/utilize/events/interaction/BreakBlockEvent.java +++ /dev/null @@ -1,17 +0,0 @@ -package nl.devpieter.utilize.events.interaction; - -import net.minecraft.util.math.BlockPos; -import nl.devpieter.sees.Event.CancelableEventBase; - -public class BreakBlockEvent extends CancelableEventBase { - - private final BlockPos blockPos; - - public BreakBlockEvent(BlockPos blockPos) { - this.blockPos = blockPos; - } - - public BlockPos blockPos() { - return blockPos; - } -} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/InteractBlockEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/InteractBlockEvent.java deleted file mode 100644 index 85ec22d..0000000 --- a/src/main/java/nl/devpieter/utilize/events/interaction/InteractBlockEvent.java +++ /dev/null @@ -1,37 +0,0 @@ -package nl.devpieter.utilize.events.interaction; - -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.util.Hand; -import net.minecraft.util.hit.BlockHitResult; -import nl.devpieter.sees.Event.CancelableEventBase; - -public class InteractBlockEvent extends CancelableEventBase { - - private final Hand hand; - private final BlockHitResult hitResult; - - @Deprecated(since = "1.0.9", forRemoval = true) - public InteractBlockEvent(ClientPlayerEntity player, Hand hand, BlockHitResult hitResult) { - this.hand = hand; - this.hitResult = hitResult; - } - - public InteractBlockEvent(Hand hand, BlockHitResult hitResult) { - this.hand = hand; - this.hitResult = hitResult; - } - - @Deprecated(since = "1.0.9", forRemoval = true) - public ClientPlayerEntity player() { - return MinecraftClient.getInstance().player; - } - - public Hand hand() { - return hand; - } - - public BlockHitResult hitResult() { - return hitResult; - } -} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/InteractEntityEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/InteractEntityEvent.java deleted file mode 100644 index 130c73d..0000000 --- a/src/main/java/nl/devpieter/utilize/events/interaction/InteractEntityEvent.java +++ /dev/null @@ -1,37 +0,0 @@ -package nl.devpieter.utilize.events.interaction; - -import net.minecraft.client.MinecraftClient; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Hand; -import nl.devpieter.sees.Event.CancelableEventBase; - -public class InteractEntityEvent extends CancelableEventBase { - - private final Entity target; - private final Hand hand; - - @Deprecated(since = "1.0.9", forRemoval = true) - public InteractEntityEvent(PlayerEntity player, Entity target, Hand hand) { - this.target = target; - this.hand = hand; - } - - public InteractEntityEvent(Entity target, Hand hand) { - this.target = target; - this.hand = hand; - } - - @Deprecated(since = "1.0.9", forRemoval = true) - public PlayerEntity player() { - return MinecraftClient.getInstance().player; - } - - public Entity target() { - return target; - } - - public Hand hand() { - return hand; - } -} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/InteractItemEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/InteractItemEvent.java deleted file mode 100644 index 8e9c571..0000000 --- a/src/main/java/nl/devpieter/utilize/events/interaction/InteractItemEvent.java +++ /dev/null @@ -1,29 +0,0 @@ -package nl.devpieter.utilize.events.interaction; - -import net.minecraft.client.MinecraftClient; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Hand; -import nl.devpieter.sees.Event.CancelableEventBase; - -public class InteractItemEvent extends CancelableEventBase { - - private final Hand hand; - - @Deprecated(since = "1.0.9", forRemoval = true) - public InteractItemEvent(PlayerEntity player, Hand hand) { - this.hand = hand; - } - - public InteractItemEvent(Hand hand) { - this.hand = hand; - } - - @Deprecated(since = "1.0.9", forRemoval = true) - public PlayerEntity player() { - return MinecraftClient.getInstance().player; - } - - public Hand hand() { - return hand; - } -} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/UpdateBlockBreakingProgressEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/UpdateBlockBreakingProgressEvent.java index 1c43489..92df5c9 100644 --- a/src/main/java/nl/devpieter/utilize/events/interaction/UpdateBlockBreakingProgressEvent.java +++ b/src/main/java/nl/devpieter/utilize/events/interaction/UpdateBlockBreakingProgressEvent.java @@ -2,9 +2,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import nl.devpieter.sees.Event.CancelableEventBase; +import nl.devpieter.sees.event.SCancelableEventBase; -public class UpdateBlockBreakingProgressEvent extends CancelableEventBase { +public class UpdateBlockBreakingProgressEvent extends SCancelableEventBase { private final BlockPos blockPos; private final Direction direction; diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/block/AttackBlockEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/block/AttackBlockEvent.java new file mode 100644 index 0000000..955ef68 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/block/AttackBlockEvent.java @@ -0,0 +1,28 @@ +package nl.devpieter.utilize.events.interaction.block; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import nl.devpieter.sees.event.SCancelableEventBase; + +/** + * It's not recommended to directly cancel this event, as it may cause issues with the game logic. + * Instead, use the {@link nl.devpieter.utilize.events.interaction.keybinding.AttackKeyPressedEvent} to directly cancel the attack action. + */ +public class AttackBlockEvent extends SCancelableEventBase { + + private final BlockPos blockPos; + private final Direction direction; + + public AttackBlockEvent(BlockPos blockPos, Direction direction) { + this.blockPos = blockPos; + this.direction = direction; + } + + public BlockPos blockPos() { + return this.blockPos; + } + + public Direction direction() { + return this.direction; + } +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/block/AttackBlockReturnEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/block/AttackBlockReturnEvent.java new file mode 100644 index 0000000..fb927f2 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/block/AttackBlockReturnEvent.java @@ -0,0 +1,36 @@ +package nl.devpieter.utilize.events.interaction.block; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import nl.devpieter.sees.event.SReturnableEvent; + +public class AttackBlockReturnEvent implements SReturnableEvent { + + private final BlockPos blockPos; + private final Direction direction; + private boolean returnValue; + + public AttackBlockReturnEvent(BlockPos blockPos, Direction direction, boolean returnValue) { + this.blockPos = blockPos; + this.direction = direction; + this.returnValue = returnValue; + } + + public BlockPos blockPos() { + return this.blockPos; + } + + public Direction direction() { + return this.direction; + } + + @Override + public Boolean getResult() { + return this.returnValue; + } + + @Override + public void setResult(Boolean result) { + this.returnValue = result; + } +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/block/AttackBlockTailEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/block/AttackBlockTailEvent.java new file mode 100644 index 0000000..94f197d --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/block/AttackBlockTailEvent.java @@ -0,0 +1,8 @@ +package nl.devpieter.utilize.events.interaction.block; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import nl.devpieter.sees.event.SEvent; + +public record AttackBlockTailEvent(BlockPos blockPos, Direction direction) implements SEvent { +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/block/BreakBlockEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/block/BreakBlockEvent.java new file mode 100644 index 0000000..deb8878 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/block/BreakBlockEvent.java @@ -0,0 +1,21 @@ +package nl.devpieter.utilize.events.interaction.block; + +import net.minecraft.util.math.BlockPos; +import nl.devpieter.sees.event.SCancelableEventBase; + +/** + * It's not recommended to directly cancel this event, as it may cause issues with the game logic. + * Instead, use the {@link nl.devpieter.utilize.events.interaction.keybinding.AttackKeyPressedEvent} to directly cancel the attack action. + */ +public class BreakBlockEvent extends SCancelableEventBase { + + private final BlockPos blockPos; + + public BreakBlockEvent(BlockPos blockPos) { + this.blockPos = blockPos; + } + + public BlockPos blockPos() { + return this.blockPos; + } +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/block/BreakBlockReturnEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/block/BreakBlockReturnEvent.java new file mode 100644 index 0000000..734c737 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/block/BreakBlockReturnEvent.java @@ -0,0 +1,30 @@ +package nl.devpieter.utilize.events.interaction.block; + +import net.minecraft.util.math.BlockPos; +import nl.devpieter.sees.event.SCancelableEventBase; +import nl.devpieter.sees.event.SReturnableEvent; + +public class BreakBlockReturnEvent implements SReturnableEvent { + + private final BlockPos blockPos; + private boolean returnValue; + + public BreakBlockReturnEvent(BlockPos blockPos, boolean returnValue) { + this.blockPos = blockPos; + this.returnValue = returnValue; + } + + public BlockPos blockPos() { + return this.blockPos; + } + + @Override + public Boolean getResult() { + return this.returnValue; + } + + @Override + public void setResult(Boolean result) { + this.returnValue = result; + } +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/block/BreakBlockTailEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/block/BreakBlockTailEvent.java new file mode 100644 index 0000000..14ed4ad --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/block/BreakBlockTailEvent.java @@ -0,0 +1,7 @@ +package nl.devpieter.utilize.events.interaction.block; + +import net.minecraft.util.math.BlockPos; +import nl.devpieter.sees.event.SEvent; + +public record BreakBlockTailEvent(BlockPos blockPos) implements SEvent { +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/block/InteractBlockEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/block/InteractBlockEvent.java new file mode 100644 index 0000000..99b35c9 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/block/InteractBlockEvent.java @@ -0,0 +1,28 @@ +package nl.devpieter.utilize.events.interaction.block; + +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import nl.devpieter.sees.event.SCancelableEventBase; + +/** + * It's not recommended to directly cancel this event, as it may cause issues with the game logic. + * Instead, use the {@link nl.devpieter.utilize.events.interaction.keybinding.UseKeyPressedEvent} to directly cancel the use action. + */ +public class InteractBlockEvent extends SCancelableEventBase { + + private final Hand hand; + private final BlockHitResult hitResult; + + public InteractBlockEvent(Hand hand, BlockHitResult hitResult) { + this.hand = hand; + this.hitResult = hitResult; + } + + public Hand hand() { + return this.hand; + } + + public BlockHitResult hitResult() { + return this.hitResult; + } +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/block/InteractBlockReturnEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/block/InteractBlockReturnEvent.java new file mode 100644 index 0000000..11fb675 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/block/InteractBlockReturnEvent.java @@ -0,0 +1,37 @@ +package nl.devpieter.utilize.events.interaction.block; + +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import nl.devpieter.sees.event.SReturnableEvent; + +public class InteractBlockReturnEvent implements SReturnableEvent { + + private final Hand hand; + private final BlockHitResult hitResult; + private ActionResult returnValue; + + public InteractBlockReturnEvent(Hand hand, BlockHitResult hitResult, ActionResult returnValue) { + this.hand = hand; + this.hitResult = hitResult; + this.returnValue = returnValue; + } + + public Hand hand() { + return this.hand; + } + + public BlockHitResult hitResult() { + return this.hitResult; + } + + @Override + public ActionResult getResult() { + return this.returnValue; + } + + @Override + public void setResult(ActionResult result) { + this.returnValue = result; + } +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/block/InteractBlockTailEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/block/InteractBlockTailEvent.java new file mode 100644 index 0000000..f4d9e50 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/block/InteractBlockTailEvent.java @@ -0,0 +1,8 @@ +package nl.devpieter.utilize.events.interaction.block; + +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import nl.devpieter.sees.event.SEvent; + +public record InteractBlockTailEvent(Hand hand, BlockHitResult hitResult) implements SEvent { +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/entity/AttackEntityEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/entity/AttackEntityEvent.java new file mode 100644 index 0000000..825da1b --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/entity/AttackEntityEvent.java @@ -0,0 +1,21 @@ +package nl.devpieter.utilize.events.interaction.entity; + +import net.minecraft.entity.Entity; +import nl.devpieter.sees.event.SCancelableEventBase; + +/** + * It's not recommended to directly cancel this event, as it may cause issues with the game logic. + * Instead, use the {@link nl.devpieter.utilize.events.interaction.keybinding.AttackKeyPressedEvent} to directly cancel the attack action. + */ +public class AttackEntityEvent extends SCancelableEventBase { + + private final Entity target; + + public AttackEntityEvent(Entity target) { + this.target = target; + } + + public Entity target() { + return this.target; + } +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/entity/AttackEntityReturnEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/entity/AttackEntityReturnEvent.java new file mode 100644 index 0000000..28a343a --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/entity/AttackEntityReturnEvent.java @@ -0,0 +1,7 @@ +package nl.devpieter.utilize.events.interaction.entity; + +import net.minecraft.entity.Entity; +import nl.devpieter.sees.event.SEvent; + +public record AttackEntityReturnEvent(Entity target) implements SEvent { +} \ No newline at end of file diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/entity/AttackEntityTailEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/entity/AttackEntityTailEvent.java new file mode 100644 index 0000000..de30110 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/entity/AttackEntityTailEvent.java @@ -0,0 +1,7 @@ +package nl.devpieter.utilize.events.interaction.entity; + +import net.minecraft.entity.Entity; +import nl.devpieter.sees.event.SEvent; + +public record AttackEntityTailEvent(Entity target) implements SEvent { +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/entity/InteractEntityEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/entity/InteractEntityEvent.java new file mode 100644 index 0000000..dbe3b83 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/entity/InteractEntityEvent.java @@ -0,0 +1,28 @@ +package nl.devpieter.utilize.events.interaction.entity; + +import net.minecraft.entity.Entity; +import net.minecraft.util.Hand; +import nl.devpieter.sees.event.SCancelableEventBase; + +/** + * It's not recommended to directly cancel this event, as it may cause issues with the game logic. + * Instead, use the {@link nl.devpieter.utilize.events.interaction.keybinding.UseKeyPressedEvent} to directly cancel the use action. + */ +public class InteractEntityEvent extends SCancelableEventBase { + + private final Entity target; + private final Hand hand; + + public InteractEntityEvent(Entity target, Hand hand) { + this.hand = hand; + this.target = target; + } + + public Entity target() { + return this.target; + } + + public Hand hand() { + return this.hand; + } +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/entity/InteractEntityReturnEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/entity/InteractEntityReturnEvent.java new file mode 100644 index 0000000..c02028c --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/entity/InteractEntityReturnEvent.java @@ -0,0 +1,37 @@ +package nl.devpieter.utilize.events.interaction.entity; + +import net.minecraft.entity.Entity; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import nl.devpieter.sees.event.SReturnableEvent; + +public class InteractEntityReturnEvent implements SReturnableEvent { + + private final Entity target; + private final Hand hand; + private ActionResult returnValue; + + public InteractEntityReturnEvent(Entity target, Hand hand, ActionResult returnValue) { + this.target = target; + this.hand = hand; + this.returnValue = returnValue; + } + + public Entity target() { + return this.target; + } + + public Hand hand() { + return this.hand; + } + + @Override + public ActionResult getResult() { + return this.returnValue; + } + + @Override + public void setResult(ActionResult result) { + this.returnValue = result; + } +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/entity/InteractEntityTailEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/entity/InteractEntityTailEvent.java new file mode 100644 index 0000000..823dec8 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/entity/InteractEntityTailEvent.java @@ -0,0 +1,8 @@ +package nl.devpieter.utilize.events.interaction.entity; + +import net.minecraft.entity.Entity; +import net.minecraft.util.Hand; +import nl.devpieter.sees.event.SEvent; + +public record InteractEntityTailEvent(Entity target, Hand hand) implements SEvent { +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/item/InteractItemEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/item/InteractItemEvent.java new file mode 100644 index 0000000..fb8af87 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/item/InteractItemEvent.java @@ -0,0 +1,21 @@ +package nl.devpieter.utilize.events.interaction.item; + +import net.minecraft.util.Hand; +import nl.devpieter.sees.event.SCancelableEventBase; + +/** + * It's not recommended to directly cancel this event, as it may cause issues with the game logic. + * Instead, use the {@link nl.devpieter.utilize.events.interaction.keybinding.UseKeyPressedEvent} to directly cancel the use action. + */ +public class InteractItemEvent extends SCancelableEventBase { + + private final Hand hand; + + public InteractItemEvent(Hand hand) { + this.hand = hand; + } + + public Hand hand() { + return this.hand; + } +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/item/InteractItemReturnEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/item/InteractItemReturnEvent.java new file mode 100644 index 0000000..22d8bbe --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/item/InteractItemReturnEvent.java @@ -0,0 +1,30 @@ +package nl.devpieter.utilize.events.interaction.item; + +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import nl.devpieter.sees.event.SReturnableEvent; + +public class InteractItemReturnEvent implements SReturnableEvent { + + private final Hand hand; + private ActionResult returnValue; + + public InteractItemReturnEvent(Hand hand, ActionResult returnValue) { + this.hand = hand; + this.returnValue = returnValue; + } + + public Hand hand() { + return this.hand; + } + + @Override + public ActionResult getResult() { + return this.returnValue; + } + + @Override + public void setResult(ActionResult result) { + this.returnValue = result; + } +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/item/InteractItemTailEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/item/InteractItemTailEvent.java new file mode 100644 index 0000000..913bd5c --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/item/InteractItemTailEvent.java @@ -0,0 +1,8 @@ +package nl.devpieter.utilize.events.interaction.item; + +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import nl.devpieter.sees.event.SEvent; + +public record InteractItemTailEvent(Hand hand) implements SEvent { +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/keybinding/AttackKeyPressedEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/keybinding/AttackKeyPressedEvent.java new file mode 100644 index 0000000..c94cd28 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/keybinding/AttackKeyPressedEvent.java @@ -0,0 +1,6 @@ +package nl.devpieter.utilize.events.interaction.keybinding; + +import nl.devpieter.sees.event.SCancelableEventBase; + +public class AttackKeyPressedEvent extends SCancelableEventBase { +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/keybinding/KeyBindingPressedCheckEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/keybinding/KeyBindingPressedCheckEvent.java new file mode 100644 index 0000000..abdc253 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/keybinding/KeyBindingPressedCheckEvent.java @@ -0,0 +1,29 @@ +package nl.devpieter.utilize.events.interaction.keybinding; + +import nl.devpieter.sees.event.SReturnableEvent; +import nl.devpieter.utilize.enums.KeyActionOverride; +import org.jetbrains.annotations.NotNull; + +public class KeyBindingPressedCheckEvent implements SReturnableEvent { + + private final String keyId; + private KeyActionOverride override = KeyActionOverride.NONE; + + public KeyBindingPressedCheckEvent(@NotNull String keyId) { + this.keyId = keyId; + } + + public @NotNull String getKeyId() { + return keyId; + } + + @Override + public KeyActionOverride getResult() { + return override; + } + + @Override + public void setResult(KeyActionOverride result) { + override = result; + } +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/keybinding/KeyBindingPressedEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/keybinding/KeyBindingPressedEvent.java new file mode 100644 index 0000000..38a7d83 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/keybinding/KeyBindingPressedEvent.java @@ -0,0 +1,29 @@ +package nl.devpieter.utilize.events.interaction.keybinding; + +import nl.devpieter.sees.event.SReturnableEvent; +import nl.devpieter.utilize.enums.KeyActionOverride; +import org.jetbrains.annotations.NotNull; + +public class KeyBindingPressedEvent implements SReturnableEvent { + + private final String keyId; + private KeyActionOverride override = KeyActionOverride.NONE; + + public KeyBindingPressedEvent(@NotNull String keyId) { + this.keyId = keyId; + } + + public @NotNull String getKeyId() { + return keyId; + } + + @Override + public KeyActionOverride getResult() { + return override; + } + + @Override + public void setResult(KeyActionOverride result) { + override = result; + } +} diff --git a/src/main/java/nl/devpieter/utilize/events/interaction/keybinding/UseKeyPressedEvent.java b/src/main/java/nl/devpieter/utilize/events/interaction/keybinding/UseKeyPressedEvent.java new file mode 100644 index 0000000..9ab28ac --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/interaction/keybinding/UseKeyPressedEvent.java @@ -0,0 +1,6 @@ +package nl.devpieter.utilize.events.interaction.keybinding; + +import nl.devpieter.sees.event.SCancelableEventBase; + +public class UseKeyPressedEvent extends SCancelableEventBase { +} diff --git a/src/main/java/nl/devpieter/utilize/events/inventory/HotbarSlotChangedEvent.java b/src/main/java/nl/devpieter/utilize/events/inventory/HotbarSlotChangedEvent.java index efba27d..a8e5963 100644 --- a/src/main/java/nl/devpieter/utilize/events/inventory/HotbarSlotChangedEvent.java +++ b/src/main/java/nl/devpieter/utilize/events/inventory/HotbarSlotChangedEvent.java @@ -1,6 +1,6 @@ package nl.devpieter.utilize.events.inventory; -import nl.devpieter.sees.Event.Event; +import nl.devpieter.sees.event.SEvent; -public record HotbarSlotChangedEvent(int previous, int current) implements Event { +public record HotbarSlotChangedEvent(int previous, int current) implements SEvent { } diff --git a/src/main/java/nl/devpieter/utilize/events/inventory/SlotClickEvent.java b/src/main/java/nl/devpieter/utilize/events/inventory/SlotClickEvent.java index 0d6ff6a..43d3fdf 100644 --- a/src/main/java/nl/devpieter/utilize/events/inventory/SlotClickEvent.java +++ b/src/main/java/nl/devpieter/utilize/events/inventory/SlotClickEvent.java @@ -1,25 +1,15 @@ package nl.devpieter.utilize.events.inventory; -import net.minecraft.client.MinecraftClient; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.screen.slot.SlotActionType; -import nl.devpieter.sees.Event.CancelableEventBase; +import nl.devpieter.sees.event.SCancelableEventBase; -public class SlotClickEvent extends CancelableEventBase { +public class SlotClickEvent extends SCancelableEventBase { private final int syncId; private final int slotId; private final int button; private final SlotActionType actionType; - @Deprecated(since = "1.0.9", forRemoval = true) - public SlotClickEvent(int syncId, int slotId, int button, SlotActionType actionType, PlayerEntity player) { - this.syncId = syncId; - this.slotId = slotId; - this.button = button; - this.actionType = actionType; - } - public SlotClickEvent(int syncId, int slotId, int button, SlotActionType actionType) { this.syncId = syncId; this.slotId = slotId; @@ -42,9 +32,4 @@ public int button() { public SlotActionType actionType() { return actionType; } - - @Deprecated(since = "1.0.9", forRemoval = true) - public PlayerEntity player() { - return MinecraftClient.getInstance().player; - } } diff --git a/src/main/java/nl/devpieter/utilize/events/inventory/TotemCountChangedEvent.java b/src/main/java/nl/devpieter/utilize/events/inventory/TotemCountChangedEvent.java deleted file mode 100644 index 3fc9b91..0000000 --- a/src/main/java/nl/devpieter/utilize/events/inventory/TotemCountChangedEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package nl.devpieter.utilize.events.inventory; - -import nl.devpieter.sees.Event.Event; - -public record TotemCountChangedEvent(int previous, int current) implements Event { -} diff --git a/src/main/java/nl/devpieter/utilize/events/inventory/TotemHoldingChangedEvent.java b/src/main/java/nl/devpieter/utilize/events/inventory/TotemHoldingChangedEvent.java deleted file mode 100644 index 6c54b8e..0000000 --- a/src/main/java/nl/devpieter/utilize/events/inventory/TotemHoldingChangedEvent.java +++ /dev/null @@ -1,9 +0,0 @@ -package nl.devpieter.utilize.events.inventory; - -import nl.devpieter.sees.Event.Event; - -public record TotemHoldingChangedEvent( - boolean previousMainHand, boolean currentMainHand, - boolean previousOffhand, boolean currentOffhand -) implements Event { -} diff --git a/src/main/java/nl/devpieter/utilize/events/packet/ProfessionChangedPacketEvent.java b/src/main/java/nl/devpieter/utilize/events/packet/ProfessionChangedPacketEvent.java deleted file mode 100644 index 8eb56aa..0000000 --- a/src/main/java/nl/devpieter/utilize/events/packet/ProfessionChangedPacketEvent.java +++ /dev/null @@ -1,9 +0,0 @@ -package nl.devpieter.utilize.events.packet; - -import net.minecraft.entity.passive.VillagerEntity; -import net.minecraft.village.VillagerProfession; -import nl.devpieter.sees.Event.Event; -import org.jetbrains.annotations.NotNull; - -public record ProfessionChangedPacketEvent(@NotNull VillagerEntity villager, @NotNull VillagerProfession previous, @NotNull VillagerProfession current) implements Event { -} diff --git a/src/main/java/nl/devpieter/utilize/events/packet/ScreenOpenedPacketEvent.java b/src/main/java/nl/devpieter/utilize/events/packet/ScreenOpenedPacketEvent.java deleted file mode 100644 index b396106..0000000 --- a/src/main/java/nl/devpieter/utilize/events/packet/ScreenOpenedPacketEvent.java +++ /dev/null @@ -1,30 +0,0 @@ -package nl.devpieter.utilize.events.packet; - -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.text.Text; -import nl.devpieter.sees.Event.CancelableEventBase; - -public class ScreenOpenedPacketEvent extends CancelableEventBase { - - private final int syncId; - private final ScreenHandlerType type; - private final Text name; - - public ScreenOpenedPacketEvent(int syncId, ScreenHandlerType type, Text name) { - this.syncId = syncId; - this.type = type; - this.name = name; - } - - public int syncId() { - return syncId; - } - - public ScreenHandlerType type() { - return type; - } - - public Text name() { - return name; - } -} diff --git a/src/main/java/nl/devpieter/utilize/events/packet/TradesOfferedPacketEvent.java b/src/main/java/nl/devpieter/utilize/events/packet/TradesOfferedPacketEvent.java deleted file mode 100644 index 6367795..0000000 --- a/src/main/java/nl/devpieter/utilize/events/packet/TradesOfferedPacketEvent.java +++ /dev/null @@ -1,23 +0,0 @@ -package nl.devpieter.utilize.events.packet; - -import net.minecraft.village.TradeOfferList; -import nl.devpieter.sees.Event.CancelableEventBase; - -public class TradesOfferedPacketEvent extends CancelableEventBase { - - private final int syncId; - private final TradeOfferList tradeOffers; - - public TradesOfferedPacketEvent(int syncId, TradeOfferList tradeOffers) { - this.syncId = syncId; - this.tradeOffers = tradeOffers; - } - - public int syncId() { - return syncId; - } - - public TradeOfferList tradeOffers() { - return tradeOffers; - } -} diff --git a/src/main/java/nl/devpieter/utilize/events/player/PlayerDamagedEvent.java b/src/main/java/nl/devpieter/utilize/events/player/PlayerDamagedEvent.java index c540609..f3addcc 100644 --- a/src/main/java/nl/devpieter/utilize/events/player/PlayerDamagedEvent.java +++ b/src/main/java/nl/devpieter/utilize/events/player/PlayerDamagedEvent.java @@ -1,6 +1,6 @@ package nl.devpieter.utilize.events.player; -import nl.devpieter.sees.Event.Event; +import nl.devpieter.sees.event.SEvent; -public record PlayerDamagedEvent(double current, double damage) implements Event { +public record PlayerDamagedEvent(double current, double damage) implements SEvent { } \ No newline at end of file diff --git a/src/main/java/nl/devpieter/utilize/events/player/PlayerHealedEvent.java b/src/main/java/nl/devpieter/utilize/events/player/PlayerHealedEvent.java index 2c1f933..1e3a2ee 100644 --- a/src/main/java/nl/devpieter/utilize/events/player/PlayerHealedEvent.java +++ b/src/main/java/nl/devpieter/utilize/events/player/PlayerHealedEvent.java @@ -1,6 +1,6 @@ package nl.devpieter.utilize.events.player; -import nl.devpieter.sees.Event.Event; +import nl.devpieter.sees.event.SEvent; -public record PlayerHealedEvent(double current, double heal) implements Event { +public record PlayerHealedEvent(double current, double heal) implements SEvent { } diff --git a/src/main/java/nl/devpieter/utilize/events/player/SleepStateChangedEvent.java b/src/main/java/nl/devpieter/utilize/events/player/SleepStateChangedEvent.java deleted file mode 100644 index c7bccce..0000000 --- a/src/main/java/nl/devpieter/utilize/events/player/SleepStateChangedEvent.java +++ /dev/null @@ -1,14 +0,0 @@ -package nl.devpieter.utilize.events.player; - -import nl.devpieter.sees.Event.Event; -import org.jetbrains.annotations.NotNull; - -public record SleepStateChangedEvent(@NotNull SleepState previous, @NotNull SleepState current) implements Event { - - public enum SleepState { - AWAKE, - FALLING_ASLEEP, - SLEEPING, - WAKING_UP - } -} diff --git a/src/main/java/nl/devpieter/utilize/events/screen/ScreenChangedEvent.java b/src/main/java/nl/devpieter/utilize/events/screen/ScreenChangedEvent.java index 5c0bc1b..bf842e3 100644 --- a/src/main/java/nl/devpieter/utilize/events/screen/ScreenChangedEvent.java +++ b/src/main/java/nl/devpieter/utilize/events/screen/ScreenChangedEvent.java @@ -1,8 +1,8 @@ package nl.devpieter.utilize.events.screen; import net.minecraft.client.gui.screen.Screen; -import nl.devpieter.sees.Event.Event; +import nl.devpieter.sees.event.SEvent; import org.jetbrains.annotations.Nullable; -public record ScreenChangedEvent(@Nullable Screen previous, @Nullable Screen current) implements Event { +public record ScreenChangedEvent(@Nullable Screen previous, @Nullable Screen current) implements SEvent { } diff --git a/src/main/java/nl/devpieter/utilize/events/sound/PlaySoundEvent.java b/src/main/java/nl/devpieter/utilize/events/sound/PlaySoundEvent.java deleted file mode 100644 index 38fc56e..0000000 --- a/src/main/java/nl/devpieter/utilize/events/sound/PlaySoundEvent.java +++ /dev/null @@ -1,18 +0,0 @@ -package nl.devpieter.utilize.events.sound; - -import net.minecraft.client.sound.SoundInstance; -import nl.devpieter.sees.Event.CancelableEventBase; - -@Deprecated(since = "1.0.10", forRemoval = true) -public class PlaySoundEvent extends CancelableEventBase { - - private final SoundInstance sound; - - public PlaySoundEvent(SoundInstance sound) { - this.sound = sound; - } - - public SoundInstance sound() { - return sound; - } -} diff --git a/src/main/java/nl/devpieter/utilize/events/tick/ClientPlayerTickEvent.java b/src/main/java/nl/devpieter/utilize/events/tick/ClientPlayerTickEvent.java new file mode 100644 index 0000000..ffb136a --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/tick/ClientPlayerTickEvent.java @@ -0,0 +1,4 @@ +package nl.devpieter.utilize.events.tick; + +public record ClientPlayerTickEvent() implements ITickEvent { +} diff --git a/src/main/java/nl/devpieter/utilize/events/tick/ClientPlayerTickTailEvent.java b/src/main/java/nl/devpieter/utilize/events/tick/ClientPlayerTickTailEvent.java new file mode 100644 index 0000000..8e8cd13 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/tick/ClientPlayerTickTailEvent.java @@ -0,0 +1,4 @@ +package nl.devpieter.utilize.events.tick; + +public record ClientPlayerTickTailEvent() implements ITickEvent { +} diff --git a/src/main/java/nl/devpieter/utilize/events/tick/ClientTickEvent.java b/src/main/java/nl/devpieter/utilize/events/tick/ClientTickEvent.java index 5fb9063..df75c70 100644 --- a/src/main/java/nl/devpieter/utilize/events/tick/ClientTickEvent.java +++ b/src/main/java/nl/devpieter/utilize/events/tick/ClientTickEvent.java @@ -1,6 +1,4 @@ package nl.devpieter.utilize.events.tick; -import nl.devpieter.sees.Event.Event; - -public record ClientTickEvent() implements Event { +public record ClientTickEvent() implements ITickEvent { } diff --git a/src/main/java/nl/devpieter/utilize/events/tick/ClientTickTailEvent.java b/src/main/java/nl/devpieter/utilize/events/tick/ClientTickTailEvent.java new file mode 100644 index 0000000..f512b87 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/tick/ClientTickTailEvent.java @@ -0,0 +1,4 @@ +package nl.devpieter.utilize.events.tick; + +public record ClientTickTailEvent() implements ITickEvent { +} diff --git a/src/main/java/nl/devpieter/utilize/events/tick/ITickEvent.java b/src/main/java/nl/devpieter/utilize/events/tick/ITickEvent.java new file mode 100644 index 0000000..78a0d1b --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/events/tick/ITickEvent.java @@ -0,0 +1,6 @@ +package nl.devpieter.utilize.events.tick; + +import nl.devpieter.sees.event.SEvent; + +public interface ITickEvent extends SEvent { +} diff --git a/src/main/java/nl/devpieter/utilize/http/AsyncRequest.java b/src/main/java/nl/devpieter/utilize/http/AsyncRequest.java index 1470b1d..f8b74a5 100644 --- a/src/main/java/nl/devpieter/utilize/http/AsyncRequest.java +++ b/src/main/java/nl/devpieter/utilize/http/AsyncRequest.java @@ -4,10 +4,7 @@ import java.util.ArrayList; import java.util.List; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; +import java.util.concurrent.*; public abstract class AsyncRequest extends RequestHelper { @@ -16,91 +13,67 @@ public abstract class AsyncRequest extends RequestHelper { private final List> callbacks = new ArrayList<>(); private CompletableFuture future; + protected abstract @Nullable T requestAsync() throws Exception; + public AsyncRequest() { this(null); } public AsyncRequest(@Nullable ResultConsumer requestCallback) { if (requestCallback == null) return; - this.callbacks.add(requestCallback); + callbacks.add(requestCallback); } - /** - * Shuts down the executor service used for asynchronous requests. - */ public static void shutdown() { EXECUTOR_SERVICE.shutdown(); - } - protected abstract @Nullable T requestAsync() throws Exception; + try { + if (EXECUTOR_SERVICE.awaitTermination(5, TimeUnit.SECONDS)) return; + EXECUTOR_SERVICE.shutdownNow(); + } catch (InterruptedException e) { + EXECUTOR_SERVICE.shutdownNow(); + Thread.currentThread().interrupt(); + } + } - /** - * Adds a callback to the list of callbacks. - * - * @param callback the callback to be added, can be null - */ public void addCallback(@Nullable ResultConsumer callback) { if (callback == null) return; - this.callbacks.add(callback); + callbacks.add(callback); } - /** - * Executes the asynchronous request. - * If the request is already in progress, this method does nothing. - */ public void execute() { - if (this.future != null) return; + if (future != null) return; - this.future = CompletableFuture.supplyAsync(() -> { + future = CompletableFuture.supplyAsync(() -> { try { T result = requestAsync(); - this.callCallbacks(result, null); + callCallbacks(result, null); return result; } catch (Exception e) { - this.callCallbacks(null, e); + callCallbacks(null, e); throw new RuntimeException(e); } }, EXECUTOR_SERVICE); } - /** - * Cancels the asynchronous request if it is in progress. - */ public void cancel() { - this.future.cancel(true); + future.cancel(true); } - /** - * Checks if the asynchronous request is done. - * - * @return true if the request is done, false otherwise - */ public boolean isDone() { - return this.future.isDone(); + return future.isDone(); } - /** - * Gets the result of the asynchronous request. - * - * @return the result of the request - * @throws ExecutionException if the computation threw an exception - * @throws InterruptedException if the current thread was interrupted while waiting - */ public T get() throws ExecutionException, InterruptedException { - return this.future.get(); + return future.get(); } - /** - * Gets the CompletableFuture representing the asynchronous request. - * - * @return the CompletableFuture representing the request - */ public CompletableFuture getFuture() { return future; } private void callCallbacks(@Nullable T result, @Nullable Exception exception) { - for (ResultConsumer callback : this.callbacks) { + for (ResultConsumer callback : callbacks) { if (callback != null) callback.accept(result, exception); } } diff --git a/src/main/java/nl/devpieter/utilize/http/RequestHelper.java b/src/main/java/nl/devpieter/utilize/http/RequestHelper.java index 7e158a8..58340a4 100644 --- a/src/main/java/nl/devpieter/utilize/http/RequestHelper.java +++ b/src/main/java/nl/devpieter/utilize/http/RequestHelper.java @@ -15,71 +15,36 @@ public abstract class RequestHelper { protected static final HttpClient CLIENT = HttpClient.newHttpClient(); - /** - * Sends a simple GET request to the specified URI. - * - * @param uri the URI to send the GET request to - * @return the HttpResponse containing the response body as a String - * @throws IOException if an I/O error occurs when sending or receiving - * @throws InterruptedException if the operation is interrupted - */ public static @NotNull HttpResponse simpleGet(@NotNull URI uri) throws IOException, InterruptedException { HttpRequest request = createRequestBuilder(uri).GET().build(); return CLIENT.send(request, HttpResponse.BodyHandlers.ofString()); } - /** - * Sends a simple POST request to the specified URI with the given body. - * - * @param uri the URI to send the POST request to - * @param bodyPublisher the body of the POST request - * @return the HttpResponse containing the response body as a String - * @throws IOException if an I/O error occurs when sending or receiving - * @throws InterruptedException if the operation is interrupted - */ public static @NotNull HttpResponse simplePost(@NotNull URI uri, @NotNull HttpRequest.BodyPublisher bodyPublisher) throws IOException, InterruptedException { HttpRequest request = createRequestBuilder(uri).POST(bodyPublisher).build(); return CLIENT.send(request, HttpResponse.BodyHandlers.ofString()); } - /** - * Sends a simple PUT request to the specified URI with the given body. - * - * @param uri the URI to send the PUT request to - * @param bodyPublisher the body of the PUT request - * @return the HttpResponse containing the response body as a String - * @throws IOException if an I/O error occurs when sending or receiving - * @throws InterruptedException if the operation is interrupted - */ public static @NotNull HttpResponse simplePut(@NotNull URI uri, @NotNull HttpRequest.BodyPublisher bodyPublisher) throws IOException, InterruptedException { HttpRequest request = createRequestBuilder(uri).PUT(bodyPublisher).build(); return CLIENT.send(request, HttpResponse.BodyHandlers.ofString()); } - /** - * Sends a simple DELETE request to the specified URI. - * - * @param uri the URI to send the DELETE request to - * @return the HttpResponse containing the response body as a String - * @throws IOException if an I/O error occurs when sending or receiving - * @throws InterruptedException if the operation is interrupted - */ public static @NotNull HttpResponse simpleDelete(@NotNull URI uri) throws IOException, InterruptedException { HttpRequest request = createRequestBuilder(uri).DELETE().build(); return CLIENT.send(request, HttpResponse.BodyHandlers.ofString()); } - /** - * Creates a new HttpRequest.Builder with the specified URI and default headers. - * - * @param uri the URI to set in the request builder - * @return the HttpRequest.Builder with the specified URI and default headers - */ public static HttpRequest.Builder createRequestBuilder(@NotNull URI uri) { - String agent = String.format("Utilize/%s-%s", Utilize.getUtilizeVersion(), Utilize.getMinecraftVersion()); + return createRequestBuilder(uri, Utilize.getInstance().getUserAgent()); + } + /** + * @see Utilize#getUserAgent(String, String) + */ + public static HttpRequest.Builder createRequestBuilder(@NotNull URI uri, @NotNull String userAgent) { return HttpRequest.newBuilder() - .header(USER_AGENT_HEADER, agent) + .header(USER_AGENT_HEADER, userAgent) .header("Content-Type", "application/json") .header("Accept", "application/json") .uri(uri); diff --git a/src/main/java/nl/devpieter/utilize/listeners/packet/EntityTrackerUpdatePacketListener.java b/src/main/java/nl/devpieter/utilize/listeners/packet/EntityTrackerUpdatePacketListener.java deleted file mode 100644 index 2d5dfc3..0000000 --- a/src/main/java/nl/devpieter/utilize/listeners/packet/EntityTrackerUpdatePacketListener.java +++ /dev/null @@ -1,46 +0,0 @@ -package nl.devpieter.utilize.listeners.packet; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.data.DataTracker; -import net.minecraft.entity.passive.VillagerEntity; -import net.minecraft.network.packet.s2c.play.EntityTrackerUpdateS2CPacket; -import net.minecraft.village.VillagerData; -import net.minecraft.village.VillagerProfession; -import nl.devpieter.sees.Sees; -import nl.devpieter.utilize.events.packet.ProfessionChangedPacketEvent; -import nl.devpieter.utilize.utils.WorldUtils; - -import java.lang.reflect.Type; - -public class EntityTrackerUpdatePacketListener implements IPacketListener { - - private final Sees sees = Sees.getInstance(); - - @Override - public Type getPacketType() { - return EntityTrackerUpdateS2CPacket.class; - } - - @Override - public boolean onPacket(EntityTrackerUpdateS2CPacket packet) { - Entity entity = WorldUtils.getEntity(packet.id()); - if (!(entity instanceof VillagerEntity villager)) return false; - - for (DataTracker.SerializedEntry entry : packet.trackedValues()) { - if (!(entry.value() instanceof VillagerData newVillagerData)) continue; - - //#if MC>=12105 - VillagerProfession previous = villager.getVillagerData().profession().value(); - VillagerProfession current = newVillagerData.profession().value(); - //#else - //$$ VillagerProfession previous = villager.getVillagerData().getProfession(); - //$$ VillagerProfession current = newVillagerData.getProfession(); - //#endif - - if (previous == current) continue; - this.sees.call(new ProfessionChangedPacketEvent(villager, previous, current)); - } - - return false; - } -} diff --git a/src/main/java/nl/devpieter/utilize/listeners/packet/OpenScreenPacketListener.java b/src/main/java/nl/devpieter/utilize/listeners/packet/OpenScreenPacketListener.java deleted file mode 100644 index 323c4cb..0000000 --- a/src/main/java/nl/devpieter/utilize/listeners/packet/OpenScreenPacketListener.java +++ /dev/null @@ -1,27 +0,0 @@ -package nl.devpieter.utilize.listeners.packet; - -import net.minecraft.network.packet.s2c.play.OpenScreenS2CPacket; -import nl.devpieter.sees.Sees; -import nl.devpieter.utilize.Utilize; -import nl.devpieter.utilize.events.packet.ScreenOpenedPacketEvent; - -import java.lang.reflect.Type; - -public class OpenScreenPacketListener implements IPacketListener { - - private final Sees sees = Sees.getInstance(); - - @Override - public Type getPacketType() { - return OpenScreenS2CPacket.class; - } - - @Override - public boolean onPacket(OpenScreenS2CPacket packet) { - ScreenOpenedPacketEvent event = new ScreenOpenedPacketEvent(packet.getSyncId(), packet.getScreenHandlerType(), packet.getName()); - if (!this.sees.call(event)) return false; - - Utilize.blockScreenId(packet.getSyncId()); - return false; - } -} diff --git a/src/main/java/nl/devpieter/utilize/listeners/packet/SetTradeOffersPacketListener.java b/src/main/java/nl/devpieter/utilize/listeners/packet/SetTradeOffersPacketListener.java deleted file mode 100644 index 99c49ef..0000000 --- a/src/main/java/nl/devpieter/utilize/listeners/packet/SetTradeOffersPacketListener.java +++ /dev/null @@ -1,27 +0,0 @@ -package nl.devpieter.utilize.listeners.packet; - -import net.minecraft.network.packet.s2c.play.SetTradeOffersS2CPacket; -import nl.devpieter.sees.Sees; -import nl.devpieter.utilize.Utilize; -import nl.devpieter.utilize.events.packet.TradesOfferedPacketEvent; - -import java.lang.reflect.Type; - -public class SetTradeOffersPacketListener implements IPacketListener { - - private final Sees sees = Sees.getInstance(); - - @Override - public Type getPacketType() { - return SetTradeOffersS2CPacket.class; - } - - @Override - public boolean onPacket(SetTradeOffersS2CPacket packet) { - TradesOfferedPacketEvent event = new TradesOfferedPacketEvent(packet.getSyncId(), packet.getOffers()); - if (!this.sees.call(event)) return false; - - Utilize.blockScreenId(packet.getSyncId()); - return true; - } -} diff --git a/src/main/java/nl/devpieter/utilize/managers/DamageManager.java b/src/main/java/nl/devpieter/utilize/managers/DamageManager.java index aab36ee..aa6bdfc 100644 --- a/src/main/java/nl/devpieter/utilize/managers/DamageManager.java +++ b/src/main/java/nl/devpieter/utilize/managers/DamageManager.java @@ -4,38 +4,37 @@ import nl.devpieter.utilize.events.player.PlayerDamagedEvent; import nl.devpieter.utilize.events.player.PlayerHealedEvent; -public class DamageManager { +public final class DamageManager { - private static DamageManager INSTANCE; + private static final DamageManager INSTANCE = new DamageManager(); - private final Sees sees = Sees.getInstance(); + private final Sees sees = Sees.getSharedInstance(); - private double currentHealth = -1; + private double currentCurrentHealth = -1; private DamageManager() { } public static DamageManager getInstance() { - if (INSTANCE == null) INSTANCE = new DamageManager(); return INSTANCE; } public void tick(double currentHealth) { - if (this.currentHealth == -1) { - this.currentHealth = currentHealth; + if (currentCurrentHealth == -1) { + currentCurrentHealth = currentHealth; return; } - double difference = this.currentHealth - currentHealth; - this.currentHealth = currentHealth; + double difference = currentCurrentHealth - currentHealth; + currentCurrentHealth = currentHealth; if (difference == 0) return; - if (difference > 0) this.sees.call(new PlayerDamagedEvent(currentHealth, difference)); - else if (difference < 0) this.sees.call(new PlayerHealedEvent(currentHealth, -difference)); + if (difference > 0) sees.dispatch(new PlayerDamagedEvent(currentHealth, difference)); + else if (difference < 0) sees.dispatch(new PlayerHealedEvent(currentHealth, -difference)); } public double getCurrentHealth() { - return this.currentHealth; + return currentCurrentHealth; } } diff --git a/src/main/java/nl/devpieter/utilize/managers/DebugManager.java b/src/main/java/nl/devpieter/utilize/managers/DebugManager.java deleted file mode 100644 index b4c9629..0000000 --- a/src/main/java/nl/devpieter/utilize/managers/DebugManager.java +++ /dev/null @@ -1,35 +0,0 @@ -package nl.devpieter.utilize.managers; - -import net.minecraft.client.render.debug.DebugRenderer; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; - -public class DebugManager { - - private static DebugManager INSTANCE; - - private final List renderers = new ArrayList<>(); - - private DebugManager() { - } - - public static DebugManager getInstance() { - if (INSTANCE == null) INSTANCE = new DebugManager(); - return INSTANCE; - } - - public void addRenderer(@NotNull DebugRenderer.Renderer renderer) { - if (this.renderers.contains(renderer)) return; - this.renderers.add(renderer); - } - - public void removeRenderer(@NotNull DebugRenderer.Renderer renderer) { - this.renderers.remove(renderer); - } - - public List getRenderers() { - return this.renderers; - } -} diff --git a/src/main/java/nl/devpieter/utilize/managers/PacketManager.java b/src/main/java/nl/devpieter/utilize/managers/PacketManager.java index 7fe0510..040b2e8 100644 --- a/src/main/java/nl/devpieter/utilize/managers/PacketManager.java +++ b/src/main/java/nl/devpieter/utilize/managers/PacketManager.java @@ -6,9 +6,9 @@ import java.util.ArrayList; import java.util.List; -public class PacketManager { +public final class PacketManager { - private static PacketManager INSTANCE; + private static final PacketManager INSTANCE = new PacketManager(); private final List> listeners = new ArrayList<>(); @@ -16,16 +16,15 @@ private PacketManager() { } public static PacketManager getInstance() { - if (INSTANCE == null) INSTANCE = new PacketManager(); return INSTANCE; } public void subscribe(IPacketListener listener) { - this.listeners.add(listener); + listeners.add(listener); } public void unsubscribe(IPacketListener listener) { - this.listeners.remove(listener); + listeners.remove(listener); } public boolean packetReceived(Packet packet) { diff --git a/src/main/java/nl/devpieter/utilize/managers/SleepManager.java b/src/main/java/nl/devpieter/utilize/managers/SleepManager.java deleted file mode 100644 index 5b9d1c3..0000000 --- a/src/main/java/nl/devpieter/utilize/managers/SleepManager.java +++ /dev/null @@ -1,49 +0,0 @@ -package nl.devpieter.utilize.managers; - -import nl.devpieter.sees.Sees; -import nl.devpieter.utilize.events.player.SleepStateChangedEvent; - -public class SleepManager { - - private static SleepManager INSTANCE; - - private final Sees sees = Sees.getInstance(); - - private SleepStateChangedEvent.SleepState currentState = SleepStateChangedEvent.SleepState.AWAKE; - - private SleepManager() { - } - - public static SleepManager getInstance() { - if (INSTANCE == null) INSTANCE = new SleepManager(); - return INSTANCE; - } - - public void tick(boolean isSleeping, float sleepTimer) { - SleepStateChangedEvent.SleepState previous = this.currentState; - - switch (this.currentState) { - case AWAKE: - if (isSleeping) this.currentState = SleepStateChangedEvent.SleepState.FALLING_ASLEEP; - break; - case FALLING_ASLEEP: - if (!isSleeping) this.currentState = SleepStateChangedEvent.SleepState.AWAKE; - else if (sleepTimer == 100) this.currentState = SleepStateChangedEvent.SleepState.SLEEPING; - break; - case SLEEPING: - if (!isSleeping) this.currentState = SleepStateChangedEvent.SleepState.WAKING_UP; - break; - case WAKING_UP: - if (!isSleeping) this.currentState = SleepStateChangedEvent.SleepState.AWAKE; - else if (sleepTimer == 0) this.currentState = SleepStateChangedEvent.SleepState.SLEEPING; - break; - } - - if (previous == this.currentState) return; - this.sees.call(new SleepStateChangedEvent(previous, this.currentState)); - } - - public SleepStateChangedEvent.SleepState getCurrentState() { - return this.currentState; - } -} diff --git a/src/main/java/nl/devpieter/utilize/managers/TaskManager.java b/src/main/java/nl/devpieter/utilize/managers/TaskManager.java deleted file mode 100644 index db332fe..0000000 --- a/src/main/java/nl/devpieter/utilize/managers/TaskManager.java +++ /dev/null @@ -1,76 +0,0 @@ -package nl.devpieter.utilize.managers; - -import java.util.ArrayList; -import java.util.List; - -public class TaskManager { - - private static TaskManager INSTANCE; - - private final List tasks = new ArrayList<>(); - - private TaskManager() { - } - - public static TaskManager getInstance() { - if (INSTANCE == null) INSTANCE = new TaskManager(); - return INSTANCE; - } - - public void addTask(ITask task) { - this.tasks.add(task); - } - - public void removeTask(ITask task) { - this.tasks.remove(task); - } - - public void tick() { - for (ITask task : new ArrayList<>(tasks)) { - task.tick(); - if (task.isFinished()) removeTask(task); - } - } - - public static interface ITask { - void tick(); - - void reset(); - - boolean isFinished(); - } - - public static class RunOnceTask implements ITask { - - private final Runnable runnable; - private final int startDelay; - - private boolean finished; - private int tickCounter; - - public RunOnceTask(Runnable runnable, int startDelay) { - this.runnable = runnable; - this.startDelay = startDelay; - this.tickCounter = 0; - } - - public void tick() { - if (finished) return; - - tickCounter++; - if (tickCounter < startDelay) return; - - runnable.run(); - finished = true; - } - - public void reset() { - this.finished = false; - this.tickCounter = 0; - } - - public boolean isFinished() { - return finished; - } - } -} diff --git a/src/main/java/nl/devpieter/utilize/managers/TotemManager.java b/src/main/java/nl/devpieter/utilize/managers/TotemManager.java deleted file mode 100644 index 76d035e..0000000 --- a/src/main/java/nl/devpieter/utilize/managers/TotemManager.java +++ /dev/null @@ -1,65 +0,0 @@ -package nl.devpieter.utilize.managers; - -import net.minecraft.item.Items; -import nl.devpieter.sees.Sees; -import nl.devpieter.utilize.events.inventory.TotemCountChangedEvent; -import nl.devpieter.utilize.events.inventory.TotemHoldingChangedEvent; -import nl.devpieter.utilize.utils.InventoryUtils; - -public class TotemManager { - - private static TotemManager INSTANCE; - - private final Sees sees = Sees.getInstance(); - - private int currentTotems = 0; - private boolean holdingMainHand = false; - private boolean holdingOffhand = false; - - private TotemManager() { - } - - public static TotemManager getInstance() { - if (INSTANCE == null) INSTANCE = new TotemManager(); - return INSTANCE; - } - - public void tick() { - this.tickTotemCount(); - this.tickHoldingTotem(); - } - - public int getCurrentTotems() { - return this.currentTotems; - } - - public boolean isHoldingTotem() { - return this.holdingMainHand || this.holdingOffhand; - } - - public boolean isHoldingTotemInMainHand() { - return this.holdingMainHand; - } - - public boolean isHoldingTotemInOffhand() { - return this.holdingOffhand; - } - - private void tickTotemCount() { - int totemCount = InventoryUtils.countItem(Items.TOTEM_OF_UNDYING); - if (totemCount == this.currentTotems) return; - - this.sees.call(new TotemCountChangedEvent(this.currentTotems, totemCount)); - this.currentTotems = totemCount; - } - - private void tickHoldingTotem() { - boolean mainHand = InventoryUtils.isMainHandOf(Items.TOTEM_OF_UNDYING); - boolean offhand = InventoryUtils.isOffhandOf(Items.TOTEM_OF_UNDYING); - if (mainHand == this.holdingMainHand && offhand == this.holdingOffhand) return; - - this.sees.call(new TotemHoldingChangedEvent(this.holdingMainHand, mainHand, this.holdingOffhand, offhand)); - this.holdingMainHand = mainHand; - this.holdingOffhand = offhand; - } -} diff --git a/src/main/java/nl/devpieter/utilize/mixins/ChatHudMixin.java b/src/main/java/nl/devpieter/utilize/mixins/ChatHudMixin.java index c6f2b78..8c85c2e 100644 --- a/src/main/java/nl/devpieter/utilize/mixins/ChatHudMixin.java +++ b/src/main/java/nl/devpieter/utilize/mixins/ChatHudMixin.java @@ -33,12 +33,12 @@ public abstract class ChatHudMixin { protected abstract void addMessage(ChatHudLine message); @Unique - private final Sees sees = Sees.getInstance(); + private final Sees sees = Sees.getSharedInstance(); @Inject(at = @At("HEAD"), method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/message/MessageSignatureData;Lnet/minecraft/client/gui/hud/MessageIndicator;)V", cancellable = true) public void onAddMessage(Text message, MessageSignatureData signatureData, MessageIndicator indicator, CallbackInfo ci) { - ReceiveMessageEvent event = new ReceiveMessageEvent(message); - Text result = this.sees.callWithResult(event); + ReceiveMessageEvent event = new ReceiveMessageEvent(message); // rename to ChatHudMessageAddEvent, or something similar + Text result = sees.dispatchWithResult(event); if (event.isCancelled()) { ci.cancel(); @@ -46,10 +46,10 @@ public void onAddMessage(Text message, MessageSignatureData signatureData, Messa } // TODO - Optimize - ChatHudLine chatHudLine = new ChatHudLine(this.client.inGameHud.getTicks(), result, signatureData, indicator); - this.logChatMessage(chatHudLine); - this.addVisibleMessage(chatHudLine); - this.addMessage(chatHudLine); + ChatHudLine chatHudLine = new ChatHudLine(client.inGameHud.getTicks(), result, signatureData, indicator); + logChatMessage(chatHudLine); + addVisibleMessage(chatHudLine); + addMessage(chatHudLine); ci.cancel(); } diff --git a/src/main/java/nl/devpieter/utilize/mixins/ClientConnectionMixin.java b/src/main/java/nl/devpieter/utilize/mixins/ClientConnectionMixin.java index e17899b..ac769a5 100644 --- a/src/main/java/nl/devpieter/utilize/mixins/ClientConnectionMixin.java +++ b/src/main/java/nl/devpieter/utilize/mixins/ClientConnectionMixin.java @@ -3,11 +3,7 @@ import net.minecraft.network.ClientConnection; import net.minecraft.network.listener.PacketListener; import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.c2s.play.CloseHandledScreenC2SPacket; -import net.minecraft.network.packet.s2c.play.OpenScreenS2CPacket; -import nl.devpieter.utilize.Utilize; import nl.devpieter.utilize.managers.PacketManager; -import nl.devpieter.utilize.utils.NetworkUtils; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @@ -24,17 +20,4 @@ public class ClientConnectionMixin { private static void onHandlePacket(Packet packet, PacketListener listener, CallbackInfo ci) { if (packetManager.packetReceived(packet)) ci.cancel(); } - - @Inject(at = @At("TAIL"), method = "handlePacket", cancellable = true) - private static void onHandlePacketTail(Packet packet, PacketListener listener, CallbackInfo ci) { - - if (packet instanceof OpenScreenS2CPacket openScreenPacket) { - int syncId = openScreenPacket.getSyncId(); - if (!Utilize.shouldBlockScreenId(syncId)) return; - - NetworkUtils.sendPacket(new CloseHandledScreenC2SPacket(openScreenPacket.getSyncId())); - Utilize.blockedScreenId(syncId); - ci.cancel(); - } - } } diff --git a/src/main/java/nl/devpieter/utilize/mixins/ClientPlayerEntityMixin.java b/src/main/java/nl/devpieter/utilize/mixins/ClientPlayerEntityMixin.java index d23ac13..724a6b8 100644 --- a/src/main/java/nl/devpieter/utilize/mixins/ClientPlayerEntityMixin.java +++ b/src/main/java/nl/devpieter/utilize/mixins/ClientPlayerEntityMixin.java @@ -5,13 +5,10 @@ import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.world.ClientWorld; import nl.devpieter.sees.Sees; -import nl.devpieter.utilize.Utilize; -import nl.devpieter.utilize.events.tick.ClientTickEvent; +import nl.devpieter.utilize.events.tick.ClientPlayerTickEvent; +import nl.devpieter.utilize.events.tick.ClientPlayerTickTailEvent; import nl.devpieter.utilize.managers.DamageManager; -import nl.devpieter.utilize.managers.SleepManager; -import nl.devpieter.utilize.managers.TaskManager; -import nl.devpieter.utilize.managers.TotemManager; -import nl.devpieter.utilize.setting.SettingManager; +import nl.devpieter.utilize.task.TaskManager; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @@ -22,39 +19,29 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity { @Unique - private final Sees sees = Sees.getInstance(); + private final Sees sees = Sees.getSharedInstance(); @Unique private final DamageManager damageManager = DamageManager.getInstance(); - @Unique - private final SleepManager sleepManager = SleepManager.getInstance(); - @Unique private final TaskManager taskManager = TaskManager.getInstance(); - @Unique - private final TotemManager totemManager = TotemManager.getInstance(); - public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile) { super(world, profile); } - @Inject(at = @At("TAIL"), method = "tick") + @Inject(at = @At("HEAD"), method = "tick") private void onTick(CallbackInfo ci) { - this.damageManager.tick(this.getHealth()); - this.sleepManager.tick(this.isSleeping(), this.getSleepTimer()); - this.taskManager.tick(); - this.totemManager.tick(); - - this.sees.call(new ClientTickEvent()); + taskManager.tick(TaskManager.TickPhase.PLAYER_HEAD); + sees.dispatch(new ClientPlayerTickEvent()); } - @Inject(at = @At("HEAD"), method = "swingHand", cancellable = true) - private void onSwingHand(CallbackInfo ci) { - if (!Utilize.shouldBlockSwingHandOnce()) return; + @Inject(at = @At("TAIL"), method = "tick") + private void onTickTail(CallbackInfo ci) { + damageManager.tick(getHealth()); + taskManager.tick(TaskManager.TickPhase.PLAYER_TAIL); - ci.cancel(); - Utilize.blockedSwingHandOnce(); + sees.dispatch(new ClientPlayerTickTailEvent()); } } diff --git a/src/main/java/nl/devpieter/utilize/mixins/ClientPlayerInteractionManagerMixin.java b/src/main/java/nl/devpieter/utilize/mixins/ClientPlayerInteractionManagerMixin.java index 8d1b4a2..0754270 100644 --- a/src/main/java/nl/devpieter/utilize/mixins/ClientPlayerInteractionManagerMixin.java +++ b/src/main/java/nl/devpieter/utilize/mixins/ClientPlayerInteractionManagerMixin.java @@ -11,11 +11,15 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import nl.devpieter.sees.Sees; -import nl.devpieter.utilize.Utilize; -import nl.devpieter.utilize.events.interaction.*; +import nl.devpieter.utilize.events.interaction.UpdateBlockBreakingProgressEvent; +import nl.devpieter.utilize.events.interaction.block.*; +import nl.devpieter.utilize.events.interaction.entity.*; +import nl.devpieter.utilize.events.interaction.item.InteractItemEvent; +import nl.devpieter.utilize.events.interaction.item.InteractItemReturnEvent; +import nl.devpieter.utilize.events.interaction.item.InteractItemTailEvent; import nl.devpieter.utilize.events.inventory.HotbarSlotChangedEvent; import nl.devpieter.utilize.events.inventory.SlotClickEvent; -import nl.devpieter.utilize.utils.InventoryUtils; +import nl.devpieter.utilize.utils.minecraft.InventoryUtils; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; @@ -34,68 +38,121 @@ public abstract class ClientPlayerInteractionManagerMixin { private int lastSelectedHotbarSlot = -1; @Unique - private final Sees sees = Sees.getInstance(); + private final Sees sees = Sees.getSharedInstance(); @Inject(at = @At("HEAD"), method = "updateBlockBreakingProgress", cancellable = true) private void onUpdateBlockBreakingProgress(BlockPos pos, Direction direction, CallbackInfoReturnable cir) { - if (!this.sees.call(new UpdateBlockBreakingProgressEvent(pos, direction))) return; + if (!sees.dispatch(new UpdateBlockBreakingProgressEvent(pos, direction))) return; - this.cancelBlockBreaking(); + // TODO - Make not cancelable? + + cancelBlockBreaking(); + cir.setReturnValue(false); + } + + @Inject(at = @At("HEAD"), method = "attackBlock", cancellable = true) + private void onAttackBlock(BlockPos pos, Direction direction, CallbackInfoReturnable cir) { + if (!sees.dispatch(new AttackBlockEvent(pos, direction))) return; + + cancelBlockBreaking(); cir.setReturnValue(false); - cir.cancel(); + } + + @Inject(at = @At("RETURN"), method = "attackBlock", cancellable = true) + private void onAttackBlockReturn(BlockPos pos, Direction direction, CallbackInfoReturnable cir) { + cir.setReturnValue(sees.dispatchWithResult(new AttackBlockReturnEvent(pos, direction, cir.getReturnValue()))); + } + + @Inject(at = @At("TAIL"), method = "attackBlock") + private void onAttackBlockTail(BlockPos pos, Direction direction, CallbackInfoReturnable cir) { + sees.dispatch(new AttackBlockTailEvent(pos, direction)); } @Inject(at = @At("HEAD"), method = "breakBlock", cancellable = true) private void onBreakBlock(BlockPos pos, CallbackInfoReturnable cir) { - if (!this.sees.call(new BreakBlockEvent(pos))) return; + if (!sees.dispatch(new BreakBlockEvent(pos))) return; - this.cancelBlockBreaking(); + cancelBlockBreaking(); cir.setReturnValue(false); - cir.cancel(); } - @Inject(at = @At("HEAD"), method = "attackBlock", cancellable = true) - private void onAttackBlock(BlockPos pos, Direction direction, CallbackInfoReturnable cir) { - if (!this.sees.call(new AttackBlockEvent(pos, direction))) return; + @Inject(at = @At("RETURN"), method = "breakBlock", cancellable = true) + private void onBreakBlockReturn(BlockPos pos, CallbackInfoReturnable cir) { + cir.setReturnValue(sees.dispatchWithResult(new BreakBlockReturnEvent(pos, cir.getReturnValue()))); + } - this.cancelBlockBreaking(); - cir.setReturnValue(false); - cir.cancel(); + @Inject(at = @At("TAIL"), method = "breakBlock") + private void onBreakBlockTail(BlockPos pos, CallbackInfoReturnable cir) { + sees.dispatch(new BreakBlockTailEvent(pos)); } @Inject(at = @At("HEAD"), method = "interactBlock", cancellable = true) private void onInteractBlock(ClientPlayerEntity player, Hand hand, BlockHitResult hitResult, CallbackInfoReturnable cir) { - if (!this.sees.call(new InteractBlockEvent(hand, hitResult))) return; + if (!sees.dispatch(new InteractBlockEvent(hand, hitResult))) return; cir.setReturnValue(ActionResult.FAIL); - cir.cancel(); + } + + @Inject(at = @At("RETURN"), method = "interactBlock", cancellable = true) + private void onInteractBlockReturn(ClientPlayerEntity player, Hand hand, BlockHitResult hitResult, CallbackInfoReturnable cir) { + cir.setReturnValue(sees.dispatchWithResult(new InteractBlockReturnEvent(hand, hitResult, cir.getReturnValue()))); + } + + @Inject(at = @At("TAIL"), method = "interactBlock") + private void onInteractBlockTail(ClientPlayerEntity player, Hand hand, BlockHitResult hitResult, CallbackInfoReturnable cir) { + sees.dispatch(new InteractBlockTailEvent(hand, hitResult)); } @Inject(at = @At("HEAD"), method = "interactItem", cancellable = true) private void onInteractItem(PlayerEntity player, Hand hand, CallbackInfoReturnable cir) { - if (!this.sees.call(new InteractItemEvent(hand))) return; + if (!sees.dispatch(new InteractItemEvent(hand))) return; cir.setReturnValue(ActionResult.FAIL); - cir.cancel(); + } + + @Inject(at = @At("RETURN"), method = "interactItem", cancellable = true) + private void onInteractItemReturn(PlayerEntity player, Hand hand, CallbackInfoReturnable cir) { + cir.setReturnValue(sees.dispatchWithResult(new InteractItemReturnEvent(hand, cir.getReturnValue()))); + } + + @Inject(at = @At("TAIL"), method = "interactItem") + private void onInteractItemTail(PlayerEntity player, Hand hand, CallbackInfoReturnable cir) { + sees.dispatch(new InteractItemTailEvent(hand)); } @Inject(at = @At("HEAD"), method = "attackEntity", cancellable = true) private void onAttackEntity(PlayerEntity player, Entity target, CallbackInfo ci) { - System.out.println("AttackEntityEvent called for " + target.getName().getString() + " by " + player.getName().getString()); - if (!this.sees.call(new AttackEntityEvent(target))) return; - + if (!sees.dispatch(new AttackEntityEvent(target))) return; ci.cancel(); - Utilize.blockSwingHandOnce(); + } + + @Inject(at = @At("RETURN"), method = "attackEntity") + private void onAttackEntityReturn(PlayerEntity player, Entity target, CallbackInfo ci) { + sees.dispatch(new AttackEntityReturnEvent(target)); + } + + @Inject(at = @At("TAIL"), method = "attackEntity") + private void onAttackEntityTail(PlayerEntity player, Entity target, CallbackInfo ci) { + sees.dispatch(new AttackEntityTailEvent(target)); } @Inject(at = @At("HEAD"), method = "interactEntity", cancellable = true) private void onInteractEntity(PlayerEntity player, Entity target, Hand hand, CallbackInfoReturnable cir) { - if (!this.sees.call(new InteractEntityEvent(target, hand))) return; + if (!sees.dispatch(new InteractEntityEvent(target, hand))) return; cir.setReturnValue(ActionResult.FAIL); - cir.cancel(); + } + + @Inject(at = @At("RETURN"), method = "interactEntity", cancellable = true) + private void onInteractEntityReturn(PlayerEntity player, Entity target, Hand hand, CallbackInfoReturnable cir) { + cir.setReturnValue(sees.dispatchWithResult(new InteractEntityReturnEvent(target, hand, cir.getReturnValue()))); + } + + @Inject(at = @At("TAIL"), method = "interactEntity") + private void onInteractEntityTail(PlayerEntity player, Entity target, Hand hand, CallbackInfoReturnable cir) { + sees.dispatch(new InteractEntityTailEvent(target, hand)); } @Inject(at = @At("HEAD"), method = "clickSlot", cancellable = true) private void onClickSlot(int syncId, int slotId, int button, SlotActionType actionType, PlayerEntity player, CallbackInfo ci) { - if (!this.sees.call(new SlotClickEvent(syncId, slotId, button, actionType))) return; + if (!sees.dispatch(new SlotClickEvent(syncId, slotId, button, actionType))) return; ci.cancel(); } @@ -103,14 +160,14 @@ private void onClickSlot(int syncId, int slotId, int button, SlotActionType acti private void onSyncSelectedSlot(CallbackInfo ci) { int slot = InventoryUtils.getSelectedHotbarSlot(); - if (this.lastSelectedHotbarSlot == -1) { - this.lastSelectedHotbarSlot = slot; + if (lastSelectedHotbarSlot == -1) { + lastSelectedHotbarSlot = slot; return; } - if (slot == this.lastSelectedHotbarSlot) return; - this.lastSelectedHotbarSlot = slot; + if (slot == lastSelectedHotbarSlot) return; + lastSelectedHotbarSlot = slot; - this.sees.call(new HotbarSlotChangedEvent(this.lastSelectedHotbarSlot, slot)); + sees.dispatch(new HotbarSlotChangedEvent(lastSelectedHotbarSlot, slot)); } } diff --git a/src/main/java/nl/devpieter/utilize/mixins/DebugRendererMixin.java b/src/main/java/nl/devpieter/utilize/mixins/DebugRendererMixin.java deleted file mode 100644 index 26918c8..0000000 --- a/src/main/java/nl/devpieter/utilize/mixins/DebugRendererMixin.java +++ /dev/null @@ -1,45 +0,0 @@ -package nl.devpieter.utilize.mixins; - -import net.minecraft.client.render.VertexConsumerProvider; -import net.minecraft.client.render.debug.DebugRenderer; -import net.minecraft.client.util.math.MatrixStack; -import nl.devpieter.utilize.managers.DebugManager; -import nl.devpieter.utilize.utils.ClientUtils; -import org.spongepowered.asm.mixin.Mixin; -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; - -//#if MC>=12102 -import net.minecraft.client.render.Frustum; -//#endif - -//#if MC>=12109 -import net.minecraft.world.debug.DebugDataStore; -//#endif - -@Mixin(DebugRenderer.class) -public class DebugRendererMixin { - - @Unique - private final DebugManager debugManager = DebugManager.getInstance(); - - @Inject(at = @At("HEAD"), method = "render") - //#if MC>=12109 - private void onRender(MatrixStack matrices, Frustum frustum, VertexConsumerProvider.Immediate vertexConsumers, double cameraX, double cameraY, double cameraZ, boolean lateDebug, CallbackInfo ci) { - //#elseif MC>=12102 - //$$ private void onRender(MatrixStack matrices, Frustum frustum, VertexConsumerProvider.Immediate vertexConsumers, double cameraX, double cameraY, double cameraZ, CallbackInfo ci) { - //#else - //$$ public void render(MatrixStack matrices, VertexConsumerProvider.Immediate vertexConsumers, double cameraX, double cameraY, double cameraZ, CallbackInfo ci) { - //#endif - for (DebugRenderer.Renderer renderer : this.debugManager.getRenderers()) { - //#if MC>=12109 - DebugDataStore debugDataStore = ClientUtils.getNetworkHandler().getDebugDataStore(); - renderer.render(matrices, vertexConsumers, cameraX, cameraY, cameraZ, debugDataStore, frustum); - //#else - //$$ renderer.render(matrices, vertexConsumers, cameraX, cameraY, cameraZ); - //#endif - } - } -} diff --git a/src/main/java/nl/devpieter/utilize/mixins/KeyBindingMixin.java b/src/main/java/nl/devpieter/utilize/mixins/KeyBindingMixin.java new file mode 100644 index 0000000..b6705e6 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/mixins/KeyBindingMixin.java @@ -0,0 +1,80 @@ +package nl.devpieter.utilize.mixins; + +import net.minecraft.client.option.KeyBinding; +import nl.devpieter.sees.Sees; +import nl.devpieter.utilize.enums.KeyActionOverride; +import nl.devpieter.utilize.events.interaction.keybinding.AttackKeyPressedEvent; +import nl.devpieter.utilize.events.interaction.keybinding.KeyBindingPressedCheckEvent; +import nl.devpieter.utilize.events.interaction.keybinding.KeyBindingPressedEvent; +import nl.devpieter.utilize.events.interaction.keybinding.UseKeyPressedEvent; +import org.jetbrains.annotations.NotNull; +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.CallbackInfoReturnable; + +@Mixin(KeyBinding.class) +public abstract class KeyBindingMixin { + + @Shadow + private int timesPressed; + + @Shadow + public abstract void setPressed(boolean pressed); + + @Shadow + public abstract String getId(); + + @Unique + private final Sees sees = Sees.getSharedInstance(); + + @Inject(at = @At("RETURN"), method = "isPressed", cancellable = true) + private void isPressed(CallbackInfoReturnable cir) { + handle(cir); + if (cir.getReturnValue()) handlePress(cir); + } + + @Inject(at = @At("RETURN"), method = "wasPressed", cancellable = true) + private void wasPressed(CallbackInfoReturnable cir) { + handle(cir); + if (cir.getReturnValue()) handlePress(cir); + } + + @Unique + private void handle(@NotNull CallbackInfoReturnable cir) { + KeyActionOverride override = sees.dispatchWithResult(new KeyBindingPressedCheckEvent(getId())); + if (override == KeyActionOverride.FORCE_RELEASE) forceRelease(cir); + else if (override == KeyActionOverride.FORCE_PRESS) forcePress(cir); + } + + @Unique + private void handlePress(@NotNull CallbackInfoReturnable cir) { + String keyId = getId(); + + if (keyId.equals("key.attack")) { + if (sees.dispatch(new AttackKeyPressedEvent())) forceRelease(cir); + } else if (keyId.equals("key.use")) { + if (sees.dispatch(new UseKeyPressedEvent())) forceRelease(cir); + } + + KeyActionOverride override = sees.dispatchWithResult(new KeyBindingPressedEvent(keyId)); + if (override == KeyActionOverride.FORCE_RELEASE) forceRelease(cir); + else if (override == KeyActionOverride.FORCE_PRESS) forcePress(cir); + } + + @Unique + private void forceRelease(CallbackInfoReturnable cir) { + timesPressed = 0; + setPressed(false); + cir.setReturnValue(false); + } + + @Unique + private void forcePress(CallbackInfoReturnable cir) { + if (timesPressed < 1) timesPressed = 1; + setPressed(true); + cir.setReturnValue(true); + } +} diff --git a/src/main/java/nl/devpieter/utilize/mixins/MinecraftClientMixin.java b/src/main/java/nl/devpieter/utilize/mixins/MinecraftClientMixin.java index 4a89871..f9c26cd 100644 --- a/src/main/java/nl/devpieter/utilize/mixins/MinecraftClientMixin.java +++ b/src/main/java/nl/devpieter/utilize/mixins/MinecraftClientMixin.java @@ -5,7 +5,10 @@ import nl.devpieter.sees.Sees; import nl.devpieter.utilize.Utilize; import nl.devpieter.utilize.events.screen.ScreenChangedEvent; +import nl.devpieter.utilize.events.tick.ClientTickEvent; +import nl.devpieter.utilize.events.tick.ClientTickTailEvent; import nl.devpieter.utilize.setting.SettingManager; +import nl.devpieter.utilize.task.TaskManager; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -22,33 +25,62 @@ public class MinecraftClientMixin { public Screen currentScreen; @Unique - private final Sees sees = Sees.getInstance(); + private Screen previousScreen; + + @Unique + private final Sees sees = Sees.getSharedInstance(); @Unique private SettingManager settingManager; @Unique - private Screen previousScreen; + private TaskManager taskManager; @Inject(at = @At("HEAD"), method = "setScreen") private void onSetScreenHead(Screen screen, CallbackInfo ci) { - this.previousScreen = this.currentScreen; + previousScreen = currentScreen; } @Inject(at = @At("TAIL"), method = "setScreen") private void onSetScreenTail(Screen screen, CallbackInfo ci) { - this.sees.call(new ScreenChangedEvent(this.previousScreen, screen)); + sees.dispatch(new ScreenChangedEvent(previousScreen, screen)); } - @Inject(at = @At("TAIL"), method = "tick") + @Inject(at = @At("HEAD"), method = "tick") private void onTick(CallbackInfo ci) { + tryInitializeManagers(); + + if (taskManager != null) { + taskManager.beginTick(); + taskManager.tick(TaskManager.TickPhase.CLIENT_HEAD); + } + + sees.dispatch(new ClientTickEvent()); + } + + @Inject(at = @At("TAIL"), method = "tick") + private void onTickTail(CallbackInfo ci) { + if (settingManager != null) settingManager.tick(); + if (taskManager != null) taskManager.tick(TaskManager.TickPhase.CLIENT_TAIL); + + sees.dispatch(new ClientTickTailEvent()); + } + + /** + * We need to initialize the managers here because Utilize may not be fully initialized + * when MinecraftClient is being constructed, leading to potential null references. + */ + @Unique + private void tryInitializeManagers() { + if (settingManager != null || taskManager != null) return; + if (!Utilize.getInstance().isInitialized()) return; + if (settingManager == null) { - if (!Utilize.isInitialized()) return; settingManager = SettingManager.getInstance(); } - if (settingManager != null) { - settingManager.tick(); + if (taskManager == null) { + taskManager = TaskManager.getInstance(); } } } diff --git a/src/main/java/nl/devpieter/utilize/mixins/SeesMixin.java b/src/main/java/nl/devpieter/utilize/mixins/SeesMixin.java new file mode 100644 index 0000000..d60e598 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/mixins/SeesMixin.java @@ -0,0 +1,32 @@ +package nl.devpieter.utilize.mixins; + +import nl.devpieter.sees.Sees; +import nl.devpieter.sees.event.SEvent; +import nl.devpieter.utilize.events.interaction.keybinding.KeyBindingPressedCheckEvent; +import nl.devpieter.utilize.events.tick.ITickEvent; +import nl.devpieter.utilize.utils.minecraft.ClientUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.spongepowered.asm.mixin.Mixin; +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.CallbackInfoReturnable; + +@Mixin(value = Sees.class, remap = false) +public class SeesMixin { + + @Unique + private final Logger logger = LoggerFactory.getLogger("Utilize/SeesMixin"); + +// @Inject( +// method = "dispatch(Lnl/devpieter/sees/event/SEvent;)Z", +// at = @At("RETURN") +// ) +// private void onDispatch(SEvent event, CallbackInfoReturnable cir) { +// if (event instanceof ITickEvent || event instanceof KeyBindingPressedCheckEvent) return; +// if (!ClientUtils.isDevEnv()) return; +// +// logger.info("Dispatched event: {} (canceled: {})", event.getClass().getSimpleName(), cir.getReturnValue()); +// } +} diff --git a/src/main/java/nl/devpieter/utilize/models/PolymorphicValue.java b/src/main/java/nl/devpieter/utilize/models/PolymorphicValue.java new file mode 100644 index 0000000..755b600 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/models/PolymorphicValue.java @@ -0,0 +1,41 @@ +package nl.devpieter.utilize.models; + +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import org.jetbrains.annotations.NotNull; + +public class PolymorphicValue { + + private static final Gson gson = new Gson(); + + private String className; + private JsonElement data; + + private transient T instance; + + public PolymorphicValue() { + } + + public PolymorphicValue(@NotNull T value) { + className = value.getClass().getName(); + data = gson.toJsonTree(value); + instance = value; + } + + public T getValue(Class baseType) { + if (instance != null) return instance; + + try { + Class clazz = Class.forName(className); + instance = baseType.cast(gson.fromJson(data, clazz)); + + return instance; + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + public void sync() { + data = gson.toJsonTree(instance); + } +} diff --git a/src/main/java/nl/devpieter/utilize/setting/SettingManager.java b/src/main/java/nl/devpieter/utilize/setting/SettingManager.java index c472464..ad48d86 100644 --- a/src/main/java/nl/devpieter/utilize/setting/SettingManager.java +++ b/src/main/java/nl/devpieter/utilize/setting/SettingManager.java @@ -3,10 +3,11 @@ import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.reflect.TypeToken; -import nl.devpieter.utilize.Utilize; import nl.devpieter.utilize.setting.interfaces.ISetting; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.*; import java.time.Duration; @@ -15,11 +16,12 @@ import java.util.List; import java.util.concurrent.CompletableFuture; -public class SettingManager { +public final class SettingManager { - private static SettingManager INSTANCE; + private static final SettingManager INSTANCE = new SettingManager(); private final Gson gson = new Gson(); + private final Logger logger = LoggerFactory.getLogger("Utilize - SettingManager"); private final Duration saveInterval = Duration.ofSeconds(15); private final HashMap>> saveQueue = new HashMap<>(); @@ -31,39 +33,35 @@ private SettingManager() { } public static SettingManager getInstance() { - if (INSTANCE == null) INSTANCE = new SettingManager(); return INSTANCE; } public static void shutdown() { - if (INSTANCE == null) return; - INSTANCE.forceSaveQueue(); - INSTANCE = null; } public void tick() { - if (this.saveQueue.isEmpty()) return; + if (saveQueue.isEmpty()) return; long currentTime = System.currentTimeMillis(); - if (currentTime - this.lastSaveTime < this.saveInterval.toMillis()) return; + if (currentTime - lastSaveTime < saveInterval.toMillis()) return; - if (this.saveFuture != null && !this.saveFuture.isDone()) return; + if (saveFuture != null && !saveFuture.isDone()) return; - this.saveFuture = CompletableFuture.supplyAsync(() -> { - int files = this.saveQueue.size(); - int size = this.saveQueue.values().stream().mapToInt(List::size).sum(); - Utilize.LOGGER.info("Starting periodic 'setting batch save' for {} files and {} settings", files, size); + saveFuture = CompletableFuture.supplyAsync(() -> { + int files = saveQueue.size(); + int size = saveQueue.values().stream().mapToInt(List::size).sum(); + logger.info("Starting periodic 'setting batch save' for {} files and {} settings", files, size); - for (String path : this.saveQueue.keySet()) { + for (String path : saveQueue.keySet()) { File file = new File(path); - if (this.saveBatchToFile(file, this.saveQueue.get(path))) continue; - Utilize.LOGGER.error("Failed to save settings batch to file: {}", file.getAbsolutePath()); + if (saveBatchToFile(file, saveQueue.get(path))) continue; + logger.error("Failed to save settings batch to file: {}", file.getAbsolutePath()); } - this.lastSaveTime = currentTime; - this.saveQueue.clear(); + lastSaveTime = currentTime; + saveQueue.clear(); return true; }); } @@ -72,11 +70,11 @@ public boolean queueSave(@NotNull File file, @NotNull ISetting setting) { String path = file.getAbsolutePath(); KeyedSetting keyedSetting = setting.asKeyedSetting(); - List> settingsList = this.saveQueue.getOrDefault(path, new ArrayList<>()); + List> settingsList = saveQueue.getOrDefault(path, new ArrayList<>()); settingsList.removeIf(s -> s.key().equals(keyedSetting.key())); settingsList.add(keyedSetting); - this.saveQueue.put(path, settingsList); + saveQueue.put(path, settingsList); return true; } @@ -84,37 +82,37 @@ public boolean queueSave(@NotNull File file, @NotNull List> settings boolean success = true; for (ISetting setting : settings) { - if (!this.queueSave(file, setting)) success = false; + if (!queueSave(file, setting)) success = false; } return success; } public void forceSaveQueue() { - if (this.saveQueue.isEmpty()) return; + if (saveQueue.isEmpty()) return; - int files = this.saveQueue.size(); - int size = this.saveQueue.values().stream().mapToInt(List::size).sum(); - Utilize.LOGGER.info("Forced starting 'setting batch save' for {} files and {} settings", files, size); + int files = saveQueue.size(); + int size = saveQueue.values().stream().mapToInt(List::size).sum(); + logger.info("Forced starting 'setting batch save' for {} files and {} settings", files, size); - for (String path : this.saveQueue.keySet()) { + for (String path : saveQueue.keySet()) { File file = new File(path); - if (this.saveBatchToFile(file, this.saveQueue.get(path))) continue; - Utilize.LOGGER.error("Failed to force save settings batch to file: {}", file.getAbsolutePath()); + if (saveBatchToFile(file, saveQueue.get(path))) continue; + logger.error("Failed to force save settings batch to file: {}", file.getAbsolutePath()); } - this.saveQueue.clear(); + saveQueue.clear(); } public boolean loadSetting(@NotNull File file, @NotNull ISetting setting) { - List> batch = this.readBatchFromFile(file); - return this.loadSettingFromBatch(setting, batch); + List> batch = readBatchFromFile(file); + return loadSettingFromBatch(setting, batch); } public boolean loadSettings(@NotNull File file, @NotNull List> settings) { - List> batch = this.readBatchFromFile(file); - for (ISetting setting : settings) this.loadSettingFromBatch(setting, batch); + List> batch = readBatchFromFile(file); + for (ISetting setting : settings) loadSettingFromBatch(setting, batch); return true; } @@ -127,19 +125,19 @@ private boolean loadSettingFromBatch(@NotNull ISetting setting, @Nullable for (KeyedSetting keyedSetting : batch) { if (!keyedSetting.key().equals(setting.getIdentifier())) continue; - JsonElement jsonElement = this.gson.toJsonTree(keyedSetting.value()); - T value = this.gson.fromJson(jsonElement, setting.getType()); + JsonElement jsonElement = gson.toJsonTree(keyedSetting.value()); + T value = gson.fromJson(jsonElement, setting.getType()); setting.setValue(setting.shouldAllowNull() ? value : value != null ? value : setting.getDefault()); return true; } - Utilize.LOGGER.warn("Failed to load setting: {} from batch", setting.getIdentifier()); + logger.warn("Failed to load setting: {} from batch", setting.getIdentifier()); return false; } private boolean saveBatchToFile(@NotNull File file, @NotNull List> settings) { - List> currentSettings = this.readBatchFromFile(file); + List> currentSettings = readBatchFromFile(file); if (currentSettings == null) currentSettings = new ArrayList<>(); HashMap> settingsMap = new HashMap<>(); @@ -154,20 +152,20 @@ private boolean saveBatchToFile(@NotNull File file, @NotNull List(settingsMap.values()); try (FileWriter writer = new FileWriter(file)) { - this.gson.toJson(currentSettings, writer); + gson.toJson(currentSettings, writer); return true; } catch (IOException e) { - Utilize.LOGGER.error("Failed to save settings batch to file: {}", file.getAbsolutePath(), e); + logger.error("Failed to save settings batch to file: {}", file.getAbsolutePath(), e); return false; } } private @Nullable List> readBatchFromFile(@NotNull File file) { try (Reader reader = new FileReader(file)) { - return this.gson.fromJson(reader, new TypeToken>>() { + return gson.fromJson(reader, new TypeToken>>() { }.getType()); } catch (IOException e) { - Utilize.LOGGER.error("Failed to read settings batch from file: {}", file.getAbsolutePath(), e); + logger.error("Failed to read settings batch from file: {}", file.getAbsolutePath(), e); return null; } } diff --git a/src/main/java/nl/devpieter/utilize/setting/base/SettingBase.java b/src/main/java/nl/devpieter/utilize/setting/base/SettingBase.java index 08c4705..c36ddae 100644 --- a/src/main/java/nl/devpieter/utilize/setting/base/SettingBase.java +++ b/src/main/java/nl/devpieter/utilize/setting/base/SettingBase.java @@ -25,26 +25,30 @@ public SettingBase(@NotNull String identifier, T defaultValue, boolean allowNull @Override public String getIdentifier() { - return this.identifier; + return identifier; } @Override public boolean shouldAllowNull() { - return this.allowNull; + return allowNull; } @Override public T getValue() { - return this.value; + return value; } @Override public T getDefault() { - return this.defaultValue; + return defaultValue; } @Override public void setValue(T value) { + if (!allowNull && value == null) { + throw new IllegalArgumentException("Null value not allowed for setting: " + identifier); + } + this.value = value; } } diff --git a/src/main/java/nl/devpieter/utilize/setting/interfaces/IMapSetting.java b/src/main/java/nl/devpieter/utilize/setting/interfaces/IMapSetting.java new file mode 100644 index 0000000..5ecc667 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/setting/interfaces/IMapSetting.java @@ -0,0 +1,18 @@ +package nl.devpieter.utilize.setting.interfaces; + +import java.util.Map; + +public interface IMapSetting extends ISetting> { + + boolean containsKey(T key); + + boolean containsValue(V value); + + V get(T key); + + void put(T key, V value); + + void remove(T key); + + void clear(); +} diff --git a/src/main/java/nl/devpieter/utilize/setting/interfaces/IPolymorphicSetting.java b/src/main/java/nl/devpieter/utilize/setting/interfaces/IPolymorphicSetting.java new file mode 100644 index 0000000..66267bc --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/setting/interfaces/IPolymorphicSetting.java @@ -0,0 +1,15 @@ +package nl.devpieter.utilize.setting.interfaces; + +import com.google.common.reflect.TypeToken; +import nl.devpieter.utilize.models.PolymorphicValue; + +import java.lang.reflect.Type; + +public interface IPolymorphicSetting extends ISetting> { + + @Override + default Type getType() { + return new TypeToken>() { + }.getType(); + } +} diff --git a/src/main/java/nl/devpieter/utilize/setting/interfaces/ISetting.java b/src/main/java/nl/devpieter/utilize/setting/interfaces/ISetting.java index 7a45f1e..e7d5d11 100644 --- a/src/main/java/nl/devpieter/utilize/setting/interfaces/ISetting.java +++ b/src/main/java/nl/devpieter/utilize/setting/interfaces/ISetting.java @@ -19,14 +19,20 @@ public interface ISetting { void setValue(T value); default void reset() { - this.setValue(this.getDefault()); + setValue(getDefault()); } default boolean isDefaultValueSet() { - return !this.getValue().equals(this.getDefault()); + T value = getValue(); + T defaultValue = getDefault(); + + if (value == null && defaultValue == null) return true; + if (value == null || defaultValue == null) return false; + + return value.equals(defaultValue); } default KeyedSetting asKeyedSetting() { - return new KeyedSetting<>(this.getIdentifier(), this.getValue()); + return new KeyedSetting<>(getIdentifier(), getValue()); } } diff --git a/src/main/java/nl/devpieter/utilize/setting/settings/BooleanSetting.java b/src/main/java/nl/devpieter/utilize/setting/settings/BooleanSetting.java index 7f3a287..4ef0a54 100644 --- a/src/main/java/nl/devpieter/utilize/setting/settings/BooleanSetting.java +++ b/src/main/java/nl/devpieter/utilize/setting/settings/BooleanSetting.java @@ -16,17 +16,17 @@ public BooleanSetting(@NotNull String identifier, Boolean defaultValue, boolean @Override public void toggle() { - if (this.getValue() == null) throw new IllegalStateException("Cannot toggle a null value. Use setValue() instead."); - this.setValue(!this.getValue()); + if (getValue() == null) throw new IllegalStateException("Cannot toggle a null value. Use setValue() instead."); + setValue(!getValue()); } @Override public void setTrue() { - this.setValue(true); + setValue(true); } @Override public void setFalse() { - this.setValue(false); + setValue(false); } } diff --git a/src/main/java/nl/devpieter/utilize/setting/settings/FloatSetting.java b/src/main/java/nl/devpieter/utilize/setting/settings/FloatSetting.java index 0a67876..e974858 100644 --- a/src/main/java/nl/devpieter/utilize/setting/settings/FloatSetting.java +++ b/src/main/java/nl/devpieter/utilize/setting/settings/FloatSetting.java @@ -19,32 +19,32 @@ public FloatSetting(@NotNull String identifier, Float defaultValue, boolean allo @Override public void increment() { - if (this.getValue() == null) throw new IllegalStateException("Cannot increment a null value. Use setValue() instead."); - this.setValue(this.getValue() + 1.0F); + if (getValue() == null) throw new IllegalStateException("Cannot increment a null value. Use setValue() instead."); + setValue(getValue() + 1.0F); } @Override public void increment(@Nullable Float amount) { - if (amount == null && !this.shouldAllowNull()) throw new IllegalArgumentException("Amount cannot be null"); + if (amount == null && !shouldAllowNull()) throw new IllegalArgumentException("Amount cannot be null"); - if (amount == null) this.setValue(0.0F); - else if (this.getValue() == null) this.setValue(amount); - else this.setValue(this.getValue() + amount); + if (amount == null) setValue(0.0F); + else if (getValue() == null) setValue(amount); + else setValue(getValue() + amount); } @Override public void decrement() { - if (this.getValue() == null) throw new IllegalStateException("Cannot decrement a null value. Use setValue() instead."); - this.setValue(this.getValue() - 1.0F); + if (getValue() == null) throw new IllegalStateException("Cannot decrement a null value. Use setValue() instead."); + setValue(getValue() - 1.0F); } @Override public void decrement(@Nullable Float amount) { - if (amount == null && !this.shouldAllowNull()) throw new IllegalArgumentException("Amount cannot be null"); + if (amount == null && !shouldAllowNull()) throw new IllegalArgumentException("Amount cannot be null"); - if (amount == null) this.setValue(0.0F); - else if (this.getValue() == null) this.setValue(-amount); - else this.setValue(this.getValue() - amount); + if (amount == null) setValue(0.0F); + else if (getValue() == null) setValue(-amount); + else setValue(getValue() - amount); } @Override diff --git a/src/main/java/nl/devpieter/utilize/setting/settings/IntSetting.java b/src/main/java/nl/devpieter/utilize/setting/settings/IntSetting.java index e23e8af..a7a93b7 100644 --- a/src/main/java/nl/devpieter/utilize/setting/settings/IntSetting.java +++ b/src/main/java/nl/devpieter/utilize/setting/settings/IntSetting.java @@ -19,32 +19,32 @@ public IntSetting(@NotNull String identifier, Integer defaultValue, boolean allo @Override public void increment() { - if (this.getValue() == null) throw new IllegalStateException("Cannot increment a null value. Use setValue() instead."); - this.setValue(this.getValue() + 1); + if (getValue() == null) throw new IllegalStateException("Cannot increment a null value. Use setValue() instead."); + setValue(getValue() + 1); } @Override public void increment(@Nullable Integer amount) { - if (amount == null && !this.shouldAllowNull()) throw new IllegalArgumentException("Amount cannot be null"); + if (amount == null && !shouldAllowNull()) throw new IllegalArgumentException("Amount cannot be null"); - if (amount == null) this.setValue(0); - else if (this.getValue() == null) this.setValue(amount); - else this.setValue(this.getValue() + amount); + if (amount == null) setValue(0); + else if (getValue() == null) setValue(amount); + else setValue(getValue() + amount); } @Override public void decrement() { - if (this.getValue() == null) throw new IllegalStateException("Cannot decrement a null value. Use setValue() instead."); - this.setValue(this.getValue() - 1); + if (getValue() == null) throw new IllegalStateException("Cannot decrement a null value. Use setValue() instead."); + setValue(getValue() - 1); } @Override public void decrement(@Nullable Integer amount) { - if (amount == null && !this.shouldAllowNull()) throw new IllegalArgumentException("Amount cannot be null"); + if (amount == null && !shouldAllowNull()) throw new IllegalArgumentException("Amount cannot be null"); - if (amount == null) this.setValue(0); - else if (this.getValue() == null) this.setValue(-amount); - else this.setValue(this.getValue() - amount); + if (amount == null) setValue(0); + else if (getValue() == null) setValue(-amount); + else setValue(getValue() - amount); } @Override diff --git a/src/main/java/nl/devpieter/utilize/setting/settings/ListSetting.java b/src/main/java/nl/devpieter/utilize/setting/settings/ListSetting.java index 1e93924..e939954 100644 --- a/src/main/java/nl/devpieter/utilize/setting/settings/ListSetting.java +++ b/src/main/java/nl/devpieter/utilize/setting/settings/ListSetting.java @@ -19,50 +19,50 @@ public ListSetting(String identifier, List defaultValue, boolean allowNull) { @Override public boolean contains(T value) { - if (this.getValue() == null) return false; - return this.getValue().contains(value); + if (getValue() == null) return false; + return getValue().contains(value); } @Override public void add(T value) { - if (this.getValue() == null) throw new IllegalStateException("List value is null, cannot add element."); - this.getValue().add(value); + if (getValue() == null) throw new IllegalStateException("List value is null, cannot add element."); + getValue().add(value); } @Override public void remove(T value) { - if (this.getValue() == null) throw new IllegalStateException("List value is null, cannot remove element."); - this.getValue().remove(value); + if (getValue() == null) throw new IllegalStateException("List value is null, cannot remove element."); + getValue().remove(value); } @Override public void removeAt(int index) { - if (this.getValue() == null) throw new IllegalStateException("List value is null, cannot remove element at index."); - if (index < 0 || index >= this.getValue().size()) throw new IndexOutOfBoundsException("Index out of bounds for list."); + if (getValue() == null) throw new IllegalStateException("List value is null, cannot remove element at index."); + if (index < 0 || index >= getValue().size()) throw new IndexOutOfBoundsException("Index out of bounds for list."); - this.getValue().remove(index); + getValue().remove(index); } @Override public void removeFirst() { - if (this.getValue() == null) throw new IllegalStateException("List value is null, cannot remove first element."); - if (this.getValue().isEmpty()) throw new IllegalStateException("List is empty, cannot remove first element."); + if (getValue() == null) throw new IllegalStateException("List value is null, cannot remove first element."); + if (getValue().isEmpty()) throw new IllegalStateException("List is empty, cannot remove first element."); - this.getValue().removeFirst(); + getValue().removeFirst(); } @Override public void removeLast() { - if (this.getValue() == null) throw new IllegalStateException("List value is null, cannot remove last element."); - if (this.getValue().isEmpty()) throw new IllegalStateException("List is empty, cannot remove last element."); + if (getValue() == null) throw new IllegalStateException("List value is null, cannot remove last element."); + if (getValue().isEmpty()) throw new IllegalStateException("List is empty, cannot remove last element."); - this.getValue().removeLast(); + getValue().removeLast(); } @Override public void clear() { - if (this.getValue() == null) throw new IllegalStateException("List value is null, cannot clear."); - this.getValue().clear(); + if (getValue() == null) throw new IllegalStateException("List value is null, cannot clear."); + getValue().clear(); } @Override diff --git a/src/main/java/nl/devpieter/utilize/setting/settings/MapSetting.java b/src/main/java/nl/devpieter/utilize/setting/settings/MapSetting.java new file mode 100644 index 0000000..cd498c8 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/setting/settings/MapSetting.java @@ -0,0 +1,62 @@ +package nl.devpieter.utilize.setting.settings; + +import com.google.common.reflect.TypeToken; +import nl.devpieter.utilize.setting.base.SettingBase; +import nl.devpieter.utilize.setting.interfaces.IMapSetting; +import org.jetbrains.annotations.NotNull; + +import java.lang.reflect.Type; +import java.util.Map; + +public class MapSetting extends SettingBase> implements IMapSetting { + + public MapSetting(@NotNull String identifier, Map defaultValue) { + super(identifier, defaultValue); + } + + public MapSetting(@NotNull String identifier, Map defaultValue, boolean allowNull) { + super(identifier, defaultValue, allowNull); + } + + @Override + public boolean containsKey(T key) { + if (getValue() == null) return false; + return getValue().containsKey(key); + } + + @Override + public boolean containsValue(V value) { + if (getValue() == null) return false; + return getValue().containsValue(value); + } + + @Override + public V get(T key) { + if (getValue() == null) return null; + return getValue().get(key); + } + + @Override + public void put(T key, V value) { + if (getValue() == null) throw new IllegalStateException("Map value is null, cannot put element."); + getValue().put(key, value); + } + + @Override + public void remove(T key) { + if (getValue() == null) throw new IllegalStateException("Map value is null, cannot remove element."); + getValue().remove(key); + } + + @Override + public void clear() { + if (getValue() == null) throw new IllegalStateException("Map value is null, cannot clear elements."); + getValue().clear(); + } + + @Override + public Type getType() { + return new TypeToken>() { + }.getType(); + } +} diff --git a/src/main/java/nl/devpieter/utilize/task/TaskManager.java b/src/main/java/nl/devpieter/utilize/task/TaskManager.java new file mode 100644 index 0000000..187f5b5 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/task/TaskManager.java @@ -0,0 +1,92 @@ +package nl.devpieter.utilize.task; + +import nl.devpieter.utilize.task.interfaces.ITask; + +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; + +public final class TaskManager { + + private static final TaskManager INSTANCE = new TaskManager(); + + private final List pendingTasks = new ArrayList<>(); + private final EnumMap> taskMap = new EnumMap<>(TickPhase.class); + + private TaskManager() { + taskMap.put(TickPhase.PLAYER_HEAD, new ArrayList<>()); + taskMap.put(TickPhase.PLAYER_TAIL, new ArrayList<>()); + taskMap.put(TickPhase.CLIENT_HEAD, new ArrayList<>()); + taskMap.put(TickPhase.CLIENT_TAIL, new ArrayList<>()); + } + + public static TaskManager getInstance() { + return INSTANCE; + } + + public void addTask(ITask task) { + addTask(task, TickPhase.PLAYER_TAIL); + } + + public void addTask(ITask task, TickPhase phase) { + pendingTasks.add(new TaskEntry(task, phase)); + } + + public void removeTask(ITask task) { + pendingTasks.removeIf(entry -> entry.task() == task); + + for (List tasks : taskMap.values()) { + tasks.remove(task); + } + } + + public void beginTick() { + flushPendingTasks(); + } + + public void tick(TickPhase phase) { + List tasks = taskMap.get(phase); + if (tasks == null || tasks.isEmpty()) return; + + List toRemove = new ArrayList<>(); + + for (ITask task : tasks) { + TickResult result = task.tick(); + + if (result == TickResult.FINISHED) { + toRemove.add(task); + } else if (result == TickResult.REQUEUE) { + toRemove.add(task); + addTask(task, phase); + } + } + + tasks.removeAll(toRemove); + } + + private void flushPendingTasks() { + if (pendingTasks.isEmpty()) return; + + for (TaskEntry entry : pendingTasks) { + taskMap.get(entry.phase()).add(entry.task()); + } + + pendingTasks.clear(); + } + + public enum TickPhase { + PLAYER_HEAD, + PLAYER_TAIL, + CLIENT_HEAD, + CLIENT_TAIL + } + + public enum TickResult { + CONTINUE, + FINISHED, + REQUEUE + } + + private record TaskEntry(ITask task, TickPhase phase) { + } +} diff --git a/src/main/java/nl/devpieter/utilize/task/interfaces/ITask.java b/src/main/java/nl/devpieter/utilize/task/interfaces/ITask.java new file mode 100644 index 0000000..b2fd1a0 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/task/interfaces/ITask.java @@ -0,0 +1,8 @@ +package nl.devpieter.utilize.task.interfaces; + +import nl.devpieter.utilize.task.TaskManager; + +public interface ITask { + + TaskManager.TickResult tick(); +} diff --git a/src/main/java/nl/devpieter/utilize/task/tasks/RunLaterTask.java b/src/main/java/nl/devpieter/utilize/task/tasks/RunLaterTask.java new file mode 100644 index 0000000..e056da3 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/task/tasks/RunLaterTask.java @@ -0,0 +1,42 @@ +package nl.devpieter.utilize.task.tasks; + +import nl.devpieter.utilize.task.TaskManager; +import nl.devpieter.utilize.task.interfaces.ITask; +import nl.devpieter.utilize.utils.common.MathUtils; +import org.jetbrains.annotations.NotNull; + +import java.time.Duration; + +public class RunLaterTask implements ITask { + + private final Runnable runnable; + + private final int startDelayTicks; + + private boolean finished; + private int tickCounter; + + public RunLaterTask(@NotNull Runnable runnable, @NotNull Duration startDelay) { + this(runnable, MathUtils.durationToTicks(startDelay)); + } + + public RunLaterTask(@NotNull Runnable runnable, int startDelayTicks) { + this.runnable = runnable; + this.startDelayTicks = startDelayTicks; + } + + @Override + public TaskManager.TickResult tick() { + if (finished) return TaskManager.TickResult.FINISHED; + + tickCounter++; + if (tickCounter < startDelayTicks) { + return TaskManager.TickResult.CONTINUE; + } + + runnable.run(); + finished = true; + + return TaskManager.TickResult.FINISHED; + } +} diff --git a/src/main/java/nl/devpieter/utilize/utils/WorldUtils.java b/src/main/java/nl/devpieter/utilize/utils/WorldUtils.java deleted file mode 100644 index 256defa..0000000 --- a/src/main/java/nl/devpieter/utilize/utils/WorldUtils.java +++ /dev/null @@ -1,88 +0,0 @@ -package nl.devpieter.utilize.utils; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.mob.MobEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; -import net.minecraft.util.math.Vec3i; -import net.minecraft.world.World; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.ArrayList; -import java.util.List; - -public class WorldUtils { - - public static @Nullable BlockState getStateAt(@NotNull Vec3d vec3d) { - return getStateAt(MathUtils.from(vec3d)); - } - - public static @Nullable BlockState getStateAt(@NotNull Vec3i vec3i) { - return getStateAt(new BlockPos(vec3i)); - } - - public static @Nullable BlockState getStateAt(@NotNull BlockPos pos) { - if (!ClientUtils.hasWorld()) return null; - return ClientUtils.getWorld().getBlockState(pos); - } - - public static @Nullable Block getBlockAt(@NotNull Vec3d vec3d) { - return getBlockAt(MathUtils.from(vec3d)); - } - - public static @Nullable Block getBlockAt(@NotNull Vec3i vec3i) { - return getBlockAt(new BlockPos(vec3i)); - } - - public static @Nullable Block getBlockAt(@NotNull BlockPos pos) { - BlockState state = getStateAt(pos); - if (state == null) return null; - - return state.getBlock(); - } - - public static @Nullable Entity getEntity(int id) { - if (!ClientUtils.hasWorld()) return null; - return ClientUtils.getWorld().getEntityById(id); - } - - @Deprecated(since = "1.0.11", forRemoval = true) - public static List getNearbyPlayers(float distance) { - if (!ClientUtils.hasPlayer() || !ClientUtils.hasWorld()) return new ArrayList<>(); - - World world = ClientUtils.getWorld(); - PlayerEntity clientPlayer = ClientUtils.getPlayer(); - - return world.getPlayers().stream() - .filter(player -> - player != clientPlayer && - player.distanceTo(clientPlayer) <= distance && - player.isAlive() - ).toList(); - } - - @Deprecated(since = "1.0.11", forRemoval = true) - public static boolean arePlayersNearby(float distance) { - return !getNearbyPlayers(distance).isEmpty(); - } - - @Deprecated(since = "1.0.11", forRemoval = true) - public static List getNearbyMobs(float distance) { - if (!ClientUtils.hasPlayer() || !ClientUtils.hasWorld()) return new ArrayList<>(); - - World world = ClientUtils.getWorld(); - PlayerEntity clientPlayer = ClientUtils.getPlayer(); - - return world.getEntitiesByClass(MobEntity.class, clientPlayer.getBoundingBox().expand(distance), LivingEntity::isAlive); - } - - @Deprecated(since = "1.0.11", forRemoval = true) - public static boolean areMobsNearby(float distance) { - return !getNearbyMobs(distance).isEmpty(); - } -} diff --git a/src/main/java/nl/devpieter/utilize/utils/common/FileUtils.java b/src/main/java/nl/devpieter/utilize/utils/common/FileUtils.java index 2e10dd6..28131ad 100644 --- a/src/main/java/nl/devpieter/utilize/utils/common/FileUtils.java +++ b/src/main/java/nl/devpieter/utilize/utils/common/FileUtils.java @@ -2,7 +2,10 @@ import java.io.File; -public class FileUtils { +public final class FileUtils { + + private FileUtils() { + } public static boolean doesFileExist(File file) { try { diff --git a/src/main/java/nl/devpieter/utilize/utils/MathUtils.java b/src/main/java/nl/devpieter/utilize/utils/common/MathUtils.java similarity index 79% rename from src/main/java/nl/devpieter/utilize/utils/MathUtils.java rename to src/main/java/nl/devpieter/utilize/utils/common/MathUtils.java index 3eb83ad..a79bb51 100644 --- a/src/main/java/nl/devpieter/utilize/utils/MathUtils.java +++ b/src/main/java/nl/devpieter/utilize/utils/common/MathUtils.java @@ -1,11 +1,28 @@ -package nl.devpieter.utilize.utils; +package nl.devpieter.utilize.utils.common; import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3i; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; -public class MathUtils { +import java.time.Duration; + +public final class MathUtils { + + private MathUtils() { + } + + public static int secondsToTicks(int seconds) { + return seconds * 20; + } + + public static int ticksToSeconds(int ticks) { + return ticks / 20; + } + + public static int durationToTicks(Duration duration) { + return (int) (duration.toMillis() / 50); + } @Contract("_ -> new") public static @NotNull Vec3d from(@NotNull Vec3i vec3i) { diff --git a/src/main/java/nl/devpieter/utilize/utils/RandomUtils.java b/src/main/java/nl/devpieter/utilize/utils/common/RandomUtils.java similarity index 95% rename from src/main/java/nl/devpieter/utilize/utils/RandomUtils.java rename to src/main/java/nl/devpieter/utilize/utils/common/RandomUtils.java index c19d0d1..b53506d 100644 --- a/src/main/java/nl/devpieter/utilize/utils/RandomUtils.java +++ b/src/main/java/nl/devpieter/utilize/utils/common/RandomUtils.java @@ -1,6 +1,9 @@ -package nl.devpieter.utilize.utils; +package nl.devpieter.utilize.utils.common; -public class RandomUtils { +public final class RandomUtils { + + private RandomUtils() { + } /** * @param chanceForTrue The chance to return true (0 to 100). diff --git a/src/main/java/nl/devpieter/utilize/utils/ClientUtils.java b/src/main/java/nl/devpieter/utilize/utils/minecraft/ClientUtils.java similarity index 77% rename from src/main/java/nl/devpieter/utilize/utils/ClientUtils.java rename to src/main/java/nl/devpieter/utilize/utils/minecraft/ClientUtils.java index c7660bd..a50737d 100644 --- a/src/main/java/nl/devpieter/utilize/utils/ClientUtils.java +++ b/src/main/java/nl/devpieter/utilize/utils/minecraft/ClientUtils.java @@ -1,4 +1,4 @@ -package nl.devpieter.utilize.utils; +package nl.devpieter.utilize.utils.minecraft; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.MinecraftClient; @@ -7,19 +7,10 @@ import net.minecraft.client.network.ClientPlayerInteractionManager; import net.minecraft.client.sound.SoundManager; import net.minecraft.client.world.ClientWorld; -import net.minecraft.network.packet.Packet; -import net.minecraft.text.Text; -public class ClientUtils { +public final class ClientUtils { - @Deprecated(since = "1.0.3", forRemoval = true) - public static void sendMessage(Text message, boolean overlay) { - PlayerUtils.sendMessage(message, overlay); - } - - @Deprecated(since = "1.0.3", forRemoval = true) - public static void sendPacket(Packet packet) { - NetworkUtils.sendPacket(packet); + private ClientUtils() { } public static boolean isDevEnv() { diff --git a/src/main/java/nl/devpieter/utilize/utils/EnchantmentUtils.java b/src/main/java/nl/devpieter/utilize/utils/minecraft/EnchantmentUtils.java similarity index 95% rename from src/main/java/nl/devpieter/utilize/utils/EnchantmentUtils.java rename to src/main/java/nl/devpieter/utilize/utils/minecraft/EnchantmentUtils.java index 7d1d56d..b17db70 100644 --- a/src/main/java/nl/devpieter/utilize/utils/EnchantmentUtils.java +++ b/src/main/java/nl/devpieter/utilize/utils/minecraft/EnchantmentUtils.java @@ -1,4 +1,4 @@ -package nl.devpieter.utilize.utils; +package nl.devpieter.utilize.utils.minecraft; import net.minecraft.component.type.ItemEnchantmentsComponent; import net.minecraft.enchantment.Enchantment; @@ -12,7 +12,10 @@ import java.util.Set; -public class EnchantmentUtils { +public final class EnchantmentUtils { + + private EnchantmentUtils() { + } public static boolean isMaxLevel(@NotNull RegistryEntry enchantment, int level) { return level == enchantment.value().getMaxLevel(); diff --git a/src/main/java/nl/devpieter/utilize/utils/InteractionUtils.java b/src/main/java/nl/devpieter/utilize/utils/minecraft/InteractionUtils.java similarity index 75% rename from src/main/java/nl/devpieter/utilize/utils/InteractionUtils.java rename to src/main/java/nl/devpieter/utilize/utils/minecraft/InteractionUtils.java index 64774e0..c17d3af 100644 --- a/src/main/java/nl/devpieter/utilize/utils/InteractionUtils.java +++ b/src/main/java/nl/devpieter/utilize/utils/minecraft/InteractionUtils.java @@ -1,8 +1,11 @@ -package nl.devpieter.utilize.utils; +package nl.devpieter.utilize.utils.minecraft; import net.minecraft.screen.slot.SlotActionType; -public class InteractionUtils { +public final class InteractionUtils { + + private InteractionUtils() { + } public static void clickInventorySlot(int syncId, int packetSlot, int button, SlotActionType actionType) { if (!ClientUtils.hasInteractionManager() || !ClientUtils.hasPlayer()) return; diff --git a/src/main/java/nl/devpieter/utilize/utils/InventoryUtils.java b/src/main/java/nl/devpieter/utilize/utils/minecraft/InventoryUtils.java similarity index 91% rename from src/main/java/nl/devpieter/utilize/utils/InventoryUtils.java rename to src/main/java/nl/devpieter/utilize/utils/minecraft/InventoryUtils.java index e5f5137..406f430 100644 --- a/src/main/java/nl/devpieter/utilize/utils/InventoryUtils.java +++ b/src/main/java/nl/devpieter/utilize/utils/minecraft/InventoryUtils.java @@ -1,4 +1,4 @@ -package nl.devpieter.utilize.utils; +package nl.devpieter.utilize.utils.minecraft; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.Item; @@ -13,7 +13,10 @@ import java.util.ArrayList; import java.util.List; -public class InventoryUtils { +public final class InventoryUtils { + + private InventoryUtils() { + } public static boolean hasInventory() { return ClientUtils.hasPlayer() && ClientUtils.getPlayer().getInventory() != null; @@ -50,22 +53,12 @@ public static boolean isOffhandOf(@Nullable Item item) { public static void selectHotbarSlot(int slot) { if (slot < 0 || slot > 8 || !hasInventory()) return; - - //#if MC>=12105 getInventory().setSelectedSlot(slot); - //#else - //$$ getInventory().selectedSlot = slot; - //#endif } public static int getSelectedHotbarSlot() { if (!hasInventory()) return -1; - - //#if MC>=12105 return getInventory().getSelectedSlot(); - //#else - //$$ return getInventory().selectedSlot; - //#endif } public static @NotNull List findHotbarSlots(@Nullable Item item) { diff --git a/src/main/java/nl/devpieter/utilize/utils/NetworkUtils.java b/src/main/java/nl/devpieter/utilize/utils/minecraft/NetworkUtils.java similarity index 87% rename from src/main/java/nl/devpieter/utilize/utils/NetworkUtils.java rename to src/main/java/nl/devpieter/utilize/utils/minecraft/NetworkUtils.java index cbf3554..e3ae13f 100644 --- a/src/main/java/nl/devpieter/utilize/utils/NetworkUtils.java +++ b/src/main/java/nl/devpieter/utilize/utils/minecraft/NetworkUtils.java @@ -1,9 +1,12 @@ -package nl.devpieter.utilize.utils; +package nl.devpieter.utilize.utils.minecraft; import net.minecraft.network.packet.Packet; import org.jetbrains.annotations.NotNull; -public class NetworkUtils { +public final class NetworkUtils { + + private NetworkUtils() { + } public static void sendPacket(@NotNull Packet packet) { if (!ClientUtils.hasNetworkHandler()) return; diff --git a/src/main/java/nl/devpieter/utilize/utils/PlayerUtils.java b/src/main/java/nl/devpieter/utilize/utils/minecraft/PlayerUtils.java similarity index 76% rename from src/main/java/nl/devpieter/utilize/utils/PlayerUtils.java rename to src/main/java/nl/devpieter/utilize/utils/minecraft/PlayerUtils.java index fd61145..9f5bb71 100644 --- a/src/main/java/nl/devpieter/utilize/utils/PlayerUtils.java +++ b/src/main/java/nl/devpieter/utilize/utils/minecraft/PlayerUtils.java @@ -1,4 +1,4 @@ -package nl.devpieter.utilize.utils; +package nl.devpieter.utilize.utils.minecraft; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -8,13 +8,25 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public class PlayerUtils { +public final class PlayerUtils { + + private PlayerUtils() { + } public static void sendMessage(@NotNull Text message, boolean overlay) { if (!ClientUtils.hasPlayer()) return; ClientUtils.getPlayer().sendMessage(message, overlay); } + public static @Nullable HitResult getHitResult() { + if (!ClientUtils.hasPlayer()) return null; + + HitResult result = ClientUtils.getClient().crosshairTarget; + if (!(result instanceof HitResult hitResult)) return null; + + return hitResult; + } + public static @Nullable BlockHitResult getBlockHitResult() { if (!ClientUtils.hasPlayer()) return null; diff --git a/src/main/java/nl/devpieter/utilize/utils/SoundUtils.java b/src/main/java/nl/devpieter/utilize/utils/minecraft/SoundUtils.java similarity index 87% rename from src/main/java/nl/devpieter/utilize/utils/SoundUtils.java rename to src/main/java/nl/devpieter/utilize/utils/minecraft/SoundUtils.java index 5fba0ba..f1b533e 100644 --- a/src/main/java/nl/devpieter/utilize/utils/SoundUtils.java +++ b/src/main/java/nl/devpieter/utilize/utils/minecraft/SoundUtils.java @@ -1,11 +1,14 @@ -package nl.devpieter.utilize.utils; +package nl.devpieter.utilize.utils.minecraft; import net.minecraft.client.sound.PositionedSoundInstance; import net.minecraft.client.sound.SoundInstance; import net.minecraft.sound.SoundEvent; import org.jetbrains.annotations.NotNull; -public class SoundUtils { +public final class SoundUtils { + + private SoundUtils() { + } public static void playOnMaster(@NotNull SoundEvent soundEvent) { playOnMaster(soundEvent, 1.0F, 1.0F); diff --git a/src/main/java/nl/devpieter/utilize/utils/TextUtils.java b/src/main/java/nl/devpieter/utilize/utils/minecraft/TextUtils.java similarity index 88% rename from src/main/java/nl/devpieter/utilize/utils/TextUtils.java rename to src/main/java/nl/devpieter/utilize/utils/minecraft/TextUtils.java index d592763..72603bd 100644 --- a/src/main/java/nl/devpieter/utilize/utils/TextUtils.java +++ b/src/main/java/nl/devpieter/utilize/utils/minecraft/TextUtils.java @@ -1,11 +1,14 @@ -package nl.devpieter.utilize.utils; +package nl.devpieter.utilize.utils.minecraft; import net.minecraft.text.MutableText; import net.minecraft.text.Style; import net.minecraft.text.Text; import org.jetbrains.annotations.NotNull; -public class TextUtils { +public final class TextUtils { + + private TextUtils() { + } public static MutableText currentOrDefaultStyle(@NotNull Text text, @NotNull Style defaultStyle) { return Text.of("").copy().setStyle(defaultStyle).append(text); diff --git a/src/main/java/nl/devpieter/utilize/utils/minecraft/WorldUtils.java b/src/main/java/nl/devpieter/utilize/utils/minecraft/WorldUtils.java new file mode 100644 index 0000000..bac83d7 --- /dev/null +++ b/src/main/java/nl/devpieter/utilize/utils/minecraft/WorldUtils.java @@ -0,0 +1,50 @@ +package nl.devpieter.utilize.utils.minecraft; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.entity.Entity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.Vec3i; +import nl.devpieter.utilize.utils.common.MathUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +public final class WorldUtils { + + private WorldUtils() { + } + + public static @Nullable BlockState getStateAt(@NotNull Vec3d vec3d) { + return getStateAt(MathUtils.from(vec3d)); + } + + public static @Nullable BlockState getStateAt(@NotNull Vec3i vec3i) { + return getStateAt(new BlockPos(vec3i)); + } + + public static @Nullable BlockState getStateAt(@NotNull BlockPos pos) { + if (!ClientUtils.hasWorld()) return null; + return ClientUtils.getWorld().getBlockState(pos); + } + + public static @Nullable Block getBlockAt(@NotNull Vec3d vec3d) { + return getBlockAt(MathUtils.from(vec3d)); + } + + public static @Nullable Block getBlockAt(@NotNull Vec3i vec3i) { + return getBlockAt(new BlockPos(vec3i)); + } + + public static @Nullable Block getBlockAt(@NotNull BlockPos pos) { + BlockState state = getStateAt(pos); + if (state == null) return null; + + return state.getBlock(); + } + + public static @Nullable Entity getEntity(int id) { + if (!ClientUtils.hasWorld()) return null; + return ClientUtils.getWorld().getEntityById(id); + } +} diff --git a/src/main/resources/utilize.mixins.json b/src/main/resources/utilize.mixins.json index 37556b7..4140fc6 100644 --- a/src/main/resources/utilize.mixins.json +++ b/src/main/resources/utilize.mixins.json @@ -7,13 +7,14 @@ "ChatHudMixin", "ClientPlayerEntityMixin", "ClientPlayerInteractionManagerMixin", - "DebugRendererMixin", + "KeyBindingMixin", "MinecraftClientMixin" ], "injectors": { "defaultRequire": 1 }, "mixins": [ - "ClientConnectionMixin" + "ClientConnectionMixin", + "SeesMixin" ] } diff --git a/versions/1.21.0/gradle.properties b/versions/1.21.0/gradle.properties deleted file mode 100644 index bdc45f1..0000000 --- a/versions/1.21.0/gradle.properties +++ /dev/null @@ -1,6 +0,0 @@ -# check this on https://modmuss50.me/fabric.html -minecraft_version=1.21 -max_minecraft_version=1.21.1 - -yarn_mappings=1.21+build.9 -fabric_version=0.102.0+1.21 \ No newline at end of file diff --git a/versions/1.21.2/gradle.properties b/versions/1.21.2/gradle.properties deleted file mode 100644 index 467c105..0000000 --- a/versions/1.21.2/gradle.properties +++ /dev/null @@ -1,6 +0,0 @@ -# check this on https://modmuss50.me/fabric.html -minecraft_version=1.21.2 -max_minecraft_version=1.21.4 - -yarn_mappings=1.21.2+build.1 -fabric_version=0.106.1+1.21.2 \ No newline at end of file diff --git a/versions/1.21.5/gradle.properties b/versions/1.21.5/gradle.properties deleted file mode 100644 index c66c1e1..0000000 --- a/versions/1.21.5/gradle.properties +++ /dev/null @@ -1,6 +0,0 @@ -# check this on https://modmuss50.me/fabric.html -minecraft_version=1.21.5 -max_minecraft_version=1.21.5 - -yarn_mappings=1.21.5+build.1 -fabric_version=0.128.1+1.21.5 \ No newline at end of file diff --git a/versions/1.21.6/gradle.properties b/versions/1.21.6/gradle.properties deleted file mode 100644 index ee93499..0000000 --- a/versions/1.21.6/gradle.properties +++ /dev/null @@ -1,6 +0,0 @@ -# check this on https://modmuss50.me/fabric.html -minecraft_version=1.21.6 -max_minecraft_version=1.21.8 - -yarn_mappings=1.21.8+build.1 -fabric_version=0.128.2+1.21.6 \ No newline at end of file diff --git a/versions/1.21.9/gradle.properties b/versions/1.21.9/gradle.properties index a94908d..1ead45f 100644 --- a/versions/1.21.9/gradle.properties +++ b/versions/1.21.9/gradle.properties @@ -1,6 +1,6 @@ # check this on https://modmuss50.me/fabric.html minecraft_version=1.21.9 -max_minecraft_version=1.21.9 +max_minecraft_version=1.21.11 yarn_mappings=1.21.9+build.1 -fabric_version=0.134.0+1.21.9 \ No newline at end of file +fabric_version=0.134.1+1.21.9 \ No newline at end of file