Compare commits

..

No commits in common. "639d06b01db4b2c1e78d08c2f0aad3822d9c5421" and "9f49f44075d6a9f21888f2375cb39379f47a12fb" have entirely different histories.

5 changed files with 5 additions and 23 deletions

2
.gitignore vendored
View File

@ -118,5 +118,3 @@ run/
!gradle-wrapper.jar
/gradlew
/gradlew.bat
local.gradle

View File

@ -46,8 +46,4 @@ shadowJar {
relocate 'com.sparkjava', 'eu.mhsl.lib.shadow.spark-core'
mergeServiceFiles()
}
if (file("local.gradle").exists()) {
apply from: "local.gradle"
}
}

View File

@ -107,9 +107,6 @@ public class Settings extends Appliance {
.filter(setting -> ((CategorizedSetting) setting).category().equals(category))
.toList();
//skip empty category rows
if(categorizedSettings.isEmpty()) return;
for(int i = 0; i < categorizedSettings.size(); i++) {
int slot = row.get() * 9 + i % 9;
inventory.setItem(slot, categorizedSettings.get(i).buildItem());
@ -142,23 +139,17 @@ public class Settings extends Appliance {
int countOfUncategorized = (int) settings.stream()
.filter(setting -> !(setting instanceof CategorizedSetting))
.count();
int rowsOfUncategorized = (int) Math.ceil((double) countOfUncategorized / 9);
int rowsOfCategorized = Arrays.stream(SettingCategory.values())
return Arrays.stream(SettingCategory.values())
.map(settingCategory -> settings.stream()
.filter(setting -> setting instanceof CategorizedSetting)
.map(setting -> (CategorizedSetting) setting)
.filter(categorizedSetting -> categorizedSetting.category().equals(settingCategory))
.count())
.map(itemCount -> itemCount + countOfUncategorized)
.map(itemCount -> (int) Math.ceil((double) itemCount / 9))
.reduce(Integer::sum)
.orElse(1) * 9;
int rows = rowsOfUncategorized + rowsOfCategorized;
if(rows % 9 != 0) throw new IllegalStateException(
String.format("Failed to calculate settings inventory size. %d is not an multiple of 9", rows)
);
return rows;
}
public void onSettingsClose(Player player) {

View File

@ -66,10 +66,8 @@ public final class Main extends JavaPlugin {
});
Main.logger().info(String.format("Initialized %d appliances!", this.appliances.size()));
if(Configuration.pluginConfig.getBoolean("httpServerEnabled", true)) {
Main.logger().info("Starting HTTP API...");
new HttpServer();
}
Main.logger().info("Starting HTTP API...");
new HttpServer();
this.getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
Main.logger().info("Startup complete!");

View File

@ -1,5 +1,4 @@
plugin:
httpServerEnabled: true
disabledAppliances:
- NameOfApplianceClass