project: we are actually up to date now, thanks blue!

injector/injector.gradle.kts

@@ -31,6 +31,9 @@ tasks.register<JavaExec>("inject") {
     main = "com.openosrs.injector.Injector"
     classpath = sourceSets["main"].runtimeClasspath
     args(vanillaDep.singleFile, openosrsVersion)
+    outputs.upToDateWhen {
+        false
+    }
 }
 
 tasks {

injector/src/main/java/com/openosrs/injector/injectors/RSApiInjector.java

@@ -118,9 +118,9 @@ public class RSApiInjector extends AbstractInjector
 
 				final Signature sig = apiMethod.getSignature();
 
-				if (sig.isVoid())
+				if (sig.size() == 1)
 				{
-					if (sig.size() == 1)
+					if (sig.isVoid() || sig.getReturnValue().equals(Type.fromAsmString(apiMethod.getClazz().getName())))
 					{
 						Type type = InjectUtil.apiToDeob(inject, sig.getTypeOfArg(0));
 						if (deobType.equals(type))
@@ -276,7 +276,7 @@ public class RSApiInjector extends AbstractInjector
 			final ClassFile targetClass = InjectUtil.vanillaFromApiMethod(inject, apiMethod);
 			apiMethod.setInjected(true);
 
-			if (apiMethod.getSignature().isVoid())
+			if (apiMethod.getSignature().getArguments().size() == 1)
 			{
 				++set;
 				log.debug("[DEBUG] Injecting setter {} for {} into {}", apiMethod.getMethod(), field.getPoolField(), targetClass.getPoolClass());

injector/src/main/java/com/openosrs/injector/injectors/rsapi/InjectSetter.java

@@ -102,7 +102,15 @@ public class InjectSetter
 			ins.add(new PutField(instructions, field));
 		}
 
-		ins.add(new VReturn(instructions));
+		if (!apiMethod.getSignature().getReturnValue().equals(Type.VOID))
+		{
+			ins.add(new ALoad(instructions, 0));
+			ins.add(InjectUtil.createReturnForType(instructions, apiMethod.getSignature().getReturnValue()));
+		}
+		else
+		{
+			ins.add(new VReturn(instructions));
+		}
 
 		targetClass.addMethod(method);
 	}

runelite-api/src/main/java/net/runelite/api/Client.java

@@ -526,6 +526,16 @@ public interface Client extends GameShell
 	@Nullable
 	Widget getWidget(int groupId, int childId);
 
+	/**
+	 * Gets a widget by it's packed ID.
+	 *
+	 * <p>
+	 * Note: Use {@link #getWidget(WidgetInfo)} or {@link #getWidget(int, int)} for
+	 * a more readable version of this method.
+	 */
+	@Nullable
+	Widget getWidget(int packedID);
+
 	/**
 	 * Gets an array containing the x-axis canvas positions
 	 * of all widgets.
@@ -784,6 +794,15 @@ public interface Client extends GameShell
 	 */
 	void setVarbit(Varbits varbit, int value);
 
+	/**
+	 * Gets the varbit composition for a given varbit id
+	 *
+	 * @param id
+	 * @return
+	 */
+	@Nullable
+	VarbitComposition getVarbit(int id);
+
 	/**
 	 * Gets the value of a given variable.
 	 *
@@ -817,10 +836,11 @@ public interface Client extends GameShell
 	void setVarbitValue(int[] varps, int varbit, int value);
 
 	/**
-	 * Gets the varbit composition for a given varbit id
+	 * Mark the given varp as changed, causing var listeners to be
+	 * triggered next tick
+	 * @param varp
 	 */
-	@Nullable
-	VarbitComposition getVarbitDefinition(int id);
+	void queueChangedVarp(int varp);
 
 	/**
 	 * Gets the widget flags table.
@@ -898,16 +918,6 @@ public interface Client extends GameShell
 	 */
 	IterableHashTable<MessageNode> getMessages();
 
-	/**
-	 * Gets the viewport widget.
-	 * <p>
-	 * The viewport is the area of the game above the chatbox
-	 * and to the left of the mini-map.
-	 *
-	 * @return the viewport widget
-	 */
-	Widget getViewportWidget();
-
 	/**
 	 * Gets the object composition corresponding to an objects ID.
 	 *
@@ -926,6 +936,18 @@ public interface Client extends GameShell
 	 */
 	NPCComposition getNpcDefinition(int npcId);
 
+	/**
+	 * Gets the {@link StructComposition} for a given struct ID
+	 *
+	 * @see StructID
+	 */
+	StructComposition getStructComposition(int structID);
+
+	/**
+	 * Gets the client's cache of in memory struct compositions
+	 */
+	NodeCache getStructCompositionCache();
+
 	/**
 	 * Gets an array of all world areas
 	 *
@@ -1017,6 +1039,18 @@ public interface Client extends GameShell
 	 */
 	List<GraphicsObject> getGraphicsObjects();
 
+	/**
+	 * Gets the music volume
+	 * @return volume 0-255 inclusive
+	 */
+	int getMusicVolume();
+
+	/**
+	 * Sets the music volume
+	 * @param volume 0-255 inclusive
+	 */
+	void setMusicVolume(int volume);
+
 	/**
 	 * Play a sound effect at the player's current location. This is how UI,
 	 * and player-generated (e.g. mining, woodcutting) sound effects are
@@ -1160,6 +1194,20 @@ public interface Client extends GameShell
 	 */
 	String[] getStringStack();
 
+	/**
+	 * Gets the cs2 vm's active widget
+	 *
+	 * This is used for all {@code cc_*} operations with a {@code 0} operand
+	 */
+	Widget getScriptActiveWidget();
+
+	/**
+	 * Gets the cs2 vm's "dot" widget
+	 *
+	 * This is used for all {@code .cc_*} operations with a {@code 1} operand
+	 */
+	Widget getScriptDotWidget();
+
 	/**
 	 * Checks whether a player is on the friends list.
 	 *
@@ -1329,11 +1377,21 @@ public interface Client extends GameShell
 	 * <p>
 	 * This method must be ran on the client thread and is not reentrant
 	 *
+	 * This method is shorthand for {@code client.createScriptEvent(args).run()}
+	 *
 	 * @param args the script id, then any additional arguments to execute the script with
 	 * @see ScriptID
 	 */
 	void runScript(Object... args);
 
+	/**
+	 * Creates a blank ScriptEvent for executing a ClientScript2 script
+	 *
+	 * @param args the script id, then any additional arguments to execute the script with
+	 * @see ScriptID
+	 */
+	ScriptEvent createScriptEvent(Object ...args);
+
 	/**
 	 * Checks whether or not there is any active hint arrow.
 	 *
@@ -2063,20 +2121,4 @@ public interface Client extends GameShell
 	void setOutdatedScript(String outdatedScript);
 
 	List<String> getOutdatedScripts();
-
-	void queueChangedVarp(int varp);
-
-	VarbitComposition getVarbit(int id);
-
-	Widget getWidget(int param1);
-
-	Widget getScriptActiveWidget();
-
-	ScriptEvent createScriptEvent(Object[] args);
-
-	int getViewportColor();
-
-	NodeCache getStructCompositionCache();
-
-	void setMusicVolume(int i);
 }

runelite-api/src/main/java/net/runelite/api/ItemComposition.java

@@ -5,7 +5,7 @@ import javax.annotation.Nullable;
 /**
  * Represents the template of a specific item type.
  */
-public interface ItemComposition
+public interface ItemComposition extends ParamHolder
 {
 	/**
 	 * Gets the items name.

runelite-api/src/main/java/net/runelite/api/IterableHashTable.java

@@ -27,4 +27,5 @@ package net.runelite.api;
 public interface IterableHashTable<T extends Node> extends Iterable<T>
 {
 	T get(long hash);
+	void put(T node, long hash);
 }

runelite-api/src/main/java/net/runelite/api/NPCComposition.java

@@ -27,7 +27,7 @@ package net.runelite.api;
 /**
  * Information about a specific {@link NpcID}
  */
-public interface NPCComposition
+public interface NPCComposition extends ParamHolder
 {
 	/**
 	 * Gets the name of the NPC.

runelite-api/src/main/java/net/runelite/api/ObjectComposition.java

@@ -27,7 +27,7 @@ package net.runelite.api;
 /**
  * Information about a specific {@link ObjectID}
  */
-public interface ObjectComposition
+public interface ObjectComposition extends ParamHolder
 {
 	/**
 	 * Gets ID for the object.

runelite-api/src/main/java/net/runelite/api/Preferences.java

@@ -43,15 +43,27 @@ public interface Preferences
 	 */
 	void setRememberedUsername(String username);
 
+	/**
+	 * Gets the sound effect volume
+	 * @return volume 0-127 inclusive
+	 */
 	int getSoundEffectVolume();
 
-	void setSoundEffectVolume(int i);
+	/**
+	 * Sets the sound effect volume
+	 * @param volume 0-127 inclusive
+	 */
+	void setSoundEffectVolume(int volume);
 
+	/**
+	 * Gets the area sound effect volume
+	 * @return volume 0-127 inclusive
+	 */
 	int getAreaSoundEffectVolume();
 
-	void setAreaSoundEffectVolume(int i);
-
-	int getMusicVolume();
-
-	void setClientMusicVolume(int i);
+	/**
+	 * Sets the area sound effect volume
+	 * @param volume 0-127 inclusive
+	 */
+	void setAreaSoundEffectVolume(int volume);
 }

runelite-api/src/main/java/net/runelite/api/ScriptID.java

@@ -348,6 +348,20 @@ public final class ScriptID
 	@ScriptArguments()
 	public static final int BANKMAIN_SEARCHING = 514;
 
+	/**
+	 * Chooses the click handler for a {@link ParamID#SETTING_SLIDER_CUSTOM_ONOP} = 1 settings slider
+	 *
+	 * The active widget is set to the track created by {@link ParamID#SETTING_FOREGROUND_CLICKZONE}
+	 * <ul>
+	 * <li>int {@link ParamID#SETTING_ID}</li>
+	 * <li>int (WidgetID) Slider handle ID</li>
+	 * <li>int (widget index) Slider handle index</li>
+	 * <li>int track width</li>
+	 * <li>int y offset</li>
+	 * <li>int x offset</li>
+	 * <li>int (WidgetID) drag parent</li>
+	 * </ul>
+	 */
 	@ScriptArguments(integer = 7)
 	public static final int SETTINGS_SLIDER_CHOOSE_ONOP = 3885;
 

runelite-api/src/main/java/net/runelite/api/events/WidgetHiddenChanged.java

@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package net.runelite.api.events;
-
-import net.runelite.api.widgets.Widget;
-import lombok.Data;
-
-/**
- * An event where the hidden state of a {@link Widget} has been modified.
- */
-@Data
-public class WidgetHiddenChanged implements Event
-{
-	/**
-	 * The affected widget.
-	 */
-	private Widget widget;
-	/**
-	 * The new hidden state of the widget.
-	 */
-	private boolean hidden;
-}

runelite-api/src/main/java/net/runelite/api/hooks/Callbacks.java

@@ -72,9 +72,6 @@ public interface Callbacks
 	 */
 	void drawAboveOverheads();
 
-	void drawLayer(Widget layer, List<WidgetItem> widgetItems);
-
-	void drawInterface(int interfaceId, List<WidgetItem> widgetItems);
 	/**
 	 * Client top-most draw method, rendering over top of most of game interfaces.
 	 *
@@ -85,6 +82,20 @@ public interface Callbacks
 	 */
 	void draw(MainBufferProvider mainBufferProvider, Graphics graphics, int x, int y);
 
+	/**
+	 * Called after an interface has been drawn
+	 * @param interfaceId the interface id
+	 * @param widgetItems Widget items within the interface
+	 */
+	void drawInterface(int interfaceId, List<WidgetItem> widgetItems);
+
+	/**
+	 * Called after a widget layer has been drawn
+	 * @param layer The layer
+	 * @param widgetItems Widget items within the layer
+	 */
+	void drawLayer(Widget layer, List<WidgetItem> widgetItems);
+
 	/**
 	 * Mouse pressed event. If this event will be consumed it will not be propagated further to client.
 	 *

runelite-api/src/main/java/net/runelite/api/widgets/Widget.java

@@ -70,6 +70,10 @@ public interface Widget
 
 	int getButtonType();
 
+	boolean isWidgetItemDragged(int index);
+
+	Point getWidgetItemDragOffsets();
+
 	/**
 	 * Gets the type of content displayed by the widget.
 	 */
@@ -1017,16 +1021,6 @@ public interface Widget
 	 */
 	void setOnReleaseListener(Object ...args);
 
-	boolean isWidgetItemDragged(int index);
-
-	Point getWidgetItemDragOffsets();
-
-	static boolean getDragParent(Widget widget)
-	{
-		System.out.println("ERROR: IMPLEMENT"); //Would throw but that breaks widget inspector
-		return false;
-	}
-
 	/**
 	 * Sets a script to be ran when a drag operation is finished on this widget
 	 *
@@ -1057,5 +1051,4 @@ public interface Widget
 	 * @param args A ScriptID, then the args for the script
 	 */
 	void setOnVarTransmitListener(Object ...args);
-}
 }

runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java

@@ -927,7 +927,6 @@ public enum WidgetInfo
 
 	HEALTH_OVERLAY_BAR(WidgetID.HEALTH_OVERLAY_BAR_GROUP_ID, WidgetID.EncounterHealthBar.CONTAINER),
 	SETTINGS_INIT(WidgetID.SETTINGS_GROUP_ID, WidgetID.Settings.INIT),
-	SETTINGS_SIDE_CAMERA_ZOOM_SLIDER_TRACK(WidgetID.SETTINGS_SIDE_GROUP_ID, WidgetID.SettingsSide.CAMERA_ZOOM_SLIDER_TRACK),
 	TRAILBLAZER_AREA_TELEPORT(WidgetID.TRAILBLAZER_AREAS_GROUP_ID, WidgetID.TrailblazerAreas.TELEPORT),
 	;
 

runelite-mixins/src/main/java/net/runelite/mixins/ParamHolderMixin.java

@@ -0,0 +1,118 @@
+package net.runelite.mixins;
+
+import net.runelite.api.ParamHolder;
+import net.runelite.api.mixins.Inject;
+import net.runelite.api.mixins.Mixin;
+import net.runelite.api.mixins.Mixins;
+import net.runelite.api.mixins.Shadow;
+import net.runelite.rs.api.RSClient;
+import net.runelite.rs.api.RSIntegerNode;
+import net.runelite.rs.api.RSItemComposition;
+import net.runelite.rs.api.RSNPCComposition;
+import net.runelite.rs.api.RSNode;
+import net.runelite.rs.api.RSObjectComposition;
+import net.runelite.rs.api.RSObjectNode;
+import net.runelite.rs.api.RSParamComposition;
+import net.runelite.rs.api.RSStructComposition;
+
+@Mixins({
+	@Mixin(RSStructComposition.class),
+	@Mixin(RSObjectComposition.class),
+	@Mixin(RSNPCComposition.class),
+	@Mixin(RSItemComposition.class)
+})
+public abstract class ParamHolderMixin implements ParamHolder
+{
+	@Shadow("client")
+	private static RSClient client;
+
+	@Inject
+	private RSNode getParam(int id)
+	{
+		return this.getParams() == null ? null : (RSNode) this.getParams().get(id);
+	}
+
+	@Inject
+	private void setParam(int id, RSNode node)
+	{
+		RSParamComposition comp = client.getRSParamComposition(id);
+		if (comp.isString() != (node instanceof RSObjectNode))
+		{
+			if (comp.isString())
+			{
+				throw new IllegalArgumentException("trying to put int into string param");
+			}
+			else
+			{
+				throw new IllegalArgumentException("trying to put string into int param");
+			}
+		}
+		else
+		{
+			if (getParams() == null)
+			{
+				setParams(client.newIterableNodeHashTable(16));
+			}
+
+			getParams().put(node, id);
+		}
+	}
+
+	@Inject
+	@Override
+	public int getIntValue(int paramID)
+	{
+		RSNode param = getParam(paramID);
+		if (param != null)
+		{
+			RSIntegerNode node = (RSIntegerNode) param;
+			return node.getValue();
+		}
+		else
+		{
+			RSParamComposition comp = client.getRSParamComposition(paramID);
+			if (comp.isString())
+			{
+				throw new IllegalArgumentException("trying to get int from string param");
+			}
+
+			return comp.getDefaultInt();
+		}
+	}
+
+	@Inject
+	@Override
+	public void setValue(int id, int val)
+	{
+		setParam(id, client.newIntegerNode(val));
+	}
+
+	@Inject
+	@Override
+	public String getStringValue(int paramID)
+	{
+		RSNode param = getParam(paramID);
+		if (param != null)
+		{
+			RSObjectNode node = (RSObjectNode) param;
+			return (String) node.getValue();
+		}
+		else
+		{
+			RSParamComposition comp = client.getRSParamComposition(paramID);
+			if (!comp.isString())
+			{
+				throw new IllegalArgumentException("trying to get string from int param");
+			}
+
+			return comp.getDefaultStr();
+		}
+	}
+
+	@Inject
+	@Override
+	public void setValue(int id, String val)
+	{
+		setParam(id, client.newObjectNode(val));
+	}
+}

runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java

@@ -67,17 +67,19 @@ import net.runelite.api.NPC;
 import net.runelite.api.NPCComposition;
 import net.runelite.api.NameableContainer;
 import net.runelite.api.Node;
+import net.runelite.api.NodeCache;
 import net.runelite.api.ObjectComposition;
 import static net.runelite.api.Perspective.LOCAL_TILE_SIZE;
 import net.runelite.api.Player;
 import net.runelite.api.Point;
 import net.runelite.api.Prayer;
 import net.runelite.api.Projectile;
+import net.runelite.api.ScriptEvent;
 import net.runelite.api.Skill;
 import net.runelite.api.SpritePixels;
+import net.runelite.api.StructComposition;
 import net.runelite.api.Tile;
 import net.runelite.api.VarPlayer;
-import net.runelite.api.VarbitComposition;
 import net.runelite.api.Varbits;
 import net.runelite.api.WidgetNode;
 import net.runelite.api.WorldType;
@@ -101,11 +103,13 @@ import net.runelite.api.events.NpcSpawned;
 import net.runelite.api.events.PlayerDespawned;
 import net.runelite.api.events.PlayerMenuOptionsChanged;
 import net.runelite.api.events.PlayerSpawned;
+import net.runelite.api.events.PostStructComposition;
 import net.runelite.api.events.ResizeableChanged;
 import net.runelite.api.events.StatChanged;
 import net.runelite.api.events.UsernameChanged;
 import net.runelite.api.events.VarbitChanged;
 import net.runelite.api.events.VolumeChanged;
+import net.runelite.api.events.WidgetClosed;
 import net.runelite.api.events.WidgetLoaded;
 import net.runelite.api.events.WorldChanged;
 import net.runelite.api.hooks.Callbacks;
@@ -129,6 +133,7 @@ import net.runelite.rs.api.RSClient;
 import net.runelite.rs.api.RSEnumComposition;
 import net.runelite.rs.api.RSFriendSystem;
 import net.runelite.rs.api.RSIndexedSprite;
+import net.runelite.rs.api.RSInterfaceParent;
 import net.runelite.rs.api.RSItemContainer;
 import net.runelite.rs.api.RSNPC;
 import net.runelite.rs.api.RSNode;
@@ -137,7 +142,9 @@ import net.runelite.rs.api.RSNodeHashTable;
 import net.runelite.rs.api.RSPacketBuffer;
 import net.runelite.rs.api.RSPlayer;
 import net.runelite.rs.api.RSScene;
+import net.runelite.rs.api.RSScriptEvent;
 import net.runelite.rs.api.RSSpritePixels;
+import net.runelite.rs.api.RSStructComposition;
 import net.runelite.rs.api.RSTile;
 import net.runelite.rs.api.RSTileItem;
 import net.runelite.rs.api.RSUsername;
@@ -727,24 +734,6 @@ public abstract class RSClientMixin implements RSClient
 		setChatCycle(getCycleCntr());
 	}
 
-	@Inject
-	@Override
-	public Widget getViewportWidget()
-	{
-		if (isResized())
-		{
-			if (getVar(Varbits.SIDE_PANELS) == 1)
-			{
-				return getWidget(WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE);
-			}
-			else
-			{
-				return getWidget(WidgetInfo.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX);
-			}
-		}
-		return getWidget(WidgetInfo.FIXED_VIEWPORT);
-	}
-
 	@Inject
 	@Override
 	public MenuEntry[] getMenuEntries()
@@ -1565,24 +1554,23 @@ public abstract class RSClientMixin implements RSClient
 			else if (widget.getContentType() == WidgetType.RECTANGLE)
 			{
 				if (renderX == client.getViewportXOffset() && renderY == client.getViewportYOffset()
-				&& widget.getWidth() == client.getViewportWidth() && widget.getHeight() == client.getViewportHeight()
+					&& widget.getWidth() == client.getViewportWidth() && widget.getHeight() == client.getViewportHeight()
 					&& widget.getOpacity() > 0 && widget.isFilled() && client.isGpu())
 				{
 					int tc = widget.getTextColor();
-				int alpha = widget.getOpacity() & 0xFF;
-				int inverseAlpha = 256 - alpha;
-				int vpc = viewportColor;
-				int c1 = (alpha * (tc & 0xff00ff) >> 8 & 0xFF00FF) + (alpha * (tc & 0x00FF00) >> 8 & 0x00FF00);
-				int c2 = (inverseAlpha * (vpc & 0xff00ff) >> 8 & 0xFF00FF) + (inverseAlpha * (vpc & 0x00FF00) >> 8 & 0x00FF00);
-				int outAlpha = alpha + ((vpc >>> 24) * (255 - alpha) * 0x8081 >>> 23);
-				viewportColor = outAlpha << 24 | c1 + c2;
-				widget.setHidden(true);
-				hiddenWidgets.add(widget);
-				continue;
+					int alpha = widget.getOpacity() & 0xFF;
+					int inverseAlpha = 256 - alpha;
+					int vpc = viewportColor;
+					int c1 = (alpha * (tc & 0xff00ff) >> 8 & 0xFF00FF) + (alpha * (tc & 0x00FF00) >> 8 & 0x00FF00);
+					int c2 = (inverseAlpha * (vpc & 0xff00ff) >> 8 & 0xFF00FF) + (inverseAlpha * (vpc & 0x00FF00) >> 8 & 0x00FF00);
+					int outAlpha = alpha + ((vpc >>> 24) * (255 - alpha) * 0x8081 >>> 23);
+					viewportColor = outAlpha << 24 | c1 + c2;
+					widget.setHidden(true);
+					hiddenWidgets.add(widget);
+					continue;
 				}
 			}
 
-
 			WidgetNode childNode = componentTable.get(widget.getId());
 			if (childNode != null)
 			{
@@ -2108,16 +2096,85 @@ public abstract class RSClientMixin implements RSClient
 
 	@Inject
 	@Override
-	public VarbitComposition getVarbit(int id)
+	public ScriptEvent createScriptEvent(Object... args)
 	{
-		return getVarbitDefinition(id);
+		return createRSScriptEvent(args);
 	}
 
 	@Inject
 	@Override
-	public int getViewportColor()
+	public RSScriptEvent createRSScriptEvent(Object... args)
 	{
-		return viewportColor;
+		RSScriptEvent event = createScriptEvent();
+		event.setArguments(args);
+		return event;
+	}
+
+	@Inject
+	@Override
+	public NodeCache getStructCompositionCache()
+	{
+		assert client.isClientThread() : "getStructCompositionCache must be called on client thread";
+
+		return getRSStructCompositionCache();
+	}
+
+	@Inject
+	@Override
+	public StructComposition getStructComposition(int structID)
+	{
+		assert client.isClientThread() : "getStructComposition must be called on client thread";
+
+		return getRSStructComposition(structID);
+	}
+
+	@Copy("StructDefinition_getStructDefinition")
+	@Replace("StructDefinition_getStructDefinition")
+	@SuppressWarnings("InfiniteRecursion")
+	static RSStructComposition copy$getStructComposition(int id)
+	{
+		RSStructComposition comp = copy$getStructComposition(id);
+
+		if (comp.getId() == -1)
+		{
+			comp.setId(id);
+			PostStructComposition event = new PostStructComposition();
+			event.setStructComposition(comp);
+			client.getCallbacks().post(event);
+		}
+
+		return comp;
+	}
+
+	@Inject
+	@Override
+	public int getMusicVolume()
+	{
+		return client.getPreferences().getMusicVolume();
+	}
+
+	@Inject
+	@Override
+	public void setMusicVolume(int volume)
+	{
+		if (volume > 0 && client.getPreferences().getMusicVolume() <= 0 && client.getCurrentTrackGroupId() != -1)
+		{
+			client.playMusicTrack(1000, client.getMusicTracks(), client.getCurrentTrackGroupId(), 0, volume, false);
+		}
+
+		client.getPreferences().setMusicVolume(volume);
+		client.setMusicTrackVolume(volume);
+		if (client.getMidiPcmStream() != null)
+		{
+			client.getMidiPcmStream().setPcmStreamVolume(volume);
+		}
+	}
+
+	@Inject
+	@MethodHook("closeInterface")
+	public static void preCloseInterface(RSInterfaceParent iface, boolean willUnload)
+	{
+		client.getCallbacks().post(new WidgetClosed(iface.getId(), iface.getModalMode(), willUnload));
 	}
 }
 

runelite-mixins/src/main/java/net/runelite/mixins/RSClientPreferencesMixin.java

@@ -1,31 +0,0 @@
-package net.runelite.mixins;
-
-import net.runelite.api.mixins.Inject;
-import net.runelite.api.mixins.Mixin;
-import net.runelite.api.mixins.Shadow;
-import net.runelite.rs.api.RSClient;
-import net.runelite.rs.api.RSClientPreferences;
-
-@Mixin(RSClientPreferences.class)
-public abstract class RSClientPreferencesMixin implements RSClientPreferences
-{
-	@Shadow("client")
-	private static RSClient client;
-
-	@Inject
-	@Override
-	public void setClientMusicVolume(int volume)
-	{
-		if (volume > 0 && client.getPreferences().getMusicVolume() <= 0 && client.getCurrentTrackGroupId() != -1)
-		{
-			client.playMusicTrack(1000, client.getMusicTracks(), client.getCurrentTrackGroupId(), 0, volume, false);
-		}
-
-		client.getPreferences().setMusicVolume(volume);
-		client.setMusicTrackVolume(volume);
-		if (client.getMidiPcmStream() != null)
-		{
-			client.getMidiPcmStream().setPcmStreamVolume(volume);
-		}
-	}
-}

runelite-mixins/src/main/java/net/runelite/mixins/RSGameShellMixin.java

@@ -42,6 +42,9 @@ public abstract class RSGameShellMixin implements RSGameShell
 	@Shadow("client")
 	private static RSClient client;
 
+	@Shadow("viewportColor")
+	private static int viewportColor;
+
 	@Inject
 	private Thread thread;
 
@@ -83,7 +86,7 @@ public abstract class RSGameShellMixin implements RSGameShell
 		DrawCallbacks drawCallbacks = client.getDrawCallbacks();
 		if (drawCallbacks != null)
 		{
-			drawCallbacks.draw(client.getViewportColor());
+			drawCallbacks.draw(viewportColor);
 		}
 	}
 

