Skip to content

Commit 9f7c3d6

Browse files
poqdavidpoqdavid
committed
Version 1.2
1 parent eab0bb3 commit 9f7c3d6

File tree

10 files changed

+60
-78
lines changed

10 files changed

+60
-78
lines changed

‎build.gradle

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ buildscript {
2727
classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
2828
classpath "org.spongepowered:SpongeGradle:0.11.5"
2929
classpath "gradle.plugin.net.minecrell:licenser:0.4.1"
30+
classpath "net.kyori:blossom:1.+"
3031
}
3132
}
3233

@@ -42,11 +43,22 @@ apply plugin: 'com.github.johnrengelman.shadow'
4243
apply plugin: 'net.minecrell.licenser'
4344
apply plugin: 'org.spongepowered.mixin'
4445
apply plugin: 'org.spongepowered.gradle.plugin'
46+
apply plugin: 'net.kyori.blossom'
4547

4648
group = "${getProjectProperty('m_group')}" as Object
4749
version = "${getProjectProperty('minecraft_version')}-${getProjectProperty('m_major')}.${getProjectProperty('m_minor')}-${getProjectProperty('m_api')}-${getProjectProperty('m_suffix')}" as Object
4850
description = "${getProjectProperty('m_description')}"
4951

52+
blossom {
53+
replaceToken("@version@", "${getProjectProperty('m_major')}.${getProjectProperty('m_minor')}")
54+
replaceToken("@description@", description)
55+
replaceToken("@id@", m_id)
56+
replaceToken("@name@", m_name)
57+
replaceToken("@organization@", m_organization)
58+
replaceToken("@authors@", m_authors)
59+
replaceToken("@url@", m_url)
60+
}
61+
5062
if (System.getenv().BUILD_NUMBER != null) {
5163
version += "+${System.getenv().BUILD_NUMBER}"
5264
}
@@ -110,21 +122,23 @@ configurations {
110122
}
111123

112124
dependencies {
125+
implementation group: 'org.bstats', name: 'bstats-sponge', version: getProjectProperty('bstats')
126+
shadow group: 'org.bstats', name: 'bstats-sponge', version: getProjectProperty('bstats')
127+
113128
minecraft "net.minecraftforge:forge:${getProjectProperty('forgeVersion')}"
129+
114130
implementation("org.spongepowered:spongeapi:${getProjectProperty('spongeapi')}")
115-
compile 'org.spongepowered:mixin:0.8.3-SNAPSHOT'
116-
compile 'org.spongepowered:mixin:0.8.3-SNAPSHOT:processor'
131+
annotationProcessor("org.spongepowered:spongeapi:${getProjectProperty('spongeapi')}")
117132

118-
implementation 'org.spongepowered:mixin:0.8.1-SNAPSHOT'
119-
implementation("javax.validation:validation-api:2.0.1.Final")
120-
compile group: 'commons-io', name: 'commons-io', version: '2.6'
121-
compile group: 'org.bstats', name: 'bstats-sponge', version: '2.2.1'
122-
shadow group: 'org.bstats', name: 'bstats-sponge', version: '2.2.1'
133+
implementation 'org.spongepowered:mixin:0.8.5-SNAPSHOT'
134+
compile 'org.spongepowered:mixin:0.8.5-SNAPSHOT:processor'
123135

124-
annotationProcessor("org.spongepowered:spongeapi:${getProjectProperty('spongeapi')}")
125-
annotationProcessor("org.spongepowered:mixin:0.8.3-SNAPSHOT:processor")
136+
annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT:processor")
137+
138+
implementation("javax.validation:validation-api:2.0.1.Final")
139+
implementation group: 'commons-io', name: 'commons-io', version: '2.6'
126140

127-
implementation files('../NyxCore/build/libs/NyxCore-1.12.2-1.1-S7.3.0-STABLE.jar')
141+
implementation 'io.github.poqdavid.nyx:NyxCore'
128142
}
129143

