project: Mixins

This commit is contained in:
Owain van Brakel
2022-01-26 01:20:51 +01:00
parent 1a8e75e9b9
commit 7179aa26a0
2 changed files with 389 additions and 79 deletions

View File

@@ -24,6 +24,10 @@
*/
package net.runelite.mixins;
import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import net.runelite.api.HashTable;
import net.runelite.api.Node;
import net.runelite.api.Point;
@@ -37,6 +41,8 @@ import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Replace;
import net.runelite.api.mixins.Shadow;
import net.runelite.api.widgets.Widget;
import static net.runelite.api.widgets.WidgetInfo.TO_CHILD;
import static net.runelite.api.widgets.WidgetInfo.TO_GROUP;
import net.runelite.api.widgets.WidgetItem;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSModel;
@@ -45,12 +51,6 @@ import net.runelite.rs.api.RSNodeHashTable;
import net.runelite.rs.api.RSPlayerComposition;
import net.runelite.rs.api.RSSequenceDefinition;
import net.runelite.rs.api.RSWidget;
import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static net.runelite.api.widgets.WidgetInfo.TO_CHILD;
import static net.runelite.api.widgets.WidgetInfo.TO_GROUP;
@Mixin(RSWidget.class)
public abstract class RSWidgetMixin implements RSWidget
@@ -240,9 +240,11 @@ public abstract class RSWidgetMixin implements RSWidget
@Inject
@Override
public void setName(String name)
public Widget setName(String name)
{
setRSName(name.replace(' ', '\u00A0'));
return this;
}
@Inject
@@ -596,4 +598,346 @@ public abstract class RSWidgetMixin implements RSWidget
return new Point(dragOffsetX, dragOffsetY);
}
@Inject
@Override
public Widget setClickMask(int mask)
{
this.rs$setClickMask(mask);
return this;
}
@Inject
@Override
public Widget setModelId(int modelId)
{
this.rs$setModelId(modelId);
return this;
}
@Inject
@Override
public Widget setModelType(int modelType)
{
this.rs$setModelType(modelType);
return this;
}
@Inject
@Override
public Widget setAnimationId(int animationId)
{
this.rs$setAnimationId(animationId);
return this;
}
@Inject
@Override
public Widget setText(String text)
{
this.rs$setText(text);
return this;
}
@Inject
@Override
public Widget setTextColor(int textColor)
{
this.rs$setTextColor(textColor);
return this;
}
@Inject
@Override
public Widget setOpacity(int opacity)
{
this.rs$setOpacity(opacity);
return this;
}
@Inject
@Override
public Widget setHidden(boolean hidden)
{
this.rs$setHidden(hidden);
return this;
}
@Inject
@Override
public Widget setRotationX(int rotationX)
{
this.rs$setRotationX(rotationX);
return this;
}
@Inject
@Override
public Widget setRotationY(int rotationY)
{
this.rs$setRotationY(rotationY);
return this;
}
@Inject
@Override
public Widget setRotationZ(int rotationZ)
{
this.rs$setRotationZ(rotationZ);
return this;
}
@Inject
@Override
public Widget setModelZoom(int modelZoom)
{
this.rs$setModelZoom(modelZoom);
return this;
}
@Inject
@Override
public Widget setContentType(int contentType)
{
this.rs$setContentType(contentType);
return this;
}
@Inject
@Override
public Widget setScrollX(int scrollX)
{
this.rs$setScrollX(scrollX);
return this;
}
@Inject
@Override
public Widget setScrollY(int scrollY)
{
this.rs$setScrollY(scrollY);
return this;
}
@Inject
@Override
public Widget setScrollWidth(int width)
{
this.rs$setScrollWidth(width);
return this;
}
@Inject
@Override
public Widget setScrollHeight(int height)
{
this.rs$setScrollHeight(height);
return this;
}
@Inject
@Override
public Widget setSpriteId(int spriteId)
{
this.rs$setSpriteId(spriteId);
return this;
}
@Inject
@Override
public Widget setSpriteTiling(boolean tiling)
{
this.rs$setSpriteTiling(tiling);
return this;
}
@Inject
@Override
public Widget setItemId(int itemId)
{
this.rs$setItemId(itemId);
return this;
}
@Inject
@Override
public Widget setItemQuantity(int quantity)
{
this.rs$setItemQuantity(quantity);
return this;
}
@Inject
@Override
public Widget setOriginalX(int originalX)
{
this.rs$setOriginalX(originalX);
return this;
}
@Inject
@Override
public Widget setOriginalY(int originalY)
{
this.rs$setOriginalY(originalY);
return this;
}
@Inject
@Override
public Widget setOriginalHeight(int originalHeight)
{
this.rs$setOriginalHeight(originalHeight);
return this;
}
@Inject
@Override
public Widget setOriginalWidth(int originalWidth)
{
this.rs$setOriginalWidth(originalWidth);
return this;
}
@Inject
@Override
public Widget setHasListener(boolean hasListener)
{
this.rs$setHasListener(hasListener);
return this;
}
@Inject
@Override
public Widget setFontId(int id)
{
this.rs$setFontId(id);
return this;
}
@Inject
@Override
public Widget setTextShadowed(boolean shadowed)
{
this.rs$setTextShadowed(shadowed);
return this;
}
@Inject
@Override
public Widget setItemQuantityMode(int itemQuantityMode)
{
this.rs$setItemQuantityMode(itemQuantityMode);
return this;
}
@Inject
@Override
public Widget setXPositionMode(int xpm)
{
this.rs$setXPositionMode(xpm);
return this;
}
@Inject
@Override
public Widget setYPositionMode(int ypm)
{
this.rs$setYPositionMode(ypm);
return this;
}
@Inject
@Override
public Widget setXTextAlignment(int xta)
{
this.rs$setXTextAlignment(xta);
return this;
}
@Inject
@Override
public Widget setYTextAlignment(int yta)
{
this.rs$setYTextAlignment(yta);
return this;
}
@Inject
@Override
public Widget setWidthMode(int widthMode)
{
this.rs$setWidthMode(widthMode);
return this;
}
@Inject
@Override
public Widget setHeightMode(int heightMode)
{
this.rs$setHeightMode(heightMode);
return this;
}
@Inject
@Override
public Widget setFilled(boolean filled)
{
this.rs$setFilled(filled);
return this;
}
@Inject
@Override
public Widget setDragParent(Widget dragParent)
{
this.rs$setDragParent(dragParent);
return this;
}
@Inject
@Override
public Widget setLineHeight(int height)
{
this.rs$setLineHeight(height);
return this;
}
}

