move ops to modules

Coppertine · Jul 5, 2023 · 86cfc7b · 86cfc7b
1 parent 5022200
commit 86cfc7b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/data/b64/functions/math/bitwise/and.mcfunction b/data/b64/functions/math/bitwise/and.mcfunction
@@ -3,7 +3,7 @@
 # Credit: phi
 # https://github.com/MinecraftPhi/MinecraftPhi-modules/tree/master/phi.bitwise/src/datapack/data/phi.bitwise/functions
 from bolt_expressions import Scoreboard
-from ../pow import pow
+from b64:pow import pow
 score = Scoreboard("b64.math")
 # Apparently, phi attmempts to multiply a and b by 2 until it overflows.
 output = score["$output"]

diff --git a/data/b64/functions/math/bitwise/rshift.mcfunction b/data/b64/functions/math/bitwise/rshift.mcfunction
@@ -3,7 +3,7 @@
 # Credit: phi
 # https://github.com/MinecraftPhi/MinecraftPhi-modules/tree/master/phi.bitwise/src/datapack/data/phi.bitwise/functions
 from bolt_expressions import Scoreboard
-from ../pow import pow
+from b64:pow import pow
 score = Scoreboard("b64.math")
 a = score["$a"]
 b = score["$b"]

diff --git a/...b64/functions/math/bitwise/ops.mcfunction → data/b64/modules/ops.bolt b/...b64/functions/math/bitwise/ops.mcfunction → data/b64/modules/ops.bolt
@@ -1,6 +1,5 @@
 from bolt_expressions import Scoreboard
-from ../pow import pow
-import sys
+from b64:pow import pow
 
 score = Scoreboard("b64.math")
 # inputs: $a, $b

diff --git a/data/b64/functions/math/pow.mcfunction → data/b64/modules/pow.bolt b/data/b64/functions/math/pow.mcfunction → data/b64/modules/pow.bolt
@@ -14,12 +14,12 @@ def pow(base, exp):
     _exp = exp
     _result = 1
 
-    if score var _exp matches 1.. function ./exp:
+    if score var _exp matches 1.. function ./math/exp:
         _result *= _base
         _exp -= 1
 
         if score var _exp matches 1..
-            function ./exp
+            function ./math/exp
 
     _output = value["$" + next(identifiers)]
     _output = _result