Skip to content

Commit 355bc44

Browse files
noahbclarksonnoahbclarkson
committed
Added GUIShop Economy coversion
+ Added GUIShop Economy conversion + Added option to add increased buy value weight when converting GUIShop to Auto-Tune + Properly format when converting economies. + Added another page to the shop + Updated to 0.10.2
1 parent ed9dd49 commit 355bc44

File tree

7 files changed

+191
-46
lines changed

7 files changed

+191
-46
lines changed

‎Auto-Tune/dependency-reduced-pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>unprotesting.com.github</groupId>
55
<artifactId>Auto-Tune</artifactId>
66
<name>Auto-Tune</name>
7-
<version>0.10.1</version>
7+
<version>0.10.2</version>
88
<description>The automatic pricing plugin for minecraft</description>
99
<url>https://github.com/Unprotesting/Auto-Tune</url>
1010
<issueManagement>

‎Auto-Tune/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<!-- Project information -->
1010
<groupId>unprotesting.com.github</groupId>
1111
<artifactId>Auto-Tune</artifactId>
12-
<version>0.10.1</version>
12+
<version>0.10.2</version>
1313
<!-- Info -->
1414
<name>Auto-Tune</name>
1515
<url>https://github.com/Unprotesting/Auto-Tune</url>

‎Auto-Tune/src/resources/config.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,11 @@ debug-enabled: false
132132
checksum-header-bypass: false
133133

134134
## Use another economies shop settings for prices (don't change this without deleting data.db and resetting)
135-
## Options: Default | Essentials
135+
## This will convert the shops file from another economy to a compatible Auto-Tune shops.yml
136+
## Options: Default | Essentials | GUIShop
136137
## Instructions for use: Turn this on, stop your server, delete data.db, start server, available data-transfers will appear in shops.yml, reset this option to default and restart your server again
137-
economy-shop-config: 'default'
138+
## Remove GUI-Shop once done to avoid incompatiability errors
139+
economy-shop-config: 'default'
140+
141+
## Percentage value sell prices have on new price when converting GUIShop to Auto-Tune
142+
shop-config-guishop-sell-value: 20.00

‎Auto-Tune/src/unprotesting/com/github/Commands/AutoTuneGUIShopUserCommand.java

Lines changed: 86 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131