runelite-mixins/src/main/java/net/runelite/mixins/RSParamCompositionMixin.java

@@ -0,0 +1,16 @@
+package net.runelite.mixins;
+
+import net.runelite.api.mixins.Inject;
+import net.runelite.api.mixins.Mixin;
+import net.runelite.rs.api.RSParamComposition;
+
+@Mixin(RSParamComposition.class)
+public abstract class RSParamCompositionMixin implements RSParamComposition
+{
+	@Inject
+	@Override
+	public boolean isString()
+	{
+		return getType() == 's';
+	}
+}

runelite-mixins/src/main/java/net/runelite/mixins/RSScriptEventMixin.java

@@ -0,0 +1,21 @@
+package net.runelite.mixins;
+
+import net.runelite.api.mixins.Inject;
+import net.runelite.api.mixins.Mixin;
+import net.runelite.api.mixins.Shadow;
+import net.runelite.rs.api.RSClient;
+import net.runelite.rs.api.RSScriptEvent;
+
+@Mixin(RSScriptEvent.class)
+public abstract class RSScriptEventMixin implements RSScriptEvent
+{
+	@Shadow("client")
+	private static RSClient client;
+
+	@Inject
+	@Override
+	public void run()
+	{
+		client.runScriptEvent(this);
+	}
+}

