Skip to content

Quilt Support #1984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 23 commits into
base: dev
Choose a base branch
from
Open

Quilt Support #1984

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
59b250f
Initial work on quilt support
anonymous123-code Mar 27, 2023
fcdc9d6
Gradle template fixes
anonymous123-code Mar 27, 2023
a6ebe7b
Properly add Quilt to Facet editor
anonymous123-code Mar 27, 2023
f52bf80
Add Templates to template editor
anonymous123-code Mar 27, 2023
4f48c2f
Fix generated qmj
anonymous123-code Mar 27, 2023
5810f9a
Dont generate client Entry Point on Server-Only mods
anonymous123-code Mar 27, 2023
d8e7fd2
Fix environment information in QMJ
anonymous123-code Mar 27, 2023
3fa28cf
Fix entrypoint name detected as name listener
anonymous123-code Mar 27, 2023
be2ecc5
QMJ template fix: use artifact id in mod icon path
anonymous123-code Mar 28, 2023
76f9ac1
Temp fix: remove gradle wrapper step to avoid sync and wrapper runnin…
anonymous123-code Mar 28, 2023
2a958a3
Fix: metadata is now properly filled
anonymous123-code Mar 28, 2023
76a1ad2
Fix formatting
anonymous123-code Mar 28, 2023
66953fe
Forgot some licenses
anonymous123-code Mar 28, 2023
93dde67
Some more formatting
anonymous123-code Mar 28, 2023
cf06e2f
Merge branch 'minecraft-dev:dev' into quilt
anonymous123-code Apr 13, 2023
bf81f89
Fix for https://github.com/QuiltMC/update-quilt-meta/issues/9
anonymous123-code Apr 13, 2023
9765754
Readd gradle wrapper step as it seems to be fixed since the merge
anonymous123-code Apr 18, 2023
df4142f
Revert "Fix for https://github.com/QuiltMC/update-quilt-meta/issues/9…
anonymous123-code Apr 18, 2023
e0b69e4
Merge remote-tracking branch 'super/dev' into quilt
anonymous123-code Apr 18, 2023
62651ed
Add Standard Library selector
anonymous123-code Apr 19, 2023
f4c1bab
Properly store changes to the authors input
anonymous123-code Apr 19, 2023
fe0a0a6
Refactor: Move row init inside init blocks
anonymous123-code Apr 19, 2023
00ef5a9
Refactor: Move row init inside init blocks
anonymous123-code Apr 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Some more formatting
  • Loading branch information
