From 247a1be0e43508e133b1ca38175b8f645460d3fa Mon Sep 17 00:00:00 2001 From: themodernhakr Date: Tue, 25 Feb 2025 23:56:50 -0600 Subject: [PATCH 1/9] 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=1UQiUr6zivXKtO*wrzAV8h9T4s}!plmVZCqPwl|`G5F(|L-U1 zoid;d{3`}bDQZOxJd&KP3lGOH1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Tue, 25 Feb 2025 23:57:05 -0600 Subject: [PATCH 2/9] add straggler --- .DS_Store | Bin 6148 -> 6148 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/.DS_Store b/.DS_Store index b27bfb6ea9fe022a09663bd4a32ef7fdc1fe1f76..cc74c2e28d40fa01bd1e216175fb20e2bb5728ed 100644 GIT binary patch delta 106 zcmZoMXffEJ#uTe$!N9=4!l1{H&XCDalAG`1l9ZF51Qg@Q Date: Wed, 26 Feb 2025 00:04:36 -0600 Subject: [PATCH 3/9] update .gitignore --- .DS_Store | Bin 6148 -> 6148 bytes .gitignore | 2 ++ 2 files changed, 2 insertions(+) diff --git a/.DS_Store b/.DS_Store index cc74c2e28d40fa01bd1e216175fb20e2bb5728ed..af7ed249e9a83462a4d22cf7d45dea2b2d11f91f 100644 GIT binary patch delta 106 zcmZoMXffEJ#uS@Aoq>UYg+Y%YogtH6I&RQVLV@&y@& U!O8i#1wcIv46Fv5o0%F#0kp^()&Kwi delta 106 zcmZoMXffEJ#uTe$!N9=4!l1{H&XCDalAG`1l9ZF51Qg@Q Date: Wed, 26 Feb 2025 00:10:32 -0600 Subject: [PATCH 4/9] remove .DS_Store --- .DS_Store | Bin 6148 -> 6148 bytes src/.DS_Store | Bin 6148 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/.DS_Store diff --git a/.DS_Store b/.DS_Store index af7ed249e9a83462a4d22cf7d45dea2b2d11f91f..3b20bc53bc1515b59b61c581a8acdc07f02284cb 100644 GIT binary patch delta 189 zcmZoMXffEJ#uS_9&cMLH!l1{H&XCDalAG`1l9ZF51Qg@gb589^@%CemsPZXr`PrLo z9-+$@WEch~=jRpx^)N87HcW12+R4Q9c(NU{n7vk@rfC7hIA(@oh9ZXK+UYg+Y%YogtH6I&RQVLV@&y@& z!O8i#1wcIv46Fu|o0)bpNj;xz$1G;gzj>d20mL|FhGK>yhUDCQgkjR(eA?4dWKoP_ TFxb41IgMpv0pDhJj=%f>ZaOlB diff --git a/src/.DS_Store b/src/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Wed, 26 Feb 2025 00:11:50 -0600 Subject: [PATCH 5/9] try removing .DS_Store again --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 3b20bc53bc1515b59b61c581a8acdc07f02284cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKy-EW?5S~pUMg&QxU~`qAg^ zXZ^!d@7q`?kcx3r>d=@v>8O`=^E|^xG&Kgr(E6wE^NV>{UHs^O7b6`G@@X-LS1&gw zGyb3$dPLV$r4e0F&o4zxVIh^bX|P|$*3st9&EzkLv57-Wgujr>TVmn{_p>O{tuJ%P8m=J z{uKkJmb8-=9!b{L(!=pu8$pkuEF4!joTT8wF2#uDrFac$1@?$9fU#iV5Eh7T1S}2O JC Date: Wed, 26 Feb 2025 00:21:11 -0600 Subject: [PATCH 6/9] remove data/ folder --- .../function/command/transport_creative.mcfunction | 1 - data/ferdinland/function/command/transport_smp.mcfunction | 1 - data/minecraft/tags/function/load.json | 5 ----- data/minecraft/tags/function/tick.json | 5 ----- 4 files changed, 12 deletions(-) delete mode 100644 data/ferdinland/function/command/transport_creative.mcfunction delete mode 100644 data/ferdinland/function/command/transport_smp.mcfunction delete mode 100644 data/minecraft/tags/function/load.json delete mode 100644 data/minecraft/tags/function/tick.json diff --git a/data/ferdinland/function/command/transport_creative.mcfunction b/data/ferdinland/function/command/transport_creative.mcfunction deleted file mode 100644 index 60d6c7c..0000000 --- a/data/ferdinland/function/command/transport_creative.mcfunction +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 6c27526..0000000 --- a/data/ferdinland/function/command/transport_smp.mcfunction +++ /dev/null @@ -1 +0,0 @@ -transfer 10.0.0.13 25565 \ No newline at end of file diff --git a/data/minecraft/tags/function/load.json b/data/minecraft/tags/function/load.json deleted file mode 100644 index 959ec21..0000000 --- a/data/minecraft/tags/function/load.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "ferdinland:__load__" - ] -} \ No newline at end of file diff --git a/data/minecraft/tags/function/tick.json b/data/minecraft/tags/function/tick.json deleted file mode 100644 index fa946b7..0000000 --- a/data/minecraft/tags/function/tick.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "ferdinland:__tick__" - ] -} \ No newline at end of file From f4a8f9502d935506aa69f698e7632dd307964263 Mon Sep 17 00:00:00 2001 From: themodernhakr Date: Wed, 26 Feb 2025 00:27:36 -0600 Subject: [PATCH 7/9] add initial build script --- build.sh | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 build.sh diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..b6d8693 --- /dev/null +++ b/build.sh @@ -0,0 +1,2 @@ +pip3 install git+https://github.com/WingedSeal/jmc.git#subdirectory=src +jmc compile From 559117352eb8863ba67ba07e9b928064c000d369 Mon Sep 17 00:00:00 2001 From: themodernhakr Date: Wed, 26 Feb 2025 00:45:12 -0600 Subject: [PATCH 8/9] fix function loading in commands --- src/commands.jmc | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/commands.jmc b/src/commands.jmc index 2e7b0ab..aff832e 100644 --- a/src/commands.jmc +++ b/src/commands.jmc @@ -1,10 +1,22 @@ @lazy function triggerCommand(objective, function) { scoreboard players enable @a $objective; - execute as @a[scores={$objective=1..}] run function $function; + execute as @a[scores={$objective=1..}] run $function; scoreboard players set @a $objective 0; } + function command.transport_creative() { + transfer 10.0.0.13 25566; + } + + function command.transport_SMP() { + transfer 10.0.0.13 25565; + } + + function command.open_menu() { + guis open menu; + } + class command { @add(__load__) function commandsLoad() { @@ -15,20 +27,8 @@ class command { @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; + triggerCommand(transportCreative, command.transport_creative()); + triggerCommand(transportSMP, command.transport_SMP()); + triggerCommand(menu, command.open_menu()); } } From 4c0823e86a938fe6abcede678ed4c05e90ce8103 Mon Sep 17 00:00:00 2001 From: themodernhakr Date: Wed, 26 Feb 2025 00:48:48 -0600 Subject: [PATCH 9/9] remove test chat load command --- main.jmc | 2 -- 1 file changed, 2 deletions(-) diff --git a/main.jmc b/main.jmc index aef4955..4044763 100644 --- a/main.jmc +++ b/main.jmc @@ -1,5 +1,3 @@ import "src/*"; -say "I want to say load"; - function __tick__() {}