Skip to content

Commit b15d151

Browse files
committed
Added instantfall logger
just for watching the IF flag
1 parent 2bda7b5 commit b15d151

5 files changed

Lines changed: 63 additions & 1 deletion

File tree

src/main/java/carpet/CarpetServer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import carpet.logging.microtiming.marker.MicroTimingMarkerManager;
1111
import carpet.logging.microtiming.utils.MicroTimingStandardCarpetLogger;
1212
import carpet.logging.phantom.PhantomLogger;
13+
import carpet.logging.instantfall.InstantFallFlagWatcher;
1314
import carpet.network.CarpetServerNetworkHandler;
1415
import carpet.network.tiscm.TISCMServerPacketHandler;
1516
import carpet.script.CarpetScriptServer;
@@ -81,6 +82,7 @@ public static void tick(MinecraftServer server)
8182

8283
MicroTimingMarkerManager.getInstance().tick();
8384
PhantomLogger.getInstance().tick();
85+
InstantFallFlagWatcher.getInstance().tick();
8486
}
8587

8688
public static void registerCarpetCommands(CommandDispatcher<CommandSource> dispatcher)

src/main/java/carpet/logging/LoggerRegistry.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package carpet.logging;
22

33
import carpet.logging.commandblock.CommandBlockLogger;
4+
import carpet.logging.instantfall.InstantFallLogger;
45
import carpet.logging.lifetime.LifeTimeHUDLogger;
56
import carpet.logging.microtiming.utils.MicroTimingStandardCarpetLogger;
67
import carpet.logging.phantom.PhantomLogger;
@@ -46,6 +47,7 @@ public class LoggerRegistry
4647
public static boolean __savestate;
4748
public static boolean __phantom;
4849
public static boolean __threadstone;
50+
public static boolean __instantfall;
4951

5052
public static void initLoggers()
5153
{
@@ -74,6 +76,7 @@ public static void initLoggers()
7476
registerLogger("savestate", new Logger("savestate",null, null));
7577
registerLogger("phantom", PhantomLogger.getInstance().createCarpetLogger());
7678
registerLogger(ThreadstoneLogger.NAME, ThreadstoneLogger.getInstance().createCarpetLogger());
79+
registerLogger(InstantFallLogger.NAME, InstantFallLogger.getInstance().createCarpetLogger());
7780
}
7881

7982
/**
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package carpet.logging.instantfall;
2+
3+
import net.minecraft.block.BlockFalling;
4+
5+
public class InstantFallFlagWatcher
6+
{
7+
private static final InstantFallFlagWatcher INSTANCE = new InstantFallFlagWatcher();
8+
9+
private boolean previousFlag;
10+
11+
private InstantFallFlagWatcher()
12+
{
13+
this.previousFlag = BlockFalling.fallInstantly;
14+
}
15+
16+
public static InstantFallFlagWatcher getInstance() {
17+
return INSTANCE;
18+
}
19+
20+
public void tick()
21+
{
22+
boolean currentFlag = BlockFalling.fallInstantly;
23+
if (currentFlag != this.previousFlag)
24+
{
25+
InstantFallLogger.getInstance().onInstantFallFlagFlipped(currentFlag);
26+
}
27+
this.previousFlag = currentFlag;
28+
}
29+
}
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package carpet.logging.instantfall;
2+
3+
import carpet.logging.AbstractLogger;
4+
import carpet.utils.Messenger;
5+
import net.minecraft.util.text.ITextComponent;
6+
7+
public class InstantFallLogger extends AbstractLogger
8+
{
9+
public static final String NAME = "instantfall";
10+
private static final InstantFallLogger INSTANCE = new InstantFallLogger();
11+
12+
public InstantFallLogger()
13+
{
14+
super(NAME);
15+
}
16+
17+
public static InstantFallLogger getInstance()
18+
{
19+
return INSTANCE;
20+
}
21+
22+
public void onInstantFallFlagFlipped(boolean currentFlag)
23+
{
24+
this.log(() -> new ITextComponent[]{advTr("flag_changed", "InstantFall flag has changed to %s", Messenger.bool(currentFlag))});
25+
}
26+
}

src/main/resources/assets/carpet/lang/zh_cn.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,10 +557,12 @@ logger:
557557
now: '%1$s将从现在起开始生成'
558558
projectiles:
559559
visualized:
560-
info: 可视化投掷物记录器:已可视化%d游戏刻的轨迹
560+
info: 可视化投掷物记录器:已可视化%s游戏刻的轨迹
561561
not_enabled:
562562
.: 可视化投掷物记录器:可视化规则未启用
563563
hint: 点击以启用
564+
instantfall:
565+
flag_changed: 瞬时落沙 flag 已切换为 %s
564566

565567
raid_invalidate_reason:
566568
difficulty_peaceful: 难度被设为和平

0 commit comments

Comments
 (0)