Rename util to common

bzip2
Graham 5 years ago
parent 8b41f6288d
commit e05653cdcc
  1. 2
      asm/pom.xml
  2. 4
      asm/src/main/java/dev/openrs2/asm/classpath/ClassPath.kt
  3. 4
      asm/src/main/java/dev/openrs2/asm/classpath/Library.kt
  4. 6
      common/pom.xml
  5. 2
      common/src/main/java/dev/openrs2/common/StringUtils.kt
  6. 2
      common/src/main/java/dev/openrs2/common/collect/DisjointSet.kt
  7. 2
      common/src/main/java/dev/openrs2/common/collect/ForestDisjointSet.kt
  8. 2
      common/src/main/java/dev/openrs2/common/io/DeterministicJarOutputStream.kt
  9. 2
      common/src/main/java/dev/openrs2/common/io/SkipOutputStream.kt
  10. 2
      common/src/test/java/dev/openrs2/common/StringUtilsTest.kt
  11. 2
      decompiler/pom.xml
  12. 2
      deob/src/main/java/dev/openrs2/deob/ArgRef.kt
  13. 2
      deob/src/main/java/dev/openrs2/deob/analysis/SourcedIntValue.kt
  14. 4
      deob/src/main/java/dev/openrs2/deob/remap/TypedRemapper.java
  15. 2
      deob/src/main/java/dev/openrs2/deob/transform/DummyArgTransformer.java
  16. 2
      deob/src/main/java/dev/openrs2/deob/transform/UnusedArgTransformer.java
  17. 4
      pom.xml

@ -20,7 +20,7 @@
<dependencies>
<dependency>
<groupId>dev.openrs2</groupId>
<artifactId>openrs2-util</artifactId>
<artifactId>openrs2-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>

@ -3,8 +3,8 @@ package dev.openrs2.asm.classpath
import com.google.common.collect.ImmutableList
import dev.openrs2.asm.MemberDesc
import dev.openrs2.asm.MemberRef
import dev.openrs2.util.collect.DisjointSet
import dev.openrs2.util.collect.ForestDisjointSet
import dev.openrs2.common.collect.DisjointSet
import dev.openrs2.common.collect.ForestDisjointSet
import org.objectweb.asm.commons.Remapper
import org.objectweb.asm.tree.ClassNode

@ -3,8 +3,8 @@ package dev.openrs2.asm.classpath
import com.github.michaelbull.logging.InlineLogger
import dev.openrs2.asm.hasCode
import dev.openrs2.asm.remap.ClassForNameRemapper
import dev.openrs2.util.io.DeterministicJarOutputStream
import dev.openrs2.util.io.SkipOutputStream
import dev.openrs2.common.io.DeterministicJarOutputStream
import dev.openrs2.common.io.SkipOutputStream
import org.apache.harmony.pack200.Pack200
import org.objectweb.asm.ClassReader
import org.objectweb.asm.ClassWriter

@ -8,11 +8,11 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>openrs2-util</artifactId>
<artifactId>openrs2-common</artifactId>
<packaging>jar</packaging>
<name>OpenRS2 Utilities</name>
<description>Common utility code used by all modules.</description>
<name>OpenRS2 Common</name>
<description>Common code used by all modules.</description>
<dependencies>
<dependency>

@ -1,4 +1,4 @@
package dev.openrs2.util
package dev.openrs2.common
fun CharSequence.indefiniteArticle(): String {
require(isNotEmpty())

@ -1,4 +1,4 @@
package dev.openrs2.util.collect
package dev.openrs2.common.collect
interface DisjointSet<T> : Iterable<DisjointSet.Partition<T>> {
interface Partition<T> : Iterable<T>

@ -1,4 +1,4 @@
package dev.openrs2.util.collect
package dev.openrs2.common.collect
import java.util.*
import kotlin.NoSuchElementException

@ -1,4 +1,4 @@
package dev.openrs2.util.io
package dev.openrs2.common.io
import java.io.OutputStream
import java.nio.file.attribute.FileTime

@ -1,4 +1,4 @@
package dev.openrs2.util.io
package dev.openrs2.common.io
import java.io.FilterOutputStream
import java.io.OutputStream

@ -1,4 +1,4 @@
package dev.openrs2.util
package dev.openrs2.common
import kotlin.test.Test
import kotlin.test.assertEquals

@ -20,7 +20,7 @@
<dependencies>
<dependency>
<groupId>dev.openrs2</groupId>
<artifactId>openrs2-util</artifactId>
<artifactId>openrs2-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>

@ -1,6 +1,6 @@
package dev.openrs2.deob
import dev.openrs2.asm.MemberRef
import dev.openrs2.util.collect.DisjointSet
import dev.openrs2.common.collect.DisjointSet
data class ArgRef(val method: DisjointSet.Partition<MemberRef>, val arg: Int)

@ -1,6 +1,6 @@
package dev.openrs2.deob.analysis
import dev.openrs2.asm.MemberRef
import dev.openrs2.util.collect.DisjointSet
import dev.openrs2.common.collect.DisjointSet
data class SourcedIntValue(val source: DisjointSet.Partition<MemberRef>, val intValue: IntValue)

@ -10,8 +10,8 @@ import dev.openrs2.asm.MemberDesc;
import dev.openrs2.asm.MemberRef;
import dev.openrs2.asm.classpath.ClassMetadata;
import dev.openrs2.asm.classpath.ClassPath;
import dev.openrs2.util.StringUtilsKt;
import dev.openrs2.util.collect.DisjointSet;
import dev.openrs2.common.StringUtilsKt;
import dev.openrs2.common.collect.DisjointSet;
import kotlin.text.StringsKt;
import org.objectweb.asm.Type;
import org.objectweb.asm.commons.Remapper;

@ -19,10 +19,10 @@ import dev.openrs2.asm.StackMetadataKt;
import dev.openrs2.asm.classpath.ClassPath;
import dev.openrs2.asm.classpath.Library;
import dev.openrs2.asm.transform.Transformer;
import dev.openrs2.common.collect.DisjointSet;
import dev.openrs2.deob.ArgRef;
import dev.openrs2.deob.analysis.IntInterpreter;
import dev.openrs2.deob.analysis.SourcedIntValue;
import dev.openrs2.util.collect.DisjointSet;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
import org.objectweb.asm.tree.AbstractInsnNode;

@ -12,10 +12,10 @@ import dev.openrs2.asm.MethodNodeUtilsKt;
import dev.openrs2.asm.classpath.ClassPath;
import dev.openrs2.asm.classpath.Library;
import dev.openrs2.asm.transform.Transformer;
import dev.openrs2.common.collect.DisjointSet;
import dev.openrs2.deob.ArgRef;
import dev.openrs2.deob.analysis.ConstSourceInterpreter;
import dev.openrs2.deob.remap.TypedRemapper;
import dev.openrs2.util.collect.DisjointSet;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
import org.objectweb.asm.tree.AbstractInsnNode;

@ -23,12 +23,12 @@
<module>all</module>
<module>asm</module>
<module>bundler</module>
<module>common</module>
<module>decompiler</module>
<module>deob</module>
<module>deob-annotations</module>
<module>deob-ast</module>
<module>deob</module>
<module>game</module>
<module>util</module>
</modules>
<scm>

Loading…
Cancel
Save