runelite-mixins/src/main/java/net/runelite/mixins/RSStructCompositionMixin.java

@@ -0,0 +1,26 @@
+package net.runelite.mixins;
+
+import net.runelite.api.mixins.Inject;
+import net.runelite.api.mixins.Mixin;
+import net.runelite.rs.api.RSStructComposition;
+
+@Mixin(RSStructComposition.class)
+public abstract class RSStructCompositionMixin implements RSStructComposition
+{
+	@Inject
+	private int id = -1;
+
+	@Inject
+	@Override
+	public int getId()
+	{
+		return id;
+	}
+
+	@Inject
+	@Override
+	public void setId(int id)
+	{
+		this.id = id;
+	}
+}

runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java

@@ -28,7 +28,6 @@ import net.runelite.api.HashTable;
 import net.runelite.api.Node;
 import net.runelite.api.Point;
 import net.runelite.api.WidgetNode;
-import net.runelite.api.events.WidgetHiddenChanged;
 import net.runelite.api.events.WidgetPositioned;
 import net.runelite.api.mixins.Copy;
 import net.runelite.api.mixins.FieldHook;
@@ -410,78 +409,6 @@ public abstract class RSWidgetMixin implements RSWidget
 		return bounds != null && bounds.contains(new java.awt.Point(point.getX(), point.getY()));
 	}
 
