User: mysterious_dev Date: 05 Jan 23 22:05 Revision: 68cb436cd52508a4a43ede0b213d038bc67eb1ad Summary: Add Mob Effect template & reorder templates list alphabetically (#1917) * Add Mob Effect template & reorder template list alphabetically * Delete useless blank line * Decrease version for html file * Test compatibility for 1.17+ TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8209&personal=false Index: src/main/kotlin/insight/generation/MinecraftClassCreateAction.kt =================================================================== --- src/main/kotlin/insight/generation/MinecraftClassCreateAction.kt (revision d2124e2b5c2a8d0e3c8493abd5b510dd2e995ca0) +++ src/main/kotlin/insight/generation/MinecraftClassCreateAction.kt (revision 68cb436cd52508a4a43ede0b213d038bc67eb1ad) @@ -64,27 +64,29 @@ if (mcVersion < MinecraftVersions.MC1_17) { builder.addKind("Block", icon, MinecraftTemplates.FORGE_BLOCK_TEMPLATE) + builder.addKind("Enchantment", icon, MinecraftTemplates.FORGE_ENCHANTMENT_TEMPLATE) builder.addKind("Item", icon, MinecraftTemplates.FORGE_ITEM_TEMPLATE) builder.addKind("Packet", icon, MinecraftTemplates.FORGE_PACKET_TEMPLATE) - builder.addKind("Enchantment", icon, MinecraftTemplates.FORGE_ENCHANTMENT_TEMPLATE) } else if (mcVersion < MinecraftVersions.MC1_18) { builder.addKind("Block", icon, MinecraftTemplates.FORGE_1_17_BLOCK_TEMPLATE) + builder.addKind("Enchantment", icon, MinecraftTemplates.FORGE_1_17_ENCHANTMENT_TEMPLATE) builder.addKind("Item", icon, MinecraftTemplates.FORGE_1_17_ITEM_TEMPLATE) + builder.addKind("Mob Effect", icon, MinecraftTemplates.FORGE_1_17_MOB_EFFECT_TEMPLATE) builder.addKind("Packet", icon, MinecraftTemplates.FORGE_1_17_PACKET_TEMPLATE) - builder.addKind("Enchantment", icon, MinecraftTemplates.FORGE_1_17_ENCHANTMENT_TEMPLATE) } else { builder.addKind("Block", icon, MinecraftTemplates.FORGE_1_17_BLOCK_TEMPLATE) + builder.addKind("Enchantment", icon, MinecraftTemplates.FORGE_1_17_ENCHANTMENT_TEMPLATE) builder.addKind("Item", icon, MinecraftTemplates.FORGE_1_17_ITEM_TEMPLATE) + builder.addKind("Mob Effect", icon, MinecraftTemplates.FORGE_1_17_MOB_EFFECT_TEMPLATE) builder.addKind("Packet", icon, MinecraftTemplates.FORGE_1_18_PACKET_TEMPLATE) - builder.addKind("Enchantment", icon, MinecraftTemplates.FORGE_1_17_ENCHANTMENT_TEMPLATE) } } if (isFabric) { val icon = PlatformAssets.FABRIC_ICON builder.addKind("Block", icon, MinecraftTemplates.FABRIC_BLOCK_TEMPLATE) - builder.addKind("Item", icon, MinecraftTemplates.FABRIC_ITEM_TEMPLATE) builder.addKind("Enchantment", icon, MinecraftTemplates.FABRIC_ENCHANTMENT_TEMPLATE) + builder.addKind("Item", icon, MinecraftTemplates.FABRIC_ITEM_TEMPLATE) } } Index: src/main/kotlin/util/MinecraftTemplates.kt =================================================================== --- src/main/kotlin/util/MinecraftTemplates.kt (revision d2124e2b5c2a8d0e3c8493abd5b510dd2e995ca0) +++ src/main/kotlin/util/MinecraftTemplates.kt (revision 68cb436cd52508a4a43ede0b213d038bc67eb1ad) @@ -301,6 +301,7 @@ const val FORGE_1_17_ITEM_TEMPLATE = "ForgeItem (1.17+).java" const val FORGE_1_17_PACKET_TEMPLATE = "ForgePacket (1.17+).java" const val FORGE_1_17_ENCHANTMENT_TEMPLATE = "ForgeEnchantment (1.17+).java" + const val FORGE_1_17_MOB_EFFECT_TEMPLATE = "ForgeMobEffect (1.17+).java" const val FORGE_1_18_PACKET_TEMPLATE = "ForgePacket (1.18+).java" Index: src/main/resources/fileTemplates/j2ee/skeleton/forge/ForgeMobEffect (1.17+).java.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/forge/ForgeMobEffect (1.17+).java.ft (revision 68cb436cd52508a4a43ede0b213d038bc67eb1ad) +++ src/main/resources/fileTemplates/j2ee/skeleton/forge/ForgeMobEffect (1.17+).java.ft (revision 68cb436cd52508a4a43ede0b213d038bc67eb1ad) @@ -0,0 +1,11 @@ +#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end +#parse("File Header.java") + +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffectCategory; + +public class ${NAME} extends MobEffect { + public ${NAME}(MobEffectCategory category, int color) { + super(category, color); + } +} Index: src/main/resources/fileTemplates/j2ee/skeleton/forge/ForgeModEffect (1.17+).java.html =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/forge/ForgeModEffect (1.17+).java.html (revision 68cb436cd52508a4a43ede0b213d038bc67eb1ad) +++ src/main/resources/fileTemplates/j2ee/skeleton/forge/ForgeModEffect (1.17+).java.html (revision 68cb436cd52508a4a43ede0b213d038bc67eb1ad) @@ -0,0 +1,15 @@ + + + + + Forge 1.17+ style mob effect class + +