Skip to content

Commit 0241704

Browse files
SeanOMikSeanOMik
committed
Modify the GUI a bit to make it easier to move around in
1 parent 0c24e0b commit 0241704

File tree

11 files changed

+93
-288
lines changed

11 files changed

+93
-288
lines changed

‎dependency-reduced-pom.xml‎

Lines changed: 13 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>net.seanomik</groupId>
55
<artifactId>energeticstorage</artifactId>
66
<name>EnergeticStorage</name>
7-
<version>0.1-SNAPSHOT</version>
7+
<version>0.4-SNAPSHOT</version>
88
<build>
99
<defaultGoal>clean package</defaultGoal>
1010
<resources>
@@ -27,38 +27,22 @@
2727
<version>3.1.0</version>
2828
<executions>
2929
<execution>
30+
<id>shade</id>
3031
<phase>package</phase>
3132
<goals>
3233
<goal>shade</goal>
3334
</goals>
3435
<configuration>
35-
<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.15.2_\plugins\EnergeticStorage-MC-v1.15.X-v${project.version}.jar</outputFile>
36-
<createDependencyReducedPom>false</createDependencyReducedPom>
36+
<relocations>
37+
<relocation>
38+
<pattern>de.tr7zw.changeme.nbtapi</pattern>
39+
<shadedPattern>de.tr7zw.nbtapi.energeticstorage</shadedPattern>
40+
</relocation>
41+
</relocations>
3742
</configuration>
3843
</execution>
3944
</executions>
4045
</plugin>
41-
<plugin>
42-
<artifactId>maven-shade-plugin</artifactId>
43-
<version>3.2.1</version>
44-
<executions>
45-
<execution>
46-
<id>shade</id>
47-
<phase>package</phase>
48-
<goals>
49-
<goal>shade</goal>
50-
</goals>
51-
</execution>
52-
</executions>
53-
<configuration>
54-
<relocations>
55-
<relocation>
56-
<pattern>de.tr7zw.changeme.nbtapi</pattern>
57-
<shadedPattern>de.tr7zw.nbtapi</shadedPattern>
58-
</relocation>
59-
</relocations>
60-
</configuration>
61-
</plugin>
6246
</plugins>
6347
</build>
6448
<repositories>
@@ -75,42 +59,21 @@
7559
<url>https://repo.codemc.org/repository/maven-public/</url>
7660
</repository>
7761
<repository>
78-
<id>maven-repository</id>
79-
<url>file:///${project.basedir}/maven-repository</url>
62+
<id>jitpack.io</id>
63+
<url>https://jitpack.io</url>
8064
</repository>
8165
</repositories>
8266
<dependencies>
8367
<dependency>
8468
<groupId>org.spigotmc</groupId>
85-
<artifactId>spigot-api</artifactId>
86-
<version>1.15.2-R0.1-SNAPSHOT</version>
69+
<artifactId>spigot</artifactId>
70+
<version>1.14-R0.1-SNAPSHOT</version>
8771
<scope>provided</scope>
88-
<exclusions>
89-
<exclusion>
90-
<artifactId>commons-lang</artifactId>
91-
<groupId>commons-lang</groupId>
92-
</exclusion>
93-
<exclusion>
94-
<artifactId>guava</artifactId>
95-
<groupId>com.google.guava</groupId>
96-
</exclusion>
97-
<exclusion>
98-
<artifactId>gson</artifactId>
99-
<groupId>com.google.code.gson</groupId>
100-
</exclusion>
101-
<exclusion>
102-
<artifactId>bungeecord-chat</artifactId>
103-
<groupId>net.md-5</groupId>
104-
</exclusion>
105-
<exclusion>
106-
<artifactId>snakeyaml</artifactId>
107-
<groupId>org.yaml</groupId>
108-
</exclusion>
109-
</exclusions>
11072
</dependency>
11173
</dependencies>
11274
<properties>
11375
<java.version>1.8</java.version>
11476
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11577
</properties>
11678
</project>
79+