-	@Inject
-	@Override
-	public void broadcastHidden(boolean hidden)
-	{
-		WidgetHiddenChanged event = new WidgetHiddenChanged();
-		event.setWidget(this);
-		event.setHidden(hidden);
-
-		client.getCallbacks().post(event);
-
-		RSWidget[] children = getChildren();
-
-		if (children != null)
-		{
-			// recursive through children
-			for (RSWidget child : children)
-			{
-				// if the widget is hidden it will not magically unhide from its parent changing
-				if (child == null || child.isSelfHidden())
-				{
-					continue;
-				}
-
-				child.broadcastHidden(hidden);
-			}
-		}
-
-		// make sure we iterate nested children as well
-		// cannot be null
-		Widget[] nestedChildren = getNestedChildren();
-
-		for (Widget nestedChild : nestedChildren)
-		{
-			if (nestedChild == null || nestedChild.isSelfHidden())
-			{
-				continue;
-			}
-
-			((RSWidget) nestedChild).broadcastHidden(hidden);
-		}
-	}
-
-	@FieldHook("isHidden")
-	@Inject
-	public void onHiddenChanged(int idx)
-	{
-		int id = getId();
-
-		if (id == -1)
-		{
-			return;
-		}
-
-		Widget parent = getParent();
-
-		// if the parent is hidden then changes in this widget don't have any visual effect
-		// so ignore them
-		if (parent != null)
-		{
-			if (parent.isHidden())
-			{
-				return;
-			}
-		}
-		else if (TO_GROUP(id) != client.getWidgetRoot())
-		{
-			return;
-		}
-
-		broadcastHidden(isSelfHidden());
-	}
-
 	@FieldHook("y")
 	@Inject
 	public void onPositionChanged(int idx)

runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java

@@ -27,7 +27,7 @@ package net.runelite.mixins;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import net.runelite.api.Client;
+import static net.runelite.api.Opcodes.*;
 import net.runelite.api.events.ScriptCallbackEvent;
 import net.runelite.api.events.ScriptPostFired;
 import net.runelite.api.events.ScriptPreFired;
@@ -40,13 +40,12 @@ import net.runelite.api.widgets.JavaScriptCallback;
 import net.runelite.rs.api.RSClient;
 import net.runelite.rs.api.RSScript;
 import net.runelite.rs.api.RSScriptEvent;
-import static net.runelite.api.Opcodes.*;
 
 @Mixin(RSClient.class)
 public abstract class ScriptVMMixin implements RSClient
 {
 	@Shadow("client")
-	private static Client client;
+	private static RSClient client;
 
 	@Inject
 	private static RSScript currentScript;
@@ -172,11 +171,44 @@ public abstract class ScriptVMMixin implements RSClient
 	@Override
 	public void runScript(Object... args)
 	{
-		assert isClientThread();
-		assert currentScript == null;
-		assert args[0] instanceof Integer || args[0] instanceof JavaScriptCallback : "The first argument should always be a ScriptID!";
-		RSScriptEvent se = createScriptEvent();
-		se.setArguments(args);
-		runScript(se, 5000000);
+		runScriptEvent(createRSScriptEvent(args));
+	}
+
+	@Inject
+	@Override
+	public void runScriptEvent(RSScriptEvent event)
+	{
+		assert isClientThread() : "runScriptEvent must be called on client thread";
+		assert currentScript == null : "scripts are not reentrant";
+		runScript(event, 5000000);
+		boolean assertionsEnabled = false;
+		assert assertionsEnabled = true;
+
+		Object[] args = event.getArguments();
+		if (assertionsEnabled && args[0] instanceof Integer)
+		{
+			int scriptId = (int) args[0];
+			RSScript script = (RSScript) client.getScriptCache().get(scriptId);
+
+			if (script != null)
+			{
+				int intCount = 0, stringCount = 0;
+				for (int i = 1; i < args.length; i++)
+				{
+					if (args[i] instanceof Integer)
+					{
+						intCount++;
+					}
+					else
+					{
+						stringCount++;
+					}
+				}
+
+				assert script.getIntArgumentCount() == intCount && script.getStringArgumentCount() == stringCount :
+					"Script " + scriptId + " was called with the incorrect number of arguments; takes "
+						+ script.getIntArgumentCount() + "+" + script.getStringArgumentCount() + ", got " + intCount + "+" + stringCount;
+			}
+		}
 	}
 }

runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java

@@ -2,6 +2,7 @@ package net.runelite.mixins;
 
 import net.runelite.api.VarClientInt;
 import net.runelite.api.VarClientStr;
+import net.runelite.api.VarbitComposition;
 import net.runelite.api.Varbits;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
@@ -55,7 +56,7 @@ public abstract class VarbitMixin implements RSClient
 
 	@Inject
 	@Override
-	public RSVarbitComposition getVarbitDefinition(int id)
+	public RSVarbitComposition getVarbitComposition(int id)
 	{
 		assert client.isClientThread() : "getVarbitDefinition must be called on client thread";
 
@@ -78,7 +79,7 @@ public abstract class VarbitMixin implements RSClient
 	{
 		assert client.isClientThread();
 
-		RSVarbitComposition v = getVarbitDefinition(varbitId);
+		RSVarbitComposition v = getVarbitComposition(varbitId);
 		if (v == null)
 		{
 			throw new IndexOutOfBoundsException("Varbit " + varbitId + " does not exist!"); // oob for "backwards compatibility lol"
@@ -95,7 +96,7 @@ public abstract class VarbitMixin implements RSClient
 	@Override
 	public void setVarbitValue(int[] varps, int varbitId, int value)
 	{
-		RSVarbitComposition v = getVarbitDefinition(varbitId);
+		RSVarbitComposition v = getVarbitComposition(varbitId);
 		if (v == null)
 		{
 			throw new IndexOutOfBoundsException(String.format("Varbit %d does not exist!", varbitId)); // oob for "backwards compatibility lol"
@@ -161,4 +162,11 @@ public abstract class VarbitMixin implements RSClient
 	{
 		return getVarcs().getVarcMap();
 	}
+
+	@Inject
+	@Override
+	public VarbitComposition getVarbit(int id)
+	{
+		return getVarbitComposition(id);
+	}
 }

runescape-api/src/main/java/net/runelite/rs/api/RSClient.java

@@ -1320,4 +1320,34 @@ public interface RSClient extends RSGameShell, Client
 
 	@Import("scriptActiveWidget")
 	RSWidget getScriptActiveWidget();
+
+	@Import("scriptDotWidget")
+	RSWidget getScriptDotWidget();
+
+	RSScriptEvent createRSScriptEvent(Object... args);
+
+	void runScriptEvent(RSScriptEvent event);
+
+	@Import("Script_cached")
+	RSEvictingDualNodeHashTable getScriptCache();
+
+	@Import("StructDefinition_cached")
+	RSEvictingDualNodeHashTable getRSStructCompositionCache();
+
+	@Import("StructDefinition_getStructDefinition")
+	RSStructComposition getRSStructComposition(int id);
+
+	@Import("getParamDefinition")
+	RSParamComposition getRSParamComposition(int id);
+
+	@Construct
+	RSIntegerNode newIntegerNode(int contents);
+
+	@Construct
+	RSObjectNode newObjectNode(Object contents);
+
+	@Construct
+	RSIterableNodeHashTable newIterableNodeHashTable(int size);
+
+	RSVarbitComposition getVarbitComposition(int id);
 }

runescape-api/src/main/java/net/runelite/rs/api/RSClientPreferences.java

@@ -30,7 +30,6 @@ public interface RSClientPreferences extends Preferences
 	void setAreaSoundEffectVolume(int i);
 
 	@Import("musicVolume")
-	@Override
 	int getMusicVolume();
 
 	@Import("musicVolume")

runescape-api/src/main/java/net/runelite/rs/api/RSInterfaceParent.java

@@ -8,4 +8,8 @@ public interface RSInterfaceParent extends RSNode, WidgetNode
 	@Import("group")
 	@Override
 	int getId();
+
+	@Import("type")
+	@Override
+	int getModalMode();
 }

runescape-api/src/main/java/net/runelite/rs/api/RSItemComposition.java

@@ -84,4 +84,10 @@ public interface RSItemComposition extends ItemComposition
 
 	@Import("retextureTo")
 	short[] getTextureToReplaceWith();
+
+	@Import("params")
+	RSIterableNodeHashTable getParams();
+
+	@Import("params")
+	void setParams(RSIterableNodeHashTable params);
 }

runescape-api/src/main/java/net/runelite/rs/api/RSIterableNodeHashTable.java

@@ -1,6 +1,7 @@
 package net.runelite.rs.api;
 
 import net.runelite.api.IterableHashTable;
+import net.runelite.api.Node;
 import net.runelite.mapping.Import;
 
 public interface RSIterableNodeHashTable extends IterableHashTable
@@ -8,4 +9,8 @@ public interface RSIterableNodeHashTable extends IterableHashTable
 	@Import("get")
 	@Override
 	RSNode get(long hash);
+
+	@Import("put")
+	@Override
+	void put(Node node, long hash);
 }

runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java

@@ -59,4 +59,10 @@ public interface RSNPCComposition extends NPCComposition
 
 	@Import("headIconPrayer")
 	int getRsOverheadIcon();
+
+	@Import("params")
+	RSIterableNodeHashTable getParams();
+
+	@Import("params")
+	void setParams(RSIterableNodeHashTable params);
 }

runescape-api/src/main/java/net/runelite/rs/api/RSObjectComposition.java

@@ -32,4 +32,10 @@ public interface RSObjectComposition extends ObjectComposition
 	@Import("transform")
 	@Override
 	RSObjectComposition getImpostor();
+
+	@Import("params")
+	RSIterableNodeHashTable getParams();
+
+	@Import("params")
+	void setParams(RSIterableNodeHashTable params);
 }

runescape-api/src/main/java/net/runelite/rs/api/RSObjectNode.java

@@ -1,3 +1,9 @@
 package net.runelite.rs.api;
 
-public interface RSObjectNode {}
+import net.runelite.mapping.Import;
+
+public interface RSObjectNode extends RSNode
+{
+	@Import("obj")
+	Object getValue();
+}

runescape-api/src/main/java/net/runelite/rs/api/RSParamComposition.java

@@ -0,0 +1,17 @@
+package net.runelite.rs.api;
+
+import net.runelite.mapping.Import;
+
+public interface RSParamComposition
+{
+	boolean isString();
+
+	@Import("type")
+	char getType();
+
+	@Import("defaultInt")
+	int getDefaultInt();
+
+	@Import("defaultStr")
+	String getDefaultStr();
+}

runescape-api/src/main/java/net/runelite/rs/api/RSParamDefinition.java

@@ -1,3 +0,0 @@
-package net.runelite.rs.api;
-
-public interface RSParamDefinition {}

runescape-api/src/main/java/net/runelite/rs/api/RSScript.java

@@ -12,4 +12,10 @@ public interface RSScript extends Script, RSDualNode
 	@Import("opcodes")
 	@Override
 	int[] getInstructions();
+
+	@Import("intArgumentCount")
+	int getIntArgumentCount();
+
+	@Import("stringArgumentCount")
+	int getStringArgumentCount();
 }

runescape-api/src/main/java/net/runelite/rs/api/RSScriptEvent.java

@@ -43,6 +43,9 @@ public interface RSScriptEvent extends ScriptEvent
 	@Import("widget")
 	Widget getSource();
 
+	@Import("widget")
+	RSScriptEvent setSource(Widget widget);
+
 	@Import("opIndex")
 	int getOp();
 

runescape-api/src/main/java/net/runelite/rs/api/RSStructComposition.java

@@ -0,0 +1,16 @@
+package net.runelite.rs.api;
+
+import net.runelite.api.StructComposition;
+import net.runelite.mapping.Import;
+
+public interface RSStructComposition extends StructComposition
+{
+	int getId();
+	void setId(int id);
+
+	@Import("params")
+	RSIterableNodeHashTable getParams();
+
+	@Import("params")
+	void setParams(RSIterableNodeHashTable params);
+}

runescape-api/src/main/java/net/runelite/rs/api/RSStructDefinition.java

@@ -1,3 +0,0 @@
-package net.runelite.rs.api;
-
-public interface RSStructDefinition {}

runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java

@@ -345,8 +345,6 @@ public interface RSWidget extends Widget
 	@Import("paddingY")
 	int getYPitch();
 
-	void broadcastHidden(boolean hidden);
-
 	@Import("onOp")
 	@Override
 	void setOnOpListener(Object... args);
@@ -570,4 +568,24 @@ public interface RSWidget extends Widget
 	@Import("onClick")
 	@Override
 	void setOnClickListener(Object[] o);
+
+	@Import("onDragComplete")
+	@Override
+	void setOnDragCompleteListener(Object[] o);
+
+	@Import("onDrag")
+	@Override
+	void setOnDragListener(Object[] o);
+
+	@Import("parent")
+	@Override
+	RSWidget getDragParent();
+
+	@Import("parent")
+	@Override
+	void setDragParent(Widget dragParent);
+
+	@Import("onVarTransmit")
+	@Override
+	void setOnVarTransmitListener(Object[] o);
 }

runescape-client/src/main/java/AbstractWorldMapIcon.java

@@ -178,19 +178,19 @@ public abstract class AbstractWorldMapIcon {
 		garbageValue = "5"
 	)
 	@Export("StructDefinition_getStructDefinition")
-	public static StructDefinition StructDefinition_getStructDefinition(int var0) {
-		StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0); // L: 23
+	public static StructComposition StructDefinition_getStructDefinition(int var0) {
+		StructComposition var1 = (StructComposition) StructComposition.StructDefinition_cached.get((long)var0); // L: 23
 		if (var1 != null) { // L: 24
 			return var1;
 		} else {
-			byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0); // L: 25
-			var1 = new StructDefinition(); // L: 26
+			byte[] var2 = StructComposition.StructDefinition_archive.takeFile(34, var0); // L: 25
+			var1 = new StructComposition(); // L: 26
 			if (var2 != null) { // L: 27
 				var1.decode(new Buffer(var2));
 			}
 
 			var1.postDecode(); // L: 28
-			StructDefinition.StructDefinition_cached.put(var1, (long)var0); // L: 29
+			StructComposition.StructDefinition_cached.put(var1, (long)var0); // L: 29
 			return var1; // L: 30
 		}
 	}

runescape-client/src/main/java/Canvas.java

@@ -274,7 +274,7 @@ public final class Canvas extends java.awt.Canvas {
 						ObjectComposition.ObjectDefinition_modelsArchive = var4; // L: 1917
 						ObjectComposition.ObjectDefinition_isLowDetail = var17; // L: 1918
 						World.method1849(DynamicObject.archive2, BuddyRankComparator.archive7); // L: 1920
-						ParamDefinition.method4526(DynamicObject.archive2); // L: 1921
+						ParamComposition.method4526(DynamicObject.archive2); // L: 1921
 						Actor.method1821(DynamicObject.archive2, BuddyRankComparator.archive7, Client.isMembersWorld, class297.fontPlain11); // L: 1922
 						PcmPlayer.method2538(DynamicObject.archive2, SceneTilePaint.archive0, WorldMapSprite.archive1); // L: 1923
 						ModelData0.method3331(DynamicObject.archive2, BuddyRankComparator.archive7); // L: 1924
@@ -294,7 +294,7 @@ public final class Canvas extends java.awt.Canvas {
 						class195.Widget_loadedInterfaces = new boolean[class58.Widget_archive.getGroupCount()]; // L: 1941
 						Archive var11 = DynamicObject.archive2; // L: 1943
 						InvDefinition.InvDefinition_archive = var11; // L: 1945
-						StructDefinition.method4545(DynamicObject.archive2); // L: 1947
+						StructComposition.method4545(DynamicObject.archive2); // L: 1947
 						ModelData0.method3330(DynamicObject.archive2); // L: 1948
 						class13.method129(DynamicObject.archive2); // L: 1949
 						Varcs.varcs = new Varcs(); // L: 1950

runescape-client/src/main/java/ChatChannel.java

@@ -109,19 +109,19 @@ public class ChatChannel {
 		garbageValue = "1207819240"
 	)
 	@Export("getParamDefinition")
-	public static ParamDefinition getParamDefinition(int var0) {
-		ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); // L: 25
+	public static ParamComposition getParamDefinition(int var0) {
+		ParamComposition var1 = (ParamComposition) ParamComposition.ParamDefinition_cached.get((long)var0); // L: 25
 		if (var1 != null) { // L: 26
 			return var1;
 		} else {
-			byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0); // L: 27
-			var1 = new ParamDefinition(); // L: 28
+			byte[] var2 = ParamComposition.ParamDefinition_archive.takeFile(11, var0); // L: 27
+			var1 = new ParamComposition(); // L: 28
 			if (var2 != null) { // L: 29
 				var1.decode(new Buffer(var2));
 			}
 
 			var1.postDecode(); // L: 30
-			ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); // L: 31
+			ParamComposition.ParamDefinition_cached.put(var1, (long)var0); // L: 31
 			return var1; // L: 32
 		}
 	}