3232
public class AutoTuneGUIShopUserCommand implements CommandExecutor {
3333

34-
static DecimalFormat df2 = new DecimalFormat("###,###,###,##0.00");
34+
public static DecimalFormat df1 = new DecimalFormat("###########0.00");
35+
public static DecimalFormat df2 = new DecimalFormat("###,###,###,##0.00");
3536
static DecimalFormat df3 = new DecimalFormat("###,###,###,##0.00000");
3637

3738
public Economy economy = Main.getEconomy();
@@ -74,6 +75,7 @@ public void loadGUIMAIN(Player player, CommandSender senderpub) {
7475
StaticPane pageTwo = new StaticPane(1, 1, 7, menuRows - 2);
7576
StaticPane pageThree = new StaticPane(1, 1, 7, menuRows - 2);
7677
StaticPane pageFour = new StaticPane(1, 1, 7, menuRows - 2);
78+
StaticPane pageFive = new StaticPane(1, 1, 7, menuRows - 2);
7779
StaticPane back = new StaticPane(0, menuRows - 1, 1, 1);
7880
StaticPane forward = new StaticPane(8, menuRows - 1, 1, 1);
7981

@@ -95,6 +97,10 @@ public void loadGUIMAIN(Player player, CommandSender senderpub) {
9597
pageAmount = 5;
9698
pane.addPane(3, pageFour);
9799
}
100+
if (size > paneSize * 4) {
101+
pageAmount = 6;
102+
pane.addPane(4, pageFive);
103+
}
98104

99105
final Integer finalPageAmount = pageAmount;
100106

@@ -131,6 +137,9 @@ public void loadGUIMAIN(Player player, CommandSender senderpub) {
131137
if (finalPageAmount == 5) {
132138
pane.setPage(4);
133139
}
140+
if (finalPageAmount == 6) {
141+
pane.setPage(5);
142+
}
134143
gui.update();
135144
playernew.setItemOnCursor(null);
136145
event.setCancelled(true);
@@ -156,115 +165,142 @@ public void loadGUIMAIN(Player player, CommandSender senderpub) {
156165
if (i<7) {
157166
pageOne.addItem(a, i, 0);
158167
}
159-
if (i >= 7 && i<14) {
168+
else if (i >= 7 && i<14) {
160169
pageOne.addItem(a, i - 7, 1);
161170
}
162-
if (i >= 14 && i<21) {
171+
else if (i >= 14 && i<21) {
163172
pageTwo.addItem(a, i - 14, 0);
164173
}
165-
if (i >= 21 && i<28) {
174+
else if (i >= 21 && i<28) {
166175
pageTwo.addItem(a, i - 21, 1);
167176
}
168-
if (i >= 28 && i<35) {
177+
else if (i >= 28 && i<35) {
169178
pageThree.addItem(a, i - 28, 0);
170179
}
171-
if (i >= 35 && i<42) {
180+
else if (i >= 35 && i<42) {
172181
pageThree.addItem(a, i - 35, 1);
173182
}
174-
if (i >= 42 && i<49) {
183+
else if (i >= 42 && i<49) {
175184
pageFour.addItem(a, i - 42, 0);
176185
}
177-
if (i >= 49 && i<56) {
186+
else if (i >= 49 && i<56) {
178187
pageFour.addItem(a, i - 49, 1);
179188
}
189+
else if (i >= 56 && i<63) {
190+
pageFive.addItem(a, i - 56, 0);
191+
}
192+
else if (i >= 63 && i<70) {
193+
pageFive.addItem(a, i - 63, 1);
194+
}
180195
}
181196
if (Config.getMenuRows() == 5) {
182197
if (i<7) {
183198
pageOne.addItem(a, i, 0);
184199
}
185-
if (i >= 7 && i<14) {
200+
else if (i >= 7 && i<14) {
186201
pageOne.addItem(a, i - 7, 1);
187202
}
188-
if (i >= 14 && i<21) {
203+
else if (i >= 14 && i<21) {
189204
pageOne.addItem(a, i - 14, 2);
190205
}
191-
if (i >= 21 && i<28) {
206+
else if (i >= 21 && i<28) {
192207
pageTwo.addItem(a, i - 21, 0);
193208
}
194-
if (i >= 28 && i<35) {
209+
else if (i >= 28 && i<35) {
195210
pageTwo.addItem(a, i - 28, 1);
196211
}
197-
if (i >= 35 && i<42) {
212+
else if (i >= 35 && i<42) {
198213
pageTwo.addItem(a, i - 35, 2);
199214
}
200-
if (i >= 42 && i<49) {
215+
else if (i >= 42 && i<49) {
201216
pageThree.addItem(a, i - 42, 0);
202217
}
203-
if (i >= 49 && i<56) {
218+
else if (i >= 49 && i<56) {
204219
pageThree.addItem(a, i - 49, 1);
205220
}
206-
if (i >= 56 && i<63) {
221+
else if (i >= 56 && i<63) {
207222
pageThree.addItem(a, i - 56, 2);
208223
}
209-
if (i >= 63 && i<70) {
224+
else if (i >= 63 && i<70) {
210225
pageFour.addItem(a, i - 63, 0);
211226
}
212-
if (i >= 70 && i<77) {
227+
else if (i >= 70 && i<77) {
213228
pageFour.addItem(a, i - 70, 1);
214229
}
215-
if (i >= 77 && i<84) {
230+
else if (i >= 77 && i<84) {
216231
pageFour.addItem(a, i - 77, 2);
217232
}
233+
else if (i >= 84 && i<91) {
234+
pageFive.addItem(a, i - 84, 0);
235+
}
236+
else if (i >= 91 && i<98) {
237+
pageFive.addItem(a, i - 91, 1);
238+
}
239+
else if (i >= 98 && i<105) {
240+
pageFive.addItem(a, i - 98, 2);
241+
}
218242
}
219243
if (Config.getMenuRows() == 6) {
220244
if (i<7) {
221245
pageOne.addItem(a, i, 0);
222246
}
223-
if (i >= 7 && i<14) {
247+
else if (i >= 7 && i<14) {
224248
pageOne.addItem(a, i - 7, 1);
225249
}
226-
if (i >= 14 && i<21) {
250+
else if (i >= 14 && i<21) {
227251
pageOne.addItem(a, i - 14, 2);
228252
}
229-
if (i >= 21 && i<28) {
253+
else if (i >= 21 && i<28) {
230254
pageOne.addItem(a, i - 21, 3);
231255
}
232-
if (i >= 28 && i<35) {
256+
else if (i >= 28 && i<35) {
233257
pageTwo.addItem(a, i - 28, 0);
234258
}
235-
if (i >= 35 && i<42) {
259+
else if (i >= 35 && i<42) {
236260
pageTwo.addItem(a, i - 35, 1);
237261
}
238-
if (i >= 42 && i<49) {
262+
else if (i >= 42 && i<49) {
239263
pageTwo.addItem(a, i - 42, 2);
240264
}
241-
if (i >= 49 && i<56) {
265+
else if (i >= 49 && i<56) {
242266
pageTwo.addItem(a, i - 49, 3);
243267
}
244-
if (i >= 56 && i<63) {
268+
else if (i >= 56 && i<63) {
245269
pageThree.addItem(a, i - 56, 0);
246270
}
247-
if (i >= 63 && i<70) {
271+
else if (i >= 63 && i<70) {
248272
pageThree.addItem(a, i - 63, 1);
249273
}
250-
if (i >= 70 && i<77) {
274+
else if (i >= 70 && i<77) {
251275
pageThree.addItem(a, i - 70, 2);
252276
}
253-
if (i >= 77 && i<84) {
277+
else if (i >= 77 && i<84) {
254278
pageThree.addItem(a, i - 77, 3);
255279
}
256-
if (i >= 84 && i<91) {
280+
else if (i >= 84 && i<91) {
257281
pageFour.addItem(a, i - 84, 0);
258282
}
259-
if (i >= 91 && i<98) {
283+
else if (i >= 91 && i<98) {
260284
pageFour.addItem(a, i - 91, 1);
261285
}
262-
if (i >= 98 && i<105) {
286+
else if (i >= 98 && i<105) {
263287
pageFour.addItem(a, i - 98, 2);
264288
}
265-
if (i >= 105 && i<112) {
289+
else if (i >= 105 && i<112) {
266290
pageFour.addItem(a, i - 105, 3);
267291
}
292+
else if (i >= 112 && i<119) {
293+
pageFive.addItem(a, i - 112, 0);
294+
}
295+
else if (i >= 119 && i<126) {
296+
pageFive.addItem(a, i - 119, 1);
297+
}
298+
else if (i >= 126 && i<135) {
299+
pageFive.addItem(a, i - 126, 2);
300+
}
301+
else if (i >= 135 && i<142) {
302+
pageFive.addItem(a, i - 135, 3);
303+
}
268304

269305
}
270306

@@ -288,6 +324,13 @@ public void loadGUIMAIN(Player player, CommandSender senderpub) {
288324
pane.addPane(3, pageFour);
289325
pane.addPane(4, SBPane);
290326
}
327+
if (finalPageAmount == 6) {
328+
pane.addPane(1, pageTwo);
329+
pane.addPane(2, pageThree);
330+
pane.addPane(3, pageFour);
331+
pane.addPane(4, pageFive);
332+
pane.addPane(5, SBPane);
333+
}
291334
else {
292335
pane.addPane(1, SBPane);
293336
}
@@ -306,6 +349,11 @@ public void loadGUIMAIN(Player player, CommandSender senderpub) {
306349
imforward.setLore(Arrays.asList(ChatColor.BOLD + "Click to go to the next page"));
307350
isforward.setItemMeta(imforward);
308351

352+
if (pane.getPage() == 0 && finalPageAmount == 6) {
353+
back.setVisible(false);
354+
forward.setVisible(true);
355+
}
356+
309357
if (pane.getPage() == 0 && finalPageAmount == 5) {
310358
back.setVisible(false);
311359
forward.setVisible(true);
@@ -329,6 +377,10 @@ public void loadGUIMAIN(Player player, CommandSender senderpub) {
329377
if (pane.getPage() != 0) {
330378
pane.setPage(pane.getPage() - 1);
331379
}
380+
if (pane.getPage() == 0 && finalPageAmount == 6) {
381+
back.setVisible(false);
382+
forward.setVisible(true);
383+
}
332384
if (pane.getPage() == 0 && finalPageAmount == 5) {
333385
back.setVisible(false);
334386
forward.setVisible(true);

‎Auto-Tune/src/unprotesting/com/github/Main.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,17 @@ public static FileConfiguration saveEssentialsFiles(){
624624
return worthyml;
625625
}
626626

627+
public static FileConfiguration saveGUIShopFiles(){
628+
FileConfiguration shopsyml;
629+
shopsyml = YamlConfiguration.loadConfiguration(new File("plugins/GUIShop/shops.yml"));
630+
try {
631+
shopsyml.save(new File("plugins/GUIShop/", "shops.yml"));
632+
} catch (IOException e) {
633+
plugin.getLogger().warning("Unable to save shops.yml"); // shouldn't really happen
634+
}
635+
return shopsyml;
636+
}
637+
627638
public static void setupDataFiles() {
628639
if (Config.isChecksumHeaderBypass()) {
629640
Main.debugLog("Enabling checksum-header-bypass");

‎Auto-Tune/src/unprotesting/com/github/util/Config.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ public final class Config {
5858
dynamicInflationValue,
5959
inflationValue,
6060
intrestRate,
61-
maxDebt;
61+
maxDebt,
62+
shopConfigGUIShopSellValue;
6263

6364

6465
public static void loadDefaults() {
@@ -104,6 +105,7 @@ public static void loadDefaults() {
104105
Config.setIntrestRate(Main.getMainConfig().getDouble("intrest-rate", 0.001));
105106
Config.setMaxDebt(Main.getMainConfig().getDouble("max-debt-value", -1000.00));
106107
Config.setSellPriceDifferenceVariationStart(Main.getMainConfig().getDouble("sell-price-difference-variation-start", 25.0));
108+
Config.setShopConfigGUIShopSellValue(Main.getMainConfig().getDouble("shop-config-guishop-sell-value", 20.00));
107109
}
108110

109111
}

0 commit comments

Comments
 (0)