Commit 28480145 authored by Marwolf's avatar Marwolf 💬

Merge branch 'spritesheet_split_client' into '2.0.0'

Sprite Sheet Split

See merge request !2219
parents 81b57ed5 b3deea63
<component name="libraryTable">
<library name="Gradle: android.arch.core:runtime:1.1.1@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/949109f98d28e28b49e7174c03db802b/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/949109f98d28e28b49e7174c03db802b/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c4c1a137ce979034158dc642fac7bd4b/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c4c1a137ce979034158dc642fac7bd4b/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
......
<component name="libraryTable">
<library name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8c740115ccce41b0b74b8378c40d08b2/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/8c740115ccce41b0b74b8378c40d08b2/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/31badabc81e4c326ab5989519a049610/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/31badabc81e4c326ab5989519a049610/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
......
<component name="libraryTable">
<library name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e25fc030dabab2f7c9905b7750960da8/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e25fc030dabab2f7c9905b7750960da8/jars/classes.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7fb269dc5042648599dfb47722ea4786/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7fb269dc5042648599dfb47722ea4786/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
......
<component name="libraryTable">
<library name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/953f652e09d51eb2ccb17b27027c6dc2/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/953f652e09d51eb2ccb17b27027c6dc2/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/766442277cca77f55f24eefd78d34172/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/766442277cca77f55f24eefd78d34172/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
......
<component name="libraryTable">
<library name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1d9482b1c27a22161b06d64ab49c5856/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1d9482b1c27a22161b06d64ab49c5856/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/77e9d40019c6b75ca6736d5ed0e7d785/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/77e9d40019c6b75ca6736d5ed0e7d785/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
......
<component name="libraryTable">
<library name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3ac52c1e18f155b3bedeb89796cf08bc/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3ac52c1e18f155b3bedeb89796cf08bc/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/19a9d7f1fddd290d353b663e8b58ab8a/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/19a9d7f1fddd290d353b663e8b58ab8a/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4faf478ff85e482d50b4e4c95182d105/annotations.zip!/" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0df932e4b6ad2e18658c447b858e6581/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4faf478ff85e482d50b4e4c95182d105/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4faf478ff85e482d50b4e4c95182d105/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0df932e4b6ad2e18658c447b858e6581/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0df932e4b6ad2e18658c447b858e6581/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:cursoradapter:28.0.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f63045ef37af5ef34b558d94c8203ea4/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/f63045ef37af5ef34b558d94c8203ea4/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e2dec6a693d350729b7bc3eed22cc97/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/7e2dec6a693d350729b7bc3eed22cc97/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:customview:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6dc088c96888c8961375dc134b0201ce/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6dc088c96888c8961375dc134b0201ce/jars/classes.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/84e0c5e08b0da2bd483b13e6e1bc04d8/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/84e0c5e08b0da2bd483b13e6e1bc04d8/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:documentfile:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4e4b85050891587878643fda944bed69/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4e4b85050891587878643fda944bed69/jars/classes.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/14bd2f8120382a5b516a742accbf6d5f/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/14bd2f8120382a5b516a742accbf6d5f/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:drawerlayout:28.0.0@aar">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1852fdc8fb3971daabedc25553e71ddd/annotations.zip!/" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e0d476e5f18c9297c8584bafe400292f/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1852fdc8fb3971daabedc25553e71ddd/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1852fdc8fb3971daabedc25553e71ddd/jars/classes.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e0d476e5f18c9297c8584bafe400292f/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e0d476e5f18c9297c8584bafe400292f/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:interpolator:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2892178dfee230593bc7f86dbe2d1af1/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2892178dfee230593bc7f86dbe2d1af1/jars/classes.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2060e6077cada2ad22bcd966772a6e3a/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2060e6077cada2ad22bcd966772a6e3a/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:loader:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ce92b960e34150bdd8dc69f7f145d92c/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/ce92b960e34150bdd8dc69f7f145d92c/jars/classes.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ee891d4f5861868ae30d22551635713/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1ee891d4f5861868ae30d22551635713/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/274e51a69ad766a93dbb55a5e0d7d0c8/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/274e51a69ad766a93dbb55a5e0d7d0c8/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b5f7b967cb2df5b457ac167a7122cb8e/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/b5f7b967cb2df5b457ac167a7122cb8e/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:print:28.0.0@aar">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fefe93ca12c44bfb9658c9ecb0a49d6e/annotations.zip!/" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/482c74c635c9fe86663ae9d1aa22e95f/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fefe93ca12c44bfb9658c9ecb0a49d6e/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/fefe93ca12c44bfb9658c9ecb0a49d6e/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/482c74c635c9fe86663ae9d1aa22e95f/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/482c74c635c9fe86663ae9d1aa22e95f/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/94db3b0b8b5e539b8b8c5f17584ace02/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/94db3b0b8b5e539b8b8c5f17584ace02/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d0497e5445ad79cfd2241b70ae72fc8b/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d0497e5445ad79cfd2241b70ae72fc8b/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:support-compat:28.0.0@aar">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3e0220031a6218fdc3315c1317ab2ff4/annotations.zip!/" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/957c3d109df40b30a9b8db1fbefbbd86/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3e0220031a6218fdc3315c1317ab2ff4/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/3e0220031a6218fdc3315c1317ab2ff4/jars/classes.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/957c3d109df40b30a9b8db1fbefbbd86/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/957c3d109df40b30a9b8db1fbefbbd86/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:support-core-ui:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e62d6c711e89ab7f2a053b584babb532/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e62d6c711e89ab7f2a053b584babb532/jars/classes.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d41f6f797713b4cba3c0c4b6636b1771/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d41f6f797713b4cba3c0c4b6636b1771/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:support-core-utils:28.0.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/712e87edf9d6f9e9f50e7dddcc8e8c48/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/712e87edf9d6f9e9f50e7dddcc8e8c48/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d78ac6313607446372d05a1167ed8aa0/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/d78ac6313607446372d05a1167ed8aa0/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:support-fragment:28.0.0@aar">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e2b8ef436c55eb180e109fbffd66876e/annotations.zip!/" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c299cfbef678a7faeb00a0775d4a0d9/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e2b8ef436c55eb180e109fbffd66876e/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e2b8ef436c55eb180e109fbffd66876e/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c299cfbef678a7faeb00a0775d4a0d9/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1c299cfbef678a7faeb00a0775d4a0d9/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:support-media-compat:28.0.0@aar">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2f1b56f0116d9dad05fdf0ce210504de/annotations.zip!/" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e12961f4c3fce605ef17f61ce85ac18a/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2f1b56f0116d9dad05fdf0ce210504de/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2f1b56f0116d9dad05fdf0ce210504de/jars/classes.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e12961f4c3fce605ef17f61ce85ac18a/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e12961f4c3fce605ef17f61ce85ac18a/res" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:support-v4:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6712a9676d5b7311f509de5e452823fc/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/6712a9676d5b7311f509de5e452823fc/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/facd4d55a062f626a693dad1d7552d1e/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/facd4d55a062f626a693dad1d7552d1e/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar">
<ANNOTATIONS>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bf4d3c93c116113a5f4a92315e2bdf18/annotations.zip!/" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5d3a45dbea6484c631963ea6d52829f6/annotations.zip!/" />
</ANNOTATIONS>
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bf4d3c93c116113a5f4a92315e2bdf18/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/bf4d3c93c116113a5f4a92315e2bdf18/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5d3a45dbea6484c631963ea6d52829f6/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5d3a45dbea6484c631963ea6d52829f6/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:versionedparcelable:28.0.0@aar">
<CLASSES>
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/90888f2f8b91288737a31508345a9b96/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/90888f2f8b91288737a31508345a9b96/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/721d6d05156f1c9b58c5630d266dcded/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/721d6d05156f1c9b58c5630d266dcded/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
<component name="libraryTable">
<library name="Gradle: com.android.support:viewpager:28.0.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1dedee264d96a846a165ab0ff4b188fc/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/1dedee264d96a846a165ab0ff4b188fc/res" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2a17d7ceaf2e156d8a7d448ef923f57d/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/2a17d7ceaf2e156d8a7d448ef923f57d/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
......
This diff is collapsed.
......@@ -88,24 +88,15 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/duplicate_classes_check" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_app_info_output_file" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_jni_libs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
......@@ -113,13 +104,9 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
......
......@@ -192,11 +192,19 @@ public class CacheUpdater extends Activity {
String ip_cabbage = "androidcheck.openrsc.com";
String port_cabbage = "43595";
FileOutputStream fileout_cabbage;
String pack = "cabbagemenus:1";
FileOutputStream fileout_cabbage2;
try {
fileout_cabbage = new FileOutputStream("/data/user/0/com.openrsc.client/files" + File.separator + "ip.txt");
OutputStreamWriter outputWriter = new OutputStreamWriter(fileout_cabbage);
outputWriter.write(ip_cabbage);
outputWriter.close();
fileout_cabbage2 = new FileOutputStream("/data/user/0/com.openrsc.client/files" + File.separator + "config.txt");
OutputStreamWriter outputWriter2 = new OutputStreamWriter(fileout_cabbage2);
outputWriter2.write(pack);
outputWriter2.close();
} catch (Exception e) {
e.printStackTrace();
}
......
......@@ -3,7 +3,8 @@ package com.openrsc.client.entityhandling.defs;
public class ItemDef extends EntityDef {
public String command;
public int basePrice;
public int sprite;
public int authenticSpriteID;
public String spriteLocation;
public boolean stackable;
public boolean wieldable;
public int wearableID;
......@@ -14,12 +15,18 @@ public class ItemDef extends EntityDef {
private int isNotedFormOf = -1;
private int notedFormID = -1;
public ItemDef(String name, String description, String command, int basePrice, int sprite, boolean stackable,
public ItemDef(String name, String description, int authenticSpriteID, String spriteLocation,int id) {
super(name,description,id);
this.authenticSpriteID = authenticSpriteID;
this.spriteLocation = spriteLocation;
}
public ItemDef(String name, String description, String command, int basePrice, int authenticSpriteID, boolean stackable,
boolean wieldable, int wearableID, int pictureMask, boolean membersItem, boolean quest, int id) {
super(name, description, id);
this.command = command;
this.basePrice = basePrice;
this.sprite = sprite;
this.authenticSpriteID = authenticSpriteID;
this.stackable = stackable;
this.wieldable = wieldable;
this.wearableID = wearableID;
......@@ -29,13 +36,13 @@ public class ItemDef extends EntityDef {
this.id = id;
}
public ItemDef(String name, String description, String command, int basePrice, int sprite, boolean stackable,
boolean wieldable, int wearableID, int pictureMask, boolean membersItem, boolean quest, int notedForm, int notedFormOf,
int id) {
public ItemDef(String name, String description, String command, int basePrice, int authenticSpriteID, String spriteLocation,
boolean stackable, boolean wieldable, int wearableID, int pictureMask, boolean membersItem,
boolean quest, int notedForm, int notedFormOf, int id) {
super(name, description, id);
this.command = command;
this.basePrice = basePrice;
this.sprite = sprite;
this.authenticSpriteID = authenticSpriteID;
this.stackable = stackable;
this.wieldable = wieldable;
this.wearableID = wearableID;
......@@ -45,13 +52,14 @@ public class ItemDef extends EntityDef {
this.id = id;
this.notedFormID = notedForm;
this.isNotedFormOf = notedFormOf;
this.spriteLocation = spriteLocation;
}
public ItemDef(int i, ItemDef item) {
super(item.name, "Swap this note at any bank for the equivalent item.", i);
this.command = item.command;
this.basePrice = item.basePrice;
this.sprite = 438;
this.authenticSpriteID = 438;
this.stackable = true;
this.wieldable = false;
this.pictureMask = 0;
......@@ -65,10 +73,12 @@ public class ItemDef extends EntityDef {
return command;
}
public int getSprite() {
return sprite;
public int getAuthenticSpriteID() {
return authenticSpriteID;
}
public String getSpriteLocation() { return this.spriteLocation; }
public int getBasePrice() {
return basePrice;
}
......@@ -104,4 +114,4 @@ public class ItemDef extends EntityDef {
public void setNotedForm(int id) {
this.notedFormID = id;
}
}
\ No newline at end of file
}
......@@ -127,4 +127,4 @@ public class NPCDef extends EntityDef {
public boolean isAttackable() {
return attackable;
}
}
\ No newline at end of file
}
package com.openrsc.client.entityhandling.defs;
public class SpriteDef extends EntityDef {
private int authenticSpriteID;
private String spriteLocation;
public SpriteDef(String name, int authenticSpriteID, String spriteLocation, int id) {
super(name,"",id);
this.authenticSpriteID = authenticSpriteID;
this.spriteLocation = spriteLocation;
}
public int getAuthenticSpriteID() { return this.authenticSpriteID; }
public String getSpriteLocation() { return this.spriteLocation; }
}
......@@ -40,4 +40,4 @@ public class AnimationDef {
public int getNumber() {
return number;
}
}
\ No newline at end of file
}
......@@ -16,4 +16,4 @@ public class TextureDef {
public String getAnimationName() {
return animationName;
}
}
\ No newline at end of file
}
......@@ -96,10 +96,12 @@ public class Sprite {
public int getID() {
return id;
}
public void setID(int id) { this.id = id; }
public String getPackageName() {
return packageName;
}
public void setPackageName(String name) { this.packageName = name; }
public void setShift(int xShift, int yShift) {
this.xShift = xShift;
......@@ -117,10 +119,10 @@ public class Sprite {
public int getXShift() {
return xShift;
}
public void setXShift(int value) { this.xShift = value; }
public int getYShift() {
return yShift;
}
public int getYShift() { return yShift; }
public void setYShift(int value) { this.yShift = value; }
public int[] getPixels() {
return pixels;
......@@ -189,4 +191,4 @@ public class Sprite {
public void setUnknownByteArray(byte[] unknownByteArray) {
this.unknownByteArray = unknownByteArray;
}
}
\ No newline at end of file
}
package com.openrsc.data;
class DataFileVariables {
DataFileVariables() {
anIntArray485 = new int[256];
anIntArray487 = new int[257];
anIntArray488 = new int[257];
aBooleanArray491 = new boolean[256];
aBooleanArray492 = new boolean[16];
aByteArray493 = new byte[256];
aByteArray494 = new byte[4096];
anIntArray495 = new int[16];
aByteArray496 = new byte[18002];
aByteArray497 = new byte[18002];
aByteArrayArray498 = new byte[6][258];
anIntArrayArray499 = new int[6][258];
anIntArrayArray500 = new int[6][258];
anIntArrayArray501 = new int[6][258];
anIntArray502 = new int[6];
}
public class DataFileVariables {
public static int anIntArray489[];
final int anInt456 = 4096;
final int anInt457 = 16;
final int anInt458 = 258;
......@@ -29,43 +12,59 @@ class DataFileVariables {
final int anInt462 = 50;
final int anInt463 = 4;
final int anInt464 = 18002;
byte aByteArray465[];
int anInt466;
int anInt467;
int anInt468;
int anInt469;
byte aByteArray470[];
int anInt471;
int anInt472;
int anInt473;
int anInt474;
byte aByte475;
int anInt476;
boolean aBoolean477;
int anInt478;
int anInt479;
int anInt480;
int anInt481;
int anInt482;
int anInt483;
int anInt484;
int anIntArray485[];
int anInt486;
int anIntArray487[];
public byte[] aByteArray465;
public int anInt466;
public int anInt467;
public int anInt468;
public int anInt469;
public byte[] aByteArray470;
public int anInt471;
public int anInt472;
public int anInt473;
public int anInt474;
public byte aByte475;
public int anInt476;
public boolean aBoolean477;
public int anInt478;
public int anInt479;
public int anInt480;
public int anInt481;
public int anInt482;
public int anInt483;
public int anInt484;
public int[] anIntArray485;
public int anInt486;
public int[] anIntArray487;
int anIntArray488[];
public static int anIntArray489[];
int anInt490;
boolean aBooleanArray491[];
boolean aBooleanArray492[];
byte aByteArray493[];
byte aByteArray494[];
int anIntArray495[];
byte aByteArray496[];