Skip to content

Commit

Permalink
Update Build to 29 for prep for next release.
Browse files Browse the repository at this point in the history 
Signed-off-by: creatorfromhell <[email protected]>
  • Loading branch information
@creatorfromhell
creatorfromhell committed Aug 24, 2023
1 parent d2adf18 commit e6c2d67
Show file tree
Hide file tree
Showing 17 changed files with 27 additions and 29 deletions.
2 changes: 1 addition & 1 deletion Bukkit/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@
<parent>
<groupId>net.tnemc</groupId>
<artifactId>TNE</artifactId>
<version>0.1.2.0-Pre-28</version>
<version>0.1.2.0-Pre-29</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
2 changes: 1 addition & 1 deletion Bungee/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,6 @@
<parent>
<groupId>net.tnemc</groupId>
<artifactId>TNE</artifactId>
<version>0.1.2.0-Pre-28</version>
<version>0.1.2.0-Pre-29</version>
</parent>
</project>
2 changes: 1 addition & 1 deletion Core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<parent>
<groupId>net.tnemc</groupId>
<artifactId>TNE</artifactId>
<version>0.1.2.0-Pre-28</version>
<version>0.1.2.0-Pre-29</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion Core/src/net/tnemc/core/TNECore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public abstract class TNECore {
public static final String coreURL = "https://tnemc.net/files/module-version.xml";
public static final Pattern UUID_MATCHER_PATTERN = Pattern.compile("(\\w{8})(\\w{4})(\\w{4})(\\w{4})(\\w{12})");
public static final String version = "0.1.2.0";
public static final String build = "Pre-28";
public static final String build = "Pre-29";

/* Core non-final variables utilized within TNE as settings */
protected File directory;
Expand Down
10 changes: 5 additions & 5 deletions Core/src/net/tnemc/core/currency/format/impl/MinorNameRule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ public String format(@Nullable Account account, HoldingsEntry entry, String form
/*
[15:52:47 WARN]: java.lang.NullPointerException: Cannot invoke "java.lang.CharSequence.toString()" because "replacement" is null
[15:52:47 WARN]: at java.base/java.lang.String.replace(String.java:2956)
[15:52:47 WARN]: at BukkitCore-0.1.2.0-Pre-28.jar//net.tnemc.core.currency.format.impl.MinorNameRule.lambda$format$0(MinorNameRule.java:42)
[15:52:47 WARN]: at BukkitCore-0.1.2.0-Pre-29.jar//net.tnemc.core.currency.format.impl.MinorNameRule.lambda$format$0(MinorNameRule.java:42)
[15:52:47 WARN]: at java.base/java.util.Optional.map(Optional.java:260)
[15:52:47 WARN]: at BukkitCore-0.1.2.0-Pre-28.jar//net.tnemc.core.currency.format.impl.MinorNameRule.format(MinorNameRule.java:42)
[15:52:47 WARN]: at BukkitCore-0.1.2.0-Pre-28.jar//net.tnemc.core.currency.format.CurrencyFormatter.format(CurrencyFormatter.java:77)
[15:52:47 WARN]: at BukkitCore-0.1.2.0-Pre-28.jar//net.tnemc.core.command.MoneyCommand.onSet(MoneyCommand.java:299)
[15:52:47 WARN]: at BukkitCore-0.1.2.0-Pre-28.jar//net.tnemc.bukkit.command.MoneyCommand.onSet(MoneyCom
[15:52:47 WARN]: at BukkitCore-0.1.2.0-Pre-29.jar//net.tnemc.core.currency.format.impl.MinorNameRule.format(MinorNameRule.java:42)
[15:52:47 WARN]: at BukkitCore-0.1.2.0-Pre-29.jar//net.tnemc.core.currency.format.CurrencyFormatter.format(CurrencyFormatter.java:77)
[15:52:47 WARN]: at BukkitCore-0.1.2.0-Pre-29.jar//net.tnemc.core.command.MoneyCommand.onSet(MoneyCommand.java:299)
[15:52:47 WARN]: at BukkitCore-0.1.2.0-Pre-29.jar//net.tnemc.bukkit.command.MoneyCommand.onSet(MoneyCom
*/

final Optional<Currency> currency = entry.currency();
Expand Down
2 changes: 0 additions & 2 deletions Core/src/net/tnemc/core/currency/loader/DefaultCurrencyLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,6 @@ public boolean loadCurrency(final File directory, File curDirectory) {
final UUID check = UUID.nameUUIDFromBytes(identifier.getBytes(StandardCharsets.UTF_8));
if(cur.contains("Info.UUID")) {

System.out.println("UUIDASID: " + uuidAsId);

final UUID id = (uuidAsId && !cur.getString("Info.UUID").equalsIgnoreCase(check.toString()))? check : UUID.fromString(cur.getString("Info.UUID"));


Expand Down
2 changes: 1 addition & 1 deletion FabricCore/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies {

// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"

compileOnly(group:'net.tnemc', name: 'TNE', version: '0.1.2.0-Pre-28')
compileOnly(group:'net.tnemc', name: 'TNE', version: '0.1.2.0-Pre-29')
compileOnly(group:'net.tnemc', name: 'TNML-CORE', version: '1.0-SNAPSHOT-18')
}

Expand Down
2 changes: 1 addition & 1 deletion FabricCore/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ org.gradle.parallel=true
# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.19.4
tne_version=0.1.2.0-Pre-28
tne_version=0.1.2.0-Pre-29
yarn_mappings=1.19.4+build.2
loader_version=0.14.19

Expand Down
6 changes: 3 additions & 3 deletions Folia/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
<dependency>
<groupId>net.tnemc</groupId>
<artifactId>EconomyCore</artifactId>
<version>0.1.2.0-Pre-28</version>
<version>0.1.2.0-Pre-29</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand All @@ -186,7 +186,7 @@
<dependency>
<groupId>net.tnemc</groupId>
<artifactId>BukkitCore</artifactId>
<version>0.1.2.0-Pre-28</version>
<version>0.1.2.0-Pre-29</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -220,7 +220,7 @@
<parent>
<groupId>net.tnemc</groupId>
<artifactId>TNE</artifactId>
<version>0.1.2.0-Pre-28</version>
<version>0.1.2.0-Pre-29</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
4 changes: 2 additions & 2 deletions PaperCore/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
<dependency>
<groupId>net.tnemc</groupId>
<artifactId>EconomyCore</artifactId>
<version>0.1.2.0-Pre-28</version>
<version>0.1.2.0-Pre-29</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -261,7 +261,7 @@
<parent>
<groupId>net.tnemc</groupId>
<artifactId>TNE</artifactId>
<version>0.1.2.0-Pre-28</version>
<version>0.1.2.0-Pre-29</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
2 changes: 1 addition & 1 deletion Sponge/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
<parent>
<groupId>net.tnemc</groupId>
<artifactId>TNE</artifactId>
<version>0.1.2.0-Pre-28</version>
<version>0.1.2.0-Pre-29</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
2 changes: 1 addition & 1 deletion Sponge/resources/META-INF/sponge_plugins.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"license": "AGPL",
"global": {
"version": "0.1.2.0-Pre-28",
"version": "0.1.2.0-Pre-29",
"links": {
"homepage": "https://tnemc.net",
"source": "https://github.com/TheNewEconomy/EconomyCore",
Expand Down
2 changes: 1 addition & 1 deletion Sponge8/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
<parent>
<groupId>net.tnemc</groupId>
<artifactId>TNE</artifactId>
<version>0.1.2.0-Pre-28</version>
<version>0.1.2.0-Pre-29</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
2 changes: 1 addition & 1 deletion Sponge8/resources/META-INF/sponge_plugins.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"license": "AGPL",
"global": {
"version": "0.1.2.0-Pre-28",
"version": "0.1.2.0-Pre-29",
"links": {
"homepage": "https://tnemc.net",
"source": "https://github.com/TheNewEconomy/EconomyCore",
Expand Down
8 changes: 4 additions & 4 deletions Sponge8/src/net/tnemc/sponge/impl/SpongeServerProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,12 @@ public AbstractItemStack<?> stackBuilder() {
public void saveResource(String resourcePath, boolean replace) {
if (resourcePath != null && !resourcePath.equals("")) {
resourcePath = resourcePath.replace('\\', '/');
LogProvider logger = SpongeCore.log();
final LogProvider logger = SpongeCore.log();
InputStream in = this.getResource(resourcePath);
if (in == null) {
throw new IllegalArgumentException("The embedded resource '" + resourcePath + "' cannot be found in the jar.");
} else {
File outFile = new File(SpongeCore.directory(), resourcePath);
final File outFile = new File(SpongeCore.directory(), resourcePath);
int lastIndex = resourcePath.lastIndexOf(47);
File outDir = new File(SpongeCore.directory(), resourcePath.substring(0, lastIndex >= 0 ? lastIndex : 0));
if (!outDir.exists()) {
Expand All @@ -241,8 +241,8 @@ public void saveResource(String resourcePath, boolean replace) {

try {
if (outFile.exists() && !replace) {
Level var10001 = Level.WARNING;
String var10002 = outFile.getName();
final Level var10001 = Level.WARNING;
final String var10002 = outFile.getName();
//logger.log(var10001, "Could not save " + var10002 + " to " + outFile + " because " + outFile.getName() + " already exists.");
} else {
OutputStream out = new FileOutputStream(outFile);
Expand Down
4 changes: 2 additions & 2 deletions Velocity/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@
<dependency>
<groupId>net.tnemc</groupId>
<artifactId>BungeeCore</artifactId>
<version>0.1.2.0-Pre-28</version>
<version>0.1.2.0-Pre-29</version>
<scope>compile</scope>
</dependency>
</dependencies>

<parent>
<groupId>net.tnemc</groupId>
<artifactId>TNE</artifactId>
<version>0.1.2.0-Pre-28</version>
<version>0.1.2.0-Pre-29</version>
</parent>
</project>
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.tnemc</groupId>
<artifactId>TNE</artifactId>
<version>0.1.2.0-Pre-28</version>
<version>0.1.2.0-Pre-29</version>
<packaging>pom</packaging>
<name>The New Economy</name>

Expand Down

0 comments on commit e6c2d67

Please sign in to comment.