refactor code
This commit is contained in:
+1
-1
@@ -1,9 +1,9 @@
|
|||||||
package io.nanachiyo0721.shiroha.commands.bar;
|
package io.nanachiyo0721.shiroha.commands.bar;
|
||||||
|
|
||||||
import io.papermc.paper.command.brigadier.CommandSourceStack;
|
|
||||||
import io.nanachiyo0721.shiroha.commands.bar.sub.ConfigEditCommand;
|
import io.nanachiyo0721.shiroha.commands.bar.sub.ConfigEditCommand;
|
||||||
import io.nanachiyo0721.shiroha.commands.bar.sub.ToggleCommand;
|
import io.nanachiyo0721.shiroha.commands.bar.sub.ToggleCommand;
|
||||||
import io.nanachiyo0721.shiroha.enums.EnumBarType;
|
import io.nanachiyo0721.shiroha.enums.EnumBarType;
|
||||||
|
import io.papermc.paper.command.brigadier.CommandSourceStack;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.leavesmc.leaves.command.CommandNode;
|
import org.leavesmc.leaves.command.CommandNode;
|
||||||
|
|||||||
+3
-3
@@ -6,12 +6,12 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
|
|||||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||||
import com.mojang.brigadier.suggestion.Suggestions;
|
import com.mojang.brigadier.suggestion.Suggestions;
|
||||||
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
|
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
|
||||||
import io.papermc.paper.command.brigadier.CommandSourceStack;
|
|
||||||
import io.papermc.paper.command.brigadier.Commands;
|
|
||||||
import io.papermc.paper.command.brigadier.PaperCommands;
|
|
||||||
import io.nanachiyo0721.shiroha.commands.bar.BarCommand;
|
import io.nanachiyo0721.shiroha.commands.bar.BarCommand;
|
||||||
import io.nanachiyo0721.shiroha.enums.EnumBarType;
|
import io.nanachiyo0721.shiroha.enums.EnumBarType;
|
||||||
import io.nanachiyo0721.shiroha.functions.bars.TickableStatusBarList;
|
import io.nanachiyo0721.shiroha.functions.bars.TickableStatusBarList;
|
||||||
|
import io.papermc.paper.command.brigadier.CommandSourceStack;
|
||||||
|
import io.papermc.paper.command.brigadier.Commands;
|
||||||
|
import io.papermc.paper.command.brigadier.PaperCommands;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.format.TextColor;
|
import net.kyori.adventure.text.format.TextColor;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
|
|||||||
@@ -3,13 +3,13 @@ package io.nanachiyo0721.shiroha.config;
|
|||||||
import com.electronwill.nightconfig.core.UnmodifiableConfig;
|
import com.electronwill.nightconfig.core.UnmodifiableConfig;
|
||||||
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
|
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import io.nanachiyo0721.shiroha.config.flags.*;
|
|
||||||
import io.papermc.paper.threadedregions.RegionizedServer;
|
|
||||||
import io.nanachiyo0721.shiroha.api.config.ShirohaConfigsInstance;
|
|
||||||
import io.nanachiyo0721.shiroha.api.config.ConfigDataPair;
|
import io.nanachiyo0721.shiroha.api.config.ConfigDataPair;
|
||||||
|
import io.nanachiyo0721.shiroha.api.config.ShirohaConfigsInstance;
|
||||||
import io.nanachiyo0721.shiroha.commands.config.ConfigCommand;
|
import io.nanachiyo0721.shiroha.commands.config.ConfigCommand;
|
||||||
|
import io.nanachiyo0721.shiroha.config.flags.*;
|
||||||
import io.nanachiyo0721.shiroha.enums.EnumConfigCategory;
|
import io.nanachiyo0721.shiroha.enums.EnumConfigCategory;
|
||||||
import io.nanachiyo0721.shiroha.utils.ClassScanUtil;
|
import io.nanachiyo0721.shiroha.utils.ClassScanUtil;
|
||||||
|
import io.papermc.paper.threadedregions.RegionizedServer;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|||||||
+1
-1
@@ -7,9 +7,9 @@ import io.nanachiyo0721.shiroha.config.flags.ConfigClassInfo;
|
|||||||
import io.nanachiyo0721.shiroha.config.flags.ConfigInfo;
|
import io.nanachiyo0721.shiroha.config.flags.ConfigInfo;
|
||||||
import io.nanachiyo0721.shiroha.config.flags.DoNotLoad;
|
import io.nanachiyo0721.shiroha.config.flags.DoNotLoad;
|
||||||
import io.nanachiyo0721.shiroha.config.flags.HotReloadUnsupported;
|
import io.nanachiyo0721.shiroha.config.flags.HotReloadUnsupported;
|
||||||
|
import io.nanachiyo0721.shiroha.data.BufferedLinearRegionFileFlusher;
|
||||||
import io.nanachiyo0721.shiroha.enums.EnumConfigCategory;
|
import io.nanachiyo0721.shiroha.enums.EnumConfigCategory;
|
||||||
import io.nanachiyo0721.shiroha.enums.EnumRegionFormat;
|
import io.nanachiyo0721.shiroha.enums.EnumRegionFormat;
|
||||||
import io.nanachiyo0721.shiroha.data.BufferedLinearRegionFileFlusher;
|
|
||||||
import net.minecraft.server.MinecraftServer;
|
import net.minecraft.server.MinecraftServer;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
|||||||
+4
-2
@@ -477,13 +477,15 @@ public class BufferedLinearRegionFile implements io.nanachiyo0721.shiroha.data.R
|
|||||||
|
|
||||||
this.swapFileChannel.close();
|
this.swapFileChannel.close();
|
||||||
} catch (IOException ex) {
|
} catch (IOException ex) {
|
||||||
if (failure == null) failure = ex; else failure.addSuppressed(ex);
|
if (failure == null) failure = ex;
|
||||||
|
else failure.addSuppressed(ex);
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
this.masterFileParser.closeNoLock();
|
this.masterFileParser.closeNoLock();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
if (failure == null) failure = e; else failure.addSuppressed(e);
|
if (failure == null) failure = e;
|
||||||
|
else failure.addSuppressed(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
// finalize
|
// finalize
|
||||||
|
|||||||
+3
-3
@@ -1,12 +1,12 @@
|
|||||||
package io.nanachiyo0721.shiroha.functions.bars.impl;
|
package io.nanachiyo0721.shiroha.functions.bars.impl;
|
||||||
|
|
||||||
import ca.spottedleaf.common.time.TickData;
|
import ca.spottedleaf.common.time.TickData;
|
||||||
import io.papermc.paper.threadedregions.ThreadedRegionizer;
|
|
||||||
import io.papermc.paper.threadedregions.TickRegionScheduler;
|
|
||||||
import io.papermc.paper.threadedregions.TickRegions;
|
|
||||||
import io.nanachiyo0721.shiroha.config.modules.function.RegionBarConfig;
|
import io.nanachiyo0721.shiroha.config.modules.function.RegionBarConfig;
|
||||||
import io.nanachiyo0721.shiroha.enums.EnumStatusBarDisplay;
|
import io.nanachiyo0721.shiroha.enums.EnumStatusBarDisplay;
|
||||||
import io.nanachiyo0721.shiroha.functions.bars.TickableStatusBar;
|
import io.nanachiyo0721.shiroha.functions.bars.TickableStatusBar;
|
||||||
|
import io.papermc.paper.threadedregions.ThreadedRegionizer;
|
||||||
|
import io.papermc.paper.threadedregions.TickRegionScheduler;
|
||||||
|
import io.papermc.paper.threadedregions.TickRegions;
|
||||||
import net.kyori.adventure.bossbar.BossBar;
|
import net.kyori.adventure.bossbar.BossBar;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||||
|
|||||||
+3
-3
@@ -1,12 +1,12 @@
|
|||||||
package io.nanachiyo0721.shiroha.functions.bars.impl;
|
package io.nanachiyo0721.shiroha.functions.bars.impl;
|
||||||
|
|
||||||
import ca.spottedleaf.common.time.TickData;
|
import ca.spottedleaf.common.time.TickData;
|
||||||
import io.papermc.paper.threadedregions.ThreadedRegionizer;
|
|
||||||
import io.papermc.paper.threadedregions.TickRegionScheduler;
|
|
||||||
import io.papermc.paper.threadedregions.TickRegions;
|
|
||||||
import io.nanachiyo0721.shiroha.config.modules.function.TpsBarConfig;
|
import io.nanachiyo0721.shiroha.config.modules.function.TpsBarConfig;
|
||||||
import io.nanachiyo0721.shiroha.enums.EnumStatusBarDisplay;
|
import io.nanachiyo0721.shiroha.enums.EnumStatusBarDisplay;
|
||||||
import io.nanachiyo0721.shiroha.functions.bars.TickableStatusBar;
|
import io.nanachiyo0721.shiroha.functions.bars.TickableStatusBar;
|
||||||
|
import io.papermc.paper.threadedregions.ThreadedRegionizer;
|
||||||
|
import io.papermc.paper.threadedregions.TickRegionScheduler;
|
||||||
|
import io.papermc.paper.threadedregions.TickRegions;
|
||||||
import net.kyori.adventure.bossbar.BossBar;
|
import net.kyori.adventure.bossbar.BossBar;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||||
|
|||||||
@@ -25,12 +25,15 @@ public class Pos {
|
|||||||
public static int getYSize(LevelHeightAccessor view) {
|
public static int getYSize(LevelHeightAccessor view) {
|
||||||
return view.getHeight();
|
return view.getHeight();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getMinY(LevelHeightAccessor view) {
|
public static int getMinY(LevelHeightAccessor view) {
|
||||||
return view.getMinY();
|
return view.getMinY();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getMaxYInclusive(LevelHeightAccessor view) {
|
public static int getMaxYInclusive(LevelHeightAccessor view) {
|
||||||
return view.getMaxY();
|
return view.getMaxY();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getMaxYExclusive(LevelHeightAccessor view) {
|
public static int getMaxYExclusive(LevelHeightAccessor view) {
|
||||||
return view.getMaxY() + 1;
|
return view.getMaxY() + 1;
|
||||||
}
|
}
|
||||||
@@ -66,12 +69,15 @@ public class Pos {
|
|||||||
public static int getNumYSections(LevelHeightAccessor view) {
|
public static int getNumYSections(LevelHeightAccessor view) {
|
||||||
return view.getSectionsCount();
|
return view.getSectionsCount();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getMinYSection(LevelHeightAccessor view) {
|
public static int getMinYSection(LevelHeightAccessor view) {
|
||||||
return view.getMinSectionY();
|
return view.getMinSectionY();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getMaxYSectionInclusive(LevelHeightAccessor view) {
|
public static int getMaxYSectionInclusive(LevelHeightAccessor view) {
|
||||||
return view.getMaxSectionY();
|
return view.getMaxSectionY();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getMaxYSectionExclusive(LevelHeightAccessor view) {
|
public static int getMaxYSectionExclusive(LevelHeightAccessor view) {
|
||||||
return view.getMaxSectionY() + 1;
|
return view.getMaxSectionY() + 1;
|
||||||
}
|
}
|
||||||
@@ -79,6 +85,7 @@ public class Pos {
|
|||||||
public static int fromSectionIndex(LevelHeightAccessor view, int sectionCoord) {
|
public static int fromSectionIndex(LevelHeightAccessor view, int sectionCoord) {
|
||||||
return sectionCoord + SectionYCoord.getMinYSection(view);
|
return sectionCoord + SectionYCoord.getMinYSection(view);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int fromBlockCoord(int blockCoord) {
|
public static int fromBlockCoord(int blockCoord) {
|
||||||
return SectionPos.blockToSectionCoord(blockCoord);
|
return SectionPos.blockToSectionCoord(blockCoord);
|
||||||
}
|
}
|
||||||
@@ -88,12 +95,15 @@ public class Pos {
|
|||||||
public static int getNumYSections(LevelHeightAccessor view) {
|
public static int getNumYSections(LevelHeightAccessor view) {
|
||||||
return view.getSectionsCount();
|
return view.getSectionsCount();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getMinYSectionIndex(LevelHeightAccessor view) {
|
public static int getMinYSectionIndex(LevelHeightAccessor view) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getMaxYSectionIndexInclusive(LevelHeightAccessor view) {
|
public static int getMaxYSectionIndexInclusive(LevelHeightAccessor view) {
|
||||||
return view.getSectionsCount() - 1;
|
return view.getSectionsCount() - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getMaxYSectionIndexExclusive(LevelHeightAccessor view) {
|
public static int getMaxYSectionIndexExclusive(LevelHeightAccessor view) {
|
||||||
return view.getSectionsCount();
|
return view.getSectionsCount();
|
||||||
}
|
}
|
||||||
@@ -102,6 +112,7 @@ public class Pos {
|
|||||||
public static int fromSectionCoord(LevelHeightAccessor view, int sectionCoord) {
|
public static int fromSectionCoord(LevelHeightAccessor view, int sectionCoord) {
|
||||||
return sectionCoord - SectionYCoord.getMinYSection(view);
|
return sectionCoord - SectionYCoord.getMinYSection(view);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int fromBlockCoord(LevelHeightAccessor view, int blockCoord) {
|
public static int fromBlockCoord(LevelHeightAccessor view, int blockCoord) {
|
||||||
return fromSectionCoord(view, SectionPos.blockToSectionCoord(blockCoord));
|
return fromSectionCoord(view, SectionPos.blockToSectionCoord(blockCoord));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user