Skip to content

Commit

Permalink
Added instantfall logger
Browse files Browse the repository at this point in the history
just for watching the IF flag
  • Loading branch information
Fallen-Breath committed Mar 15, 2023
1 parent 2bda7b5 commit b15d151
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/main/java/carpet/CarpetServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import carpet.logging.microtiming.marker.MicroTimingMarkerManager;
import carpet.logging.microtiming.utils.MicroTimingStandardCarpetLogger;
import carpet.logging.phantom.PhantomLogger;
import carpet.logging.instantfall.InstantFallFlagWatcher;
import carpet.network.CarpetServerNetworkHandler;
import carpet.network.tiscm.TISCMServerPacketHandler;
import carpet.script.CarpetScriptServer;
Expand Down Expand Up @@ -81,6 +82,7 @@ public static void tick(MinecraftServer server)

MicroTimingMarkerManager.getInstance().tick();
PhantomLogger.getInstance().tick();
InstantFallFlagWatcher.getInstance().tick();
}

public static void registerCarpetCommands(CommandDispatcher<CommandSource> dispatcher)
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/carpet/logging/LoggerRegistry.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package carpet.logging;

import carpet.logging.commandblock.CommandBlockLogger;
import carpet.logging.instantfall.InstantFallLogger;
import carpet.logging.lifetime.LifeTimeHUDLogger;
import carpet.logging.microtiming.utils.MicroTimingStandardCarpetLogger;
import carpet.logging.phantom.PhantomLogger;
Expand Down Expand Up @@ -46,6 +47,7 @@ public class LoggerRegistry
public static boolean __savestate;
public static boolean __phantom;
public static boolean __threadstone;
public static boolean __instantfall;

public static void initLoggers()
{
Expand Down Expand Up @@ -74,6 +76,7 @@ public static void initLoggers()
registerLogger("savestate", new Logger("savestate",null, null));
registerLogger("phantom", PhantomLogger.getInstance().createCarpetLogger());
registerLogger(ThreadstoneLogger.NAME, ThreadstoneLogger.getInstance().createCarpetLogger());
registerLogger(InstantFallLogger.NAME, InstantFallLogger.getInstance().createCarpetLogger());
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package carpet.logging.instantfall;

import net.minecraft.block.BlockFalling;

public class InstantFallFlagWatcher
{
private static final InstantFallFlagWatcher INSTANCE = new InstantFallFlagWatcher();

private boolean previousFlag;

private InstantFallFlagWatcher()
{
this.previousFlag = BlockFalling.fallInstantly;
}

public static InstantFallFlagWatcher getInstance() {
return INSTANCE;
}

public void tick()
{
boolean currentFlag = BlockFalling.fallInstantly;
if (currentFlag != this.previousFlag)
{
InstantFallLogger.getInstance().onInstantFallFlagFlipped(currentFlag);
}
this.previousFlag = currentFlag;
}
}
26 changes: 26 additions & 0 deletions src/main/java/carpet/logging/instantfall/InstantFallLogger.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package carpet.logging.instantfall;

import carpet.logging.AbstractLogger;
import carpet.utils.Messenger;
import net.minecraft.util.text.ITextComponent;

public class InstantFallLogger extends AbstractLogger
{
public static final String NAME = "instantfall";
private static final InstantFallLogger INSTANCE = new InstantFallLogger();

public InstantFallLogger()
{
super(NAME);
}

public static InstantFallLogger getInstance()
{
return INSTANCE;
}

public void onInstantFallFlagFlipped(boolean currentFlag)
{
this.log(() -> new ITextComponent[]{advTr("flag_changed", "InstantFall flag has changed to %s", Messenger.bool(currentFlag))});
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/carpet/lang/zh_cn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -557,10 +557,12 @@ logger:
now: '%1$s将从现在起开始生成'
projectiles:
visualized:
info: 可视化投掷物记录器:已可视化%d游戏刻的轨迹
info: 可视化投掷物记录器:已可视化%s游戏刻的轨迹
not_enabled:
.: 可视化投掷物记录器:可视化规则未启用
hint: 点击以启用
instantfall:
flag_changed: 瞬时落沙 flag 已切换为 %s

raid_invalidate_reason:
difficulty_peaceful: 难度被设为和平
Expand Down

0 comments on commit b15d151

Please sign in to comment.