~

bedrock-dev · Aug 17, 2022 · f50f868 · f50f868
1 parent 1ead766
commit f50f868
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 5 deletions.
diff --git a/src/opts/ActorOpt.cpp b/src/opts/ActorOpt.cpp
@@ -9,6 +9,10 @@
 
 THook(void, "?push@PushableComponent@@QEAAXAEAVActor@@AEBVVec3@@@Z", void *comp, void *a1,
       const Vec3 &v) {
+    if (!trapdoor::mod().actorPush) {
+        original(comp, a1, v);
+        return;
+    }
     if (v != Vec3::ZERO) {
         original(comp, a1, v);
     }

diff --git a/src/opts/HopperOpt.cpp b/src/opts/HopperOpt.cpp
@@ -99,8 +99,15 @@ THook(bool, "?_tryMoveItems@Hopper@@IEAA_NAEAVBlockSource@@AEAVContainer@@AEBVVe
       Hopper *self, BlockSource &bs, Container &fromContainer, Vec3 const &v, int attachedFace,
       bool canPushItems) {
     auto *tHopper = reinterpret_cast<THopper *>(self);
-    // 漏斗矿车直接返回
     if (tHopper->mIsEntity) return original(self, bs, fromContainer, v, attachedFace, canPushItems);
+
+    auto hma = trapdoor::mod().hopper;
+    if (!hma) {
+        return original(self, bs, fromContainer, v, attachedFace, canPushItems);
+    }
+
+    // 漏斗矿车直接返回
+
     auto pos = v.toBlockPos();
     auto aboveBlockPos = pos + BlockPos(0, 1, 0);
     auto &aboveBlock = bs.getBlock(aboveBlockPos);
@@ -144,10 +151,10 @@ THook(bool, "?_tryMoveItems@Hopper@@IEAA_NAEAVBlockSource@@AEAVContainer@@AEBVVe
 // }
 THook(bool, "?_isFullContainer@Hopper@@IEAA_NAEAVBlockSource@@AEAVContainer@@H@Z", Hopper *hopper,
       BlockSource &bs, Container &container, int face) {
-    if (!trapdoor::mod().hopper) {
+    auto hma = trapdoor::mod().hopper;
+    if (!hma) {
         return original(hopper, bs, container, face);
     }
-
     auto sz = container.getSize();
     for (int i = 0; i < sz; i++) {
         auto &item = container.getItem(i);

diff --git a/src/opts/RandomTickOpt.cpp b/src/opts/RandomTickOpt.cpp
@@ -18,6 +18,10 @@
 // }
 
 THook(bool, "?shouldRandomTick@Block@@QEBA_NXZ", Block *block) {
+    if (!trapdoor::mod().randomTick) {
+        return original(block);
+    }
+
     auto id = block->getId();
     /*
      * -378 => minecraft:deepslate

diff --git a/src/opts/RedstoneOpt.cpp b/src/opts/RedstoneOpt.cpp
@@ -66,7 +66,12 @@ struct TCircuitSceneGraph {
 static_assert(sizeof(ComponentItem) == 32);
 
 THook(void, "?removeComponent@CircuitSceneGraph@@AEAAXAEBVBlockPos@@@Z", void *g,
-      const BlockPos &p) {}
+      const BlockPos &p) {
+    if (trapdoor::mod().componentRemove) {
+        return;
+    }
+    original(g, p);
+}
 
 void optPendingRemoves(CircuitSceneGraph *graph) {
     // rmt_ScopedCPUSample(PendingRemoveAll, 0);
@@ -173,6 +178,18 @@ void optPendingRemoves(CircuitSceneGraph *graph) {
 
 THook(void, "?update@CircuitSceneGraph@@QEAAXPEAVBlockSource@@@Z", CircuitSceneGraph *self,
       void *bs) {
-    optPendingRemoves(self);
+    if (trapdoor::mod().componentRemove) {
+        optPendingRemoves(self);
+    }
     original(self, bs);
 }
+
+// THook(void, "?evaluateComponents@CircuitSystem@@AEAAX_N@Z", void *c, bool t) {
+//     if (t) {
+//         rmt_ScopedCPUSample(Evaluate_True, 0);
+//         original(c, t);
+//     } else {
+//         rmt_ScopedCPUSample(Evaluate_False, 0);
+//         original(c, t);
+//     }
+// }