Skip to content

Conversation

@fischer-felix
Copy link
Contributor

Exactly what it says on the tin, support for the Quilt server type.

The start script is basically just a heavily modified version of the one for fabric, just changing the way it is installed.

While Fabric provides an easy way to obtain the server jar directly, Quilt uses their own installer tool written in java, thus I download this tool and then execute it with the correct directories and versions set.

This should resolve #1484.

Copy link
Owner

@itzg itzg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Can you also add a test similar to tests/setuponlytests/pufferfish?

QUILT_INSTALLER_VERSION=$(maven-metadata-release https://maven.quiltmc.org/repository/release/org/quiltmc/quilt-installer/maven-metadata.xml)
fi
export INSTALLER=quilt-installer-${QUILT_INSTALLER_VERSION}.jar
export SERVER=quilt-server-launch.jar
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be good to qualify the file name by the server version to enable in place upgrades. If the installer doesn't let you override that, then you could rename the jar to the versioned name.

exit 1
fi

export FAMILY=QUILT
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try to use one of the existing family values unless it is indeed not compatible with any other. If that's the case then you'll need to double check any later conditions on FAMILY that might need to be extended.

@fischer-felix
Copy link
Contributor Author

I hope I added the test correctly, I more or less just took the one from Pufferfish and modified the docker-compose.yml and verify.sh. Hope I changed the right things.

@itzg
Copy link
Owner

itzg commented May 11, 2022

New changes look great. The PR verification should be giving it a test run now.

@@ -0,0 +1 @@
mc-image-helper assert fileExists "/data/quilt-server-launch-*.jar"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like it should be

Suggested change
mc-image-helper assert fileExists "/data/quilt-server-launch-*.jar"
mc-image-helper assert fileExists "/data/quilt-server-*-launch.jar"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be fixed now

@itzg itzg merged commit 691be80 into itzg:master May 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add Quilt server support

2 participants