View File

@@ -64,7 +64,7 @@ public interface RSWidget extends Widget
int getClickMask();
@Import("flags")
void setClickMask(int mask);
void rs$setClickMask(int mask);
//@Import("boundsIndex") -- unused for now
//int getBoundsIndex();
@@ -74,8 +74,7 @@ public interface RSWidget extends Widget
int getModelId();
@Import("modelId")
@Override
void setModelId(int modelId);
void rs$setModelId(int modelId);
@Import("itemIds")
int[] getItemIds();
@@ -87,13 +86,13 @@ public interface RSWidget extends Widget
int getModelType();
@Import("modelType")
void setModelType(int modelType);
void rs$setModelType(int modelType);
@Import("sequenceId")
int getAnimationId();
@Import("sequenceId")
void setAnimationId(int animationId);
void rs$setAnimationId(int animationId);
@Import("actions")
@Override
@@ -119,24 +118,21 @@ public interface RSWidget extends Widget
void setRSName(String name);
@Import("text")
@Override
void setText(String text);
void rs$setText(String text);
@Import("color")
@Override
int getTextColor();
@Import("color")
@Override
void setTextColor(int textColor);
void rs$setTextColor(int textColor);
@Import("transparencyTop")
@Override
int getOpacity();
@Import("transparencyTop")
@Override
void setOpacity(int opacity);
void rs$setOpacity(int opacity);
@Import("x")
@Override
@@ -175,7 +171,7 @@ public interface RSWidget extends Widget
boolean isSelfHidden();
@Import("isHidden")
void setHidden(boolean hidden);
void rs$setHidden(boolean hidden);
@Import("childIndex")
int getIndex();
@@ -188,40 +184,34 @@ public interface RSWidget extends Widget
int getRotationX();
@Import("modelAngleX")
@Override
void setRotationX(int rotationX);
void rs$setRotationX(int rotationX);
@Import("modelAngleZ") // Do not change
@Override
int getRotationY();
@Import("modelAngleZ") // Do not change
@Override
void setRotationY(int rotationY);
void rs$setRotationY(int rotationY);
@Import("modelAngleY") // Do not change
@Override
int getRotationZ();
@Import("modelAngleY") // Do not change
@Override
void setRotationZ(int rotationZ);
void rs$setRotationZ(int rotationZ);
@Import("modelZoom")
@Override
int getModelZoom();
@Import("modelZoom")
@Override
void setModelZoom(int modelZoom);
void rs$setModelZoom(int modelZoom);
@Import("contentType")
@Override
int getContentType();
@Import("contentType")
@Override
void setContentType(int contentType);
void rs$setContentType(int contentType);
@Import("type")
@Override
@@ -240,48 +230,42 @@ public interface RSWidget extends Widget
int getScrollX();
@Import("scrollX")
@Override
void setScrollX(int scrollX);
void rs$setScrollX(int scrollX);
@Import("scrollY")
@Override
int getScrollY();
@Import("scrollY")
@Override
void setScrollY(int scrollY);
void rs$setScrollY(int scrollY);
@Import("scrollWidth")
@Override
int getScrollWidth();
@Import("scrollWidth")
@Override
void setScrollWidth(int width);
void rs$setScrollWidth(int width);
@Import("scrollHeight")
@Override
int getScrollHeight();
@Import("scrollHeight")
@Override
void setScrollHeight(int height);
void rs$setScrollHeight(int height);
@Import("spriteId2")
@Override
int getSpriteId();
@Import("spriteId2")
@Override
void setSpriteId(int spriteId);
void rs$setSpriteId(int spriteId);
@Import("spriteTiling")
@Override
boolean getSpriteTiling();
@Import("spriteTiling")
@Override
void setSpriteTiling(boolean tiling);
void rs$setSpriteTiling(boolean tiling);
@Import("outline")
@Override
@@ -296,48 +280,42 @@ public interface RSWidget extends Widget
int getItemId();
@Import("itemId")
@Override
void setItemId(int itemId);
void rs$setItemId(int itemId);
@Import("itemQuantity")
@Override
int getItemQuantity();
@Import("itemQuantity")
@Override
void setItemQuantity(int quantity);
void rs$setItemQuantity(int quantity);
@Import("rawX")
@Override
int getOriginalX();
@Import("rawX")
@Override
void setOriginalX(int originalX);
void rs$setOriginalX(int originalX);
@Import("rawY")
@Override
int getOriginalY();
@Import("rawY")
@Override
void setOriginalY(int originalY);
void rs$setOriginalY(int originalY);
@Import("rawHeight")
@Override
int getOriginalHeight();
@Import("rawHeight")
@Override
void setOriginalHeight(int originalHeight);
void rs$setOriginalHeight(int originalHeight);
@Import("rawWidth")
@Override
int getOriginalWidth();
@Import("rawWidth")
@Override
void setOriginalWidth(int originalWidth);
void rs$setOriginalWidth(int originalWidth);
@Import("paddingX")
int getPaddingX();
@@ -374,8 +352,7 @@ public interface RSWidget extends Widget
boolean hasListener();
@Import("hasListener")
@Override
void setHasListener(boolean hasListener);
void rs$setHasListener(boolean hasListener);
@Import("onKey")
@Override
@@ -426,16 +403,14 @@ public interface RSWidget extends Widget
int getFontId();
@Import("fontId")
@Override
void setFontId(int id);
void rs$setFontId(int id);
@Import("textShadowed")
@Override
boolean getTextShadowed();
@Import("textShadowed")
@Override
void setTextShadowed(boolean shadowed);
void rs$setTextShadowed(boolean shadowed);
@Import("dragZoneSize")
@Override
@@ -458,56 +433,49 @@ public interface RSWidget extends Widget
int getItemQuantityMode();
@Import("itemQuantityMode")
@Override
void setItemQuantityMode(int itemQuantityMode);
void rs$setItemQuantityMode(int itemQuantityMode);
@Import("xAlignment")
@Override
int getXPositionMode();
@Import("xAlignment")
@Override
void setXPositionMode(int xpm);
void rs$setXPositionMode(int xpm);
@Import("yAlignment")
@Override
int getYPositionMode();
@Import("yAlignment")
@Override
void setYPositionMode(int ypm);
void rs$setYPositionMode(int ypm);
@Import("textXAlignment")
@Override
int getXTextAlignment();
@Import("textXAlignment")
@Override
void setXTextAlignment(int xta);
void rs$setXTextAlignment(int xta);
@Import("textYAlignment")
@Override
int getYTextAlignment();
@Import("textYAlignment")
@Override
void setYTextAlignment(int yta);
void rs$setYTextAlignment(int yta);
@Import("widthAlignment")
@Override
int getWidthMode();
@Import("widthAlignment")
@Override
void setWidthMode(int widthMode);
void rs$setWidthMode(int widthMode);
@Import("heightAlignment")
@Override
int getHeightMode();
@Import("heightAlignment")
@Override
void setHeightMode(int heightMode);
void rs$setHeightMode(int heightMode);
@Import("getFont")
@Override
@@ -518,8 +486,7 @@ public interface RSWidget extends Widget
boolean isFilled();
@Import("fill")
@Override
void setFilled(boolean filled);
void rs$setFilled(boolean filled);
@Import("spellActionName")
@Override
@@ -591,8 +558,7 @@ public interface RSWidget extends Widget
RSWidget getDragParent();
@Import("parent")
@Override
void setDragParent(Widget dragParent);
void rs$setDragParent(Widget dragParent);
@Import("onVarTransmit")
@Override
@@ -609,7 +575,7 @@ public interface RSWidget extends Widget
int getLineHeight();
@Import("textLineHeight")
void setLineHeight(int height);
void rs$setLineHeight(int height);
void broadcastHidden(boolean hidden);
}