mirror of
https://github.com/eaglerforge/EaglerForgeInjector
synced 2025-07-24 22:51:18 -09:00
revert
This commit is contained in:
parent
e4274a9ac3
commit
fe134620be
@ -26,12 +26,12 @@ ModAPI.addEventListener("lib:libcustomitems:loaded", () => {
|
|||||||
globalThis.pos2y = {}
|
globalThis.pos2y = {}
|
||||||
globalThis.pos2z = {}
|
globalThis.pos2z = {}
|
||||||
|
|
||||||
globalThis.pos2x[username] = blockpos.x;
|
globalThis.pos2x[username] = blockpos.x
|
||||||
globalThis.pos2y[username] = blockpos.y;
|
globalThis.pos2y[username] = blockpos.y
|
||||||
globalThis.pos2z[username] = blockpos.z;
|
globalThis.pos2z[username] = blockpos.z
|
||||||
console.log("rightclick: " + blockpos.x + ", " + blockpos.y + ", " + blockpos.z);
|
console.log("rightclick: " + blockpos.x + ", " + blockpos.y + ", " + blockpos.z)
|
||||||
// Send chat message to player
|
// Send chat message to player
|
||||||
user.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + "Pos #2 set to: " + blockpos.x + ", " + blockpos.y + ", " + blockpos.z)));
|
user.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + "Pos #2 set to: " + blockpos.x + ", " + blockpos.y + ", " + blockpos.z)))
|
||||||
return true;
|
return true;
|
||||||
`,
|
`,
|
||||||
onLeftClickGround: `/*/user, world, itemstack, blockpos/*/
|
onLeftClickGround: `/*/user, world, itemstack, blockpos/*/
|
||||||
@ -42,43 +42,22 @@ ModAPI.addEventListener("lib:libcustomitems:loaded", () => {
|
|||||||
globalThis.posy = {}
|
globalThis.posy = {}
|
||||||
globalThis.posz = {}
|
globalThis.posz = {}
|
||||||
|
|
||||||
globalThis.posx[username] = blockpos.x;
|
globalThis.posx[username] = blockpos.x
|
||||||
globalThis.posy[username] = blockpos.y;
|
globalThis.posy[username] = blockpos.y
|
||||||
globalThis.posz[username] = blockpos.z;
|
globalThis.posz[username] = blockpos.z
|
||||||
|
|
||||||
// Send chat message to player
|
// Send chat message to player
|
||||||
user.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + "Pos #1 set to: " + blockpos.x + ", " + blockpos.y + ", " + blockpos.z)));
|
user.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + "Pos #1 set to: " + blockpos.x + ", " + blockpos.y + ", " + blockpos.z)))
|
||||||
return true;
|
return true;
|
||||||
`
|
`
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
(() => {
|
(() => {
|
||||||
// Storing block changes for undo/redo
|
|
||||||
const undoStack = {};
|
|
||||||
const redoStack = {};
|
|
||||||
|
|
||||||
PluginAPI.dedicatedServer.appendCode(function () {
|
PluginAPI.dedicatedServer.appendCode(function () {
|
||||||
PluginAPI.addEventListener("processcommand", (event) => {
|
PluginAPI.addEventListener("processcommand", (event) => {
|
||||||
if (!ModAPI.reflect.getClassById("net.minecraft.entity.player.EntityPlayerMP").instanceOf(event.sender.getRef())) { return }
|
if (!ModAPI.reflect.getClassById("net.minecraft.entity.player.EntityPlayerMP").instanceOf(event.sender.getRef())) {return}
|
||||||
const prefix = "§7[§4worldedit§7] ";
|
const prefix = "§7[§4worldedit§7] ";
|
||||||
var blockPosConstructor = ModAPI.reflect.getClassById("net.minecraft.util.BlockPos").constructors.find((x) => { return x.length === 3 });
|
|
||||||
var username = ModAPI.util.str(event.sender.getName());
|
|
||||||
|
|
||||||
const storeUndo = (username, blocks) => {
|
|
||||||
if (!undoStack[username]) undoStack[username] = [];
|
|
||||||
undoStack[username].push(blocks);
|
|
||||||
redoStack[username] = []; // Clear redo stack on new action
|
|
||||||
};
|
|
||||||
|
|
||||||
const performAction = (blocks, sender, reverse = false) => {
|
|
||||||
blocks.forEach((blockInfo) => {
|
|
||||||
const blockPos = blockPosConstructor(blockInfo.x, blockInfo.y, blockInfo.z);
|
|
||||||
const block = reverse ? blockInfo.oldBlock : blockInfo.newBlock;
|
|
||||||
sender.getServerForPlayer().setBlockState(blockPos, block, 3);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
if (event.command.toLowerCase().startsWith("//wand")) {
|
if (event.command.toLowerCase().startsWith("//wand")) {
|
||||||
// Create a new ItemStack for the custom item
|
// Create a new ItemStack for the custom item
|
||||||
const ItemStackClass = ModAPI.reflect.getClassById("net.minecraft.item.ItemStack");
|
const ItemStackClass = ModAPI.reflect.getClassById("net.minecraft.item.ItemStack");
|
||||||
@ -111,107 +90,86 @@ ModAPI.addEventListener("lib:libcustomitems:loaded", () => {
|
|||||||
|
|
||||||
event.preventDefault = true;
|
event.preventDefault = true;
|
||||||
}
|
}
|
||||||
|
var blockPosConstructor = ModAPI.reflect.getClassById("net.minecraft.util.BlockPos").constructors.find((x) => { return x.length === 3 });
|
||||||
if (event.command.toLowerCase().startsWith("//set")) {
|
if (event.command.toLowerCase().startsWith("//set")) {
|
||||||
const args = event.command.substring("//set ".length);
|
const args = event.command.substring("//set ".length);
|
||||||
|
var username = ModAPI.util.str(event.sender.getName());
|
||||||
|
|
||||||
if (args) {
|
if (args) {
|
||||||
const blockTypeName = args;
|
const blockTypeName = args
|
||||||
const x1 = globalThis.posx[username], y1 = globalThis.posy[username], z1 = globalThis.posz[username];
|
const x1 = globalThis.posx[username], y1 = globalThis.posy[username], z1 = globalThis.posz[username];
|
||||||
const x2 = globalThis.pos2x[username], y2 = globalThis.pos2y[username], z2 = globalThis.pos2z[username];
|
const x2 = globalThis.pos2x[username], y2 = globalThis.pos2y[username], z2 = globalThis.pos2z[username];
|
||||||
|
|
||||||
const blockType = ModAPI.blocks[blockTypeName];
|
// Validate block and get block type
|
||||||
if (!blockType) {
|
|
||||||
event.sender.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + `Invalid block: ${blockTypeName}`)));
|
|
||||||
event.preventPrevent = true;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const block = blockType.getDefaultState().getRef();
|
|
||||||
const xMin = Math.min(x1, x2), xMax = Math.max(x1, x2);
|
|
||||||
const yMin = Math.min(y1, y2), yMax = Math.max(y1, y2);
|
|
||||||
const zMin = Math.min(z1, z2), zMax = Math.max(z1, z2);
|
|
||||||
|
|
||||||
let blockChanges = [];
|
|
||||||
|
|
||||||
for (let x = xMin; x <= xMax; x++) {
|
|
||||||
for (let y = yMin; y <= yMax; y++) {
|
|
||||||
for (let z = zMin; z <= zMax; z++) {
|
|
||||||
const blockPos = blockPosConstructor(x, y, z);
|
|
||||||
const oldBlock = event.sender.getServerForPlayer().getBlockState(blockPos);
|
|
||||||
blockChanges.push({ x, y, z, oldBlock, newBlock: block });
|
|
||||||
event.sender.getServerForPlayer().setBlockState(blockPos, block, 3);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
storeUndo(username, blockChanges);
|
|
||||||
event.sender.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + `Set blocks to ${blockTypeName}`)));
|
|
||||||
}
|
|
||||||
event.preventDefault = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (event.command.toLowerCase().startsWith("//walls")) {
|
|
||||||
const args = event.command.substring("//walls ".length);
|
|
||||||
|
|
||||||
if (args) {
|
|
||||||
const blockTypeName = args;
|
|
||||||
const x1 = globalThis.posx[username], y1 = globalThis.posy[username], z1 = globalThis.posz[username];
|
|
||||||
const x2 = globalThis.pos2x[username], y2 = globalThis.pos2y[username], z2 = globalThis.pos2z[username];
|
|
||||||
|
|
||||||
const blockType = ModAPI.blocks[blockTypeName];
|
const blockType = ModAPI.blocks[blockTypeName];
|
||||||
if (!blockType) {
|
if (!blockType) {
|
||||||
event.sender.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + `Invalid block: ${blockTypeName}`)));
|
event.sender.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + `Invalid block: ${blockTypeName}`)));
|
||||||
event.preventDefault = true;
|
event.preventDefault = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const block = blockType.getDefaultState().getRef();
|
const block = blockType.getDefaultState().getRef();
|
||||||
|
|
||||||
|
// Get min and max coordinates for the fill region
|
||||||
|
const xMin = Math.min(x1, x2), xMax = Math.max(x1, x2);
|
||||||
|
const yMin = Math.min(y1, y2), yMax = Math.max(y1, y2);
|
||||||
|
const zMin = Math.min(z1, z2), zMax = Math.max(z1, z2);
|
||||||
|
|
||||||
|
// Loop through the region and set the blocks
|
||||||
|
for (let x = xMin; x <= xMax; x++) {
|
||||||
|
for (let y = yMin; y <= yMax; y++) {
|
||||||
|
for (let z = zMin; z <= zMax; z++) {
|
||||||
|
const blockPos = blockPosConstructor(x, y, z);
|
||||||
|
event.sender.getServerForPlayer().setBlockState(blockPos, block, 3);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Notify the player that the blocks have been set
|
||||||
|
event.sender.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + `Set blocks to ${blockTypeName}`)));
|
||||||
|
} else{
|
||||||
|
event.sender.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + `Arguments not found!`)));
|
||||||
|
}
|
||||||
|
event.preventDefault = true;
|
||||||
|
}
|
||||||
|
if (event.command.toLowerCase().startsWith("//walls")) {
|
||||||
|
const args = event.command.substring("//walls ".length);
|
||||||
|
var username = ModAPI.util.str(event.sender.getName());
|
||||||
|
|
||||||
|
if (args) {
|
||||||
|
const blockTypeName = args;
|
||||||
|
const x1 = globalThis.posx[username], y1 = globalThis.posy[username], z1 = globalThis.posz[username];
|
||||||
|
const x2 = globalThis.pos2x[username], y2 = globalThis.pos2y[username], z2 = globalThis.pos2z[username];
|
||||||
|
|
||||||
|
// Validate block and get block type
|
||||||
|
const blockType = ModAPI.blocks[blockTypeName];
|
||||||
|
if (!blockType) {
|
||||||
|
event.sender.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + `Invalid block: ${blockTypeName}`)));
|
||||||
|
event.preventDefault = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const block = blockType.getDefaultState().getRef();
|
||||||
|
|
||||||
|
// Get min and max coordinates for the region
|
||||||
const xMin = Math.min(x1, x2), xMax = Math.max(x1, x2);
|
const xMin = Math.min(x1, x2), xMax = Math.max(x1, x2);
|
||||||
const yMin = Math.min(y1, y2), yMax = Math.max(y1, y2);
|
const yMin = Math.min(y1, y2), yMax = Math.max(y1, y2);
|
||||||
const zMin = Math.min(z1, z2), zMax = Math.max(z1, z2);
|
const zMin = Math.min(z1, z2), zMax = Math.max(z1, z2);
|
||||||
|
|
||||||
let blockChanges = [];
|
// Loop through the region and set the walls (exclude interior blocks)
|
||||||
|
|
||||||
for (let x = xMin; x <= xMax; x++) {
|
for (let x = xMin; x <= xMax; x++) {
|
||||||
for (let y = yMin; y <= yMax; y++) {
|
for (let y = yMin; y <= yMax; y++) {
|
||||||
for (let z = zMin; z <= zMax; z++) {
|
for (let z = zMin; z <= zMax; z++) {
|
||||||
if ((x === xMin || x === xMax || z === zMin || z === zMax) && y !== yMin && y !== yMax) {
|
if (x === xMin || x === xMax || z === zMin || z === zMax) {
|
||||||
const blockPos = blockPosConstructor(x, y, z);
|
const blockPos = blockPosConstructor(x, y, z);
|
||||||
const oldBlock = event.sender.getServerForPlayer().getBlockState(blockPos);
|
|
||||||
blockChanges.push({ x, y, z, oldBlock, newBlock: block });
|
|
||||||
event.sender.getServerForPlayer().setBlockState(blockPos, block, 3);
|
event.sender.getServerForPlayer().setBlockState(blockPos, block, 3);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
storeUndo(username, blockChanges);
|
// Notify the player that the walls have been set
|
||||||
event.sender.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + `Created walls with ${blockTypeName}`)));
|
event.sender.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + `Walls set to ${blockTypeName}`)));
|
||||||
}
|
|
||||||
event.preventDefault = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (event.command.toLowerCase().startsWith("//undo")) {
|
|
||||||
if (undoStack[username] && undoStack[username].length > 0) {
|
|
||||||
const lastAction = undoStack[username].pop();
|
|
||||||
redoStack[username].push(lastAction);
|
|
||||||
performAction(lastAction, event.sender, true); // Reverse the block changes
|
|
||||||
event.sender.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + `Undo successful`)));
|
|
||||||
} else {
|
} else {
|
||||||
event.sender.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + `Nothing to undo`)));
|
event.sender.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + `Arguments not found!`)));
|
||||||
}
|
|
||||||
event.preventDefault = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (event.command.toLowerCase().startsWith("//redo")) {
|
|
||||||
if (redoStack[username] && redoStack[username].length > 0) {
|
|
||||||
const lastUndoneAction = redoStack[username].pop();
|
|
||||||
undoStack[username].push(lastUndoneAction);
|
|
||||||
performAction(lastUndoneAction, event.sender); // Reapply the block changes
|
|
||||||
event.sender.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + `Redo successful`)));
|
|
||||||
} else {
|
|
||||||
event.sender.addChatMessage(ModAPI.reflect.getClassById("net.minecraft.util.ChatComponentText").constructors[0](ModAPI.util.str(prefix + `Nothing to redo`)));
|
|
||||||
}
|
}
|
||||||
event.preventDefault = true;
|
event.preventDefault = true;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user