Remove trade-short and relevant settings

Remove trade-short and relevant settings.

     - Remove trade-short.html/.csv as it's not used often.
     - Remove trade.html settings.
     - Updated to latest 1.18 snapshot.

.classpath

@@ -20,9 +20,9 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/">
-	<accessrules>
-        <accessrule kind="accessible" pattern="**/com/sun/net/**"/>
-    </accessrules>
+		<accessrules>
+        	<accessrule kind="accessible" pattern="**/com/sun/net/**"/>
+    	</accessrules>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/default"/>

build.gradle

@@ -27,7 +27,7 @@ dependencies {
     implementation 'org.apache.httpcomponents:httpclient:4.5.13'
     implementation 'com.github.stefvanschie.inventoryframework:IF:0.10.3'
 
-    compileOnly 'org.spigotmc:spigot-api:1.18-pre5-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.18-R0.1-SNAPSHOT'
     compileOnly 'com.github.MilkBowl:VaultAPI:1.7.1'
     compileOnly 'org.projectlombok:lombok:1.18.22'
     compileOnly 'net.essentialsx:EssentialsX:2.19.0'

src/main/java/unprotesting/com/github/Main.java

@@ -124,7 +124,7 @@ private void checkEconomy(){
 
     public static void setupDataFiles(){
         dataFiles = new DataFiles(INSTANCE.getDataFolder());
-        for (int i = 0; i < 8; i++){
+        for (int i = 0; i < dataFiles.getFileNames().length; i++){
             if (!dataFiles.getFiles()[i].exists()){
                 INSTANCE.saveResource(dataFiles.getFileNames()[i], false);
             }

src/main/java/unprotesting/com/github/commands/TradeCommand.java

@@ -23,13 +23,11 @@ public boolean onCommand(CommandSender sender, Command command, String trade, St
             if (!(player.hasPermission("at.trade") || player.hasPermission("at.admin"))){CommandUtil.noPermission(player);return true;}
             String[] arr = Main.getServerIPStrings();
             player.spigot().sendMessage(createTextComponent(ChatColor.YELLOW + "View Overall Item Prices", "Click to go to " + arr[0], arr[0]));
-            player.spigot().sendMessage(createTextComponent(ChatColor.YELLOW + "View Recent Item Prices", "Click to go to " + arr[1], arr[1]));
             return true;
         }
         else{
             String[] arr = Main.getServerIPStrings();
             Logging.log("Go to: " + arr[0] + " for overall item prices.");
-            Logging.log("Go to: " + arr[1] + " for recent item prices.");
             return true;
         }
     }

src/main/java/unprotesting/com/github/config/Config.java

@@ -17,7 +17,7 @@ public class Config {
  @Getter
  @Setter
  private static Integer port, timePeriod, sellPriceVariationTimePeriod, sellPriceVariationUpdatePeriod, autoSellUpdatePeriod, 
-                         autoSellProfitUpdatePeriod, maximumShortTradeLength, InterestRateUpdateRate,
+                         autoSellProfitUpdatePeriod, InterestRateUpdateRate,
                          tutorialMessagePeriod, updatePricesThreshold;
 
  @Getter
@@ -45,7 +45,6 @@ public static void loadDefaults() {
         Config.setReadFromCSV(getDataFiles().getConfig().getBoolean("read-from-csv", false));
 
         Config.setPort(getDataFiles().getConfig().getInt("port", 8321));
-        Config.setMaximumShortTradeLength(getDataFiles().getConfig().getInt("maximum-short-trade-length", 144));
         Config.setTimePeriod(getDataFiles().getConfig().getInt("time-period", 30));
         Config.setAutoSellUpdatePeriod(getDataFiles().getConfig().getInt("auto-sell-update-period", 20));
         Config.setAutoSellProfitUpdatePeriod(getDataFiles().getConfig().getInt("auto-sell-profit-update-period", 1200));

src/main/java/unprotesting/com/github/config/DataFiles.java

@@ -13,17 +13,17 @@ public class DataFiles {
 
     @Getter
     private File[] files;
-    private final String[] filenames = {"config.yml", "shops.yml", "enchantments.yml", "playerdata.yml", "messages.yml", "web/trade.html", "web/trade-short.html", "web/favicon.ico"};
+    private final String[] filenames = {"config.yml", "shops.yml", "enchantments.yml", "playerdata.yml", "messages.yml", "web/trade.html", "web/favicon.ico"};
     private YamlConfiguration[] configs;
 
     public DataFiles(File dataFolder){
-        this.files = new File[8];
+        this.files = new File[7];
         this.configs = new YamlConfiguration[5];
         for (int i = 0; i < 5; i++){
             this.configs[i] = new YamlConfiguration();
         }
         int i = 0;
-        for (;i < 8; i++){
+        for (;i < files.length; i++){
             File file = new File(dataFolder, filenames[i]);
             files[i] = file;
         }

src/main/java/unprotesting/com/github/data/csv/CSVHandler.java

@@ -17,12 +17,7 @@ public class CSVHandler {
 
     //  Create CSV files with all price, buy and sell data to be read by the webpage
     public static void writeCSV(){
-        try {
-            write("trade", 0);
-            write("trade-short", Config.getMaximumShortTradeLength());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        try {write("trade", 0);} catch (IOException e) {e.printStackTrace();}
     }
 
     //  Create individual CSV file

src/main/java/unprotesting/com/github/events/async/IPCheckEvent.java

@@ -30,11 +30,11 @@ private String[] getIP(){
             hostIP = in.readLine().trim();
         } catch (IOException e) {
             e.printStackTrace();
-            String official_website = "http://autotune.xyz";
-            return new String[] {official_website, official_website};
+            String error = "http://autotune.xyz";
+            return new String[] {error, error};
         }
         String base = "http://" + hostIP + ":" + Config.getPort();
-        String[] output = {base + "/trade.html", base + "/trade-short.html"};
+        String[] output = {base + "/trade.html"};
         return output;
     }
 

src/main/resources/config.yml

@@ -26,10 +26,6 @@ web-server-enabled: true
 ##  Make sure to port-forward and disable firewalls for this port.
 port: 8123
 
-##  The maximum length in data points that the trade-short.html will show (this doesn't affect data)
-##  Info: When the time-period is set to 30, a maximum-short-trade-length of 48 is one day.
-maximum-short-trade-length: 50
-
 ##  Time Period in minutes
 ##  Info: When decreasing or increasing this adjust your volatility settings accordingly
 time-period: 30