runescape-client/src/main/java/Client.java

@@ -5098,9 +5098,9 @@ public final class Client extends GameShell implements Usernamed {
 						field707 = (field707 + 1) % 100; // L: 6209
 						String var34 = AbstractFont.escapeBrackets(ServerPacket.method3663(AttackOption.method2135(var3))); // L: 6210
 						if (var60.modIcon != -1) { // L: 6211
-							UserComparator10.addChatMessage(9, class25.method248(var60.modIcon) + var38, var34, ParamDefinition.base37DecodeLong(var22));
+							UserComparator10.addChatMessage(9, class25.method248(var60.modIcon) + var38, var34, ParamComposition.base37DecodeLong(var22));
 						} else {
-							UserComparator10.addChatMessage(9, var38, var34, ParamDefinition.base37DecodeLong(var22)); // L: 6212
+							UserComparator10.addChatMessage(9, var38, var34, ParamComposition.base37DecodeLong(var22)); // L: 6212
 						}
 					}
 

runescape-client/src/main/java/DynamicObject.java

@@ -93,7 +93,7 @@ public class DynamicObject extends Renderable
 		this.x = var5; // L: 24
 		this.y = var6; // L: 25
 		if (var7 != -1) { // L: 26
-			this.sequenceDefinition = ParamDefinition.SequenceDefinition_get(var7); // L: 27
+			this.sequenceDefinition = ParamComposition.SequenceDefinition_get(var7); // L: 27
 			this.frame = 0; // L: 28
 			this.cycleStart = Client.cycle - 1; // L: 29
 			if (this.sequenceDefinition.field3548 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30

runescape-client/src/main/java/EnumComposition.java

@@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("jx")
-@Implements("EnumDefinition")
+@Implements("EnumComposition")
 public class EnumComposition extends DualNode {
 	@ObfuscatedName("rk")
 	@ObfuscatedGetter(

runescape-client/src/main/java/FontName.java

@@ -596,7 +596,7 @@ public class FontName {
 													CollisionMap.invalidateWidget(var10);
 												}
 											} else {
-												SequenceDefinition var47 = ParamDefinition.SequenceDefinition_get(var20); // L: 9272
+												SequenceDefinition var47 = ParamComposition.SequenceDefinition_get(var20); // L: 9272
 												var41 = var10.getModel(var47, var10.modelFrame, var36, PlayerComposition.localPlayer.appearance); // L: 9273
 												if (var41 == null && Widget.field2603) { // L: 9274
 													CollisionMap.invalidateWidget(var10);

runescape-client/src/main/java/Frames.java

@@ -96,7 +96,7 @@ public class Frames extends DualNode {
 		if (var0 != ScriptOpcodes.CC_CALLONRESIZE && var0 != ScriptOpcodes.IF_CALLONRESIZE) { // L: 1145
 			int var4;
 			if (var0 == 1928) { // L: 1162
-				var6 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 1163
+				var6 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 1163
 				var4 = Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]; // L: 1164
 				if (var4 >= 1 && var4 <= 10) { // L: 1165
 					class3.widgetDefaultMenuAction(var4, var6.id, var6.childIndex, var6.itemId, ""); // L: 1168
@@ -124,7 +124,7 @@ public class Frames extends DualNode {
 			if (var0 >= 2000) { // L: 1150
 				var6 = CollisionMap.getWidget(Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]); // L: 1151
 			} else {
-				var6 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 1153
+				var6 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 1153
 			}
 
 			if (var6.onResize == null) { // L: 1154

runescape-client/src/main/java/GrandExchangeOfferUnitPriceComparator.java

@@ -75,7 +75,7 @@ final class GrandExchangeOfferUnitPriceComparator implements Comparator {
 		garbageValue = "-613147121"
 	)
 	static int method200(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 1041
+		Widget var3 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 1041
 		if (var0 == ScriptOpcodes.CC_GETSCROLLX) { // L: 1042
 			Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = var3.scrollX; // L: 1043
 			return 1; // L: 1044

runescape-client/src/main/java/GraphicsObject.java

@@ -81,7 +81,7 @@ public final class GraphicsObject extends Renderable
 		int var8 = TileItem.SpotAnimationDefinition_get(this.id).sequence; // L: 27
 		if (var8 != -1) { // L: 28
 			this.isFinished = false; // L: 29
-			this.sequenceDefinition = ParamDefinition.SequenceDefinition_get(var8); // L: 30
+			this.sequenceDefinition = ParamComposition.SequenceDefinition_get(var8); // L: 30
 		} else {
 			this.isFinished = true; // L: 32
 		}

runescape-client/src/main/java/HorizontalAlignment.java

@@ -148,7 +148,7 @@ public enum HorizontalAlignment implements Enumerated {
 						return 1; // L: 3442
 					} else {
 						int var4;
-						ParamDefinition var5;
+						ParamComposition var5;
 						if (var0 == ScriptOpcodes.NC_PARAM) { // L: 3444
 							VarcInt.Interpreter_intStackSize -= 2; // L: 3445
 							var3 = Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize]; // L: 3446

runescape-client/src/main/java/ItemComposition.java

@@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("jq")
-@Implements("ItemDefinition")
+@Implements("ItemComposition")
 public class ItemComposition extends DualNode {
 	@ObfuscatedName("p")
 	@Export("ItemDefinition_inMembersWorld")

runescape-client/src/main/java/Messages.java

@@ -63,7 +63,7 @@ public class Messages {
 		garbageValue = "-729014462"
 	)
 	static int method2283(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 1012
+		Widget var3 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 1012
 		if (var0 == ScriptOpcodes.CC_GETX) { // L: 1013
 			Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = var3.x; // L: 1014
 			return 1; // L: 1015

runescape-client/src/main/java/ModeWhere.java

@@ -131,7 +131,7 @@ public enum ModeWhere implements Enumerated {
 			var0 -= 1000; // L: 948
 			var3 = CollisionMap.getWidget(Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]); // L: 949
 		} else {
-			var3 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 951
+			var3 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 951
 		}
 
 		String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize]; // L: 952

runescape-client/src/main/java/NPC.java

@@ -71,7 +71,7 @@ public final class NPC extends Actor {
 			--var4; // L: 35
 		}
 
-		if (super.sequence != -1 && ParamDefinition.SequenceDefinition_get(super.sequence).field3555 == 1) { // L: 37
+		if (super.sequence != -1 && ParamComposition.SequenceDefinition_get(super.sequence).field3555 == 1) { // L: 37
 			super.sequence = -1;
 		}
 
@@ -96,7 +96,7 @@ public final class NPC extends Actor {
 		garbageValue = "-169739231"
 	)
 	final void method2106(int var1, int var2, boolean var3) {
-		if (super.sequence != -1 && ParamDefinition.SequenceDefinition_get(super.sequence).field3555 == 1) { // L: 50
+		if (super.sequence != -1 && ParamComposition.SequenceDefinition_get(super.sequence).field3555 == 1) { // L: 50
 			super.sequence = -1;
 		}
 
@@ -140,8 +140,8 @@ public final class NPC extends Actor {
 		if (this.definition == null) { // L: 77
 			return null;
 		} else {
-			SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? ParamDefinition.SequenceDefinition_get(super.sequence) : null; // L: 78
-			SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? ParamDefinition.SequenceDefinition_get(super.movementSequence) : null; // L: 79
+			SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? ParamComposition.SequenceDefinition_get(super.sequence) : null; // L: 78
+			SequenceDefinition var2 = super.movementSequence != -1 && (super.idleSequence != super.movementSequence || var1 == null) ? ParamComposition.SequenceDefinition_get(super.movementSequence) : null; // L: 79
 			Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 80
 			if (var3 == null) {
 				return null;

runescape-client/src/main/java/NPCComposition.java

@@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("jd")
-@Implements("NPCDefinition")
+@Implements("NPCComposition")
 public class NPCComposition extends DualNode {
 	@ObfuscatedName("h")
 	@ObfuscatedSignature(

runescape-client/src/main/java/ObjectComposition.java

@@ -5,7 +5,7 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("jm")
-@Implements("ObjectDefinition")
+@Implements("ObjectComposition")
 public class ObjectComposition extends DualNode {
 	@ObfuscatedName("h")
 	@Export("ObjectDefinition_isLowDetail")

runescape-client/src/main/java/ParamComposition.java

@@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("jl")
-@Implements("ParamDefinition")
-public class ParamDefinition extends DualNode {
+@Implements("ParamComposition")
+public class ParamComposition extends DualNode {
 	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "Lib;"
@@ -39,7 +39,7 @@ public class ParamDefinition extends DualNode {
 		ParamDefinition_cached = new EvictingDualNodeHashTable(64); // L: 12
 	}
 
-	ParamDefinition() {
+	ParamComposition() {
 		this.autoDisable = true; // L: 16
 	} // L: 18
 
@@ -120,7 +120,7 @@ public class ParamDefinition extends DualNode {
 		garbageValue = "1899658312"
 	)
 	public static void method4526(AbstractArchive var0) {
-		StructDefinition.StructDefinition_archive = var0; // L: 19
+		StructComposition.StructDefinition_archive = var0; // L: 19
 	} // L: 20
 
 	@ObfuscatedName("v")

runescape-client/src/main/java/Player.java

@@ -384,8 +384,8 @@ public final class Player extends Actor {
 		if (this.appearance == null) { // L: 149
 			return null;
 		} else {
-			SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? ParamDefinition.SequenceDefinition_get(super.sequence) : null; // L: 150
-			SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : ParamDefinition.SequenceDefinition_get(super.movementSequence); // L: 151
+			SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? ParamComposition.SequenceDefinition_get(super.sequence) : null; // L: 150
+			SequenceDefinition var2 = super.movementSequence == -1 || this.isUnanimated || super.idleSequence == super.movementSequence && var1 != null ? null : ParamComposition.SequenceDefinition_get(super.movementSequence); // L: 151
 			Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); // L: 152
 			if (var3 == null) { // L: 153
 				return null;
@@ -451,7 +451,7 @@ public final class Player extends Actor {
 		garbageValue = "1635620178"
 	)
 	final void method1313(int var1, int var2, byte var3) {
-		if (super.sequence != -1 && ParamDefinition.SequenceDefinition_get(super.sequence).field3555 == 1) { // L: 199
+		if (super.sequence != -1 && ParamComposition.SequenceDefinition_get(super.sequence).field3555 == 1) { // L: 199
 			super.sequence = -1;
 		}
 

runescape-client/src/main/java/PlayerComposition.java

@@ -37,7 +37,8 @@ public class PlayerComposition
 	@ObfuscatedSignature(
 		descriptor = "Lhe;"
 	)
-	static Widget field2561;
+	@Export("scriptDotWidget")
+	static Widget scriptDotWidget;
 	@ObfuscatedName("kn")
 	@ObfuscatedSignature(
 		descriptor = "Lbq;"

runescape-client/src/main/java/Projectile.java

@@ -150,7 +150,7 @@ public final class Projectile extends Renderable
 		this.isMoving = false; // L: 47
 		int var12 = TileItem.SpotAnimationDefinition_get(this.id).sequence; // L: 48
 		if (var12 != -1) { // L: 49
-			this.sequenceDefinition = ParamDefinition.SequenceDefinition_get(var12);
+			this.sequenceDefinition = ParamComposition.SequenceDefinition_get(var12);
 		} else {
 			this.sequenceDefinition = null; // L: 50
 		}

runescape-client/src/main/java/SceneTilePaint.java

@@ -74,7 +74,7 @@ public final class SceneTilePaint
 		var0.isWalking = false; // L: 4080
 		SequenceDefinition var1;
 		if (var0.movementSequence != -1) { // L: 4081
-			var1 = ParamDefinition.SequenceDefinition_get(var0.movementSequence); // L: 4082
+			var1 = ParamComposition.SequenceDefinition_get(var0.movementSequence); // L: 4082
 			if (var1 != null && var1.frameIds != null) { // L: 4083
 				++var0.movementFrameCycle; // L: 4084
 				if (var0.movementFrame < var1.frameIds.length && var0.movementFrameCycle > var1.frameLengths[var0.movementFrame]) { // L: 4085
@@ -100,7 +100,7 @@ public final class SceneTilePaint
 
 			int var3 = TileItem.SpotAnimationDefinition_get(var0.spotAnimation).sequence; // L: 4100
 			if (var3 != -1) { // L: 4101
-				SequenceDefinition var2 = ParamDefinition.SequenceDefinition_get(var3); // L: 4102
+				SequenceDefinition var2 = ParamComposition.SequenceDefinition_get(var3); // L: 4102
 				if (var2 != null && var2.frameIds != null) { // L: 4103
 					++var0.spotAnimationFrameCycle; // L: 4104
 					if (var0.spotAnimationFrame < var2.frameIds.length && var0.spotAnimationFrameCycle > var2.frameLengths[var0.spotAnimationFrame]) { // L: 4105
@@ -121,7 +121,7 @@ public final class SceneTilePaint
 		}
 
 		if (var0.sequence != -1 && var0.sequenceDelay <= 1) { // L: 4118
-			var1 = ParamDefinition.SequenceDefinition_get(var0.sequence); // L: 4119
+			var1 = ParamComposition.SequenceDefinition_get(var0.sequence); // L: 4119
 			if (var1.field3560 == 1 && var0.field996 > 0 && var0.field984 <= Client.cycle && var0.field973 < Client.cycle) { // L: 4120 4121
 				var0.sequenceDelay = 1; // L: 4122
 				return; // L: 4123
@@ -129,7 +129,7 @@ public final class SceneTilePaint
 		}
 
 		if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 4127
-			var1 = ParamDefinition.SequenceDefinition_get(var0.sequence); // L: 4128
+			var1 = ParamComposition.SequenceDefinition_get(var0.sequence); // L: 4128
 			if (var1 != null && var1.frameIds != null) { // L: 4129
 				++var0.sequenceFrameCycle; // L: 4130
 				if (var0.sequenceFrame < var1.frameIds.length && var0.sequenceFrameCycle > var1.frameLengths[var0.sequenceFrame]) { // L: 4131

runescape-client/src/main/java/ScriptFrame.java

@@ -50,7 +50,7 @@ public class ScriptFrame {
 			var4 = CollisionMap.getWidget(Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]); // L: 778
 			var3 = false; // L: 779
 		} else {
-			var4 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 781
+			var4 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 781
 		}
 
 		int var11;

runescape-client/src/main/java/SecureRandomCallable.java

@@ -63,7 +63,7 @@ public class SecureRandomCallable implements Callable {
 					boolean var3 = false; // L: 110
 
 					for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { // L: 111
-						ParamDefinition var5 = ChatChannel.getParamDefinition((int)var4.key); // L: 112
+						ParamComposition var5 = ChatChannel.getParamDefinition((int)var4.key); // L: 112
 						if (var5.autoDisable) { // L: 113
 							var4.remove();
 						} else {

runescape-client/src/main/java/Skeleton.java

@@ -135,7 +135,7 @@ public class Skeleton extends Node {
 						}
 
 						if (var5 != -1) { // L: 10614
-							SequenceDefinition var6 = ParamDefinition.SequenceDefinition_get(var5); // L: 10615
+							SequenceDefinition var6 = ParamComposition.SequenceDefinition_get(var5); // L: 10615
 
 							for (var3.modelFrameCycle += Client.field850; var3.modelFrameCycle > var6.frameLengths[var3.modelFrame]; CollisionMap.invalidateWidget(var3)) { // L: 10616 10617 10624
 								var3.modelFrameCycle -= var6.frameLengths[var3.modelFrame]; // L: 10618

runescape-client/src/main/java/SpotAnimationDefinition.java

@@ -203,7 +203,7 @@ public class SpotAnimationDefinition extends DualNode {
 
 		Model var5;
 		if (this.sequence != -1 && var1 != -1) { // L: 103
-			var5 = ParamDefinition.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1);
+			var5 = ParamComposition.SequenceDefinition_get(this.sequence).transformSpotAnimationModel(var2, var1);
 		} else {
 			var5 = var2.toSharedSpotAnimationModel(true); // L: 104
 		}

runescape-client/src/main/java/StructComposition.java

@@ -4,8 +4,8 @@ import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("jb")
-@Implements("StructDefinition")
-public class StructDefinition extends DualNode {
+@Implements("StructComposition")
+public class StructComposition extends DualNode {
 	@ObfuscatedName("h")
 	@ObfuscatedSignature(
 		descriptor = "Lib;"
@@ -29,7 +29,7 @@ public class StructDefinition extends DualNode {
 		StructDefinition_cached = new EvictingDualNodeHashTable(64); // L: 13
 	}
 
-	StructDefinition() {
+	StructComposition() {
 	} // L: 16
 
 	@ObfuscatedName("x")

runescape-client/src/main/java/StudioGame.java

@@ -81,7 +81,7 @@ public enum StudioGame implements Enumerated {
 		garbageValue = "1020902177"
 	)
 	public static void method4185() {
-		ParamDefinition.ParamDefinition_cached.clear(); // L: 72
+		ParamComposition.ParamDefinition_cached.clear(); // L: 72
 	} // L: 73
 
 	@ObfuscatedName("ak")

runescape-client/src/main/java/Tiles.java

@@ -166,7 +166,7 @@ public final class Tiles {
 	@Export("performPlayerAnimation")
 	static void performPlayerAnimation(Player var0, int var1, int var2) {
 		if (var0.sequence == var1 && var1 != -1) { // L: 4151
-			int var3 = ParamDefinition.SequenceDefinition_get(var1).field3548; // L: 4152
+			int var3 = ParamComposition.SequenceDefinition_get(var1).field3548; // L: 4152
 			if (var3 == 1) { // L: 4153
 				var0.sequenceFrame = 0; // L: 4154
 				var0.sequenceFrameCycle = 0; // L: 4155
@@ -177,7 +177,7 @@ public final class Tiles {
 			if (var3 == 2) { // L: 4159
 				var0.field974 = 0; // L: 4160
 			}
-		} else if (var1 == -1 || var0.sequence == -1 || ParamDefinition.SequenceDefinition_get(var1).field3557 >= ParamDefinition.SequenceDefinition_get(var0.sequence).field3557) { // L: 4163
+		} else if (var1 == -1 || var0.sequence == -1 || ParamComposition.SequenceDefinition_get(var1).field3557 >= ParamComposition.SequenceDefinition_get(var0.sequence).field3557) { // L: 4163
 			var0.sequence = var1; // L: 4164
 			var0.sequenceFrame = 0; // L: 4165
 			var0.sequenceFrameCycle = 0; // L: 4166

runescape-client/src/main/java/UserComparator9.java

@@ -64,7 +64,7 @@ public class UserComparator9 extends AbstractUserComparator {
 			var0 -= 1000; // L: 735
 			var3 = CollisionMap.getWidget(Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]); // L: 736
 		} else {
-			var3 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 738
+			var3 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 738
 		}
 
 		CollisionMap.invalidateWidget(var3); // L: 739

runescape-client/src/main/java/WorldMapData_0.java

@@ -461,7 +461,7 @@ public class WorldMapData_0 extends AbstractWorldMapData {
 
 					var7 = var1.readUnsignedByte(); // L: 7166
 					if (var6 == var15.sequence && var6 != -1) { // L: 7167
-						var8 = ParamDefinition.SequenceDefinition_get(var6).field3548; // L: 7168
+						var8 = ParamComposition.SequenceDefinition_get(var6).field3548; // L: 7168
 						if (var8 == 1) { // L: 7169
 							var15.sequenceFrame = 0; // L: 7170
 							var15.sequenceFrameCycle = 0; // L: 7171
@@ -472,7 +472,7 @@ public class WorldMapData_0 extends AbstractWorldMapData {
 						if (var8 == 2) { // L: 7175
 							var15.field974 = 0; // L: 7176
 						}
-					} else if (var6 == -1 || var15.sequence == -1 || ParamDefinition.SequenceDefinition_get(var6).field3557 >= ParamDefinition.SequenceDefinition_get(var15.sequence).field3557) { // L: 7179
+					} else if (var6 == -1 || var15.sequence == -1 || ParamComposition.SequenceDefinition_get(var6).field3557 >= ParamComposition.SequenceDefinition_get(var15.sequence).field3557) { // L: 7179
 						var15.sequence = var6; // L: 7180
 						var15.sequenceFrame = 0; // L: 7181
 						var15.sequenceFrameCycle = 0; // L: 7182

runescape-client/src/main/java/WorldMapData_1.java

@@ -188,7 +188,7 @@ public class WorldMapData_1 extends AbstractWorldMapData {
 			var4 = Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]; // L: 553
 			var3 = CollisionMap.getWidget(var4); // L: 554
 		} else {
-			var3 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 556
+			var3 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 556
 		}
 
 		if (var0 == ScriptOpcodes.CC_SETSCROLLPOS) { // L: 557

runescape-client/src/main/java/WorldMapID.java

@@ -119,7 +119,7 @@ public class WorldMapID {
 						VarcInt.Interpreter_intStackSize -= 2; // L: 1387
 						var10 = Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize]; // L: 1388
 						var16 = Interpreter.Interpreter_intStack[VarcInt.Interpreter_intStackSize + 1]; // L: 1389
-						Widget var13 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 1390
+						Widget var13 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 1390
 						class13.clickWidget(var13, var10, var16); // L: 1391
 						return 1; // L: 1392
 					} else if (var0 == ScriptOpcodes.MOUSECAM) {
@@ -256,7 +256,7 @@ public class WorldMapID {
 						return 1; // L: 1534
 					} else if (var0 == 3140) {
 						Client.field810 = 3; // L: 1537
-						Client.field811 = var2 ? PlayerComposition.field2561.id * -437932207 * 653064625 : VarcInt.scriptActiveWidget.id * -437932207 * 653064625; // L: 1538
+						Client.field811 = var2 ? PlayerComposition.scriptDotWidget.id * -437932207 * 653064625 : VarcInt.scriptActiveWidget.id * -437932207 * 653064625; // L: 1538
 						return 1; // L: 1539
 					} else {
 						boolean var11;
@@ -528,7 +528,7 @@ public class WorldMapID {
 		if (var0.field984 >= Client.cycle) { // L: 3878
 			WorldMapManager.method672(var0);
 		} else if (var0.field973 >= Client.cycle) { // L: 3879
-			if (var0.field973 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > ParamDefinition.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 3880
+			if (var0.field973 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > ParamComposition.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) { // L: 3880
 				var2 = var0.field973 - var0.field984; // L: 3881
 				var3 = Client.cycle - var0.field984; // L: 3882
 				var4 = var0.field941 * 64 + var0.field981 * 128; // L: 3883

runescape-client/src/main/java/WorldMapRectangle.java

@@ -57,7 +57,7 @@ public final class WorldMapRectangle {
 		garbageValue = "470419605"
 	)
 	static int method331(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 1124
+		Widget var3 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 1124
 		if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { // L: 1125
 			Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = ServerPacket.Widget_unpackTargetMask(FaceNormal.getWidgetFlags(var3)); // L: 1126
 			return 1; // L: 1127
@@ -126,7 +126,7 @@ public final class WorldMapRectangle {
 		WorldMapID.method601(); // L: 2883
 		HealthBarDefinition.method4509(); // L: 2884
 		VarcInt.method4426(); // L: 2885
-		StructDefinition.StructDefinition_cached.clear(); // L: 2887
+		StructComposition.StructDefinition_cached.clear(); // L: 2887
 		StudioGame.method4185(); // L: 2889
 		WorldMapElement.WorldMapElement_cachedSprites.clear(); // L: 2891
 		PlayerComposition.PlayerAppearance_cachedModels.clear(); // L: 2894

runescape-client/src/main/java/class13.java

@@ -13,7 +13,7 @@ public final class class13 {
 		garbageValue = "2"
 	)
 	public static void method129(AbstractArchive var0) {
-		ParamDefinition.ParamDefinition_archive = var0; // L: 21
+		ParamComposition.ParamDefinition_archive = var0; // L: 21
 	} // L: 22
 
 	@ObfuscatedName("x")

runescape-client/src/main/java/class200.java

@@ -56,7 +56,7 @@ public class class200 {
 			var3 = Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]; // L: 503
 			var4 = CollisionMap.getWidget(var3); // L: 504
 		} else {
-			var4 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 506
+			var4 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 506
 		}
 
 		if (var0 == ScriptOpcodes.CC_SETPOSITION) { // L: 507

runescape-client/src/main/java/class231.java

@@ -157,7 +157,7 @@ public class class231 {
 					var12.isIf3 = true; // L: 452
 					var6.children[var11] = var12; // L: 453
 					if (var2) { // L: 454
-						PlayerComposition.field2561 = var12;
+						PlayerComposition.scriptDotWidget = var12;
 					} else {
 						VarcInt.scriptActiveWidget = var12; // L: 455
 					}
@@ -169,7 +169,7 @@ public class class231 {
 		} else {
 			Widget var3;
 			if (var0 == ScriptOpcodes.CC_DELETE) { // L: 459
-				var3 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 460
+				var3 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 460
 				Widget var10 = CollisionMap.getWidget(var3.id); // L: 461
 				var10.children[var3.childIndex] = null; // L: 462
 				CollisionMap.invalidateWidget(var10); // L: 463
@@ -185,7 +185,7 @@ public class class231 {
 					if (var3 != null) { // L: 487
 						Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = 1; // L: 488
 						if (var2) { // L: 489
-							PlayerComposition.field2561 = var3;
+							PlayerComposition.scriptDotWidget = var3;
 						} else {
 							VarcInt.scriptActiveWidget = var3; // L: 490
 						}
@@ -205,7 +205,7 @@ public class class231 {
 				if (var5 != null && var4 != -1) { // L: 477
 					Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = 1; // L: 478
 					if (var2) { // L: 479
-						PlayerComposition.field2561 = var5;
+						PlayerComposition.scriptDotWidget = var5;
 					} else {
 						VarcInt.scriptActiveWidget = var5; // L: 480
 					}

runescape-client/src/main/java/class238.java

@@ -41,7 +41,7 @@ public class class238 {
 		garbageValue = "1585982662"
 	)
 	public static String method4166(CharSequence var0) {
-		String var1 = ParamDefinition.base37DecodeLong(Renderable.method3340(var0)); // L: 75
+		String var1 = ParamComposition.base37DecodeLong(Renderable.method3340(var0)); // L: 75
 		if (var1 == null) { // L: 76
 			var1 = "";
 		}

runescape-client/src/main/java/class277.java

@@ -10,7 +10,7 @@ public class class277 {
 		garbageValue = "-1829984749"
 	)
 	static int method5005(int var0, Script var1, boolean var2) {
-		Widget var3 = var2 ? PlayerComposition.field2561 : VarcInt.scriptActiveWidget; // L: 1106
+		Widget var3 = var2 ? PlayerComposition.scriptDotWidget : VarcInt.scriptActiveWidget; // L: 1106
 		if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { // L: 1107
 			Interpreter.Interpreter_intStack[++VarcInt.Interpreter_intStackSize - 1] = var3.itemId; // L: 1108
 			return 1; // L: 1109

runescape-client/src/main/java/class51.java

@@ -213,7 +213,7 @@ public class class51 implements WorldMapSection {
 			var0.field963 = 0; // L: 3987
 		} else {
 			if (var0.sequence != -1 && var0.sequenceDelay == 0) { // L: 3990
-				SequenceDefinition var1 = ParamDefinition.SequenceDefinition_get(var0.sequence); // L: 3991
+				SequenceDefinition var1 = ParamComposition.SequenceDefinition_get(var0.sequence); // L: 3991
 				if (var0.field996 > 0 && var1.field3560 == 0) { // L: 3992
 					++var0.field963; // L: 3993
 					return; // L: 3994