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

Merge branch 'runelite' into question_mark_full_stop

Browse Source 
# Conflicts:
#	runelite-client/src/main/java/net/runelite/client/plugins/OPRSExternalPluginManager.java
This commit is contained in:
ThatGamerBlue
2021-02-04 07:34:47 +00:00
parent 4023066b5d 8c72f10b65
commit d9cc74671d
8 changed files with 36 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/com/openosrs/client/OpenOSRS.java
View File

@@ -8,7 +8,7 @@ import java.util.UUID;
public class OpenOSRS
{
public static final File OPENOSRS_DIR = new File(System.getProperty("user.home"), ".openosrs");
public static final File EXTERNALPLUGIN_DIR = new File(OPENOSRS_DIR, "plugins");
public static final File EXTERNALPLUGIN_DIR = new File(OPENOSRS_DIR, "plugins-oprs");
public static final String SYSTEM_VERSION;
public static String uuid = UUID.randomUUID().toString();

31
runelite-client/src/main/java/com/openosrs/client/events/ExternalPluginsLoaded.java
View File

@@ -1,31 +0,0 @@
/*
* Copyright (c) 2019 Owain van Brakel <https://github.com/Owain94>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package com.openosrs.client.events;
import lombok.Data;
@Data
public class ExternalPluginsLoaded
{}

2
runelite-client/src/main/java/com/openosrs/client/events/ExternalPluginChanged.java → runelite-client/src/main/java/com/openosrs/client/events/OPRSPluginChanged.java
View File

@@ -28,7 +28,7 @@ import lombok.Data;
import net.runelite.client.plugins.Plugin;
@Data
public class ExternalPluginChanged
public class OPRSPluginChanged
{
private final String pluginId;
private final Plugin plugin;

2
runelite-client/src/main/java/com/openosrs/client/events/ExternalRepositoryChanged.java → runelite-client/src/main/java/com/openosrs/client/events/OPRSRepositoryChanged.java
View File

@@ -27,7 +27,7 @@ package com.openosrs.client.events;
import lombok.Data;
@Data
public class ExternalRepositoryChanged
public class OPRSRepositoryChanged
{
private final String owner;
private final boolean added;