Skip to content

Commit a3fbaac

Browse files
committed
Remove old SideOnly code
1 parent 8ff2325 commit a3fbaac

17 files changed

+13
-1400
lines changed

src/main/kotlin/platform/fabric/creator/FabricProjectConfig.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import com.demonwav.mcdev.creator.buildsystem.gradle.GradleBuildSystem
1717
import com.demonwav.mcdev.creator.buildsystem.gradle.GradleCreator
1818
import com.demonwav.mcdev.platform.PlatformType
1919
import com.demonwav.mcdev.platform.fabric.EntryPoint
20-
import com.demonwav.mcdev.platform.forge.inspections.sideonly.Side
20+
import com.demonwav.mcdev.sideonly.Side
2121
import com.demonwav.mcdev.util.License
2222
import com.demonwav.mcdev.util.SemanticVersion
2323
import com.intellij.openapi.module.Module
@@ -35,7 +35,7 @@ class FabricProjectConfig : ProjectConfig(), GradleCreator {
3535
var apiMavenLocation: String? = null
3636
var loomVersion = SemanticVersion.release()
3737
var gradleVersion = SemanticVersion.release()
38-
var environment = Side.NONE
38+
var environment = Side.BOTH
3939
var entryPoints: List<EntryPoint> = arrayListOf()
4040
var modRepo: String? = null
4141
var mixins = false

src/main/kotlin/platform/fabric/creator/FabricProjectSettingsWizard.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import com.demonwav.mcdev.creator.ValidatedFieldType.NON_BLANK
1919
import com.demonwav.mcdev.platform.PlatformType
2020
import com.demonwav.mcdev.platform.fabric.EntryPoint
2121
import com.demonwav.mcdev.platform.fabric.util.FabricConstants
22-
import com.demonwav.mcdev.platform.forge.inspections.sideonly.Side
22+
import com.demonwav.mcdev.sideonly.Side
2323
import com.demonwav.mcdev.util.License
2424
import com.demonwav.mcdev.util.SemanticVersion
2525
import com.demonwav.mcdev.util.modUpdateStep
@@ -255,7 +255,7 @@ class FabricProjectSettingsWizard(private val creator: MinecraftProjectCreator)
255255
conf.environment = when ((environmentBox.selectedItem as? String)?.toLowerCase(Locale.ROOT)) {
256256
"client" -> Side.CLIENT
257257
"server" -> Side.SERVER
258-
else -> Side.NONE
258+
else -> Side.BOTH
259259
}
260260
conf.license = licenseBox.selectedItem as? License
261261
conf.entryPoints = entryPoints.filter { it.valid }

src/main/kotlin/platform/fabric/creator/FabricTemplate.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ package com.demonwav.mcdev.platform.fabric.creator
1212

1313
import com.demonwav.mcdev.creator.buildsystem.BuildSystem
1414
import com.demonwav.mcdev.platform.BaseTemplate
15-
import com.demonwav.mcdev.platform.forge.inspections.sideonly.Side
15+
import com.demonwav.mcdev.sideonly.Side
1616
import com.demonwav.mcdev.util.License
1717
import com.demonwav.mcdev.util.MinecraftTemplates.Companion.FABRIC_BUILD_GRADLE_TEMPLATE
1818
import com.demonwav.mcdev.util.MinecraftTemplates.Companion.FABRIC_GRADLE_PROPERTIES_TEMPLATE

src/main/kotlin/platform/forge/ForgeModule.kt

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import com.demonwav.mcdev.insight.generation.GenerationData
1616
import com.demonwav.mcdev.inspection.IsCancelled
1717
import com.demonwav.mcdev.platform.AbstractModule
1818
import com.demonwav.mcdev.platform.PlatformType
19-
import com.demonwav.mcdev.platform.forge.inspections.sideonly.SidedProxyAnnotator
2019
import com.demonwav.mcdev.platform.forge.util.ForgeConstants
2120
import com.demonwav.mcdev.util.SourceType
2221
import com.demonwav.mcdev.util.extendsOrImplements
@@ -26,7 +25,6 @@ import com.demonwav.mcdev.util.waitForAllSmart
2625
import com.intellij.json.JsonFileType
2726
import com.intellij.openapi.application.ApplicationManager
2827
import com.intellij.openapi.fileTypes.FileTypeManager
29-
import com.intellij.openapi.project.DumbService
3028
import com.intellij.psi.JavaPsiFacade
3129
import com.intellij.psi.PsiClass
3230
import com.intellij.psi.PsiClassType
@@ -36,7 +34,6 @@ import com.intellij.psi.PsiMethod
3634
import com.intellij.psi.PsiMethodCallExpression
3735
import com.intellij.psi.PsiType
3836
import com.intellij.psi.search.GlobalSearchScope
39-
import com.intellij.psi.search.searches.AnnotatedElementsSearch
4037

4138
class ForgeModule internal constructor(facet: MinecraftFacet) : AbstractModule(facet) {
4239

@@ -54,27 +51,6 @@ class ForgeModule internal constructor(facet: MinecraftFacet) : AbstractModule(f
5451
runWriteTaskLater {
5552
FileTypeManager.getInstance().associatePattern(JsonFileType.INSTANCE, ForgeConstants.MCMOD_INFO)
5653
}
57-
58-
// Index @SideOnly
59-
val service = DumbService.getInstance(project)
60-
service.runReadActionInSmartMode runSmart@{
61-
if (service.isDumb || project.isDisposed) {
62-
return@runSmart
63-
}
64-
65-
val scope = GlobalSearchScope.projectScope(project)
66-
val sidedProxy = JavaPsiFacade.getInstance(project)
67-
.findClass(ForgeConstants.SIDED_PROXY_ANNOTATION, scope) ?: return@runSmart
68-
val annotatedFields = AnnotatedElementsSearch.searchPsiFields(sidedProxy, scope).findAll()
69-
70-
for (field in annotatedFields) {
71-
if (service.isDumb || project.isDisposed) {
72-
return@runSmart
73-
}
74-
75-
SidedProxyAnnotator.check(field)
76-
}
77-
}
7854
}
7955
}
8056

src/main/kotlin/platform/forge/inspections/sideonly/FieldDeclarationSideOnlyInspection.kt

Lines changed: 0 additions & 126 deletions
This file was deleted.

src/main/kotlin/platform/forge/inspections/sideonly/LocalVariableDeclarationSideOnlyInspection.kt

Lines changed: 0 additions & 136 deletions
This file was deleted.

0 commit comments

Comments
 (0)