Skip to content

Commit c78d6db

Browse files
chsamichsami
committed
Merge remote-tracking branch 'origin/development' into development
2 parents 8793468 + cffa513 commit c78d6db

212 files changed

Lines changed: 15946 additions & 9366 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/manual_nightly.yml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
parameter:
77
description: branch
88

9+
env:
10+
version: "1.9.7"
11+
912
jobs:
1013
build:
1114
runs-on: ubuntu-latest # You can choose a different runner if needed
@@ -19,15 +22,22 @@ jobs:
1922
ref: development
2023
fetch-depth: 0
2124

25+
- name: Force sync with latest development
26+
run: |
27+
git fetch origin development
28+
git checkout development
29+
git reset --hard origin/development
30+
2231
- name: Set up JDK 11
2332
uses: actions/setup-java@v3
2433
with:
2534
distribution: temurin
2635
java-version: 11
2736

2837
- name: Build Shaded JAR
29-
run: mvn clean package
30-
38+
run: |
39+
COMMIT_SHA=$(git rev-parse --short HEAD)
40+
mvn clean package -Dmicrobot.commit.sha=$COMMIT_SHA
3141
3242
- name: Create Release
3343
uses: "marvinpinto/action-automatic-releases@latest"
@@ -57,7 +67,7 @@ jobs:
5767
<settings>
5868
<servers>
5969
<server>
60-
<id>microbot-release</id>
70+
<id>microbot-nightly</id>
6171
<username>${{ secrets.NEXUS_USER }}</username>
6272
<password>${{ secrets.NEXUS_PASSWORD }}</password>
6373
</server>
@@ -66,4 +76,4 @@ jobs:
6676
EOL
6777
6878
- name: Deploy to Nexus
69-
run: mvn deploy:deploy-file -DgroupId=com.microbot -DartifactId=client -Dversion=1.9.6.1 -Dpackaging=jar -Dfile=runelite-client/target/microbot-1.9.6.1.jar -DrepositoryId=microbot-release -Durl=http://138.201.81.246:8081/repository/microbot-release/
79+
run: mvn deploy:deploy-file -DgroupId=com.microbot -DartifactId=client -Dversion=$version -Dpackaging=jar -Dfile=runelite-client/target/microbot-$version.jar -DrepositoryId=microbot-nightly -Durl=https://nexus.microbot.cloud/repository/microbot-nightly/

‎.github/workflows/nightly.yml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
schedule:
55
- cron: "0 0 * * *"
66

7+
env:
8+
version: "1.9.7"
9+
710
jobs:
811
build:
912
runs-on: ubuntu-latest # You can choose a different runner if needed
@@ -15,7 +18,12 @@ jobs:
1518
with:
1619
# Specify the branch you want
1720
ref: development
18-
fetch-depth: 0
21+
22+
- name: Force sync with latest development
23+
run: |
24+
git fetch origin development
25+
git checkout development
26+
git reset --hard origin/development
1927
2028
- name: Set up JDK 11
2129
uses: actions/setup-java@v3
@@ -24,8 +32,9 @@ jobs:
2432
java-version: 11
2533

2634
- name: Build Shaded JAR
27-
run: mvn clean package
28-
35+
run: |
36+
COMMIT_SHA=$(git rev-parse --short HEAD)
37+
mvn clean package -Dmicrobot.commit.sha=$COMMIT_SHA
2938
3039
- name: Create Release
3140
uses: "marvinpinto/action-automatic-releases@latest"
@@ -54,7 +63,7 @@ jobs:
5463
<settings>
5564
<servers>
5665
<server>
57-
<id>microbot-release</id>
66+
<id>microbot-nightly</id>
5867
<username>${{ secrets.NEXUS_USER }}</username>
5968
<password>${{ secrets.NEXUS_PASSWORD }}</password>
6069
</server>
@@ -63,4 +72,4 @@ jobs:
6372
EOL
6473
6574
- name: Deploy to Nexus
66-
run: mvn deploy:deploy-file -DgroupId=com.microbot -DartifactId=client -Dversion=1.9.6.1 -Dpackaging=jar -Dfile=runelite-client/target/microbot-1.9.6.1.jar -DrepositoryId=microbot-release -Durl=http://138.201.81.246:8081/repository/microbot-release/
75+
run: mvn deploy:deploy-file -DgroupId=com.microbot -DartifactId=client -Dversion=$version -Dpackaging=jar -Dfile=runelite-client/target/microbot-$version.jar -DrepositoryId=microbot-nightly -Durl=https://nexus.microbot.cloud/repository/microbot-nightly/

‎.github/workflows/nightly_artifact_release.yml‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎.github/workflows/release.yml‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
branches:
55
- main
66

7+
env:
8+
version: "1.9.7"
9+
710
jobs:
811
build:
912
runs-on: ubuntu-latest # You can choose a different runner if needed
@@ -21,16 +24,17 @@ jobs:
2124
java-version: 11
2225

