Merge remote-tracking branch 'runelite/master' into ready-set-action
Conflicts: .gitignore cache-client/pom.xml cache-updater/pom.xml cache/pom.xml cache/src/main/java/net/runelite/cache/definitions/loaders/ParamLoader.java deobfuscator/src/main/java/net/runelite/deob/clientver/ClientVersion.java http-api/pom.xml http-service/pom.xml http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java pom.xml protocol-api/pom.xml protocol/pom.xml runelite-api/pom.xml runelite-api/src/main/java/net/runelite/api/Client.java runelite-client/pom.xml runelite-client/src/main/java/net/runelite/client/RuneLite.java runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraConfig.java runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonConfig.java runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Tree.java runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java runelite-client/src/main/java/net/runelite/client/rs/CountingInputStream.java runelite-client/src/main/java/net/runelite/client/ui/FatalErrorDialog.java runelite-client/src/main/java/net/runelite/client/ui/SplashScreen.java runelite-client/src/main/java/net/runelite/client/util/CountingInputStream.java runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java runelite-client/src/main/resources/net/runelite/client/runelite.properties runelite-client/src/main/resources/npc_health.json runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java runelite-script-assembler-plugin/pom.xml
This commit is contained in:
Owain van Brakel
5
cache/cache.gradle.kts
vendored
5
cache/cache.gradle.kts
vendored
@@ -46,9 +46,12 @@ dependencies {
|
||||
implementation(Libraries.apacheCommonsCompress)
|
||||
implementation(Libraries.slf4jApi)
|
||||
|
||||
testAnnotationProcessor(Libraries.lombok)
|
||||
|
||||
testCompileOnly(Libraries.lombok)
|
||||
|
||||
testImplementation(Libraries.junit)
|
||||
testImplementation(group = "net.runelite.rs", name = "cache", version = "${ProjectVersions.cacheversion}")
|
||||
testImplementation(Libraries.slf4jSimple)
|
||||
}
|
||||
|
||||
tasks {
|
||||
|
||||
@@ -36,6 +36,7 @@ public enum ConfigType
|
||||
ENUM(8),
|
||||
NPC(9),
|
||||
ITEM(10),
|
||||
PARAMS(11),
|
||||
SEQUENCE(12),
|
||||
SPOTANIM(13),
|
||||
VARBIT(14),
|
||||
|
||||
37
cache/src/main/java/net/runelite/cache/definitions/ParamDefinition.java
vendored
Normal file
37
cache/src/main/java/net/runelite/cache/definitions/ParamDefinition.java
vendored
Normal file
@@ -0,0 +1,37 @@
|
||||
/*
|
||||
* Copyright (c) 2020, Adam <Adam@sigterm.info>
|
||||
* 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 net.runelite.cache.definitions;
|
||||
|
||||
import lombok.Data;
|
||||
import net.runelite.cache.util.ScriptVarType;
|
||||
|
||||
@Data
|
||||
public class ParamDefinition
|
||||
{
|
||||
private ScriptVarType type;
|
||||
private boolean isMembers = true;
|
||||
private int defaultInt;
|
||||
private String defaultString;
|
||||
}
|
||||
64
cache/src/main/java/net/runelite/cache/definitions/loaders/ParamLoader.java
vendored
Normal file
64
cache/src/main/java/net/runelite/cache/definitions/loaders/ParamLoader.java
vendored
Normal file
@@ -0,0 +1,64 @@
|
||||
/*
|
||||
* Copyright (c) 2020, Adam <Adam@sigterm.info>
|
||||
* 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 net.runelite.cache.definitions.loaders;
|
||||
|
||||
import net.runelite.cache.definitions.ParamDefinition;
|
||||
import net.runelite.cache.io.InputStream;
|
||||
import net.runelite.cache.util.ScriptVarType;
|
||||
|
||||
public class ParamLoader
|
||||
{
|
||||
public ParamDefinition load(byte[] data)
|
||||
{
|
||||
ParamDefinition def = new ParamDefinition();
|
||||
InputStream b = new InputStream(data);
|
||||
|
||||
for (; ; )
|
||||
{
|
||||
int opcode = b.readUnsignedByte();
|
||||
|
||||
switch (opcode)
|
||||
{
|
||||
case 0:
|
||||
return def;
|
||||
case 1:
|
||||
{
|
||||
int idx = b.readByte();
|
||||
def.setType(ScriptVarType.forCharKey((char) idx));
|
||||
break;
|
||||
}
|
||||
case 2:
|
||||
def.setDefaultInt(b.readInt());
|
||||
break;
|
||||
case 4:
|
||||
def.setMembers(false);
|
||||
break;
|
||||
case 5:
|
||||
def.setDefaultString(b.readString());
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
88
cache/src/test/java/net/runelite/cache/ParamDumper.java
vendored
Normal file
88
cache/src/test/java/net/runelite/cache/ParamDumper.java
vendored
Normal file
@@ -0,0 +1,88 @@
|
||||
/*
|
||||
* Copyright (c) 2020, Adam <Adam@sigterm.info>
|
||||
* 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 net.runelite.cache;
|
||||
|
||||
import com.google.common.io.Files;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.Charset;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import net.runelite.cache.definitions.ParamDefinition;
|
||||
import net.runelite.cache.definitions.loaders.ParamLoader;
|
||||
import net.runelite.cache.fs.Archive;
|
||||
import net.runelite.cache.fs.ArchiveFiles;
|
||||
import net.runelite.cache.fs.FSFile;
|
||||
import net.runelite.cache.fs.Index;
|
||||
import net.runelite.cache.fs.Storage;
|
||||
import net.runelite.cache.fs.Store;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.rules.TemporaryFolder;
|
||||
|
||||
@Slf4j
|
||||
public class ParamDumper
|
||||
{
|
||||
private Gson gson = new GsonBuilder().setPrettyPrinting().create();
|
||||
|
||||
@Rule
|
||||
public TemporaryFolder folder = StoreLocation.getTemporaryFolder();
|
||||
|
||||
@Test
|
||||
@Ignore
|
||||
public void test() throws IOException
|
||||
{
|
||||
File dumpDir = folder.newFolder();
|
||||
int count = 0;
|
||||
|
||||
try (Store store = new Store(StoreLocation.LOCATION))
|
||||
{
|
||||
store.load();
|
||||
|
||||
Storage storage = store.getStorage();
|
||||
Index index = store.getIndex(IndexType.CONFIGS);
|
||||
Archive archive = index.getArchive(ConfigType.PARAMS.getId());
|
||||
|
||||
ParamLoader loader = new ParamLoader();
|
||||
|
||||
byte[] archiveData = storage.loadArchive(archive);
|
||||
ArchiveFiles files = archive.getFiles(archiveData);
|
||||
|
||||
for (FSFile file : files.getFiles())
|
||||
{
|
||||
byte[] b = file.getContents();
|
||||
|
||||
ParamDefinition def = loader.load(b);
|
||||
|
||||
Files.asCharSink(new File(dumpDir, file.getFileId() + ".json"), Charset.defaultCharset()).write(gson.toJson(def));
|
||||
++count;
|
||||
}
|
||||
}
|
||||
|
||||
log.info("Dumped {} params to {}", count, dumpDir);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user