Skip to content

Commit 5e6cd33

Browse files
committed
fix: mysql issues
1 parent bd494b5 commit 5e6cd33

File tree

4 files changed

+5
-45
lines changed

4 files changed

+5
-45
lines changed

src/main/java/me/refracdevelopment/simplegems/managers/configuration/ConfigFile.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ public boolean getBoolean(String path) {
7171
return super.getBoolean(path, true);
7272
}
7373

74-
public String getString(String path, boolean check) {
75-
return super.getString(path, "String at path '" + path + "' not found.").replace("|", "\u2503");
76-
}
77-
7874
@Override
7975
public String getString(String path) {
8076
return super.getString(path, "String at path '" + path + "' not found.").replace("|", "\u2503");

src/main/java/me/refracdevelopment/simplegems/managers/data/MySQLManager.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,10 @@ public void createTable(String name, String info) {
9292
new Thread(() -> {
9393
try (Connection resource = getConnection(); PreparedStatement statement = resource.prepareStatement("CREATE TABLE IF NOT EXISTS " + name + "(" + info + ");")) {
9494
statement.execute();
95-
statement.closeOnCompletion();
9695
} catch (SQLException exception) {
9796
RyMessageUtils.sendConsole(true, "An error occurred while creating database table " + name + ".");
9897
exception.printStackTrace();
99-
} finally {
100-
Thread.currentThread().interrupt();
10198
}
102-
103-
Thread.currentThread().interrupt();
10499
}).start();
105100
}
106101

@@ -117,16 +112,11 @@ public void execute(String query, Object... values) {
117112
statement.setObject((i + 1), values[i]);
118113

119114
statement.execute();
120-
statement.closeOnCompletion();
121115
} catch (SQLException exception) {
122116
RyMessageUtils.sendConsole(true, "An error occurred while executing an update on the database.");
123117
RyMessageUtils.sendConsole(true, "MySQL#execute : " + query);
124118
exception.printStackTrace();
125-
} finally {
126-
Thread.currentThread().interrupt();
127119
}
128-
129-
Thread.currentThread().interrupt();
130120
}).start();
131121
}
132122

@@ -144,16 +134,11 @@ public void select(String query, SelectCall callback, Object... values) {
144134
statement.setObject((i + 1), values[i]);
145135

146136
callback.call(statement.executeQuery());
147-
statement.closeOnCompletion();
148137
} catch (SQLException exception) {
149138
RyMessageUtils.sendConsole(true, "An error occurred while executing a query on the database.");
150139
RyMessageUtils.sendConsole(true, "MySQL#select : " + query);
151140
exception.printStackTrace();
152-
} finally {
153-
Thread.currentThread().interrupt();
154141
}
155-
156-
Thread.currentThread().interrupt();
157142
}).start();
158143
}
159144

src/main/java/me/refracdevelopment/simplegems/managers/data/SQLiteManager.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ public void createTable(String name, String info) {
8686
new Thread(() -> {
8787
try (Connection resource = getConnection(); PreparedStatement statement = resource.prepareStatement("CREATE TABLE IF NOT EXISTS " + name + "(" + info + ");")) {
8888
statement.execute();
89-
statement.closeOnCompletion();
9089
} catch (SQLException exception) {
9190
RyMessageUtils.sendConsole(true, "An error occurred while creating database table " + name + ".");
9291
exception.printStackTrace();
@@ -107,16 +106,11 @@ public void execute(String query, Object... values) {
107106
statement.setObject((i + 1), values[i]);
108107

109108
statement.execute();
110-
statement.closeOnCompletion();
111109
} catch (SQLException exception) {
112110
RyMessageUtils.sendConsole(true, "An error occurred while executing an update on the database.");
113111
RyMessageUtils.sendConsole(true, "SQLite#execute : " + query);
114112
exception.printStackTrace();
115-
} finally {
116-
Thread.currentThread().interrupt();
117113
}
118-
119-
Thread.currentThread().interrupt();
120114
}).start();
121115
}
122116

@@ -134,16 +128,11 @@ public void select(String query, SelectCall callback, Object... values) {
134128
statement.setObject((i + 1), values[i]);
135129

136130
callback.call(statement.executeQuery());
137-
statement.closeOnCompletion();
138131
} catch (SQLException exception) {
139132
RyMessageUtils.sendConsole(true, "An error occurred while executing a query on the database.");
140133
RyMessageUtils.sendConsole(true, "SQLite#select : " + query);
141134
exception.printStackTrace();
142-
} finally {
143-
Thread.currentThread().interrupt();
144135
}
145-
146-
Thread.currentThread().interrupt();
147136
}).start();
148137
}
149138

src/main/java/me/refracdevelopment/simplegems/utilities/menu/Menu.java

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package me.refracdevelopment.simplegems.utilities.menu;
22

3+
import me.refracdevelopment.simplegems.utilities.ItemBuilder;
34
import me.refracdevelopment.simplegems.utilities.Methods;
4-
import me.refracdevelopment.simplegems.utilities.chat.RyMessageUtils;
55
import me.refracdevelopment.simplegems.utilities.exceptions.MenuManagerException;
66
import me.refracdevelopment.simplegems.utilities.exceptions.MenuManagerNotSetupException;
77
import org.bukkit.Bukkit;
@@ -11,10 +11,6 @@
1111
import org.bukkit.inventory.Inventory;
1212
import org.bukkit.inventory.InventoryHolder;
1313
import org.bukkit.inventory.ItemStack;
14-
import org.bukkit.inventory.meta.ItemMeta;
15-
16-
import java.util.Arrays;
17-
import java.util.stream.Collectors;
1814

1915
/*
2016
Defines the behavior and attributes of all menus in our plugin
@@ -101,17 +97,11 @@ public void setFillerGlass(ItemStack itemStack) {
10197
* @return The constructed ItemStack object
10298
*/
10399
public ItemStack makeItem(Material material, String displayName, String... lore) {
100+
ItemBuilder item = new ItemBuilder(material);
101+
item.setName(displayName);
102+
item.setLore(lore);
104103

105-
ItemStack item = new ItemStack(material);
106-
ItemMeta itemMeta = item.getItemMeta();
107-
assert itemMeta != null;
108-
itemMeta.setDisplayName(RyMessageUtils.translate(displayName));
109-
110-
//Automatically translate color codes provided
111-
itemMeta.setLore(Arrays.stream(lore).map(RyMessageUtils::translate).collect(Collectors.toList()));
112-
item.setItemMeta(itemMeta);
113-
114-
return item;
104+
return item.toItemStack();
115105
}
116106

117107
}

0 commit comments

Comments
 (0)