Skip to content

Commit

Permalink
Start 176
Browse files Browse the repository at this point in the history
  • Loading branch information
@hunterwb
hunterwb committed Oct 11, 2018
1 parent 1500b33 commit fff0379
Show file tree
Hide file tree
Showing 21 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>
</parent>

<artifactId>client-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>
</parent>

<artifactId>client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>
</parent>

<artifactId>client-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion game-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>
</parent>

<artifactId>client-game-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion game-api/src/main/java/org/runestar/client/game/api/WidgetId.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ data class WidgetId(

val CASTLE_WARS_ZAMORAK_TIME_LEFT = WidgetId(WidgetGroupId.CASTLE_WARS_ZAMORAK, 25)

val CHAT_REPORT_TEXT = WidgetId(WidgetGroupId.CHAT, 29)
val CHAT_REPORT_TEXT = WidgetId(WidgetGroupId.CHAT, 36)

val INVENTORY_ITEMS = WidgetId(WidgetGroupId.INVENTORY, 0)

Expand Down
2 changes: 1 addition & 1 deletion game-api/src/main/java/org/runestar/client/game/api/live/Game.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ object Game {
}

val ticks: Observable<Unit> = XPacketBuffer.readSmartByteShortIsaac.exit
.filter { it.returned == 29 } // update npcs
.filter { it.returned == 33 } // update npcs
.map { Unit }
.delay { XClient.doCycle.enter }

Expand Down
2 changes: 1 addition & 1 deletion game-raw-accessors-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>
</parent>

<artifactId>client-game-raw-accessors-maven-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion game-raw-base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>
</parent>

<artifactId>client-game-raw-base</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion game-raw/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>
</parent>

<artifactId>client-game-raw</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion patch-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>
</parent>

<artifactId>client-patch-maven-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion plugins-dev/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>
</parent>

<artifactId>client-plugins-dev</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion plugins-spi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>
</parent>

<artifactId>client-plugins-spi</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion plugins/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>
</parent>

<artifactId>client-plugins</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>

<packaging>pom</packaging>

Expand Down Expand Up @@ -71,7 +71,7 @@
<version.slf4j>1.7.25</version.slf4j>
<version.maven>3.5.0</version.maven>

<runescape.gamepack.revision>175</runescape.gamepack.revision>
<runescape.gamepack.revision>176</runescape.gamepack.revision>
</properties>

<dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion updater-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>
</parent>

<artifactId>client-updater-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion updater-create-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>
</parent>

<artifactId>client-updater-create-maven-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion updater-deob/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>
</parent>

<artifactId>client-updater-deob</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion updater-mapper-standard/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>
</parent>

<artifactId>client-updater-mapper-standard</artifactId>
Expand Down
58 changes: 29 additions & 29 deletions ...er-mapper-standard/src/main/java/org/runestar/client/updater/mapper/std/classes/Client.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ class Client : IdentityMapper.Class() {
override val predicate = predicateOf<Method2> { it.returnType == type<NpcDefinition>() }
}

@SinceVersion(141)
@DependsOn(OverlayDefinition::class)
class getOverlayDefinition : StaticMethod() {
override val predicate = predicateOf<Method2> { it.returnType == type<OverlayDefinition>() }
}
// @SinceVersion(141)
// @DependsOn(OverlayDefinition::class)
// class getOverlayDefinition : StaticMethod() {
// override val predicate = predicateOf<Method2> { it.returnType == type<OverlayDefinition>() }
// }

@DependsOn(UnderlayDefinition::class)
class getUnderlayDefinition : StaticMethod() {
Expand Down Expand Up @@ -1808,11 +1808,11 @@ class Client : IdentityMapper.Class() {
override val predicate = predicateOf<Instruction2> { it.opcode == GETSTATIC && it.fieldType == type<AbstractIndexCache>() }
}

@SinceVersion(141)
@DependsOn(getOverlayDefinition::class, AbstractIndexCache::class)
class OverlayDefinition_indexCache : UniqueMapper.InMethod.Field(getOverlayDefinition::class) {
override val predicate = predicateOf<Instruction2> { it.opcode == GETSTATIC && it.fieldType == type<AbstractIndexCache>() }
}
// @SinceVersion(141)
// @DependsOn(getOverlayDefinition::class, AbstractIndexCache::class)
// class OverlayDefinition_indexCache : UniqueMapper.InMethod.Field(getOverlayDefinition::class) {
// override val predicate = predicateOf<Instruction2> { it.opcode == GETSTATIC && it.fieldType == type<AbstractIndexCache>() }
// }

@DependsOn(getSpotAnimationDefinition::class, AbstractIndexCache::class)
class SpotAnimationDefinition_indexCache : UniqueMapper.InMethod.Field(getSpotAnimationDefinition::class) {
Expand Down Expand Up @@ -2325,11 +2325,11 @@ class Client : IdentityMapper.Class() {
.nextIn(2) { it.opcode == PUTSTATIC && it.fieldType == IntArray::class.type }
}

@DependsOn(IndexedSprite::class, AbstractIndexCache::class)
class getIndexedSprites : IdentityMapper.StaticMethod() {
override val predicate = predicateOf<Method2> { it.returnType == type<IndexedSprite>().withDimensions(1) }
.and { it.arguments.startsWith(type<AbstractIndexCache>(), String::class.type) }
}
// @DependsOn(IndexedSprite::class, AbstractIndexCache::class)
// class getIndexedSprites : IdentityMapper.StaticMethod() {
// override val predicate = predicateOf<Method2> { it.returnType == type<IndexedSprite>().withDimensions(1) }
// .and { it.arguments.startsWith(type<AbstractIndexCache>(), String::class.type) }
// }

@SinceVersion(173)
@DependsOn(IndexedSprite::class, SpriteIds.mapScenes::class)
Expand All @@ -2341,11 +2341,11 @@ class Client : IdentityMapper.Class() {
@DependsOn(IndexedSprite::class, SpriteIds.scrollBars::class)
class scrollBarSprites : IndexedSpriteArrayField(SpriteIds.scrollBars::class)

class runeSprites : IndexedSpritesFieldMapper("runes")
class titleMuteSprites : IndexedSpritesFieldMapper("title_mute")
class slFlagSprites : IndexedSpritesFieldMapper("sl_flags")
class slArrowSprites : IndexedSpritesFieldMapper("sl_arrows")
class slStarSprites : IndexedSpritesFieldMapper("sl_stars")
// class runeSprites : IndexedSpritesFieldMapper("runes")
// class titleMuteSprites : IndexedSpritesFieldMapper("title_mute")
// class slFlagSprites : IndexedSpritesFieldMapper("sl_flags")
// class slArrowSprites : IndexedSpritesFieldMapper("sl_arrows")
// class slStarSprites : IndexedSpritesFieldMapper("sl_stars")

@SinceVersion(173)
@DependsOn(Sprite::class, SpriteIds.headIconsPrayer::class)
Expand Down Expand Up @@ -3192,12 +3192,12 @@ class Client : IdentityMapper.Class() {
// }

@MethodParameters("widget", "x", "y")
@DependsOn(Widget::class, isMenuOpen::class)
@DependsOn(Widget::class, isMenuOpen::class, Widget.parent::class)
class clickWidget : IdentityMapper.StaticMethod() {
override val predicate = predicateOf<Method2> { it.returnType == VOID_TYPE }
.and { it.arguments == listOf(type<Widget>(), INT_TYPE, INT_TYPE) }
.and { it.instructions.any { it.opcode == GETSTATIC && it.fieldId == field<isMenuOpen>().id } }
.and { it.instructions.none { it.opcode == ISHR } }
.and { it.instructions.any { it.isField && it.fieldId == field<Widget.parent>().id } }
}

@DependsOn(clickWidget::class, Widget::class)
Expand Down Expand Up @@ -3537,13 +3537,13 @@ class Client : IdentityMapper.Class() {
.and { it.arguments == listOf(type<AbstractIndexCache>(), INT_TYPE, INT_TYPE) }
}

@MethodParameters("index", "archive", "record")
@SinceVersion(173)
@DependsOn(AbstractIndexCache::class)
class loadSprites : IdentityMapper.StaticMethod() {
override val predicate = predicateOf<Method2> { it.returnType == BOOLEAN_TYPE }
.and { it.arguments == listOf(type<AbstractIndexCache>(), INT_TYPE, INT_TYPE) }
}
// @MethodParameters("index", "archive", "record")
// @SinceVersion(173)
// @DependsOn(AbstractIndexCache::class)
// class loadSprites : IdentityMapper.StaticMethod() {
// override val predicate = predicateOf<Method2> { it.returnType == BOOLEAN_TYPE }
// .and { it.arguments == listOf(type<AbstractIndexCache>(), INT_TYPE, INT_TYPE) }
// }

@MethodParameters()
@DependsOn(GameShell.kill0::class)
Expand Down
2 changes: 1 addition & 1 deletion updater-mapper/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>
</parent>

<artifactId>client-updater-mapper</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion updater/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.runestar.client</groupId>
<artifactId>client-parent</artifactId>
<version>0.175.0-SNAPSHOT</version>
<version>0.176.0-SNAPSHOT</version>
</parent>

<artifactId>client-updater</artifactId>
Expand Down

0 comments on commit fff0379

Please sign in to comment.