Injector, deob, mixins

This commit is contained in:
Lucas
2019-06-08 09:33:50 +02:00
parent 276ff1995d
commit 49afdf7dc7
599 changed files with 84012 additions and 1821 deletions

View File

@@ -32,7 +32,7 @@ import javax.inject.Inject;
import net.runelite.api.Client;
import net.runelite.api.InventoryID;
import net.runelite.api.Item;
import net.runelite.api.ItemComposition;
import net.runelite.api.ItemDefinition;
import net.runelite.api.ItemContainer;
import net.runelite.api.ItemID;
import net.runelite.client.game.ItemManager;
@@ -99,12 +99,12 @@ public class BankCalculationTest
when(client.getItemContainer(InventoryID.BANK))
.thenReturn(bankContainer);
ItemComposition whipComp = mock(ItemComposition.class);
ItemDefinition whipComp = mock(ItemDefinition.class);
when(whipComp.getId())
.thenReturn(ItemID.ABYSSAL_WHIP);
when(whipComp.getPrice())
.thenReturn(7); // 7 * .6 = 4, 4 * 1m overflows
when(itemManager.getItemComposition(ItemID.ABYSSAL_WHIP))
when(itemManager.getItemDefinition(ItemID.ABYSSAL_WHIP))
.thenReturn(whipComp);
bankCalculation.calculate();

View File

@@ -33,7 +33,7 @@ import net.runelite.api.Client;
import net.runelite.api.GraphicID;
import net.runelite.api.Player;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.GraphicChanged;
import net.runelite.api.events.SpotAnimationChanged;
import net.runelite.client.game.ItemManager;
import net.runelite.client.ui.overlay.OverlayManager;
import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
@@ -110,17 +110,17 @@ public class CookingPluginTest
}
@Test
public void testOnGraphicChanged()
public void testOnSpotAnimationChanged()
{
Player player = mock(Player.class);
when(player.getGraphic()).thenReturn(GraphicID.WINE_MAKE);
when(player.getSpotAnimation()).thenReturn(GraphicID.WINE_MAKE);
when(config.fermentTimer()).thenReturn(true);
when(client.getLocalPlayer()).thenReturn(player);
GraphicChanged graphicChanged = new GraphicChanged();
SpotAnimationChanged graphicChanged = new SpotAnimationChanged();
graphicChanged.setActor(player);
cookingPlugin.onGraphicChanged(graphicChanged);
cookingPlugin.onSpotAnimationChanged(graphicChanged);
verify(infoBoxManager).addInfoBox(any(FermentTimer.class));
}

View File

@@ -97,7 +97,7 @@ public class ExaminePluginTest
ChatMessage chatMessage = new ChatMessage(null, ChatMessageType.ITEM_EXAMINE, "", "A weapon from the abyss.", "", 0);
examinePlugin.onChatMessage(chatMessage);
// This passes due to not mocking the ItemComposition for the whip
// This passes due to not mocking the ItemDefinition for the whip
verify(examineClient).submitItem(anyInt(), anyString());
}

View File

@@ -27,7 +27,7 @@ package net.runelite.client.plugins.grandexchange;
import net.runelite.api.GrandExchangeOffer;
import net.runelite.api.GrandExchangeOfferState;
import net.runelite.api.ItemComposition;
import net.runelite.api.ItemDefinition;
import net.runelite.client.game.AsyncBufferedImage;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -48,7 +48,7 @@ public class GrandExchangeOfferSlotTest
when(offer.getState()).thenReturn(GrandExchangeOfferState.CANCELLED_BUY);
GrandExchangeOfferSlot offerSlot = new GrandExchangeOfferSlot();
offerSlot.updateOffer(mock(ItemComposition.class), mock(AsyncBufferedImage.class), offer);
offerSlot.updateOffer(mock(ItemDefinition.class), mock(AsyncBufferedImage.class), offer);
}
}

View File

@@ -34,7 +34,7 @@ import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.Hitsplat;
import net.runelite.api.NPC;
import net.runelite.api.NPCComposition;
import net.runelite.api.NPCDefinition;
import net.runelite.api.Player;
import net.runelite.api.VarPlayer;
import net.runelite.api.WorldType;
@@ -93,15 +93,15 @@ public class IdleNotifierPluginTest
// Mock monster
final String[] monsterActions = new String[] { "Attack", "Examine" };
final NPCComposition monsterComp = mock(NPCComposition.class);
final NPCDefinition monsterComp = mock(NPCDefinition.class);
when(monsterComp.getActions()).thenReturn(monsterActions);
when(monster.getComposition()).thenReturn(monsterComp);
when(monster.getDefinition()).thenReturn(monsterComp);
// Mock random event
final String[] randomEventActions = new String[] { "Talk-to", "Dismiss", "Examine" };
final NPCComposition randomEventComp = mock(NPCComposition.class);
final NPCDefinition randomEventComp = mock(NPCDefinition.class);
when(randomEventComp.getActions()).thenReturn(randomEventActions);
when(randomEvent.getComposition()).thenReturn(randomEventComp);
when(randomEvent.getDefinition()).thenReturn(randomEventComp);
// Mock player
when(player.getName()).thenReturn(PLAYER_NAME);