From 0780522506f0263ed3d8d2c1c4e18ada1b52c0d9 Mon Sep 17 00:00:00 2001 From: Ganom Date: Wed, 22 May 2019 22:29:27 -0400 Subject: [PATCH 1/2] Fixing Tmorph and added new features. --- .../client/plugins/tmorph/TMorph.java | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java b/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java index dfd63b47a1..5244ab175c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java @@ -27,10 +27,9 @@ import com.google.inject.Provides; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.GameState; -import net.runelite.api.InventoryID; import net.runelite.api.Player; -import net.runelite.api.events.GameStateChanged; -import net.runelite.api.events.ItemContainerChanged; +import net.runelite.api.events.AnimationChanged; +import net.runelite.api.events.GameTick; import net.runelite.api.kit.KitType; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; @@ -62,20 +61,28 @@ public class TMorph extends Plugin } @Subscribe - public void onItemContainerChanged(final ItemContainerChanged event) + public void onAnimationChanged(AnimationChanged event) { - if (event.getItemContainer() != client.getItemContainer(InventoryID.EQUIPMENT)) + if (config.animationTarget() < 0 && config.animationSwap() < 0) { - return; + if (event.getActor().getAnimation() != -1) + { + event.getActor().setAnimation(config.globalAnimSwap()); + } + } + if (config.animationTarget() > 0 && config.animationSwap() > 0) + { + if (event.getActor().getAnimation() == config.animationTarget()) + { + event.getActor().setAnimation(config.animationSwap()); + } } - - updateEquip(); } @Subscribe - public void onGameStateChanged(GameStateChanged event) + public void onGameTick(GameTick event) { - if (event.getGameState() != GameState.LOGGED_IN) + if (client.getGameState() != GameState.LOGGED_IN) { return; } @@ -86,7 +93,6 @@ public class TMorph extends Plugin { Player player = client.getLocalPlayer(); - if (player == null || player.getPlayerComposition() == null || client.getWidget(WidgetInfo.LOGIN_CLICK_TO_PLAY_SCREEN) != null @@ -114,8 +120,6 @@ public class TMorph extends Plugin final int glovesID = ObjectUtils.defaultIfNull(player.getPlayerComposition(). getEquipmentId(KitType.HANDS), 0); - //Mage Swap - if (config.mageSwap()) { if (config.MainhandMage() > 0) @@ -209,9 +213,6 @@ public class TMorph extends Plugin } } } - - //Range Swap - if (config.rangeSwap()) { if (config.MainhandRange() > 0) From 8bab9a68f32e4ed934aa87fc6c8adf20d76a1092 Mon Sep 17 00:00:00 2001 From: Ganom Date: Wed, 22 May 2019 22:29:56 -0400 Subject: [PATCH 2/2] Adding Experimental Functions --- .../client/plugins/tmorph/TMorphConfig.java | 61 ++++++++++++++++++- 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorphConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorphConfig.java index 11210905f2..0a98083407 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorphConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorphConfig.java @@ -51,7 +51,7 @@ public interface TMorphConfig extends Config ) default boolean mageSwap() { - return true; + return false; } @ConfigItem( @@ -63,7 +63,7 @@ public interface TMorphConfig extends Config ) default boolean rangeSwap() { - return true; + return false; } @ConfigItem( @@ -75,9 +75,64 @@ public interface TMorphConfig extends Config ) default boolean meleeSwap() { - return true; + return false; } + @ConfigItem( + keyName = "experimentalFunctions", + name = "Experimental Functions", + description = "May bug out in unintended ways.", + parent = "swaps", + position = 4 + ) + default boolean experimentalFunctions() + { + return false; + } + + //////////////////Experimental Functions + + @ConfigItem( + keyName = "globalAnimSwap", + name = "Global Animation Swap", + description = "DO NOT USE WITH ANIMATION SWAP BELOW", + + group = "Experimental Functions", + hidden = true, + unhide = "experimentalFunctions" + ) + default int globalAnimSwap() + { + return 0; + } + + @ConfigItem( + keyName = "animationSwap", + name = "Animation Swap", + description = "ID", + group = "Experimental Functions", + hidden = true, + unhide = "experimentalFunctions" + ) + default int animationSwap() + { + return 0; + } + + @ConfigItem( + keyName = "animationTarget", + name = "Animation Target", + description = "ID", + group = "Experimental Functions", + hidden = true, + unhide = "experimentalFunctions" + ) + default int animationTarget() + { + return 0; + } + + //////////////////Mage @ConfigItem(