Merge branch 'runelite' into question_mark_full_stop
# Conflicts: # runelite-api/src/main/java/com/openosrs/api/Varbits.java # runelite-api/src/main/java/net/runelite/api/kit/KitType.java # runelite-client/src/main/java/com/openosrs/client/util/ImageUtil.java
This commit is contained in:
@@ -35,10 +35,10 @@ import net.runelite.api.mixins.Mixin;
|
||||
import net.runelite.api.mixins.Replace;
|
||||
import net.runelite.api.mixins.Shadow;
|
||||
import net.runelite.rs.api.RSClient;
|
||||
import net.runelite.rs.api.RSGameShell;
|
||||
import net.runelite.rs.api.RSGameEngine;
|
||||
|
||||
@Mixin(RSGameShell.class)
|
||||
public abstract class RSGameShellMixin implements RSGameShell
|
||||
@Mixin(RSGameEngine.class)
|
||||
public abstract class RSGameEngineMixin implements RSGameEngine
|
||||
{
|
||||
@Shadow("client")
|
||||
private static RSClient client;
|
||||
@@ -6,10 +6,10 @@ import net.runelite.api.mixins.Mixin;
|
||||
import net.runelite.api.mixins.Replace;
|
||||
import net.runelite.api.mixins.Shadow;
|
||||
import net.runelite.rs.api.RSClient;
|
||||
import net.runelite.rs.api.RSGameShell;
|
||||
import net.runelite.rs.api.RSGameEngine;
|
||||
|
||||
@Mixin(RSGameShell.class)
|
||||
public abstract class StretchedModeMaxSizeMixin implements RSGameShell
|
||||
@Mixin(RSGameEngine.class)
|
||||
public abstract class StretchedModeMaxSizeMixin implements RSGameEngine
|
||||
{
|
||||
@Shadow("client")
|
||||
private static RSClient client;
|
||||
|
||||
Reference in New Issue
Block a user