yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved how books are handled

Browse Source 
Implemented admin model viewer ::models
This commit is contained in:
Oven Bread
2023-07-30 08:33:40 +00:00
committed by Ryan
parent 3cf73ba09a
commit d76b99c77a
30 changed files with 214 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/core/game/node/entity/player/link/PacketDispatch.java
+4
View File
@@ -219,6 +219,10 @@ public final class PacketDispatch {
PacketRepository.send(DisplayModel.class, new DisplayModelContext(player, ModelType.MODEL, modelID,zoom,interfaceId,childId,new Object()));
}
public void sendAngleOnInterface(int interfaceId, int childId, int zoom, int pitch, int yaw){
PacketRepository.send(InterfaceSetAngle.class, new DefaultContext(player, pitch, zoom, yaw, interfaceId, childId));
}
/**
* Send the item on interface packet.
* @param itemId The item id.
Server/src/main/core/game/system/command/sets/ModelViewerCommandSet.kt
+99
View File
@@ -0,0 +1,99 @@
package core.game.system.command.sets
import content.global.handlers.iface.BookInterface
import core.api.*
import core.game.node.entity.player.Player
import core.game.system.command.Privilege
import core.plugin.Initializable
/** To view models in game. */
@Initializable
class ModelViewerCommandSet : CommandSet(Privilege.ADMIN) {
companion object {
const val DEF_BOOK = 10216
const val TITLE = "Model Viewer"
const val ATTRIBUTE_MODEL_NUMBER = "modelNumber"
const val ATTRIBUTE_ZOOM = "modelZoom"
const val ATTRIBUTE_PITCH = "modelPitch"
const val ATTRIBUTE_YAW = "modelYaw"
private fun display(player: Player, pageNum: Int, buttonID: Int) : Boolean {
BookInterface.clearBookLines(player, BookInterface.FANCY_BOOK_2_27, BookInterface.FANCY_BOOK_2_27_LINE_IDS);
BookInterface.clearButtons(player, BookInterface.FANCY_BOOK_2_27, BookInterface.FANCY_BOOK_2_27_BUTTON_IDS);
BookInterface.setTitle(player, BookInterface.FANCY_BOOK_2_27, BookInterface.FANCY_BOOK_2_27_LINE_IDS, TITLE);
// Custom button interfaces for model book
// These are non-standard. No pages are "turned" here.
player.packetDispatch.sendInterfaceConfig(BookInterface.FANCY_BOOK_2_27, 114, false)
player.packetDispatch.sendInterfaceConfig(BookInterface.FANCY_BOOK_2_27, 116, false)
player.packetDispatch.sendInterfaceConfig(BookInterface.FANCY_BOOK_2_27, 118, false)
player.packetDispatch.sendInterfaceConfig(BookInterface.FANCY_BOOK_2_27, 122, false)
player.packetDispatch.sendInterfaceConfig(BookInterface.FANCY_BOOK_2_27, 124, false)
player.packetDispatch.sendInterfaceConfig(BookInterface.FANCY_BOOK_2_27, 126, false)
player.packetDispatch.sendInterfaceConfig(BookInterface.FANCY_BOOK_2_27, 128, false)
player.packetDispatch.sendInterfaceConfig(BookInterface.FANCY_BOOK_2_27, 144, false)
player.packetDispatch.sendInterfaceConfig(BookInterface.FANCY_BOOK_2_27, 146, false)
player.packetDispatch.sendInterfaceConfig(BookInterface.FANCY_BOOK_2_27, 148, false)
player.packetDispatch.sendInterfaceConfig(BookInterface.FANCY_BOOK_2_27, 152, false)
player.packetDispatch.sendInterfaceConfig(BookInterface.FANCY_BOOK_2_27, 154, false)
player.packetDispatch.sendInterfaceConfig(BookInterface.FANCY_BOOK_2_27, 156, false)
player.packetDispatch.sendInterfaceConfig(BookInterface.FANCY_BOOK_2_27, 158, false)
player.packetDispatch.sendString("-1 zoom" ,BookInterface.FANCY_BOOK_2_27, 114)
player.packetDispatch.sendString("-1 pitch" ,BookInterface.FANCY_BOOK_2_27, 116)
player.packetDispatch.sendString("-1 yaw" ,BookInterface.FANCY_BOOK_2_27, 118)
player.packetDispatch.sendString("-1" ,BookInterface.FANCY_BOOK_2_27, 122)
player.packetDispatch.sendString("-10" ,BookInterface.FANCY_BOOK_2_27, 124)
player.packetDispatch.sendString("-100" ,BookInterface.FANCY_BOOK_2_27, 126)
player.packetDispatch.sendString("-1000" ,BookInterface.FANCY_BOOK_2_27, 128)
player.packetDispatch.sendString("+1 zoom" ,BookInterface.FANCY_BOOK_2_27, 144)
player.packetDispatch.sendString("+1 pitch" ,BookInterface.FANCY_BOOK_2_27, 146)
player.packetDispatch.sendString("+1 yaw" ,BookInterface.FANCY_BOOK_2_27, 148)
player.packetDispatch.sendString("+1" ,BookInterface.FANCY_BOOK_2_27, 152)
player.packetDispatch.sendString("+10" ,BookInterface.FANCY_BOOK_2_27, 154)
player.packetDispatch.sendString("+100" ,BookInterface.FANCY_BOOK_2_27, 156)
player.packetDispatch.sendString("+1000" ,BookInterface.FANCY_BOOK_2_27, 158)
// Attach buttons to setAttributes
when (buttonID) {
114 -> setAttribute(player, ATTRIBUTE_ZOOM, getAttribute(player, ATTRIBUTE_ZOOM, 700) - 100)
116 -> setAttribute(player, ATTRIBUTE_PITCH, getAttribute(player, ATTRIBUTE_PITCH, 0) - 100)
118 -> setAttribute(player, ATTRIBUTE_YAW, getAttribute(player, ATTRIBUTE_YAW, 0) - 100)
122 -> setAttribute(player, ATTRIBUTE_MODEL_NUMBER, getAttribute(player, ATTRIBUTE_MODEL_NUMBER, DEF_BOOK) - 1)
124 -> setAttribute(player, ATTRIBUTE_MODEL_NUMBER, getAttribute(player, ATTRIBUTE_MODEL_NUMBER, DEF_BOOK) - 10)
126 -> setAttribute(player, ATTRIBUTE_MODEL_NUMBER, getAttribute(player, ATTRIBUTE_MODEL_NUMBER, DEF_BOOK) - 100)
128 -> setAttribute(player, ATTRIBUTE_MODEL_NUMBER, getAttribute(player, ATTRIBUTE_MODEL_NUMBER, DEF_BOOK) - 1000)
144 -> setAttribute(player, ATTRIBUTE_ZOOM, getAttribute(player, ATTRIBUTE_ZOOM, 700) + 100)
146 -> setAttribute(player, ATTRIBUTE_PITCH, getAttribute(player, ATTRIBUTE_PITCH, 0) + 100)
148 -> setAttribute(player, ATTRIBUTE_YAW, getAttribute(player, ATTRIBUTE_YAW, 0) + 100)
152 -> setAttribute(player, ATTRIBUTE_MODEL_NUMBER, getAttribute(player, ATTRIBUTE_MODEL_NUMBER, DEF_BOOK) + 1)
154 -> setAttribute(player, ATTRIBUTE_MODEL_NUMBER, getAttribute(player, ATTRIBUTE_MODEL_NUMBER, DEF_BOOK) + 10)
156 -> setAttribute(player, ATTRIBUTE_MODEL_NUMBER, getAttribute(player, ATTRIBUTE_MODEL_NUMBER, DEF_BOOK) + 100)
158 -> setAttribute(player, ATTRIBUTE_MODEL_NUMBER, getAttribute(player, ATTRIBUTE_MODEL_NUMBER, DEF_BOOK) + 1000)
}
// Display model number
player.packetDispatch.sendString("No: " + getAttribute(player, ATTRIBUTE_MODEL_NUMBER, DEF_BOOK) + " " + getAttribute(player, ATTRIBUTE_ZOOM, 700) + " " + getAttribute(player, ATTRIBUTE_PITCH, 0) + " " + getAttribute(player, ATTRIBUTE_YAW, 0),BookInterface.FANCY_BOOK_2_27, 38)
player.packetDispatch.sendString("No: " + (getAttribute(player, ATTRIBUTE_MODEL_NUMBER, DEF_BOOK) + 1),BookInterface.FANCY_BOOK_2_27, 53)
// Display the models in the middle
BookInterface.setModelOnPage(player,0, getAttribute(player, ATTRIBUTE_MODEL_NUMBER, DEF_BOOK), BookInterface.FANCY_BOOK_2_27, BookInterface.FANCY_BOOK_2_27_IMAGE_ENABLE_DRAW_IDS[7], BookInterface.FANCY_BOOK_2_27_IMAGE_DRAW_IDS[7], getAttribute(player, ATTRIBUTE_ZOOM, 700), getAttribute(player, ATTRIBUTE_PITCH, 0), getAttribute(player, ATTRIBUTE_YAW, 0))
BookInterface.setModelOnPage(player,0, getAttribute(player, ATTRIBUTE_MODEL_NUMBER, DEF_BOOK) + 1, BookInterface.FANCY_BOOK_2_27, BookInterface.FANCY_BOOK_2_27_IMAGE_ENABLE_DRAW_IDS[22], BookInterface.FANCY_BOOK_2_27_IMAGE_DRAW_IDS[22], getAttribute(player, ATTRIBUTE_ZOOM, 700), getAttribute(player, ATTRIBUTE_PITCH, 0), getAttribute(player, ATTRIBUTE_YAW, 0))
return true
}
}
override fun defineCommands() {
define("models"){ player, args ->
// Bad number of args
if(args.size > 2){
reject(player,"Usage: ::models")
return@define
}
BookInterface.openBook(player, BookInterface.FANCY_BOOK_2_27, ::display)
return@define
}
}
}
Server/src/main/core/game/system/command/sets/StatsCommandSet.kt
+1 -3
View File
@@ -188,10 +188,8 @@ class StatsCommandSet : CommandSet(Privilege.STANDARD) {
return@define
}
setAttribute(player, "bookInterfaceCallback", ::display)
setAttribute(player, "bookInterfaceCurrentPage", 0)
setAttribute(player, "stats-command-query-player", queryPlayer)
display(player, 0, 0)
BookInterface.openBook(player, BookInterface.FANCY_BOOK_26, ::display)
return@define
}
}
Server/src/main/core/net/packet/PacketRepository.java
+1
View File
@@ -77,6 +77,7 @@ public final class PacketRepository {
OUTGOING_PACKETS.put(Varbit.class, new Varbit());
OUTGOING_PACKETS.put(ResetInterface.class, new ResetInterface());
OUTGOING_PACKETS.put(VarcUpdate.class, new VarcUpdate());
OUTGOING_PACKETS.put(InterfaceSetAngle.class, new InterfaceSetAngle());
}
/**
Server/src/main/core/net/packet/out/InterfaceSetAngle.java
+26
View File
@@ -0,0 +1,26 @@
package core.net.packet.out;
import core.game.node.entity.player.Player;
import core.net.packet.context.DefaultContext;
import core.net.packet.IoBuffer;
import core.net.packet.OutgoingPacket;
public final class InterfaceSetAngle implements OutgoingPacket<DefaultContext> {
@Override
public void send(DefaultContext context) {
Player player = context.getPlayer();
Object[] objects = context.getObjects();
int pitch = (Integer)objects[0];
int scale = (Integer)objects[1];
int yaw = (Integer)objects[2];
int interfaceId = (Integer)objects[3];
int childId = (Integer)objects[4];
IoBuffer buffer = new IoBuffer(132);
buffer.putShort(pitch);
buffer.putShortA(player.getInterfaceManager().getPacketCount(1));
buffer.putLEShortA(scale);
buffer.putLEShortA(yaw);
buffer.putInt(interfaceId << 16 | childId);
buffer.cypherOpcode(context.getPlayer().getSession().getIsaacPair().getOutput());context.getPlayer().getSession().write(buffer);
}
}