Skip to content

Commit 56eec96

Browse files
EarthcomputerEarthcomputer
committed
Merge branch '2021.2' into 2021.3
# Conflicts: # gradle/libs.versions.toml
2 parents ea1e431 + b47196b commit 56eec96

File tree

95 files changed

+3534
-66
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+3534
-66
lines changed

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎readme.md‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Minecraft Development for IntelliJ
1212
<td colspan="2"><a href="https://ci.demonwav.com/viewType.html?buildTypeId=MinecraftDev_Build"><img src="https://tc.demonwav.com/app/rest/builds/buildType:(id:MinecraftDev_Build)/statusIcon.svg" alt="Teamcity Build Status" /></a></td>
1313
</tr>
1414
<tr>
15-
<td align="right" rowspan="4"><b>Nightly Builds</b></td>
15+
<td align="right" rowspan="5"><b>Nightly Builds</b></td>
1616
<td align="left">2021.1</td>
1717
<td align="left"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Nightly_20211"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20211)/statusIcon.svg" alt="2021.1 Nightly Status" /></a></td>
1818
</tr>
@@ -22,7 +22,11 @@ Minecraft Development for IntelliJ
2222
</tr>
2323
<tr>
2424
<td align="left">2021.3</td>
25-
<td align="left"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Nightly_20213"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20213)/statusIcon.svg" alt="2021.3 EAP Nightly Status" /></a></td>
25+
<td align="left"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Nightly_20213"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20213)/statusIcon.svg" alt="2021.3 Nightly Status" /></a></td>
26+
</tr>
27+
<tr>
28+
<td align="left">2022.1</td>
29+
<td align="left"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Nightly_20221"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20221)/statusIcon.svg" alt="2022.1 EAP Nightly Status" /></a></td>
2630
</tr>
2731
<tr>
2832
<td align="right"><b>OS Tests</b></td>
@@ -132,6 +136,7 @@ Supported Platforms
132136