@anonymous123-code
anonymous123-code committed Mar 28, 2023
commit 93dde67f5741ba6ad9fe728ed46cd60a705f7bd3
10 changes: 7 additions & 3 deletions src/main/kotlin/platform/quilt/creator/gradle-steps.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ import com.demonwav.mcdev.creator.EmptyStep
import com.demonwav.mcdev.creator.JdkProjectSetupFinalizer
import com.demonwav.mcdev.creator.addGradleGitignore
import com.demonwav.mcdev.creator.addTemplates
import com.demonwav.mcdev.creator.buildsystem.*
import com.demonwav.mcdev.creator.buildsystem.BuildSystemPropertiesStep
import com.demonwav.mcdev.creator.buildsystem.BuildSystemSupport
import com.demonwav.mcdev.creator.buildsystem.GRADLE_VERSION_KEY
import com.demonwav.mcdev.creator.buildsystem.GradleImportStep
import com.demonwav.mcdev.creator.buildsystem.addGradleWrapperProperties
import com.demonwav.mcdev.creator.findStep
import com.demonwav.mcdev.creator.gitEnabled
import com.demonwav.mcdev.creator.step.AbstractLongRunningAssetsStep
Expand All @@ -28,7 +32,7 @@ class QuiltGradleSupport : BuildSystemSupport {

override fun createStep(step: String, parent: NewProjectWizardStep): NewProjectWizardStep {
return when (step) {
BuildSystemSupport.PRE_STEP -> QuiltGradleFilesStep(parent) // TODO: Read fixed version of Gradle Wrapper Step
BuildSystemSupport.PRE_STEP -> QuiltGradleFilesStep(parent) // TODO: fixed version of Gradle Wrapper Step
BuildSystemSupport.POST_STEP -> GradleImportStep(parent)
else -> EmptyStep(parent)
}
Expand Down Expand Up @@ -75,7 +79,7 @@ class QuiltGradleFilesStep(parent: NewProjectWizardStep) : AbstractLongRunningAs
"gradle/libs.versions.toml" to MinecraftTemplates.QUILT_LIBS_VERSIONS_TEMPLATE
)

assets.data.putUserData(GRADLE_VERSION_KEY, SemanticVersion.release(8,0,2))
assets.data.putUserData(GRADLE_VERSION_KEY, SemanticVersion.release(8, 0, 2))
assets.addGradleWrapperProperties(project)

if (gitEnabled) {
Expand Down
19 changes: 17 additions & 2 deletions src/main/kotlin/platform/quilt/creator/ui-steps.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,20 @@
package com.demonwav.mcdev.platform.quilt.creator

import com.demonwav.mcdev.creator.platformtype.ModPlatformStep
import com.demonwav.mcdev.creator.step.*
import com.demonwav.mcdev.creator.step.AbstractCollapsibleStep
import com.demonwav.mcdev.creator.step.AbstractLatentStep
import com.demonwav.mcdev.creator.step.AbstractMcVersionChainStep
import com.demonwav.mcdev.creator.step.AbstractOptionalStringBasedOnProjectNameStep
import com.demonwav.mcdev.creator.step.DescriptionStep
import com.demonwav.mcdev.creator.step.IssueTrackerStep
import com.demonwav.mcdev.creator.step.LicenseStep
import com.demonwav.mcdev.creator.step.ModNameStep
import com.demonwav.mcdev.creator.step.NewProjectWizardChainStep.Companion.nextStep
import com.demonwav.mcdev.creator.step.RepositoryStep
import com.demonwav.mcdev.creator.step.UseMixinsStep
import com.demonwav.mcdev.creator.step.VersionChainComboBox
import com.demonwav.mcdev.creator.step.WaitForSmartModeStep
import com.demonwav.mcdev.creator.step.WebsiteStep
import com.demonwav.mcdev.platform.forge.inspections.sideonly.Side
import com.demonwav.mcdev.platform.quilt.util.QuiltStandardLibrariesVersions
import com.demonwav.mcdev.platform.quilt.util.QuiltVersions
Expand Down Expand Up @@ -193,7 +205,10 @@ class QuiltVersionChainStep(
super.setupProject(project)
data.putUserData(MC_VERSION_KEY, (getVersion(MINECRAFT_VERSION) as QuiltMcVersion).version)
data.putUserData(LOADER_VERSION_KEY, getVersion(LOADER_VERSION) as SemanticVersion)
data.putUserData(QUILT_MAPPINGS_VERSION_KEY, (getVersion(QUILT_MAPPINGS_VERSION) as QuiltVersions.QuiltMappingsVersion).name)
data.putUserData(
QUILT_MAPPINGS_VERSION_KEY,
(getVersion(QUILT_MAPPINGS_VERSION) as QuiltVersions.QuiltMappingsVersion).name
)
if (useApi) {
data.putUserData(API_VERSION_KEY, getVersion(QFAPI_VERSION) as SemanticVersion)
}
Expand Down
8 changes: 5 additions & 3 deletions src/main/kotlin/platform/quilt/reference/QuiltReferenceContributor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,22 @@ import com.demonwav.mcdev.platform.fabric.reference.LicenseReference
import com.demonwav.mcdev.platform.fabric.reference.ResourceFileReference
import com.demonwav.mcdev.platform.quilt.util.QuiltConstants
import com.demonwav.mcdev.util.isPropertyValue
import com.intellij.json.psi.*
import com.intellij.json.psi.JsonArray
import com.intellij.json.psi.JsonElement
import com.intellij.json.psi.JsonObject
import com.intellij.json.psi.JsonProperty
import com.intellij.json.psi.JsonStringLiteral
import com.intellij.patterns.PatternCondition
import com.intellij.patterns.PlatformPatterns
import com.intellij.psi.PsiReferenceContributor
import com.intellij.psi.PsiReferenceRegistrar
import com.intellij.util.ProcessingContext
import org.jetbrains.kotlin.idea.completion.or


class QuiltReferenceContributor : PsiReferenceContributor() {
override fun registerReferenceProviders(registrar: PsiReferenceRegistrar) {
val stringInModJson = PlatformPatterns.psiElement(JsonStringLiteral::class.java)
.inVirtualFile(PlatformPatterns.virtualFile().withName(QuiltConstants.QUILT_MOD_JSON))

val entryPointPattern = stringInModJson.withParent(
PlatformPatterns.psiElement(JsonArray::class.java)
.withSuperParent(
Expand Down