Skip to content
This repository was archived by the owner on May 27, 2024. It is now read-only.

Commit 984a1d7

Browse files
author
Gregory Mitchell
authored
Update to v1.8.3 (#122)
2 parents c2a9b2c + 5cbc31d commit 984a1d7

29 files changed

Lines changed: 78 additions & 23 deletions

File tree

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ With the freedom to have your own symbols, icons, conversion rates, and even int
3636
- Fix 1.20.2 Errors
3737
- Update Lamp to v3.1.7
3838
- Fix Command Errors
39+
- **v1.8.3**
40+
- Fix various SQL and SQL-Conversion related errors
41+
- Fix Business Setting Serializability Errors
42+
- Fix NBT Product Errors
43+
- Fix Natural Increase sounds being played when not enabled
3944

4045
### 👔 1.7.0 Update: Cunning Corporations
4146
- New Features

api/src/main/java/us/teaminceptus/novaconomy/api/settings/Settings.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,12 @@ public static final class Business<T> implements NovaSetting<T>, Serializable {
224224
private static final long serialVersionUID = -7174484717138758485L;
225225

226226
private final String key;
227-
private final Supplier<T> defaultValue;
227+
private final T defaultValue;
228228
private final String dKey;
229229
private final Set<T> possibleValues;
230230
private final Class<T> clazz;
231231

232-
private Business(String key, String dKey, Class<T> clazz, Supplier<T> defaultValue, Set<T> possibleValues) {
232+
private Business(String key, String dKey, Class<T> clazz, T defaultValue, Set<T> possibleValues) {
233233
this.key = key;
234234
this.dKey = dKey;
235235
this.defaultValue = defaultValue;
@@ -238,20 +238,20 @@ private Business(String key, String dKey, Class<T> clazz, Supplier<T> defaultVal
238238
}
239239

240240
private static <T extends Enum<T>> Business<T> ofEnum(String key, String dKey, Class<T> clazz, T defaultValue) {
241-
return new Business<>(key, dKey, clazz, () -> defaultValue, ImmutableSet.copyOf(defaultValue.getDeclaringClass().getEnumConstants()));
241+
return new Business<>(key, dKey, clazz, defaultValue, ImmutableSet.copyOf(defaultValue.getDeclaringClass().getEnumConstants()));
242242
}
243243

244244
private static Business<Boolean> ofBoolean(String key, String dKey, boolean defaultValue) {
245-
return new Business<>(key, dKey, Boolean.class, () -> defaultValue, ImmutableSet.of(true, false));
245+
return new Business<>(key, dKey, Boolean.class, defaultValue, ImmutableSet.of(true, false));
246246
}
247247

248248
private static Business<Boolean> ofBoolean(String key, String dKey, Supplier<Boolean> defaultValue) {
249-
return new Business<>(key, dKey, Boolean.class, defaultValue, ImmutableSet.of(true, false));
249+
return new Business<>(key, dKey, Boolean.class, defaultValue.get(), ImmutableSet.of(true, false));
250250
}
251251

252252
@Override
253253
public T getDefaultValue() {
254-
return defaultValue.get();
254+
return defaultValue;
255255
}
256256

257257
@Override

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ plugins {
1111
}
1212

1313
val pGroup = "us.teaminceptus.novaconomy"
14-
val pVersion = "1.8.2-SNAPSHOT"
14+
val pVersion = "1.8.3-SNAPSHOT"
1515
val pAuthor = "Team-Inceptus"
1616

1717
sonarqube {

nms/1_10_R1/src/main/java/us/teaminceptus/novaconomy/v1_10_R1/NBTWrapper1_10_R1.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ public void set(String key, Product product) {
166166
novaconomy.set(key, productT);
167167
tag.set(ROOT, novaconomy);
168168
nmsitem.setTag(tag);
169+
item = CraftItemStack.asBukkitCopy(nmsitem);
169170
}
170171

171172
}

nms/1_11_R1/src/main/java/us/teaminceptus/novaconomy/v1_11_R1/NBTWrapper1_11_R1.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ public void set(String key, Product product) {
166166
novaconomy.set(key, productT);
167167
tag.set(ROOT, novaconomy);
168168
nmsitem.setTag(tag);
169+
item = CraftItemStack.asBukkitCopy(nmsitem);
169170
}
170171

171172
}

nms/1_12_R1/src/main/java/us/teaminceptus/novaconomy/v1_12_R1/NBTWrapper1_12_R1.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ public void set(String key, Product product) {
166166
novaconomy.set(key, productT);
167167
tag.set(ROOT, novaconomy);
168168
nmsitem.setTag(tag);
169+
item = CraftItemStack.asBukkitCopy(nmsitem);
169170
}
170171

171172
}

nms/1_13_R1/src/main/java/us/teaminceptus/novaconomy/v1_13_R1/NBTWrapper1_13_R1.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ public void set(String key, Product product) {
164164
novaconomy.set(key, productT);
165165
tag.set(ROOT, novaconomy);
166166
nmsitem.setTag(tag);
167+
item = CraftItemStack.asBukkitCopy(nmsitem);
167168
}
168169

169170
}

nms/1_13_R2/src/main/java/us/teaminceptus/novaconomy/v1_13_R2/NBTWrapper1_13_R2.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ public void set(String key, Product product) {
164164
novaconomy.set(key, productT);
165165
tag.set(ROOT, novaconomy);
166166
nmsitem.setTag(tag);
167+
item = CraftItemStack.asBukkitCopy(nmsitem);
167168
}
168169

169170
}

nms/1_14_R1/src/main/java/us/teaminceptus/novaconomy/v1_14_R1/NBTWrapper1_14_R1.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ public void set(String key, Product product) {
164164
novaconomy.set(key, productT);
165165
tag.set(ROOT, novaconomy);
166166
nmsitem.setTag(tag);
167+
item = CraftItemStack.asBukkitCopy(nmsitem);
167168
}
168169

169170
}

nms/1_15_R1/src/main/java/us/teaminceptus/novaconomy/v1_15_R1/NBTWrapper1_15_R1.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ public void set(String key, Product product) {
164164
novaconomy.set(key, productT);
165165
tag.set(ROOT, novaconomy);
166166
nmsitem.setTag(tag);
167+
item = CraftItemStack.asBukkitCopy(nmsitem);
167168
}
168169

169170
}

0 commit comments

Comments
 (0)