api(mixins): More object methods exposed

This commit is contained in:
Owain van Brakel
2021-09-25 03:01:43 +02:00
parent 910ff6c082
commit d6579901c6
6 changed files with 145 additions and 6 deletions

View File

@@ -721,7 +721,8 @@ public class Scene {
@ObfuscatedSignature(
descriptor = "(III)Lhn;"
)
public BoundaryObject method4155(int var1, int var2, int var3) {
@Export("getBoundaryObject")
public BoundaryObject getBoundaryObject(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3];
return var4 == null ? null : var4.boundaryObject;
}
@@ -730,7 +731,8 @@ public class Scene {
@ObfuscatedSignature(
descriptor = "(III)Lhh;"
)
public WallDecoration method4156(int var1, int var2, int var3) {
@Export("getWallDecoration")
public WallDecoration getWallDecoration(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3];
return var4 == null ? null : var4.wallDecoration;
}
@@ -739,7 +741,8 @@ public class Scene {
@ObfuscatedSignature(
descriptor = "(III)Lhj;"
)
public GameObject method4180(int var1, int var2, int var3) {
@Export("getGameObject")
public GameObject getGameObject(int var1, int var2, int var3) {
Tile var4 = this.tiles[var1][var2][var3];
if (var4 == null) {
return null;

View File

@@ -412,7 +412,7 @@ public class ScriptFrame {
var9 = Client.field549[var7];
if (var3 >= 0 && var4 >= 0 && var3 < 103 && var4 < 103) {
if (var9 == 0) {
BoundaryObject var33 = CollisionMap.scene.method4155(class391.Client_plane, var3, var4);
BoundaryObject var33 = CollisionMap.scene.getBoundaryObject(class391.Client_plane, var3, var4);
if (var33 != null) {
var11 = HealthBarDefinition.Entity_unpackID(var33.tag);
if (var7 == 2) {
@@ -425,7 +425,7 @@ public class ScriptFrame {
}
if (var9 == 1) {
WallDecoration var43 = CollisionMap.scene.method4156(class391.Client_plane, var3, var4);
WallDecoration var43 = CollisionMap.scene.getWallDecoration(class391.Client_plane, var3, var4);
if (var43 != null) {
var11 = HealthBarDefinition.Entity_unpackID(var43.tag);
if (var7 != 4 && var7 != 5) {
@@ -444,7 +444,7 @@ public class ScriptFrame {
}
if (var9 == 2) {
GameObject var44 = CollisionMap.scene.method4180(class391.Client_plane, var3, var4);
GameObject var44 = CollisionMap.scene.getGameObject(class391.Client_plane, var3, var4);
if (var7 == 11) {
var7 = 10;
}