ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fixed maven issues

Browse Source 
Maven really fucked me on this merge lol
This commit is contained in:
zeruth
2019-06-06 23:35:26 -04:00
parent 0dcd321ce6
commit 5eb12b7119
9 changed files with 87 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
RuneLitePlus/pom.xml
View File

@@ -27,9 +27,9 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.runeswag</groupId> <groupId>net.runelite</groupId>
<artifactId>runeswag-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.5.26-SNAPSHOT</version>
</parent> </parent>
<artifactId>client</artifactId> <artifactId>client</artifactId>
@@ -422,7 +422,7 @@
<plugin> <plugin>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>script-assembler-plugin</artifactId> <artifactId>script-assembler-plugin</artifactId>
<version>1.5.26-SNAPSHOT</version> <version>1.5.23-SNAPSHOT</version>
<executions> <executions>
<execution> <execution>
<id>assemble</id> <id>assemble</id>

2
RuneLitePlus/src/main/java/net/runelite/client/Notifier.java
View File

@@ -300,7 +300,7 @@ public class Notifier
{ {
if (OSType.getOSType() == OSType.Linux && !Files.exists(notifyIconPath)) if (OSType.getOSType() == OSType.Linux && !Files.exists(notifyIconPath))
{ {
try (InputStream stream = Notifier.class.getResourceAsStream("/runeliteplus.png")) try (InputStream stream = Notifier.class.getResourceAsStream("/runelite.png"))
{ {
Files.copy(stream, notifyIconPath); Files.copy(stream, notifyIconPath);
} }

19
RuneLitePlus/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusConfig.java
View File

@@ -34,11 +34,22 @@ import net.runelite.client.config.Range;
@ConfigGroup("runeliteplus") @ConfigGroup("runeliteplus")
public interface RuneLitePlusConfig extends Config public interface RuneLitePlusConfig extends Config
{ {
@ConfigItem(
position = 0,
keyName = "customPresence",
name = "RL+ Presence",
description = "Represent RL+ with a custom icon and discord presence."
)
default boolean customPresence()
{
return false;
}
@ConfigItem( @ConfigItem(
keyName = "enableOpacity", keyName = "enableOpacity",
name = "Enable opacity", name = "Enable opacity",
description = "Enables opacity for the whole window.<br>NOTE: This only stays enabled if your pc supports this!", description = "Enables opacity for the whole window.<br>NOTE: This only stays enabled if your pc supports this!",
position = 0 position = 1
) )
default boolean enableOpacity() default boolean enableOpacity()
{ {
@@ -53,7 +64,7 @@ public interface RuneLitePlusConfig extends Config
keyName = "opacityPercentage", keyName = "opacityPercentage",
name = "Opacity percentage", name = "Opacity percentage",
description = "Changes the opacity of the window if opacity is enabled", description = "Changes the opacity of the window if opacity is enabled",
position = 1 position = 2
) )
default int opacityPercentage() default int opacityPercentage()
{ {
@@ -64,7 +75,7 @@ public interface RuneLitePlusConfig extends Config
keyName = "keyboardPin", keyName = "keyboardPin",
name = "Keyboard bank pin", name = "Keyboard bank pin",
description = "Enables you to type your bank pin", description = "Enables you to type your bank pin",
position = 2 position = 3
) )
default boolean keyboardPin() default boolean keyboardPin()
{ {
@@ -75,7 +86,7 @@ public interface RuneLitePlusConfig extends Config
keyName = "logOpt", keyName = "logOpt",
name = "Send logs", name = "Send logs",
description = "Send logs to help us analyze errors", description = "Send logs to help us analyze errors",
position = 3 position = 4
) )
default boolean logOpt() default boolean logOpt()
{ {

53
RuneLitePlus/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java
View File

@@ -160,19 +160,32 @@ public class RuneLitePlusPlugin extends Plugin
@Override @Override
protected void startUp() throws Exception protected void startUp() throws Exception
{ {
ClientUI.currentPresenceName = ("RuneLitePlus");
ClientUI.frame.setTitle(ClientUI.currentPresenceName);
RuneLiteProperties.discordAppID = rlPlusDiscordApp;
discordService.close();
discordService.init();
entered = -1; entered = -1;
enterIdx = 0; enterIdx = 0;
if (getConfig(configManager).customPresence())
{
ClientUI.currentPresenceName = ("RuneLitePlus");
ClientUI.frame.setTitle(ClientUI.currentPresenceName);
}
if (config.logOpt()) if (config.logOpt())
{ {
Sentry.init("https://f0ed76be2fe847f8b9eb3620fa55d729@sentry.io/1468399?stacktrace.app.packages=net.runelite.client"); Sentry.init("https://f0ed76be2fe847f8b9eb3620fa55d729@sentry.io/1468399?stacktrace.app.packages=net.runelite.client");
} }
if (config.customPresence())
{
RuneLiteProperties.discordAppID = rlPlusDiscordApp;
discordService.close();
discordService.init();
}
else
{
RuneLiteProperties.discordAppID = rlDiscordApp;
discordService.close();
discordService.init();
}
} }
@Subscribe @Subscribe
@@ -183,7 +196,33 @@ public class RuneLitePlusPlugin extends Plugin
return; return;
} }
if (!config.keyboardPin()) if (event.getKey().equals("customPresence"))
{
if (config.customPresence())
{
ClientUI.currentPresenceName = ("RuneLitePlus");
ClientUI.frame.setTitle(ClientUI.currentPresenceName);
}
else
{
ClientUI.currentPresenceName = ("RuneLite");
ClientUI.frame.setTitle(ClientUI.currentPresenceName);
}
if (config.customPresence())
{
RuneLiteProperties.discordAppID = rlPlusDiscordApp;
discordService.close();
discordService.init();
}
else
{
RuneLiteProperties.discordAppID = rlDiscordApp;
discordService.close();
discordService.init();
}
}
else if (!config.keyboardPin())
{ {
entered = -1; entered = -1;
enterIdx = 0; enterIdx = 0;

2
RuneLitePlus/src/main/java/net/runelite/client/rs/ClientLoader.java
View File

@@ -64,7 +64,7 @@ import org.apache.commons.compress.compressors.CompressorException;
@Singleton @Singleton
public class ClientLoader public class ClientLoader
{ {
private static final File CUSTOMFILE = new File("./injected-client/target/injected-client-1.5.25-SNAPSHOT.jar"); private static final File CUSTOMFILE = new File("./injected-client/target/injected-client-1.0-SNAPSHOT.jar");
private final ClientConfigLoader clientConfigLoader; private final ClientConfigLoader clientConfigLoader;
private ClientUpdateCheckMode updateCheckMode; private ClientUpdateCheckMode updateCheckMode;

2
RuneLitePlus/src/main/java/net/runelite/client/ui/ClientUI.java
View File

@@ -117,7 +117,7 @@ public class ClientUI
private static final int CLIENT_WELL_HIDDEN_MARGIN_TOP = 10; private static final int CLIENT_WELL_HIDDEN_MARGIN_TOP = 10;
public static boolean allowInput = false; public static boolean allowInput = false;
public static String currentPresenceName = "RuneLite"; public static String currentPresenceName = "RuneLite";
public static final BufferedImage ICON = ImageUtil.getResourceStreamFromClass(ClientUI.class, "/runeliteplus.png"); public static final BufferedImage ICON = ImageUtil.getResourceStreamFromClass(ClientUI.class, "/runelite.png");
@Getter @Getter
private TrayIcon trayIcon; private TrayIcon trayIcon;

11
deobfuscator/pom.xml
View File

@@ -153,6 +153,17 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

14
injected-client/pom.xml
View File

@@ -27,9 +27,9 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>com.runeswag</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runeswag-parent</artifactId>
<version>1.5.25-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>injected-client</artifactId> <artifactId>injected-client</artifactId>
@@ -37,9 +37,9 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.runeswag</groupId> <groupId>net.runelite</groupId>
<artifactId>client</artifactId> <artifactId>client</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.5.26-SNAPSHOT</version>
<optional>true</optional> <!-- to prevent the dependency on this from runelite-client --> <optional>true</optional> <!-- to prevent the dependency on this from runelite-client -->
</dependency> </dependency>
<dependency> <dependency>
@@ -51,7 +51,7 @@
<dependency> <dependency>
<groupId>net.runelite.rs</groupId> <groupId>net.runelite.rs</groupId>
<artifactId>vanilla</artifactId> <artifactId>vanilla</artifactId>
<version>${rs.version}</version> <version>180</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
</dependencies> </dependencies>
@@ -61,7 +61,7 @@
<plugin> <plugin>
<groupId>net.runelite.rs</groupId> <groupId>net.runelite.rs</groupId>
<artifactId>injector-plugin</artifactId> <artifactId>injector-plugin</artifactId>
<version>${project.version}</version> <version>1.5.26-SNAPSHOT</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>

2
injector-plugin/pom.xml
View File

@@ -29,7 +29,7 @@
<parent> <parent>
<groupId>net.runelite</groupId> <groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId> <artifactId>runelite-parent</artifactId>
<version>1.5.25-SNAPSHOT</version> <version>1.5.26-SNAPSHOT</version>
</parent> </parent>
<groupId>net.runelite.rs</groupId> <groupId>net.runelite.rs</groupId>