From 247a1be0e43508e133b1ca38175b8f645460d3fa Mon Sep 17 00:00:00 2001
From: themodernhakr <ehrumsey@gmail.com>
Date: Tue, 25 Feb 2025 23:56:50 -0600
Subject: [PATCH] convert datapack to JMC project

---
 .DS_Store                                     | Bin 0 -> 6148 bytes
 .gitignore                                    |   1 +
 .../function/command/init.mcfunction          |   3 --
 .../function/command/menu_open.mcfunction     |   1 -
 .../command/transport_creative.mcfunction     |   2 +-
 .../function/command/transport_smp.mcfunction |   2 +-
 .../function/command/trigger.mcfunction       |  11 ------
 data/ferdinland/function/load.mcfunction      |   3 --
 data/ferdinland/function/tick.mcfunction      |   4 ---
 data/minecraft/tags/function/load.json        |   4 +--
 data/minecraft/tags/function/tick.json        |   4 +--
 jmc_config.json                               |   7 ++++
 main.hjmc                                     |   5 +++
 main.jmc                                      |   5 +++
 pack.mcmeta                                   |  10 ++----
 src/.DS_Store                                 | Bin 0 -> 6148 bytes
 src/commands.jmc                              |  34 ++++++++++++++++++
 17 files changed, 61 insertions(+), 35 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 .gitignore
 delete mode 100644 data/ferdinland/function/command/init.mcfunction
 delete mode 100644 data/ferdinland/function/command/menu_open.mcfunction
 delete mode 100644 data/ferdinland/function/command/trigger.mcfunction
 delete mode 100644 data/ferdinland/function/load.mcfunction
 delete mode 100644 data/ferdinland/function/tick.mcfunction
 create mode 100644 jmc_config.json
 create mode 100644 main.hjmc
 create mode 100644 main.jmc
 create mode 100644 src/.DS_Store
 create mode 100644 src/commands.jmc

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b27bfb6ea9fe022a09663bd4a32ef7fdc1fe1f76
GIT binary patch
literal 6148
zcmeHK%}T>S5T0!dRs`)qP})nLK<&YMEb%5-=nL33ScR0-wtCJ@@lm{b@K!we0QwN(
z3kV(rzu6tzY^&EIG6S<;GC#YMFJU)BM5b{W*NG}bRE9DZRx$h_>}Oq&f>_pphUZ9n
z^;S3S4;CWT@K+h&cUPhv>d`rkz4vFT$9Z2rjiOGHc3>-i?r%oJho=MIA5Z=5+pCw0
zIsf1+_iYrLNX5D_wP{T4c+^cgX`0|8ni;)fsP>Wf<%^kYt-STV7n2G5>8zOM&GX&q
zoZl;k9x*i)X+%Tn=1UQiUr6<J7Mw3*<9@O`aLY(uzKGiU(X|vQUcZDrE<r^ZPzIEN
zWii0pEu_5WP)B7z8BhkM4DkLCKp8{9%%R;nFxVCVSc2IKuDO@soIo%X%pAf4F)kJ8
zQjN42#-+m^NL(nGIdth{r1>zivXKtO*wrzAV8h9T4s}!plmVZCqPwl|`G5F(|L-U1
zoid;d{3`}bDQZOxJd&KP3lGO<Z2&!ivT$7HaGHV(dlVy<kK%2p71#s50EU8@Ls%gC
NBVcLJK^a&o17DV4X?y?x

literal 0
HcmV?d00001

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..60baa9c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+data/*
diff --git a/data/ferdinland/function/command/init.mcfunction b/data/ferdinland/function/command/init.mcfunction
deleted file mode 100644
index 13a39cf..0000000
--- a/data/ferdinland/function/command/init.mcfunction
+++ /dev/null
@@ -1,3 +0,0 @@
-scoreboard objectives add transportCreative trigger
-scoreboard objectives add transportSMP trigger
-scoreboard objectives add menu trigger
diff --git a/data/ferdinland/function/command/menu_open.mcfunction b/data/ferdinland/function/command/menu_open.mcfunction
deleted file mode 100644
index a30c26e..0000000
--- a/data/ferdinland/function/command/menu_open.mcfunction
+++ /dev/null
@@ -1 +0,0 @@
-guis open menu
diff --git a/data/ferdinland/function/command/transport_creative.mcfunction b/data/ferdinland/function/command/transport_creative.mcfunction
index f59d45e..60d6c7c 100644
--- a/data/ferdinland/function/command/transport_creative.mcfunction
+++ b/data/ferdinland/function/command/transport_creative.mcfunction
@@ -1 +1 @@
-transfer 10.0.0.13 25566 @s
+transfer 10.0.0.13 25566
\ No newline at end of file
diff --git a/data/ferdinland/function/command/transport_smp.mcfunction b/data/ferdinland/function/command/transport_smp.mcfunction
index f8e4965..6c27526 100644
--- a/data/ferdinland/function/command/transport_smp.mcfunction
+++ b/data/ferdinland/function/command/transport_smp.mcfunction
@@ -1 +1 @@
-transfer 10.0.0.13 25565 @s
+transfer 10.0.0.13 25565
\ No newline at end of file
diff --git a/data/ferdinland/function/command/trigger.mcfunction b/data/ferdinland/function/command/trigger.mcfunction
deleted file mode 100644
index 393aa0a..0000000
--- a/data/ferdinland/function/command/trigger.mcfunction
+++ /dev/null
@@ -1,11 +0,0 @@
-scoreboard players enable @a transportCreative 
-execute as @a[scores={transportCreative=1..}] run function ferdinland:command/transport_creative
-scoreboard players set @a transportCreative 0
-
-scoreboard players enable @a transportSMP 
-execute as @a[scores={transportSMP=1..}] run function ferdinland:command/transport_smp
-scoreboard players set @a transportSMP 0
-
-scoreboard players enable @a menu 
-execute as @a[scores={menu=1..}] run function ferdinland:command/menu_open
-scoreboard players set @a menu 0
diff --git a/data/ferdinland/function/load.mcfunction b/data/ferdinland/function/load.mcfunction
deleted file mode 100644
index 5a88561..0000000
--- a/data/ferdinland/function/load.mcfunction
+++ /dev/null
@@ -1,3 +0,0 @@
-# load function
-say This load function
-function ferdinland:command/init
diff --git a/data/ferdinland/function/tick.mcfunction b/data/ferdinland/function/tick.mcfunction
deleted file mode 100644
index 6ef7b11..0000000
--- a/data/ferdinland/function/tick.mcfunction
+++ /dev/null
@@ -1,4 +0,0 @@
-# tick function
-#
-
-function ferdinland:command/trigger
diff --git a/data/minecraft/tags/function/load.json b/data/minecraft/tags/function/load.json
index b8a28d7..959ec21 100644
--- a/data/minecraft/tags/function/load.json
+++ b/data/minecraft/tags/function/load.json
@@ -1,5 +1,5 @@
 {
     "values": [
-        "ferdinland:load"
+        "ferdinland:__load__"
     ]
-}
+}
\ No newline at end of file
diff --git a/data/minecraft/tags/function/tick.json b/data/minecraft/tags/function/tick.json
index cd8c738..fa946b7 100644
--- a/data/minecraft/tags/function/tick.json
+++ b/data/minecraft/tags/function/tick.json
@@ -1,5 +1,5 @@
 {
     "values": [
-        "ferdinland:tick"
+        "ferdinland:__tick__"
     ]
-}
+}
\ No newline at end of file
diff --git a/jmc_config.json b/jmc_config.json
new file mode 100644
index 0000000..fd19024
--- /dev/null
+++ b/jmc_config.json
@@ -0,0 +1,7 @@
+{
+    "namespace": "ferdinland",
+    "description": "Custom datapack for the Ferdinland Minecraft Server",
+    "pack_format": "48",
+    "target": "main.jmc",
+    "output": "."
+}
\ No newline at end of file
diff --git a/main.hjmc b/main.hjmc
new file mode 100644
index 0000000..b6a7a47
--- /dev/null
+++ b/main.hjmc
@@ -0,0 +1,5 @@
+#define createObjTrigger(x) scoreboard objectives add x trigger
+#define createObjDummy(x) scoreboard objectives add x dummy
+
+#command guis
+#command transfer
diff --git a/main.jmc b/main.jmc
new file mode 100644
index 0000000..aef4955
--- /dev/null
+++ b/main.jmc
@@ -0,0 +1,5 @@
+import "src/*";
+
+say "I want to say load";
+
+function __tick__() {}
diff --git a/pack.mcmeta b/pack.mcmeta
index 22fda89..cb3d578 100644
--- a/pack.mcmeta
+++ b/pack.mcmeta
@@ -1,10 +1,6 @@
 {
-    "__comment": "The datapack is assembled by Datapack Assembler",
-    "__link": "https://far.ddns.me",
-    "__patreon": "Thank you to Someone, NatNATTO, Andrew and CadeMade for the support on https://patreon.com/GalSergey",
-
     "pack": {
-        "description": "Custom datapack for the Ferdinland Minecraft Server",
-        "pack_format": 48
+        "pack_format": 48,
+        "description": "Custom datapack for the Ferdinland Minecraft Server"
     }
-}
+}
\ No newline at end of file
diff --git a/src/.DS_Store b/src/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/src/commands.jmc b/src/commands.jmc
new file mode 100644
index 0000000..2e7b0ab
--- /dev/null
+++ b/src/commands.jmc
@@ -0,0 +1,34 @@
+@lazy
+function triggerCommand(objective, function) {
+	scoreboard players enable @a $objective;
+	execute as @a[scores={$objective=1..}] run function $function;
+	scoreboard players set @a $objective 0;
+}
+
+class command {
+	@add(__load__)
+	function commandsLoad() {
+		createObjTrigger(transportCreative);
+		createObjTrigger(transportSMP);
+		createObjTrigger(menu);
+	}
+
+	@add(__tick__)
+	function commandsTick() {
+		triggerCommand(transportCreative, this.transport_creative());
+		triggerCommand(transportSMP, this.transport_SMP());
+		triggerCommand(menu, this.menu());
+	}
+
+	function transport_creative() {
+		transfer 10.0.0.13 25566;
+	}
+
+	function transport_SMP() {
+		transfer 10.0.0.13 25565;
+	}
+
+	function open_menu() {
+		guis open menu;
+	}
+}