133137
- [![Bukkit Icon](src/main/resources/assets/icons/platform/Bukkit.png?raw=true) **Bukkit**](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/browse) ([![Spigot Icon](src/main/resources/assets/icons/platform/Spigot.png?raw=true) Spigot](https://spigotmc.org/) and [![Paper Icon](src/main/resources/assets/icons/platform/Paper.png?raw=true) Paper](https://papermc.io/))
134138
- [![Sponge Icon](src/main/resources/assets/icons/platform/Sponge_dark.png?raw=true) **Sponge**](https://www.spongepowered.org/)
139+
- [![Architectury Icon](src/main/resources/assets/icons/platform/Architectury.png?raw=true) **Architectury**](https://github.com/architectury/architectury-api)
135140
- [![Forge Icon](src/main/resources/assets/icons/platform/Forge.png?raw=true) **Minecraft Forge**](https://forums.minecraftforge.net/)
136141
- [![Fabric Icon](src/main/resources/assets/icons/platform/Fabric.png?raw=true) **Fabric**](https://fabricmc.net)
137142
- [![LiteLoader Icon](src/main/resources/assets/icons/platform/LiteLoader.png?raw=true) **LiteLoader**](http://www.liteloader.com/)

‎src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/archloom/ArchitecturyModelBuilderImpl.groovy‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
* Minecraft Dev for IntelliJ
3+
*
4+
* https://minecraftdev.org
5+
*
6+
* Copyright (c) 2021 minecraft-dev
7+
*
8+
* MIT License
9+
*/
10+
11+
package com.demonwav.mcdev.platform.mcp.gradle.tooling.archloom
12+
13+
import org.gradle.api.Project
14+
import org.jetbrains.annotations.NotNull
15+
import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder
16+
import org.jetbrains.plugins.gradle.tooling.ModelBuilderService
17+
18+
class ArchitecturyModelBuilderImpl implements ModelBuilderService {
19+
boolean canBuild(String modelName) {
20+
return ArchitecturyModel.name == modelName
21+
}
22+
23+
Object buildAll(String modelName, Project project) {
24+
def moduleType = ArchitecturyModel.ModuleType.NONE
25+
if (project.getPluginManager().hasPlugin('architectury-plugin')) {
26+
if (project.configurations.findByName('transformProductionFabric') != null) {
27+
moduleType = ArchitecturyModel.ModuleType.COMMON
28+
} else {
29+
moduleType = ArchitecturyModel.ModuleType.PLATFORM_SPECIFIC
30+
}
31+
}
32+
33+
return new ArchitecturyModelImpl(moduleType)
34+
}
35+
36+
ErrorMessageBuilder getErrorMessageBuilder(@NotNull Project project, @NotNull Exception e) {
37+
return ErrorMessageBuilder.create(
38+
project, e, "MinecraftDev import errors"
39+
).withDescription("Unable to build MinecraftDev ArchitecturyLoom project configuration")
40+
}
41+
}

‎src/gradle-tooling-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/archloom/ArchitecturyModelImpl.groovy‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/*
2+
* Minecraft Dev for IntelliJ
3+
*
4+
* https://minecraftdev.org
5+
*
6+
* Copyright (c) 2021 minecraft-dev
7+
*
8+
* MIT License
9+
*/
10+
11+
package com.demonwav.mcdev.platform.mcp.gradle.tooling.archloom
12+
13+
class ArchitecturyModelImpl implements ArchitecturyModel, Serializable {
14+
private final ModuleType moduleType;
15+
16+
ArchitecturyModelImpl(ModuleType moduleType) {
17+
this.moduleType = moduleType
18+
}
19+
20+
ModuleType getModuleType() {
21+
return moduleType
22+
}
23+
}

‎src/gradle-tooling-extension/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/archloom/ArchitecturyModel.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/*
2+
* Minecraft Dev for IntelliJ
3+
*
4+
* https://minecraftdev.org
5+
*
6+
* Copyright (c) 2021 minecraft-dev
7+
*
8+
* MIT License
9+
*/
10+
11+
package com.demonwav.mcdev.platform.mcp.gradle.tooling.archloom;
12+
13+
public interface ArchitecturyModel {
14+
ModuleType getModuleType();
15+
16+
enum ModuleType {
17+
NONE, COMMON, PLATFORM_SPECIFIC
18+
}
19+
}

‎src/gradle-tooling-extension/resources/META-INF/services/org.jetbrains.plugins.gradle.tooling.ModelBuilderService‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
com.demonwav.mcdev.platform.mcp.gradle.tooling.archloom.ArchitecturyModelBuilderImpl
12
com.demonwav.mcdev.platform.mcp.gradle.tooling.vanillagradle.VanillaGradleModelBuilderImpl
23
com.demonwav.mcdev.platform.mcp.gradle.tooling.McpModelFG2BuilderImpl
34
com.demonwav.mcdev.platform.mcp.gradle.tooling.McpModelFG3BuilderImpl

‎src/main/kotlin/asset/PlatformAssets.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ object PlatformAssets : Assets() {
3131
val FABRIC_ICON = loadIcon("/assets/icons/platform/Fabric.png")
3232
val FABRIC_ICON_2X = loadIcon("/assets/icons/platform/[email protected]")
3333

34+
val ARCHITECTURY_ICON = loadIcon("/assets/icons/platform/Architectury.png")
35+
val ARCHITECTURY_ICON_2X = loadIcon("/assets/icons/platform/[email protected]")
36+
3437
val SPONGE_ICON = loadIcon("/assets/icons/platform/Sponge.png")
3538
val SPONGE_ICON_2X = loadIcon("/assets/icons/platform/[email protected]")
3639
val SPONGE_ICON_DARK = loadIcon("/assets/icons/platform/Sponge_dark.png")

‎src/main/kotlin/creator/MinecraftModuleBuilder.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ package com.demonwav.mcdev.creator
1212

1313
import com.demonwav.mcdev.asset.PlatformAssets
1414
import com.demonwav.mcdev.platform.MinecraftModuleType
15+
import com.demonwav.mcdev.platform.architectury.creator.ArchitecturyProjectSettingsWizard
1516
import com.demonwav.mcdev.platform.bukkit.creator.BukkitProjectSettingsWizard
1617
import com.demonwav.mcdev.platform.bungeecord.creator.BungeeCordProjectSettingsWizard
1718
import com.demonwav.mcdev.platform.fabric.creator.FabricProjectSettingsWizard
@@ -110,6 +111,7 @@ class MinecraftModuleBuilder : JavaModuleBuilder() {
110111
SpongeProjectSettingsWizard(creator),
111112
ForgeProjectSettingsWizard(creator),
112113
FabricProjectSettingsWizard(creator),
114+
ArchitecturyProjectSettingsWizard(creator),
113115
LiteLoaderProjectSettingsWizard(creator),
114116
VelocityProjectSettingsWizard(creator),
115117
BungeeCordProjectSettingsWizard(creator)

‎src/main/kotlin/creator/PlatformChooserWizardStep.kt‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ package com.demonwav.mcdev.creator
1313
import com.demonwav.mcdev.asset.PlatformAssets
1414
import com.demonwav.mcdev.creator.buildsystem.BuildSystemType
1515
import com.demonwav.mcdev.platform.PlatformType
16+
import com.demonwav.mcdev.platform.architectury.creator.ArchitecturyProjectConfig
1617
import com.demonwav.mcdev.platform.bukkit.creator.BukkitProjectConfig
1718
import com.demonwav.mcdev.platform.bungeecord.creator.BungeeCordProjectConfig
1819
import com.demonwav.mcdev.platform.fabric.creator.FabricProjectConfig
@@ -43,6 +44,7 @@ class PlatformChooserWizardStep(private val creator: MinecraftProjectCreator) :
4344
private lateinit var spongePluginCheckBox: JCheckBox
4445
private lateinit var forgeModCheckBox: JCheckBox
4546
private lateinit var fabricModCheckBox: JCheckBox
47+
private lateinit var architecturyModCheckBox: JCheckBox
4648
private lateinit var bungeeCordPluginCheckBox: JCheckBox
4749
private lateinit var waterfallPluginCheckBox: JCheckBox
4850
private lateinit var velocityPluginCheckBox: JCheckBox
@@ -71,7 +73,15 @@ class PlatformChooserWizardStep(private val creator: MinecraftProjectCreator) :
7173
spigotPluginCheckBox
7274
)
7375
}
74-
forgeModCheckBox.addActionListener { toggle(forgeModCheckBox, liteLoaderModCheckBox) }
76+
forgeModCheckBox.addActionListener { toggle(forgeModCheckBox, liteLoaderModCheckBox, architecturyModCheckBox) }
77+
fabricModCheckBox.addActionListener { toggle(fabricModCheckBox, architecturyModCheckBox) }
78+
architecturyModCheckBox.addActionListener {
79+
toggle(
80+
architecturyModCheckBox,
81+
fabricModCheckBox,
82+
forgeModCheckBox
83+
)
84+
}
7585
liteLoaderModCheckBox.addActionListener { toggle(liteLoaderModCheckBox, forgeModCheckBox) }
7686
bungeeCordPluginCheckBox.addActionListener { toggle(bungeeCordPluginCheckBox, waterfallPluginCheckBox) }
7787
waterfallPluginCheckBox.addActionListener { toggle(waterfallPluginCheckBox, bungeeCordPluginCheckBox) }
@@ -120,6 +130,7 @@ class PlatformChooserWizardStep(private val creator: MinecraftProjectCreator) :
120130
spongePluginCheckBox.isSelected ||
121131
forgeModCheckBox.isSelected ||
122132
fabricModCheckBox.isSelected ||
133+
architecturyModCheckBox.isSelected ||
123134
liteLoaderModCheckBox.isSelected ||
124135
bungeeCordPluginCheckBox.isSelected ||
125136
waterfallPluginCheckBox.isSelected ||
@@ -152,6 +163,10 @@ class PlatformChooserWizardStep(private val creator: MinecraftProjectCreator) :
152163
result += FabricProjectConfig()
153164
}
154165

166+
if (architecturyModCheckBox.isSelected) {
167+
result += ArchitecturyProjectConfig()
168+
}
169+
155170
if (liteLoaderModCheckBox.isSelected) {
156171
result += LiteLoaderProjectConfig()
157172
}

‎src/main/kotlin/creator/ProjectChooserWizardStep.form‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<properties/>
2929
<border type="empty"/>
3030
<children>
31-
<grid id="c580e" binding="chooserPanel" layout-manager="GridLayoutManager" row-count="11" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="5" vgap="5">
31+
<grid id="c580e" binding="chooserPanel" layout-manager="GridLayoutManager" row-count="12" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="5" vgap="5">
3232
<margin top="2" left="10" bottom="10" right="10"/>
3333
<constraints/>
3434
<properties/>
@@ -90,7 +90,7 @@
9090
</component>
9191
<component id="ef19b" class="javax.swing.JLabel">
9292
<constraints>
93-
<grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
93+
<grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
9494
</constraints>
9595
<properties>
9696
<icon value="assets/icons/platform/[email protected]"/>
@@ -140,15 +140,15 @@
140140
</component>
141141
<component id="51426" class="javax.swing.JCheckBox" binding="bungeeCordPluginCheckBox">
142142
<constraints>
143-
<grid row="8" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
143+
<grid row="9" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
144144
</constraints>
145145
<properties>
146146
<text value="BungeeCord Plugin"/>
147147
</properties>
148148
</component>
149149
<component id="a965" class="javax.swing.JLabel">
150150
<constraints>
151-
<grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
151+
<grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
152152
</constraints>
153153
<properties>
154154
<icon value="assets/icons/platform/[email protected]"/>
@@ -157,15 +157,15 @@
157157
</component>
158158
<component id="5a8c1" class="javax.swing.JCheckBox" binding="liteLoaderModCheckBox" default-binding="true">
159159
<constraints>
160-
<grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
160+
<grid row="7" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
161161
</constraints>
162162
<properties>
163163
<text value="LiteLoader Mod"/>
164164
</properties>
165165
</component>
166166
<component id="87b9d" class="javax.swing.JLabel">
167167
<constraints>
168-
<grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
168+
<grid row="10" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
169169
</constraints>
170170
<properties>
171171
<enabled value="true"/>
@@ -176,7 +176,7 @@
176176
</component>
177177
<component id="405e" class="javax.swing.JLabel">
178178
<constraints>
179-
<grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
179+
<grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
180180
</constraints>
181181
<properties>
182182
<enabled value="true"/>
@@ -187,23 +187,23 @@
187187
</component>
188188
<component id="55507" class="javax.swing.JCheckBox" binding="waterfallPluginCheckBox">
189189
<constraints>
190-
<grid row="9" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
190+
<grid row="10" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
191191
</constraints>
192192
<properties>
193193
<text value="Waterfall Plugin"/>
194194
</properties>
195195
</component>
196196
<component id="93e0" class="javax.swing.JCheckBox" binding="velocityPluginCheckBox">
197197
<constraints>
198-
<grid row="7" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
198+
<grid row="8" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
199199
</constraints>
200200
<properties>
201201
<text value="Velocity Plugin"/>
202202
</properties>
203203
</component>
204204
<vspacer id="d9ec2">
205205
<constraints>
206-
<grid row="10" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
206+
<grid row="11" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
207207
</constraints>
208208
</vspacer>
209209
<component id="e8c19" class="javax.swing.JLabel">
@@ -223,6 +223,23 @@
223223
<text value="Fabric Mod"/>
224224
</properties>
225225
</component>
226+
<component id="53465" class="javax.swing.JLabel">
227+
<constraints>
228+
<grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
229+
</constraints>
230+
<properties>
231+
<icon value="assets/icons/platform/[email protected]"/>
232+
<text value=""/>
233+
</properties>
234+
</component>
235+
<component id="d3acf" class="javax.swing.JCheckBox" binding="architecturyModCheckBox">
236+
<constraints>
237+
<grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
238+
</constraints>
239+
<properties>
240+
<text value="Architectury Mod"/>
241+
</properties>
242+
</component>
226243
</children>
227244
</grid>
228245
</children>

0 commit comments

Comments
 (0)