130144
license {

‎gradle.properties

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,17 @@ m_description=A simple backpack plugin
1818

1919
## Version
2020
m_major=1
21-
m_minor=1
22-
m_api=S7.3.0
21+
m_minor=2
22+
m_api=S7.4
2323
m_suffix=STABLE
2424

2525
## Dependencies
26-
spongeapi=7.3.0
27-
##spongeforge=7.1.6
28-
##spongeforgeServerFolder=run/spongeforge
29-
26+
spongeapi=7.4.+
3027
minecraft_version=1.12.2
3128
forge_rundir=run/forge
32-
forgeVersion=1.12.2-14.23.5.2854
29+
forgeVersion=1.12.2-14.23.5.2860
3330
mappings_channel=snapshot
3431
mappings_version=20180814-1.12
3532

33+
bstats=2.+
3634
validation=1.1.0.Final

‎settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
rootProject.name = 'NyxBackpack'
2+
includeBuild "../NyxCore"

‎src/main/java/io/github/poqdavid/nyx/nyxbackpack/Commands/BackpackCMD.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import io.github.poqdavid.nyx.nyxbackpack.NyxBackpack;
2424
import io.github.poqdavid.nyx.nyxbackpack.Utils.Backpack;
2525
import io.github.poqdavid.nyx.nyxcore.Permissions.BackpackPermission;
26-
import io.github.poqdavid.nyx.nyxcore.Utils.Tools;
26+
import io.github.poqdavid.nyx.nyxcore.Utils.CoreTools;
2727
import org.spongepowered.api.command.CommandException;
2828
import org.spongepowered.api.command.CommandPermissionException;
2929
import org.spongepowered.api.command.CommandResult;
@@ -60,7 +60,7 @@ public static String[] getAlias() {
6060
@Override
6161
public CommandResult execute(CommandSource src, CommandContext args) throws CommandException {
6262
if (src instanceof Player) {
63-
final Player player_cmd_src = Tools.getPlayer(src);
63+
final Player player_cmd_src = CoreTools.getPlayer(src);
6464

6565
if (player_cmd_src.hasPermission(BackpackPermission.COMMAND_BACKPACK_MAIN)) {
6666

‎src/main/java/io/github/poqdavid/nyx/nyxbackpack/Commands/BackpackLockCMD.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
package io.github.poqdavid.nyx.nyxbackpack.Commands;
2222

2323
import io.github.poqdavid.nyx.nyxcore.Permissions.BackpackPermission;
24-
import io.github.poqdavid.nyx.nyxcore.Utils.Tools;
24+
import io.github.poqdavid.nyx.nyxcore.Utils.CoreTools;
2525
import org.spongepowered.api.command.CommandException;
2626
import org.spongepowered.api.command.CommandPermissionException;
2727
import org.spongepowered.api.command.CommandResult;
@@ -33,7 +33,6 @@
3333

3434
import java.util.Optional;
3535

36-
3736
public class BackpackLockCMD implements CommandExecutor {
3837

3938
public BackpackLockCMD() {
@@ -59,17 +58,17 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
5958
if (user_args != null) {
6059
if (args.hasAny("l") || args.hasAny("u")) {
6160
if (args.hasAny("l")) {
62-
if (!Tools.backpackCheckLock(user_args)) {
61+
if (!CoreTools.backpackCheckLock(user_args)) {
6362
this.bpLock(user_args, src);
6463
}
6564
}
6665
if (args.hasAny("u")) {
67-
if (Tools.backpackCheckLock(user_args)) {
66+
if (CoreTools.backpackCheckLock(user_args)) {
6867
this.bpunlock(user_args, src);
6968
}
7069
}
7170
} else {
72-
if (Tools.backpackCheckLock(user_args)) {
71+
if (CoreTools.backpackCheckLock(user_args)) {
7372
this.bpunlock(user_args, src);
7473
} else {
7574
this.bpLock(user_args, src);
@@ -83,15 +82,15 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
8382
}
8483

8584
private void bpLock(User user_args, CommandSource src) {
86-
if (Tools.lockBackpack(user_args, true)) {
85+
if (CoreTools.lockBackpack(user_args, true)) {
8786
src.sendMessage(Text.of("Backpack for " + user_args.getName() + " is now locked"));
8887
} else {
8988
src.sendMessage(Text.of("Backpack lock for " + user_args.getName() + " didn't work"));
9089
}
9190
}
9291

9392
private void bpunlock(User user_args, CommandSource src) {
94-
if (Tools.unlockBackpack(user_args, true)) {
93+
if (CoreTools.unlockBackpack(user_args, true)) {
9594
src.sendMessage(Text.of("Backpack for " + user_args.getName() + " is now unlocked"));
9695
} else {
9796
src.sendMessage(Text.of("Backpack unlock for " + user_args.getName() + " didn't work"));

‎src/main/java/io/github/poqdavid/nyx/nyxbackpack/Commands/CommandManager.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.spongepowered.api.command.spec.CommandSpec;
2727
import org.spongepowered.api.text.Text;
2828

29-
3029
public class CommandManager {
3130

3231
public static CommandSpec helpCmd;

‎src/main/java/io/github/poqdavid/nyx/nyxbackpack/Commands/OpenCMD.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import io.github.poqdavid.nyx.nyxbackpack.NyxBackpack;
2424
import io.github.poqdavid.nyx.nyxbackpack.Utils.Backpack;
2525
import io.github.poqdavid.nyx.nyxcore.Permissions.BackpackPermission;
26-
import io.github.poqdavid.nyx.nyxcore.Utils.Tools;
26+
import io.github.poqdavid.nyx.nyxcore.Utils.CoreTools;
2727
import org.spongepowered.api.command.CommandException;
2828
import org.spongepowered.api.command.CommandPermissionException;
2929
import org.spongepowered.api.command.CommandResult;
@@ -64,7 +64,7 @@ public static String[] getAlias() {
6464
@Override
6565
public CommandResult execute(CommandSource src, CommandContext args) throws CommandException {
6666
if (src instanceof Player) {
67-
final Player player_cmd_src = Tools.getPlayer(src);
67+
final Player player_cmd_src = CoreTools.getPlayer(src);
6868
final Optional<User> user = args.getOne("user");
6969
User user_args = null;
7070
if (user.isPresent()) {

‎src/main/java/io/github/poqdavid/nyx/nyxbackpack/NyxBackpack.java

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import io.github.poqdavid.nyx.nyxcore.NyxCore;
2626
import io.github.poqdavid.nyx.nyxcore.Utils.CText;
2727
import io.github.poqdavid.nyx.nyxcore.Utils.NCLogger;
28-
import io.github.poqdavid.nyx.nyxcore.Utils.Tools;
28+
import io.github.poqdavid.nyx.nyxcore.Utils.CoreTools;
2929
import org.bstats.sponge.Metrics;
3030
import org.slf4j.Logger;
3131
import org.spongepowered.api.Game;
@@ -43,15 +43,14 @@
4343
import org.spongepowered.api.plugin.Dependency;
4444
import org.spongepowered.api.plugin.Plugin;
4545
import org.spongepowered.api.plugin.PluginContainer;
46-
import org.spongepowered.api.service.permission.PermissionDescription;
4746
import org.spongepowered.api.service.permission.PermissionService;
4847

4948
import javax.annotation.Nonnull;
5049
import javax.annotation.Nullable;
5150
import java.nio.file.Path;
5251

5352

54-
@Plugin(id = PluginData.id, name = PluginData.name, version = PluginData.version, description = PluginData.description, url = PluginData.url, authors = {PluginData.author1}, dependencies = {@Dependency(id = "nyxcore", version = "1.1", optional = false)})
53+
@Plugin(id = "nyxbackpack", name = "@name@", version = "@version@", description = "@description@", url = "https://github.com/poqdavid/NyxBackpack", authors = {"@authors@"}, dependencies = {@Dependency(id = "nyxcore", version = "1.5", optional = false)})
5554
public class NyxBackpack {
5655

5756
private static NyxBackpack nyxbackpack;
@@ -71,7 +70,7 @@ public NyxBackpack(Metrics.Factory metricsFactory, @ConfigDir(sharedRoot = true)
7170
this.logger = NyxCore.getInstance().getLogger(CText.get(CText.Colors.BLUE, 1, "Nyx") + CText.get(CText.Colors.MAGENTA, 0, "Backpack"));
7271

7372
this.logger.info(" ");
74-
this.logger.info(CText.get(CText.Colors.MAGENTA, 0, "NyxBackpack") + CText.get(CText.Colors.YELLOW, 0, " v" + io.github.poqdavid.nyx.nyxbackpack.PluginData.version));
73+
this.logger.info(CText.get(CText.Colors.MAGENTA, 0, "@name@") + CText.get(CText.Colors.YELLOW, 0, " v" + this.getVersion()));
7574
this.logger.info("Starting...");
7675
this.logger.info(" ");
7776

@@ -101,7 +100,11 @@ public PluginContainer getPluginContainer() {
101100

102101
@Nonnull
103102
public String getVersion() {
104-
return PluginData.version;
103+
if (this.getPluginContainer().getVersion().isPresent()) {
104+
return this.getPluginContainer().getVersion().get();
105+
} else {
106+
return "@version@";
107+
}
105108
}
106109

107110
@Nonnull
@@ -122,11 +125,11 @@ public void setGame(Game game) {
122125
@Listener
123126
public void onGamePreInit(@Nullable final GamePreInitializationEvent event) {
124127
this.logger.info(" ");
125-
this.logger.info(CText.get(CText.Colors.MAGENTA, 0, "NyxBackpack") + CText.get(CText.Colors.YELLOW, 0, " v" + io.github.poqdavid.nyx.nyxbackpack.PluginData.version));
128+
this.logger.info(CText.get(CText.Colors.MAGENTA, 0, "@name@") + CText.get(CText.Colors.YELLOW, 0, " v" + this.getVersion()));
126129
this.logger.info("Initializing...");
127130
this.logger.info(" ");
128131

129-
Tools.backpackUnlockAll();
132+
CoreTools.backpackUnlockAll();
130133
}
131134

132135
@Listener
@@ -160,15 +163,15 @@ public void onServerStart(GameStartedServerEvent event) {
160163

161164
@Listener
162165
public void onPlayerJoin(ClientConnectionEvent.Join event) {
163-
final Player player = Tools.getPlayer(event.getCause()).get();
164-
Tools.MakeNewBP(player);
166+
final Player player = CoreTools.getPlayer(event.getCause()).get();
167+
CoreTools.MakeNewBP(player);
165168
}
166169

167170
@Listener
168171
public void onGameReload(@Nullable final GameReloadEvent event) {
169172
this.logger.info("Reloading...");
170173

171-
Tools.backpackUnlockAll();
174+
CoreTools.backpackUnlockAll();
172175
this.logger.info("Reloaded!");
173176
}
174177

‎src/main/java/io/github/poqdavid/nyx/nyxbackpack/PluginData.java

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

‎src/main/java/io/github/poqdavid/nyx/nyxbackpack/Utils/Backpack.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import com.google.gson.GsonBuilder;
2626
import com.google.gson.reflect.TypeToken;
2727
import io.github.poqdavid.nyx.nyxbackpack.NyxBackpack;
28-
import io.github.poqdavid.nyx.nyxcore.Utils.Tools;
28+
import io.github.poqdavid.nyx.nyxcore.Utils.CoreTools;
2929
import org.apache.commons.io.FileUtils;
3030
import org.spongepowered.api.entity.living.player.Player;
3131
import org.spongepowered.api.entity.living.player.User;
@@ -91,9 +91,9 @@ private void saveBackpack(User user, Map<String, String> items, NyxBackpack nb)
9191
Gson gson = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
9292

9393
if (items == null || items.isEmpty()) {
94-
Tools.WriteFile(this.backpackFilePath.toFile(), "{}");
94+
CoreTools.WriteFile(this.backpackFilePath.toFile(), "{}");
9595
} else {
96-
Tools.WriteFile(this.backpackFilePath.toFile(), gson.toJson(items));
96+
CoreTools.WriteFile(this.backpackFilePath.toFile(), gson.toJson(items));
9797
}
9898
}
9999

@@ -105,7 +105,7 @@ private Map<String, String> loadStacks(User user) throws Exception {
105105
if (slot.getProperty(SlotIndex.class, "slotindex").isPresent()) {
106106

107107
Integer index = slot.getProperty(SlotIndex.class, "slotindex").get().getValue();
108-
SlotPos slotP = Tools.indexToSP(index);
108+
SlotPos slotP = CoreTools.indexToSP(index);
109109
items.put(slotP.getX() + "," + slotP.getY(), "EMPTY");
110110

111111
if (slot.size() > 0) {
@@ -117,7 +117,7 @@ private Map<String, String> loadStacks(User user) throws Exception {
117117
if (!slot.peek().get().getType().equals(ItemTypes.NONE)) {
118118
try {
119119

120-
items.put(slotP.getX() + "," + slotP.getY(), Tools.ItemStackToBase64(slot.peek().get()));
120+
items.put(slotP.getX() + "," + slotP.getY(), CoreTools.ItemStackToBase64(slot.peek().get()));
121121

122122
} catch (Exception e) {
123123
NyxBackpack.getInstance().getLogger().error("Failed to load a stack data from inventory for this user: " + user.getName() + " SlotPos: " + slotP.getX() + "X," + slotP.getY() + "Y");
@@ -143,7 +143,7 @@ private Map<String, String> loadSlots() throws Exception {
143143
final File file = this.backpackFilePath.toFile();
144144

145145
if (!file.exists()) {
146-
Tools.WriteFile(file, "{}");
146+
CoreTools.WriteFile(file, "{}");
147147
}
148148

149149
Gson gson = new Gson();
@@ -180,7 +180,7 @@ private void loadBackpack(User user, NyxBackpack nb) {
180180
final SlotPos sp = SlotPos.of(Integer.parseInt(entry.getKey().split(",")[0]), Integer.parseInt(entry.getKey().split(",")[1]));
181181
try {
182182
if (!entry.getValue().equals("EMPTY")) {
183-
final ItemStack itemST = Tools.Base64ToItemStack(entry.getValue());
183+
final ItemStack itemST = CoreTools.Base64ToItemStack(entry.getValue());
184184
this.inventory.query(QueryOperationTypes.INVENTORY_PROPERTY.of(sp)).set(itemST);
185185
} else {
186186
this.inventory.query(QueryOperationTypes.INVENTORY_PROPERTY.of(sp)).set(ItemStack.empty());

0 commit comments

Comments
 (0)