User: orlando sangiovanni Date: 09 Sep 26 16:56 Revision: b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8 Summary: Add Fabric 26.1+ class templates (Mojmap) (#2639) * Added freemarker templates for 26.1+ fabric mods and renamed old versions in "NAME (1.21.11-).java.xyza", enchantment 26.1+ template is not changed yet for my information miss * Set FabricEnchantment (26.1+).java.ft content according to NeoForgeEnchantment.java.ft but both are not functionals in newer versions, also renamed FabricStatusEffect (26.1+).java.xyza to FabricMobEffect (26.1+).java.xyza for coherence * Added a Minecraft version parsing for fabric with method computeVersion in FabricModule.kt * Fixed typos * Added gradle variables support and minecraft version for neoforge for remove enchantment template in 1.21+ * Added new Json template for 1.21+ enchantments instead of unfunctional java classes with a new action for minecraft resources creation containing for now only enchantments templates (in a future pr i think that i'll expand it, changing from Minecraft Enchantment to Minecraft Json and adding blockstates, models, etc. templates) * Improved resource modid detection resource root's modid now detected scanning the path instead of choosing ever the first modid in project modids * Update action text for Minecraft Json creation * Clean up commented code in MinecraftResourceCreateAction Removed commented-out code related to module and Minecraft version checks. * Cleaned Code and Deleting Rendundant Version Detecting Code * Remove fabricMinecraftVersion from FabricModule Remove unused fabricMinecraftVersion property. * Removed Unused Imports and Deleted Json Template * Resolved unrelated formatting changes * Fix formatting of constructor in ForgeEnchantment template * Default to newest template if mcVersion is null --------- Co-authored-by: joe TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10634&personal=false Index: src/main/kotlin/insight/generation/MinecraftClassCreateAction.kt =================================================================== --- src/main/kotlin/insight/generation/MinecraftClassCreateAction.kt (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) +++ src/main/kotlin/insight/generation/MinecraftClassCreateAction.kt (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -69,6 +69,7 @@ val isForge = MinecraftFacet.getInstance(module, ForgeModuleType) != null val isNeoForge = MinecraftFacet.getInstance(module, NeoForgeModuleType) != null val isFabric = MinecraftFacet.getInstance(module, FabricModuleType) != null + val mcVersion = MinecraftFacet.getInstance(module, McpModuleType)?.getSettings() ?.minecraftVersion?.let(SemanticVersion::parse) @@ -88,31 +89,41 @@ builder.addKind("Packet", icon, MinecraftTemplates.FORGE_1_17_PACKET_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) } + if (mcVersion < MinecraftVersions.MC1_21) { + builder.addKind("Enchantment", icon, MinecraftTemplates.FORGE_1_17_ENCHANTMENT_TEMPLATE) - } + } + } if (isNeoForge) { val icon = PlatformAssets.NEOFORGE_ICON builder.addKind("Block", icon, MinecraftTemplates.NEOFORGE_BLOCK_TEMPLATE) - builder.addKind("Enchantment", icon, MinecraftTemplates.NEOFORGE_ENCHANTMENT_TEMPLATE) builder.addKind("Item", icon, MinecraftTemplates.NEOFORGE_ITEM_TEMPLATE) builder.addKind("Mob effect", icon, MinecraftTemplates.NEOFORGE_MOB_EFFECT_TEMPLATE) builder.addKind("Packet", icon, MinecraftTemplates.NEOFORGE_PACKET_TEMPLATE) + if (mcVersion == null || mcVersion < MinecraftVersions.MC1_21) + builder.addKind("Enchantment", icon, MinecraftTemplates.NEOFORGE_ENCHANTMENT_TEMPLATE) } if (isFabric) { val icon = PlatformAssets.FABRIC_ICON + if (mcVersion != null && mcVersion < MinecraftVersions.MC26_1) { + builder.addKind("Block", icon, MinecraftTemplates.FABRIC_1_21_11_BLOCK_TEMPLATE) + builder.addKind("Item", icon, MinecraftTemplates.FABRIC_1_21_11_ITEM_TEMPLATE) + builder.addKind("Status effect", icon, MinecraftTemplates.FABRIC_1_21_11_STATUS_EFFECT_TEMPLATE) + } else { + builder.addKind("Block", icon, MinecraftTemplates.FABRIC_26_1_BLOCK_TEMPLATE) + builder.addKind("Item", icon, MinecraftTemplates.FABRIC_26_1_ITEM_TEMPLATE) + builder.addKind("Mob effect", icon, MinecraftTemplates.FABRIC_26_1_MOB_EFFECT_TEMPLATE) - builder.addKind("Block", icon, MinecraftTemplates.FABRIC_BLOCK_TEMPLATE) - builder.addKind("Enchantment", icon, MinecraftTemplates.FABRIC_ENCHANTMENT_TEMPLATE) - builder.addKind("Item", icon, MinecraftTemplates.FABRIC_ITEM_TEMPLATE) - builder.addKind("Status effect", icon, MinecraftTemplates.FABRIC_STATUS_EFFECT_TEMPLATE) - } + } + if (mcVersion != null && mcVersion < MinecraftVersions.MC1_21) + builder.addKind("Enchantment", icon, MinecraftTemplates.FABRIC_1_21_11_ENCHANTMENT_TEMPLATE) - } + } + } override fun isAvailable(dataContext: DataContext): Boolean { val psi = dataContext.getData(CommonDataKeys.PSI_ELEMENT) Index: src/main/kotlin/util/MinecraftTemplates.kt =================================================================== --- src/main/kotlin/util/MinecraftTemplates.kt (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) +++ src/main/kotlin/util/MinecraftTemplates.kt (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -161,13 +161,18 @@ } FileTemplateGroupDescriptor("Fabric", PlatformAssets.FABRIC_ICON).let { fabricSkeletonGroup -> skeletonGroup.addTemplate(fabricSkeletonGroup) - fabricSkeletonGroup.addTemplate(FileTemplateDescriptor(FABRIC_BLOCK_TEMPLATE)) - fabricSkeletonGroup.addTemplate(FileTemplateDescriptor(FABRIC_ITEM_TEMPLATE)) - fabricSkeletonGroup.addTemplate(FileTemplateDescriptor(FABRIC_ENCHANTMENT_TEMPLATE)) - fabricSkeletonGroup.addTemplate(FileTemplateDescriptor(FABRIC_STATUS_EFFECT_TEMPLATE)) + fabricSkeletonGroup.addTemplate(FileTemplateDescriptor(FABRIC_1_21_11_BLOCK_TEMPLATE)) + fabricSkeletonGroup.addTemplate(FileTemplateDescriptor(FABRIC_1_21_11_ITEM_TEMPLATE)) + fabricSkeletonGroup.addTemplate(FileTemplateDescriptor(FABRIC_1_21_11_ENCHANTMENT_TEMPLATE)) + fabricSkeletonGroup.addTemplate(FileTemplateDescriptor(FABRIC_1_21_11_STATUS_EFFECT_TEMPLATE)) + + fabricSkeletonGroup.addTemplate(FileTemplateDescriptor(FABRIC_26_1_BLOCK_TEMPLATE)) + fabricSkeletonGroup.addTemplate(FileTemplateDescriptor(FABRIC_26_1_ITEM_TEMPLATE)) + fabricSkeletonGroup.addTemplate(FileTemplateDescriptor(FABRIC_26_1_MOB_EFFECT_TEMPLATE)) + } - } + } FileTemplateGroupDescriptor("Licenses", null).let { licenseGroup -> group.addTemplate(licenseGroup) enumEntries().forEach { license -> @@ -268,11 +273,15 @@ const val FORGE_1_18_PACKET_TEMPLATE = "ForgePacket (1.18+).java" - const val FABRIC_BLOCK_TEMPLATE = "FabricBlock.java" - const val FABRIC_ITEM_TEMPLATE = "FabricItem.java" - const val FABRIC_ENCHANTMENT_TEMPLATE = "FabricEnchantment.java" - const val FABRIC_STATUS_EFFECT_TEMPLATE = "FabricStatusEffect.java" + const val FABRIC_1_21_11_BLOCK_TEMPLATE = "FabricBlock (1.21.11-).java" + const val FABRIC_1_21_11_ITEM_TEMPLATE = "FabricItem (1.21.11-).java" + const val FABRIC_1_21_11_ENCHANTMENT_TEMPLATE = "FabricEnchantment (1.21.11-).java" + const val FABRIC_1_21_11_STATUS_EFFECT_TEMPLATE = "FabricStatusEffect (1.21.11-).java" + const val FABRIC_26_1_BLOCK_TEMPLATE = "FabricBlock (26.1+).java" + const val FABRIC_26_1_ITEM_TEMPLATE = "FabricItem (26.1+).java" + const val FABRIC_26_1_MOB_EFFECT_TEMPLATE = "FabricMobEffect (26.1+).java" + const val NEOFORGE_MIXINS_JSON_TEMPLATE = "NeoForge Mixins Config.json" const val NEOFORGE_MAIN_CLASS_TEMPLATE = "NeoForge Main Class.java" const val NEOFORGE_CONFIG_TEMPLATE = "NeoForge Config.java" Index: src/main/kotlin/util/MinecraftVersions.kt =================================================================== --- src/main/kotlin/util/MinecraftVersions.kt (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) +++ src/main/kotlin/util/MinecraftVersions.kt (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -48,6 +48,7 @@ val MC1_21_1 = SemanticVersion.release(1, 21, 1) val MC1_21_11 = SemanticVersion.release(1, 21, 11) val MC26_1 = SemanticVersion.release(26, 1) + val MC26_2 = SemanticVersion.release(26, 2) fun requiredJavaVersion(minecraftVersion: SemanticVersion) = when { minecraftVersion <= MC1_16_5 -> JavaSdkVersion.JDK_1_8 Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock (1.21.11-).java.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock (1.21.11-).java.ft (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock (1.21.11-).java.ft (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -0,0 +1,10 @@ +#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end +#parse("File Header.java") + +import net.minecraft.block.Block; + +public class ${NAME} extends Block { + public ${NAME}(Settings settings) { + super(settings); + } +} Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock (1.21.11-).java.html =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock (1.21.11-).java.html (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock (1.21.11-).java.html (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -0,0 +1,25 @@ + + + + + A basic block class for fabric 1.21.11-. + + Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock (26.1+).java.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock (26.1+).java.ft (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock (26.1+).java.ft (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -0,0 +1,10 @@ +#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end +#parse("File Header.java") + +import net.minecraft.world.level.block.Block; + +public class ${NAME} extends Block { + public ${NAME}(Properties properties) { + super(properties); + } +} Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock (26.1+).java.html =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock (26.1+).java.html (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock (26.1+).java.html (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -0,0 +1,25 @@ + + + + + A basic block class for fabric 26.1+. + + Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock.java.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock.java.ft (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock.java.ft (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) @@ -1,10 +0,0 @@ -#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end -#parse("File Header.java") - -import net.minecraft.block.Block; - -public class ${NAME} extends Block { - public ${NAME}(Settings settings) { - super(settings); - } -} Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock.java.html =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock.java.html (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricBlock.java.html (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) @@ -1,25 +0,0 @@ - - - - - A basic block class for fabric. - - Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricEnchantment (1.21.11-).java.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricEnchantment (1.21.11-).java.ft (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricEnchantment (1.21.11-).java.ft (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -0,0 +1,12 @@ +#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end +#parse("File Header.java") + +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentTarget; +import net.minecraft.entity.EquipmentSlot; + +public class ${NAME} extends Enchantment { + public ${NAME}(Rarity weight, EnchantmentTarget type, EquipmentSlot[] slotTypes) { + super(weight, type, slotTypes); + } +} Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricEnchantment (1.21.11-).java.html =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricEnchantment (1.21.11-).java.html (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricEnchantment (1.21.11-).java.html (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -0,0 +1,25 @@ + + + + + A basic enchantment class for fabric 1.21.11-. + + Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricEnchantment.java.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricEnchantment.java.ft (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricEnchantment.java.ft (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) @@ -1,12 +0,0 @@ -#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end -#parse("File Header.java") - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentTarget; -import net.minecraft.entity.EquipmentSlot; - -public class ${NAME} extends Enchantment { - public ${NAME}(Rarity weight, EnchantmentTarget type, EquipmentSlot[] slotTypes) { - super(weight, type, slotTypes); - } -} Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricEnchantment.java.html =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricEnchantment.java.html (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricEnchantment.java.html (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) @@ -1,25 +0,0 @@ - - - - - A basic enchantment class for fabric. - - Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem (1.21.11-).java.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem (1.21.11-).java.ft (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem (1.21.11-).java.ft (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -0,0 +1,10 @@ +#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end +#parse("File Header.java") + +import net.minecraft.item.Item; + +public class ${NAME} extends Item { + public ${NAME}(Settings settings) { + super(settings); + } +} Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem (1.21.11-).java.html =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem (1.21.11-).java.html (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem (1.21.11-).java.html (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -0,0 +1,25 @@ + + + + + An empty Fabric item class for 1.21.11-. + + Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem (26.1+).java.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem (26.1+).java.ft (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem (26.1+).java.ft (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -0,0 +1,10 @@ +#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end +#parse("File Header.java") + +import net.minecraft.world.item.Item; + +public class ${NAME} extends Item { + public ${NAME}(Properties props) { + super(props); + } +} Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem (26.1+).java.html =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem (26.1+).java.html (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem (26.1+).java.html (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -0,0 +1,25 @@ + + + + + An empty Fabric item class for 1.21.11-. + + Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem.java.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem.java.ft (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem.java.ft (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) @@ -1,10 +0,0 @@ -#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end -#parse("File Header.java") - -import net.minecraft.item.Item; - -public class ${NAME} extends Item { - public ${NAME}(Settings settings) { - super(settings); - } -} Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem.java.html =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem.java.html (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricItem.java.html (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) @@ -1,25 +0,0 @@ - - - - - An empty Fabric item class. - - Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricMobEffect (26.1+).java.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricMobEffect (26.1+).java.ft (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricMobEffect (26.1+).java.ft (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -0,0 +1,10 @@ +#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 mobEffectCategory, int color) { + super(mobEffectCategory, color); + } +} \ No newline at end of file Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricMobEffect (26.1+).java.html =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricMobEffect (26.1+).java.html (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricMobEffect (26.1+).java.html (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -0,0 +1,25 @@ + + + + +An empty Fabric status effect class for 1.21.11- . + + Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricStatusEffect (1.21.11-).java.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricStatusEffect (1.21.11-).java.ft (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricStatusEffect (1.21.11-).java.ft (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -0,0 +1,11 @@ +#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end +#parse("File Header.java") + +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.entity.effect.StatusEffectCategory; + +public class ${NAME} extends StatusEffect { + public ${NAME}(StatusEffectCategory statusEffectCategory, int color) { + super(statusEffectCategory, color); + } +} \ No newline at end of file Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricStatusEffect (1.21.11-).java.html =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricStatusEffect (1.21.11-).java.html (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricStatusEffect (1.21.11-).java.html (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -0,0 +1,25 @@ + + + + + An empty Fabric status effect class for 1.21.11- . + + Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricStatusEffect.java.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricStatusEffect.java.ft (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricStatusEffect.java.ft (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) @@ -1,11 +0,0 @@ -#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end -#parse("File Header.java") - -import net.minecraft.entity.effect.StatusEffect; -import net.minecraft.entity.effect.StatusEffectCategory; - -public class ${NAME} extends StatusEffect { - public ${NAME}(StatusEffectCategory statusEffectCategory, int color) { - super(statusEffectCategory, color); - } -} \ No newline at end of file Index: src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricStatusEffect.java.html =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricStatusEffect.java.html (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) +++ src/main/resources/fileTemplates/j2ee/skeleton/fabric/FabricStatusEffect.java.html (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) @@ -1,25 +0,0 @@ - - - - - An empty Fabric status effect class. - - Index: src/main/resources/fileTemplates/j2ee/skeleton/forge/ForgeEnchantment (1.17+).java.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/skeleton/forge/ForgeEnchantment (1.17+).java.ft (revision c6f0217256b87cc10966c66f6d04d239ebd0d0ee) +++ src/main/resources/fileTemplates/j2ee/skeleton/forge/ForgeEnchantment (1.17+).java.ft (revision b8a594f8f8413eef6bdfa66bbd13b3dbc2392af8) @@ -7,6 +7,6 @@ public class ${NAME} extends Enchantment { public ${NAME}(Rarity rarity, EnchantmentCategory category, EquipmentSlot[] slots) { - super(rarity, category, slots); + super(rarity, category, slots); } }