Skip to content
This repository was archived by the owner on Apr 9, 2023. It is now read-only.

Commit 6564cf5

Browse files
author
Vatuu
committed
Changed back from getters/setters, since JNA is crying.
1 parent 109a073 commit 6564cf5

5 files changed

Lines changed: 30 additions & 41 deletions

File tree

RPCTest/src/main/java/Main.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public static void main(String[] args){
3939
System.out.println("Unknown Command.");
4040
}
4141
DiscordRichPresence rich = new DiscordRichPresence();
42-
rich.setState("Running Test | Private");
43-
rich.setDetails("Score = " + score);
42+
rich.state = "Running Test | Private";
43+
rich.details = "Score = " + score;
4444
DiscordRPC.discordUpdatePresence(rich);
4545
ready = true;
4646
}
@@ -67,16 +67,16 @@ private static String getInput() {
6767

6868
private static void initDiscord(){
6969
DiscordEventHandlers handlers = new DiscordEventHandlers();
70-
handlers.setReady(new Ready());
70+
handlers.ready = new Ready();
7171
DiscordRPC.discordInitialize("415885161457123338", handlers, true);
7272
}
7373

7474
private static class Ready implements ReadyCallback{
7575
public void apply(){
7676
System.out.println("Ready.");
7777
DiscordRichPresence rich = new DiscordRichPresence();
78-
rich.setState("Running Test | Private");
79-
rich.setDetails("Score = 0");
78+
rich.state = "Running Test | Private";
79+
rich.details = "Score = 0";
8080
DiscordRPC.discordUpdatePresence(rich);
8181
ready = true;
8282
}

discord-rpc.iml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@
1111
</content>
1212
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1313
<orderEntry type="sourceFolder" forTests="false" />
14-
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
1514
<orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.5.1" level="project" />
1615
<orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
1716
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
1817
<orderEntry type="library" name="Maven: com.github.Vatuu:discord-rpc-binaries:3.0.0" level="project" />
19-
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.18" level="project" />
2018
</component>
2119
</module>

pom.xml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>net.arikia.dev</groupId>
55
<artifactId>discord-rpc</artifactId>
66
<name>DiscordRPC</name>
7-
<version>1.2</version>
7+
<version>1.2.1</version>
88
<packaging>jar</packaging>
99

1010
<properties>
@@ -29,22 +29,19 @@
2929
<groupId>commons-io</groupId>
3030
<artifactId>commons-io</artifactId>
3131
<version>2.5</version>
32+
<scope>compile</scope>
3233
</dependency>
3334
<dependency>
3435
<groupId>commons-lang</groupId>
3536
<artifactId>commons-lang</artifactId>
3637
<version>2.6</version>
38+
<scope>compile</scope>
3739
</dependency>
3840
<dependency>
3941
<groupId>com.github.Vatuu</groupId>
4042
<artifactId>discord-rpc-binaries</artifactId>
4143
<version>3.0.0</version>
42-
</dependency>
43-
<dependency>
44-
<groupId>org.projectlombok</groupId>
45-
<artifactId>lombok</artifactId>
46-
<version>1.16.18</version>
47-
<scope>provided</scope>
44+
<scope>compile</scope>
4845
</dependency>
4946
</dependencies>
5047

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package net.arikia.dev.drpc;
22

33
import com.sun.jna.Structure;
4-
import lombok.Data;
5-
import lombok.Getter;
6-
import lombok.Setter;
74
import net.arikia.dev.drpc.callbacks.*;
85

96
import java.util.Arrays;
@@ -15,7 +12,6 @@
1512
*
1613
*
1714
*/
18-
@Data
1915
public class DiscordEventHandlers extends Structure {
2016

2117
@Override
@@ -26,10 +22,10 @@ public List<String> getFieldOrder(){
2622
/**
2723
* Callback called when Discord-RPC was initialized successfully.
2824
*/
29-
private ReadyCallback ready;
30-
private DisconnectedCallback disconnected;
31-
private ErroredCallback errored;
32-
private JoinGameCallback joinGame;
33-
private SpectateGameCallback spectateGame;
34-
private JoinRequestCallback joinRequest;
25+
public ReadyCallback ready;
26+
public DisconnectedCallback disconnected;
27+
public ErroredCallback errored;
28+
public JoinGameCallback joinGame;
29+
public SpectateGameCallback spectateGame;
30+
public JoinRequestCallback joinRequest;
3531
}

src/main/java/net/arikia/dev/drpc/DiscordRichPresence.java

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package net.arikia.dev.drpc;
22

33
import com.sun.jna.Structure;
4-
import lombok.Data;
54

65
import java.util.Arrays;
76
import java.util.List;
@@ -12,7 +11,6 @@
1211
*
1312
*
1413
*/
15-
@Data
1614
public class DiscordRichPresence extends Structure {
1715

1816
/*
@@ -42,74 +40,74 @@ public List<String> getFieldOrder(){
4240
/**
4341
* State of the player's current party.
4442
*/
45-
private String state;
43+
public String state;
4644

4745
/**
4846
* Details to the current game-session of the player.
4947
*/
50-
private String details;
48+
public String details;
5149
/**
5250
* unix timestamp for the start of the game
5351
*/
54-
private long startTimestamp;
52+
public long startTimestamp;
5553

5654
/**
5755
* Unix timestamp for when the game will end
5856
*/
59-
private long endTimestamp;
57+
public long endTimestamp;
6058

6159
/**
6260
* Name of the uploaded image for the large profile artwork.
6361
*/
64-
private String largeImageKey;
62+
public String largeImageKey;
6563

6664
/**
6765
* Tooltip for the largeImageKey
6866
*/
69-
private String largeImageText;
67+
public String largeImageText;
7068

7169
/**
7270
* Name of the uploaded image for the small profile artwork.
7371
*/
74-
private String smallImageKey;
72+
public String smallImageKey;
7573

7674
/**
7775
* Tooltip for the smallImageKey
7876
*/
79-
private String smallImageText;
77+
public String smallImageText;
8078

8179
/**
8280
* Id of the player's party, lobby, or group.
8381
*/
84-
private String partyId;
82+
public String partyId;
8583

8684
/**
8785
* Current size of the player's party, lobby, or group.
8886
*/
89-
private int partySize;
87+
public int partySize;
9088

9189
/**
9290
* Maximum size of the player's party, lobby, or group.
9391
*/
94-
private int partyMax;
92+
public int partyMax;
9593

9694
/**
9795
* Unique hashed string for Spectate and Join.
9896
*/
99-
private String matchSecret;
97+
public String matchSecret;
10098

10199
/**
102100
* Unique hashed string for Spectate button.
103101
*/
104-
private String spectateSecret;
102+
public String spectateSecret;
105103

106104
/**
107105
* Unique hashed string for chat invitations and Ask to Join.
108106
*/
109-
private String joinSecret;
107+
public String joinSecret;
110108

111109
/**
112110
* Marks the matchSecret as a game session with a specific beginning and end.
113111
*/
114-
private int instance;
112+
public int instance;
115113
}

0 commit comments

Comments
 (0)