diff --git a/.gitignore b/.gitignore index dc332c3..d97e685 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ review/review.json +server/ diff --git a/.packwizignore b/.packwizignore index 0d9d083..aebdea5 100644 --- a/.packwizignore +++ b/.packwizignore @@ -1,2 +1,7 @@ README.md -review/ +review +review/* +server +server/* +docker-compose.yml +justfile diff --git a/config/wall-jump.properties b/config/wall-jump.properties new file mode 100644 index 0000000..326de78 --- /dev/null +++ b/config/wall-jump.properties @@ -0,0 +1,15 @@ +#automatically generated default config file +#Sat Sep 02 09:54:10 ADT 2023 +useDoubleJump=false +exhaustionWallJump=0.8 +minFallDistance=7.5 +autoRotation=false +enableEnchantments=false +stepAssist=true +allowReClinging=false +sprintSpeedBoost=0.0 +elytraSpeedBoost=0.0 +wallSlideDelay=15 +useWallJump=true +wallJumpHeight=0.55 +playFallSound=true diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..2d0bd56 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,27 @@ +version: "3.5" +services: + server: + image: itzg/minecraft-server + environment: + TZ: America/Halifax + + TYPE: FABRIC + VERSION: 1.20.1 + FABRIC_LOADER_VERSION: 0.14.22 + + MEMORY: "10G" + USE_AIKAR_FLAGS: "true" + EULA: "TRUE" + OPS: endigma_ + REPLACE_ENV_VARIABLES: "TRUE" + CONSOLE: "false" + + PACKWIZ_URL: "http://localhost:8080/pack.toml" + + MOTD: "§l§cBINGUS" + volumes: + - ./server:/data + network_mode: host + restart: unless-stopped + stdin_open: true + tty: true diff --git a/index.toml b/index.toml index c6347a1..13aef77 100644 --- a/index.toml +++ b/index.toml @@ -24,6 +24,10 @@ hash = "f1732450e74cbeaece566e75c5de7ee81cdeafd96693f786a460abb68162f65d" file = "config/rules.json" hash = "4e126cb5d83c38dec8b0df299539aa92fff39fd3faa2a3824c94e1171749f1f1" +[[files]] +file = "config/wall-jump.properties" +hash = "abd2fe87ba82de4dd91da88937a348ece73fa545578e23bb42225fd9539dafa3" + [[files]] file = "mods/advancementinfo.pw.toml" hash = "a14f8a33991b072fcece09a03c630cbfd17bbc74a24a04f9cf537bfa5d425280" @@ -126,7 +130,7 @@ metafile = true [[files]] file = "mods/calcmod.pw.toml" -hash = "1954480b9ca39e03d69d992523f7ad16221c5bdbf8909e20da3c2c66417b9870" +hash = "068a45759a111a7fef83d858b1b7f300745c26469397c2e399f652f4d54ddd62" metafile = true [[files]] @@ -259,11 +263,6 @@ file = "mods/dynamiccrosshaircompat.pw.toml" hash = "8d9ea18bd45e85f091bbc2239a05ce35392260cae70297ab219048f76911fc33" metafile = true -[[files]] -file = "mods/e4mc.pw.toml" -hash = "706924659dac92dc50b584b1ecf8f90ba628ede1e029d8642ca4aaec4d9eb3d5" -metafile = true - [[files]] file = "mods/elytra-boosters.pw.toml" hash = "5dedf416ffa0816ab53ab5983fdc6017d49fd4db505e8eb8458e38774bf594c1" @@ -454,6 +453,11 @@ file = "mods/main-menu-credits.pw.toml" hash = "2a79f7fb98b7073c926c6f87a93473f5714cf82a2ace7f344e4e2de4a33e0233" metafile = true +[[files]] +file = "mods/midnightlib.pw.toml" +hash = "bc79745faf3cfec5d60e239817905c2bebfb692f8ae3ff3671fc8afd4800227e" +metafile = true + [[files]] file = "mods/mixintrace.pw.toml" hash = "b89656eaf7e4404d8d2c5b1e1155aae85a839939f83cab6d1b5e791412ad5f86" @@ -699,6 +703,11 @@ file = "mods/ukus-armor-hud.pw.toml" hash = "4a807bf22e6095d7732c4e619201a372bbe132f9b1ed478e409ff9777e6f6ffd" metafile = true +[[files]] +file = "mods/vanilla-permissions.pw.toml" +hash = "07f7ec6edd1deefe5cf36f83104374ba2a28b44a0877984e5030e3a4e4de5854" +metafile = true + [[files]] file = "mods/voice-chat-interaction.pw.toml" hash = "5efd3cf3ce070d55b607d938dae8ecd201ef54ca2def1fa3f316d6247de6ca8d" diff --git a/justfile b/justfile new file mode 100644 index 0000000..4cc42df --- /dev/null +++ b/justfile @@ -0,0 +1,11 @@ +logs: + docker compose logs -f + +reload: + docker compose restart + +up: + docker compose up -d + +down: + docker compose down --volumes diff --git a/mods/calcmod.pw.toml b/mods/calcmod.pw.toml index 7120be8..c2bffd2 100644 --- a/mods/calcmod.pw.toml +++ b/mods/calcmod.pw.toml @@ -1,13 +1,13 @@ name = "CalcMod" filename = "calcmod-1.2.0.jar" -side = "both" +side = "client" [download] -url = "https://cdn.modrinth.com/data/XoHTb2Ap/versions/A9kFOzYp/calcmod-1.2.0.jar" -hash-format = "sha1" -hash = "842569f3f9f088cd2b1d043c602a8b865cf777ff" + url = "https://cdn.modrinth.com/data/XoHTb2Ap/versions/A9kFOzYp/calcmod-1.2.0.jar" + hash-format = "sha1" + hash = "842569f3f9f088cd2b1d043c602a8b865cf777ff" [update] -[update.modrinth] -mod-id = "XoHTb2Ap" -version = "A9kFOzYp" + [update.modrinth] + mod-id = "XoHTb2Ap" + version = "A9kFOzYp" diff --git a/mods/e4mc.pw.toml b/mods/e4mc.pw.toml deleted file mode 100644 index 66b1c25..0000000 --- a/mods/e4mc.pw.toml +++ /dev/null @@ -1,13 +0,0 @@ -name = "e4mc" -filename = "e4mc-4.0.1+1.19.4-fabric.jar" -side = "server" - -[download] -url = "https://cdn.modrinth.com/data/qANg5Jrr/versions/vVFlVRt7/e4mc-4.0.1%2B1.19.4-fabric.jar" -hash-format = "sha1" -hash = "458253f15e3c5bb0d5354f42f3eedc5b1a71472c" - -[update] -[update.modrinth] -mod-id = "qANg5Jrr" -version = "vVFlVRt7" diff --git a/mods/midnightlib.pw.toml b/mods/midnightlib.pw.toml new file mode 100644 index 0000000..07c107d --- /dev/null +++ b/mods/midnightlib.pw.toml @@ -0,0 +1,13 @@ +name = "MidnightLib" +filename = "midnightlib-fabric-1.4.1.1.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/codAaoxh/versions/YXz8kIQl/midnightlib-fabric-1.4.1.1.jar" +hash-format = "sha1" +hash = "23ab09b69c30e296d35fc957c2e9168b10a94001" + +[update] +[update.modrinth] +mod-id = "codAaoxh" +version = "YXz8kIQl" diff --git a/mods/vanilla-permissions.pw.toml b/mods/vanilla-permissions.pw.toml new file mode 100644 index 0000000..7cdc2e4 --- /dev/null +++ b/mods/vanilla-permissions.pw.toml @@ -0,0 +1,13 @@ +name = "Vanilla Permissions" +filename = "vanilla-permissions-0.2.2+1.20.1.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/fdZkP5Bb/versions/POy2ZtwI/vanilla-permissions-0.2.2%2B1.20.1.jar" +hash-format = "sha1" +hash = "92fc0342d4823dd527d92eb75ac8027fd1d2a85e" + +[update] +[update.modrinth] +mod-id = "fdZkP5Bb" +version = "POy2ZtwI" diff --git a/pack.toml b/pack.toml index 8a1bfde..d71c53e 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "e26823fe959055f5931cf9db93991344df24fa97767005aeca0607288b03741a" +hash = "d25982aa80e2ad924c07803207cf5f427476cba7e1cf88271b3d22276a9d3505" [versions] fabric = "0.14.22" diff --git a/review/all.json b/review/all.json index 37f6c20..44217d0 100644 --- a/review/all.json +++ b/review/all.json @@ -224,6 +224,25 @@ "conflicts": null, "review": false }, + { + "slug": "architectury-api", + "project_type": "mod", + "title": "Architectury API", + "description": "An intermediary api aimed to ease developing multiplatform mods.", + "body": "# Architectury API\n\nTalk to us on [Discord](https://discord.gg/C2RdJDpRBP)!\n\nAn intermediary api aimed to ease developing multiplatform mods.\n\n### What is Architectury API\n\nArchitectury API is an api to abstract calls to fabric api and forge api as both loader has different implementations of\nwhat can be perceived as the same thing.\n\nArchitectury API updates regularly, with new hooks and features. Currently contains over **90** events hooks, networking\nabstraction, loader calls abstraction, game registry abstraction and an easy to use @ExpectPlatform annotation (Only\nworks on static methods).\n\n### Do I really need this API?\n\nArchitectury API is only one part of the architectury ecosystem, **Architectury Plugin** is the gradle plugin enabling\nall this multiplatform actions.\n\nArchitectury API is optional for projects built on architectury, you may create your architectury project with just\nArchitectury Plugin.\n\n### Advantages of Architectury\n\n- Open sourced\n- Less boilerplate for your multiplatform mod\n\n### Getting started with making multiplatform mods\n\nArchitectury Loom: https://github.com/architectury/architectury-loom (a fork of Fabric Loom adding multiplatform development capabilities)\n\nGradle Plugin: https://github.com/architectury/architectury-plugin (includes Architectury Injectables, for the `@ExpectPlatform` annotation)\n\nExample Mod: https://github.com/architectury/architectury-example-mod (a discontinued example mod using Architectury, if possible, use the templates instead)\n\nMod Templates: https://github.com/architectury/architectury-templates (a set of templates to get started using the Architectury toolchain)\n\n### Example: Usage of @ExpectPlatform\n![Exmaple of the @ExpectPlatform annotation, part of Architectury Injectables](https://camo.githubusercontent.com/78c68766affb70fbd88f9806e0e95f78765ec339448d7102065f2942be2b3215/68747470733a2f2f6d656469612e646973636f72646170702e6e65742f6174746163686d656e74732f3538363138363230323738313138383130382f3737363432383831343330393738353632302f756e6b6e6f776e2e706e673f77696474683d31313931266865696768743d343339)\n\n### Credits\n\nIn certain older versions, this library used to bundle typetools; you can find its license [here](https://github.com/jhalterman/typetools/blob/master/LICENSE.txt \"\")", + "client_side": "optional", + "server_side": "optional", + "categories": + [ + "library" + ], + "additional_categories": [], + "gallery": [], + "kind": "optional", + "link": "https://modrinth.com/mod/architectury-api", + "review": false, + "conflicts": null + }, { "slug": "argonauts", "project_type": "mod", @@ -1781,26 +1800,6 @@ "review": false, "conflicts": null }, - { - "slug": "e4mc", - "project_type": "mod", - "title": "e4mc", - "description": "Open a LAN server to anyone, anywhere, anytime.", - "body": "# [e4mc](https://e4mc.link)\n\nOpen your LAN server to the public, easily and quickly!\n\n## What is e4mc?\n\ne4mc is a reverse tunneling reverse proxy for Minecraft.\nIn simpler terms, it's a software that allows you to temporarily expose a local Minecraft server to the internet.\n\n## How do I use it?\n\nSimply install the mod, and Open to LAN as normal. A public domain will appear alongside the local port. Others can simply connect to the public domain to connect to your LAN server.\n\n## Why e4mc?\n\n### Works everywhere\n\nIt works everywhere. and I mean everywhere. If you can read this webpage, you can use e4mc.\n\n### Works with vanilla clients\n\nYou don't need to install e4mc on both sides.\nIt just gives you a domain.\nJust share the domain.\n\n### No extra software or configuration required\n\nNone. The host installs the mod on their side, and that's it.\nYou install the mod, Open to LAN as normal, and you get a sharable domain.\n\n### Open source\n\nYes. The entire thing. The server too. It's all public.", - "client_side": "unsupported", - "server_side": "required", - "categories": - [ - "social", - "utility" - ], - "additional_categories": [], - "gallery": [], - "kind": "serverside", - "link": "https://modrinth.com/mod/e4mc", - "review": false, - "conflicts": null - }, { "slug": "elytra-boosters", "project_type": "mod", @@ -3035,6 +3034,26 @@ "conflicts": null, "review": false }, + { + "slug": "midnightlib", + "project_type": "mod", + "title": "MidnightLib", + "description": "Common library with a built-in configuration system", + "body": "
MidnightLib is a library that provides common utils and a configuration system for mods.
\n
Mod developers are allowed and encouraged to include it into their mods.
Every feature can be toggled in the library's own config screen/file.\n

\"Example", + "client_side": "optional", + "server_side": "optional", + "categories": + [ + "library", + "utility" + ], + "additional_categories": [], + "gallery": [], + "kind": "optional", + "link": "https://modrinth.com/mod/midnightlib", + "review": false, + "conflicts": null + }, { "slug": "minecart-crashes", "project_type": "mod", @@ -3738,6 +3757,28 @@ "conflicts": null, "review": false }, + { + "slug": "puzzles-lib", + "project_type": "mod", + "title": "Puzzles Lib", + "description": "Why's it called Puzzles you ask? That's the puzzle!", + "body": "

\n

\n

 

\n

\n

  

\n

\n

📖 About:

\n

Puzzles Lib is a rather light-weight library consisting of multiple frameworks and utility classes. But most of all, it offers an abstraction layer for developing mods on both the Forge and Fabric mod loader, making ports and maintaining mods rather simple without having to rewrite a bunch of logic.

\n

This mod doesn't do anything on its own, so install it only when you also use another one of my mods.

\n

The Fabric version of this project additionally depends on the Forge Config API Port library. This is required for mod configuration, as it allows for using the exact same system as on the Forge mod loader.

\n

\n

    \"Reddit\" 

\n

", + "client_side": "required", + "server_side": "required", + "categories": + [ + "library" + ], + "additional_categories": [], + "gallery": + [ + "https://cdn.modrinth.com/data/QAGBst4M/images/f57930a615a4c67e94387efeb6016c3e2d3e8ff9.png" + ], + "kind": "required", + "link": "https://modrinth.com/mod/puzzles-lib", + "review": false, + "conflicts": null + }, { "slug": "radiant-gear", "project_type": "mod",