Push forward

This commit is contained in:
2026-07-14 15:09:17 +08:00
parent dd3efffa76
commit c6819e3329
92 changed files with 207 additions and 207 deletions
@@ -38,7 +38,7 @@ import java.util.logging.Level;
@SuppressWarnings("unused")
public class KaiijuEntityLimits {
private static final Logger LOGGER = LogUtils.getLogger();
private static final File CONFIG_FOLDER = new File("luminol_config");
private static final File CONFIG_FOLDER = new File("shiroha_config");
protected static final String HEADER =
"Per region entity limits for Kaiiju.\n"
@@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull;
import org.leavesmc.leaves.command.RootNode;
public class BarCommand extends RootNode {
private static final String PERM_BASE = "luminol.commands.bar";
private static final String PERM_BASE = "shiroha.commands.bar";
public BarCommand() {
super("bar", PERM_BASE);
@@ -45,6 +45,6 @@ public class MembarConfig implements IConfigModule {
@Override
public void onUnloaded(CommentedFileConfig configInstance) {
Bukkit.getCommandMap().getKnownCommands().remove("luminol:membar");
Bukkit.getCommandMap().getKnownCommands().remove("shiroha:membar");
}
}
@@ -45,6 +45,6 @@ public class RegionBarConfig implements IConfigModule {
@Override
public void onUnloaded(CommentedFileConfig configInstance) {
Bukkit.getCommandMap().getKnownCommands().remove("luminol:regionbar");
Bukkit.getCommandMap().getKnownCommands().remove("shiroha:regionbar");
}
}
@@ -53,6 +53,6 @@ public class TpsBarConfig implements IConfigModule {
@Override
public void onUnloaded(CommentedFileConfig configInstance) {
Bukkit.getCommandMap().getKnownCommands().remove("luminol:tpsbar");
Bukkit.getCommandMap().getKnownCommands().remove("shiroha:tpsbar");
}
}
@@ -10,7 +10,7 @@ import io.nanachiyo0721.shiroha.enums.EnumConfigCategory;
public class LeavesSleepingBlockEntityConfig implements IConfigModule {
@ConfigInfo(name = "enabled", comments = """
Use sleeping blocking optimizations from lithium,\s
on luminol the hopper optimizations of paper were totally removed and replaced by those of lithium\s
on shiroha the hopper optimizations of paper were totally removed and replaced by those of lithium\s
and it's turned on by default""")
@HotReloadUnsupported
public static boolean enabled = true;
@@ -40,5 +40,5 @@ public interface RegionFile extends ChunkSystemRegionFile, AutoCloseable {
default int getRecalculateCount() {
return 0;
} // Luminol - Configurable region file format
} // Shiroha - Configurable region file format
}
@@ -49,7 +49,7 @@ public enum EnumBarType {
}
EnumBarType(Class<? extends TickableStatusBar> clazz, String name, String commandName, String configPath, Supplier<Map<String, Object>> settingsProvider) {
this(clazz, name, commandName, new Pair<>("luminol", configPath), settingsProvider);
this(clazz, name, commandName, new Pair<>("shiroha", configPath), settingsProvider);
}
EnumBarType(Class<? extends TickableStatusBar> clazz, String name, String commandName, @NonNull Pair<String, String> configPath, Supplier<Map<String, Object>> settingsProvider) {
@@ -87,8 +87,8 @@ public class TickableStatusBarList {
public void load(@NonNull ValueInput input) {
final ValueInput statusBarsInput = input
.child("luminol")
.flatMap(luminol -> luminol.child("status_bars"))
.child("shiroha")
.flatMap(shiroha -> shiroha.child("status_bars"))
.orElse(null); // I hate these optionals (x)
// does not have this data
@@ -119,7 +119,7 @@ public class TickableStatusBarList {
public void save(@NonNull ValueOutput output) {
final ValueOutput statusBarsOutput = output
.child("luminol")
.child("shiroha")
.child("status_bars");
for (Map.Entry<EnumBarType, TickableStatusBar> barEntry : this.managedBars.entrySet()) {
@@ -37,7 +37,7 @@ public class SleepUntilTimeBlockEntityTickInvoker implements TickingBlockEntity
@Override
public void tick() {
//noinspection ConstantConditions
long tickTime = this.sleepingBlockEntity.getLevel().getRedstoneGameTime(); // Luminol - Regionized threading for sleeping block entity
long tickTime = this.sleepingBlockEntity.getLevel().getRedstoneGameTime(); // Shiroha - Regionized threading for sleeping block entity
if (tickTime >= this.sleepUntilTickExclusive) {
((SleepingBlockEntity) this.sleepingBlockEntity).setTicker(this.delegate);
this.delegate.tick();
@@ -65,9 +65,9 @@ public class ChunkSectionInventoryEntityTracker extends ChunkSectionEntityMoveme
return tracker;
}
// Luminol start - region threading for lithium sleeping block entity
// Shiroha start - region threading for lithium sleeping block entity
public boolean hasUser() {
return this.userCount > 0;
}
// Luminol end
// Shiroha end
}
@@ -65,9 +65,9 @@ public class ChunkSectionItemEntityMovementTracker extends ChunkSectionEntityMov
return tracker;
}
// Luminol start - region threading for lithium sleeping block entity
// Shiroha start - region threading for lithium sleeping block entity
public boolean hasUser() {
return this.userCount > 0;
}
// Luminol end
// Shiroha end
}
@@ -23,9 +23,9 @@ import net.minecraft.world.item.ItemStack;
public class ItemOverstackUtils {
public static float getItemStackSignalStrength(int maxStackSize, ItemStack itemStack) {
float result = (float) itemStack.getCount() / Math.min(maxStackSize, itemStack.getMaxStackSize());
/*if (LeavesConfig.modify.oldMC.allowGrindstoneOverstacking && CurseEnchantedBook.isCursedEnchantedBook(itemStack)) { // Luminol
/*if (LeavesConfig.modify.oldMC.allowGrindstoneOverstacking && CurseEnchantedBook.isCursedEnchantedBook(itemStack)) { // Shiroha
return result;
}*/ // Luminol
}*/ // Shiroha
return Math.clamp(result, 0f, 1f);
}
}