From 8a8ad5de38562cbadf853538c1fe38c3f418712b Mon Sep 17 00:00:00 2001
From: rdbtCVS <87152661+rdbtCVS@users.noreply.github.com>
Date: Fri, 3 Jul 2026 13:54:03 +0100
Subject: [PATCH 1/7] Update to mojmap / 26.1.2
---
failsafes/AlertUtils.js | 4 +-
failsafes/impl/ChatMentionFailsafe.js | 4 +-
failsafes/impl/RotationFailsafe.js | 9 +-
failsafes/impl/SlotChangeFailsafe.js | 4 +-
failsafes/impl/TeleportFailsafe.js | 12 +-
failsafes/impl/VelocityFailsafe.js | 13 +-
gui/GUI.js | 2 +-
gui/NotificationManager.js | 2 +-
gui/OverlayUtils.js | 4 +-
gui/Utils.js | 7 +-
gui/categories/CategoryManager.js | 2 +-
gui/core/GuiEvents.js | 2 +-
gui/core/GuiRenderer.js | 2 +-
loader.js | 8 +-
modules/combat/CombatBot.js | 2 +-
modules/farming/FarmingMacro/FarmHandler.js | 12 +-
.../farming/FarmingMacro/farms/CocoaBean.js | 11 +-
modules/farming/GlowingMushroomESP.js | 9 +-
modules/farming/GlowingMushroomMacro.js | 28 +-
modules/farming/PeltMacro.js | 32 +-
modules/farming/PeltQOL.js | 2 +-
modules/foraging/HideonLeafESP.js | 2 +-
modules/loader.js | 1 -
modules/mining/CommissionMacro.js | 1 -
modules/mining/GemstoneMacro.js | 20 +-
modules/mining/GlaciteCommissionMacro.js | 1 -
modules/mining/MiningBot.js | 76 ++--
modules/mining/Nuker.js | 14 +-
modules/mining/OreMacro.js | 20 +-
modules/mining/PinglessMining.js | 8 +-
modules/mining/PowderMacro.js | 11 +-
modules/other/AutoConversation.js | 4 +-
modules/other/BeachBaller.js | 2 +-
modules/other/CancelInteract.js | 4 +-
modules/other/ChatQOL.js | 4 +-
modules/other/Failsafes.js | 8 +-
modules/other/Freecam.js | 45 +-
modules/other/InventoryWalk.js | 32 +-
modules/other/MacroScheduler.js | 2 +-
modules/other/RatMacro.js | 4 +-
modules/skills/ChocolateFactory.js | 2 +-
modules/skills/MinionCollector.js | 4 +-
modules/skills/RouteWalker.js | 2 +-
modules/skills/StridersurferMacro.js | 15 +-
modules/visuals/GIF.js | 6 +-
modules/visuals/HUD.js | 85 ++--
modules/visuals/ProfileHider.js | 6 +-
modules/visuals/StructureESP.js | 10 +-
modules/visuals/Xray.js | 60 ---
utils/Clipping.js | 10 +-
utils/Constants.js | 45 +-
utils/Flowstate.js | 6 +-
utils/Math.js | 22 +-
utils/MiningUtils.js | 6 +-
utils/Misc.js | 1 +
utils/NukerUtils.js | 22 +-
utils/Packets.js | 411 +++++++++---------
utils/Raytrace.js | 9 +-
utils/Router.js | 2 +-
utils/Sign.js | 2 +-
utils/Ungrab.js | 14 +-
utils/Utils.js | 22 +-
utils/V5Commands.js | 2 +-
utils/Webhooks.js | 7 +-
utils/backend/WebSocket.js | 6 +-
.../dependencies/BloomCore/RaytraceBlocks.js | 10 +-
utils/pathfinder/EtherwarpPathfinder.js | 6 +-
utils/pathfinder/PathFinder.js | 4 +-
utils/pathfinder/PathFlyer/PathMovement.js | 2 +-
utils/pathfinder/PathFlyer/PathRotations.js | 11 +-
utils/pathfinder/PathSpline.js | 32 +-
utils/pathfinder/PathWalker/PathAote.js | 23 +-
utils/pathfinder/PathWalker/PathJumps.js | 12 +-
utils/pathfinder/PathWalker/PathRecovery.js | 2 +-
utils/pathfinder/PathWalker/PathRotations.js | 62 +--
.../PathWalker/PathRotationsUtility.js | 16 +-
utils/player/Inventory.js | 8 +-
utils/player/Keybinding.js | 63 ++-
utils/player/RotationGCD.js | 22 +-
utils/player/Rotations.js | 6 +-
utils/player/ServerInfo.js | 10 +-
utils/world/WorldScanner.js | 20 +-
82 files changed, 734 insertions(+), 782 deletions(-)
delete mode 100644 modules/visuals/Xray.js
diff --git a/failsafes/AlertUtils.js b/failsafes/AlertUtils.js
index 8f965940..918c0417 100644
--- a/failsafes/AlertUtils.js
+++ b/failsafes/AlertUtils.js
@@ -233,9 +233,11 @@ class AlertUtilsClass {
* Uses GLFW to grab the window on a failsafe if they have the setting toggled (WIP)
*/
_grabWindowOnFailsafe() {
+ return;
+ // todo: fix: broken due to 26.1 mappings
try {
const GLFW = org.lwjgl.glfw.GLFW;
- const windowHandle = Client.getMinecraft().getWindow().getHandle();
+ const windowHandle = Client.getMinecraft().getWindow();
const wasIconified = GLFW.glfwGetWindowAttrib(windowHandle, GLFW.GLFW_ICONIFIED) === GLFW.GLFW_TRUE;
const wasMaximized = GLFW.glfwGetWindowAttrib(windowHandle, GLFW.GLFW_MAXIMIZED) === GLFW.GLFW_TRUE;
diff --git a/failsafes/impl/ChatMentionFailsafe.js b/failsafes/impl/ChatMentionFailsafe.js
index 79586af5..2ab4869d 100644
--- a/failsafes/impl/ChatMentionFailsafe.js
+++ b/failsafes/impl/ChatMentionFailsafe.js
@@ -2,7 +2,7 @@ import { Chat } from '../../utils/Chat';
import { MacroState } from '../../utils/MacroState';
import { Failsafe } from '../Failsafe';
import FailsafeUtils from '../FailsafeUtils';
-import { GameMessageS2C } from '../../utils/Packets';
+import { ClientboundSystemChatPacket } from '../../utils/Packets';
class ChatMentionFailsafe extends Failsafe {
constructor() {
@@ -33,7 +33,7 @@ class ChatMentionFailsafe extends Failsafe {
if (!result.isBlocked) return;
this.onTrigger(result);
- }).setFilteredClass(GameMessageS2C);
+ }).setFilteredClass(ClientboundSystemChatPacket);
}
scanMessage(msg, fullMessage = msg) {
diff --git a/failsafes/impl/RotationFailsafe.js b/failsafes/impl/RotationFailsafe.js
index 14c0984c..5e8b4ad7 100644
--- a/failsafes/impl/RotationFailsafe.js
+++ b/failsafes/impl/RotationFailsafe.js
@@ -1,7 +1,7 @@
import { Chat } from '../../utils/Chat';
import { MathUtils } from '../../utils/Math';
import { MacroState } from '../../utils/MacroState';
-import { PlayerPositionLookS2C } from '../../utils/Packets';
+import { ClientboundPlayerPositionPacket } from '../../utils/Packets';
import { Failsafe } from '../Failsafe';
import FailsafeUtils from '../FailsafeUtils';
@@ -30,8 +30,8 @@ class RotationFailsafe extends Failsafe {
const newZ = pos.z;
const change = packet.change();
- const newYaw = change.yaw();
- const newPitch = change.pitch();
+ const newYaw = change.yRot();
+ const newPitch = change.xRot();
const dx = Math.abs(newX - fromX);
const dy = Math.abs(newY - fromY);
@@ -41,6 +41,7 @@ class RotationFailsafe extends Failsafe {
const yawDiff = Math.abs(MathUtils.getAngleDifference(currYaw, newYaw));
const pitchDiff = Math.abs(newPitch - currPitch);
+ // todo: this isnt what a null rotation packet is, which retard made these failsafes?
if (yawDiff === 0 && pitchDiff === 0) {
Chat.messageDebug('null rotation packet ignored (yawDiff=0, pitchDiff=0)', false);
return;
@@ -53,7 +54,7 @@ class RotationFailsafe extends Failsafe {
if (this.disabled || !MacroState.isFailsafeMacroRunning() || scheduledAt < this._disabledUntil) return;
this.onTrigger(currYaw, currPitch, newYaw, newPitch, yawDiff, pitchDiff);
}, this._getReactionDelay(this.settings));
- }).setFilteredClass(PlayerPositionLookS2C);
+ }).setFilteredClass(ClientboundPlayerPositionPacket);
}
onTrigger(fromYaw, fromPitch, toYaw, toPitch, yawDiff, pitchDiff) {
diff --git a/failsafes/impl/SlotChangeFailsafe.js b/failsafes/impl/SlotChangeFailsafe.js
index 1c93f6cc..4701e849 100644
--- a/failsafes/impl/SlotChangeFailsafe.js
+++ b/failsafes/impl/SlotChangeFailsafe.js
@@ -1,6 +1,6 @@
import { Chat } from '../../utils/Chat';
import { MacroState } from '../../utils/MacroState';
-import { UpdateSelectedSlotS2C } from '../../utils/Packets';
+import { ClientboundSetHeldSlotPacket } from '../../utils/Packets';
import { Failsafe } from '../Failsafe';
import FailsafeUtils from '../FailsafeUtils';
@@ -27,7 +27,7 @@ class SlotChangeFailsafe extends Failsafe {
if (this.disabled || !MacroState.isFailsafeMacroRunning() || scheduledAt < this._disabledUntil) return;
this.onTrigger(currentSlot, newSlot);
}, this._getReactionDelay(this.settings));
- }).setFilteredClass(UpdateSelectedSlotS2C);
+ }).setFilteredClass(ClientboundSetHeldSlotPacket);
}
onTrigger(fromSlot, toSlot) {
diff --git a/failsafes/impl/TeleportFailsafe.js b/failsafes/impl/TeleportFailsafe.js
index 840ddf10..a0ea4cfe 100644
--- a/failsafes/impl/TeleportFailsafe.js
+++ b/failsafes/impl/TeleportFailsafe.js
@@ -1,6 +1,6 @@
import { Chat } from '../../utils/Chat';
import { MacroState } from '../../utils/MacroState';
-import { PlayerInteractItemC2S, PlayerPositionLookS2C, CommandExecutionC2S } from '../../utils/Packets';
+import { ServerboundUseItemPacket, ClientboundPlayerPositionPacket, ServerboundChatCommandPacket } from '../../utils/Packets';
import PathConfig from '../../utils/pathfinder/PathConfig';
import { Failsafe } from '../Failsafe';
import FailsafeUtils from '../FailsafeUtils';
@@ -32,7 +32,7 @@ class TeleportFailsafe extends Failsafe {
register('packetSent', () => {
if (!MacroState.isFailsafeMacroRunning()) return;
lastRightClickTime = Date.now();
- }).setFilteredClass(PlayerInteractItemC2S);
+ }).setFilteredClass(ServerboundUseItemPacket);
register('packetSent', (packet) => {
if (!MacroState.isFailsafeMacroRunning()) return;
@@ -47,7 +47,7 @@ class TeleportFailsafe extends Failsafe {
pendingWarpIgnoreTimer = null;
}, WARP_IGNORE_TIMEOUT_MS);
}
- }).setFilteredClass(CommandExecutionC2S);
+ }).setFilteredClass(ServerboundChatCommandPacket);
}
shouldIgnoreWarpTeleport(x, y, z) {
@@ -147,8 +147,8 @@ class TeleportFailsafe extends Failsafe {
const data = {
distance,
- yaw: change.yaw(),
- pitch: change.pitch(),
+ yaw: change.yRot(),
+ pitch: change.xRot(),
currYaw: Player.getYaw(),
currPitch: Player.getPitch(),
lastRightClickTime,
@@ -180,7 +180,7 @@ class TeleportFailsafe extends Failsafe {
if (this.disabled || !MacroState.isFailsafeMacroRunning() || scheduledAt < this._disabledUntil || this._shouldDisableTeleport(data)) return;
this.onTrigger(fromX, fromY, fromZ, newX, newY, newZ, distance);
}, this._getReactionDelay(this.settings));
- }).setFilteredClass(PlayerPositionLookS2C);
+ }).setFilteredClass(ClientboundPlayerPositionPacket);
}
handleNullPacket(x, y, z) {
diff --git a/failsafes/impl/VelocityFailsafe.js b/failsafes/impl/VelocityFailsafe.js
index d5fd9337..6129c587 100644
--- a/failsafes/impl/VelocityFailsafe.js
+++ b/failsafes/impl/VelocityFailsafe.js
@@ -1,6 +1,6 @@
import { Chat } from '../../utils/Chat';
import { MacroState } from '../../utils/MacroState';
-import { EntityVelocityUpdateS2C } from '../../utils/Packets';
+import { ClientboundSetEntityMotionPacket } from '../../utils/Packets';
import { Failsafe } from '../Failsafe';
import FailsafeUtils from '../FailsafeUtils';
@@ -24,7 +24,7 @@ class VelocityFailsafe extends Failsafe {
this._handleVelocityOnDamageDisabled();
if (this.disabled) return;
const playerMP = Player.asPlayerMP();
- if (!playerMP || packet?.getEntityId() !== playerMP?.mcValue?.getId()) return;
+ if (!playerMP || packet?.id?.() !== playerMP?.mcValue?.getId()) return;
const x = Math.floor(Player.getX());
const y = Math.floor(Player.getY()) - 1;
@@ -36,9 +36,10 @@ class VelocityFailsafe extends Failsafe {
this.settings = FailsafeUtils.getFailsafeSettings('Velocity');
if (!this.settings.isEnabled) return;
- const vx = packet?.getVelocity().x;
- const vy = packet?.getVelocity().y;
- const vz = packet?.getVelocity().z;
+ const movement = packet?.movement?.();
+ const vx = movement?.x;
+ const vy = movement?.y;
+ const vz = movement?.z;
const speed = Math.hypot(vx, vy, vz);
if (this._shouldDisableVelocity(speed, blockName)) return;
@@ -48,7 +49,7 @@ class VelocityFailsafe extends Failsafe {
return;
this.onTrigger(speed);
}, this._getReactionDelay(this.settings));
- }).setFilteredClass(EntityVelocityUpdateS2C);
+ }).setFilteredClass(ClientboundSetEntityMotionPacket);
}
_handleVelocityOnDamageDisabled() {
diff --git a/gui/GUI.js b/gui/GUI.js
index 0c988d35..fc4e78d6 100644
--- a/gui/GUI.js
+++ b/gui/GUI.js
@@ -83,5 +83,5 @@ export const openGui = () => {
};
export const closeGui = () => {
- GuiState.myGui.close();
+ Client.currentGui.close();
};
diff --git a/gui/NotificationManager.js b/gui/NotificationManager.js
index 81d2809b..da44639d 100644
--- a/gui/NotificationManager.js
+++ b/gui/NotificationManager.js
@@ -373,7 +373,7 @@ class NotificationManager {
try {
const window = Client.getMinecraft().getWindow();
- const scale = window.getScaleFactor();
+ const scale = window.getGuiScale();
const mouseX = Client.getMouseX() / scale;
const mouseY = Client.getMouseY() / scale;
diff --git a/gui/OverlayUtils.js b/gui/OverlayUtils.js
index 53ab2023..47130fbf 100644
--- a/gui/OverlayUtils.js
+++ b/gui/OverlayUtils.js
@@ -685,7 +685,7 @@ class OverlayUtils {
const sw = Renderer.screen.getWidth();
const sh = Renderer.screen.getHeight();
if (sw === 0) return;
- Client.getMinecraft().gameRenderer.renderBlur();
+ Client.getMinecraft().gameRenderer.processBlurEffect();
this.editorBoxes = {};
this.drawingGUI = true;
@@ -1010,7 +1010,7 @@ class OverlayUtils {
}
openPositionsGUI() {
- GuiState.myGui.close();
+ Client.currentGui.close();
Overlays.Gui.open();
}
diff --git a/gui/Utils.js b/gui/Utils.js
index 1e626bb3..f80fc863 100644
--- a/gui/Utils.js
+++ b/gui/Utils.js
@@ -263,7 +263,12 @@ export const setGuiClickSoundEnabled = (enabled) => {
export const playClickSound = () => {
if (!guiClickSoundEnabled) return;
- World.getWorld().playSoundClient(SoundEvent.of(Identifier.of('minecraft', 'entity.experience_orb.pickup')), SoundCategory.MASTER, 0.5, 1.0);
+ World.getWorld().playPlayerSound(
+ SoundEvent.createVariableRangeEvent(Identifier.fromNamespaceAndPath('minecraft', 'entity.experience_orb.pickup')),
+ SoundCategory.MASTER,
+ 0.5,
+ 1.0
+ );
};
const profilePath = new File(globalAssetsDir, 'discordProfile.png');
diff --git a/gui/categories/CategoryManager.js b/gui/categories/CategoryManager.js
index 7705cf1e..43b6eebd 100644
--- a/gui/categories/CategoryManager.js
+++ b/gui/categories/CategoryManager.js
@@ -45,7 +45,7 @@ export const createCategoriesManager = (deps) => {
const enabledByClick = typeof module.requestToggleFromUser === 'function' ? module.requestToggleFromUser() : false;
if (module.isMacro && enabledByClick && GuiState.myGui.isOpen()) {
- GuiState.myGui.close();
+ Client.currentGui.close();
}
},
{ showContainer: false }
diff --git a/gui/core/GuiEvents.js b/gui/core/GuiEvents.js
index c894fd5e..bbee394d 100644
--- a/gui/core/GuiEvents.js
+++ b/gui/core/GuiEvents.js
@@ -72,7 +72,7 @@ GuiState.myGui.registerScrolled(handleScroll);
NVG.registerV5Render(() => {
if (GuiState.myGui.isOpen()) {
const window = Client.getMinecraft().getWindow();
- const scale = window.getScaleFactor();
+ const scale = window.getGuiScale();
const mouseX = Client.getMouseX() / scale;
const mouseY = Client.getMouseY() / scale;
drawGUI(mouseX, mouseY);
diff --git a/gui/core/GuiRenderer.js b/gui/core/GuiRenderer.js
index bda8e2ab..9a336b67 100644
--- a/gui/core/GuiRenderer.js
+++ b/gui/core/GuiRenderer.js
@@ -13,7 +13,7 @@ export const drawGUI = (mouseX, mouseY) => {
const centerX = targetBackground.x + targetBackground.width / 2;
const centerY = targetBackground.y + targetBackground.height / 2;
- Client.getMinecraft().gameRenderer.renderBlur();
+ Client.getMinecraft().gameRenderer.processBlurEffect();
try {
NVG.beginFrame(Renderer.screen.getWidth(), Renderer.screen.getHeight());
diff --git a/loader.js b/loader.js
index eb89fd72..e70debb9 100644
--- a/loader.js
+++ b/loader.js
@@ -10,11 +10,11 @@ import './gui/GUI';
/* CORE */
import './utils/Config';
import './utils/backend/WebSocket';
-import { RequestCommandCompletionsC2S } from './utils/Packets';
+import { ServerboundCommandSuggestionPacket } from './utils/Packets';
register('packetSent', (packet, event) => {
- if (packet.getPartialCommand().toLowerCase().startsWith('/v5')) cancel(event);
-}).setFilteredClass(RequestCommandCompletionsC2S);
+ if (packet.getCommand().toLowerCase().startsWith('/v5')) cancel(event);
+}).setFilteredClass(ServerboundCommandSuggestionPacket);
/* Utils */
import { MacroState } from './utils/MacroState';
@@ -23,7 +23,7 @@ import './modules/other/MacroControllers';
import './modules/other/DiscordIntegration';
import './utils/pathfinder/PathFinder';
import './utils/pathfinder/EtherwarpPathfinder';
-import './utils/Clipping';
+//import './utils/Clipping';
import './utils/Misc';
import './failsafes/FailsafeManager';
import './utils/SkyblockEvents';
diff --git a/modules/combat/CombatBot.js b/modules/combat/CombatBot.js
index c529956e..3969b7e7 100644
--- a/modules/combat/CombatBot.js
+++ b/modules/combat/CombatBot.js
@@ -312,7 +312,7 @@ class Combat extends ModuleBase {
const mcItem = item?.toMC ? item.toMC() : item;
if (!mcItem) return false;
- const profileType = net.minecraft.component.DataComponentTypes.PROFILE;
+ const profileType = net.minecraft.core.component.DataComponents.PROFILE;
const profileComponent = mcItem.get(profileType);
const profileString = profileComponent?.getGameProfile?.()?.toString() || '';
if (!profileString) return false;
diff --git a/modules/farming/FarmingMacro/FarmHandler.js b/modules/farming/FarmingMacro/FarmHandler.js
index 8aebbddf..7e2f228a 100644
--- a/modules/farming/FarmingMacro/FarmHandler.js
+++ b/modules/farming/FarmingMacro/FarmHandler.js
@@ -112,7 +112,7 @@ export default class FarmHandler {
const playerBlockY = Math.round(player.getY());
const playerBlockZ = Math.floor(player.getZ());
- let yaw = ((player.getYaw() % 360) + 360) % 360;
+ let yaw = ((MathUtils.wrapTo180(player.getYRot()) % 360) + 360) % 360;
const scanResults = [];
const range = [-5, -4, -3, -2, -1, 1, 2, 3, 4, 5];
@@ -144,7 +144,7 @@ export default class FarmHandler {
getBlockInFront(offsetDist = 1, yOffset = 0) {
const player = Player.getPlayer();
- let yaw = ((player.getYaw() % 360) + 360) % 360;
+ let yaw = ((MathUtils.wrapTo180(player.getYRot()) % 360) + 360) % 360;
let dx = 0,
dz = 0;
@@ -197,11 +197,11 @@ export default class FarmHandler {
} else {
if (!macro.decidePrompted) macro.message(`&cMacro can't decide, press A or D!`);
macro.decidePrompted = true;
- if (Client.getMinecraft().options.leftKey.isPressed()) {
+ if (Client.getMinecraft().options.keyLeft.isDown()) {
macro.movementKey = 'a';
macro.ignoreKeys = ['d', 's'];
macro.decidePrompted = false;
- } else if (Client.getMinecraft().options.rightKey.isPressed()) {
+ } else if (Client.getMinecraft().options.keyRight.isDown()) {
macro.movementKey = 'd';
macro.ignoreKeys = ['a', 's'];
macro.decidePrompted = false;
@@ -212,7 +212,7 @@ export default class FarmHandler {
checkForCrop(checkForAge = true, yOffset = 1) {
const playerEntity = Player.getPlayer();
- let yaw = ((playerEntity.getYaw() % 360) + 360) % 360;
+ let yaw = ((MathUtils.wrapTo180(playerEntity.getYRot()) % 360) + 360) % 360;
let fx = 0,
fz = 0; // Forward
@@ -282,7 +282,7 @@ export default class FarmHandler {
areChunksLoaded(x, z) {
const chunkX = Math.floor(x) >> 4;
const chunkZ = Math.floor(z) >> 4;
- return World.getWorld().getChunkManager().isChunkLoaded(chunkX, chunkZ);
+ return World.getWorld().getChunkSource().hasChunk(chunkX, chunkZ);
}
getAngle(point) {
diff --git a/modules/farming/FarmingMacro/farms/CocoaBean.js b/modules/farming/FarmingMacro/farms/CocoaBean.js
index e236ddbf..3cde8ec3 100644
--- a/modules/farming/FarmingMacro/farms/CocoaBean.js
+++ b/modules/farming/FarmingMacro/farms/CocoaBean.js
@@ -1,5 +1,6 @@
import FarmHandler from '../FarmHandler';
import { CROP_TOOLS } from '../constants';
+import { MathUtils } from '../../../../utils/Math';
import { Keybind } from '../../../../utils/player/Keybinding';
import { Rotations } from '../../../../utils/player/Rotations';
import { Utils } from '../../../../utils/Utils';
@@ -30,7 +31,7 @@ export default class CocoaBean extends FarmHandler {
break;
case states.DECIDEROTATION:
- const currentYaw = ((Player.getPlayer().getYaw() % 360) + 360) % 360;
+ const currentYaw = ((MathUtils.wrapTo180(Player.getPlayer().getYRot()) % 360) + 360) % 360;
let allowedYaws = macro.farmAxis === 'X' ? [90, 270] : [0, 180];
let closestYaw = allowedYaws.reduce((prev, curr) => {
@@ -97,10 +98,10 @@ export default class CocoaBean extends FarmHandler {
macro.decidePrompted = true;
}
- if (Client.getMinecraft().options.forwardKey.isPressed()) {
+ if (Client.getMinecraft().options.keyUp.isDown()) {
macro.movementKey = 'w';
macro.decidePrompted = false;
- } else if (Client.getMinecraft().options.backKey.isPressed()) {
+ } else if (Client.getMinecraft().options.keyDown.isDown()) {
macro.movementKey = 's';
macro.decidePrompted = false;
} else {
@@ -162,7 +163,7 @@ export default class CocoaBean extends FarmHandler {
isMatureCocoa(block) {
if (!block || !block.type.getRegistryName().includes('cocoa')) return false;
try {
- return block.getState().get(net.minecraft.state.property.Properties.AGE_2) === 2;
+ return block.getState().get(net.minecraft.world.level.block.state.properties.BlockStateProperties.AGE_2) === 2;
} catch (e) {
return false;
}
@@ -170,7 +171,7 @@ export default class CocoaBean extends FarmHandler {
getRelativePos(xRel, yRel, zRel) {
const player = Player.getPlayer();
- const liveYaw = ((player.getYaw() % 360) + 360) % 360;
+ const liveYaw = ((MathUtils.wrapTo180(player.getYRot()) % 360) + 360) % 360;
let allowedYaws = [0, 90, 180, 270];
let snappedYaw = allowedYaws.reduce((prev, curr) => {
let diffCurr = Math.abs(curr - liveYaw);
diff --git a/modules/farming/GlowingMushroomESP.js b/modules/farming/GlowingMushroomESP.js
index b73b4df9..059c8426 100644
--- a/modules/farming/GlowingMushroomESP.js
+++ b/modules/farming/GlowingMushroomESP.js
@@ -1,8 +1,8 @@
import { Vec3d } from '../../utils/Constants';
import { ModuleBase } from '../../utils/ModuleBase';
-import { ParticleS2C } from '../../utils/Packets';
+import { ClientboundLevelParticlesPacket } from '../../utils/Packets';
-const ENTITY_EFFECT = net.minecraft.particle.ParticleTypes.ENTITY_EFFECT;
+const ENTITY_EFFECT = net.minecraft.core.particles.ParticleTypes.ENTITY_EFFECT;
const MUSHROOM_IDS = new Set(['minecraft:red_mushroom', 'minecraft:brown_mushroom']);
class GlowingMushroomESP extends ModuleBase {
@@ -18,7 +18,7 @@ class GlowingMushroomESP extends ModuleBase {
this.fillColor = new RenderColor(0, 255, 0, 70);
- this.on('packetReceived', (packet) => this.onParticlePacket(packet)).setFilteredClass(ParticleS2C);
+ this.on('packetReceived', (packet) => this.onParticlePacket(packet)).setFilteredClass(ClientboundLevelParticlesPacket);
this.on('tick', () => this.cleanup());
this.on('worldLoad', () => this.mushrooms.clear());
this.on('worldUnload', () => this.mushrooms.clear());
@@ -35,7 +35,8 @@ class GlowingMushroomESP extends ModuleBase {
}
onParticlePacket(packet) {
- if (packet.getParameters().getType() !== ENTITY_EFFECT) return;
+ const particle = packet.getParticle?.();
+ if ((particle?.getType?.() ?? particle) !== ENTITY_EFFECT) return;
const x = packet.getX();
const y = packet.getY();
diff --git a/modules/farming/GlowingMushroomMacro.js b/modules/farming/GlowingMushroomMacro.js
index 98fb7d17..964c79c4 100644
--- a/modules/farming/GlowingMushroomMacro.js
+++ b/modules/farming/GlowingMushroomMacro.js
@@ -270,9 +270,9 @@ class GlowingMushroomMacro extends ModuleBase {
const point = this.getMushroomAimPoint(mushroom, eye);
if (!point) continue;
- const dx = point.x - eye.x;
- const dy = point.y - eye.y;
- const dz = point.z - eye.z;
+ const dx = point.x - eye.x();
+ const dy = point.y - eye.y();
+ const dz = point.z - eye.z();
const distance = Math.hypot(dx, dy, dz);
if (distance > MAX_REACH) continue;
@@ -298,13 +298,13 @@ class GlowingMushroomMacro extends ModuleBase {
for (const mushroom of mushrooms) {
if (!isGlowingMushroomBlock(mushroom.x, mushroom.y, mushroom.z)) continue;
- const nearestX = Math.max(mushroom.x, Math.min(eye.x, mushroom.x + 1));
- const nearestY = Math.max(mushroom.y, Math.min(eye.y, mushroom.y + 1));
- const nearestZ = Math.max(mushroom.z, Math.min(eye.z, mushroom.z + 1));
+ const nearestX = Math.max(mushroom.x, Math.min(eye.x(), mushroom.x + 1));
+ const nearestY = Math.max(mushroom.y, Math.min(eye.y(), mushroom.y + 1));
+ const nearestZ = Math.max(mushroom.z, Math.min(eye.z(), mushroom.z + 1));
- const dx = nearestX - eye.x;
- const dy = nearestY - eye.y;
- const dz = nearestZ - eye.z;
+ const dx = nearestX - eye.x();
+ const dy = nearestY - eye.y();
+ const dz = nearestZ - eye.z();
const distance = Math.hypot(dx, dy, dz);
if (distance > MAX_REACH) continue;
@@ -399,7 +399,7 @@ class GlowingMushroomMacro extends ModuleBase {
}
getPlayerEye() {
- return Player.getPlayer()?.getEyePos?.() || null;
+ return Player.getPlayer()?.getEyePosition?.() || null;
}
getMushroomAimPoint(mushroom, eye = this.getPlayerEye()) {
@@ -414,7 +414,7 @@ class GlowingMushroomMacro extends ModuleBase {
};
if (!this.isPointWithinReach(point, eye)) continue;
- if (!Raytrace.isLineClear(eye.x, eye.y, eye.z, point.x, point.y, point.z, mushroom.x, mushroom.y, mushroom.z)) continue;
+ if (!Raytrace.isLineClear(eye.x(), eye.y(), eye.z(), point.x, point.y, point.z, mushroom.x, mushroom.y, mushroom.z)) continue;
return point;
}
@@ -435,9 +435,9 @@ class GlowingMushroomMacro extends ModuleBase {
const z = Array.isArray(point) ? point[2] : point.z;
if (!Number.isFinite(x) || !Number.isFinite(y) || !Number.isFinite(z)) return false;
- const dx = x - eye.x;
- const dy = y - eye.y;
- const dz = z - eye.z;
+ const dx = x - eye.x();
+ const dy = y - eye.y();
+ const dz = z - eye.z();
return Math.hypot(dx, dy, dz) <= MAX_REACH;
}
diff --git a/modules/farming/PeltMacro.js b/modules/farming/PeltMacro.js
index 29bfe979..09472997 100644
--- a/modules/farming/PeltMacro.js
+++ b/modules/farming/PeltMacro.js
@@ -1,7 +1,7 @@
import { OverlayManager } from '../../gui/OverlayUtils';
import { MCHand, Vec3d } from '../../utils/Constants';
import { ModuleBase } from '../../utils/ModuleBase';
-import { PlayerInteractItemC2S } from '../../utils/Packets';
+import { ServerboundUseItemPacket } from '../../utils/Packets';
import { ScheduleTask } from '../../utils/ScheduleTask';
import Pathfinder from '../../utils/pathfinder/PathFinder';
import { EtherwarpPathfinder } from '../../utils/pathfinder/EtherwarpPathfinder';
@@ -17,7 +17,7 @@ import { Mouse } from '../../utils/Ungrab';
// this is complete codex vibecoded slop, but it works so who cares!
-const RaycastContext = net.minecraft.world.RaycastContext;
+const RaycastContext = net.minecraft.world.level.ClipContext;
const TREVOR_TARGETS = {
'desert settlement': [
@@ -340,7 +340,7 @@ class PeltMacro extends ModuleBase {
if (!player || !world || !entity) return false;
try {
- const eyePos = player.getEyePos();
+ const eyePos = player.getEyePosition();
const mcEntity = entity.toMC ? entity.toMC() : entity;
const box = mcEntity?.getBoundingBox?.();
if (!eyePos || !box) return Player.asPlayerMP()?.canSeeEntity?.(entity) ?? false;
@@ -358,14 +358,8 @@ class PeltMacro extends ModuleBase {
const sampleY = minY + (maxY - minY) * yOffset;
for (const zOffset of MOB_VISIBILITY_SAMPLE_OFFSETS) {
const sampleZ = minZ + (maxZ - minZ) * zOffset;
- const hit = world.raycast(
- new RaycastContext(
- eyePos,
- new Vec3d(sampleX, sampleY, sampleZ),
- RaycastContext.ShapeType.COLLIDER,
- RaycastContext.FluidHandling.NONE,
- player
- )
+ const hit = world.clip(
+ new RaycastContext(eyePos, new Vec3d(sampleX, sampleY, sampleZ), RaycastContext.Block.COLLIDER, RaycastContext.Fluid.NONE, player)
);
if (!hit || String(hit.getType()) === 'MISS') {
@@ -388,9 +382,9 @@ class PeltMacro extends ModuleBase {
try {
const ep = player.getEyePos?.();
if (ep) {
- const ex = Number(ep.x);
- const ey = Number(ep.y);
- const ez = Number(ep.z);
+ const ex = Number(ep.x());
+ const ey = Number(ep.y());
+ const ez = Number(ep.z());
if ([ex, ey, ez].every(Number.isFinite)) return { ex, ey, ez };
}
} catch (e) {
@@ -417,9 +411,9 @@ class PeltMacro extends ModuleBase {
if (!eyePos || !player || !world) return false;
if (![endX, endY, endZ].every(Number.isFinite)) return false;
try {
- const ex = eyePos.x;
- const ey = eyePos.y;
- const ez = eyePos.z;
+ const ex = eyePos.x();
+ const ey = eyePos.y();
+ const ez = eyePos.z();
let dx = endX - ex;
let dy = endY - ey;
let dz = endZ - ez;
@@ -430,7 +424,7 @@ class PeltMacro extends ModuleBase {
dz /= len;
const ext = ETHERWARP_LOS_RAY_EXTEND;
const endVec = new Vec3d(endX + dx * ext, endY + dy * ext, endZ + dz * ext);
- const hit = world.raycast(new RaycastContext(eyePos, endVec, RaycastContext.ShapeType.COLLIDER, RaycastContext.FluidHandling.NONE, player));
+ const hit = world.clip(new RaycastContext(eyePos, endVec, RaycastContext.Block.COLLIDER, RaycastContext.Fluid.NONE, player));
if (!hit) return false;
const typeStr = String(hit.getType?.());
if (typeStr === 'MISS') return false;
@@ -679,7 +673,7 @@ class PeltMacro extends ModuleBase {
const pitch = Number.parseFloat(Player.getPitch());
if (!Number.isFinite(yaw) || !Number.isFinite(pitch)) return;
- Client.sendPacket(new PlayerInteractItemC2S(MCHand.MAIN_HAND, 0, yaw, pitch));
+ Client.sendPacket(new ServerboundUseItemPacket(MCHand.MAIN_HAND, 0, yaw, pitch));
if (isLast && this.travelState?.sequenceToken === token) {
this.travelState.routeCompletedAt = Date.now();
}
diff --git a/modules/farming/PeltQOL.js b/modules/farming/PeltQOL.js
index 6584c41e..c268ef5b 100644
--- a/modules/farming/PeltQOL.js
+++ b/modules/farming/PeltQOL.js
@@ -94,7 +94,7 @@ class PeltQOL extends ModuleBase {
findStart(message) {
const event = message.getStyle().getClickEvent();
- const command = event && event.getAction().name() === 'RUN_COMMAND' && event.comp_3506();
+ const command = event && event.action().name() === 'RUN_COMMAND' && event.command(); // mojmap: command
if (command && /^\s*\/chatprompt\b.*\byes\s*$/i.test(command)) return command;
for (const child of message.getSiblings()) {
const found = this.findStart(child);
diff --git a/modules/foraging/HideonLeafESP.js b/modules/foraging/HideonLeafESP.js
index 66e01ce8..601214fe 100644
--- a/modules/foraging/HideonLeafESP.js
+++ b/modules/foraging/HideonLeafESP.js
@@ -2,7 +2,7 @@ import { Vec3d } from '../../utils/Constants';
import { ModuleBase } from '../../utils/ModuleBase';
import { Utils } from '../../utils/Utils';
-const ShulkerEntity = net.minecraft.entity.mob.ShulkerEntity;
+const ShulkerEntity = net.minecraft.world.entity.monster.Shulker;
class HideonLeafESP extends ModuleBase {
constructor() {
diff --git a/modules/loader.js b/modules/loader.js
index 173be413..426d2b59 100644
--- a/modules/loader.js
+++ b/modules/loader.js
@@ -35,7 +35,6 @@ import './visuals/MusicOverlay';
import './visuals/ProfileHider';
import './visuals/RatESP';
import './visuals/StructureESP';
-import './visuals/Xray';
/* SKILLS */
import './skills/AutoExperiments';
diff --git a/modules/mining/CommissionMacro.js b/modules/mining/CommissionMacro.js
index 5b6a85ff..775de549 100644
--- a/modules/mining/CommissionMacro.js
+++ b/modules/mining/CommissionMacro.js
@@ -291,7 +291,6 @@ class CommissionMacro extends ModuleBase {
CombatBot.clearExternalTargets();
CombatBot.toggle(false);
Pathfinder.resetPath(true);
- Keybind.setKey('rightclick', false);
}
delayedReset(delay) {
diff --git a/modules/mining/GemstoneMacro.js b/modules/mining/GemstoneMacro.js
index ecbd1f85..017729d4 100644
--- a/modules/mining/GemstoneMacro.js
+++ b/modules/mining/GemstoneMacro.js
@@ -1,8 +1,8 @@
import { isDeveloperModeEnabled } from '../../utils/DeveloperModeState';
-import { Vec3d } from '../../utils/Constants';
+import { MCHand, Vec3d } from '../../utils/Constants';
import { MathUtils } from '../../utils/Math';
import { ModuleBase } from '../../utils/ModuleBase';
-import { PlayerInteractItemC2S } from '../../utils/Packets';
+import { ServerboundUseItemPacket } from '../../utils/Packets';
import { Raytrace } from '../../utils/Raytrace';
import RouteState from '../../utils/RouteState';
import { Router } from '../../utils/Router';
@@ -383,7 +383,7 @@ class GemstoneMacro extends ModuleBase {
raytraceBlockFaces(point) {
const player = Player.getPlayer();
- const start = player.getEyePos();
+ const start = player.getEyePosition();
const faces = [
{ name: 'EAST', target: [point.x + 1.1, point.y + 0.5, point.z + 0.5] },
{ name: 'WEST', target: [point.x - 0.1, point.y + 0.5, point.z + 0.5] },
@@ -396,8 +396,8 @@ class GemstoneMacro extends ModuleBase {
shortest = Infinity;
for (const face of faces) {
const [tx, ty, tz] = face.target;
- if (Raytrace.isLineClear(start.x, start.y, start.z, tx, ty, tz)) {
- let d = Math.hypot(tx - start.x, ty - start.y, tz - start.z);
+ if (Raytrace.isLineClear(start.x(), start.y(), start.z(), tx, ty, tz)) {
+ let d = Math.hypot(tx - start.x(), ty - start.y(), tz - start.z());
if (d < shortest) {
shortest = d;
closest = { face: face.name, hitPos: { x: tx, y: ty, z: tz } };
@@ -423,13 +423,13 @@ class GemstoneMacro extends ModuleBase {
rightClickEtherWarp(targetVec) {
const player = Player.getPlayer();
- const eye = player.getEyePos();
- const dx = targetVec.x - eye.x,
- dy = targetVec.y - eye.y,
- dz = targetVec.z - eye.z;
+ const eye = player.getEyePosition();
+ const dx = targetVec.x - eye.x(),
+ dy = targetVec.y - eye.y(),
+ dz = targetVec.z - eye.z();
const yaw = Math.atan2(-dx, dz) * (180 / Math.PI);
const pitch = Math.atan2(-dy, Math.hypot(dx, dz)) * (180 / Math.PI);
- Client.sendPacket(new PlayerInteractItemC2S(Hand.MAIN_HAND, 0, Number.parseFloat(yaw), Number.parseFloat(pitch)));
+ Client.sendPacket(new ServerboundUseItemPacket(MCHand.MAIN_HAND, 0, Number.parseFloat(yaw), Number.parseFloat(pitch)));
}
onEnable() {
diff --git a/modules/mining/GlaciteCommissionMacro.js b/modules/mining/GlaciteCommissionMacro.js
index 4c041e43..a0b2f995 100644
--- a/modules/mining/GlaciteCommissionMacro.js
+++ b/modules/mining/GlaciteCommissionMacro.js
@@ -146,7 +146,6 @@ class GlaciteCommissionMacro extends ModuleBase {
this.cancelNpcRotation();
this.stopTunnelMiner();
Pathfinder.resetPath(true);
- Keybind.setKey('rightclick', false);
}
delayedReset(delay) {
diff --git a/modules/mining/MiningBot.js b/modules/mining/MiningBot.js
index 82dcd891..1f11e309 100644
--- a/modules/mining/MiningBot.js
+++ b/modules/mining/MiningBot.js
@@ -3,7 +3,7 @@ import { MathUtils } from '../../utils/Math';
import { MiningUtils } from '../../utils/MiningUtils';
import { ModuleBase } from '../../utils/ModuleBase';
import { NukerUtils } from '../../utils/NukerUtils';
-import { PlayerActionC2S } from '../../utils/Packets';
+import { ServerboundPlayerActionPacket } from '../../utils/Packets';
import { Raytrace } from '../../utils/Raytrace';
import { manager } from '../../utils/SkyblockEvents';
import { Utils } from '../../utils/Utils';
@@ -253,7 +253,7 @@ class Bot extends ModuleBase {
this.exploit = register('packetSent', (packet, event) => {
if (packet?.getAction()?.toString() === 'ABORT_DESTROY_BLOCK') cancel(event);
})
- .setFilteredClass(PlayerActionC2S)
+ .setFilteredClass(ServerboundPlayerActionPacket)
.unregister();
this.debug = register('postRenderWorld', () => this.renderDebug()).unregister();
@@ -263,7 +263,6 @@ class Bot extends ModuleBase {
if (!this.enabled) return;
if (this.refreshingMiningStats) {
this.stopMiningControls(true);
- Keybind.setKey('rightclick', false);
return;
}
if (Client.isInGui()) {
@@ -471,8 +470,8 @@ class Bot extends ModuleBase {
const lookVec = Player.asPlayerMP()?.getLookVector();
if (!lookVec) return false;
- const forwardX = Player.getX() + lookVec.x * 0.8;
- const forwardZ = Player.getZ() + lookVec.z * 0.8;
+ const forwardX = Player.getX() + lookVec.x() * 0.8;
+ const forwardZ = Player.getZ() + lookVec.z() * 0.8;
const feetY = Math.floor(Player.getY());
return this.isSolidBlockAt(forwardX, feetY, forwardZ) || this.isSolidBlockAt(forwardX, feetY + 1, forwardZ);
@@ -559,7 +558,7 @@ class Bot extends ModuleBase {
incrementMiningCountersIfLookingAtCurrent(fakeLookMode) {
if (fakeLookMode !== 'Off') {
- Player.getPlayer().swingHand(MCHand.MAIN_HAND);
+ Player.getPlayer().swing(MCHand.MAIN_HAND);
this.mineTickCount++;
} else {
const lookingAt = Player.lookingAt();
@@ -795,12 +794,12 @@ class Bot extends ModuleBase {
let head = 0;
const reach = scanReach + this.bfsPad;
- const minBx = Math.floor(eyePos.x - reach) - 1,
- dimX = Math.floor(eyePos.x + reach) + 1 - minBx + 1;
- const minBy = Math.floor(eyePos.y - reach) - 1,
- dimY = Math.floor(eyePos.y + reach) + 1 - minBy + 1;
- const minBz = Math.floor(eyePos.z - reach) - 1,
- dimZ = Math.floor(eyePos.z + reach) + 1 - minBz + 1;
+ const minBx = Math.floor(eyePos.x() - reach) - 1,
+ dimX = Math.floor(eyePos.x() + reach) + 1 - minBx + 1;
+ const minBy = Math.floor(eyePos.y() - reach) - 1,
+ dimY = Math.floor(eyePos.y() + reach) + 1 - minBy + 1;
+ const minBz = Math.floor(eyePos.z() - reach) - 1,
+ dimZ = Math.floor(eyePos.z() + reach) + 1 - minBz + 1;
const maxQueueSize = dimX * dimY * dimZ;
const workspace = this.ensureScanWorkspace(maxQueueSize);
const visited = workspace.visited;
@@ -814,13 +813,13 @@ class Bot extends ModuleBase {
const candidateCheapCost = workspace.candidateCheapCost;
const candidateBlockName = workspace.candidateBlockName;
const visitMark = workspace.visitMark;
- const eyeX = eyePos.x;
- const eyeY = eyePos.y;
- const eyeZ = eyePos.z;
+ const eyeX = eyePos.x();
+ const eyeY = eyePos.y();
+ const eyeZ = eyePos.z();
const hasLookVec = !!lookVec;
- const lookX = hasLookVec ? lookVec.x : 0;
- const lookY = hasLookVec ? lookVec.y : 0;
- const lookZ = hasLookVec ? lookVec.z : 0;
+ const lookX = hasLookVec ? lookVec.x() : 0;
+ const lookY = hasLookVec ? lookVec.y() : 0;
+ const lookZ = hasLookVec ? lookVec.z() : 0;
let reachableCount = 0;
let tail = 1;
@@ -995,7 +994,7 @@ class Bot extends ModuleBase {
const pX = Player.getX(),
pY = Player.getY(),
pZ = Player.getZ();
- const eyePos = Player.getPlayer().getEyePos();
+ const eyePos = Player.getPlayer().getEyePosition();
const lookVec = Player.asPlayerMP().getLookVector();
const start = startPos || { x: Math.floor(pX), y: Math.floor(pY), z: Math.floor(pZ) };
@@ -1040,9 +1039,9 @@ class Bot extends ModuleBase {
const cx = x + 0.5,
cy = y + 0.5,
cz = z + 0.5;
- const eyeX = eyePos.x,
- eyeY = eyePos.y,
- eyeZ = eyePos.z;
+ const eyeX = eyePos.x(),
+ eyeY = eyePos.y(),
+ eyeZ = eyePos.z();
const vx = cx - eyeX,
vy = cy - eyeY,
vz = cz - eyeZ;
@@ -1051,7 +1050,7 @@ class Bot extends ModuleBase {
if (checkFov && lookVec) {
const vLen = Math.sqrt(vLenSq);
- const dotToCenter = (vx * lookVec.x + vy * lookVec.y + vz * lookVec.z) / vLen;
+ const dotToCenter = (vx * lookVec.x() + vy * lookVec.y() + vz * lookVec.z()) / vLen;
if (dotToCenter < -0.05) return null;
}
@@ -1289,7 +1288,7 @@ class Bot extends ModuleBase {
if (distSq > maxReachSq) return null;
const dist = Math.sqrt(distSq);
- const dot = lookVec && dist > 0 ? (dX * lookVec.x + dY * lookVec.y + dZ * lookVec.z) / dist : 1;
+ const dot = lookVec && dist > 0 ? (dX * lookVec.x() + dY * lookVec.y() + dZ * lookVec.z()) / dist : 1;
return { x: resultX, y: resultY, z: resultZ, dist, dot };
}
@@ -1305,11 +1304,15 @@ class Bot extends ModuleBase {
calculateVisibilityStability(x, y, z, eyePos, maxReachSq, confirmedVisibleSamples = 0) {
let visibleSamples = confirmedVisibleSamples;
const sampleEye = this._visibilitySampleEye;
- sampleEye.y = eyePos.y;
+ const eyeX = typeof eyePos?.x === 'function' ? eyePos.x() : eyePos?.x;
+ const eyeY = typeof eyePos?.y === 'function' ? eyePos.y() : eyePos?.y;
+ const eyeZ = typeof eyePos?.z === 'function' ? eyePos.z() : eyePos?.z;
+ if (![eyeX, eyeY, eyeZ].every(Number.isFinite)) return visibleSamples / VISIBILITY_SAMPLE_COUNT;
+ sampleEye.y = eyeY;
for (let i = confirmedVisibleSamples > 0 ? 3 : 0; i < VISIBILITY_OFFSETS.length; i += 3) {
- sampleEye.x = eyePos.x + VISIBILITY_OFFSETS[i];
- sampleEye.z = eyePos.z + VISIBILITY_OFFSETS[i + 2];
+ sampleEye.x = eyeX + VISIBILITY_OFFSETS[i];
+ sampleEye.z = eyeZ + VISIBILITY_OFFSETS[i + 2];
if (this.findVisibleAimPoint(x, y, z, sampleEye, null, maxReachSq, false)) {
visibleSamples++;
@@ -1422,7 +1425,7 @@ class Bot extends ModuleBase {
refreshCurrentTargetAimPoint() {
if (!this.currentTarget) return false;
- const eyePos = Player.getPlayer().getEyePos();
+ const eyePos = Player.getPlayer().getEyePosition();
const lookVec = Player.asPlayerMP().getLookVector();
const hit = this.findVisibleAimPoint(
this.currentTarget.x,
@@ -1494,7 +1497,7 @@ class Bot extends ModuleBase {
if (!Array.isArray(locations) || locations.length === 0) return false;
this.manualScan = true;
- const eyePos = Player.getPlayer().getEyePos();
+ const eyePos = Player.getPlayer().getEyePosition();
const maxReachSq = this.mineReach * this.mineReach;
this.foundLocations = locations
@@ -1575,7 +1578,6 @@ class Bot extends ModuleBase {
Keybind.setKey('space', false);
this.setSneak(false, true);
Keybind.setKey('leftclick', false);
- Keybind.setKey('rightclick', false);
this.foundLocations = [];
this.lastBlockPos = null;
this.lastBlockType = null;
@@ -1644,10 +1646,10 @@ class Bot extends ModuleBase {
let nextTarget = null;
if (this.foundLocations.length > 1 && current.aimX !== undefined) {
- const eyePos = Player.getPlayer().getEyePos();
- const simLookX = current.aimX - eyePos.x;
- const simLookY = current.aimY - eyePos.y;
- const simLookZ = current.aimZ - eyePos.z;
+ const eyePos = Player.getPlayer().getEyePosition();
+ const simLookX = current.aimX - eyePos.x();
+ const simLookY = current.aimY - eyePos.y();
+ const simLookZ = current.aimZ - eyePos.z();
const simLookLen = Math.hypot(simLookX, simLookY, simLookZ);
if (simLookLen > 0) {
@@ -1660,9 +1662,9 @@ class Bot extends ModuleBase {
if (loc.x === current.x && loc.y === current.y && loc.z === current.z) continue;
if (loc.aimX === undefined) continue;
- const dx = loc.aimX - eyePos.x;
- const dy = loc.aimY - eyePos.y;
- const dz = loc.aimZ - eyePos.z;
+ const dx = loc.aimX - eyePos.x();
+ const dy = loc.aimY - eyePos.y();
+ const dz = loc.aimZ - eyePos.z();
const dist = Math.hypot(dx, dy, dz);
if (dist === 0) continue;
diff --git a/modules/mining/Nuker.js b/modules/mining/Nuker.js
index c4479295..b4cca435 100644
--- a/modules/mining/Nuker.js
+++ b/modules/mining/Nuker.js
@@ -1,11 +1,10 @@
import { BP, BlockHitResult, Direction, MCHand, Vec3d } from '../../utils/Constants';
import { ModuleBase } from '../../utils/ModuleBase';
import { NukerUtils } from '../../utils/NukerUtils';
-import { PlayerInteractBlockC2S } from '../../utils/Packets';
+import { ServerboundUseItemOnPacket } from '../../utils/Packets';
import { manager } from '../../utils/SkyblockEvents';
import { Executor } from '../../utils/ThreadExecutor';
import { TabListUtils } from '../../utils/TabListUtils';
-import { Utils } from '../../utils/Utils';
import { v5Command } from '../../utils/V5Commands';
import { Keybind } from '../../utils/player/Keybinding';
@@ -105,7 +104,7 @@ class NukerClass extends ModuleBase {
}
if (Client.isInGui() && !Client.isInChat()) return;
- if (Client.getKeyBindFromDescription('key.attack')?.isKeyDown() || Client.getMinecraft().options.attackKey?.isPressed()) return;
+ if (Client.getKeyBindFromDescription('key.attack')?.isKeyDown() || Client.getMinecraft().options.keyAttack?.isDown()) return;
if (!this.onGround()) return;
let delay = Player.asPlayerMP().isOnGround() ? this.onGroundDelay : this.offGroundDelay;
@@ -284,6 +283,7 @@ class NukerClass extends ModuleBase {
}
distance(from, to) {
+ if (!from || !to) return { distance: Infinity };
const dx = from[0] - to[0],
dy = from[1] - to[1],
dz = from[2] - to[2];
@@ -291,6 +291,7 @@ class NukerClass extends ModuleBase {
}
distanceToBlockBox(from, to) {
+ if (!from || !to) return { distance: Infinity };
const clampedX = Math.max(to[0], Math.min(from[0], to[0] + 1));
const clampedY = Math.max(to[1], Math.min(from[1], to[1] + 1));
const clampedZ = Math.max(to[2], Math.min(from[2], to[2] + 1));
@@ -302,8 +303,9 @@ class NukerClass extends ModuleBase {
}
cords() {
- let eye = Utils.convertToVector(Player.asPlayerMP().getEyePosition(1));
- return [eye.x, eye.y, eye.z];
+ const eye = Player.getPlayer()?.getEyePosition();
+ if (!eye) return null;
+ return [eye.x(), eye.y(), eye.z()];
}
renderRGB(loc) {
@@ -316,7 +318,7 @@ class NukerClass extends ModuleBase {
rightClickBlock(xyz) {
let hitResult = new BlockHitResult(new Vec3d(xyz[0] + 0.5, xyz[1] + 0.5, xyz[2] + 0.5), Direction.UP, new BP(xyz[0], xyz[1], xyz[2]), false);
- Client.sendSequencedPacket((sequence) => new PlayerInteractBlockC2S(MCHand.MAIN_HAND, hitResult, sequence));
+ Client.sendSequencedPacket((sequence) => new ServerboundUseItemOnPacket(MCHand.MAIN_HAND, hitResult, sequence));
}
init() {
diff --git a/modules/mining/OreMacro.js b/modules/mining/OreMacro.js
index 240db16f..172cccd7 100644
--- a/modules/mining/OreMacro.js
+++ b/modules/mining/OreMacro.js
@@ -1,8 +1,8 @@
import { isDeveloperModeEnabled } from '../../utils/DeveloperModeState';
-import { Vec3d } from '../../utils/Constants';
+import { MCHand, Vec3d } from '../../utils/Constants';
import { MathUtils } from '../../utils/Math';
import { ModuleBase } from '../../utils/ModuleBase';
-import { PlayerInteractItemC2S } from '../../utils/Packets';
+import { ServerboundUseItemPacket } from '../../utils/Packets';
import { Guis } from '../../utils/player/Inventory';
import { Keybind } from '../../utils/player/Keybinding';
import { Rotations } from '../../utils/player/Rotations';
@@ -539,9 +539,9 @@ class OreMacro extends ModuleBase {
raytraceBlockFaces(point) {
const player = Player.getPlayer();
- const startX = player.getEyePos().x;
- const startY = player.getEyePos().y;
- const startZ = player.getEyePos().z;
+ const startX = player.getEyePosition().x();
+ const startY = player.getEyePosition().y();
+ const startZ = player.getEyePosition().z();
const centerX = point.x + 0.5;
const centerY = point.y + 0.5;
@@ -622,16 +622,16 @@ class OreMacro extends ModuleBase {
if (!targetVec) return;
const player = Player.getPlayer();
- const eyePos = player.getEyePos();
+ const eyePos = player.getEyePosition();
- const dx = targetVec.x - eyePos.x;
- const dy = targetVec.y - eyePos.y;
- const dz = targetVec.z - eyePos.z;
+ const dx = targetVec.x - eyePos.x();
+ const dy = targetVec.y - eyePos.y();
+ const dz = targetVec.z - eyePos.z();
const yaw = Math.atan2(-dx, dz) * (180 / Math.PI);
const pitch = Math.atan2(-dy, Math.hypot(dx, dz)) * (180 / Math.PI);
- const packet = new PlayerInteractItemC2S(Hand.MAIN_HAND, 0, Number.parseFloat(yaw), Number.parseFloat(pitch));
+ const packet = new ServerboundUseItemPacket(MCHand.MAIN_HAND, 0, Number.parseFloat(yaw), Number.parseFloat(pitch));
Client.sendPacket(packet);
}
diff --git a/modules/mining/PinglessMining.js b/modules/mining/PinglessMining.js
index 360d9ab4..d5745833 100644
--- a/modules/mining/PinglessMining.js
+++ b/modules/mining/PinglessMining.js
@@ -2,7 +2,7 @@
import { MiningUtils } from '../../utils/MiningUtils';
import { ModuleBase } from '../../utils/ModuleBase';
-import { HandSwingC2S, PlayerActionC2S } from '../../utils/Packets';
+import { ServerboundSwingPacket, ServerboundPlayerActionPacket } from '../../utils/Packets';
import { Utils } from '../../utils/Utils';
class Pingless extends ModuleBase {
@@ -31,7 +31,7 @@ class Pingless extends ModuleBase {
z = this.pos.z;
const player = Player.getPlayer();
- if (!player || !player.isOnGround()) return;
+ if (!player || !player.onGround()) return;
if (
!Player.getHeldItem()
@@ -46,7 +46,7 @@ class Pingless extends ModuleBase {
this.mining = true;
}
- }).setFilteredClass(PlayerActionC2S);
+ }).setFilteredClass(ServerboundPlayerActionPacket);
this.on('packetSent', () => {
if (Utils.area() !== 'Crystal Hollows') return;
@@ -59,7 +59,7 @@ class Pingless extends ModuleBase {
this.mining = false;
this.pos = null;
}
- }).setFilteredClass(HandSwingC2S);
+ }).setFilteredClass(ServerboundSwingPacket);
this.tickCount = 1;
this.addSlider('Tick Delay', 0, 5, 1, (v) => (this.tickCount = v), 'How long to wait before removing hardstone.');
diff --git a/modules/mining/PowderMacro.js b/modules/mining/PowderMacro.js
index 48f5353b..d01419bc 100644
--- a/modules/mining/PowderMacro.js
+++ b/modules/mining/PowderMacro.js
@@ -1,4 +1,5 @@
import { isDeveloperModeEnabled } from '../../utils/DeveloperModeState';
+import { MathUtils } from '../../utils/Math';
import { ModuleBase } from '../../utils/ModuleBase';
import { Keybind } from '../../utils/player/Keybinding';
import { Rotations } from '../../utils/player/Rotations';
@@ -91,8 +92,8 @@ class PowderMacro extends ModuleBase {
if (!player) return;
this.savedRotation = {
- yaw: player.getYaw(),
- pitch: player.getPitch(),
+ yaw: MathUtils.wrapTo180(player.getYRot()),
+ pitch: player.getXRot(),
};
this.targetChest = null;
@@ -131,8 +132,8 @@ class PowderMacro extends ModuleBase {
Keybind.setKey('shift', true);
this.pivot = {
- yaw: player.getYaw(),
- pitch: player.getPitch(),
+ yaw: MathUtils.wrapTo180(player.getYRot()),
+ pitch: player.getXRot(),
};
this.startTime = Date.now();
@@ -208,7 +209,7 @@ class PowderMacro extends ModuleBase {
const player = Player.getPlayer();
if (!player) return;
- const current = { yaw: player.getYaw(), pitch: player.getPitch() };
+ const current = { yaw: MathUtils.wrapTo180(player.getYRot()), pitch: player.getXRot() };
const target = this.savedRotation ?? this.pivot;
const diffYaw = RotationGCD.angleDifference(target.yaw, current.yaw);
diff --git a/modules/other/AutoConversation.js b/modules/other/AutoConversation.js
index 5d51b04b..eaa41338 100644
--- a/modules/other/AutoConversation.js
+++ b/modules/other/AutoConversation.js
@@ -23,11 +23,11 @@ class AutoConversation extends ModuleBase {
const style = comp.getStyle();
const clickEvent = style ? style.getClickEvent() : null;
- if (clickEvent && clickEvent.getAction().name() === 'RUN_COMMAND') {
+ if (clickEvent && clickEvent.action().name() === 'RUN_COMMAND') {
let value = null;
try {
- value = clickEvent.comp_3506();
+ value = clickEvent.command(); // mojmap: command
} catch (e) {
console.error('V5 Caught error' + e + e.stack);
}
diff --git a/modules/other/BeachBaller.js b/modules/other/BeachBaller.js
index 68655e2b..fb52bae5 100644
--- a/modules/other/BeachBaller.js
+++ b/modules/other/BeachBaller.js
@@ -415,7 +415,7 @@ class Beachballer extends ModuleBase {
isBeachBall(item) {
try {
const mcItem = item.toMC();
- const profileType = net.minecraft.component.DataComponentTypes.PROFILE;
+ const profileType = net.minecraft.core.component.DataComponents.PROFILE;
const profileComponent = mcItem.get(profileType);
const data = profileComponent.getGameProfile().toString();
diff --git a/modules/other/CancelInteract.js b/modules/other/CancelInteract.js
index 733dfd30..9059abb1 100644
--- a/modules/other/CancelInteract.js
+++ b/modules/other/CancelInteract.js
@@ -1,5 +1,5 @@
import { ModuleBase } from '../../utils/ModuleBase';
-import { PlayerInteractBlockC2S } from '../../utils/Packets';
+import { ServerboundUseItemOnPacket } from '../../utils/Packets';
const AIR_BLOCKS = new Set(['minecraft:air', 'minecraft:cave_air', 'minecraft:void_air']);
const INTERACTION_WHITELIST = new Set([
@@ -34,7 +34,7 @@ class CancelInteract extends ModuleBase {
this.cancelTime = 0;
this.on('playerInteract', (action, pos) => this.onPlayerInteract(action, pos));
- this.on('packetSent', (packet, event) => this.onPacketSent(packet, event)).setFilteredClass(PlayerInteractBlockC2S);
+ this.on('packetSent', (packet, event) => this.onPacketSent(packet, event)).setFilteredClass(ServerboundUseItemOnPacket);
}
onPlayerInteract(action, pos) {
diff --git a/modules/other/ChatQOL.js b/modules/other/ChatQOL.js
index abf8c5fa..231bcbc3 100644
--- a/modules/other/ChatQOL.js
+++ b/modules/other/ChatQOL.js
@@ -48,7 +48,7 @@ class ChatQOL extends ModuleBase {
}
registerChatPatch() {
- const McText = net.minecraft.text.Text;
+ const McText = net.minecraft.network.chat.Component;
register('chat', (event) => {
if (!this.CHAT_PATCH) return;
@@ -65,7 +65,7 @@ class ChatQOL extends ModuleBase {
ChatLib.deleteChat(deleteRegex);
const newText = event.message.copy().append(McText.literal(` ยง7(x${this.lastCounter})`));
- const chatHud = Client.getMinecraft().inGameHud.getChatHud();
+ const chatHud = Client.getMinecraft().gui.getChat();
chatHud.addMessage(newText);
return;
}
diff --git a/modules/other/Failsafes.js b/modules/other/Failsafes.js
index b2b8de9f..792739db 100644
--- a/modules/other/Failsafes.js
+++ b/modules/other/Failsafes.js
@@ -2,9 +2,9 @@ import { AlertUtils } from '../../failsafes/AlertUtils';
import { getSetting } from '../../gui/GuiSave';
import { File, globalAssetsDir } from '../../utils/Constants';
import { ModuleBase } from '../../utils/ModuleBase';
-import { DisconnectS2C, LoginDisconnectS2C } from '../../utils/Packets';
+import { ClientboundDisconnectPacket, ClientboundLoginDisconnectPacket } from '../../utils/Packets';
import { MacroState } from '../../utils/MacroState';
-import Clipping from '../../utils/Clipping';
+//import Clipping from '../../utils/Clipping';
const JURL = Java.type('java.net.URL');
const JOutputStreamWriter = Java.type('java.io.OutputStreamWriter');
@@ -49,10 +49,10 @@ class Failsafes extends ModuleBase {
this.postBanLog(fullText, lastMacro, currentlyMacroing);
if (this.clipOnBan) {
- Client.scheduleTask(40, () => Clipping.saveClip());
+ //Client.scheduleTask(40, () => Clipping.saveClip());
}
}
- }).setFilteredClasses([LoginDisconnectS2C, DisconnectS2C]);
+ }).setFilteredClasses([ClientboundLoginDisconnectPacket, ClientboundDisconnectPacket]);
const sectionName = 'Failsafes';
diff --git a/modules/other/Freecam.js b/modules/other/Freecam.js
index 7605eec5..7986f0b8 100644
--- a/modules/other/Freecam.js
+++ b/modules/other/Freecam.js
@@ -2,10 +2,11 @@ import { Vec3d } from '../../utils/Constants';
import { Camera } from '../../utils/Camera';
import { Mixin } from '../../utils/MixinManager';
import { ModuleBase } from '../../utils/ModuleBase';
+import { MathUtils } from '../../utils/Math';
import { Keybind } from '../../utils/player/Keybinding';
import { mc } from '../../utils/Utils';
-const Perspective = net.minecraft.client.option.Perspective;
+const Perspective = net.minecraft.client.CameraType;
const THIRD_PERSON_DISTANCE = 4.0;
class Freecam extends ModuleBase {
@@ -48,16 +49,16 @@ class Freecam extends ModuleBase {
}
this.message('&aEnabled');
- this.cameraPos = this.getInitialCameraPos(player, player.getYaw(), player.getPitch());
+ this.cameraPos = this.getInitialCameraPos(player, MathUtils.wrapTo180(player.getYRot()), player.getXRot());
this.velocity = new Vec3d(0, 0, 0);
- this.savedPerspective = mc.options.getPerspective();
+ this.savedPerspective = mc.options.getCameraType();
Keybind.unpressKeys();
Mixin.set('freecamEnabled', true);
Mixin.delete('freecamFrozenYaw');
Mixin.delete('freecamFrozenPitch');
Mixin.delete('cameraOverrideYaw');
Mixin.delete('cameraOverridePitch');
- mc.options.setPerspective(Perspective.THIRD_PERSON_BACK);
+ mc.options.setCameraType(Perspective.THIRD_PERSON_BACK);
Camera.setCameraPosition(this.cameraPos);
}
@@ -74,7 +75,7 @@ class Freecam extends ModuleBase {
Camera.clearCameraPosition();
if (this.savedPerspective) {
- mc.options.setPerspective(this.savedPerspective);
+ mc.options.setCameraType(this.savedPerspective);
}
this.savedPerspective = null;
@@ -88,15 +89,15 @@ class Freecam extends ModuleBase {
if (!player) return;
if (!this.cameraPos) {
- this.cameraPos = this.getInitialCameraPos(player, player.getYaw(), player.getPitch());
+ this.cameraPos = this.getInitialCameraPos(player, MathUtils.wrapTo180(player.getYRot()), player.getXRot());
}
- if (mc.options.getPerspective() !== Perspective.THIRD_PERSON_BACK) {
- mc.options.setPerspective(Perspective.THIRD_PERSON_BACK);
+ if (mc.options.getCameraType() !== Perspective.THIRD_PERSON_BACK) {
+ mc.options.setCameraType(Perspective.THIRD_PERSON_BACK);
}
const options = mc.options;
- const yaw = (player.getYaw() * Math.PI) / 180;
+ const yaw = (MathUtils.wrapTo180(player.getYRot()) * Math.PI) / 180;
let moveX = 0;
let moveY = 0;
@@ -107,26 +108,26 @@ class Freecam extends ModuleBase {
const leftX = Math.cos(yaw);
const leftZ = Math.sin(yaw);
- if (options.forwardKey.isPressed()) {
+ if (options.keyUp.isDown()) {
moveX += forwardX;
moveZ += forwardZ;
}
- if (options.backKey.isPressed()) {
+ if (options.keyDown.isDown()) {
moveX -= forwardX;
moveZ -= forwardZ;
}
- if (options.leftKey.isPressed()) {
+ if (options.keyLeft.isDown()) {
moveX += leftX;
moveZ += leftZ;
}
- if (options.rightKey.isPressed()) {
+ if (options.keyRight.isDown()) {
moveX -= leftX;
moveZ -= leftZ;
}
- if (options.jumpKey.isPressed()) {
+ if (options.keyJump.isDown()) {
moveY += 1;
}
- if (options.sneakKey.isPressed()) {
+ if (options.keyShift.isDown()) {
moveY -= 1;
}
@@ -141,25 +142,25 @@ class Freecam extends ModuleBase {
const smoothing = hasInput ? 0.35 : 0.12;
this.velocity = new Vec3d(
- this.velocity.x + (targetX - this.velocity.x) * smoothing,
- this.velocity.y + (targetY - this.velocity.y) * smoothing,
- this.velocity.z + (targetZ - this.velocity.z) * smoothing
+ this.velocity.x() + (targetX - this.velocity.x()) * smoothing,
+ this.velocity.y() + (targetY - this.velocity.y()) * smoothing,
+ this.velocity.z() + (targetZ - this.velocity.z()) * smoothing
);
- const velocityMagnitude = Math.hypot(this.velocity.x, this.velocity.y, this.velocity.z);
+ const velocityMagnitude = Math.hypot(this.velocity.x(), this.velocity.y(), this.velocity.z());
if (velocityMagnitude < 0.0005) {
this.velocity = new Vec3d(0, 0, 0);
Camera.setCameraPosition(this.cameraPos);
return;
}
- this.cameraPos = new Vec3d(this.cameraPos.x + this.velocity.x, this.cameraPos.y + this.velocity.y, this.cameraPos.z + this.velocity.z);
+ this.cameraPos = new Vec3d(this.cameraPos.x() + this.velocity.x(), this.cameraPos.y() + this.velocity.y(), this.cameraPos.z() + this.velocity.z());
Camera.setCameraPosition(this.cameraPos);
}
getInitialCameraPos(player, yaw, pitch) {
- const eyePos = player.getEyePos();
+ const eyePos = player.getEyePosition();
const yawRad = (yaw * Math.PI) / 180;
const pitchRad = (pitch * Math.PI) / 180;
const cosPitch = Math.cos(pitchRad);
@@ -167,7 +168,7 @@ class Freecam extends ModuleBase {
const lookY = -Math.sin(pitchRad);
const lookZ = Math.cos(yawRad) * cosPitch;
- return new Vec3d(eyePos.x - lookX * THIRD_PERSON_DISTANCE, eyePos.y - lookY * THIRD_PERSON_DISTANCE, eyePos.z - lookZ * THIRD_PERSON_DISTANCE);
+ return new Vec3d(eyePos.x() - lookX * THIRD_PERSON_DISTANCE, eyePos.y() - lookY * THIRD_PERSON_DISTANCE, eyePos.z() - lookZ * THIRD_PERSON_DISTANCE);
}
}
diff --git a/modules/other/InventoryWalk.js b/modules/other/InventoryWalk.js
index f54e629f..576c8f26 100644
--- a/modules/other/InventoryWalk.js
+++ b/modules/other/InventoryWalk.js
@@ -1,13 +1,13 @@
import { TypingState } from '../../gui/Utils';
import { ModuleBase } from '../../utils/ModuleBase';
import {
- ClickSlotC2S,
- CommonPingS2C,
- InventoryS2C,
- OpenScreenS2C,
- ScreenHandlerSlotUpdateS2C,
- SetCursorItemS2C,
- SetPlayerInventoryS2C,
+ ServerboundContainerClickPacket,
+ ClientboundPingPacket,
+ ClientboundContainerSetContentPacket,
+ ClientboundOpenScreenPacket,
+ ClientboundContainerSetSlotPacket,
+ ClientboundSetCursorItemPacket,
+ ClientboundSetPlayerInventoryPacket,
} from '../../utils/Packets';
import { ScheduleTask } from '../../utils/ScheduleTask';
@@ -24,13 +24,13 @@ class InventoryWalk extends ModuleBase {
this.time = 0;
this.lastPacketTime = Date.now();
this.keybinds = [
- new KeyBind(Client.getMinecraft().options.forwardKey),
- new KeyBind(Client.getMinecraft().options.leftKey),
- new KeyBind(Client.getMinecraft().options.rightKey),
- new KeyBind(Client.getMinecraft().options.backKey),
- new KeyBind(Client.getMinecraft().options.jumpKey),
- new KeyBind(Client.getMinecraft().options.sprintKey),
- new KeyBind(Client.getMinecraft().options.sneakKey),
+ new KeyBind(Client.getMinecraft().options.keyUp),
+ new KeyBind(Client.getMinecraft().options.keyLeft),
+ new KeyBind(Client.getMinecraft().options.keyRight),
+ new KeyBind(Client.getMinecraft().options.keyDown),
+ new KeyBind(Client.getMinecraft().options.keyJump),
+ new KeyBind(Client.getMinecraft().options.keySprint),
+ new KeyBind(Client.getMinecraft().options.keyShift),
];
this.on('tick', () => {
@@ -57,7 +57,7 @@ class InventoryWalk extends ModuleBase {
this.keybinds.forEach((keybind) => {
keybind.setState(false);
});
- }).setFilteredClass(ClickSlotC2S);
+ }).setFilteredClass(ServerboundContainerClickPacket);
this.on('packetReceived', (packet) => {
this.clicked = false;
@@ -67,7 +67,7 @@ class InventoryWalk extends ModuleBase {
keybind.setState(down);
});
});
- }).setFilteredClass(OpenScreenS2C);
+ }).setFilteredClass(ClientboundOpenScreenPacket);
this.on('packetReceived', (packet) => {
this.lastPacketTime = Date.now();
diff --git a/modules/other/MacroScheduler.js b/modules/other/MacroScheduler.js
index 947f53fb..d670c697 100644
--- a/modules/other/MacroScheduler.js
+++ b/modules/other/MacroScheduler.js
@@ -437,7 +437,7 @@ class MacroScheduler extends ModuleBase {
try {
const mc = Client.getMinecraft();
if (mc.getNetworkHandler()) {
- const text = net.minecraft.text.Text.of(reason);
+ const text = net.minecraft.network.chat.Component.literal(String(reason ?? ''));
mc.getNetworkHandler().getConnection().disconnect(text);
}
} catch (e) {
diff --git a/modules/other/RatMacro.js b/modules/other/RatMacro.js
index 79a7b1a2..26be3694 100644
--- a/modules/other/RatMacro.js
+++ b/modules/other/RatMacro.js
@@ -4,7 +4,7 @@ import { OverlayManager } from '../../gui/OverlayUtils';
import { Chat } from '../../utils/Chat';
import { MCHand } from '../../utils/Constants';
import { ModuleBase } from '../../utils/ModuleBase';
-import { PlayerInteractItemC2S } from '../../utils/Packets';
+import { ServerboundUseItemPacket } from '../../utils/Packets';
import { EtherwarpPathfinder } from '../../utils/pathfinder/EtherwarpPathfinder';
import { Guis } from '../../utils/player/Inventory';
import { Keybind } from '../../utils/player/Keybinding';
@@ -368,7 +368,7 @@ class RatMacro extends ModuleBase {
const yaw = Number.parseFloat(Player.getYaw());
const pitch = Number.parseFloat(Player.getPitch());
this.debug(`firing at rat &e${this.formatRatRef()}&f with yaw &e${yaw.toFixed(2)}&f pitch &e${pitch.toFixed(2)}`);
- Client.sendSequencedPacket((sequence) => new PlayerInteractItemC2S(MCHand.MAIN_HAND, sequence, yaw, pitch));
+ Client.sendSequencedPacket((sequence) => new ServerboundUseItemPacket(MCHand.MAIN_HAND, sequence, yaw, pitch));
this.markRatAssumedDead(attackTarget);
this.pendingAttackAtGoal = false;
this.finishCurrentTargetKilled();
diff --git a/modules/skills/ChocolateFactory.js b/modules/skills/ChocolateFactory.js
index 614be623..7d73486b 100644
--- a/modules/skills/ChocolateFactory.js
+++ b/modules/skills/ChocolateFactory.js
@@ -5,7 +5,7 @@ import { Guis } from '../../utils/player/Inventory';
const COOKIE_SLOT = 13;
const MAX_TRACKED_EGGS = 6;
const EGG_MESSAGE_REGEX = /.*\b(A|found|collected)\b.+Chocolate (Breakfast|Lunch|Dinner|Brunch|Dรฉjeuner|Supper).*/i;
-const PROFILE_TYPE = net.minecraft.component.DataComponentTypes.PROFILE;
+const PROFILE_TYPE = net.minecraft.core.component.DataComponents.PROFILE;
const EGG_TYPES = [
{
diff --git a/modules/skills/MinionCollector.js b/modules/skills/MinionCollector.js
index 2565c376..4f3c1905 100644
--- a/modules/skills/MinionCollector.js
+++ b/modules/skills/MinionCollector.js
@@ -2,7 +2,7 @@ import { ArmorStandEntity } from '../../utils/Constants';
import { ModuleBase } from '../../utils/ModuleBase';
import { Utils } from '../../utils/Utils';
import { MCHand, Vec3d } from '../../utils/Constants';
-import { PlayerInteractEntityC2S } from '../../utils/Packets';
+import { ServerboundInteractPacket } from '../../utils/Packets';
import { Guis } from '../../utils/player/Inventory';
class MinionCollector extends ModuleBase {
@@ -108,7 +108,7 @@ class MinionCollector extends ModuleBase {
rightClickMinion(entity) {
const ent = entity.toMC().getEntity();
const vec = new Vec3d(0.0, 0.5, 0.0);
- const packet = PlayerInteractEntityC2S.interactAt(ent, false, MCHand.MAIN_HAND, vec);
+ const packet = new ServerboundInteractPacket(ent.getId(), MCHand.MAIN_HAND, vec, false);
Client.sendPacket(packet);
this.lastCollection = 0;
}
diff --git a/modules/skills/RouteWalker.js b/modules/skills/RouteWalker.js
index ce8cda73..86dc5a47 100644
--- a/modules/skills/RouteWalker.js
+++ b/modules/skills/RouteWalker.js
@@ -170,7 +170,7 @@ class RouteWalkerer extends ModuleBase {
let angle = MathUtils.calculateAbsoluteAngles(new Vec3d(this.point.x + 0.5, this.point.y + 2, this.point.z + 0.5));
- Rotations.lookAtAngles(angle.yaw, this.LOCKPITCH ? this.PITCH : player.getPitch(), { speedMultiplier: 1.0 });
+ Rotations.lookAtAngles(angle.yaw, this.LOCKPITCH ? this.PITCH : player.getXRot(), { speedMultiplier: 1.0 });
if (currentDistance < 3) {
this.etherwarpReady = false;
diff --git a/modules/skills/StridersurferMacro.js b/modules/skills/StridersurferMacro.js
index c972ab2e..88733237 100644
--- a/modules/skills/StridersurferMacro.js
+++ b/modules/skills/StridersurferMacro.js
@@ -1,5 +1,6 @@
import { OverlayManager } from '../../gui/OverlayUtils';
import { ArmorStandEntity } from '../../utils/Constants';
+import { MathUtils } from '../../utils/Math';
import { ModuleBase } from '../../utils/ModuleBase';
import { Guis } from '../../utils/player/Inventory';
import { Keybind } from '../../utils/player/Keybinding';
@@ -131,8 +132,8 @@ class StridersurferMacro extends ModuleBase {
const closeStridersurfer = this.getNearbyStridersurfer(armorStands);
if (closeStridersurfer) {
- this.previousYaw = Player.getPlayer().getYaw();
- this.previousPitch = Player.getPlayer().getPitch();
+ this.previousYaw = MathUtils.wrapTo180(Player.getPlayer().getYRot());
+ this.previousPitch = Player.getPlayer().getXRot();
this.stridersurferTarget = closeStridersurfer;
Guis.setItemSlot(this.getAxeSlot());
this.transitionTo(STEPS.SNAP_TO_STRIDER, 0);
@@ -342,7 +343,7 @@ class StridersurferMacro extends ModuleBase {
getNearbyStridersurfer(armorStands) {
const player = Player.getPlayer();
if (!player) return null;
- const eyes = player.getEyePos();
+ const eyes = player.getEyePosition();
if (!eyes) return null;
return armorStands.find((entity) => {
@@ -361,7 +362,7 @@ class StridersurferMacro extends ModuleBase {
isStridersurferWithinRange(entity) {
const player = Player.getPlayer();
if (!player) return false;
- const eyes = player.getEyePos();
+ const eyes = player.getEyePosition();
if (!eyes) return false;
const distance = this.distanceFromEyes(entity, eyes);
@@ -369,9 +370,9 @@ class StridersurferMacro extends ModuleBase {
}
distanceFromEyes(entity, eyes) {
- const dx = entity.getX() - eyes.x;
- const dy = entity.getY() - 1 - eyes.y;
- const dz = entity.getZ() - eyes.z;
+ const dx = entity.getX() - eyes.x();
+ const dy = entity.getY() - 1 - eyes.y();
+ const dz = entity.getZ() - eyes.z();
return Math.hypot(dx, dy, dz);
}
diff --git a/modules/visuals/GIF.js b/modules/visuals/GIF.js
index 491ed081..c67e092c 100644
--- a/modules/visuals/GIF.js
+++ b/modules/visuals/GIF.js
@@ -253,7 +253,7 @@ class GIFOverlay extends ModuleBase {
isChatOpen() {
const gui = Client.currentGui.get();
if (!gui) return false;
- return gui.class.simpleName == 'class_408';
+ return gui.class.simpleName == 'ChatScreen'; // mojmap: ChatScreen
}
getGifFiles() {
@@ -302,7 +302,7 @@ class GIFOverlay extends ModuleBase {
handleClick(x, y, button, isPressed) {
if (this.instances.length === 0 || !this.isChatOpen() || button !== 0) return;
- const scale = Client.getMinecraft().getWindow().getScaleFactor();
+ const scale = Client.getMinecraft().getWindow().getGuiScale();
const mx = x / scale;
const my = y / scale;
@@ -317,7 +317,7 @@ class GIFOverlay extends ModuleBase {
handleDrag(dx, dy, x, y, button) {
if (this.instances.length === 0 || !this.isChatOpen() || button !== 0) return;
- const scale = Client.getMinecraft().getWindow().getScaleFactor();
+ const scale = Client.getMinecraft().getWindow().getGuiScale();
const mx = x / scale;
const my = y / scale;
diff --git a/modules/visuals/HUD.js b/modules/visuals/HUD.js
index aab30e35..6a7ec58e 100644
--- a/modules/visuals/HUD.js
+++ b/modules/visuals/HUD.js
@@ -16,6 +16,7 @@ class HUD extends ModuleBase {
this.STATS_HUD = true;
this.INVENTORY_HUD = true;
+ this.worldLoaded = World.isLoaded();
this.addToggle('Stats Hud', (v) => (this.STATS_HUD = !!v), 'Shows FPS, TPS, Ping etc.', true);
this.addToggle('Inventory Hud', (v) => (this.INVENTORY_HUD = !!v), 'Turns on the inventory Hud', true);
@@ -25,13 +26,16 @@ class HUD extends ModuleBase {
this.inventory = this.loadOverlayState('inventory', { x: 50, y: 100, scale: 1.0 });
this.when(
- () => this.STATS_HUD || this.INVENTORY_HUD,
+ () => this.INVENTORY_HUD,
'renderOverlay',
() => this.renderOverlay()
);
+ NVG.registerV5PreRender(() => this.renderInventoryBackgroundOverlay());
+ NVG.registerV5Render(() => this.renderStatsOverlay());
register('gameUnload', () => this.savePositions());
register('guiClosed', () => this.savePositions());
+ register('tick', () => (this.worldLoaded = World.isLoaded()));
}
onDisable() {
@@ -176,6 +180,34 @@ class HUD extends ModuleBase {
if (this.INVENTORY_HUD) this.recalcInventoryBounds();
}
+ prepareOverlay(enabled, recalc) {
+ if (OverlayManager.drawingGUI || !enabled || !this.worldLoaded) return false;
+
+ this.syncFromOverlayEditor();
+
+ const sw = Renderer.screen.getWidth();
+ const sh = Renderer.screen.getHeight();
+ if (sw <= 0 || sh <= 0) return false;
+
+ recalc.call(this);
+ return { sw, sh };
+ }
+
+ drawInFrame(sw, sh, draw) {
+ try {
+ NVG.beginFrame(sw, sh);
+ draw.call(this);
+ } catch (e) {
+ console.error('V5 Caught error' + e + e.stack);
+ } finally {
+ try {
+ NVG.endFrame();
+ } catch (e) {
+ console.error('V5 Caught error' + e + e.stack);
+ }
+ }
+ }
+
drawStatsHud() {
const o = this.stats;
const s = o.scale;
@@ -302,50 +334,27 @@ class HUD extends ModuleBase {
});
}
- renderOverlay() {
- if (OverlayManager.drawingGUI) return;
-
- this.syncFromOverlayEditor();
-
- const sw = Renderer.screen.getWidth();
- const sh = Renderer.screen.getHeight();
- if (sw <= 0 || sh <= 0) return;
+ renderInventoryBackgroundOverlay() {
+ const frame = this.prepareOverlay(this.INVENTORY_HUD, this.recalcInventoryBounds);
+ if (!frame) return;
+ this.drawInFrame(frame.sw, frame.sh, this.drawInventoryHudBackground);
+ }
- this.recalcAllBounds();
+ renderOverlay() {
+ const frame = this.prepareOverlay(this.INVENTORY_HUD, this.recalcInventoryBounds);
+ if (!frame) return;
try {
- NVG.beginFrame(sw, sh);
- if (this.INVENTORY_HUD) this.drawInventoryHudBackground();
+ this.drawInventoryHudItems();
} catch (e) {
console.error('V5 Caught error' + e + e.stack);
- } finally {
- try {
- NVG.endFrame();
- } catch (e) {
- console.error('V5 Caught error' + e + e.stack);
- }
- }
-
- if (this.INVENTORY_HUD) {
- try {
- this.drawInventoryHudItems();
- } catch (e) {
- console.error('V5 Caught error' + e + e.stack);
- }
}
+ }
- try {
- NVG.beginFrame(sw, sh);
- if (this.STATS_HUD) this.drawStatsHud();
- } catch (e) {
- console.error('V5 Caught error' + e + e.stack);
- } finally {
- try {
- NVG.endFrame();
- } catch (e) {
- console.error('V5 Caught error' + e + e.stack);
- }
- }
+ renderStatsOverlay() {
+ const frame = this.prepareOverlay(this.STATS_HUD, this.recalcStatsBounds);
+ if (!frame) return;
+ this.drawInFrame(frame.sw, frame.sh, this.drawStatsHud);
}
}
diff --git a/modules/visuals/ProfileHider.js b/modules/visuals/ProfileHider.js
index 14272df8..049b1d2f 100644
--- a/modules/visuals/ProfileHider.js
+++ b/modules/visuals/ProfileHider.js
@@ -26,7 +26,7 @@ class ProfileHider extends ModuleBase {
const username = Player.getName();
const rawCustomInput = this.USERNAME?.trim() || this.defaultName || 'Failed to get username';
- const Text = net.minecraft.text.Text;
+ const Text = net.minecraft.network.chat.Component;
const newComponent = Text.empty();
const getReplacement = () => {
@@ -64,13 +64,13 @@ class ProfileHider extends ModuleBase {
newComponent.append(Text.literal(content).setStyle(style));
}
return java.util.Optional.empty();
- }, net.minecraft.text.Style.EMPTY);
+ }, net.minecraft.network.chat.Style.EMPTY);
return newComponent;
}
chroma(text) {
- const Text = net.minecraft.text.Text;
+ const Text = net.minecraft.network.chat.Component;
const mutableText = Text.empty();
const speed = 2000;
const offset = 100;
diff --git a/modules/visuals/StructureESP.js b/modules/visuals/StructureESP.js
index 85fb24dd..79057e57 100644
--- a/modules/visuals/StructureESP.js
+++ b/modules/visuals/StructureESP.js
@@ -1,7 +1,7 @@
import { isDeveloperModeEnabled } from '../../utils/DeveloperModeState';
import { Vec3d } from '../../utils/Constants';
import { ModuleBase } from '../../utils/ModuleBase';
-import { BlockUpdateS2C, ChunkDataS2C } from '../../utils/Packets';
+import { ClientboundBlockUpdatePacket, ClientboundLevelChunkWithLightPacket } from '../../utils/Packets';
import { manager } from '../../utils/SkyblockEvents';
class StructureESP extends ModuleBase {
@@ -13,20 +13,20 @@ class StructureESP extends ModuleBase {
});
this.on('packetReceived', (packet) => {
- const cx = packet?.getChunkX();
- const cz = packet?.getChunkZ();
+ const cx = packet?.getX();
+ const cz = packet?.getZ();
if (typeof cx !== 'number' || typeof cz !== 'number') return;
setTimeout(() => {
if (!this.enabled) return;
StructureFinder.submitChunkScan(cx, cz);
}, 50);
- }).setFilteredClass(ChunkDataS2C);
+ }).setFilteredClass(ClientboundLevelChunkWithLightPacket);
this.on('packetReceived', (packet) => {
const pos = packet?.getPos();
if (!pos) return;
StructureFinder.submitBlockUpdate(pos.getX(), pos.getY(), pos.getZ());
- }).setFilteredClass(BlockUpdateS2C);
+ }).setFilteredClass(ClientboundBlockUpdatePacket);
this.on('postRenderWorld', () => {
this.render();
diff --git a/modules/visuals/Xray.js b/modules/visuals/Xray.js
deleted file mode 100644
index 74c70062..00000000
--- a/modules/visuals/Xray.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import { isDeveloperModeEnabled } from '../../utils/DeveloperModeState';
-import { getSetting } from '../../gui/GuiSave';
-import { ModuleBase } from '../../utils/ModuleBase';
-import { ScheduleTask } from '../../utils/ScheduleTask';
-
-class Xray extends ModuleBase {
- constructor() {
- super({
- name: 'Xray',
- subcategory: 'Visuals',
- description: 'See through walls - Sodium and Iris will break Xray',
- tooltip: 'See through walls client-side.',
- theme: '#94a2bb',
- showEnabledToggle: false,
- });
-
- this.bindToggleKey();
-
- this.firstTransparency = getSetting('Xray', 'Transparency');
-
- this.addSlider('Transparency', 0, 100, 50, null, 'Transparency of Xray.');
-
- this.on('step', () => {
- const transparency = getSetting('Xray', 'Transparency');
- if (transparency !== this.firstTransparency) {
- XrayPackage.setAlpha(this.percentToAlpha(transparency));
- ScheduleTask(0, () => {
- Client.getMinecraft().worldRenderer.reload();
- });
- this.firstTransparency = transparency;
- }
- }).setFps(5);
- }
-
- percentToAlpha(percent) {
- const reversed = 100 - percent;
- return Math.round((reversed * 255) / 100);
- }
-
- onEnable() {
- this.message('&aEnabled');
-
- ScheduleTask(0, () => {
- XrayPackage.setEnabled();
- const transparency = getSetting('Xray', 'Transparency');
- XrayPackage.setAlpha(this.percentToAlpha(transparency));
- this.firstTransparency = transparency;
- });
- }
-
- onDisable() {
- this.message('&cDisabled');
-
- ScheduleTask(0, () => {
- XrayPackage.setDisabled();
- });
- }
-}
-
-if (isDeveloperModeEnabled()) new Xray();
diff --git a/utils/Clipping.js b/utils/Clipping.js
index d72c3517..600acc94 100644
--- a/utils/Clipping.js
+++ b/utils/Clipping.js
@@ -125,8 +125,8 @@ class ClippingManager extends ModuleBase {
if (!this.isRecording || !this.process) return;
const window = Client.getMinecraft().getWindow();
- const w = window.getFramebufferWidth();
- const h = window.getFramebufferHeight();
+ const w = window.getWidth();
+ const h = window.getHeight();
if (this.lastW && (this.lastW !== w || this.lastH !== h)) {
this.stopRecording(false, true, true);
@@ -394,7 +394,7 @@ class ClippingManager extends ModuleBase {
getWindowTitle() {
let mcClass = Client.getMinecraft().getClass();
- let method = mcClass.getDeclaredMethod('method_24287'); // getWindowTitle()
+ let method = mcClass.getDeclaredMethod('createTitle'); // mojmap: createTitle
method.setAccessible(true);
return method.invoke(Client.getMinecraft());
@@ -435,8 +435,8 @@ class ClippingManager extends ModuleBase {
if (this.process && this.process.isAlive()) return;
const window = Client.getMinecraft().getWindow();
- const width = window.getFramebufferWidth();
- const height = window.getFramebufferHeight();
+ const width = window.getWidth();
+ const height = window.getHeight();
this.lastFrameTime = 0;
const sessionId = Date.now();
diff --git a/utils/Constants.js b/utils/Constants.js
index 35c1c739..fcfa0c1f 100644
--- a/utils/Constants.js
+++ b/utils/Constants.js
@@ -1,6 +1,6 @@
export const SharedConstants = net.minecraft.SharedConstants;
-export const MinecraftClient = net.minecraft.client.MinecraftClient;
-export const MCHand = net.minecraft.util.Hand;
+export const MinecraftClient = net.minecraft.client.Minecraft;
+export const MCHand = net.minecraft.world.InteractionHand;
export const CLIENT_VERSION = '1.0.0';
@@ -48,32 +48,29 @@ export const FFMPEG_URLS = {
MAC_BINARY: 'https://evermeet.cx/ffmpeg/ffmpeg-8.0.1',
};
-export const BP = net.minecraft.util.math.BlockPos;
-export const Vec3d = net.minecraft.util.math.Vec3d;
-export const Direction = net.minecraft.util.math.Direction;
-export const BlockHitResult = net.minecraft.util.hit.BlockHitResult;
-export const VoxelShapes = net.minecraft.util.shape.VoxelShapes;
-export const Blocks = net.minecraft.block.Blocks;
-export const BlockStone = net.minecraft.block.BlockStone;
-export const BlockOre = net.minecraft.block.BlockOre;
-export const BlockRedstoneOre = net.minecraft.block.BlockRedstoneOre;
-export const SnowBlock = net.minecraft.block.SnowBlock;
-export const StainedGlassPaneBlock = net.minecraft.block.StainedGlassPaneBlock;
-export const ArmorStandEntity = net.minecraft.entity.decoration.ArmorStandEntity;
-export const ZombieEntity = net.minecraft.entity.mob.ZombieEntity;
-export const EndermanEntity = net.minecraft.entity.mob.EndermanEntity;
-export const BatEntity = net.minecraft.entity.passive.BatEntity;
+export const BP = net.minecraft.core.BlockPos;
+export const Vec3d = net.minecraft.world.phys.Vec3;
+export const Direction = net.minecraft.core.Direction;
+export const BlockHitResult = net.minecraft.world.phys.BlockHitResult;
+export const VoxelShapes = net.minecraft.world.phys.shapes.Shapes;
+export const Blocks = net.minecraft.world.level.block.Blocks;
+export const SnowBlock = net.minecraft.world.level.block.SnowLayerBlock;
+export const StainedGlassPaneBlock = net.minecraft.world.level.block.StainedGlassPaneBlock;
+export const ArmorStandEntity = net.minecraft.world.entity.decoration.ArmorStand;
+export const ZombieEntity = net.minecraft.world.entity.monster.zombie.Zombie;
+export const EndermanEntity = net.minecraft.world.entity.monster.EnderMan;
+export const BatEntity = net.minecraft.world.entity.ambient.Bat;
export const PortalParticle = net.minecraft.client.particle.PortalParticle; // pls rename to the correct name idk what it is
-export const MinecraftText = net.minecraft.text.Text;
-export const Formatting = net.minecraft.util.Formatting;
-export const SoundCategory = net.minecraft.sound.SoundCategory;
-export const Identifier = net.minecraft.util.Identifier;
-export const SoundEvent = net.minecraft.sound.SoundEvent;
-export const NativeImage = net.minecraft.client.texture.NativeImage;
+export const MinecraftText = net.minecraft.network.chat.Component;
+export const Formatting = net.minecraft.ChatFormatting;
+export const SoundCategory = net.minecraft.sounds.SoundSource;
+export const Identifier = net.minecraft.resources.Identifier;
+export const SoundEvent = net.minecraft.sounds.SoundEvent;
+export const NativeImage = com.mojang.blaze3d.platform.NativeImage;
export const Transferable = java.awt.datatransfer.Transferable;
export const Consumer = java.util.function.Consumer;
-export const ScreenshotRecorder = net.minecraft.client.util.ScreenshotRecorder;
+export const ScreenshotRecorder = net.minecraft.client.Screenshot;
export const ImageIO = Java.type('javax.imageio.ImageIO');
export const BufferedImage = Java.type('java.awt.image.BufferedImage');
diff --git a/utils/Flowstate.js b/utils/Flowstate.js
index 6c7efb4d..48192d8c 100644
--- a/utils/Flowstate.js
+++ b/utils/Flowstate.js
@@ -1,5 +1,5 @@
import { Chat } from './Chat';
-import { BlockUpdateS2C } from './Packets';
+import { ClientboundBlockUpdatePacket } from './Packets';
class FlowstateUtilsClass {
constructor() {
@@ -42,7 +42,7 @@ class FlowstateUtilsClass {
packet?.getPos()?.getX() == this.block.x &&
packet?.getPos()?.getY() == this.block.y &&
packet?.getPos()?.getZ() == this.block.z &&
- (packet?.getState()?.getBlock()?.toString()?.includes('bedrock') || packet?.getState()?.getBlock()?.toString()?.includes('air'))
+ (packet?.getBlockState()?.getBlock()?.toString()?.includes('bedrock') || packet?.getBlockState()?.getBlock()?.toString()?.includes('air'))
) {
this.flowstateBlocksBroken += bonus;
this.countdown = 10;
@@ -61,7 +61,7 @@ class FlowstateUtilsClass {
Chat.message(`Current Flowstate: ${rounded}`);
}
}
- }).setFilteredClass(BlockUpdateS2C);
+ }).setFilteredClass(ClientboundBlockUpdatePacket);
register('step', () => {
if (this.countdown === 0) {
diff --git a/utils/Math.js b/utils/Math.js
index d536ecf9..5ebdded1 100644
--- a/utils/Math.js
+++ b/utils/Math.js
@@ -41,7 +41,7 @@ class DistanceCalculator {
}
const vec = Utils.convertToVector(input);
if (!vec) return null;
- return new Point3D(vec.x ?? vec.getX(), vec.y ?? vec.getY(), vec.z ?? vec.getZ());
+ return new Point3D(vec.x(), vec.y(), vec.z());
}
getPlayerPos() {
@@ -50,9 +50,9 @@ class DistanceCalculator {
}
getPlayerEyes() {
- const eyePos = Player.getPlayer()?.getEyePos();
+ const eyePos = Player.getPlayer()?.getEyePosition();
if (!eyePos) return null;
- return new Point3D(eyePos.x, eyePos.y, eyePos.z);
+ return new Point3D(eyePos.x(), eyePos.y(), eyePos.z());
}
computeDistance(p1, p2) {
@@ -83,12 +83,12 @@ class AngleCalculator {
calculateRelativeAngles(targetVec) {
if (!targetVec) return { yaw: 0, pitch: 0 };
- const eyes = Player.getPlayer()?.getEyePos();
+ const eyes = Player.getPlayer()?.getEyePosition();
if (!eyes) return { yaw: 0, pitch: 0 };
- const dx = targetVec.x - eyes.x;
- const dy = targetVec.y - eyes.y;
- const dz = targetVec.z - eyes.z;
+ const dx = targetVec.x - eyes.x();
+ const dy = targetVec.y - eyes.y();
+ const dz = targetVec.z - eyes.z();
const horizontalDist = Math.hypot(dx, dz);
@@ -103,12 +103,12 @@ class AngleCalculator {
calculateAbsoluteAngles(targetVec) {
if (!targetVec) return { yaw: 0, pitch: 0 };
- const eyes = Player.getPlayer()?.getEyePos();
+ const eyes = Player.getPlayer()?.getEyePosition();
if (!eyes) return { yaw: 0, pitch: 0 };
- const dx = targetVec.x - eyes.x;
- const dy = targetVec.y - eyes.y;
- const dz = targetVec.z - eyes.z;
+ const dx = targetVec.x - eyes.x();
+ const dy = targetVec.y - eyes.y();
+ const dz = targetVec.z - eyes.z();
const horizontalDist = Math.hypot(dx, dz);
diff --git a/utils/MiningUtils.js b/utils/MiningUtils.js
index bdf9bbe9..ad39177e 100644
--- a/utils/MiningUtils.js
+++ b/utils/MiningUtils.js
@@ -600,7 +600,7 @@ class RefuelService {
break;
case this.STATES.OPEN_PLAYER_INV_SWAP:
- Client.getMinecraft().setScreen(new net.minecraft.client.gui.screen.ingame.InventoryScreen(Client.getMinecraft().player));
+ Client.getMinecraft().setScreen(new net.minecraft.client.gui.screens.inventory.InventoryScreen(Client.getMinecraft().player));
// someone fix this fucking shit. i forgot how to open inventory so this is bandaid
this.setState(this.STATES.WAIT_PLAYER_INV_SWAP, 5);
break;
@@ -741,7 +741,7 @@ class RefuelService {
break;
case this.STATES.OPEN_PLAYER_INV_RESTORE:
- Client.getMinecraft().setScreen(new net.minecraft.client.gui.screen.ingame.InventoryScreen(Client.getMinecraft().player));
+ Client.getMinecraft().setScreen(new net.minecraft.client.gui.screens.inventory.InventoryScreen(Client.getMinecraft().player));
this.setState(this.STATES.WAIT_PLAYER_INV_RESTORE, 5);
break;
@@ -1002,7 +1002,7 @@ class BlockUtils {
if (x === null || y === null || z === null) return;
let blockPos = new BP(x, y, z);
- Client.getMinecraft().world.setBlockState(blockPos, Blocks.AIR.getDefaultState());
+ Client.getMinecraft().level.setBlockAndUpdate(blockPos, Blocks.AIR.defaultBlockState());
} catch (e) {
Chat.message('error setting ghost block');
console.error('V5 Caught error' + e + e.stack);
diff --git a/utils/Misc.js b/utils/Misc.js
index f7467a74..f1192f13 100644
--- a/utils/Misc.js
+++ b/utils/Misc.js
@@ -51,6 +51,7 @@ v5Command(
let loadedClass = null;
try {
+ // TODO: resolve fullClassPath callers explicitly if dynamic packet loading needs Mojmap-specific handling.
loadedClass = Java.type(fullClassPath);
} catch (e) {
return Chat.message('Packet not found');
diff --git a/utils/NukerUtils.js b/utils/NukerUtils.js
index a41715a6..7ab30939 100644
--- a/utils/NukerUtils.js
+++ b/utils/NukerUtils.js
@@ -1,7 +1,7 @@
import { BP, Direction, MCHand, Vec3d } from './Constants';
import { MathUtils } from './Math';
import { Mixin } from './MixinManager';
-import { HandSwingC2S, PlayerActionC2S, PlayerActionC2SAction } from './Packets';
+import { ServerboundSwingPacket, ServerboundPlayerActionPacket, ServerboundPlayerActionPacket$Action } from './Packets';
import { ScheduleTask } from './ScheduleTask';
class NukerUtilsClass {
@@ -29,7 +29,7 @@ class NukerUtilsClass {
this.processNextQueuedAction();
} else if (this.tickCounter > 0) {
this.tickCounter--;
- Client.sendPacket(new HandSwingC2S(MCHand.MAIN_HAND));
+ Client.sendPacket(new ServerboundSwingPacket(MCHand.MAIN_HAND));
}
});
}
@@ -51,8 +51,8 @@ class NukerUtilsClass {
}
sendBreakPackets(blockPos, facing) {
- Client.sendSequencedPacket((sequence) => new PlayerActionC2S(PlayerActionC2SAction.START_DESTROY_BLOCK, blockPos, facing, sequence));
- Client.sendPacket(new HandSwingC2S(MCHand.MAIN_HAND));
+ Client.sendSequencedPacket((sequence) => new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket$Action.START_DESTROY_BLOCK, blockPos, facing, sequence));
+ Client.sendPacket(new ServerboundSwingPacket(MCHand.MAIN_HAND));
}
nukeQueueAdd(blockPos, ticks) {
@@ -96,19 +96,19 @@ class NukerUtilsClass {
const blockPosition = this.createBlockPosition(blockPos);
const facing = this.closestDirection(blockPosition);
- Client.sendSequencedPacket((sequence) => new PlayerActionC2S(PlayerActionC2SAction.START_DESTROY_BLOCK, blockPosition, facing, sequence));
+ Client.sendSequencedPacket((sequence) => new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket$Action.START_DESTROY_BLOCK, blockPosition, facing, sequence));
this.currentBreakingBlockPos = blockPos;
}
isBlockInRange(blockPos) {
- const eyePos = Player.getPlayer()?.getEyePos();
+ const eyePos = Player.getPlayer()?.getEyePosition();
if (!eyePos) return false;
- const clampedX = Math.max(blockPos[0], Math.min(eyePos.x, blockPos[0] + 1));
- const clampedY = Math.max(blockPos[1], Math.min(eyePos.y, blockPos[1] + 1));
- const clampedZ = Math.max(blockPos[2], Math.min(eyePos.z, blockPos[2] + 1));
- const { distance } = MathUtils.calculateDistance([eyePos.x, eyePos.y, eyePos.z], [clampedX, clampedY, clampedZ]);
+ const clampedX = Math.max(blockPos[0], Math.min(eyePos.x(), blockPos[0] + 1));
+ const clampedY = Math.max(blockPos[1], Math.min(eyePos.y(), blockPos[1] + 1));
+ const clampedZ = Math.max(blockPos[2], Math.min(eyePos.z(), blockPos[2] + 1));
+ const { distance } = MathUtils.calculateDistance([eyePos.x(), eyePos.y(), eyePos.z()], [clampedX, clampedY, clampedZ]);
return distance <= NukerUtilsClass.MAX_REACH_DISTANCE;
}
@@ -120,7 +120,7 @@ class NukerUtilsClass {
const player = Player.getPlayer();
if (!player) return Direction.UP;
- const playerEyePos = player.getEyePos();
+ const playerEyePos = player.getEyePosition();
if (!playerEyePos) return Direction.UP;
const faces = [Direction.UP, Direction.DOWN, Direction.NORTH, Direction.SOUTH, Direction.EAST, Direction.WEST];
diff --git a/utils/Packets.js b/utils/Packets.js
index 6b052db4..0964bf6e 100644
--- a/utils/Packets.js
+++ b/utils/Packets.js
@@ -1,215 +1,202 @@
// client to server
-export const AcceptCodeOfConductC2S = net.minecraft.network.packet.c2s.config.AcceptCodeOfConductC2SPacket;
-export const AcknowledgeChunksC2S = net.minecraft.network.packet.c2s.play.AcknowledgeChunksC2SPacket;
-export const AcknowledgeReconfigurationC2S = net.minecraft.network.packet.c2s.play.AcknowledgeReconfigurationC2SPacket;
-export const AdvancementTabC2S = net.minecraft.network.packet.c2s.play.AdvancementTabC2SPacket;
-export const BoatPaddleStateC2S = net.minecraft.network.packet.c2s.play.BoatPaddleStateC2SPacket;
-export const BookUpdateC2S = net.minecraft.network.packet.c2s.play.BookUpdateC2SPacket;
-export const BundleItemSelectedC2S = net.minecraft.network.packet.c2s.play.BundleItemSelectedC2SPacket;
-export const ButtonClickC2S = net.minecraft.network.packet.c2s.play.ButtonClickC2SPacket;
-export const ChangeGameModeC2S = net.minecraft.network.packet.c2s.play.ChangeGameModeC2SPacket;
-export const ChatCommandSignedC2S = net.minecraft.network.packet.c2s.play.ChatCommandSignedC2SPacket;
-export const ChatMessageC2S = net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
-export const ClickSlotC2S = net.minecraft.network.packet.c2s.play.ClickSlotC2SPacket;
-export const ScreenHandlerSlotUpdateS2C = net.minecraft.network.packet.s2c.play.ScreenHandlerSlotUpdateS2CPacket;
-export const ClientCommandC2S = net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket;
-export const ClientOptionsC2S = net.minecraft.network.packet.c2s.common.ClientOptionsC2SPacket;
-export const ClientStatusC2S = net.minecraft.network.packet.c2s.play.ClientStatusC2SPacket;
-export const ClientTickEndC2S = net.minecraft.network.packet.c2s.play.ClientTickEndC2SPacket;
-export const CloseHandledScreenC2S = net.minecraft.network.packet.c2s.play.CloseHandledScreenC2SPacket;
-export const CommandExecutionC2S = net.minecraft.network.packet.c2s.play.CommandExecutionC2SPacket;
-export const CommonPongC2S = net.minecraft.network.packet.c2s.common.CommonPongC2SPacket;
-export const CookieResponseC2S = net.minecraft.network.packet.c2s.common.CookieResponseC2SPacket;
-export const CraftRequestC2S = net.minecraft.network.packet.c2s.play.CraftRequestC2SPacket;
-export const CreativeInventoryActionC2S = net.minecraft.network.packet.c2s.play.CreativeInventoryActionC2SPacket;
-export const CustomClickActionC2S = net.minecraft.network.packet.c2s.common.CustomClickActionC2SPacket;
-export const CustomPayloadC2S = net.minecraft.network.packet.c2s.common.CustomPayloadC2SPacket;
-export const DebugSubscriptionRequestC2S = net.minecraft.network.packet.c2s.play.DebugSubscriptionRequestC2SPacket;
-export const EnterConfigurationC2S = net.minecraft.network.packet.c2s.login.EnterConfigurationC2SPacket;
-export const HandSwingC2S = net.minecraft.network.packet.c2s.play.HandSwingC2SPacket;
-export const HandshakeC2S = net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
-export const JigsawGeneratingC2S = net.minecraft.network.packet.c2s.play.JigsawGeneratingC2SPacket;
-export const KeepAliveC2S = net.minecraft.network.packet.c2s.common.KeepAliveC2SPacket;
-export const LoginHelloC2S = net.minecraft.network.packet.c2s.login.LoginHelloC2SPacket;
-export const LoginKeyC2S = net.minecraft.network.packet.c2s.login.LoginKeyC2SPacket;
-export const LoginQueryResponseC2S = net.minecraft.network.packet.c2s.login.LoginQueryResponseC2SPacket;
-export const MessageAcknowledgmentC2S = net.minecraft.network.packet.c2s.play.MessageAcknowledgmentC2SPacket;
-export const PickItemFromBlockC2S = net.minecraft.network.packet.c2s.play.PickItemFromBlockC2SPacket;
-export const PickItemFromEntityC2S = net.minecraft.network.packet.c2s.play.PickItemFromEntityC2SPacket;
-export const PlayerActionC2S = net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
-export const PlayerInputC2S = net.minecraft.network.packet.c2s.play.PlayerInputC2SPacket;
-export const PlayerInteractBlockC2S = net.minecraft.network.packet.c2s.play.PlayerInteractBlockC2SPacket;
-export const PlayerInteractEntityC2S = net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket;
-export const PlayerInteractItemC2S = net.minecraft.network.packet.c2s.play.PlayerInteractItemC2SPacket;
-export const PlayerLoadedC2S = net.minecraft.network.packet.c2s.play.PlayerLoadedC2SPacket;
-export const PlayerMoveC2S = net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
-//export const PlayerMoveFullC2S = net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket.Full;
-//export const PlayerMoveLookAndOnGroundC2S = net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket.LookAndOnGround;
-//export const PlayerMoveOnGroundOnlyC2S = net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket.OnGroundOnly;
-//export const PlayerMovePositionAndOnGroundC2S = net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket.PositionAndOnGround;
-export const PlayerSessionC2S = net.minecraft.network.packet.c2s.play.PlayerSessionC2SPacket;
-export const PlayerActionC2SAction = net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket$Action;
-export const QueryBlockNbtC2S = net.minecraft.network.packet.c2s.play.QueryBlockNbtC2SPacket;
-export const QueryEntityNbtC2S = net.minecraft.network.packet.c2s.play.QueryEntityNbtC2SPacket;
-export const QueryPingC2S = net.minecraft.network.packet.c2s.query.QueryPingC2SPacket;
-export const QueryRequestC2S = net.minecraft.network.packet.c2s.query.QueryRequestC2SPacket;
-export const ReadyC2S = net.minecraft.network.packet.c2s.config.ReadyC2SPacket;
-export const RecipeBookDataC2S = net.minecraft.network.packet.c2s.play.RecipeBookDataC2SPacket;
-export const RecipeCategoryOptionsC2S = net.minecraft.network.packet.c2s.play.RecipeCategoryOptionsC2SPacket;
-export const RenameItemC2S = net.minecraft.network.packet.c2s.play.RenameItemC2SPacket;
-export const RequestCommandCompletionsC2S = net.minecraft.network.packet.c2s.play.RequestCommandCompletionsC2SPacket;
-export const ResourcePackStatusC2S = net.minecraft.network.packet.c2s.common.ResourcePackStatusC2SPacket;
-export const SelectKnownPacksC2S = net.minecraft.network.packet.c2s.config.SelectKnownPacksC2SPacket;
-export const SelectMerchantTradeC2S = net.minecraft.network.packet.c2s.play.SelectMerchantTradeC2SPacket;
-export const SetTestBlockC2S = net.minecraft.network.packet.c2s.play.SetTestBlockC2SPacket;
-export const SlotChangedStateC2S = net.minecraft.network.packet.c2s.play.SlotChangedStateC2SPacket;
-export const SpectatorTeleportC2S = net.minecraft.network.packet.c2s.play.SpectatorTeleportC2SPacket;
-export const TeleportConfirmC2S = net.minecraft.network.packet.c2s.play.TeleportConfirmC2SPacket;
-export const TestInstanceBlockActionC2S = net.minecraft.network.packet.c2s.play.TestInstanceBlockActionC2SPacket;
-export const UpdateBeaconC2S = net.minecraft.network.packet.c2s.play.UpdateBeaconC2SPacket;
-export const UpdateCommandBlockC2S = net.minecraft.network.packet.c2s.play.UpdateCommandBlockC2SPacket;
-export const UpdateCommandBlockMinecartC2S = net.minecraft.network.packet.c2s.play.UpdateCommandBlockMinecartC2SPacket;
-export const UpdateDifficultyC2S = net.minecraft.network.packet.c2s.play.UpdateDifficultyC2SPacket;
-export const UpdateDifficultyLockC2S = net.minecraft.network.packet.c2s.play.UpdateDifficultyLockC2SPacket;
-export const UpdateJigsawC2S = net.minecraft.network.packet.c2s.play.UpdateJigsawC2SPacket;
-export const UpdatePlayerAbilitiesC2S = net.minecraft.network.packet.c2s.play.UpdatePlayerAbilitiesC2SPacket;
-export const UpdateSelectedSlotC2S = net.minecraft.network.packet.c2s.play.UpdateSelectedSlotC2SPacket;
-export const UpdateSignC2S = net.minecraft.network.packet.c2s.play.UpdateSignC2SPacket;
-export const UpdateStructureBlockC2S = net.minecraft.network.packet.c2s.play.UpdateStructureBlockC2SPacket;
-export const VehicleMoveC2S = net.minecraft.network.packet.c2s.play.VehicleMoveC2SPacket;
+export const ServerboundAcceptCodeOfConductPacket = net.minecraft.network.protocol.configuration.ServerboundAcceptCodeOfConductPacket;
+export const ServerboundChunkBatchReceivedPacket = net.minecraft.network.protocol.game.ServerboundChunkBatchReceivedPacket;
+export const ServerboundConfigurationAcknowledgedPacket = net.minecraft.network.protocol.game.ServerboundConfigurationAcknowledgedPacket;
+export const ServerboundSeenAdvancementsPacket = net.minecraft.network.protocol.game.ServerboundSeenAdvancementsPacket;
+export const ServerboundPaddleBoatPacket = net.minecraft.network.protocol.game.ServerboundPaddleBoatPacket;
+export const ServerboundEditBookPacket = net.minecraft.network.protocol.game.ServerboundEditBookPacket;
+export const ServerboundSelectBundleItemPacket = net.minecraft.network.protocol.game.ServerboundSelectBundleItemPacket;
+export const ServerboundContainerButtonClickPacket = net.minecraft.network.protocol.game.ServerboundContainerButtonClickPacket;
+export const ServerboundChangeGameModePacket = net.minecraft.network.protocol.game.ServerboundChangeGameModePacket;
+export const ServerboundChatCommandSignedPacket = net.minecraft.network.protocol.game.ServerboundChatCommandSignedPacket;
+export const ServerboundChatPacket = net.minecraft.network.protocol.game.ServerboundChatPacket;
+export const ServerboundContainerClickPacket = net.minecraft.network.protocol.game.ServerboundContainerClickPacket;
+export const ClientboundContainerSetSlotPacket = net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket;
+export const ServerboundPlayerCommandPacket = net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket;
+export const ServerboundClientInformationPacket = net.minecraft.network.protocol.common.ServerboundClientInformationPacket;
+export const ServerboundClientCommandPacket = net.minecraft.network.protocol.game.ServerboundClientCommandPacket;
+export const ServerboundClientTickEndPacket = net.minecraft.network.protocol.game.ServerboundClientTickEndPacket;
+export const ServerboundContainerClosePacket = net.minecraft.network.protocol.game.ServerboundContainerClosePacket;
+export const ServerboundChatCommandPacket = net.minecraft.network.protocol.game.ServerboundChatCommandPacket;
+export const ServerboundPongPacket = net.minecraft.network.protocol.common.ServerboundPongPacket;
+export const ServerboundCookieResponsePacket = net.minecraft.network.protocol.cookie.ServerboundCookieResponsePacket;
+export const ServerboundPlaceRecipePacket = net.minecraft.network.protocol.game.ServerboundPlaceRecipePacket;
+export const ServerboundSetCreativeModeSlotPacket = net.minecraft.network.protocol.game.ServerboundSetCreativeModeSlotPacket;
+export const ServerboundCustomClickActionPacket = net.minecraft.network.protocol.common.ServerboundCustomClickActionPacket;
+export const ServerboundCustomPayloadPacket = net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
+export const ServerboundDebugSubscriptionRequestPacket = net.minecraft.network.protocol.game.ServerboundDebugSubscriptionRequestPacket;
+export const ServerboundLoginAcknowledgedPacket = net.minecraft.network.protocol.login.ServerboundLoginAcknowledgedPacket;
+export const ServerboundSwingPacket = net.minecraft.network.protocol.game.ServerboundSwingPacket;
+export const ClientIntentionPacket = net.minecraft.network.protocol.handshake.ClientIntentionPacket;
+export const ServerboundJigsawGeneratePacket = net.minecraft.network.protocol.game.ServerboundJigsawGeneratePacket;
+export const ServerboundKeepAlivePacket = net.minecraft.network.protocol.common.ServerboundKeepAlivePacket;
+export const ServerboundHelloPacket = net.minecraft.network.protocol.login.ServerboundHelloPacket;
+export const ServerboundKeyPacket = net.minecraft.network.protocol.login.ServerboundKeyPacket;
+export const ServerboundCustomQueryAnswerPacket = net.minecraft.network.protocol.login.ServerboundCustomQueryAnswerPacket;
+export const ServerboundChatAckPacket = net.minecraft.network.protocol.game.ServerboundChatAckPacket;
+export const ServerboundPickItemFromBlockPacket = net.minecraft.network.protocol.game.ServerboundPickItemFromBlockPacket;
+export const ServerboundPickItemFromEntityPacket = net.minecraft.network.protocol.game.ServerboundPickItemFromEntityPacket;
+export const ServerboundPlayerActionPacket = net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
+export const ServerboundPlayerInputPacket = net.minecraft.network.protocol.game.ServerboundPlayerInputPacket;
+export const ServerboundUseItemOnPacket = net.minecraft.network.protocol.game.ServerboundUseItemOnPacket;
+export const ServerboundInteractPacket = net.minecraft.network.protocol.game.ServerboundInteractPacket;
+export const ServerboundUseItemPacket = net.minecraft.network.protocol.game.ServerboundUseItemPacket;
+export const ServerboundPlayerLoadedPacket = net.minecraft.network.protocol.game.ServerboundPlayerLoadedPacket;
+export const ServerboundMovePlayerPacket = net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
+export const ServerboundChatSessionUpdatePacket = net.minecraft.network.protocol.game.ServerboundChatSessionUpdatePacket;
+export const ServerboundPlayerActionPacket$Action = net.minecraft.network.protocol.game.ServerboundPlayerActionPacket$Action;
+export const ServerboundBlockEntityTagQueryPacket = net.minecraft.network.protocol.game.ServerboundBlockEntityTagQueryPacket;
+export const ServerboundEntityTagQueryPacket = net.minecraft.network.protocol.game.ServerboundEntityTagQueryPacket;
+export const ServerboundPingRequestPacket = net.minecraft.network.protocol.ping.ServerboundPingRequestPacket;
+export const ServerboundStatusRequestPacket = net.minecraft.network.protocol.status.ServerboundStatusRequestPacket;
+export const ServerboundFinishConfigurationPacket = net.minecraft.network.protocol.configuration.ServerboundFinishConfigurationPacket;
+export const ServerboundRecipeBookSeenRecipePacket = net.minecraft.network.protocol.game.ServerboundRecipeBookSeenRecipePacket;
+export const ServerboundRecipeBookChangeSettingsPacket = net.minecraft.network.protocol.game.ServerboundRecipeBookChangeSettingsPacket;
+export const ServerboundRenameItemPacket = net.minecraft.network.protocol.game.ServerboundRenameItemPacket;
+export const ServerboundCommandSuggestionPacket = net.minecraft.network.protocol.game.ServerboundCommandSuggestionPacket;
+export const ServerboundResourcePackPacket = net.minecraft.network.protocol.common.ServerboundResourcePackPacket;
+export const ServerboundSelectKnownPacks = net.minecraft.network.protocol.configuration.ServerboundSelectKnownPacks;
+export const ServerboundSelectTradePacket = net.minecraft.network.protocol.game.ServerboundSelectTradePacket;
+export const ServerboundSetTestBlockPacket = net.minecraft.network.protocol.game.ServerboundSetTestBlockPacket;
+export const ServerboundContainerSlotStateChangedPacket = net.minecraft.network.protocol.game.ServerboundContainerSlotStateChangedPacket;
+export const ServerboundTeleportToEntityPacket = net.minecraft.network.protocol.game.ServerboundTeleportToEntityPacket;
+export const ServerboundAcceptTeleportationPacket = net.minecraft.network.protocol.game.ServerboundAcceptTeleportationPacket;
+export const ServerboundTestInstanceBlockActionPacket = net.minecraft.network.protocol.game.ServerboundTestInstanceBlockActionPacket;
+export const ServerboundSetBeaconPacket = net.minecraft.network.protocol.game.ServerboundSetBeaconPacket;
+export const ServerboundSetCommandBlockPacket = net.minecraft.network.protocol.game.ServerboundSetCommandBlockPacket;
+export const ServerboundSetCommandMinecartPacket = net.minecraft.network.protocol.game.ServerboundSetCommandMinecartPacket;
+export const ServerboundChangeDifficultyPacket = net.minecraft.network.protocol.game.ServerboundChangeDifficultyPacket;
+export const ServerboundLockDifficultyPacket = net.minecraft.network.protocol.game.ServerboundLockDifficultyPacket;
+export const ServerboundSetJigsawBlockPacket = net.minecraft.network.protocol.game.ServerboundSetJigsawBlockPacket;
+export const ServerboundPlayerAbilitiesPacket = net.minecraft.network.protocol.game.ServerboundPlayerAbilitiesPacket;
+export const ServerboundSetCarriedItemPacket = net.minecraft.network.protocol.game.ServerboundSetCarriedItemPacket;
+export const ServerboundSignUpdatePacket = net.minecraft.network.protocol.game.ServerboundSignUpdatePacket;
+export const ServerboundSetStructureBlockPacket = net.minecraft.network.protocol.game.ServerboundSetStructureBlockPacket;
+export const ServerboundMoveVehiclePacket = net.minecraft.network.protocol.game.ServerboundMoveVehiclePacket;
// server to client
-export const AdvancementUpdateS2C = net.minecraft.network.packet.s2c.play.AdvancementUpdateS2CPacket;
-export const BlockBreakingProgressS2C = net.minecraft.network.packet.s2c.play.BlockBreakingProgressS2CPacket;
-export const BlockEntityUpdateS2C = net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
-export const BlockEventS2C = net.minecraft.network.packet.s2c.play.BlockEventS2CPacket;
-export const BlockUpdateS2C = net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket;
-export const BlockValueDebugS2C = net.minecraft.network.packet.s2c.play.BlockValueDebugS2CPacket;
-export const BossBarS2C = net.minecraft.network.packet.s2c.play.BossBarS2CPacket;
-export const ChatMessageS2C = net.minecraft.network.packet.s2c.play.ChatMessageS2CPacket;
-export const ChatSuggestionsS2C = net.minecraft.network.packet.s2c.play.ChatSuggestionsS2CPacket;
-export const ChunkBiomeDataS2C = net.minecraft.network.packet.s2c.play.ChunkBiomeDataS2CPacket;
-export const ChunkDataS2C = net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket;
-export const ChunkDeltaUpdateS2C = net.minecraft.network.packet.s2c.play.ChunkDeltaUpdateS2CPacket;
-export const ChunkLoadDistanceS2C = net.minecraft.network.packet.s2c.play.ChunkLoadDistanceS2CPacket;
-export const ChunkRenderDistanceCenterS2C = net.minecraft.network.packet.s2c.play.ChunkRenderDistanceCenterS2CPacket;
-export const ChunkSentS2C = net.minecraft.network.packet.s2c.play.ChunkSentS2CPacket;
-export const ChunkValueDebugS2C = net.minecraft.network.packet.s2c.play.ChunkValueDebugS2CPacket;
-export const ClearDialogS2C = net.minecraft.network.packet.s2c.common.ClearDialogS2CPacket;
-export const ClearTitleS2C = net.minecraft.network.packet.s2c.play.ClearTitleS2CPacket;
-export const CloseScreenS2C = net.minecraft.network.packet.s2c.play.CloseScreenS2CPacket;
-export const CodeOfConductS2C = net.minecraft.network.packet.s2c.config.CodeOfConductS2CPacket;
-export const CommandSuggestionsS2C = net.minecraft.network.packet.s2c.play.CommandSuggestionsS2CPacket;
-export const CommandTreeS2C = net.minecraft.network.packet.s2c.play.CommandTreeS2CPacket;
-export const CommonPingS2C = net.minecraft.network.packet.s2c.common.CommonPingS2CPacket;
-export const CookieRequestS2C = net.minecraft.network.packet.s2c.common.CookieRequestS2CPacket;
-export const CooldownUpdateS2C = net.minecraft.network.packet.s2c.play.CooldownUpdateS2CPacket;
-export const CraftFailedResponseS2C = net.minecraft.network.packet.s2c.play.CraftFailedResponseS2CPacket;
-export const CustomPayloadS2C = net.minecraft.network.packet.s2c.common.CustomPayloadS2CPacket;
-export const CustomReportDetailsS2C = net.minecraft.network.packet.s2c.common.CustomReportDetailsS2CPacket;
-export const DamageTiltS2C = net.minecraft.network.packet.s2c.play.DamageTiltS2CPacket;
-export const DeathMessageS2C = net.minecraft.network.packet.s2c.play.DeathMessageS2CPacket;
-export const DebugSampleS2C = net.minecraft.network.packet.s2c.play.DebugSampleS2CPacket;
-export const DifficultyS2C = net.minecraft.network.packet.s2c.play.DifficultyS2CPacket;
-export const DisconnectS2C = net.minecraft.network.packet.s2c.common.DisconnectS2CPacket;
-export const DynamicRegistriesS2C = net.minecraft.network.packet.s2c.config.DynamicRegistriesS2CPacket;
-export const EndCombatS2C = net.minecraft.network.packet.s2c.play.EndCombatS2CPacket;
-export const EnterCombatS2C = net.minecraft.network.packet.s2c.play.EnterCombatS2CPacket;
-export const EnterConfigurationS2C = net.minecraft.network.packet.s2c.play.EnterConfigurationS2CPacket;
-export const EnterReconfigurationS2C = net.minecraft.network.packet.s2c.play.EnterReconfigurationS2CPacket;
-export const EntitiesDestroyS2C = net.minecraft.network.packet.s2c.play.EntitiesDestroyS2CPacket;
-export const EntityAnimationS2C = net.minecraft.network.packet.s2c.play.EntityAnimationS2CPacket;
-export const EntityAttachS2C = net.minecraft.network.packet.s2c.play.EntityAttachS2CPacket;
-export const EntityAttributesS2C = net.minecraft.network.packet.s2c.play.EntityAttributesS2CPacket;
-export const EntityDamageS2C = net.minecraft.network.packet.s2c.play.EntityDamageS2CPacket;
-export const EntityEquipmentUpdateS2C = net.minecraft.network.packet.s2c.play.EntityEquipmentUpdateS2CPacket;
-export const EntityPassengersSetS2C = net.minecraft.network.packet.s2c.play.EntityPassengersSetS2CPacket;
-export const EntityPositionS2C = net.minecraft.network.packet.s2c.play.EntityPositionS2CPacket;
-export const EntityS2C = net.minecraft.network.packet.s2c.play.EntityS2CPacket;
-//export const EntityS2C_MoveRelative = net.minecraft.network.packet.s2c.play.EntityS2CPacket.MoveRelative;
-//export const EntityS2C_Rotate = net.minecraft.network.packet.s2c.play.EntityS2CPacket.Rotate;
-//export const EntityS2C_RotateAndMoveRelative = net.minecraft.network.packet.s2c.play.EntityS2CPacket.RotateAndMoveRelative;
-export const EntitySetHeadYawS2C = net.minecraft.network.packet.s2c.play.EntitySetHeadYawS2CPacket;
-export const EntitySpawnS2C = net.minecraft.network.packet.s2c.play.EntitySpawnS2CPacket;
-export const EntityStatusS2C = net.minecraft.network.packet.s2c.play.EntityStatusS2CPacket;
-export const EntityStatusEffectUpdateS2C = net.minecraft.network.packet.s2c.play.EntityStatusEffectUpdateS2CPacket;
-export const EntityTrackerUpdateS2C = net.minecraft.network.packet.s2c.play.EntityTrackerUpdateS2CPacket;
-export const EntityVelocityUpdateS2C = net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket;
-export const ExperienceBarUpdateS2C = net.minecraft.network.packet.s2c.play.ExperienceBarUpdateS2CPacket;
-export const ExperienceOrbSpawnS2C = net.minecraft.network.packet.s2c.play.ExperienceOrbSpawnS2CPacket;
-export const ExplosionS2C = net.minecraft.network.packet.s2c.play.ExplosionS2CPacket;
-export const FeaturesS2C = net.minecraft.network.packet.s2c.config.FeaturesS2CPacket;
-export const GameJoinS2C = net.minecraft.network.packet.s2c.play.GameJoinS2CPacket;
-export const GameMessageS2C = net.minecraft.network.packet.s2c.play.GameMessageS2CPacket;
-export const GameStateChangeS2C = net.minecraft.network.packet.s2c.play.GameStateChangeS2CPacket;
-export const HealthUpdateS2C = net.minecraft.network.packet.s2c.play.HealthUpdateS2CPacket;
-export const InventoryS2C = net.minecraft.network.packet.s2c.play.InventoryS2CPacket;
-export const ItemPickupAnimationS2C = net.minecraft.network.packet.s2c.play.ItemPickupAnimationS2CPacket;
-//export const KeepAliveS2C = net.minecraft.network.packet.s2c.common.KeepAliveS2CPacket;
-export const LightUpdateS2C = net.minecraft.network.packet.s2c.play.LightUpdateS2CPacket;
-export const LoginCompressionS2C = net.minecraft.network.packet.s2c.login.LoginCompressionS2CPacket;
-export const LoginDisconnectS2C = net.minecraft.network.packet.s2c.login.LoginDisconnectS2CPacket;
-//export const LoginHelloS2C = net.minecraft.network.packet.s2c.login.LoginHelloS2CPacket;
-export const LoginQueryRequestS2C = net.minecraft.network.packet.s2c.login.LoginQueryRequestS2CPacket;
-export const LoginSuccessS2C = net.minecraft.network.packet.s2c.login.LoginSuccessS2CPacket;
-export const LookAtS2C = net.minecraft.network.packet.s2c.play.LookAtS2CPacket;
-export const MapUpdateS2C = net.minecraft.network.packet.s2c.play.MapUpdateS2CPacket;
-export const NbtQueryResponseS2C = net.minecraft.network.packet.s2c.play.NbtQueryResponseS2CPacket;
-export const OpenHorseScreenS2C = net.minecraft.network.packet.s2c.play.OpenHorseScreenS2CPacket;
-export const OpenScreenS2C = net.minecraft.network.packet.s2c.play.OpenScreenS2CPacket;
-export const OpenWrittenBookS2C = net.minecraft.network.packet.s2c.play.OpenWrittenBookS2CPacket;
-export const ParticleS2C = net.minecraft.network.packet.s2c.play.ParticleS2CPacket;
-export const PlayerAbilitiesS2C = net.minecraft.network.packet.s2c.play.PlayerAbilitiesS2CPacket;
-export const PlayerActionResponseS2C = net.minecraft.network.packet.s2c.play.PlayerActionResponseS2CPacket;
-export const PlayerListHeaderS2C = net.minecraft.network.packet.s2c.play.PlayerListHeaderS2CPacket;
-export const PlayerListS2C = net.minecraft.network.packet.s2c.play.PlayerListS2CPacket;
-export const PlayerPositionLookS2C = net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket;
-export const PlayerRemoveS2C = net.minecraft.network.packet.s2c.play.PlayerRemoveS2CPacket;
-export const PlayerRespawnS2C = net.minecraft.network.packet.s2c.play.PlayerRespawnS2CPacket;
-export const PlayerRotationS2C = net.minecraft.network.packet.s2c.play.PlayerRotationS2CPacket;
-export const PlayerSpawnPositionS2C = net.minecraft.network.packet.s2c.play.PlayerSpawnPositionS2CPacket;
-export const ProfilelessChatMessageS2C = net.minecraft.network.packet.s2c.play.ProfilelessChatMessageS2CPacket;
-export const ProjectilePowerS2C = net.minecraft.network.packet.s2c.play.ProjectilePowerS2CPacket;
-export const QueryPongS2C = net.minecraft.network.packet.s2c.query.QueryPongS2CPacket;
-export const QueryResponseS2C = net.minecraft.network.packet.s2c.query.QueryResponseS2CPacket;
-//export const ReadyS2C = net.minecraft.network.packet.s2c.config.ReadyS2CPacket;
-export const RecipeBookAddS2C = net.minecraft.network.packet.s2c.play.RecipeBookAddS2CPacket;
-export const RecipeBookRemoveS2C = net.minecraft.network.packet.s2c.play.RecipeBookRemoveS2CPacket;
-export const RecipeBookSettingsS2C = net.minecraft.network.packet.s2c.play.RecipeBookSettingsS2CPacket;
-export const RemoveEntityStatusEffectS2C = net.minecraft.network.packet.s2c.play.RemoveEntityStatusEffectS2CPacket;
-export const ResetScoreS2C = net.minecraft.network.packet.s2c.play.ResetScoreS2CPacket;
-export const ResourcePackPopS2C = net.minecraft.network.packet.s2c.common.ResourcePackPopS2CPacket;
-export const ResourcePackPushS2C = net.minecraft.network.packet.s2c.common.ResourcePackPushS2CPacket;
-export const ScoreboardDisplayS2C = net.minecraft.network.packet.s2c.play.ScoreboardDisplayS2CPacket;
-export const ScoreboardObjectiveUpdateS2C = net.minecraft.network.packet.s2c.play.ScoreboardObjectiveUpdateS2CPacket;
-//export const SelectKnownPacksS2C = net.minecraft.network.packet.s2c.config.SelectKnownPacksS2CPacket;
-export const ServerMetadataS2C = net.minecraft.network.packet.s2c.play.ServerMetadataS2CPacket;
-export const ServerTransferS2C = net.minecraft.network.packet.s2c.common.ServerTransferS2CPacket;
-export const SetCameraEntityS2C = net.minecraft.network.packet.s2c.play.SetCameraEntityS2CPacket;
-export const SetCursorItemS2C = net.minecraft.network.packet.s2c.play.SetCursorItemS2CPacket;
-export const SetPlayerInventoryS2C = net.minecraft.network.packet.s2c.play.SetPlayerInventoryS2CPacket;
-export const SetTestInstanceBlockS2C = net.minecraft.network.packet.s2c.play.SetTestInstanceBlockS2CPacket;
-export const SetTradeOffersS2C = net.minecraft.network.packet.s2c.play.SetTradeOffersS2CPacket;
-export const SignEditorOpenS2C = net.minecraft.network.packet.s2c.play.SignEditorOpenS2CPacket;
-export const SimulationDistanceS2C = net.minecraft.network.packet.s2c.play.SimulationDistanceS2CPacket;
-export const StatisticsS2C = net.minecraft.network.packet.s2c.play.StatisticsS2CPacket;
-export const StopSoundS2C = net.minecraft.network.packet.s2c.play.StopSoundS2CPacket;
-export const StoreCookieS2C = net.minecraft.network.packet.s2c.common.StoreCookieS2CPacket;
-export const SubtitleS2C = net.minecraft.network.packet.s2c.play.SubtitleS2CPacket;
-export const SynchronizeRecipesS2C = net.minecraft.network.packet.s2c.play.SynchronizeRecipesS2CPacket;
-export const SynchronizeTagsS2C = net.minecraft.network.packet.s2c.common.SynchronizeTagsS2CPacket;
-export const TeamS2C = net.minecraft.network.packet.s2c.play.TeamS2CPacket;
-export const TitleS2C = net.minecraft.network.packet.s2c.play.TitleS2CPacket;
-export const TitleFadeS2C = net.minecraft.network.packet.s2c.play.TitleFadeS2CPacket;
-export const UnloadChunkS2C = net.minecraft.network.packet.s2c.play.UnloadChunkS2CPacket;
-//export const UpdateSelectedSlotS2C = net.minecraft.network.packet.s2c.play.UpdateSelectedSlotS2CPacket;
-export const UpdateSelectedSlotS2C = net.minecraft.network.packet.s2c.play.UpdateSelectedSlotS2CPacket;
-export const UpdateTickRateS2C = net.minecraft.network.packet.s2c.play.UpdateTickRateS2CPacket;
-//export const VehicleMoveS2C = net.minecraft.network.packet.s2c.play.VehicleMoveS2CPacket;
-export const WorldBorderCenterChangedS2C = net.minecraft.network.packet.s2c.play.WorldBorderCenterChangedS2CPacket;
-export const WorldBorderInterpolateSizeS2C = net.minecraft.network.packet.s2c.play.WorldBorderInterpolateSizeS2CPacket;
-export const WorldBorderSizeChangedS2C = net.minecraft.network.packet.s2c.play.WorldBorderSizeChangedS2CPacket;
-export const WorldBorderWarningBlocksChangedS2C = net.minecraft.network.packet.s2c.play.WorldBorderWarningBlocksChangedS2CPacket;
-export const WorldBorderWarningTimeChangedS2C = net.minecraft.network.packet.s2c.play.WorldBorderWarningTimeChangedS2CPacket;
-export const WorldEventS2C = net.minecraft.network.packet.s2c.play.WorldEventS2CPacket;
-export const WorldTimeUpdateS2C = net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket;
+export const ClientboundUpdateAdvancementsPacket = net.minecraft.network.protocol.game.ClientboundUpdateAdvancementsPacket;
+export const ClientboundBlockDestructionPacket = net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket;
+export const ClientboundBlockEntityDataPacket = net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
+export const ClientboundBlockEventPacket = net.minecraft.network.protocol.game.ClientboundBlockEventPacket;
+export const ClientboundBlockUpdatePacket = net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket;
+export const ClientboundDebugBlockValuePacket = net.minecraft.network.protocol.game.ClientboundDebugBlockValuePacket;
+export const ClientboundBossEventPacket = net.minecraft.network.protocol.game.ClientboundBossEventPacket;
+export const ClientboundPlayerChatPacket = net.minecraft.network.protocol.game.ClientboundPlayerChatPacket;
+export const ClientboundCustomChatCompletionsPacket = net.minecraft.network.protocol.game.ClientboundCustomChatCompletionsPacket;
+export const ClientboundChunksBiomesPacket = net.minecraft.network.protocol.game.ClientboundChunksBiomesPacket;
+export const ClientboundLevelChunkWithLightPacket = net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket;
+export const ClientboundSectionBlocksUpdatePacket = net.minecraft.network.protocol.game.ClientboundSectionBlocksUpdatePacket;
+export const ClientboundSetChunkCacheRadiusPacket = net.minecraft.network.protocol.game.ClientboundSetChunkCacheRadiusPacket;
+export const ClientboundSetChunkCacheCenterPacket = net.minecraft.network.protocol.game.ClientboundSetChunkCacheCenterPacket;
+export const ClientboundChunkBatchFinishedPacket = net.minecraft.network.protocol.game.ClientboundChunkBatchFinishedPacket;
+export const ClientboundDebugChunkValuePacket = net.minecraft.network.protocol.game.ClientboundDebugChunkValuePacket;
+export const ClientboundClearDialogPacket = net.minecraft.network.protocol.common.ClientboundClearDialogPacket;
+export const ClientboundClearTitlesPacket = net.minecraft.network.protocol.game.ClientboundClearTitlesPacket;
+export const ClientboundContainerClosePacket = net.minecraft.network.protocol.game.ClientboundContainerClosePacket;
+export const ClientboundCodeOfConductPacket = net.minecraft.network.protocol.configuration.ClientboundCodeOfConductPacket;
+export const ClientboundCommandSuggestionsPacket = net.minecraft.network.protocol.game.ClientboundCommandSuggestionsPacket;
+export const ClientboundCommandsPacket = net.minecraft.network.protocol.game.ClientboundCommandsPacket;
+export const ClientboundPingPacket = net.minecraft.network.protocol.common.ClientboundPingPacket;
+export const ClientboundCookieRequestPacket = net.minecraft.network.protocol.cookie.ClientboundCookieRequestPacket;
+export const ClientboundCooldownPacket = net.minecraft.network.protocol.game.ClientboundCooldownPacket;
+export const ClientboundPlaceGhostRecipePacket = net.minecraft.network.protocol.game.ClientboundPlaceGhostRecipePacket;
+export const ClientboundCustomPayloadPacket = net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
+export const ClientboundCustomReportDetailsPacket = net.minecraft.network.protocol.common.ClientboundCustomReportDetailsPacket;
+export const ClientboundHurtAnimationPacket = net.minecraft.network.protocol.game.ClientboundHurtAnimationPacket;
+export const ClientboundPlayerCombatKillPacket = net.minecraft.network.protocol.game.ClientboundPlayerCombatKillPacket;
+export const ClientboundDebugSamplePacket = net.minecraft.network.protocol.game.ClientboundDebugSamplePacket;
+export const ClientboundChangeDifficultyPacket = net.minecraft.network.protocol.game.ClientboundChangeDifficultyPacket;
+export const ClientboundDisconnectPacket = net.minecraft.network.protocol.common.ClientboundDisconnectPacket;
+export const ClientboundRegistryDataPacket = net.minecraft.network.protocol.configuration.ClientboundRegistryDataPacket;
+export const ClientboundPlayerCombatEndPacket = net.minecraft.network.protocol.game.ClientboundPlayerCombatEndPacket;
+export const ClientboundPlayerCombatEnterPacket = net.minecraft.network.protocol.game.ClientboundPlayerCombatEnterPacket;
+export const ClientboundFinishConfigurationPacket = net.minecraft.network.protocol.configuration.ClientboundFinishConfigurationPacket;
+export const ClientboundStartConfigurationPacket = net.minecraft.network.protocol.game.ClientboundStartConfigurationPacket;
+export const ClientboundRemoveEntitiesPacket = net.minecraft.network.protocol.game.ClientboundRemoveEntitiesPacket;
+export const ClientboundAnimatePacket = net.minecraft.network.protocol.game.ClientboundAnimatePacket;
+export const ClientboundSetEntityLinkPacket = net.minecraft.network.protocol.game.ClientboundSetEntityLinkPacket;
+export const ClientboundUpdateAttributesPacket = net.minecraft.network.protocol.game.ClientboundUpdateAttributesPacket;
+export const ClientboundDamageEventPacket = net.minecraft.network.protocol.game.ClientboundDamageEventPacket;
+export const ClientboundSetEquipmentPacket = net.minecraft.network.protocol.game.ClientboundSetEquipmentPacket;
+export const ClientboundSetPassengersPacket = net.minecraft.network.protocol.game.ClientboundSetPassengersPacket;
+export const ClientboundTeleportEntityPacket = net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket;
+export const ClientboundMoveEntityPacket = net.minecraft.network.protocol.game.ClientboundMoveEntityPacket;
+export const ClientboundRotateHeadPacket = net.minecraft.network.protocol.game.ClientboundRotateHeadPacket;
+export const ClientboundAddEntityPacket = net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
+export const ClientboundEntityEventPacket = net.minecraft.network.protocol.game.ClientboundEntityEventPacket;
+export const ClientboundUpdateMobEffectPacket = net.minecraft.network.protocol.game.ClientboundUpdateMobEffectPacket;
+export const ClientboundSetEntityDataPacket = net.minecraft.network.protocol.game.ClientboundSetEntityDataPacket;
+export const ClientboundSetEntityMotionPacket = net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket;
+export const ClientboundSetExperiencePacket = net.minecraft.network.protocol.game.ClientboundSetExperiencePacket;
+// ponytail: removed dedicated experience-orb spawn packet in current protocol; use ClientboundAddEntityPacket if this ever needs reviving.
+export const ClientboundExplodePacket = net.minecraft.network.protocol.game.ClientboundExplodePacket;
+export const ClientboundUpdateEnabledFeaturesPacket = net.minecraft.network.protocol.configuration.ClientboundUpdateEnabledFeaturesPacket;
+export const ClientboundLoginPacket = net.minecraft.network.protocol.game.ClientboundLoginPacket;
+export const ClientboundSystemChatPacket = net.minecraft.network.protocol.game.ClientboundSystemChatPacket;
+export const ClientboundGameEventPacket = net.minecraft.network.protocol.game.ClientboundGameEventPacket;
+export const ClientboundSetHealthPacket = net.minecraft.network.protocol.game.ClientboundSetHealthPacket;
+export const ClientboundContainerSetContentPacket = net.minecraft.network.protocol.game.ClientboundContainerSetContentPacket;
+export const ClientboundTakeItemEntityPacket = net.minecraft.network.protocol.game.ClientboundTakeItemEntityPacket;
+export const ClientboundLightUpdatePacket = net.minecraft.network.protocol.game.ClientboundLightUpdatePacket;
+export const ClientboundLoginCompressionPacket = net.minecraft.network.protocol.login.ClientboundLoginCompressionPacket;
+export const ClientboundLoginDisconnectPacket = net.minecraft.network.protocol.login.ClientboundLoginDisconnectPacket;
+export const ClientboundCustomQueryPacket = net.minecraft.network.protocol.login.ClientboundCustomQueryPacket;
+export const ClientboundLoginFinishedPacket = net.minecraft.network.protocol.login.ClientboundLoginFinishedPacket;
+export const ClientboundPlayerLookAtPacket = net.minecraft.network.protocol.game.ClientboundPlayerLookAtPacket;
+export const ClientboundMapItemDataPacket = net.minecraft.network.protocol.game.ClientboundMapItemDataPacket;
+export const ClientboundTagQueryPacket = net.minecraft.network.protocol.game.ClientboundTagQueryPacket;
+export const ClientboundMountScreenOpenPacket = net.minecraft.network.protocol.game.ClientboundMountScreenOpenPacket;
+export const ClientboundOpenScreenPacket = net.minecraft.network.protocol.game.ClientboundOpenScreenPacket;
+export const ClientboundOpenBookPacket = net.minecraft.network.protocol.game.ClientboundOpenBookPacket;
+export const ClientboundLevelParticlesPacket = net.minecraft.network.protocol.game.ClientboundLevelParticlesPacket;
+export const ClientboundPlayerAbilitiesPacket = net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket;
+export const ClientboundBlockChangedAckPacket = net.minecraft.network.protocol.game.ClientboundBlockChangedAckPacket;
+export const ClientboundTabListPacket = net.minecraft.network.protocol.game.ClientboundTabListPacket;
+export const ClientboundPlayerInfoUpdatePacket = net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
+export const ClientboundPlayerPositionPacket = net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket;
+export const ClientboundPlayerInfoRemovePacket = net.minecraft.network.protocol.game.ClientboundPlayerInfoRemovePacket;
+export const ClientboundRespawnPacket = net.minecraft.network.protocol.game.ClientboundRespawnPacket;
+export const ClientboundPlayerRotationPacket = net.minecraft.network.protocol.game.ClientboundPlayerRotationPacket;
+export const ClientboundSetDefaultSpawnPositionPacket = net.minecraft.network.protocol.game.ClientboundSetDefaultSpawnPositionPacket;
+export const ClientboundDisguisedChatPacket = net.minecraft.network.protocol.game.ClientboundDisguisedChatPacket;
+export const ClientboundProjectilePowerPacket = net.minecraft.network.protocol.game.ClientboundProjectilePowerPacket;
+export const ClientboundPongResponsePacket = net.minecraft.network.protocol.ping.ClientboundPongResponsePacket;
+export const ClientboundStatusResponsePacket = net.minecraft.network.protocol.status.ClientboundStatusResponsePacket;
+export const ClientboundRecipeBookAddPacket = net.minecraft.network.protocol.game.ClientboundRecipeBookAddPacket;
+export const ClientboundRecipeBookRemovePacket = net.minecraft.network.protocol.game.ClientboundRecipeBookRemovePacket;
+export const ClientboundRecipeBookSettingsPacket = net.minecraft.network.protocol.game.ClientboundRecipeBookSettingsPacket;
+export const ClientboundRemoveMobEffectPacket = net.minecraft.network.protocol.game.ClientboundRemoveMobEffectPacket;
+export const ClientboundResetScorePacket = net.minecraft.network.protocol.game.ClientboundResetScorePacket;
+export const ClientboundResourcePackPopPacket = net.minecraft.network.protocol.common.ClientboundResourcePackPopPacket;
+export const ClientboundResourcePackPushPacket = net.minecraft.network.protocol.common.ClientboundResourcePackPushPacket;
+export const ClientboundSetDisplayObjectivePacket = net.minecraft.network.protocol.game.ClientboundSetDisplayObjectivePacket;
+export const ClientboundSetObjectivePacket = net.minecraft.network.protocol.game.ClientboundSetObjectivePacket;
+export const ClientboundServerDataPacket = net.minecraft.network.protocol.game.ClientboundServerDataPacket;
+export const ClientboundTransferPacket = net.minecraft.network.protocol.common.ClientboundTransferPacket;
+export const ClientboundSetCameraPacket = net.minecraft.network.protocol.game.ClientboundSetCameraPacket;
+export const ClientboundSetCursorItemPacket = net.minecraft.network.protocol.game.ClientboundSetCursorItemPacket;
+export const ClientboundSetPlayerInventoryPacket = net.minecraft.network.protocol.game.ClientboundSetPlayerInventoryPacket;
+export const ClientboundTestInstanceBlockStatus = net.minecraft.network.protocol.game.ClientboundTestInstanceBlockStatus;
+export const ClientboundMerchantOffersPacket = net.minecraft.network.protocol.game.ClientboundMerchantOffersPacket;
+export const ClientboundOpenSignEditorPacket = net.minecraft.network.protocol.game.ClientboundOpenSignEditorPacket;
+export const ClientboundSetSimulationDistancePacket = net.minecraft.network.protocol.game.ClientboundSetSimulationDistancePacket;
+export const ClientboundAwardStatsPacket = net.minecraft.network.protocol.game.ClientboundAwardStatsPacket;
+export const ClientboundStopSoundPacket = net.minecraft.network.protocol.game.ClientboundStopSoundPacket;
+export const ClientboundStoreCookiePacket = net.minecraft.network.protocol.common.ClientboundStoreCookiePacket;
+export const ClientboundSetSubtitleTextPacket = net.minecraft.network.protocol.game.ClientboundSetSubtitleTextPacket;
+export const ClientboundUpdateRecipesPacket = net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket;
+export const ClientboundUpdateTagsPacket = net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket;
+export const ClientboundSetPlayerTeamPacket = net.minecraft.network.protocol.game.ClientboundSetPlayerTeamPacket;
+export const ClientboundSetTitleTextPacket = net.minecraft.network.protocol.game.ClientboundSetTitleTextPacket;
+export const ClientboundSetTitlesAnimationPacket = net.minecraft.network.protocol.game.ClientboundSetTitlesAnimationPacket;
+export const ClientboundForgetLevelChunkPacket = net.minecraft.network.protocol.game.ClientboundForgetLevelChunkPacket;
+export const ClientboundSetHeldSlotPacket = net.minecraft.network.protocol.game.ClientboundSetHeldSlotPacket;
+export const ClientboundTickingStatePacket = net.minecraft.network.protocol.game.ClientboundTickingStatePacket;
+export const ClientboundSetBorderCenterPacket = net.minecraft.network.protocol.game.ClientboundSetBorderCenterPacket;
+export const ClientboundSetBorderLerpSizePacket = net.minecraft.network.protocol.game.ClientboundSetBorderLerpSizePacket;
+export const ClientboundSetBorderSizePacket = net.minecraft.network.protocol.game.ClientboundSetBorderSizePacket;
+export const ClientboundSetBorderWarningDistancePacket = net.minecraft.network.protocol.game.ClientboundSetBorderWarningDistancePacket;
+export const ClientboundSetBorderWarningDelayPacket = net.minecraft.network.protocol.game.ClientboundSetBorderWarningDelayPacket;
+export const ClientboundLevelEventPacket = net.minecraft.network.protocol.game.ClientboundLevelEventPacket;
+export const ClientboundSetTimePacket = net.minecraft.network.protocol.game.ClientboundSetTimePacket;
diff --git a/utils/Raytrace.js b/utils/Raytrace.js
index 582847fb..490b77bf 100644
--- a/utils/Raytrace.js
+++ b/utils/Raytrace.js
@@ -1,5 +1,6 @@
import { raytraceBlocks } from './dependencies/BloomCore/RaytraceBlocks';
import { Vector3 } from './dependencies/BloomCore/Vector3';
+import { MathUtils } from './Math';
export const SAMPLE_POINTS_PER_FACE = 9;
export const MAX_DDA_ITERATIONS = 300;
@@ -57,10 +58,10 @@ class VisibilityChecker {
let player = Player.getPlayer();
if (!player) return null;
- let eyePos = player.getEyePos();
+ let eyePos = player.getEyePosition();
if (!eyePos) return null;
- this.eyeCache.pos = { x: eyePos.x, y: eyePos.y, z: eyePos.z };
+ this.eyeCache.pos = { x: eyePos.x(), y: eyePos.y(), z: eyePos.z() };
this.eyeCache.time = now;
return this.eyeCache.pos;
@@ -301,8 +302,8 @@ class EntityRaytracer {
let player = Player.getPlayer();
if (!player) return null;
- let yaw = player.getYaw();
- let pitch = player.getPitch();
+ let yaw = MathUtils.wrapTo180(player.getYRot());
+ let pitch = player.getXRot();
let yawRad = (-yaw * Math.PI) / 180;
let pitchRad = (-pitch * Math.PI) / 180;
diff --git a/utils/Router.js b/utils/Router.js
index 45e59673..80b3a648 100644
--- a/utils/Router.js
+++ b/utils/Router.js
@@ -49,7 +49,7 @@ class Routes {
* @returns all files in that directory
*/
getFilesInDir(folder) {
- let mcDir = new File(Client.getMinecraft().runDirectory);
+ let mcDir = new File(Client.getMinecraft().gameDirectory);
let configPath = new File(mcDir, 'config/ChatTriggers/modules/V5Config/' + folder);
if (!configPath.exists() || !configPath.isDirectory()) {
diff --git a/utils/Sign.js b/utils/Sign.js
index 714450bf..fd60fc06 100644
--- a/utils/Sign.js
+++ b/utils/Sign.js
@@ -3,7 +3,7 @@ class SignClass {
const i = Number(line) - 1;
if (!Number.isFinite(i) || Math.floor(i) !== i || i < 0 || i > 3) return;
- const messages = this._getField(Client.getMinecraft().currentScreen, 'field_40425');
+ const messages = this._getField(Client.getMinecraft().screen, 'messages'); // mojmap: messages
if (!messages) return;
messages[i] = String(text == null ? '' : text);
diff --git a/utils/Ungrab.js b/utils/Ungrab.js
index d29df937..fcfc1770 100644
--- a/utils/Ungrab.js
+++ b/utils/Ungrab.js
@@ -20,11 +20,12 @@ class UngrabManager {
Mixin.set('inputLocked', true);
const mc = Client.getMinecraft();
- if (mc.mouse) {
- mc.mouse.unlockCursor();
+ if (mc.mouseHandler) {
+ mc.mouseHandler.releaseMouse();
if (isLinux) {
- GLFW.glfwSetInputMode(mc.getWindow().getHandle(), GLFW.GLFW_CURSOR, GLFW.GLFW_CURSOR_NORMAL);
+ // Todo: fix broken due to 26.1
+ //GLFW.glfwSetInputMode(mc.getWindow().getHandle(), GLFW.GLFW_CURSOR, GLFW.GLFW_CURSOR_NORMAL);
}
}
}
@@ -39,9 +40,10 @@ class UngrabManager {
Mixin.set('inputLocked', false);
const mc = Client.getMinecraft();
- if (mc.currentScreen == null) {
- mc.mouse.lockCursor();
- GLFW.glfwSetInputMode(mc.getWindow().getHandle(), GLFW.GLFW_CURSOR, GLFW.GLFW_CURSOR_DISABLED);
+ if (mc.screen == null) {
+ mc.mouseHandler.grabMouse();
+ // Todo: fix broken due to 26.1
+ //GLFW.glfwSetInputMode(mc.getWindow().getHandle(), GLFW.GLFW_CURSOR, GLFW.GLFW_CURSOR_DISABLED);
}
}
}
diff --git a/utils/Utils.js b/utils/Utils.js
index c8efc4f3..bfa7759e 100644
--- a/utils/Utils.js
+++ b/utils/Utils.js
@@ -1,6 +1,6 @@
import { Chat } from './Chat';
import { BP, isLinux, isMac, isWindows, Vec3d } from './Constants';
-import { GameMessageS2C } from './Packets';
+import { ClientboundSystemChatPacket } from './Packets';
import { TabListUtils } from './TabListUtils';
export const mc = Client.getMinecraft();
@@ -110,9 +110,9 @@ class LocationDetector {
}
getLobbyDay() {
- const world = Client.getMinecraft()?.world;
+ const world = Client.getMinecraft()?.level;
if (!world) return 0;
- return Math.floor(world.getTimeOfDay() / 24000);
+ return Math.floor(world.getDayTime() / 24000);
}
stripFormatting(text) {
@@ -136,7 +136,7 @@ class ManaDetector {
register('worldLoad', () => this.reset());
register('packetReceived', (packet) => {
this.onGameMessage(packet);
- }).setFilteredClass(GameMessageS2C);
+ }).setFilteredClass(ClientboundSystemChatPacket);
}
onGameMessage(packet) {
@@ -229,6 +229,10 @@ class VectorConverter {
return new Vec3d(input.x, input.y, input.z);
}
+ if (this.hasXYZMethods(input)) {
+ return new Vec3d(input.x(), input.y(), input.z());
+ }
+
if (Array.isArray(input) && input.length >= 3) {
return new Vec3d(input[0], input[1], input[2]);
}
@@ -244,6 +248,10 @@ class VectorConverter {
return obj && typeof obj.x === 'number' && typeof obj.y === 'number' && typeof obj.z === 'number';
}
+ hasXYZMethods(obj) {
+ return obj && typeof obj.x === 'function' && typeof obj.y === 'function' && typeof obj.z === 'function';
+ }
+
hasPositionMethods(obj) {
return obj && typeof obj.getX === 'function' && typeof obj.getY === 'function' && typeof obj.getZ === 'function';
}
@@ -331,7 +339,7 @@ class UtilsClass {
const playerBox = player.getBoundingBox();
const expandedBox = playerBox.expand(0.01, 0.01, 0.01);
- let yaw = ((player.getYaw() % 360) + 360) % 360;
+ let yaw = ((player.getYRot() % 360) + 360) % 360;
const collisionSides = { NORTH: false, SOUTH: false, WEST: false, EAST: false };
let minX = Math.floor(expandedBox.minX);
@@ -354,10 +362,10 @@ class UtilsClass {
if (!voxelShape || voxelShape.isEmpty()) continue;
- let collisionBoxes = voxelShape.getBoundingBoxes();
+ let collisionBoxes = voxelShape.toAabbs();
for (let i = 0; i < collisionBoxes.size(); i++) {
- let blockBox = collisionBoxes.get(i).offset(x, y, z);
+ let blockBox = collisionBoxes.get(i).move(x, y, z);
if (expandedBox.intersects(blockBox)) {
if (blockBox.maxX <= playerBox.minX + 0.05) collisionSides.WEST = true;
diff --git a/utils/V5Commands.js b/utils/V5Commands.js
index 1c40c5c2..f6e373b5 100644
--- a/utils/V5Commands.js
+++ b/utils/V5Commands.js
@@ -76,7 +76,7 @@ v5Command('help', () => {
v5Command('config', () => {
const file = new File(Client.getMinecraft().runDirectory, 'config/ChatTriggers/modules/V5Config');
try {
- net.minecraft.util.Util.getOperatingSystem().open(file);
+ net.minecraft.util.Util.getPlatform().open(file);
} catch (error) {
Chat.message('&eUnable to open config folder automatically.');
Chat.message(`&7Path: &f${file.getAbsolutePath()}`);
diff --git a/utils/Webhooks.js b/utils/Webhooks.js
index 7f319c06..744e4518 100644
--- a/utils/Webhooks.js
+++ b/utils/Webhooks.js
@@ -61,12 +61,15 @@ class DiscordNotifier {
}
takeScreenshot(title = null, description = null, color, footer, ping = false) {
+ // TODO: fix broken with 26.1
+ return;
+
const mc = Client.getMinecraft();
- const buffer = mc.getFramebuffer();
+ const buffer = mc.getMainRenderTarget();
const gameDir = mc.runDirectory;
try {
- ScreenshotRecorder.saveScreenshot(
+ ScreenshotRecorder.grab(
gameDir,
buffer,
new Consumer({
diff --git a/utils/backend/WebSocket.js b/utils/backend/WebSocket.js
index 7d8fa8e2..372792f5 100644
--- a/utils/backend/WebSocket.js
+++ b/utils/backend/WebSocket.js
@@ -2,7 +2,7 @@ import WebSocket from 'WebSocket';
import { returnDiscord } from '../../gui/Utils';
import { Chat } from '../Chat';
import { Links } from '../Constants';
-import { ChatMessageC2S } from '../Packets';
+import { ServerboundChatPacket } from '../Packets';
import { ScheduleTask } from '../ScheduleTask';
import { v5Command } from '../V5Commands';
import { handleIRCMessage, isAutoMeowEnabled, isIrcEnabled, isRandomChoiceMeowEnabled } from './IRC';
@@ -200,7 +200,7 @@ register('gameUnload', () => {
register('packetSent', (packet, event) => {
let message;
try {
- message = packet.chatMessage();
+ message = packet.message();
} catch (e) {
console.error('V5 Caught error' + e + e.stack);
}
@@ -209,7 +209,7 @@ register('packetSent', (packet, event) => {
sendChatMessage(message.substring(1));
cancel(event);
-}).setFilteredClass(ChatMessageC2S);
+}).setFilteredClass(ServerboundChatPacket);
const reconnectIRC = () => {
reconnectAttempts = 0;
diff --git a/utils/dependencies/BloomCore/RaytraceBlocks.js b/utils/dependencies/BloomCore/RaytraceBlocks.js
index 69be614f..44ce4cdc 100644
--- a/utils/dependencies/BloomCore/RaytraceBlocks.js
+++ b/utils/dependencies/BloomCore/RaytraceBlocks.js
@@ -29,10 +29,10 @@ export const getPlayerEyeCoords = (forceSneak = false) => {
if (forceSneak) return getEtherwarpEyeCoords(true, player);
- const eyePos = player.getEyePos(); // native Vec3d
- let x = eyePos.x;
- let y = eyePos.y;
- let z = eyePos.z;
+ const eyePos = player.getEyePosition(); // native Vec3d
+ let x = eyePos.x();
+ let y = eyePos.y();
+ let z = eyePos.z();
return [x, y, z];
};
@@ -42,7 +42,7 @@ export const getPlayerLookVec = () => {
if (!player) return null;
const lookVec = player.getRotationVec(1.0); // tickDelta = 1.0 is standard
- return new Vector3(lookVec.x, lookVec.y, lookVec.z);
+ return new Vector3(lookVec.x(), lookVec.y(), lookVec.z());
};
export const traverseVoxels = (start, end, blockCheckFunc = null, returnWhenTrue = false, stopWhenNotAir = false, returnIntersection = false) => {
diff --git a/utils/pathfinder/EtherwarpPathfinder.js b/utils/pathfinder/EtherwarpPathfinder.js
index 6b45d301..f436565e 100644
--- a/utils/pathfinder/EtherwarpPathfinder.js
+++ b/utils/pathfinder/EtherwarpPathfinder.js
@@ -1,6 +1,6 @@
import { Chat } from '../Chat';
import { MCHand, Vec3d } from '../Constants';
-import { CommonPingS2C, PlayerInteractItemC2S } from '../Packets';
+import { ClientboundPingPacket, ServerboundUseItemPacket } from '../Packets';
import { Guis } from '../player/Inventory';
import { Keybind } from '../player/Keybinding';
import { RotationGCD } from '../player/RotationGCD';
@@ -65,7 +65,7 @@ class EtherwarpPathHandler {
this.pollExecutionWait();
}).setFps(100);
register('renderWorld', () => this.render());
- register('packetReceived', () => this.onCommonPingPacket()).setFilteredClass(CommonPingS2C);
+ register('packetReceived', () => this.onCommonPingPacket()).setFilteredClass(ClientboundPingPacket);
register('worldUnload', () => this.handleWorldUnload());
}
@@ -476,7 +476,7 @@ class EtherwarpPathHandler {
sendEtherwarpClick() {
const yaw = Number.parseFloat(Player.getYaw());
const pitch = Number.parseFloat(Player.getPitch());
- Client.sendSequencedPacket((sequence) => new PlayerInteractItemC2S(MCHand.MAIN_HAND, sequence, yaw, pitch));
+ Client.sendSequencedPacket((sequence) => new ServerboundUseItemPacket(MCHand.MAIN_HAND, sequence, yaw, pitch));
}
stopExecution(restoreSlot = true, preserveOriginalSlot = false) {
diff --git a/utils/pathfinder/PathFinder.js b/utils/pathfinder/PathFinder.js
index dc013f51..b1c4c39d 100644
--- a/utils/pathfinder/PathFinder.js
+++ b/utils/pathfinder/PathFinder.js
@@ -336,7 +336,7 @@ class Finder {
if (PathConfig.RENDER_LOOK_POINTS) {
this.flyMovementPath?.forEach((p) => RenderUtils.drawFilledBox(new Vec3d(p.x, p.y, p.z), new RenderColor(0, 255, 0, 150), true));
- this.flyLookPoints?.forEach((p) => RenderUtils.drawFilledBox(p, new RenderColor(255, 0, 0, 150), true));
+ this.flyLookPoints?.forEach((p) => RenderUtils.drawFilledBox(new Vec3d(p.x, p.y, p.z), new RenderColor(255, 0, 0, 150), true));
const yDiffPoint = FlyMovement.debugVerticalTarget;
if (yDiffPoint) {
RenderUtils.drawFilledBox(new Vec3d(yDiffPoint.x, yDiffPoint.y, yDiffPoint.z), new RenderColor(0, 255, 255, 180), true);
@@ -541,7 +541,7 @@ class Finder {
if (dy < -0.1 || dy > 5.5) continue;
}
- if (this.isFly || player.isOnGround()) {
+ if (this.isFly || player.onGround()) {
return true;
}
}
diff --git a/utils/pathfinder/PathFlyer/PathMovement.js b/utils/pathfinder/PathFlyer/PathMovement.js
index 5eb4fde4..5479a53c 100644
--- a/utils/pathfinder/PathFlyer/PathMovement.js
+++ b/utils/pathfinder/PathFlyer/PathMovement.js
@@ -174,7 +174,7 @@ class PathMovement {
}
handleFlyBoost(next, current, player) {
- return !!player?.isOnGround() && next.y - current.y > 0.5;
+ return !!player?.onGround() && next.y - current.y > 0.5;
}
updateMovement(player) {
diff --git a/utils/pathfinder/PathFlyer/PathRotations.js b/utils/pathfinder/PathFlyer/PathRotations.js
index 1d7be74a..9edee37e 100644
--- a/utils/pathfinder/PathFlyer/PathRotations.js
+++ b/utils/pathfinder/PathFlyer/PathRotations.js
@@ -1,4 +1,4 @@
-import { BP, Vec3d } from '../../Constants';
+import { BP } from '../../Constants';
import { raytraceBlocks } from '../../dependencies/BloomCore/RaytraceBlocks';
import { Vector3 } from '../../dependencies/BloomCore/Vector3';
import { MathUtils } from '../../Math';
@@ -110,7 +110,7 @@ class PathRotations {
const p1 = path[Math.max(0, Math.min(path.length - 1, idx))];
const p2 = path[Math.max(0, Math.min(path.length - 1, idx + 1))];
if (!p2 || frac <= 0) return p1;
- return new Vec3d(p1.x + (p2.x - p1.x) * frac, p1.y + (p2.y - p1.y) * frac, p1.z + (p2.z - p1.z) * frac);
+ return { x: p1.x + (p2.x - p1.x) * frac, y: p1.y + (p2.y - p1.y) * frac, z: p1.z + (p2.z - p1.z) * frac };
}
getDistSq(a, b) {
@@ -222,7 +222,8 @@ class PathRotations {
updateLookPoint() {
const player = Player.getPlayer();
if (!player || !this.lookPoints) return;
- const playerEyes = player.getEyePos();
+ const eyePos = player.getEyePosition();
+ const playerEyes = { x: eyePos.x(), y: eyePos.y(), z: eyePos.z() };
const projection = this.updatePathPosition(this.lookPoints, this.currentPathPosition, playerEyes, 1, 10);
const distToPath = Math.sqrt(projection.minDistSq);
if (projection.position > this.currentPathPosition + 0.05 || distToPath > 1.5) {
@@ -334,8 +335,8 @@ class PathRotations {
this.currentPathPosition = 0.0;
this.complete = false;
this.cachedVisible = { t: null, point: null, time: 0 };
- this.currentYaw = MathUtils.wrapTo180(player.getYaw());
- this.currentPitch = player.getPitch();
+ this.currentYaw = MathUtils.wrapTo180(player.getYRot());
+ this.currentPitch = player.getXRot();
this.rawTargetYaw = this.currentYaw;
this.rawTargetPitch = this.currentPitch;
this.yawVelocity = 0;
diff --git a/utils/pathfinder/PathSpline.js b/utils/pathfinder/PathSpline.js
index a86b07f5..76fc8526 100644
--- a/utils/pathfinder/PathSpline.js
+++ b/utils/pathfinder/PathSpline.js
@@ -57,7 +57,7 @@ class PathSpline {
const feetPath = [];
for (const p of lookPoints) {
- const feetPoint = new Vec3d(p.x, p.y - eyeOffset, p.z);
+ const feetPoint = { x: p.x, y: p.y - eyeOffset, z: p.z };
const prev = feetPath.length ? feetPath[feetPath.length - 1] : null;
if (!prev || Math.hypot(feetPoint.x - prev.x, feetPoint.y - prev.y, feetPoint.z - prev.z) > 0.08) {
feetPath.push(feetPoint);
@@ -79,7 +79,7 @@ class PathSpline {
const x = n.x !== undefined ? n.x : n[0];
const y = n.y !== undefined ? n.y : n[1];
const z = n.z !== undefined ? n.z : n[2];
- return new Vec3d(x, y, z);
+ return { x, y, z };
});
const simplifiedPoints = [rawPoints[0]];
@@ -107,7 +107,7 @@ class PathSpline {
for (let j = 0; j < numSteps; j++) {
if (i > 0 && j === 0) continue;
- finalPath.push(new Vec3d(p1.x + (dx * j) / numSteps, p1.y + (dy * j) / numSteps, p1.z + (dz * j) / numSteps));
+ finalPath.push({ x: p1.x + (dx * j) / numSteps, y: p1.y + (dy * j) / numSteps, z: p1.z + (dz * j) / numSteps });
}
}
finalPath.push(simplifiedPoints[simplifiedPoints.length - 1]);
@@ -128,7 +128,7 @@ class PathSpline {
let lastPlacedRaw = smoothSplineData[0];
let lastForwardDir = null;
- boxPositions.push(new Vec3d(start.x, start.y + 2.62, start.z));
+ boxPositions.push({ x: start.x, y: start.y + 2.62, z: start.z });
for (let i = 1; i < smoothSplineData.length - 1; i++) {
const curr = smoothSplineData[i];
@@ -174,14 +174,14 @@ class PathSpline {
if (dot < 0.4) continue;
}
- const targetPoint = new Vec3d(curr.x + offsetX, curr.y + 2.62, curr.z + offsetZ);
+ const targetPoint = { x: curr.x + offsetX, y: curr.y + 2.62, z: curr.z + offsetZ };
this.appendLookPoint(boxPositions, this.adjustLookPoint(targetPoint, curr));
lastPlacedRaw = curr;
if (cfMag > 0.1) lastForwardDir = { x: currentForward.x / cfMag, z: currentForward.z / cfMag };
}
}
- this.appendLookPoint(boxPositions, new Vec3d(endPoint.x, endPoint.y + 2.62, endPoint.z));
+ this.appendLookPoint(boxPositions, { x: endPoint.x, y: endPoint.y + 2.62, z: endPoint.z });
this.cachedBoxPositions = boxPositions;
return boxPositions;
}
@@ -195,7 +195,7 @@ class PathSpline {
const raw = [];
for (const n of normalizedNodes) {
- const p = new Vec3d(n.x, n.y + this.PLAYER_EYE_OFFSET, n.z);
+ const p = { x: n.x, y: n.y + this.PLAYER_EYE_OFFSET, z: n.z };
if (raw.length === 0 || Math.hypot(p.x - raw[raw.length - 1].x, p.y - raw[raw.length - 1].y, p.z - raw[raw.length - 1].z) > 0.1) raw.push(p);
}
@@ -203,7 +203,7 @@ class PathSpline {
const yaw = ((player ? Player.getYaw() : 0) + 90) * (Math.PI / 180);
const pitch = -(player ? Player.getPitch() : 0) * (Math.PI / 180);
const lookV = { x: Math.cos(yaw) * Math.cos(pitch), y: Math.sin(pitch), z: Math.sin(yaw) * Math.cos(pitch) };
- const initialLook = new Vec3d(raw[0].x + lookV.x * 2, raw[0].y + lookV.y * 2, raw[0].z + lookV.z * 2);
+ const initialLook = { x: raw[0].x + lookV.x * 2, y: raw[0].y + lookV.y * 2, z: raw[0].z + lookV.z * 2 };
const adaptivePoints = [initialLook, raw[0]];
const roundedRaw = this.roundPolylineCorners(raw, this.FLY_SPACING);
@@ -280,7 +280,7 @@ class PathSpline {
if (dot < -0.3) {
const ejectionDist = isTight ? 5.5 : 3.8;
- const lookAhead = new Vec3d(b.x + u1.x * ejectionDist, b.y + u1.y * ejectionDist, b.z + u1.z * ejectionDist);
+ const lookAhead = { x: b.x + u1.x * ejectionDist, y: b.y + u1.y * ejectionDist, z: b.z + u1.z * ejectionDist };
out.push(this.adjustLookPoint(lookAhead, b));
}
@@ -292,8 +292,8 @@ class PathSpline {
const baseRadius = isTight ? 0.9 : Math.max(0.15, Math.min(1.6, spacing * 0.55));
const r = Math.min(baseRadius, abMag * 0.45, bcMag * 0.45);
- const pIn = new Vec3d(b.x - u1.x * r, b.y - u1.y * r, b.z - u1.z * r);
- const pOut = new Vec3d(b.x + u2.x * r, b.y + u2.y * r, b.z + u2.z * r);
+ const pIn = { x: b.x - u1.x * r, y: b.y - u1.y * r, z: b.z - u1.z * r };
+ const pOut = { x: b.x + u2.x * r, y: b.y + u2.y * r, z: b.z + u2.z * r };
if (this.isSegmentClear(pIn, pOut)) {
out.push(pIn);
@@ -357,7 +357,7 @@ class PathSpline {
let tDist = step - carry;
while (tDist <= dist + 1e-9) {
const t = tDist / dist;
- out.push(new Vec3d(a.x + dx * t, a.y + dy * t, a.z + dz * t));
+ out.push({ x: a.x + dx * t, y: a.y + dy * t, z: a.z + dz * t });
tDist += step;
}
carry = (((dist - (tDist - step)) % step) + step) % step;
@@ -370,9 +370,9 @@ class PathSpline {
}
nudgePointOutOfBlock(point) {
- const up = new Vec3d(point.x, point.y + this.FLY_BLOCK_NUDGE, point.z);
+ const up = { x: point.x, y: point.y + this.FLY_BLOCK_NUDGE, z: point.z };
if (!this.isPointInsideBlock(up)) return up;
- const down = new Vec3d(point.x, point.y - this.FLY_BLOCK_NUDGE, point.z);
+ const down = { x: point.x, y: point.y - this.FLY_BLOCK_NUDGE, z: point.z };
return !this.isPointInsideBlock(down) ? down : point;
}
@@ -391,9 +391,9 @@ class PathSpline {
adjustLookPoint(point, rawNode) {
if (!this.isPointInsideBlock(point)) return point;
- const unoffset = new Vec3d(rawNode.x, point.y, rawNode.z);
+ const unoffset = { x: rawNode.x, y: point.y, z: rawNode.z };
if (!this.isPointInsideBlock(unoffset)) return unoffset;
- const lowered = new Vec3d(rawNode.x, point.y - 0.5, rawNode.z);
+ const lowered = { x: rawNode.x, y: point.y - 0.5, z: rawNode.z };
return this.isPointInsideBlock(lowered) ? unoffset : lowered;
}
diff --git a/utils/pathfinder/PathWalker/PathAote.js b/utils/pathfinder/PathWalker/PathAote.js
index 12674377..5cc9ae78 100644
--- a/utils/pathfinder/PathWalker/PathAote.js
+++ b/utils/pathfinder/PathWalker/PathAote.js
@@ -1,5 +1,6 @@
import { Chat } from '../../Chat';
import { BP, SnowBlock } from '../../Constants';
+import { MathUtils } from '../../Math';
import { Utils } from '../../Utils';
import { Guis } from '../../player/Inventory';
import { Keybind } from '../../player/Keybinding';
@@ -244,17 +245,17 @@ class PathAote {
const player = Player.getPlayer();
if (!player) return false;
- const eyePos = player.getEyePos();
+ const eyePos = player.getEyePosition();
const target = rotations.getInterpolatedPoint(targetPathPosition);
if (!eyePos || !target) return false;
- const dx = target.x - eyePos.x;
- const dz = target.z - eyePos.z;
+ const dx = target.x - eyePos.x();
+ const dz = target.z - eyePos.z();
const horiz = Math.hypot(dx, dz);
if (horiz < 0.001) return true;
const targetYaw = -(Math.atan2(dx, dz) * (180 / Math.PI));
- const yawError = Math.abs(this.wrapAngle(targetYaw - player.getYaw()));
+ const yawError = Math.abs(this.wrapAngle(targetYaw - MathUtils.wrapTo180(player.getYRot())));
return yawError <= this.MAX_AIM_YAW_ERROR;
}
@@ -266,8 +267,8 @@ class PathAote {
}
getLookDirection(player) {
- const yawRad = (-player.getYaw() * Math.PI) / 180;
- const pitchRad = (-player.getPitch() * Math.PI) / 180;
+ const yawRad = (-MathUtils.wrapTo180(player.getYRot()) * Math.PI) / 180;
+ const pitchRad = (-player.getXRot() * Math.PI) / 180;
const cosPitch = Math.cos(pitchRad);
return {
x: Math.sin(yawRad) * cosPitch,
@@ -281,7 +282,7 @@ class PathAote {
const world = World.getWorld();
if (!player || !world) return 0;
- const start = player.getEyePos();
+ const start = player.getEyePosition();
if (!start) return 0;
const direction = this.getLookDirection(player);
@@ -411,10 +412,10 @@ class PathAote {
if (!finalPoint) return Number.MAX_VALUE;
const player = Player.getPlayer();
if (!player) return Number.MAX_VALUE;
- const eyes = player.getEyePos();
- const dx = eyes.x - finalPoint.x;
- const dy = eyes.y - finalPoint.y;
- const dz = eyes.z - finalPoint.z;
+ const eyes = player.getEyePosition();
+ const dx = eyes.x() - finalPoint.x;
+ const dy = eyes.y() - finalPoint.y;
+ const dz = eyes.z() - finalPoint.z;
return Math.hypot(dx, dy, dz);
}
diff --git a/utils/pathfinder/PathWalker/PathJumps.js b/utils/pathfinder/PathWalker/PathJumps.js
index 3961429c..15154c60 100644
--- a/utils/pathfinder/PathWalker/PathJumps.js
+++ b/utils/pathfinder/PathWalker/PathJumps.js
@@ -60,7 +60,7 @@ class PathJumps {
}
isBlockNonCollidable(world, blockVec) {
- const blockPosNMS = new BP(Math.floor(blockVec.x), Math.floor(blockVec.y), Math.floor(blockVec.z));
+ const blockPosNMS = new BP(Math.floor(blockVec.x()), Math.floor(blockVec.y()), Math.floor(blockVec.z()));
const blockState = world.getBlockState(blockPosNMS);
if (!blockState) return false;
return blockState.getCollisionShape(world, blockPosNMS).isEmpty();
@@ -193,7 +193,7 @@ class PathJumps {
if (this.getBlockName(data.block) !== 'minecraft:snow') return false;
const layers = this.getSnowLayers(data.block);
if (layers === 0) return false;
- const diff = data.vec.y - (8 - layers) * 0.125 - (Player.getY() - 1);
+ const diff = data.vec.y() - (8 - layers) * 0.125 - (Player.getY() - 1);
if (diff > 0.75 && layers > 6) {
if (PathConfig.PATHFINDING_DEBUG) Chat.messagePathfinder('Snow jump detected');
Keybind.setKey('space', true);
@@ -216,12 +216,12 @@ class PathJumps {
let canWalkInstead = false;
for (const data of lookahead) {
if (this.getBlockName(data.block).includes('snow')) continue;
- const heightDifference = data.vec.y - playerFloorY;
+ const heightDifference = data.vec.y() - playerFloorY;
if (heightDifference > stairClimbLimit) needsJump = true;
if (data.name.includes('slab')) {
canWalkInstead = true;
} else if (data.name.includes('stair')) {
- if (this.canWalkUpStairs(pX, pY, pZ, data.vec.x, data.vec.y, data.vec.z)) canWalkInstead = true;
+ if (this.canWalkUpStairs(pX, pY, pZ, data.vec.x(), data.vec.y(), data.vec.z())) canWalkInstead = true;
}
}
if (needsJump && !canWalkInstead) {
@@ -344,7 +344,7 @@ class PathJumps {
const player = Player.getPlayer();
if (!player) return this.reset();
- if (!player.isOnGround()) {
+ if (!player.onGround()) {
if (!Movement.isRecovering() && !this.isPlayerInFluid()) {
Keybind.setKey('space', false);
}
@@ -366,7 +366,7 @@ class PathJumps {
if (!Movement.isRecovering()) {
Keybind.setKey('space', false);
}
- this.lastLookaheadPositions = lookahead.map((d) => d.vec.y);
+ this.lastLookaheadPositions = lookahead.map((d) => d.vec.y());
}
reset() {
diff --git a/utils/pathfinder/PathWalker/PathRecovery.js b/utils/pathfinder/PathWalker/PathRecovery.js
index 5c10d9bc..1e8fd77b 100644
--- a/utils/pathfinder/PathWalker/PathRecovery.js
+++ b/utils/pathfinder/PathWalker/PathRecovery.js
@@ -54,7 +54,7 @@ class PathRecovery {
this.stuckPos = { x: pX, z: pZ };
}
- if (!player.isOnGround()) {
+ if (!player.onGround()) {
this.lastPos = { x: pX, z: pZ };
return null;
}
diff --git a/utils/pathfinder/PathWalker/PathRotations.js b/utils/pathfinder/PathWalker/PathRotations.js
index 849b5212..0709f640 100644
--- a/utils/pathfinder/PathWalker/PathRotations.js
+++ b/utils/pathfinder/PathWalker/PathRotations.js
@@ -108,15 +108,15 @@ class PathRotations {
}
isPointVisible(playerEyes, targetPoint) {
- const dx = targetPoint.x - playerEyes.x;
- const dy = targetPoint.y - playerEyes.y;
- const dz = targetPoint.z - playerEyes.z;
+ const dx = targetPoint.x - playerEyes.x();
+ const dy = targetPoint.y - playerEyes.y();
+ const dz = targetPoint.z - playerEyes.z();
const dist = Math.sqrt(dx * dx + dy * dy + dz * dz);
if (dist < 0.2) return true;
try {
const dir = new Vector3(dx / dist, dy / dist, dz / dist);
const hit = raytraceBlocks(
- [playerEyes.x, playerEyes.y, playerEyes.z],
+ [playerEyes.x(), playerEyes.y(), playerEyes.z()],
dir,
dist + 0.1,
(block) => {
@@ -136,9 +136,9 @@ class PathRotations {
const hitX = hit[0] + 0.5;
const hitY = hit[1] + 0.5;
const hitZ = hit[2] + 0.5;
- const hdx = hitX - playerEyes.x;
- const hdy = hitY - playerEyes.y;
- const hdz = hitZ - playerEyes.z;
+ const hdx = hitX - playerEyes.x();
+ const hdy = hitY - playerEyes.y();
+ const hdz = hitZ - playerEyes.z();
const hitDist = Math.sqrt(hdx * hdx + hdy * hdy + hdz * hdz);
return hitDist >= dist - 0.5;
} catch (e) {
@@ -169,9 +169,9 @@ class PathRotations {
const immediateT = Math.min(this.boxPositions.length - 1, this.currentPathPosition + 0.5);
const immediatePoint = this.getInterpolatedPoint(immediateT);
const vecImmediate = {
- x: immediatePoint.x - playerEyes.x,
- y: immediatePoint.y - playerEyes.y,
- z: immediatePoint.z - playerEyes.z,
+ x: immediatePoint.x - playerEyes.x(),
+ y: immediatePoint.y - playerEyes.y(),
+ z: immediatePoint.z - playerEyes.z(),
};
const inRecovery = this.isInRecoveryMode();
const effectiveMin = inRecovery ? this.RECOVERY_MIN_LOOKAHEAD : this.MIN_LOOKAHEAD;
@@ -179,9 +179,9 @@ class PathRotations {
while (lookahead >= effectiveMin) {
const t = Math.min(this.boxPositions.length - 1, this.currentPathPosition + lookahead);
const point = this.getInterpolatedPoint(t);
- const dx = point.x - playerEyes.x;
- const dy = point.y - playerEyes.y;
- const dz = point.z - playerEyes.z;
+ const dx = point.x - playerEyes.x();
+ const dy = point.y - playerEyes.y();
+ const dz = point.z - playerEyes.z();
const horzDist = Math.hypot(dx, dz);
if (lookahead >= this.MIN_LOOKAHEAD) {
if (dy > 1.8 && horzDist < 0.8) {
@@ -224,8 +224,8 @@ class PathRotations {
const targetIndex = Math.floor(this.currentPathPosition);
if (targetIndex + 3 >= this.boxPositions.length) return this.smoothedLookahead;
const pathPoint = this.getInterpolatedPoint(this.currentPathPosition);
- const pdx = playerEyes.x - pathPoint.x;
- const pdz = playerEyes.z - pathPoint.z;
+ const pdx = playerEyes.x() - pathPoint.x;
+ const pdz = playerEyes.z() - pathPoint.z;
const deviationFromPath = Math.sqrt(pdx * pdx + pdz * pdz);
const deviationFactor = Math.min(1, Math.max(0, (deviationFromPath - 1.6) / 2.0));
const startIndex = this.boxPositions[targetIndex];
@@ -275,7 +275,7 @@ class PathRotations {
updateLookPoint() {
const player = Player.getPlayer();
if (!player) return;
- const playerEyes = player.getEyePos();
+ const playerEyes = player.getEyePosition();
const motionY = Player.getMotionY();
const isFalling = motionY < -0.4 || this.isPathDropping();
@@ -313,7 +313,7 @@ class PathRotations {
const projectedPoint = this.getInterpolatedPoint(candidateT);
let distSq = isFalling
- ? Math.pow(playerEyes.x - projectedPoint.x, 2) + Math.pow(playerEyes.z - projectedPoint.z, 2)
+ ? Math.pow(playerEyes.x() - projectedPoint.x, 2) + Math.pow(playerEyes.z() - projectedPoint.z, 2)
: this.getDistSq(playerEyes, projectedPoint);
if (distSq < minDistanceSq) {
@@ -367,15 +367,15 @@ class PathRotations {
let targetPoint = result.point;
if (result.lookahead < this.smoothedLookahead) this.smoothedLookahead = this.smoothedLookahead * 0.9 + result.lookahead * 0.1;
- const rawDx = targetPoint.x - playerEyes.x;
- const rawDy = targetPoint.y - playerEyes.y;
- const rawDz = targetPoint.z - playerEyes.z;
+ const rawDx = targetPoint.x - playerEyes.x();
+ const rawDy = targetPoint.y - playerEyes.y();
+ const rawDz = targetPoint.z - playerEyes.z();
const rawHorz = Math.hypot(rawDx, rawDz);
const rawPitch = -Math.atan2(rawDy, rawHorz) * (180 / Math.PI);
if (rawPitch < -50 && rawHorz < 1.0) {
const newDy = rawHorz * Math.tan(30 * (Math.PI / 180));
- targetPoint = new Vec3d(targetPoint.x, playerEyes.y + newDy, targetPoint.z);
+ targetPoint = new Vec3d(targetPoint.x, playerEyes.y() + newDy, targetPoint.z);
}
if (isFalling && rawHorz < 0.5) {
@@ -383,14 +383,14 @@ class PathRotations {
targetPoint = this.getInterpolatedPoint(boostT);
}
- const dx = targetPoint.x - playerEyes.x;
- const dy = targetPoint.y - playerEyes.y;
- const dz = targetPoint.z - playerEyes.z;
+ const dx = targetPoint.x - playerEyes.x();
+ const dy = targetPoint.y - playerEyes.y();
+ const dz = targetPoint.z - playerEyes.z();
const dist = Math.hypot(dx, dy, dz);
if (dist > this.MAX_LOOK_DISTANCE) {
const scale = this.MAX_LOOK_DISTANCE / dist;
- targetPoint = new Vec3d(playerEyes.x + dx * scale, playerEyes.y + dy * scale, playerEyes.z + dz * scale);
+ targetPoint = new Vec3d(playerEyes.x() + dx * scale, playerEyes.y() + dy * scale, playerEyes.z() + dz * scale);
}
this.currentTargetPoint = targetPoint;
@@ -424,7 +424,7 @@ class PathRotations {
}
const lastPoint = this.boxPositions[lastIndex];
- const endDistSq = Math.pow(playerEyes.x - lastPoint.x, 2) + Math.pow(playerEyes.y - lastPoint.y, 2) + Math.pow(playerEyes.z - lastPoint.z, 2);
+ const endDistSq = Math.pow(playerEyes.x() - lastPoint.x, 2) + Math.pow(playerEyes.y() - lastPoint.y, 2) + Math.pow(playerEyes.z() - lastPoint.z, 2);
const nearEndBy3D = endDistSq <= Math.pow(this.COMPLETION_RADIUS, 2) && this.currentPathPosition >= lastIndex - 2.0;
const atEndByPosition = this.currentPathPosition >= lastIndex - 0.25;
@@ -480,7 +480,7 @@ class PathRotations {
const dz = p2.z - p1.z;
const dSq = dx * dx + dy * dy + dz * dz;
if (dSq === 0) return 0;
- return Math.max(0, Math.min(1, ((p.x - p1.x) * dx + (p.y - p1.y) * dy + (p.z - p1.z) * dz) / dSq));
+ return Math.max(0, Math.min(1, ((p.x() - p1.x) * dx + (p.y() - p1.y) * dy + (p.z() - p1.z) * dz) / dSq));
}
getClosestPointOnSegmentHorizontal(p, p1, p2) {
@@ -488,7 +488,7 @@ class PathRotations {
dz = p2.z - p1.z;
const dSq = dx * dx + dz * dz;
if (dSq === 0) return 0;
- return Math.max(0, Math.min(1, ((p.x - p1.x) * dx + (p.z - p1.z) * dz) / dSq));
+ return Math.max(0, Math.min(1, ((p.x() - p1.x) * dx + (p.z() - p1.z) * dz) / dSq));
}
projectPathPositionHorizontal(x, z, hint = 0) {
@@ -556,7 +556,7 @@ class PathRotations {
}
getDistSq(pos, box) {
- return (pos.x - box.x) ** 2 + (pos.y - box.y) ** 2 + (pos.z - box.z) ** 2;
+ return (pos.x() - box.x) ** 2 + (pos.y() - box.y) ** 2 + (pos.z() - box.z) ** 2;
}
pathRotations(splineData) {
@@ -571,8 +571,8 @@ class PathRotations {
}
const player = Player.getPlayer();
if (player && !this.isInitialized) {
- this.currentYaw = MathUtils.wrapTo180(player.getYaw());
- this.currentPitch = player.getPitch();
+ this.currentYaw = MathUtils.wrapTo180(player.getYRot());
+ this.currentPitch = player.getXRot();
this.rawTargetYaw = this.currentYaw;
this.rawTargetPitch = this.currentPitch;
this.yawVelocity = 0;
diff --git a/utils/pathfinder/PathWalker/PathRotationsUtility.js b/utils/pathfinder/PathWalker/PathRotationsUtility.js
index 00efd62c..4490b9fc 100644
--- a/utils/pathfinder/PathWalker/PathRotationsUtility.js
+++ b/utils/pathfinder/PathWalker/PathRotationsUtility.js
@@ -105,8 +105,8 @@ class PathRotsUtil {
return;
}
- this.initialYaw = player.getYaw();
- this.initialPitch = player.getPitch();
+ this.initialYaw = MathUtils.wrapTo180(player.getYRot());
+ this.initialPitch = player.getXRot();
this.yawDiff = this.wrapDegrees(yaw - this.initialYaw);
this.pitchDiff = pitch - this.initialPitch;
@@ -191,14 +191,14 @@ class PathRotsUtil {
rotateTo(vector, instant = false, durationMs = 500) {
let vec = Utils.convertToVector(vector);
let player = Player.getPlayer();
- if (!player || !vec || !Number.isFinite(vec.x) || !Number.isFinite(vec.y) || !Number.isFinite(vec.z)) return;
+ if (!player || !vec || !Number.isFinite(vec.x()) || !Number.isFinite(vec.y()) || !Number.isFinite(vec.z())) return;
let playerPos = player.getPos();
- let eyeHeight = player.getEyePos().y - playerPos.y;
+ let eyeHeight = player.getEyePosition().y() - playerPos.y();
- let dx = vec.x - playerPos.x;
- let dy = vec.y - (playerPos.y + eyeHeight);
- let dz = vec.z - playerPos.z;
+ let dx = vec.x() - playerPos.x();
+ let dy = vec.y() - (playerPos.y() + eyeHeight);
+ let dz = vec.z() - playerPos.z();
let targetYaw = Math.atan2(-dx, dz) * (180 / Math.PI);
let dist = Math.hypot(dx, dz);
@@ -241,7 +241,7 @@ class PathRotsUtil {
getPlayerRotation() {
const player = Player.getPlayer();
if (!player) return null;
- return { yaw: player.getYaw(), pitch: player.getPitch() };
+ return { yaw: MathUtils.wrapTo180(player.getYRot()), pitch: player.getXRot() };
}
}
diff --git a/utils/player/Inventory.js b/utils/player/Inventory.js
index 24f95c02..b5a6367b 100644
--- a/utils/player/Inventory.js
+++ b/utils/player/Inventory.js
@@ -1,5 +1,5 @@
import { Chat } from '../Chat';
-import { CloseHandledScreenC2S } from '../Packets';
+import { ServerboundContainerClosePacket } from '../Packets';
import { ScheduleTask } from '../ScheduleTask';
import { Keybind } from './Keybinding';
import { Rotations } from './Rotations';
@@ -79,16 +79,16 @@ class InterfaceHandler {
if (!player) return;
try {
- const syncId = Client.getMinecraft().player.currentScreenHandler.syncId;
+ const syncId = Client.getMinecraft().player.containerMenu.containerId;
if (syncId) {
- Client.sendPacket(new CloseHandledScreenC2S(syncId));
+ Client.sendPacket(new ServerboundContainerClosePacket(syncId));
}
if (Client.currentGui) {
Client.currentGui.close();
}
- Client.getMinecraft().options.attackKey.setPressed(false);
+ Client.getMinecraft().options.keyAttack.setDown(false);
} catch (e) {
console.error('V5 Caught error' + e + e.stack);
}
diff --git a/utils/player/Keybinding.js b/utils/player/Keybinding.js
index 56dd1dc2..2789cd4a 100644
--- a/utils/player/Keybinding.js
+++ b/utils/player/Keybinding.js
@@ -1,10 +1,10 @@
import { BP, BlockHitResult, Direction, MCHand, Vec3d } from '../Constants';
-import { PlayerInteractBlockC2S } from '../Packets';
+import { ServerboundUseItemOnPacket } from '../Packets';
import { ScheduleTask } from '../ScheduleTask';
import { Utils, mc } from '../Utils';
-const LEFT_CLICK_METHOD = mc.getClass().getDeclaredMethod('method_1536');
-const RIGHT_CLICK_METHOD = mc.getClass().getDeclaredMethod('method_1583');
+const LEFT_CLICK_METHOD = mc.getClass().getDeclaredMethod('startAttack'); // mojmap: startAttack
+const RIGHT_CLICK_METHOD = mc.getClass().getDeclaredMethod('startUseItem'); // mojmap: startUseItem
LEFT_CLICK_METHOD.setAccessible(true);
RIGHT_CLICK_METHOD.setAccessible(true);
@@ -37,7 +37,7 @@ class ControlSystem {
const bp = new BP(x, y, z);
const hitResult = new BlockHitResult(new Vec3d(x + 0.5, y + 0.5, z + 0.5), Direction.UP, bp, false);
const action = () => {
- Client.sendPacket(new PlayerInteractBlockC2S(MCHand.MAIN_HAND, hitResult, 0));
+ Client.sendPacket(new ServerboundUseItemOnPacket(MCHand.MAIN_HAND, hitResult, 0));
};
if (!delay || delay <= 0) action();
@@ -48,28 +48,18 @@ class ControlSystem {
const guiOpen = this.isGuiOpen();
if (action === 'leftclick') {
- const attackKey = mc.options.attackKey;
+ const attackKey = mc.options.keyAttack;
if (isPressed && guiOpen) return false;
if (isPressed) {
- const mouseGrabbed = net.minecraft.client.Mouse.class.getDeclaredField('field_1783');
+ const mouseGrabbed = net.minecraft.client.MouseHandler.class.getDeclaredField('mouseGrabbed'); // mojmap: mouseGrabbed
mouseGrabbed.setAccessible(true);
- mouseGrabbed.setBoolean(Client.getMinecraft().mouse, true);
+ mouseGrabbed.setBoolean(Client.getMinecraft().mouseHandler, true);
}
ScheduleTask(() => {
- attackKey.setPressed(!!isPressed);
- });
-
- return true;
- }
-
- if (action === 'rightclick') {
- const useKey = mc.options.useKey;
-
- ScheduleTask(() => {
- useKey.setPressed(!!isPressed);
+ attackKey.setDown(!!isPressed);
});
return true;
@@ -79,19 +69,20 @@ class ControlSystem {
const options = mc.options;
const mapping = {
- w: options.forwardKey,
- s: options.backKey,
- a: options.leftKey,
- d: options.rightKey,
- space: options.jumpKey,
- shift: options.sneakKey,
- sprint: options.sprintKey,
+ w: options.keyUp,
+ s: options.keyDown,
+ a: options.keyLeft,
+ d: options.keyRight,
+ space: options.keyJump,
+ shift: options.keyShift,
+ sprint: options.keySprint,
+ rightclick: options.keyUse,
};
const keyObj = mapping[action];
if (keyObj) {
ScheduleTask(() => {
- keyObj.setPressed(!!isPressed);
+ keyObj.setDown(!!isPressed);
});
return true;
}
@@ -101,16 +92,17 @@ class ControlSystem {
checkKeyDown(key) {
const options = mc.options;
const mapping = {
- w: options.forwardKey,
- s: options.backKey,
- a: options.leftKey,
- d: options.rightKey,
- space: options.jumpKey,
- shift: options.sneakKey,
- leftclick: options.attackKey,
- sprint: options.sprintKey,
+ w: options.keyUp,
+ s: options.keyDown,
+ a: options.keyLeft,
+ d: options.keyRight,
+ space: options.keyJump,
+ shift: options.keyShift,
+ leftclick: options.keyAttack,
+ sprint: options.keySprint,
+ rightclick: options.keyUse,
};
- return mapping[key] ? mapping[key].isPressed() : false;
+ return mapping[key] ? mapping[key].isDown() : false;
}
setMovementByYaw(yaw, shouldJump) {
@@ -184,6 +176,7 @@ class ControlSystem {
this.haltMovement();
this.updateKeyState('shift', false);
this.updateKeyState('leftclick', false);
+ this.updateKeyState('rightclick', false);
}
refreshCooldown() {
diff --git a/utils/player/RotationGCD.js b/utils/player/RotationGCD.js
index 7ccf128d..93ee9d9e 100644
--- a/utils/player/RotationGCD.js
+++ b/utils/player/RotationGCD.js
@@ -8,7 +8,7 @@ class SharedRotationGCD {
}
calculateGCD() {
- const sensitivity = Client.getMinecraft().options.mouseSensitivity.value;
+ const sensitivity = Client.getMinecraft().options.sensitivity().get();
const f = sensitivity * 0.6 + 0.2;
return f * f * f * 1.2;
}
@@ -45,19 +45,19 @@ class SharedRotationGCD {
syncFromPlayer(yaw = null, pitch = null, player = Player.getPlayer()) {
if (!player) return false;
- this.lastYaw = Number.isFinite(yaw) ? yaw : player.getYaw();
- this.lastPitch = Number.isFinite(pitch) ? this.clampPitch(pitch) : this.clampPitch(player.getPitch());
+ this.lastYaw = Number.isFinite(yaw) ? yaw : this.normalizeAngle(player.getYRot());
+ this.lastPitch = Number.isFinite(pitch) ? this.clampPitch(pitch) : this.clampPitch(player.getXRot());
this.initialized = true;
return true;
}
resyncIfDrifted(player, gcd) {
- const yawDrift = Math.abs(this.angleDifference(this.lastYaw, player.getYaw()));
- const pitchDrift = Math.abs(player.getPitch() - this.lastPitch);
+ const yawDrift = Math.abs(this.angleDifference(this.lastYaw, this.normalizeAngle(player.getYRot())));
+ const pitchDrift = Math.abs(player.getXRot() - this.lastPitch);
if (yawDrift > gcd * 2 || pitchDrift > gcd * 2) {
- this.lastYaw = player.getYaw();
- this.lastPitch = player.getPitch();
+ this.lastYaw = this.normalizeAngle(player.getYRot());
+ this.lastPitch = player.getXRot();
}
}
@@ -69,8 +69,8 @@ class SharedRotationGCD {
}
return {
- yaw: this.initialized ? this.lastYaw : player.getYaw(),
- pitch: this.initialized ? this.lastPitch : player.getPitch(),
+ yaw: this.initialized ? this.lastYaw : this.normalizeAngle(player.getYRot()),
+ pitch: this.initialized ? this.lastPitch : player.getXRot(),
};
}
@@ -95,8 +95,8 @@ class SharedRotationGCD {
this.lastPitch = gcdPitch;
this.lastApplyAt = now;
- player.setYaw(gcdYaw);
- player.setPitch(gcdPitch);
+ player.setYRot(gcdYaw);
+ player.setXRot(gcdPitch);
return { yaw: gcdYaw, pitch: gcdPitch };
}
diff --git a/utils/player/Rotations.js b/utils/player/Rotations.js
index 99c133b5..d28a65d9 100644
--- a/utils/player/Rotations.js
+++ b/utils/player/Rotations.js
@@ -352,9 +352,9 @@ class RotationController {
const player = Player.getPlayer();
if (!vec || !player) return null;
- const dx = vec.x - player.getX();
- const dy = vec.y - player.getEyePos().y;
- const dz = vec.z - player.getZ();
+ const dx = vec.x() - player.getX();
+ const dy = vec.y() - player.getEyePosition().y();
+ const dz = vec.z() - player.getZ();
return {
yaw: Math.atan2(-dx, dz) * (180 / Math.PI),
diff --git a/utils/player/ServerInfo.js b/utils/player/ServerInfo.js
index 1d23f775..59441c62 100644
--- a/utils/player/ServerInfo.js
+++ b/utils/player/ServerInfo.js
@@ -1,5 +1,5 @@
import { System } from '../Constants';
-import { ClientStatusC2S, CommonPingS2C, GameJoinS2C, StatisticsS2C } from '../Packets';
+import { ServerboundClientCommandPacket, ClientboundPingPacket, ClientboundLoginPacket, ClientboundAwardStatsPacket } from '../Packets';
class NetworkMonitor {
constructor() {
@@ -65,7 +65,7 @@ class NetworkMonitor {
sendPingRequest() {
if (!Player.getPlayer()) return;
if (!this.waitingForPing) {
- Client.sendPacket(new ClientStatusC2S(ClientStatusC2S.class_2800.REQUEST_STATS));
+ Client.sendPacket(new ServerboundClientCommandPacket(ServerboundClientCommandPacket.Action.REQUEST_STATS)); // mojmap: ServerboundClientCommandPacket$Action.REQUEST_STATS
this.pingStartNano = System.nanoTime();
this.waitingForPing = true;
}
@@ -101,15 +101,15 @@ register('worldLoad', () => monitor.reset());
register('packetReceived', (packet) => {
monitor.recordTpsPacket();
-}).setFilteredClass(CommonPingS2C);
+}).setFilteredClass(ClientboundPingPacket);
register('packetReceived', (packet) => {
monitor.resolvePing();
-}).setFilteredClass(StatisticsS2C);
+}).setFilteredClass(ClientboundAwardStatsPacket);
register('packetReceived', () => {
monitor.waitingForPing = false;
-}).setFilteredClass(GameJoinS2C);
+}).setFilteredClass(ClientboundLoginPacket);
register('step', () => {
monitor.sendPingRequest();
diff --git a/utils/world/WorldScanner.js b/utils/world/WorldScanner.js
index 031dca49..9036c10b 100644
--- a/utils/world/WorldScanner.js
+++ b/utils/world/WorldScanner.js
@@ -1,10 +1,10 @@
-import { BlockUpdateS2C, ChunkDataS2C } from '../../utils/Packets';
+import { ClientboundBlockUpdatePacket, ClientboundLevelChunkWithLightPacket } from '../../utils/Packets';
import { manager } from '../../utils/SkyblockEvents';
const Long2ObjectOpenHashMap = Java.type('it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap');
const ReentrantLock = Java.type('java.util.concurrent.locks.ReentrantLock');
-const ChunkPos = net.minecraft.util.math.ChunkPos;
-const BP = net.minecraft.util.math.BlockPos;
+const ChunkPos = net.minecraft.world.level.ChunkPos;
+const BP = net.minecraft.core.BlockPos;
const Runnable = java.lang.Runnable;
class Scanner {
@@ -25,12 +25,12 @@ class Scanner {
init() {
this.onChunkData = register('packetReceived', (packet) => {
- const cx = packet?.getChunkX();
- const cz = packet?.getChunkZ();
+ const cx = packet?.getX();
+ const cz = packet?.getZ();
if (!Number.isFinite(cx) || !Number.isFinite(cz)) return;
setTimeout(() => this.searchChunk(cx, cz), 50);
})
- .setFilteredClass(ChunkDataS2C)
+ .setFilteredClass(ClientboundLevelChunkWithLightPacket)
.unregister();
this.onBlockUpdate = register('packetReceived', (packet) => {
@@ -38,7 +38,7 @@ class Scanner {
if (!pos) return;
this.updateBlock(pos.getX(), pos.getY(), pos.getZ());
})
- .setFilteredClass(BlockUpdateS2C)
+ .setFilteredClass(ClientboundBlockUpdatePacket)
.unregister();
manager.subscribe('warp', () => this.clear());
@@ -92,14 +92,14 @@ class Scanner {
run: () => {
try {
if (!this.enabled) return;
- const world = Client.getMinecraft().world;
+ const world = Client.getMinecraft().level;
const chunk = world?.getChunk(cx, cz);
if (!world || !chunk || chunk.isEmpty()) return;
const found = [];
const sections = chunk.getSectionArray();
if (!sections) return;
- const minY = world.getBottomY();
+ const minY = world.getMinY();
for (let sIndex = 0; sIndex < sections.length; sIndex++) {
const section = sections[sIndex];
@@ -153,7 +153,7 @@ class Scanner {
run: () => {
try {
if (!this.enabled) return;
- const world = Client.getMinecraft().world;
+ const world = Client.getMinecraft().level;
if (!world) return;
const state = world.getBlockState(new BP(bx, by, bz));
From ab18e83eaf578706a04a54db5a7c04db56c654ba Mon Sep 17 00:00:00 2001
From: rdbtCVS <87152661+rdbtCVS@users.noreply.github.com>
Date: Fri, 3 Jul 2026 13:54:08 +0100
Subject: [PATCH 2/7] Update typings
---
typings.d.ts | 93974 +++++++++++++++++++++++++------------------------
1 file changed, 48246 insertions(+), 45728 deletions(-)
diff --git a/typings.d.ts b/typings.d.ts
index a893fdd5..bb73a5d4 100644
--- a/typings.d.ts
+++ b/typings.d.ts
@@ -2,6 +2,18 @@
///
export {};
+declare interface String {
+ addFormatting(): string;
+ addColor(): string;
+ removeFormatting(): string;
+ replaceFormatting(): string;
+}
+
+declare interface Number {
+ easeOut(to: number, speed: number, jump: number): number;
+ easeColor(to: number, speed: number, jump: number): java.awt.Color;
+}
+
interface RegisterTypes {
chat(...args: (string | unknown)[]): com.chattriggers.ctjs.api.triggers.ChatTrigger;
actionBar(...args: (string | unknown)[]): com.chattriggers.ctjs.api.triggers.ChatTrigger;
@@ -45,18 +57,6 @@ interface RegisterTypes {
}
declare global {
- interface String {
- addFormatting(): string;
- addColor(): string;
- removeFormatting(): string;
- replaceFormatting(): string;
- }
-
- interface Number {
- easeOut(to: number, speed: number, jump: number): number;
- easeColor(to: number, speed: number, jump: number): java.awt.Color;
- }
-
const Java: {
/**
* Returns the Java Class or Package given by name. If you want to
@@ -90,8 +90,6 @@ declare global {
const Keyboard: typeof gg.essential.universal.UKeyboard;
interface Keyboard extends gg.essential.universal.UKeyboard {}
- const Hand: typeof net.minecraft.util.Hand;
- interface Hand extends net.minecraft.util.Hand {}
const Client: typeof com.chattriggers.ctjs.api.client.Client;
interface Client extends com.chattriggers.ctjs.api.client.Client {}
const CPS: typeof com.chattriggers.ctjs.api.client.CPS;
@@ -222,8 +220,6 @@ declare global {
interface GradientChat extends com.chattriggers.ctjs.api.message.Chat {}
const NVG: typeof com.chattriggers.ctjs.api.render.NVGRenderer;
interface NVG extends com.chattriggers.ctjs.api.render.NVGRenderer {}
- const XrayPackage: typeof com.chattriggers.ctjs.api.render.Xray;
- interface XrayPackage extends com.chattriggers.ctjs.api.render.Xray {}
const StructureFinder: typeof com.chattriggers.ctjs.api.world.StructureFinder;
interface StructureFinder extends com.chattriggers.ctjs.api.world.StructureFinder {}
const PathManager: typeof com.chattriggers.ctjs.api.world.pathfinding.PathManager;
@@ -325,7 +321,7 @@ declare global {
const RenderableImage: {
HINTS_OBSERVED: string;
}
- interface RenderableImage {
+ interface RenderableImage extends any {
getSources(): java.util.Vector;
getProperty(p0: string): any;
getPropertyNames(): Array;
@@ -358,12 +354,12 @@ declare global {
}
}
const ColorModel: {
- getRGBdefault(): java.awt.image.ColorModel;
new(p0: number): java.awt.image.ColorModel;
+ getRGBdefault(): java.awt.image.ColorModel;
}
interface ColorModel extends java.awt.Transparency {
- hasAlpha(): boolean;
isAlphaPremultiplied(): boolean;
+ hasAlpha(): boolean;
getTransferType(): number;
getPixelSize(): number;
getComponentSize(p0: number): number;
@@ -435,7 +431,7 @@ declare global {
createWritableRaster(p0: java.awt.image.SampleModel, p1: java.awt.Point): java.awt.image.WritableRaster;
createWritableRaster(p0: java.awt.image.SampleModel, p1: java.awt.image.DataBuffer, p2: java.awt.Point): java.awt.image.WritableRaster;
}
- interface Raster {
+ interface Raster extends any {
getParent(): java.awt.image.Raster;
getSampleModelTranslateX(): number;
getSampleModelTranslateY(): number;
@@ -470,39 +466,10 @@ declare global {
getSamples(p0: number, p1: number, p2: number, p3: number, p4: number, p5: kotlin.FloatArray): kotlin.FloatArray;
getSamples(p0: number, p1: number, p2: number, p3: number, p4: number, p5: kotlin.DoubleArray): kotlin.DoubleArray;
}
- const DataBuffer: {
- TYPE_BYTE: number;
- TYPE_USHORT: number;
- TYPE_SHORT: number;
- TYPE_INT: number;
- TYPE_FLOAT: number;
- TYPE_DOUBLE: number;
- TYPE_UNDEFINED: number;
- getDataTypeSize(p0: number): number;
- }
- interface DataBuffer {
- getDataType(): number;
- getSize(): number;
- getOffset(): number;
- getOffsets(): Array;
- getNumBanks(): number;
- getElem(p0: number): number;
- getElem(p0: number, p1: number): number;
- setElem(p0: number, p1: number): void;
- setElem(p0: number, p1: number, p2: number): void;
- getElemFloat(p0: number): number;
- getElemFloat(p0: number, p1: number): number;
- setElemFloat(p0: number, p1: number): void;
- setElemFloat(p0: number, p1: number, p2: number): void;
- getElemDouble(p0: number): number;
- getElemDouble(p0: number, p1: number): number;
- setElemDouble(p0: number, p1: number): void;
- setElemDouble(p0: number, p1: number, p2: number): void;
- }
const SampleModel: {
new(p0: number, p1: number, p2: number, p3: number): java.awt.image.SampleModel;
}
- interface SampleModel {
+ interface SampleModel extends any {
getWidth(): number;
getHeight(): number;
getNumBands(): number;
@@ -543,6 +510,35 @@ declare global {
getSampleSize(): Array;
getSampleSize(p0: number): number;
}
+ const DataBuffer: {
+ TYPE_BYTE: number;
+ TYPE_USHORT: number;
+ TYPE_SHORT: number;
+ TYPE_INT: number;
+ TYPE_FLOAT: number;
+ TYPE_DOUBLE: number;
+ TYPE_UNDEFINED: number;
+ getDataTypeSize(p0: number): number;
+ }
+ interface DataBuffer extends any {
+ getDataType(): number;
+ getSize(): number;
+ getOffset(): number;
+ getOffsets(): Array;
+ getNumBanks(): number;
+ getElem(p0: number): number;
+ getElem(p0: number, p1: number): number;
+ setElem(p0: number, p1: number): void;
+ setElem(p0: number, p1: number, p2: number): void;
+ getElemFloat(p0: number): number;
+ getElemFloat(p0: number, p1: number): number;
+ setElemFloat(p0: number, p1: number): void;
+ setElemFloat(p0: number, p1: number, p2: number): void;
+ getElemDouble(p0: number): number;
+ getElemDouble(p0: number, p1: number): number;
+ setElemDouble(p0: number, p1: number): void;
+ setElemDouble(p0: number, p1: number, p2: number): void;
+ }
const BufferedImage: {
TYPE_CUSTOM: number;
TYPE_INT_RGB: number;
@@ -585,10 +581,10 @@ declare global {
ERROR: number;
ABORT: number;
}
- interface ImageObserver {
+ interface ImageObserver extends any {
imageUpdate(p0: java.awt.Image, p1: number, p2: number, p3: number, p4: number, p5: number): boolean;
}
- interface ImageProducer {
+ interface ImageProducer extends any {
addConsumer(p0: java.awt.image.ImageConsumer): void;
isConsumer(p0: java.awt.image.ImageConsumer): boolean;
removeConsumer(p0: java.awt.image.ImageConsumer): void;
@@ -606,7 +602,7 @@ declare global {
STATICIMAGEDONE: number;
IMAGEABORTED: number;
}
- interface ImageConsumer {
+ interface ImageConsumer extends any {
setDimensions(p0: number, p1: number): void;
setProperties(p0: java.util.Hashtable): void;
setColorModel(p0: java.awt.image.ColorModel): void;
@@ -621,22 +617,22 @@ declare global {
IMAGE_INCOMPATIBLE: number;
}
interface VolatileImage extends java.awt.Image, java.awt.Transparency {
+ getSnapshot(): java.awt.image.BufferedImage;
getWidth(): number;
getHeight(): number;
- getCapabilities(): java.awt.ImageCapabilities;
- getSnapshot(): java.awt.image.BufferedImage;
createGraphics(): java.awt.Graphics2D;
validate(p0: java.awt.GraphicsConfiguration): number;
contentsLost(): boolean;
+ getCapabilities(): java.awt.ImageCapabilities;
}
- interface BufferedImageOp {
+ interface BufferedImageOp extends any {
filter(p0: java.awt.image.BufferedImage, p1: java.awt.image.BufferedImage): java.awt.image.BufferedImage;
getBounds2D(p0: java.awt.image.BufferedImage): java.awt.geom.Rectangle2D;
createCompatibleDestImage(p0: java.awt.image.BufferedImage, p1: java.awt.image.ColorModel): java.awt.image.BufferedImage;
getPoint2D(p0: java.awt.geom.Point2D, p1: java.awt.geom.Point2D): java.awt.geom.Point2D;
getRenderingHints(): java.awt.RenderingHints;
}
- interface RenderedImage {
+ interface RenderedImage extends any {
getSources(): java.util.Vector;
getProperty(p0: string): any;
getPropertyNames(): Array;
@@ -659,7 +655,7 @@ declare global {
getData(p0: java.awt.Rectangle): java.awt.image.Raster;
copyData(p0: java.awt.image.WritableRaster): java.awt.image.WritableRaster;
}
- interface BufferStrategy {
+ interface BufferStrategy extends any {
getCapabilities(): java.awt.BufferCapabilities;
getDrawGraphics(): java.awt.Graphics;
contentsLost(): boolean;
@@ -677,7 +673,7 @@ declare global {
hasTileWriters(): boolean;
setData(p0: java.awt.image.Raster): void;
}
- interface TileObserver {
+ interface TileObserver extends any {
tileUpdate(p0: java.awt.image.WritableRenderedImage, p1: number, p2: number, p3: boolean): void;
}
const IndexColorModel: {
@@ -752,8 +748,8 @@ declare global {
}
namespace geom {
const Rectangle2D: {
- Float: typeof java.awt.geom.Rectangle2D$Float;
Double: typeof java.awt.geom.Rectangle2D$Double;
+ Float: typeof java.awt.geom.Rectangle2D$Float;
OUT_LEFT: number;
OUT_TOP: number;
OUT_RIGHT: number;
@@ -796,8 +792,8 @@ declare global {
setFrameFromCenter(p0: java.awt.geom.Point2D, p1: java.awt.geom.Point2D): void;
}
const Point2D: {
- Float: typeof java.awt.geom.Point2D$Float;
Double: typeof java.awt.geom.Point2D$Double;
+ Float: typeof java.awt.geom.Point2D$Float;
distanceSq(p0: number, p1: number, p2: number, p3: number): number;
distance(p0: number, p1: number, p2: number, p3: number): number;
}
@@ -811,6 +807,14 @@ declare global {
distance(p0: number, p1: number): number;
distance(p0: java.awt.geom.Point2D): number;
}
+ const Point2D$Double: {
+ new(): java.awt.geom.Point2D$Double;
+ new(p0: number, p1: number): java.awt.geom.Point2D$Double;
+ }
+ interface Point2D$Double extends java.awt.geom.Point2D, java.io.Serializable {
+ x: number;
+ y: number;
+ }
const Point2D$Float: {
new(): java.awt.geom.Point2D$Float;
new(p0: number, p1: number): java.awt.geom.Point2D$Float;
@@ -820,14 +824,6 @@ declare global {
y: number;
setLocation(p0: number, p1: number): void;
}
- const Point2D$Double: {
- new(): java.awt.geom.Point2D$Double;
- new(p0: number, p1: number): java.awt.geom.Point2D$Double;
- }
- interface Point2D$Double extends java.awt.geom.Point2D, java.io.Serializable {
- x: number;
- y: number;
- }
const AffineTransform: {
TYPE_IDENTITY: number;
TYPE_TRANSLATION: number;
@@ -839,6 +835,12 @@ declare global {
TYPE_GENERAL_ROTATION: number;
TYPE_MASK_ROTATION: number;
TYPE_GENERAL_TRANSFORM: number;
+ new(): java.awt.geom.AffineTransform;
+ new(p0: java.awt.geom.AffineTransform): java.awt.geom.AffineTransform;
+ new(p0: number, p1: number, p2: number, p3: number, p4: number, p5: number): java.awt.geom.AffineTransform;
+ new(p0: kotlin.FloatArray): java.awt.geom.AffineTransform;
+ new(p0: number, p1: number, p2: number, p3: number, p4: number, p5: number): java.awt.geom.AffineTransform;
+ new(p0: kotlin.DoubleArray): java.awt.geom.AffineTransform;
getTranslateInstance(p0: number, p1: number): java.awt.geom.AffineTransform;
getRotateInstance(p0: number): java.awt.geom.AffineTransform;
getRotateInstance(p0: number, p1: number, p2: number): java.awt.geom.AffineTransform;
@@ -848,12 +850,6 @@ declare global {
getQuadrantRotateInstance(p0: number, p1: number, p2: number): java.awt.geom.AffineTransform;
getScaleInstance(p0: number, p1: number): java.awt.geom.AffineTransform;
getShearInstance(p0: number, p1: number): java.awt.geom.AffineTransform;
- new(): java.awt.geom.AffineTransform;
- new(p0: java.awt.geom.AffineTransform): java.awt.geom.AffineTransform;
- new(p0: number, p1: number, p2: number, p3: number, p4: number, p5: number): java.awt.geom.AffineTransform;
- new(p0: kotlin.FloatArray): java.awt.geom.AffineTransform;
- new(p0: number, p1: number, p2: number, p3: number, p4: number, p5: number): java.awt.geom.AffineTransform;
- new(p0: kotlin.DoubleArray): java.awt.geom.AffineTransform;
}
interface AffineTransform extends kotlin.Cloneable, java.io.Serializable {
getType(): number;
@@ -912,7 +908,7 @@ declare global {
SEG_CUBICTO: number;
SEG_CLOSE: number;
}
- interface PathIterator {
+ interface PathIterator extends any {
getWindingRule(): number;
isDone(): boolean;
next(): void;
@@ -925,30 +921,9 @@ declare global {
setSize(p0: number, p1: number): void;
setSize(p0: java.awt.geom.Dimension2D): void;
}
- const Rectangle2D$Float: {
- new(): java.awt.geom.Rectangle2D$Float;
- new(p0: number, p1: number, p2: number, p3: number): java.awt.geom.Rectangle2D$Float;
- }
- interface Rectangle2D$Float extends java.awt.geom.Rectangle2D, java.io.Serializable {
- x: number;
- y: number;
- width: number;
- height: number;
- setRect(p0: number, p1: number, p2: number, p3: number): void;
- }
- const Rectangle2D$Double: {
- new(): java.awt.geom.Rectangle2D$Double;
- new(p0: number, p1: number, p2: number, p3: number): java.awt.geom.Rectangle2D$Double;
- }
- interface Rectangle2D$Double extends java.awt.geom.Rectangle2D, java.io.Serializable {
- x: number;
- y: number;
- width: number;
- height: number;
- }
const Line2D: {
- Float: typeof java.awt.geom.Line2D$Float;
Double: typeof java.awt.geom.Line2D$Double;
+ Float: typeof java.awt.geom.Line2D$Float;
relativeCCW(p0: number, p1: number, p2: number, p3: number, p4: number, p5: number): number;
linesIntersect(p0: number, p1: number, p2: number, p3: number, p4: number, p5: number, p6: number, p7: number): boolean;
ptSegDistSq(p0: number, p1: number, p2: number, p3: number, p4: number, p5: number): number;
@@ -979,6 +954,17 @@ declare global {
ptLineDist(p0: number, p1: number): number;
ptLineDist(p0: java.awt.geom.Point2D): number;
}
+ const Line2D$Double: {
+ new(): java.awt.geom.Line2D$Double;
+ new(p0: number, p1: number, p2: number, p3: number): java.awt.geom.Line2D$Double;
+ new(p0: java.awt.geom.Point2D, p1: java.awt.geom.Point2D): java.awt.geom.Line2D$Double;
+ }
+ interface Line2D$Double extends java.awt.geom.Line2D, java.io.Serializable {
+ x1: number;
+ y1: number;
+ x2: number;
+ y2: number;
+ }
const Line2D$Float: {
new(): java.awt.geom.Line2D$Float;
new(p0: number, p1: number, p2: number, p3: number): java.awt.geom.Line2D$Float;
@@ -991,16 +977,26 @@ declare global {
y2: number;
setLine(p0: number, p1: number, p2: number, p3: number): void;
}
- const Line2D$Double: {
- new(): java.awt.geom.Line2D$Double;
- new(p0: number, p1: number, p2: number, p3: number): java.awt.geom.Line2D$Double;
- new(p0: java.awt.geom.Point2D, p1: java.awt.geom.Point2D): java.awt.geom.Line2D$Double;
+ const Rectangle2D$Double: {
+ new(): java.awt.geom.Rectangle2D$Double;
+ new(p0: number, p1: number, p2: number, p3: number): java.awt.geom.Rectangle2D$Double;
}
- interface Line2D$Double extends java.awt.geom.Line2D, java.io.Serializable {
- x1: number;
- y1: number;
- x2: number;
- y2: number;
+ interface Rectangle2D$Double extends java.awt.geom.Rectangle2D, java.io.Serializable {
+ x: number;
+ y: number;
+ width: number;
+ height: number;
+ }
+ const Rectangle2D$Float: {
+ new(): java.awt.geom.Rectangle2D$Float;
+ new(p0: number, p1: number, p2: number, p3: number): java.awt.geom.Rectangle2D$Float;
+ }
+ interface Rectangle2D$Float extends java.awt.geom.Rectangle2D, java.io.Serializable {
+ x: number;
+ y: number;
+ width: number;
+ height: number;
+ setRect(p0: number, p1: number, p2: number, p3: number): void;
}
}
namespace font {
@@ -1008,7 +1004,7 @@ declare global {
new(p0: java.awt.geom.AffineTransform, p1: boolean, p2: boolean): java.awt.font.FontRenderContext;
new(p0: java.awt.geom.AffineTransform, p1: any, p2: any): java.awt.font.FontRenderContext;
}
- interface FontRenderContext {
+ interface FontRenderContext extends any {
isTransformed(): boolean;
getTransformType(): number;
getTransform(): java.awt.geom.AffineTransform;
@@ -1017,7 +1013,7 @@ declare global {
getAntiAliasingHint(): any;
getFractionalMetricsHint(): any;
}
- interface LineMetrics {
+ interface LineMetrics extends any {
getNumChars(): number;
getAscent(): number;
getDescent(): number;
@@ -1074,7 +1070,7 @@ declare global {
new(p0: number, p1: java.awt.geom.Rectangle2D, p2: number): java.awt.font.GlyphMetrics;
new(p0: boolean, p1: number, p2: number, p3: java.awt.geom.Rectangle2D, p4: number): java.awt.font.GlyphMetrics;
}
- interface GlyphMetrics {
+ interface GlyphMetrics extends any {
getAdvance(): number;
getAdvanceX(): number;
getAdvanceY(): number;
@@ -1095,7 +1091,7 @@ declare global {
PRIORITY_NONE: number;
new(p0: number, p1: boolean, p2: number, p3: number, p4: number, p5: boolean, p6: number, p7: number, p8: number): java.awt.font.GlyphJustificationInfo;
}
- interface GlyphJustificationInfo {
+ interface GlyphJustificationInfo extends any {
weight: number;
growPriority: number;
growAbsorb: boolean;
@@ -1112,9 +1108,9 @@ declare global {
beforeOffset(p0: number): java.awt.font.TextHitInfo;
afterOffset(p0: number): java.awt.font.TextHitInfo;
}
- interface TextHitInfo {
- getCharIndex(): number;
+ interface TextHitInfo extends any {
isLeadingEdge(): boolean;
+ getCharIndex(): number;
getInsertionIndex(): number;
getOtherHit(): java.awt.font.TextHitInfo;
getOffsetHit(p0: number): java.awt.font.TextHitInfo;
@@ -1165,8 +1161,9 @@ declare global {
UNEXPECTED: java.awt.event.FocusEvent$Cause;
ACTIVATION: java.awt.event.FocusEvent$Cause;
CLEAR_GLOBAL_FOCUS_OWNER: java.awt.event.FocusEvent$Cause;
- valueOf(value: string): java.awt.event.FocusEvent$Cause;
+ entries: kotlin.enums.EnumEntries;
values(): Array;
+ valueOf(value: string): java.awt.event.FocusEvent$Cause;
}
interface FocusEvent$Cause extends kotlin.Enum {
}
@@ -1460,12 +1457,12 @@ declare global {
KEY_LOCATION_LEFT: number;
KEY_LOCATION_RIGHT: number;
KEY_LOCATION_NUMPAD: number;
- getKeyText(p0: number): string;
- getKeyModifiersText(p0: number): string;
- getExtendedKeyCodeForChar(p0: number): number;
new(p0: java.awt.Component, p1: number, p2: number, p3: number, p4: number, p5: number, p6: number): java.awt.event.KeyEvent;
new(p0: java.awt.Component, p1: number, p2: number, p3: number, p4: number, p5: number): java.awt.event.KeyEvent;
new(p0: java.awt.Component, p1: number, p2: number, p3: number, p4: number): java.awt.event.KeyEvent;
+ getKeyText(p0: number): string;
+ getKeyModifiersText(p0: number): string;
+ getExtendedKeyCodeForChar(p0: number): number;
}
interface KeyEvent extends java.awt.event.InputEvent {
getKeyCode(): number;
@@ -1499,10 +1496,10 @@ declare global {
BUTTON1: number;
BUTTON2: number;
BUTTON3: number;
- getMouseModifiersText(p0: number): string;
new(p0: java.awt.Component, p1: number, p2: number, p3: number, p4: number, p5: number, p6: number, p7: boolean, p8: number): java.awt.event.MouseEvent;
new(p0: java.awt.Component, p1: number, p2: number, p3: number, p4: number, p5: number, p6: number, p7: boolean): java.awt.event.MouseEvent;
new(p0: java.awt.Component, p1: number, p2: number, p3: number, p4: number, p5: number, p6: number, p7: number, p8: number, p9: boolean, p10: number): java.awt.event.MouseEvent;
+ getMouseModifiersText(p0: number): string;
}
interface MouseEvent extends java.awt.event.InputEvent {
getLocationOnScreen(): java.awt.Point;
@@ -1692,10 +1689,10 @@ declare global {
DefaultCopyNoDrop: java.awt.Cursor;
DefaultMoveNoDrop: java.awt.Cursor;
DefaultLinkNoDrop: java.awt.Cursor;
+ new(): java.awt.dnd.DragSource;
getDefaultDragSource(): java.awt.dnd.DragSource;
isDragImageSupported(): boolean;
getDragThreshold(): number;
- new(): java.awt.dnd.DragSource;
}
interface DragSource extends java.io.Serializable {
startDrag(p0: java.awt.dnd.DragGestureEvent, p1: java.awt.Cursor, p2: java.awt.Image, p3: java.awt.Point, p4: java.awt.datatransfer.Transferable, p5: java.awt.dnd.DragSourceListener, p6: java.awt.datatransfer.FlavorMap): void;
@@ -1812,13 +1809,13 @@ declare global {
selectionHtmlFlavor: java.awt.datatransfer.DataFlavor;
fragmentHtmlFlavor: java.awt.datatransfer.DataFlavor;
allHtmlFlavor: java.awt.datatransfer.DataFlavor;
- getTextPlainUnicodeFlavor(): java.awt.datatransfer.DataFlavor;
- selectBestTextFlavor(p0: Array): java.awt.datatransfer.DataFlavor;
new(): java.awt.datatransfer.DataFlavor;
new(p0: java.lang.Class, p1: string): java.awt.datatransfer.DataFlavor;
new(p0: string, p1: string): java.awt.datatransfer.DataFlavor;
new(p0: string, p1: string, p2: java.lang.ClassLoader): java.awt.datatransfer.DataFlavor;
new(p0: string): java.awt.datatransfer.DataFlavor;
+ getTextPlainUnicodeFlavor(): java.awt.datatransfer.DataFlavor;
+ selectBestTextFlavor(p0: Array): java.awt.datatransfer.DataFlavor;
}
interface DataFlavor extends java.io.Externalizable, kotlin.Cloneable {
getReaderForText(p0: java.awt.datatransfer.Transferable): java.io.Reader;
@@ -1846,19 +1843,19 @@ declare global {
isFlavorJavaFileListType(): boolean;
isFlavorTextType(): boolean;
}
- interface Transferable {
+ interface Transferable extends any {
getTransferDataFlavors(): Array;
isDataFlavorSupported(p0: java.awt.datatransfer.DataFlavor): boolean;
getTransferData(p0: java.awt.datatransfer.DataFlavor): any;
}
- interface FlavorMap {
+ interface FlavorMap extends any {
getNativesForFlavors(p0: Array): Map;
getFlavorsForNatives(p0: Array): Map;
}
const Clipboard: {
new(p0: string): java.awt.datatransfer.Clipboard;
}
- interface Clipboard {
+ interface Clipboard extends any {
getName(): string;
setContents(p0: java.awt.datatransfer.Transferable, p1: java.awt.datatransfer.ClipboardOwner): void;
getContents(p0: any): java.awt.datatransfer.Transferable;
@@ -1869,7 +1866,7 @@ declare global {
removeFlavorListener(p0: java.awt.datatransfer.FlavorListener): void;
getFlavorListeners(): Array;
}
- interface ClipboardOwner {
+ interface ClipboardOwner extends any {
lostOwnership(p0: java.awt.datatransfer.Clipboard, p1: java.awt.datatransfer.Transferable): void;
}
interface FlavorListener extends java.util.EventListener {
@@ -1893,13 +1890,13 @@ declare global {
new(p0: boolean, p1: number, p2: number): java.awt.im.InputMethodHighlight;
new(p0: boolean, p1: number, p2: number, p3: Map): java.awt.im.InputMethodHighlight;
}
- interface InputMethodHighlight {
+ interface InputMethodHighlight extends any {
isSelected(): boolean;
getState(): number;
getVariation(): number;
getStyle(): Map;
}
- interface InputMethodRequests {
+ interface InputMethodRequests extends any {
getTextLocation(p0: java.awt.font.TextHitInfo): java.awt.Rectangle;
getLocationOffset(p0: number, p1: number): java.awt.font.TextHitInfo;
getInsertPositionOffset(): number;
@@ -1911,7 +1908,7 @@ declare global {
const InputContext: {
getInstance(): java.awt.im.InputContext;
}
- interface InputContext {
+ interface InputContext extends any {
selectInputMethod(p0: java.util.Locale): boolean;
getLocale(): java.util.Locale;
setCharacterSubsets(p0: Array): void;
@@ -1952,13 +1949,6 @@ declare global {
CYAN: java.awt.Color;
blue: java.awt.Color;
BLUE: java.awt.Color;
- decode(p0: string): java.awt.Color;
- getColor(p0: string): java.awt.Color;
- getColor(p0: string, p1: java.awt.Color): java.awt.Color;
- getColor(p0: string, p1: number): java.awt.Color;
- HSBtoRGB(p0: number, p1: number, p2: number): number;
- RGBtoHSB(p0: number, p1: number, p2: number, p3: kotlin.FloatArray): kotlin.FloatArray;
- getHSBColor(p0: number, p1: number, p2: number): java.awt.Color;
new(p0: number, p1: number, p2: number): java.awt.Color;
new(p0: number, p1: number, p2: number, p3: number): java.awt.Color;
new(p0: number): java.awt.Color;
@@ -1966,6 +1956,13 @@ declare global {
new(p0: number, p1: number, p2: number): java.awt.Color;
new(p0: number, p1: number, p2: number, p3: number): java.awt.Color;
new(p0: java.awt.color.ColorSpace, p1: kotlin.FloatArray, p2: number): java.awt.Color;
+ decode(p0: string): java.awt.Color;
+ getColor(p0: string): java.awt.Color;
+ getColor(p0: string, p1: java.awt.Color): java.awt.Color;
+ getColor(p0: string, p1: number): java.awt.Color;
+ HSBtoRGB(p0: number, p1: number, p2: number): number;
+ RGBtoHSB(p0: number, p1: number, p2: number, p3: kotlin.FloatArray): kotlin.FloatArray;
+ getHSBColor(p0: number, p1: number, p2: number): java.awt.Color;
}
interface Color extends java.awt.Paint, java.io.Serializable {
getRed(): number;
@@ -1991,7 +1988,7 @@ declare global {
BITMASK: number;
TRANSLUCENT: number;
}
- interface Transparency {
+ interface Transparency extends any {
getTransparency(): number;
}
const Rectangle: {
@@ -2008,14 +2005,6 @@ declare global {
y: number;
width: number;
height: number;
- contains(p0: java.awt.Point): boolean;
- contains(p0: number, p1: number): boolean;
- contains(p0: java.awt.Rectangle): boolean;
- contains(p0: number, p1: number, p2: number, p3: number): boolean;
- intersects(p0: java.awt.Rectangle): boolean;
- add(p0: number, p1: number): void;
- add(p0: java.awt.Point): void;
- add(p0: java.awt.Rectangle): void;
setBounds(p0: java.awt.Rectangle): void;
setBounds(p0: number, p1: number, p2: number, p3: number): void;
reshape(p0: number, p1: number, p2: number, p3: number): void;
@@ -2028,12 +2017,20 @@ declare global {
setSize(p0: java.awt.Dimension): void;
setSize(p0: number, p1: number): void;
resize(p0: number, p1: number): void;
+ contains(p0: java.awt.Point): boolean;
+ contains(p0: number, p1: number): boolean;
+ contains(p0: java.awt.Rectangle): boolean;
+ contains(p0: number, p1: number, p2: number, p3: number): boolean;
inside(p0: number, p1: number): boolean;
+ intersects(p0: java.awt.Rectangle): boolean;
intersection(p0: java.awt.Rectangle): java.awt.Rectangle;
union(p0: java.awt.Rectangle): java.awt.Rectangle;
+ add(p0: number, p1: number): void;
+ add(p0: java.awt.Point): void;
+ add(p0: java.awt.Rectangle): void;
grow(p0: number, p1: number): void;
}
- interface Shape {
+ interface Shape extends any {
getBounds(): java.awt.Rectangle;
getBounds2D(): java.awt.geom.Rectangle2D;
contains(p0: number, p1: number): boolean;
@@ -2053,9 +2050,9 @@ declare global {
interface Point extends java.awt.geom.Point2D, java.io.Serializable {
x: number;
y: number;
+ getLocation(): java.awt.Point;
setLocation(p0: java.awt.Point): void;
setLocation(p0: number, p1: number): void;
- getLocation(): java.awt.Point;
move(p0: number, p1: number): void;
translate(p0: number, p1: number): void;
}
@@ -2126,10 +2123,10 @@ declare global {
interface RenderingHints extends Map, kotlin.Cloneable {
add(p0: java.awt.RenderingHints): void;
}
- interface RenderingHints$Key {
+ interface RenderingHints$Key extends any {
isCompatibleValue(p0: any): boolean;
}
- interface PaintContext {
+ interface PaintContext extends any {
dispose(): void;
getColorModel(): java.awt.image.ColorModel;
getRaster(p0: number, p1: number, p2: number, p3: number): java.awt.image.Raster;
@@ -2142,7 +2139,7 @@ declare global {
SCALE_REPLICATE: number;
SCALE_AREA_AVERAGING: number;
}
- interface Image {
+ interface Image extends any {
getWidth(p0: java.awt.image.ImageObserver): number;
getHeight(p0: java.awt.image.ImageObserver): number;
getSource(): java.awt.image.ImageProducer;
@@ -2154,7 +2151,7 @@ declare global {
setAccelerationPriority(p0: number): void;
getAccelerationPriority(): number;
}
- interface Graphics {
+ interface Graphics extends any {
create(): java.awt.Graphics;
create(p0: number, p1: number, p2: number, p3: number): java.awt.Graphics;
translate(p0: number, p1: number): void;
@@ -2222,6 +2219,8 @@ declare global {
LAYOUT_RIGHT_TO_LEFT: number;
LAYOUT_NO_START_CONTEXT: number;
LAYOUT_NO_LIMIT_CONTEXT: number;
+ new(p0: string, p1: number, p2: number): java.awt.Font;
+ new(p0: Map): java.awt.Font;
textRequiresLayout(p0: Array, p1: number, p2: number): boolean;
getFont(p0: Map): java.awt.Font;
getFont(p0: string): java.awt.Font;
@@ -2231,10 +2230,9 @@ declare global {
createFont(p0: number, p1: java.io.InputStream): java.awt.Font;
createFont(p0: number, p1: java.io.File): java.awt.Font;
decode(p0: string): java.awt.Font;
- new(p0: string, p1: number, p2: number): java.awt.Font;
- new(p0: Map): java.awt.Font;
}
interface Font extends java.io.Serializable {
+ hasLayoutAttributes(): boolean;
getTransform(): java.awt.geom.AffineTransform;
getFamily(): string;
getFamily(p0: java.util.Locale): string;
@@ -2249,7 +2247,6 @@ declare global {
isBold(): boolean;
isItalic(): boolean;
isTransformed(): boolean;
- hasLayoutAttributes(): boolean;
getNumGlyphs(): number;
getMissingGlyphCode(): number;
getBaselineFor(p0: number): number;
@@ -2319,16 +2316,16 @@ declare global {
npoints: number;
xpoints: Array;
ypoints: Array;
- contains(p0: java.awt.Point): boolean;
- contains(p0: number, p1: number): boolean;
reset(): void;
invalidate(): void;
translate(p0: number, p1: number): void;
addPoint(p0: number, p1: number): void;
getBoundingBox(): java.awt.Rectangle;
+ contains(p0: java.awt.Point): boolean;
+ contains(p0: number, p1: number): boolean;
inside(p0: number, p1: number): boolean;
}
- interface GraphicsConfiguration {
+ interface GraphicsConfiguration extends any {
getDevice(): java.awt.GraphicsDevice;
createCompatibleImage(p0: number, p1: number): java.awt.image.BufferedImage;
createCompatibleImage(p0: number, p1: number, p2: number): java.awt.image.BufferedImage;
@@ -2351,7 +2348,7 @@ declare global {
TYPE_PRINTER: number;
TYPE_IMAGE_BUFFER: number;
}
- interface GraphicsDevice {
+ interface GraphicsDevice extends any {
getType(): number;
getIDstring(): string;
getConfigurations(): Array;
@@ -2367,15 +2364,6 @@ declare global {
getAvailableAcceleratedMemory(): number;
isWindowTranslucencySupported(p0: java.awt.GraphicsDevice$WindowTranslucency): boolean;
}
- const GraphicsDevice$WindowTranslucency: {
- PERPIXEL_TRANSPARENT: java.awt.GraphicsDevice$WindowTranslucency;
- TRANSLUCENT: java.awt.GraphicsDevice$WindowTranslucency;
- PERPIXEL_TRANSLUCENT: java.awt.GraphicsDevice$WindowTranslucency;
- valueOf(value: string): java.awt.GraphicsDevice$WindowTranslucency;
- values(): Array;
- }
- interface GraphicsDevice$WindowTranslucency extends kotlin.Enum {
- }
const GraphicsConfigTemplate: {
REQUIRED: number;
PREFERRED: number;
@@ -2388,11 +2376,11 @@ declare global {
}
const Window: {
Type: typeof java.awt.Window$Type;
- getWindows(): Array;
- getOwnerlessWindows(): Array;
new(p0: java.awt.Frame): java.awt.Window;
new(p0: java.awt.Window): java.awt.Window;
new(p0: java.awt.Window, p1: java.awt.GraphicsConfiguration): java.awt.Window;
+ getWindows(): Array;
+ getOwnerlessWindows(): Array;
}
interface Window extends java.awt.Container, javax.accessibility.Accessible {
getIconImages(): Array;
@@ -2444,23 +2432,21 @@ declare global {
new(): java.awt.Container;
}
interface Container extends java.awt.Component {
- remove(p0: number): void;
- remove(p0: java.awt.Component): void;
- getMousePosition(p0: boolean): java.awt.Point;
- isFocusCycleRoot(): boolean;
- add(p0: java.awt.Component): java.awt.Component;
- add(p0: string, p1: java.awt.Component): java.awt.Component;
- add(p0: java.awt.Component, p1: number): java.awt.Component;
- add(p0: java.awt.Component, p1: any): void;
- add(p0: java.awt.Component, p1: any, p2: number): void;
getComponentCount(): number;
countComponents(): number;
getComponent(p0: number): java.awt.Component;
getComponents(): Array;
getInsets(): java.awt.Insets;
insets(): java.awt.Insets;
+ add(p0: java.awt.Component): java.awt.Component;
+ add(p0: string, p1: java.awt.Component): java.awt.Component;
+ add(p0: java.awt.Component, p1: number): java.awt.Component;
+ add(p0: java.awt.Component, p1: any): void;
+ add(p0: java.awt.Component, p1: any, p2: number): void;
setComponentZOrder(p0: java.awt.Component, p1: number): void;
getComponentZOrder(p0: java.awt.Component): number;
+ remove(p0: number): void;
+ remove(p0: java.awt.Component): void;
removeAll(): void;
getLayout(): java.awt.LayoutManager;
setLayout(p0: java.awt.LayoutManager): void;
@@ -2470,9 +2456,11 @@ declare global {
addContainerListener(p0: java.awt.event.ContainerListener): void;
removeContainerListener(p0: java.awt.event.ContainerListener): void;
getContainerListeners(): Array;
+ getMousePosition(p0: boolean): java.awt.Point;
findComponentAt(p0: number, p1: number): java.awt.Component;
findComponentAt(p0: java.awt.Point): java.awt.Component;
isAncestorOf(p0: java.awt.Component): boolean;
+ isFocusCycleRoot(): boolean;
setFocusTraversalPolicy(p0: java.awt.FocusTraversalPolicy): void;
getFocusTraversalPolicy(): java.awt.FocusTraversalPolicy;
isFocusTraversalPolicySet(): boolean;
@@ -2691,7 +2679,7 @@ declare global {
getAccessibleContext(): javax.accessibility.AccessibleContext;
setMixingCutoutShape(p0: java.awt.Shape): void;
}
- interface MenuContainer {
+ interface MenuContainer extends any {
getFont(): java.awt.Font;
remove(p0: java.awt.MenuComponent): void;
postEvent(p0: java.awt.Event): boolean;
@@ -2840,30 +2828,20 @@ declare global {
HAND_CURSOR: number;
MOVE_CURSOR: number;
CUSTOM_CURSOR: number;
+ new(p0: number): java.awt.Cursor;
getPredefinedCursor(p0: number): java.awt.Cursor;
getSystemCustomCursor(p0: string): java.awt.Cursor;
getDefaultCursor(): java.awt.Cursor;
- new(p0: number): java.awt.Cursor;
}
interface Cursor extends java.io.Serializable {
getType(): number;
getName(): string;
}
- const Component$BaselineResizeBehavior: {
- CONSTANT_ASCENT: java.awt.Component$BaselineResizeBehavior;
- CONSTANT_DESCENT: java.awt.Component$BaselineResizeBehavior;
- CENTER_OFFSET: java.awt.Component$BaselineResizeBehavior;
- OTHER: java.awt.Component$BaselineResizeBehavior;
- valueOf(value: string): java.awt.Component$BaselineResizeBehavior;
- values(): Array;
- }
- interface Component$BaselineResizeBehavior extends kotlin.Enum {
- }
const Toolkit: {
getDefaultToolkit(): java.awt.Toolkit;
getProperty(p0: string, p1: string): string;
}
- interface Toolkit {
+ interface Toolkit extends any {
setDynamicLayout(p0: boolean): void;
isDynamicLayoutActive(): boolean;
getScreenSize(): java.awt.Dimension;
@@ -2942,14 +2920,13 @@ declare global {
MAXIMIZED_HORIZ: number;
MAXIMIZED_VERT: number;
MAXIMIZED_BOTH: number;
- getFrames(): Array;
new(): java.awt.Frame;
new(p0: java.awt.GraphicsConfiguration): java.awt.Frame;
new(p0: string): java.awt.Frame;
new(p0: string, p1: java.awt.GraphicsConfiguration): java.awt.Frame;
+ getFrames(): Array;
}
interface Frame extends java.awt.Window, java.awt.MenuContainer {
- setCursor(p0: number): void;
getTitle(): string;
setTitle(p0: string): void;
getIconImage(): java.awt.Image;
@@ -2965,17 +2942,18 @@ declare global {
getMaximizedBounds(): java.awt.Rectangle;
setUndecorated(p0: boolean): void;
isUndecorated(): boolean;
+ setCursor(p0: number): void;
getCursorType(): number;
}
const MenuBar: {
new(): java.awt.MenuBar;
}
interface MenuBar extends java.awt.MenuComponent, java.awt.MenuContainer, javax.accessibility.Accessible {
- remove(p0: number): void;
addNotify(): void;
getHelpMenu(): java.awt.Menu;
setHelpMenu(p0: java.awt.Menu): void;
add(p0: java.awt.Menu): java.awt.Menu;
+ remove(p0: number): void;
getMenuCount(): number;
countMenus(): number;
getMenu(p0: number): java.awt.Menu;
@@ -2989,7 +2967,6 @@ declare global {
new(p0: string, p1: boolean): java.awt.Menu;
}
interface Menu extends java.awt.MenuItem, java.awt.MenuContainer, javax.accessibility.Accessible {
- remove(p0: number): void;
isTearOff(): boolean;
getItemCount(): number;
countItems(): number;
@@ -3000,6 +2977,7 @@ declare global {
insert(p0: string, p1: number): void;
addSeparator(): void;
insertSeparator(p0: number): void;
+ remove(p0: number): void;
removeAll(): void;
}
const MenuItem: {
@@ -3034,7 +3012,7 @@ declare global {
getKey(): number;
usesShiftModifier(): boolean;
}
- interface PrintJob {
+ interface PrintJob extends any {
getGraphics(): java.awt.Graphics;
getPageDimension(): java.awt.Dimension;
getPageResolution(): number;
@@ -3042,11 +3020,11 @@ declare global {
end(): void;
}
const JobAttributes: {
+ DefaultSelectionType: typeof java.awt.JobAttributes$DefaultSelectionType;
DestinationType: typeof java.awt.JobAttributes$DestinationType;
+ DialogType: typeof java.awt.JobAttributes$DialogType;
MultipleDocumentHandlingType: typeof java.awt.JobAttributes$MultipleDocumentHandlingType;
SidesType: typeof java.awt.JobAttributes$SidesType;
- DefaultSelectionType: typeof java.awt.JobAttributes$DefaultSelectionType;
- DialogType: typeof java.awt.JobAttributes$DialogType;
new(): java.awt.JobAttributes;
new(p0: java.awt.JobAttributes): java.awt.JobAttributes;
new(p0: number, p1: java.awt.JobAttributes$DefaultSelectionType, p2: java.awt.JobAttributes$DestinationType, p3: java.awt.JobAttributes$DialogType, p4: string, p5: number, p6: number, p7: java.awt.JobAttributes$MultipleDocumentHandlingType, p8: Array>, p9: string, p10: java.awt.JobAttributes$SidesType): java.awt.JobAttributes;
@@ -3083,12 +3061,26 @@ declare global {
getToPage(): number;
setToPage(p0: number): void;
}
+ const JobAttributes$DefaultSelectionType: {
+ ALL: java.awt.JobAttributes$DefaultSelectionType;
+ RANGE: java.awt.JobAttributes$DefaultSelectionType;
+ SELECTION: java.awt.JobAttributes$DefaultSelectionType;
+ }
+ interface JobAttributes$DefaultSelectionType {
+ }
const JobAttributes$DestinationType: {
FILE: java.awt.JobAttributes$DestinationType;
PRINTER: java.awt.JobAttributes$DestinationType;
}
interface JobAttributes$DestinationType {
}
+ const JobAttributes$DialogType: {
+ COMMON: java.awt.JobAttributes$DialogType;
+ NATIVE: java.awt.JobAttributes$DialogType;
+ NONE: java.awt.JobAttributes$DialogType;
+ }
+ interface JobAttributes$DialogType {
+ }
const JobAttributes$MultipleDocumentHandlingType: {
SEPARATE_DOCUMENTS_COLLATED_COPIES: java.awt.JobAttributes$MultipleDocumentHandlingType;
SEPARATE_DOCUMENTS_UNCOLLATED_COPIES: java.awt.JobAttributes$MultipleDocumentHandlingType;
@@ -3102,26 +3094,12 @@ declare global {
}
interface JobAttributes$SidesType {
}
- const JobAttributes$DefaultSelectionType: {
- ALL: java.awt.JobAttributes$DefaultSelectionType;
- RANGE: java.awt.JobAttributes$DefaultSelectionType;
- SELECTION: java.awt.JobAttributes$DefaultSelectionType;
- }
- interface JobAttributes$DefaultSelectionType {
- }
- const JobAttributes$DialogType: {
- COMMON: java.awt.JobAttributes$DialogType;
- NATIVE: java.awt.JobAttributes$DialogType;
- NONE: java.awt.JobAttributes$DialogType;
- }
- interface JobAttributes$DialogType {
- }
const PageAttributes: {
- OrientationRequestedType: typeof java.awt.PageAttributes$OrientationRequestedType;
- PrintQualityType: typeof java.awt.PageAttributes$PrintQualityType;
- MediaType: typeof java.awt.PageAttributes$MediaType;
ColorType: typeof java.awt.PageAttributes$ColorType;
OriginType: typeof java.awt.PageAttributes$OriginType;
+ MediaType: typeof java.awt.PageAttributes$MediaType;
+ OrientationRequestedType: typeof java.awt.PageAttributes$OrientationRequestedType;
+ PrintQualityType: typeof java.awt.PageAttributes$PrintQualityType;
new(): java.awt.PageAttributes;
new(p0: java.awt.PageAttributes): java.awt.PageAttributes;
new(p0: java.awt.PageAttributes$ColorType, p1: java.awt.PageAttributes$MediaType, p2: java.awt.PageAttributes$OrientationRequestedType, p3: java.awt.PageAttributes$OriginType, p4: java.awt.PageAttributes$PrintQualityType, p5: Array): java.awt.PageAttributes;
@@ -3148,18 +3126,11 @@ declare global {
setPrinterResolution(p0: number): void;
setPrinterResolutionToDefault(): void;
}
- const PageAttributes$OrientationRequestedType: {
- PORTRAIT: java.awt.PageAttributes$OrientationRequestedType;
- LANDSCAPE: java.awt.PageAttributes$OrientationRequestedType;
- }
- interface PageAttributes$OrientationRequestedType {
- }
- const PageAttributes$PrintQualityType: {
- HIGH: java.awt.PageAttributes$PrintQualityType;
- NORMAL: java.awt.PageAttributes$PrintQualityType;
- DRAFT: java.awt.PageAttributes$PrintQualityType;
+ const PageAttributes$ColorType: {
+ COLOR: java.awt.PageAttributes$ColorType;
+ MONOCHROME: java.awt.PageAttributes$ColorType;
}
- interface PageAttributes$PrintQualityType {
+ interface PageAttributes$ColorType {
}
const PageAttributes$MediaType: {
ISO_4A0: java.awt.PageAttributes$MediaType;
@@ -3312,11 +3283,11 @@ declare global {
}
interface PageAttributes$MediaType {
}
- const PageAttributes$ColorType: {
- COLOR: java.awt.PageAttributes$ColorType;
- MONOCHROME: java.awt.PageAttributes$ColorType;
+ const PageAttributes$OrientationRequestedType: {
+ PORTRAIT: java.awt.PageAttributes$OrientationRequestedType;
+ LANDSCAPE: java.awt.PageAttributes$OrientationRequestedType;
}
- interface PageAttributes$ColorType {
+ interface PageAttributes$OrientationRequestedType {
}
const PageAttributes$OriginType: {
PHYSICAL: java.awt.PageAttributes$OriginType;
@@ -3324,15 +3295,22 @@ declare global {
}
interface PageAttributes$OriginType {
}
+ const PageAttributes$PrintQualityType: {
+ HIGH: java.awt.PageAttributes$PrintQualityType;
+ NORMAL: java.awt.PageAttributes$PrintQualityType;
+ DRAFT: java.awt.PageAttributes$PrintQualityType;
+ }
+ interface PageAttributes$PrintQualityType {
+ }
const EventQueue: {
+ new(): java.awt.EventQueue;
getMostRecentEventTime(): number;
getCurrentEvent(): java.awt.AWTEvent;
isDispatchThread(): boolean;
invokeLater(p0: java.lang.Runnable): void;
invokeAndWait(p0: java.lang.Runnable): void;
- new(): java.awt.EventQueue;
}
- interface EventQueue {
+ interface EventQueue extends any {
postEvent(p0: java.awt.AWTEvent): void;
getNextEvent(): java.awt.AWTEvent;
peekEvent(): java.awt.AWTEvent;
@@ -3340,7 +3318,7 @@ declare global {
push(p0: java.awt.EventQueue): void;
createSecondaryLoop(): java.awt.SecondaryLoop;
}
- interface SecondaryLoop {
+ interface SecondaryLoop extends any {
enter(): boolean;
exit(): boolean;
}
@@ -3349,8 +3327,9 @@ declare global {
DOCUMENT_MODAL: java.awt.Dialog$ModalityType;
APPLICATION_MODAL: java.awt.Dialog$ModalityType;
TOOLKIT_MODAL: java.awt.Dialog$ModalityType;
- valueOf(value: string): java.awt.Dialog$ModalityType;
+ entries: kotlin.enums.EnumEntries;
values(): Array;
+ valueOf(value: string): java.awt.Dialog$ModalityType;
}
interface Dialog$ModalityType extends kotlin.Enum {
}
@@ -3358,27 +3337,31 @@ declare global {
NO_EXCLUDE: java.awt.Dialog$ModalExclusionType;
APPLICATION_EXCLUDE: java.awt.Dialog$ModalExclusionType;
TOOLKIT_EXCLUDE: java.awt.Dialog$ModalExclusionType;
- valueOf(value: string): java.awt.Dialog$ModalExclusionType;
+ entries: kotlin.enums.EnumEntries;
values(): Array;
+ valueOf(value: string): java.awt.Dialog$ModalExclusionType;
}
interface Dialog$ModalExclusionType extends kotlin.Enum {
}
- const ImageCapabilities: {
- new(p0: boolean): java.awt.ImageCapabilities;
+ const Component$BaselineResizeBehavior: {
+ CONSTANT_ASCENT: java.awt.Component$BaselineResizeBehavior;
+ CONSTANT_DESCENT: java.awt.Component$BaselineResizeBehavior;
+ CENTER_OFFSET: java.awt.Component$BaselineResizeBehavior;
+ OTHER: java.awt.Component$BaselineResizeBehavior;
+ entries: kotlin.enums.EnumEntries;
+ values(): Array;
+ valueOf(value: string): java.awt.Component$BaselineResizeBehavior;
}
- interface ImageCapabilities extends kotlin.Cloneable {
- isAccelerated(): boolean;
- isTrueVolatile(): boolean;
+ interface Component$BaselineResizeBehavior extends kotlin.Enum {
}
interface Graphics2D extends java.awt.Graphics {
- translate(p0: number, p1: number): void;
- drawString(p0: string, p1: number, p2: number): void;
- drawString(p0: java.text.AttributedCharacterIterator, p1: number, p2: number): void;
+ draw(p0: java.awt.Shape): void;
drawImage(p0: java.awt.Image, p1: java.awt.geom.AffineTransform, p2: java.awt.image.ImageObserver): boolean;
drawImage(p0: java.awt.image.BufferedImage, p1: java.awt.image.BufferedImageOp, p2: number, p3: number): void;
- draw(p0: java.awt.Shape): void;
drawRenderedImage(p0: java.awt.image.RenderedImage, p1: java.awt.geom.AffineTransform): void;
drawRenderableImage(p0: java.awt.image.renderable.RenderableImage, p1: java.awt.geom.AffineTransform): void;
+ drawString(p0: string, p1: number, p2: number): void;
+ drawString(p0: java.text.AttributedCharacterIterator, p1: number, p2: number): void;
drawGlyphVector(p0: java.awt.font.GlyphVector, p1: number, p2: number): void;
fill(p0: java.awt.Shape): void;
hit(p0: java.awt.Rectangle, p1: java.awt.Shape, p2: boolean): boolean;
@@ -3391,6 +3374,7 @@ declare global {
setRenderingHints(p0: Map): void;
addRenderingHints(p0: Map): void;
getRenderingHints(): java.awt.RenderingHints;
+ translate(p0: number, p1: number): void;
rotate(p0: number): void;
rotate(p0: number, p1: number, p2: number): void;
scale(p0: number, p1: number): void;
@@ -3406,16 +3390,23 @@ declare global {
clip(p0: java.awt.Shape): void;
getFontRenderContext(): java.awt.font.FontRenderContext;
}
- interface Composite {
+ interface Composite extends any {
createContext(p0: java.awt.image.ColorModel, p1: java.awt.image.ColorModel, p2: java.awt.RenderingHints): java.awt.CompositeContext;
}
- interface CompositeContext {
+ interface CompositeContext extends any {
dispose(): void;
compose(p0: java.awt.image.Raster, p1: java.awt.image.Raster, p2: java.awt.image.WritableRaster): void;
}
- interface Stroke {
+ interface Stroke extends any {
createStrokedShape(p0: java.awt.Shape): java.awt.Shape;
}
+ const ImageCapabilities: {
+ new(p0: boolean): java.awt.ImageCapabilities;
+ }
+ interface ImageCapabilities extends kotlin.Cloneable {
+ isAccelerated(): boolean;
+ isTrueVolatile(): boolean;
+ }
const PopupMenu: {
new(): java.awt.PopupMenu;
new(p0: string): java.awt.PopupMenu;
@@ -3434,14 +3425,14 @@ declare global {
isHorizontal(): boolean;
isLeftToRight(): boolean;
}
- interface LayoutManager {
+ interface LayoutManager extends any {
addLayoutComponent(p0: string, p1: java.awt.Component): void;
removeLayoutComponent(p0: java.awt.Component): void;
preferredLayoutSize(p0: java.awt.Container): java.awt.Dimension;
minimumLayoutSize(p0: java.awt.Container): java.awt.Dimension;
layoutContainer(p0: java.awt.Container): void;
}
- interface FocusTraversalPolicy {
+ interface FocusTraversalPolicy extends any {
getComponentAfter(p0: java.awt.Container, p1: java.awt.Component): java.awt.Component;
getComponentBefore(p0: java.awt.Container, p1: java.awt.Component): java.awt.Component;
getFirstComponent(p0: java.awt.Container): java.awt.Component;
@@ -3453,8 +3444,9 @@ declare global {
NORMAL: java.awt.Window$Type;
UTILITY: java.awt.Window$Type;
POPUP: java.awt.Window$Type;
- valueOf(value: string): java.awt.Window$Type;
+ entries: kotlin.enums.EnumEntries;
values(): Array;
+ valueOf(value: string): java.awt.Window$Type;
}
interface Window$Type extends kotlin.Enum {
}
@@ -3483,19 +3475,31 @@ declare global {
REFRESH_RATE_UNKNOWN: number;
new(p0: number, p1: number, p2: number, p3: number): java.awt.DisplayMode;
}
- interface DisplayMode {
+ interface DisplayMode extends any {
getHeight(): number;
getWidth(): number;
getBitDepth(): number;
getRefreshRate(): number;
}
+ const GraphicsDevice$WindowTranslucency: {
+ PERPIXEL_TRANSPARENT: java.awt.GraphicsDevice$WindowTranslucency;
+ TRANSLUCENT: java.awt.GraphicsDevice$WindowTranslucency;
+ PERPIXEL_TRANSLUCENT: java.awt.GraphicsDevice$WindowTranslucency;
+ entries: kotlin.enums.EnumEntries;
+ values(): Array;
+ valueOf(value: string): java.awt.GraphicsDevice$WindowTranslucency;
+ }
+ interface GraphicsDevice$WindowTranslucency extends kotlin.Enum {
+ }
}
namespace io {
- interface Serializable {
+ interface Serializable extends any {
+ }
+ interface Closeable extends java.lang.AutoCloseable {
}
const InputStream: {
- nullInputStream(): java.io.InputStream;
new(): java.io.InputStream;
+ nullInputStream(): java.io.InputStream;
}
interface InputStream extends java.io.Closeable {
read(): number;
@@ -3512,20 +3516,164 @@ declare global {
markSupported(): boolean;
transferTo(p0: java.io.OutputStream): number;
}
- interface Closeable extends java.lang.AutoCloseable {
- }
const OutputStream: {
- nullOutputStream(): java.io.OutputStream;
new(): java.io.OutputStream;
+ nullOutputStream(): java.io.OutputStream;
}
interface OutputStream extends java.io.Closeable, java.io.Flushable {
write(p0: number): void;
write(p0: Array): void;
write(p0: Array, p1: number, p2: number): void;
}
- interface Flushable {
+ interface Flushable extends any {
+ flush(): void;
+ }
+ const File: {
+ separatorChar: number;
+ separator: string;
+ pathSeparatorChar: number;
+ pathSeparator: string;
+ new(p0: string): java.io.File;
+ new(p0: string, p1: string): java.io.File;
+ new(p0: java.io.File, p1: string): java.io.File;
+ new(p0: java.net.URI): java.io.File;
+ listRoots(): Array;
+ createTempFile(p0: string, p1: string, p2: java.io.File): java.io.File;
+ createTempFile(p0: string, p1: string): java.io.File;
+ }
+ interface File extends java.io.Serializable, kotlin.Comparable {
+ getName(): string;
+ getParent(): string;
+ getParentFile(): java.io.File;
+ getPath(): string;
+ isAbsolute(): boolean;
+ getAbsolutePath(): string;
+ getAbsoluteFile(): java.io.File;
+ getCanonicalPath(): string;
+ getCanonicalFile(): java.io.File;
+ toURL(): java.net.URL;
+ toURI(): java.net.URI;
+ canRead(): boolean;
+ canWrite(): boolean;
+ exists(): boolean;
+ isDirectory(): boolean;
+ isFile(): boolean;
+ isHidden(): boolean;
+ lastModified(): number;
+ length(): number;
+ createNewFile(): boolean;
+ deleteOnExit(): void;
+ list(): Array;
+ list(p0: java.io.FilenameFilter): Array;
+ listFiles(): Array;
+ listFiles(p0: java.io.FilenameFilter): Array;
+ listFiles(p0: java.io.FileFilter): Array;
+ mkdir(): boolean;
+ mkdirs(): boolean;
+ renameTo(p0: java.io.File): boolean;
+ setLastModified(p0: number): boolean;
+ setReadOnly(): boolean;
+ setWritable(p0: boolean, p1: boolean): boolean;
+ setWritable(p0: boolean): boolean;
+ setReadable(p0: boolean, p1: boolean): boolean;
+ setReadable(p0: boolean): boolean;
+ setExecutable(p0: boolean, p1: boolean): boolean;
+ setExecutable(p0: boolean): boolean;
+ canExecute(): boolean;
+ getTotalSpace(): number;
+ getFreeSpace(): number;
+ getUsableSpace(): number;
+ toPath(): java.nio.file.Path;
+ }
+ interface FilenameFilter extends any {
+ accept(p0: java.io.File, p1: string): boolean;
+ (p0: java.io.File, p1: string): boolean;
+ }
+ interface FileFilter extends any {
+ accept(p0: java.io.File): boolean;
+ (p0: java.io.File): boolean;
+ }
+ interface Externalizable extends java.io.Serializable {
+ writeExternal(p0: java.io.ObjectOutput): void;
+ readExternal(p0: java.io.ObjectInput): void;
+ }
+ interface ObjectOutput extends java.io.DataOutput, java.lang.AutoCloseable {
+ writeObject(p0: any): void;
flush(): void;
}
+ interface DataOutput extends any {
+ write(p0: number): void;
+ write(p0: Array): void;
+ write(p0: Array, p1: number, p2: number): void;
+ writeBoolean(p0: boolean): void;
+ writeByte(p0: number): void;
+ writeShort(p0: number): void;
+ writeChar(p0: number): void;
+ writeInt(p0: number): void;
+ writeLong(p0: number): void;
+ writeFloat(p0: number): void;
+ writeDouble(p0: number): void;
+ writeBytes(p0: string): void;
+ writeChars(p0: string): void;
+ writeUTF(p0: string): void;
+ }
+ interface ObjectInput extends java.io.DataInput, java.lang.AutoCloseable {
+ readObject(): any;
+ read(): number;
+ read(p0: Array): number;
+ read(p0: Array, p1: number, p2: number): number;
+ skip(p0: number): number;
+ available(): number;
+ }
+ interface DataInput extends any {
+ readFully(p0: Array): void;
+ readFully(p0: Array, p1: number, p2: number): void;
+ skipBytes(p0: number): number;
+ readBoolean(): boolean;
+ readByte(): number;
+ readUnsignedByte(): number;
+ readShort(): number;
+ readUnsignedShort(): number;
+ readChar(): number;
+ readInt(): number;
+ readLong(): number;
+ readFloat(): number;
+ readDouble(): number;
+ readLine(): string;
+ readUTF(): string;
+ }
+ const BufferedReader: {
+ new(p0: java.io.Reader, p1: number): java.io.BufferedReader;
+ new(p0: java.io.Reader): java.io.BufferedReader;
+ }
+ interface BufferedReader extends java.io.Reader {
+ readLine(): string;
+ lines(): java.util.stream.Stream;
+ }
+ const Reader: {
+ nullReader(): java.io.Reader;
+ }
+ interface Reader extends java.lang.Readable, java.io.Closeable {
+ read(): number;
+ read(p0: Array): number;
+ read(p0: Array, p1: number, p2: number): number;
+ skip(p0: number): number;
+ ready(): boolean;
+ markSupported(): boolean;
+ mark(p0: number): void;
+ reset(): void;
+ transferTo(p0: java.io.Writer): number;
+ }
+ const Writer: {
+ nullWriter(): java.io.Writer;
+ }
+ interface Writer extends java.lang.Appendable, java.io.Closeable, java.io.Flushable {
+ write(p0: number): void;
+ write(p0: Array): void;
+ write(p0: Array, p1: number, p2: number): void;
+ write(p0: string): void;
+ write(p0: string, p1: number, p2: number): void;
+ }
const PrintStream: {
new(p0: java.io.OutputStream): java.io.PrintStream;
new(p0: java.io.OutputStream, p1: boolean): java.io.PrintStream;
@@ -3539,6 +3687,7 @@ declare global {
new(p0: java.io.File, p1: java.nio.charset.Charset): java.io.PrintStream;
}
interface PrintStream extends java.io.FilterOutputStream, java.lang.Appendable, java.io.Closeable {
+ charset(): java.nio.charset.Charset;
checkError(): boolean;
writeBytes(p0: Array): void;
print(p0: boolean): void;
@@ -3564,78 +3713,12 @@ declare global {
printf(p0: java.util.Locale, p1: string, p2: any): java.io.PrintStream;
format(p0: string, p1: any): java.io.PrintStream;
format(p0: java.util.Locale, p1: string, p2: any): java.io.PrintStream;
- charset(): java.nio.charset.Charset;
}
const FilterOutputStream: {
new(p0: java.io.OutputStream): java.io.FilterOutputStream;
}
interface FilterOutputStream extends java.io.OutputStream {
}
- const File: {
- separatorChar: number;
- separator: string;
- pathSeparatorChar: number;
- pathSeparator: string;
- listRoots(): Array;
- createTempFile(p0: string, p1: string, p2: java.io.File): java.io.File;
- createTempFile(p0: string, p1: string): java.io.File;
- new(p0: string): java.io.File;
- new(p0: string, p1: string): java.io.File;
- new(p0: java.io.File, p1: string): java.io.File;
- new(p0: java.net.URI): java.io.File;
- }
- interface File extends java.io.Serializable, kotlin.Comparable {
- getName(): string;
- getParent(): string;
- getParentFile(): java.io.File;
- getPath(): string;
- isAbsolute(): boolean;
- getAbsolutePath(): string;
- getAbsoluteFile(): java.io.File;
- getCanonicalPath(): string;
- getCanonicalFile(): java.io.File;
- toURL(): java.net.URL;
- toURI(): java.net.URI;
- canRead(): boolean;
- canWrite(): boolean;
- exists(): boolean;
- isDirectory(): boolean;
- isFile(): boolean;
- isHidden(): boolean;
- lastModified(): number;
- length(): number;
- createNewFile(): boolean;
- deleteOnExit(): void;
- list(): Array;
- list(p0: java.io.FilenameFilter): Array;
- listFiles(): Array;
- listFiles(p0: java.io.FilenameFilter): Array;
- listFiles(p0: java.io.FileFilter): Array;
- mkdir(): boolean;
- mkdirs(): boolean;
- renameTo(p0: java.io.File): boolean;
- setLastModified(p0: number): boolean;
- setReadOnly(): boolean;
- setWritable(p0: boolean, p1: boolean): boolean;
- setWritable(p0: boolean): boolean;
- setReadable(p0: boolean, p1: boolean): boolean;
- setReadable(p0: boolean): boolean;
- setExecutable(p0: boolean, p1: boolean): boolean;
- setExecutable(p0: boolean): boolean;
- canExecute(): boolean;
- getTotalSpace(): number;
- getFreeSpace(): number;
- getUsableSpace(): number;
- toPath(): java.nio.file.Path;
- }
- interface FilenameFilter {
- accept(p0: java.io.File, p1: string): boolean;
- (p0: java.io.File, p1: string): boolean;
- }
- interface FileFilter {
- accept(p0: java.io.File): boolean;
- (p0: java.io.File): boolean;
- }
const PrintWriter: {
new(p0: java.io.Writer): java.io.PrintWriter;
new(p0: java.io.Writer, p1: boolean): java.io.PrintWriter;
@@ -3675,155 +3758,9 @@ declare global {
format(p0: string, p1: any): java.io.PrintWriter;
format(p0: java.util.Locale, p1: string, p2: any): java.io.PrintWriter;
}
- const Writer: {
- nullWriter(): java.io.Writer;
- }
- interface Writer extends java.lang.Appendable, java.io.Closeable, java.io.Flushable {
- write(p0: number): void;
- write(p0: Array): void;
- write(p0: Array, p1: number, p2: number): void;
- write(p0: string): void;
- write(p0: string, p1: number, p2: number): void;
- }
- interface Externalizable extends java.io.Serializable {
- writeExternal(p0: java.io.ObjectOutput): void;
- readExternal(p0: java.io.ObjectInput): void;
- }
- interface ObjectOutput extends java.io.DataOutput, java.lang.AutoCloseable {
- writeObject(p0: any): void;
- flush(): void;
- }
- interface DataOutput {
- write(p0: number): void;
- write(p0: Array): void;
- write(p0: Array, p1: number, p2: number): void;
- writeBoolean(p0: boolean): void;
- writeByte(p0: number): void;
- writeShort(p0: number): void;
- writeChar(p0: number): void;
- writeInt(p0: number): void;
- writeLong(p0: number): void;
- writeFloat(p0: number): void;
- writeDouble(p0: number): void;
- writeBytes(p0: string): void;
- writeChars(p0: string): void;
- writeUTF(p0: string): void;
- }
- interface ObjectInput extends java.io.DataInput, java.lang.AutoCloseable {
- readObject(): any;
- read(): number;
- read(p0: Array): number;
- read(p0: Array, p1: number, p2: number): number;
- skip(p0: number): number;
- available(): number;
- }
- interface DataInput {
- readFully(p0: Array): void;
- readFully(p0: Array, p1: number, p2: number): void;
- skipBytes(p0: number): number;
- readBoolean(): boolean;
- readByte(): number;
- readUnsignedByte(): number;
- readShort(): number;
- readUnsignedShort(): number;
- readChar(): number;
- readInt(): number;
- readLong(): number;
- readFloat(): number;
- readDouble(): number;
- readLine(): string;
- readUTF(): string;
- }
- const Reader: {
- nullReader(): java.io.Reader;
- }
- interface Reader extends java.lang.Readable, java.io.Closeable {
- read(): number;
- read(p0: Array): number;
- read(p0: Array, p1: number, p2: number): number;
- skip(p0: number): number;
- ready(): boolean;
- markSupported(): boolean;
- mark(p0: number): void;
- reset(): void;
- transferTo(p0: java.io.Writer): number;
- }
- const BufferedReader: {
- new(p0: java.io.Reader, p1: number): java.io.BufferedReader;
- new(p0: java.io.Reader): java.io.BufferedReader;
- }
- interface BufferedReader extends java.io.Reader {
- readLine(): string;
- lines(): java.util.stream.Stream;
- }
}
namespace util {
namespace stream {
- const IntStream: {
- builder(): java.util.stream.IntStream$Builder;
- empty(): java.util.stream.IntStream;
- of(p0: number): java.util.stream.IntStream;
- of(p0: number): java.util.stream.IntStream;
- iterate(p0: number, p1: unknown): java.util.stream.IntStream;
- iterate(p0: number, p1: unknown, p2: unknown): java.util.stream.IntStream;
- generate(p0: unknown): java.util.stream.IntStream;
- range(p0: number, p1: number): java.util.stream.IntStream;
- rangeClosed(p0: number, p1: number): java.util.stream.IntStream;
- concat(p0: java.util.stream.IntStream, p1: java.util.stream.IntStream): java.util.stream.IntStream;
- }
- interface IntStream extends java.util.stream.BaseStream {
- filter(p0: unknown): java.util.stream.IntStream;
- map(p0: unknown): java.util.stream.IntStream;
- mapToObj(p0: unknown): java.util.stream.Stream;
- mapToLong(p0: unknown): java.util.stream.LongStream;
- mapToDouble(p0: unknown): java.util.stream.DoubleStream;
- flatMap(p0: unknown): java.util.stream.IntStream;
- mapMulti(p0: java.util.stream.IntStream$IntMapMultiConsumer): java.util.stream.IntStream;
- distinct(): java.util.stream.IntStream;
- sorted(): java.util.stream.IntStream;
- peek(p0: unknown): java.util.stream.IntStream;
- limit(p0: number): java.util.stream.IntStream;
- skip(p0: number): java.util.stream.IntStream;
- takeWhile(p0: unknown): java.util.stream.IntStream;
- dropWhile(p0: unknown): java.util.stream.IntStream;
- forEach(p0: unknown): void;
- forEachOrdered(p0: unknown): void;
- toArray(): Array;
- reduce(p0: number, p1: unknown): number;
- reduce(p0: unknown): java.util.OptionalInt;
- collect(p0: unknown, p1: unknown, p2: unknown): R;
- sum(): number;
- min(): java.util.OptionalInt;
- max(): java.util.OptionalInt;
- count(): number;
- average(): java.util.OptionalDouble;
- summaryStatistics(): java.util.IntSummaryStatistics;
- anyMatch(p0: unknown): boolean;
- allMatch(p0: unknown): boolean;
- noneMatch(p0: unknown): boolean;
- findFirst(): java.util.OptionalInt;
- findAny(): java.util.OptionalInt;
- asLongStream(): java.util.stream.LongStream;
- asDoubleStream(): java.util.stream.DoubleStream;
- boxed(): java.util.stream.Stream;
- }
- interface BaseStream extends java.lang.AutoCloseable {
- iterator(): kotlin.collections.MutableIterator;
- spliterator(): java.util.Spliterator;
- isParallel(): boolean;
- sequential(): S;
- parallel(): S;
- unordered(): S;
- onClose(p0: java.lang.Runnable): S;
- }
- interface IntStream$IntMapMultiConsumer {
- accept(p0: number, p1: unknown): void;
- (p0: number, p1: unknown): void;
- }
- interface IntStream$Builder {
- add(p0: number): java.util.stream.IntStream$Builder;
- build(): java.util.stream.IntStream;
- }
const Stream: {
builder(): java.util.stream.Stream$Builder;
empty(): java.util.stream.Stream;
@@ -3876,9 +3813,62 @@ declare global {
findFirst(): java.util.Optional;
findAny(): java.util.Optional;
}
- interface Stream$Builder {
- add(p0: T): java.util.stream.Stream$Builder;
- build(): java.util.stream.Stream;
+ interface BaseStream extends java.lang.AutoCloseable {
+ iterator(): kotlin.collections.MutableIterator;
+ spliterator(): java.util.Spliterator;
+ isParallel(): boolean;
+ sequential(): S;
+ parallel(): S;
+ unordered(): S;
+ onClose(p0: java.lang.Runnable): S;
+ }
+ const IntStream: {
+ builder(): java.util.stream.IntStream$Builder;
+ empty(): java.util.stream.IntStream;
+ of(p0: number): java.util.stream.IntStream;
+ of(p0: number): java.util.stream.IntStream;
+ iterate(p0: number, p1: unknown): java.util.stream.IntStream;
+ iterate(p0: number, p1: unknown, p2: unknown): java.util.stream.IntStream;
+ generate(p0: unknown): java.util.stream.IntStream;
+ range(p0: number, p1: number): java.util.stream.IntStream;
+ rangeClosed(p0: number, p1: number): java.util.stream.IntStream;
+ concat(p0: java.util.stream.IntStream, p1: java.util.stream.IntStream): java.util.stream.IntStream;
+ }
+ interface IntStream extends java.util.stream.BaseStream {
+ filter(p0: unknown): java.util.stream.IntStream;
+ map(p0: unknown): java.util.stream.IntStream;
+ mapToObj(p0: unknown): java.util.stream.Stream;
+ mapToLong(p0: unknown): java.util.stream.LongStream;
+ mapToDouble(p0: unknown): java.util.stream.DoubleStream;
+ flatMap(p0: unknown): java.util.stream.IntStream;
+ mapMulti(p0: java.util.stream.IntStream$IntMapMultiConsumer): java.util.stream.IntStream;
+ distinct(): java.util.stream.IntStream;
+ sorted(): java.util.stream.IntStream;
+ peek(p0: unknown): java.util.stream.IntStream;
+ limit(p0: number): java.util.stream.IntStream;
+ skip(p0: number): java.util.stream.IntStream;
+ takeWhile(p0: unknown): java.util.stream.IntStream;
+ dropWhile(p0: unknown): java.util.stream.IntStream;
+ forEach(p0: unknown): void;
+ forEachOrdered(p0: unknown): void;
+ toArray(): Array;
+ reduce(p0: number, p1: unknown): number;
+ reduce(p0: unknown): java.util.OptionalInt;
+ collect(p0: unknown, p1: unknown, p2: unknown): R;
+ sum(): number;
+ min(): java.util.OptionalInt;
+ max(): java.util.OptionalInt;
+ count(): number;
+ average(): java.util.OptionalDouble;
+ summaryStatistics(): java.util.IntSummaryStatistics;
+ anyMatch(p0: unknown): boolean;
+ allMatch(p0: unknown): boolean;
+ noneMatch(p0: unknown): boolean;
+ findFirst(): java.util.OptionalInt;
+ findAny(): java.util.OptionalInt;
+ asLongStream(): java.util.stream.LongStream;
+ asDoubleStream(): java.util.stream.DoubleStream;
+ boxed(): java.util.stream.Stream;
}
const LongStream: {
builder(): java.util.stream.LongStream$Builder;
@@ -3927,14 +3917,6 @@ declare global {
asDoubleStream(): java.util.stream.DoubleStream;
boxed(): java.util.stream.Stream;
}
- interface LongStream$Builder {
- add(p0: number): java.util.stream.LongStream$Builder;
- build(): java.util.stream.LongStream;
- }
- interface LongStream$LongMapMultiConsumer {
- accept(p0: number, p1: unknown): void;
- (p0: number, p1: unknown): void;
- }
const DoubleStream: {
builder(): java.util.stream.DoubleStream$Builder;
empty(): java.util.stream.DoubleStream;
@@ -3979,20 +3961,36 @@ declare global {
findAny(): java.util.OptionalDouble;
boxed(): java.util.stream.Stream;
}
+ interface DoubleStream$DoubleMapMultiConsumer extends any {
+ accept(p0: number, p1: unknown): void;
+ (p0: number, p1: unknown): void;
+ }
interface DoubleStream$Builder {
add(p0: number): java.util.stream.DoubleStream$Builder;
build(): java.util.stream.DoubleStream;
}
- interface DoubleStream$DoubleMapMultiConsumer {
+ interface LongStream$LongMapMultiConsumer extends any {
+ accept(p0: number, p1: unknown): void;
+ (p0: number, p1: unknown): void;
+ }
+ interface LongStream$Builder {
+ add(p0: number): java.util.stream.LongStream$Builder;
+ build(): java.util.stream.LongStream;
+ }
+ interface IntStream$IntMapMultiConsumer extends any {
accept(p0: number, p1: unknown): void;
(p0: number, p1: unknown): void;
}
+ interface IntStream$Builder {
+ add(p0: number): java.util.stream.IntStream$Builder;
+ build(): java.util.stream.IntStream;
+ }
const Collector: {
Characteristics: typeof java.util.stream.Collector$Characteristics;
of(p0: unknown, p1: unknown, p2: unknown, p3: java.util.stream.Collector$Characteristics): java.util.stream.Collector;
of(p0: unknown, p1: unknown, p2: unknown, p3: unknown, p4: java.util.stream.Collector$Characteristics): java.util.stream.Collector;
}
- interface Collector {
+ interface Collector extends any {
supplier(): unknown;
accumulator(): unknown;
combiner(): unknown;
@@ -4003,42 +4001,22 @@ declare global {
CONCURRENT: java.util.stream.Collector$Characteristics;
UNORDERED: java.util.stream.Collector$Characteristics;
IDENTITY_FINISH: java.util.stream.Collector$Characteristics;
- valueOf(value: string): java.util.stream.Collector$Characteristics;
+ entries: kotlin.enums.EnumEntries;
values(): Array;
+ valueOf(value: string): java.util.stream.Collector$Characteristics;
}
interface Collector$Characteristics extends kotlin.Enum {
}
+ interface Stream$Builder {
+ add(p0: T): java.util.stream.Stream$Builder;
+ build(): java.util.stream.Stream;
+ }
}
namespace concurrent {
namespace atomic {
- const AtomicBoolean: {
- new(p0: boolean): java.util.concurrent.atomic.AtomicBoolean;
- new(): java.util.concurrent.atomic.AtomicBoolean;
- }
- interface AtomicBoolean extends java.io.Serializable {
- get(): boolean;
- compareAndSet(p0: boolean, p1: boolean): boolean;
- weakCompareAndSet(p0: boolean, p1: boolean): boolean;
- weakCompareAndSetPlain(p0: boolean, p1: boolean): boolean;
- set(p0: boolean): void;
- lazySet(p0: boolean): void;
- getAndSet(p0: boolean): boolean;
- getPlain(): boolean;
- setPlain(p0: boolean): void;
- getOpaque(): boolean;
- setOpaque(p0: boolean): void;
- getAcquire(): boolean;
- setRelease(p0: boolean): void;
- compareAndExchange(p0: boolean, p1: boolean): boolean;
- compareAndExchangeAcquire(p0: boolean, p1: boolean): boolean;
- compareAndExchangeRelease(p0: boolean, p1: boolean): boolean;
- weakCompareAndSetVolatile(p0: boolean, p1: boolean): boolean;
- weakCompareAndSetAcquire(p0: boolean, p1: boolean): boolean;
- weakCompareAndSetRelease(p0: boolean, p1: boolean): boolean;
- }
const AtomicReference: {
- new(p0: V): java.util.concurrent.atomic.AtomicReference;
- new(): java.util.concurrent.atomic.AtomicReference;
+ new(p0: V): java.util.concurrent.atomic.AtomicReference;
+ new(): java.util.concurrent.atomic.AtomicReference;
}
interface AtomicReference extends java.io.Serializable {
get(): V;
@@ -4065,6 +4043,31 @@ declare global {
weakCompareAndSetAcquire(p0: V, p1: V): boolean;
weakCompareAndSetRelease(p0: V, p1: V): boolean;
}
+ const AtomicBoolean: {
+ new(p0: boolean): java.util.concurrent.atomic.AtomicBoolean;
+ new(): java.util.concurrent.atomic.AtomicBoolean;
+ }
+ interface AtomicBoolean extends java.io.Serializable {
+ get(): boolean;
+ compareAndSet(p0: boolean, p1: boolean): boolean;
+ weakCompareAndSet(p0: boolean, p1: boolean): boolean;
+ weakCompareAndSetPlain(p0: boolean, p1: boolean): boolean;
+ set(p0: boolean): void;
+ lazySet(p0: boolean): void;
+ getAndSet(p0: boolean): boolean;
+ getPlain(): boolean;
+ setPlain(p0: boolean): void;
+ getOpaque(): boolean;
+ setOpaque(p0: boolean): void;
+ getAcquire(): boolean;
+ setRelease(p0: boolean): void;
+ compareAndExchange(p0: boolean, p1: boolean): boolean;
+ compareAndExchangeAcquire(p0: boolean, p1: boolean): boolean;
+ compareAndExchangeRelease(p0: boolean, p1: boolean): boolean;
+ weakCompareAndSetVolatile(p0: boolean, p1: boolean): boolean;
+ weakCompareAndSetAcquire(p0: boolean, p1: boolean): boolean;
+ weakCompareAndSetRelease(p0: boolean, p1: boolean): boolean;
+ }
}
const TimeUnit: {
NANOSECONDS: java.util.concurrent.TimeUnit;
@@ -4074,9 +4077,10 @@ declare global {
MINUTES: java.util.concurrent.TimeUnit;
HOURS: java.util.concurrent.TimeUnit;
DAYS: java.util.concurrent.TimeUnit;
+ entries: kotlin.enums.EnumEntries;
of(p0: java.time.temporal.ChronoUnit): java.util.concurrent.TimeUnit;
- valueOf(value: string): java.util.concurrent.TimeUnit;
values(): Array;
+ valueOf(value: string): java.util.concurrent.TimeUnit;
}
interface TimeUnit extends kotlin.Enum {
convert(p0: number, p1: java.util.concurrent.TimeUnit): number;
@@ -4093,13 +4097,13 @@ declare global {
sleep(p0: number): void;
toChronoUnit(): java.time.temporal.ChronoUnit;
}
- interface ThreadFactory {
+ interface ThreadFactory extends any {
newThread(p0: java.lang.Runnable): java.lang.Thread;
}
const Future: {
State: typeof java.util.concurrent.Future$State;
}
- interface Future {
+ interface Future extends any {
cancel(p0: boolean): boolean;
isCancelled(): boolean;
isDone(): boolean;
@@ -4114,8 +4118,9 @@ declare global {
SUCCESS: java.util.concurrent.Future$State;
FAILED: java.util.concurrent.Future$State;
CANCELLED: java.util.concurrent.Future$State;
- valueOf(value: string): java.util.concurrent.Future$State;
+ entries: kotlin.enums.EnumEntries;
values(): Array;
+ valueOf(value: string): java.util.concurrent.Future$State;
}
interface Future$State extends kotlin.Enum {
}
@@ -4133,14 +4138,15 @@ declare global {
invokeAny(p0: Array>): T;
invokeAny(p0: Array>, p1: number, p2: java.util.concurrent.TimeUnit): T;
}
- interface Executor {
+ interface Executor extends any {
execute(p0: java.lang.Runnable): void;
}
- interface Callable {
+ interface Callable extends any {
call(): V;
(): V;
}
const CompletableFuture: {
+ new(): java.util.concurrent.CompletableFuture;
supplyAsync(p0: unknown): java.util.concurrent.CompletableFuture;
supplyAsync(p0: unknown, p1: java.util.concurrent.Executor): java.util.concurrent.CompletableFuture;
runAsync(p0: java.lang.Runnable): java.util.concurrent.CompletableFuture;
@@ -4153,7 +4159,6 @@ declare global {
completedStage(p0: U): java.util.concurrent.CompletionStage;
failedFuture(p0: kotlin.Throwable): java.util.concurrent.CompletableFuture;
failedStage(p0: kotlin.Throwable): java.util.concurrent.CompletionStage;
- new(): java.util.concurrent.CompletableFuture;
}
interface CompletableFuture extends java.util.concurrent.Future, java.util.concurrent.CompletionStage {
join(): T;
@@ -4173,7 +4178,7 @@ declare global {
orTimeout(p0: number, p1: java.util.concurrent.TimeUnit): java.util.concurrent.CompletableFuture;
completeOnTimeout(p0: T, p1: number, p2: java.util.concurrent.TimeUnit): java.util.concurrent.CompletableFuture;
}
- interface CompletionStage {
+ interface CompletionStage extends any {
thenApply(p0: unknown): java.util.concurrent.CompletionStage;
thenApplyAsync(p0: unknown): java.util.concurrent.CompletionStage;
thenApplyAsync(p0: unknown, p1: java.util.concurrent.Executor): java.util.concurrent.CompletionStage;
@@ -4218,7 +4223,7 @@ declare global {
exceptionallyComposeAsync(p0: unknown, p1: java.util.concurrent.Executor): java.util.concurrent.CompletionStage;
toCompletableFuture(): java.util.concurrent.CompletableFuture;
}
- interface CompletableFuture$AsynchronousCompletionTask {
+ interface CompletableFuture$AsynchronousCompletionTask extends any {
}
interface ScheduledExecutorService extends java.util.concurrent.ExecutorService {
schedule(p0: java.lang.Runnable, p1: number, p2: java.util.concurrent.TimeUnit): java.util.concurrent.ScheduledFuture;
@@ -4231,28 +4236,15 @@ declare global {
interface Delayed extends kotlin.Comparable {
getDelay(p0: java.util.concurrent.TimeUnit): number;
}
- const CopyOnWriteArrayList: {
- new(): java.util.concurrent.CopyOnWriteArrayList;
- new(p0: Array): java.util.concurrent.CopyOnWriteArrayList;
- new(p0: Array): java.util.concurrent.CopyOnWriteArrayList;
- }
- interface CopyOnWriteArrayList extends Array, java.util.RandomAccess, kotlin.Cloneable, java.io.Serializable {
- indexOf(p0: E, p1: number): number;
- lastIndexOf(p0: E, p1: number): number;
- toArray(): Array;
- toArray(p0: Array): Array;
- addIfAbsent(p0: E): boolean;
- addAllAbsent(p0: Array): number;
- }
const ConcurrentHashMap: {
KeySetView: typeof java.util.concurrent.ConcurrentHashMap$KeySetView;
+ new(): java.util.concurrent.ConcurrentHashMap;
+ new(p0: number): java.util.concurrent.ConcurrentHashMap;
+ new(p0: Map): java.util.concurrent.ConcurrentHashMap;
+ new(p0: number, p1: number): java.util.concurrent.ConcurrentHashMap;
+ new(p0: number, p1: number, p2: number): java.util.concurrent.ConcurrentHashMap;
newKeySet(): java.util.concurrent.ConcurrentHashMap$KeySetView;
newKeySet(p0: number): java.util.concurrent.ConcurrentHashMap$KeySetView;
- new(): java.util.concurrent.ConcurrentHashMap;
- new(p0: number): java.util.concurrent.ConcurrentHashMap;
- new(p0: Map): java.util.concurrent.ConcurrentHashMap;
- new(p0: number, p1: number): java.util.concurrent.ConcurrentHashMap;
- new(p0: number, p1: number, p2: number): java.util.concurrent.ConcurrentHashMap;
}
interface ConcurrentHashMap extends java.util.AbstractMap, java.util.concurrent.ConcurrentMap, java.io.Serializable, Map {
keySet(p0: V): java.util.concurrent.ConcurrentHashMap$KeySetView;
@@ -4297,13 +4289,26 @@ declare global {
interface ConcurrentHashMap$KeySetView extends Set, java.io.Serializable {
getMappedValue(): V;
}
+ const CopyOnWriteArrayList: {
+ new(): java.util.concurrent.CopyOnWriteArrayList;
+ new(p0: Array): java.util.concurrent.CopyOnWriteArrayList;
+ new(p0: Array): java.util.concurrent.CopyOnWriteArrayList;
+ }
+ interface CopyOnWriteArrayList