2326
- name: Build Shaded JAR
24-
run: mvn clean package
25-
27+
run: |
28+
COMMIT_SHA=$(git rev-parse --short HEAD)
29+
mvn clean package -Dmicrobot.commit.sha=$COMMIT_SHA
2630
2731
- name: Create Release
2832
uses: "marvinpinto/action-automatic-releases@latest"
2933
with:
3034
repo_token: "${{ secrets.GITHUB_TOKEN }}"
31-
automatic_release_tag: "1.9.6.1"
35+
automatic_release_tag: "$version"
3236
prerelease: false
33-
title: "Release 1.9.6.1"
37+
title: "Release $version"
3438
files: |
3539
/home/runner/work/Microbot/Microbot/runelite-client/target/microbot-*.jar
3640
@@ -43,3 +47,22 @@ jobs:
4347
source: runelite-client/target/microbot-*.jar
4448
target: /var/www/files/releases/microbot/stable/
4549
strip_components: 2
50+
51+
- name: Set up Maven settings
52+
run: |
53+
mkdir -p ~/.m2
54+
cat > ~/.m2/settings.xml <<EOL
55+
<settings>
56+
<servers>
57+
<server>
58+
<id>microbot-release</id>
59+
<username>${{ secrets.NEXUS_USER }}</username>
60+
<password>${{ secrets.NEXUS_PASSWORD }}</password>
61+
</server>
62+
</servers>
63+
</settings>
64+
EOL
65+
66+
- name: Deploy to Nexus
67+
run: mvn deploy:deploy-file -DgroupId=com.microbot -DartifactId=client -Dversion=$version -Dpackaging=jar -Dfile=runelite-client/target/microbot-$version.jar -DrepositoryId=microbot-release -Durl=https://nexus.microbot.cloud/repository/microbot-release/
68+

‎cache/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<groupId>net.runelite</groupId>
3131
<artifactId>runelite-parent</artifactId>
32-
<version>1.11.12-SNAPSHOT</version>
32+
<version>1.11.13-SNAPSHOT</version>
3333
</parent>
3434

3535
<artifactId>cache</artifactId>

‎cache/src/main/java/net/runelite/cache/CollisionMapDumper.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,8 @@ private enum Exclusion {
373373

374374
DARKMEYER_CELL_DOOR_38014(38014),
375375

376+
DEATH_PLATEAU_ROCKS(38848, FlagMap.TILE_DEFAULT),
377+
376378
DESERT_MINING_CAMP_PRISON_DOOR_2689(2689),
377379

378380
DIGSITE_GATE_24560(24560),

‎cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public class ModelDefinition
3535
public transient float[][] faceTextureVCoordinates;
3636
public short[] texturePrimaryColors;
3737
public short[] faceTextures;
38+
public byte[] faceZOffsets;
3839
public byte[] textureCoords;
3940
public byte[] textureRenderTypes;
4041

‎cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,12 @@ public class ObjectDefinition
7373
private boolean isRotated = false;
7474
private int varpID = -1;
7575
private int ambientSoundId = -1;
76-
private boolean aBool2111 = false;
76+
private boolean modelClipped = false;
77+
private int soundDistanceFadeCurve;
78+
private int soundFadeInDuration = 300;
79+
private int soundFadeOutDuration = 300;
80+
private int soundFadeInCurve;
81+
private int soundFadeOutCurve;
7782
private int ambientSoundChangeTicksMin = 0;
7883
private int ambientSoundChangeTicksMax = 0;
7984
private boolean blocksProjectile = true;

‎cache/src/main/java/net/runelite/cache/definitions/SequenceDefinition.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public class SequenceDefinition
3838
public int[] chatFrameIds;
3939
public int[] frameLengths;
4040
public int frameStep = -1;
41+
public int verticalOffset;
4142
public int[] interleaveLeave;
4243
public boolean stretches = false;
4344
public int forcedPriority = 5;

‎cache/src/main/java/net/runelite/cache/definitions/loaders/GameValLoader.java‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ public class GameValLoader
4343
public static final int DBTABLES = 10;
4444
public static final int JINGLES = 11;
4545
public static final int SPRITES = 12;
46-
public static final int INTERFACES = 13;
46+
public static final int INTERFACES_LEGACY = 13;
47+
public static final int INTERFACES = 14;
48+
public static final int VARCS = 15;
4749

4850
public GameValDefinition load(int gameValId, int id, byte[] data)
4951
{
@@ -100,6 +102,24 @@ else if (gameValId == 13)
100102
}
101103
}
102104
}
105+
else if (gameValId == 14)
106+
{
107+
var is = new InputStream(data);
108+
109+
v.setName(is.readString());
110+
v.setFiles(new HashMap<>());
111+
112+
for (; ; )
113+
{
114+
int iid = is.readUnsignedShort();
115+
if (iid == 0xFFFF)
116+
{
117+
break;
118+
}
119+
120+
v.getFiles().put(iid, is.readString());
121+
}
122+
}
103123
else
104124
{
105125
v.setName(new String(data, StandardCharsets.UTF_8));

0 commit comments

Comments
 (0)