‎pom.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>net.seanomik</groupId>
88
<artifactId>energeticstorage</artifactId>
9-
<version>0.4-SNAPSHOT</version>
9+
<version>0.4.1-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

1212
<name>EnergeticStorage</name>
@@ -47,10 +47,12 @@
4747
</relocation>
4848
</relocations>
4949

50-
<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.14.4_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>
50+
<!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.14.4_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
5151
<!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.15.2_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
5252
<!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.1_\plugins\EnergeticStorage-MC-v${project.version}.jar</outputFile>-->
5353
<!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.2_\plugins\EnergeticStorage-MC-v${project.version}.jar</outputFile>-->
54+
<!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_PAPER_1.16.1_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>-->
55+
<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_PAPER_1.16.2_\plugins\EnergeticStorage-v${project.version}.jar</outputFile>
5456
</configuration>
5557
</execution>
5658
</executions>
@@ -99,7 +101,7 @@
99101
<dependency>
100102
<groupId>com.github.WesJD.AnvilGUI</groupId>
101103
<artifactId>anvilgui</artifactId>
102-
<version>ef71db62ec</version>
104+
<version>master-cee0befbaf-1</version>
103105
</dependency>
104106
</dependencies>
105107
</project>

‎src/main/java/net/seanomik/energeticstorage/EnergeticStorage.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ private void registerCommands() {
3939

4040
private void registerListener() {
4141
getServer().getPluginManager().registerEvents(Reference.ES_TERMINAL_GUI, this);
42-
getServer().getPluginManager().registerEvents(Reference.ES_SYSTEM_GUI, this);
4342
getServer().getPluginManager().registerEvents(Reference.ES_DRIVE_GUI, this);
4443
getServer().getPluginManager().registerEvents(Reference.ES_SYSTEM_SECURITY_GUI, this);
4544
getServer().getPluginManager().registerEvents(new PlayerInteractListener(), this);

‎src/main/java/net/seanomik/energeticstorage/gui/ESDriveGUI.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public void onInventoryClick(InventoryClickEvent event) {
180180
case SWAP:
181181
break;
182182
case SHIFT_IN:
183-
if (Utils.isItemValid(clickedItem)) {
183+
if (Utils.isItemValid(clickedItem) && Utils.isItemADrive(clickedItem)) {
184184
event.setCancelled(true);
185185

186186
// Add the item into the player's inventory
@@ -199,7 +199,7 @@ public void onInventoryClick(InventoryClickEvent event) {
199199
break;
200200
case INTO_HALF:
201201
case INTO:
202-
if (Utils.isItemValid(cursor)) {
202+
if (Utils.isItemValid(cursor) && Utils.isItemADrive(cursor)) {
203203
NBTItem clickedNBT = new NBTItem(cursor);
204204

205205
if (clickedNBT.hasKey("ES_Drive") && clickedNBT.getBoolean("ES_Drive")) {
@@ -214,17 +214,18 @@ public void onInventoryClick(InventoryClickEvent event) {
214214
case SHIFT_OUT:
215215
case OUT_HALF:
216216
case OUT:
217-
if (slot == 0) {
217+
if (slot == 0) { // Back button.
218218
player.closeInventory();
219219

220-
Reference.ES_SYSTEM_GUI.initializeItems(player, esSystem);
221-
Reference.ES_SYSTEM_GUI.openInventory(player, esSystem);
220+
Reference.ES_TERMINAL_GUI.openInventory(player, esSystem);
222221
} else if (slot != 1 && slot != 7 && slot != 8) {
223-
event.setCancelled(false);
222+
if (Utils.isItemADrive(cursor)) {
223+
event.setCancelled(false);
224224

225-
List<ESDrive> drives = esSystem.getESDrives();
226-
drives.remove(slot - 2);
227-
esSystem.setESDrives(drives);
225+
List<ESDrive> drives = esSystem.getESDrives();
226+
drives.remove(slot - 2);
227+
esSystem.setESDrives(drives);
228+
}
228229
}
229230
break;
230231
case INVENTORY_CLICK:

0 commit comments

Comments
 (0)