diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..869b225 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 sillyangel + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..ee56bf3 --- /dev/null +++ b/build.gradle @@ -0,0 +1,73 @@ +plugins { + id 'dev.architectury.loom' version '1.13.467' apply false + id 'architectury-plugin' version '3.4.162' + id 'com.gradleup.shadow' version '8.3.6' apply false +} + +architectury { + minecraft = project.minecraft_version +} + +allprojects { + group = rootProject.maven_group + version = rootProject.mod_version +} + +subprojects { + apply plugin: 'dev.architectury.loom' + apply plugin: 'architectury-plugin' + apply plugin: 'maven-publish' + + base { + // Set up a suffixed format for the mod jar names, e.g. `example-fabric`. + archivesName = "$rootProject.archives_name-$project.name" + } + + repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. + } + + dependencies { + minecraft "net.minecraft:minecraft:$rootProject.minecraft_version" + mappings loom.layered { + it.mappings("net.fabricmc:yarn:$rootProject.yarn_mappings:v2") + it.mappings("dev.architectury:yarn-mappings-patch-neoforge:$rootProject.yarn_mappings_patch_neoforge_version") + } + } + + java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 + } + + tasks.withType(JavaCompile).configureEach { + it.options.release = 21 + } + + // Configure Maven publishing. + publishing { + publications { + mavenJava(MavenPublication) { + artifactId = base.archivesName.get() + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } + } +} diff --git a/common/build.gradle b/common/build.gradle new file mode 100644 index 0000000..1c30675 --- /dev/null +++ b/common/build.gradle @@ -0,0 +1,24 @@ +def generatedResources = file("src/generated/resources") + +architectury { + common rootProject.enabled_platforms.split(',') +} + +sourceSets { + main { + resources { + srcDir generatedResources + exclude '.cache/**' + } + } +} + +dependencies { + // We depend on Fabric Loader here to use the Fabric @Environment annotations, + // which get remapped to the correct annotations on each platform. + // Do NOT use other classes from Fabric Loader. + modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version" + + // Architectury API. This is optional, and you can comment it out if you don't need it. + modImplementation "dev.architectury:architectury:$rootProject.architectury_api_version" +} diff --git a/common/src/generated/resources/data/more_spear_enchantments/enchantment/crippling.json b/common/src/generated/resources/data/more_spear_enchantments/enchantment/crippling.json new file mode 100644 index 0000000..111a613 --- /dev/null +++ b/common/src/generated/resources/data/more_spear_enchantments/enchantment/crippling.json @@ -0,0 +1,36 @@ +{ + "anvil_cost": 5, + "description": { + "translate": "enchantment.more_spear_enchantments.crippling" + }, + "effects": { + "minecraft:post_attack": [ + { + "affected": "victim", + "effect": { + "type": "more_spear_enchantments:crippling", + "duration": { + "type": "minecraft:linear", + "base": 2.0, + "per_level_above_first": 1.0 + } + }, + "enchanted": "attacker" + } + ] + }, + "max_cost": { + "base": 1, + "per_level_above_first": 15 + }, + "max_level": 3, + "min_cost": { + "base": 1, + "per_level_above_first": 10 + }, + "slots": [ + "hand" + ], + "supported_items": "#more_spear_enchantments:spears", + "weight": 10 +} \ No newline at end of file diff --git a/common/src/generated/resources/data/more_spear_enchantments/enchantment/poisoning.json b/common/src/generated/resources/data/more_spear_enchantments/enchantment/poisoning.json new file mode 100644 index 0000000..f161efc --- /dev/null +++ b/common/src/generated/resources/data/more_spear_enchantments/enchantment/poisoning.json @@ -0,0 +1,36 @@ +{ + "anvil_cost": 5, + "description": { + "translate": "enchantment.more_spear_enchantments.poisoning" + }, + "effects": { + "minecraft:post_attack": [ + { + "affected": "victim", + "effect": { + "type": "more_spear_enchantments:poison", + "duration": { + "type": "minecraft:linear", + "base": 3.0, + "per_level_above_first": 1.0 + } + }, + "enchanted": "attacker" + } + ] + }, + "max_cost": { + "base": 1, + "per_level_above_first": 15 + }, + "max_level": 3, + "min_cost": { + "base": 1, + "per_level_above_first": 10 + }, + "slots": [ + "hand" + ], + "supported_items": "#more_spear_enchantments:spears", + "weight": 10 +} \ No newline at end of file diff --git a/common/src/generated/resources/data/more_spear_enchantments/enchantment/thundering.json b/common/src/generated/resources/data/more_spear_enchantments/enchantment/thundering.json new file mode 100644 index 0000000..a0e20ae --- /dev/null +++ b/common/src/generated/resources/data/more_spear_enchantments/enchantment/thundering.json @@ -0,0 +1,36 @@ +{ + "anvil_cost": 5, + "description": { + "translate": "enchantment.more_spear_enchantments.thundering" + }, + "effects": { + "minecraft:post_attack": [ + { + "affected": "victim", + "effect": { + "type": "more_spear_enchantments:lightning", + "amount": { + "type": "minecraft:linear", + "base": 0.4, + "per_level_above_first": 0.2 + } + }, + "enchanted": "attacker" + } + ] + }, + "max_cost": { + "base": 1, + "per_level_above_first": 15 + }, + "max_level": 3, + "min_cost": { + "base": 1, + "per_level_above_first": 10 + }, + "slots": [ + "hand" + ], + "supported_items": "#more_spear_enchantments:spears", + "weight": 10 +} \ No newline at end of file diff --git a/common/src/generated/resources/data/more_spear_enchantments/enchantment/withering.json b/common/src/generated/resources/data/more_spear_enchantments/enchantment/withering.json new file mode 100644 index 0000000..a6cf15c --- /dev/null +++ b/common/src/generated/resources/data/more_spear_enchantments/enchantment/withering.json @@ -0,0 +1,36 @@ +{ + "anvil_cost": 5, + "description": { + "translate": "enchantment.more_spear_enchantments.withering" + }, + "effects": { + "minecraft:post_attack": [ + { + "affected": "victim", + "effect": { + "type": "more_spear_enchantments:withering", + "duration": { + "type": "minecraft:linear", + "base": 2.0, + "per_level_above_first": 1.0 + } + }, + "enchanted": "attacker" + } + ] + }, + "max_cost": { + "base": 1, + "per_level_above_first": 15 + }, + "max_level": 3, + "min_cost": { + "base": 1, + "per_level_above_first": 10 + }, + "slots": [ + "hand" + ], + "supported_items": "#more_spear_enchantments:spears", + "weight": 10 +} \ No newline at end of file diff --git a/common/src/generated/resources/data/more_spear_enchantments/tags/item/spears.json b/common/src/generated/resources/data/more_spear_enchantments/tags/item/spears.json new file mode 100644 index 0000000..a87824b --- /dev/null +++ b/common/src/generated/resources/data/more_spear_enchantments/tags/item/spears.json @@ -0,0 +1,11 @@ +{ + "values": [ + "minecraft:wooden_spear", + "minecraft:stone_spear", + "minecraft:copper_spear", + "minecraft:iron_spear", + "minecraft:golden_spear", + "minecraft:diamond_spear", + "minecraft:netherite_spear" + ] +} \ No newline at end of file diff --git a/common/src/main/java/dev/sillyangel/more_spear_enchantments/MoreSpearEnchantments.java b/common/src/main/java/dev/sillyangel/more_spear_enchantments/MoreSpearEnchantments.java new file mode 100644 index 0000000..13ea333 --- /dev/null +++ b/common/src/main/java/dev/sillyangel/more_spear_enchantments/MoreSpearEnchantments.java @@ -0,0 +1,15 @@ +package dev.sillyangel.more_spear_enchantments; + +import dev.sillyangel.more_spear_enchantments.enchantment.ModEnchantmentEffects; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public final class MoreSpearEnchantments { + public static final String MOD_ID = "more_spear_enchantments"; + public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); + + public static void init() { + LOGGER.info("Initializing More Spear Enchantments"); + ModEnchantmentEffects.registerModEnchantmentEffects(); + } +} diff --git a/common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/ModEnchantmentEffects.java b/common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/ModEnchantmentEffects.java new file mode 100644 index 0000000..4a8f562 --- /dev/null +++ b/common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/ModEnchantmentEffects.java @@ -0,0 +1,45 @@ +package dev.sillyangel.more_spear_enchantments.enchantment; + +import com.mojang.serialization.MapCodec; +import dev.architectury.registry.registries.DeferredRegister; +import dev.architectury.registry.registries.RegistrySupplier; +import dev.sillyangel.more_spear_enchantments.MoreSpearEnchantments; +import dev.sillyangel.more_spear_enchantments.enchantment.effect.*; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.effect.EnchantmentEntityEffect; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; + +public class ModEnchantmentEffects { + // Deferred register for enchantment effect types + public static final DeferredRegister> ENCHANTMENT_ENTITY_EFFECTS = + DeferredRegister.create(MoreSpearEnchantments.MOD_ID, RegistryKeys.ENCHANTMENT_ENTITY_EFFECT_TYPE); + + // Enchantment registry keys + public static final RegistryKey THUNDERING = of("thundering"); + public static final RegistryKey WITHERING = of("withering"); + public static final RegistryKey POISONING = of("poisoning"); + public static final RegistryKey CRIPPLING = of("crippling"); + + // Register enchantment effect types + public static final RegistrySupplier> LIGHTNING_EFFECT = + ENCHANTMENT_ENTITY_EFFECTS.register("lightning", () -> LightningEnchantmentEffect.CODEC); + public static final RegistrySupplier> POISON_EFFECT = + ENCHANTMENT_ENTITY_EFFECTS.register("poison", () -> PoisonEnchantmentEffect.CODEC); + public static final RegistrySupplier> WITHERING_EFFECT = + ENCHANTMENT_ENTITY_EFFECTS.register("withering", () -> WitheringEnchantmentEffect.CODEC); + public static final RegistrySupplier> CRIPPLING_EFFECT = + ENCHANTMENT_ENTITY_EFFECTS.register("crippling", () -> CripplingEnchantmentEffect.CODEC); + + private static RegistryKey of(String path) { + Identifier id = Identifier.of(MoreSpearEnchantments.MOD_ID, path); + return RegistryKey.of(RegistryKeys.ENCHANTMENT, id); + } + + public static void registerModEnchantmentEffects() { + MoreSpearEnchantments.LOGGER.info("Registering EnchantmentEffects for " + MoreSpearEnchantments.MOD_ID); + ENCHANTMENT_ENTITY_EFFECTS.register(); + } +} + diff --git a/common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/CripplingEnchantmentEffect.java b/common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/CripplingEnchantmentEffect.java new file mode 100644 index 0000000..44d33ee --- /dev/null +++ b/common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/CripplingEnchantmentEffect.java @@ -0,0 +1,53 @@ +package dev.sillyangel.more_spear_enchantments.enchantment.effect; + +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.enchantment.EnchantmentEffectContext; +import net.minecraft.enchantment.EnchantmentLevelBasedValue; +import net.minecraft.enchantment.effect.EnchantmentEntityEffect; +import net.minecraft.util.math.Vec3d; + +public record CripplingEnchantmentEffect(EnchantmentLevelBasedValue duration) implements EnchantmentEntityEffect { + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> + instance.group( + EnchantmentLevelBasedValue.CODEC.fieldOf("duration").forGetter(CripplingEnchantmentEffect::duration) + ).apply(instance, CripplingEnchantmentEffect::new) + ); + + @Override + public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity target, Vec3d pos) { + if (target instanceof LivingEntity victim) { + if (context.owner() != null && context.owner() instanceof PlayerEntity player) { + int Duration = (int) (this.duration.getValue(level) * 50); // Convert to ticks + int slownessAmplifier = level - 1; // Level 1 = Slowness 0, Level 2 = Slowness I, Level 3 = Slowness II + int weaknessAmplifier = level - 1; // Level 1 = Weakness 0, Level 2 = Weakness I, Level 3 = Weakness II + victim.addStatusEffect(new StatusEffectInstance( + StatusEffects.SLOWNESS, + Duration, + slownessAmplifier, + false, + true + )); + victim.addStatusEffect(new StatusEffectInstance( + StatusEffects.WEAKNESS, + Duration, + weaknessAmplifier, + false, + true + )); + } + } + } + + @Override + public MapCodec getCodec() { + return CODEC; + } +} + diff --git a/common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/LightningEnchantmentEffect.java b/common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/LightningEnchantmentEffect.java new file mode 100644 index 0000000..4e3a186 --- /dev/null +++ b/common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/LightningEnchantmentEffect.java @@ -0,0 +1,42 @@ +package dev.sillyangel.more_spear_enchantments.enchantment.effect; + +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.util.math.BlockPos; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.SpawnReason; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.enchantment.EnchantmentEffectContext; +import net.minecraft.enchantment.EnchantmentLevelBasedValue; +import net.minecraft.enchantment.effect.EnchantmentEntityEffect; +import net.minecraft.util.math.Vec3d; + +public record LightningEnchantmentEffect(EnchantmentLevelBasedValue amount) implements EnchantmentEntityEffect { + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> + instance.group( + EnchantmentLevelBasedValue.CODEC.fieldOf("amount").forGetter(LightningEnchantmentEffect::amount) + ).apply(instance, LightningEnchantmentEffect::new) + ); + + @Override + public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity target, Vec3d pos) { + if (target instanceof LivingEntity victim) { + if (context.owner() != null && context.owner() instanceof PlayerEntity player) { + float numStrikes = this.amount.getValue(level); + + for (float i = 0; i < numStrikes; i++) { + BlockPos position = victim.getBlockPos(); + EntityType.LIGHTNING_BOLT.spawn(world, position, SpawnReason.TRIGGERED); + } + } + } + } + + @Override + public MapCodec getCodec() { + return CODEC; + } +} diff --git a/common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/PoisonEnchantmentEffect.java b/common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/PoisonEnchantmentEffect.java new file mode 100644 index 0000000..69fc2a3 --- /dev/null +++ b/common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/PoisonEnchantmentEffect.java @@ -0,0 +1,46 @@ +package dev.sillyangel.more_spear_enchantments.enchantment.effect; + +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.enchantment.EnchantmentEffectContext; +import net.minecraft.enchantment.EnchantmentLevelBasedValue; +import net.minecraft.enchantment.effect.EnchantmentEntityEffect; +import net.minecraft.util.math.Vec3d; + +public record PoisonEnchantmentEffect(EnchantmentLevelBasedValue duration) implements EnchantmentEntityEffect { + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> + instance.group( + EnchantmentLevelBasedValue.CODEC.fieldOf("duration").forGetter(PoisonEnchantmentEffect::duration) + ).apply(instance, PoisonEnchantmentEffect::new) + ); + + @Override + public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity target, Vec3d pos) { + if (target instanceof LivingEntity victim) { + if (context.owner() != null && context.owner() instanceof PlayerEntity player) { + int poisonDuration = (int) (this.duration.getValue(level) * 40); // Convert to ticks + int poisonAmplifier = level - 2; // Level 1 = Poison 0, Level 2 = Poison I, Level 3 = Poison II + + victim.addStatusEffect(new StatusEffectInstance( + StatusEffects.POISON, + poisonDuration, + poisonAmplifier, + false, + true + )); + } + } + } + + @Override + public MapCodec getCodec() { + return CODEC; + } +} + diff --git a/common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/WitheringEnchantmentEffect.java b/common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/WitheringEnchantmentEffect.java new file mode 100644 index 0000000..7a581f1 --- /dev/null +++ b/common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/WitheringEnchantmentEffect.java @@ -0,0 +1,46 @@ +package dev.sillyangel.more_spear_enchantments.enchantment.effect; + +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.enchantment.EnchantmentEffectContext; +import net.minecraft.enchantment.EnchantmentLevelBasedValue; +import net.minecraft.enchantment.effect.EnchantmentEntityEffect; +import net.minecraft.util.math.Vec3d; + +public record WitheringEnchantmentEffect(EnchantmentLevelBasedValue duration) implements EnchantmentEntityEffect { + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> + instance.group( + EnchantmentLevelBasedValue.CODEC.fieldOf("duration").forGetter(WitheringEnchantmentEffect::duration) + ).apply(instance, WitheringEnchantmentEffect::new) + ); + + @Override + public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity target, Vec3d pos) { + if (target instanceof LivingEntity victim) { + if (context.owner() != null && context.owner() instanceof PlayerEntity player) { + int witherDuration = (int) (this.duration.getValue(level) * 40); // Convert to ticks + int witherAmplifier = level - 2; // Level 1 = Wither 0, Level 2 = Wither I, Level 3 = Wither II + + victim.addStatusEffect(new StatusEffectInstance( + StatusEffects.WITHER, + witherDuration, + witherAmplifier, + false, + true + )); + } + } + } + + @Override + public MapCodec getCodec() { + return CODEC; + } +} + diff --git a/common/src/main/java/dev/sillyangel/more_spear_enchantments/util/ModTags.java b/common/src/main/java/dev/sillyangel/more_spear_enchantments/util/ModTags.java new file mode 100644 index 0000000..5c8f405 --- /dev/null +++ b/common/src/main/java/dev/sillyangel/more_spear_enchantments/util/ModTags.java @@ -0,0 +1,25 @@ +package dev.sillyangel.more_spear_enchantments.util; + +import dev.sillyangel.more_spear_enchantments.MoreSpearEnchantments; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; + +public class ModTags { + public static class Blocks { + + private static TagKey createTag(String name) { + return TagKey.of(RegistryKeys.BLOCK, Identifier.of(MoreSpearEnchantments.MOD_ID, name)); + } + } + + public static class Items { + public static final TagKey SPEARS = createTag("spears"); + + private static TagKey createTag(String name) { + return TagKey.of(RegistryKeys.ITEM, Identifier.of(MoreSpearEnchantments.MOD_ID, name)); + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/more_spear_enchantments/icon.png b/common/src/main/resources/assets/more_spear_enchantments/icon.png new file mode 100644 index 0000000..920ad19 Binary files /dev/null and b/common/src/main/resources/assets/more_spear_enchantments/icon.png differ diff --git a/common/src/main/resources/assets/more_spear_enchantments/lang/en_pt.json b/common/src/main/resources/assets/more_spear_enchantments/lang/en_pt.json new file mode 100644 index 0000000..22d14ae --- /dev/null +++ b/common/src/main/resources/assets/more_spear_enchantments/lang/en_pt.json @@ -0,0 +1,6 @@ +{ + "enchantment.more_spear_enchantments.thundering": "Storm o' Thunder", + "enchantment.more_spear_enchantments.withering": "Rot o' Doom", + "enchantment.more_spear_enchantments.crippling": "Crippled Legs", + "enchantment.more_spear_enchantments.poisoning": "Venom'd Blade" +} diff --git a/common/src/main/resources/assets/more_spear_enchantments/lang/en_ud.json b/common/src/main/resources/assets/more_spear_enchantments/lang/en_ud.json new file mode 100644 index 0000000..b6743b0 --- /dev/null +++ b/common/src/main/resources/assets/more_spear_enchantments/lang/en_ud.json @@ -0,0 +1,6 @@ +{ + "enchantment.more_spear_enchantments.thundering": "ƃuᴉɹǝpunɥꓕ", + "enchantment.more_spear_enchantments.withering": "ƃuᴉɹǝɥʇᴉM", + "enchantment.more_spear_enchantments.crippling": "ƃuᴉlddᴉɹƆ", + "enchantment.more_spear_enchantments.poisoning": "ƃuᴉuosuᴉԀ" +} diff --git a/common/src/main/resources/assets/more_spear_enchantments/lang/en_us.json b/common/src/main/resources/assets/more_spear_enchantments/lang/en_us.json new file mode 100644 index 0000000..40d249c --- /dev/null +++ b/common/src/main/resources/assets/more_spear_enchantments/lang/en_us.json @@ -0,0 +1,7 @@ +{ + "enchantment.more_spear_enchantments.thundering": "Thundering", + "enchantment.more_spear_enchantments.withering": "Withering", + "enchantment.more_spear_enchantments.crippling": "Crippling", + "enchantment.more_spear_enchantments.poisoning": "Poisoning" +} + diff --git a/common/src/main/resources/assets/more_spear_enchantments/lang/es_mx.json b/common/src/main/resources/assets/more_spear_enchantments/lang/es_mx.json new file mode 100644 index 0000000..dec0f2d --- /dev/null +++ b/common/src/main/resources/assets/more_spear_enchantments/lang/es_mx.json @@ -0,0 +1,6 @@ +{ + "enchantment.more_spear_enchantments.thundering": "Tronante", + "enchantment.more_spear_enchantments.withering": "Marchitante", + "enchantment.more_spear_enchantments.crippling": "Lisiador", + "enchantment.more_spear_enchantments.poisoning": "Envenenamiento" +} diff --git a/common/src/main/resources/assets/more_spear_enchantments/lang/fr_fr.json b/common/src/main/resources/assets/more_spear_enchantments/lang/fr_fr.json new file mode 100644 index 0000000..613c1a0 --- /dev/null +++ b/common/src/main/resources/assets/more_spear_enchantments/lang/fr_fr.json @@ -0,0 +1,6 @@ +{ + "enchantment.more_spear_enchantments.thundering": "Tonnerre", + "enchantment.more_spear_enchantments.withering": "Flétrissure", + "enchantment.more_spear_enchantments.crippling": "Estropiant", + "enchantment.more_spear_enchantments.poisoning": "Empoisonnement" +} diff --git a/common/src/main/resources/more_spear_enchantments.mixins.json b/common/src/main/resources/more_spear_enchantments.mixins.json new file mode 100644 index 0000000..6a9d3a9 --- /dev/null +++ b/common/src/main/resources/more_spear_enchantments.mixins.json @@ -0,0 +1,13 @@ +{ + "required": true, + "package": "dev.sillyangel.more_spear_enchantments.mixin", + "compatibilityLevel": "JAVA_21", + "minVersion": "0.8", + "client": [ + ], + "mixins": [ + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/fabric/build.gradle b/fabric/build.gradle new file mode 100644 index 0000000..69f1058 --- /dev/null +++ b/fabric/build.gradle @@ -0,0 +1,73 @@ +plugins { + id 'com.gradleup.shadow' +} + +architectury { + platformSetupLoomIde() + fabric() +} + +configurations { + common { + canBeResolved = true + canBeConsumed = false + } + compileClasspath.extendsFrom common + runtimeClasspath.extendsFrom common + developmentFabric.extendsFrom common + + // Files in this configuration will be bundled into your mod using the Shadow plugin. + // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files. + shadowBundle { + canBeResolved = true + canBeConsumed = false + } +} + +dependencies { + modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version" + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:$rootProject.fabric_api_version" + + // Architectury API. This is optional, and you can comment it out if you don't need it. + modImplementation "dev.architectury:architectury-fabric:$rootProject.architectury_api_version" + + common(project(path: ':common', configuration: 'namedElements')) { transitive = false } + shadowBundle project(path: ':common', configuration: 'transformProductionFabric') +} + +processResources { + inputs.property 'version', project.version + + filesMatching('fabric.mod.json') { + expand version: inputs.properties.version + } +} + +shadowJar { + configurations = [project.configurations.shadowBundle] + archiveClassifier = 'dev-shadow' +} + +remapJar { + inputFile.set shadowJar.archiveFile +} + +loom { + runs { + datagen { + inherit client + name "Data Generation" + vmArg "-Dfabric-api.datagen" + vmArg "-Dfabric-api.datagen.output-dir=${project(':common').file('src/generated/resources').absolutePath}" + vmArg "-Dfabric-api.datagen.modid=more_spear_enchantments" + + runDir "build/datagen" + } + } +} + + + + diff --git a/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/MoreSpearEnchantmentsDataGenerator.java b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/MoreSpearEnchantmentsDataGenerator.java new file mode 100644 index 0000000..e5669fb --- /dev/null +++ b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/MoreSpearEnchantmentsDataGenerator.java @@ -0,0 +1,16 @@ +package dev.sillyangel.more_spear_enchantments.fabric; + +import dev.sillyangel.more_spear_enchantments.fabric.datagen.ModItemTagProvider; +import dev.sillyangel.more_spear_enchantments.fabric.enchantment.ModEnchantmentGenerator; +import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; +import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; + +public class MoreSpearEnchantmentsDataGenerator implements DataGeneratorEntrypoint { + @Override + public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { + FabricDataGenerator.Pack pack = fabricDataGenerator.createPack(); + + pack.addProvider(ModItemTagProvider::new); + pack.addProvider(ModEnchantmentGenerator::new); + } +} diff --git a/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/MoreSpearEnchantmentsFabric.java b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/MoreSpearEnchantmentsFabric.java new file mode 100644 index 0000000..3b65e64 --- /dev/null +++ b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/MoreSpearEnchantmentsFabric.java @@ -0,0 +1,13 @@ +package dev.sillyangel.more_spear_enchantments.fabric; + +import dev.sillyangel.more_spear_enchantments.MoreSpearEnchantments; +import net.fabricmc.api.ModInitializer; + +public class MoreSpearEnchantmentsFabric implements ModInitializer { + @Override + public void onInitialize() { + // Run our common setup + MoreSpearEnchantments.init(); + } +} + diff --git a/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/client/MoreSpearEnchantmentsFabricClient.java b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/client/MoreSpearEnchantmentsFabricClient.java new file mode 100644 index 0000000..834ea71 --- /dev/null +++ b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/client/MoreSpearEnchantmentsFabricClient.java @@ -0,0 +1,10 @@ +package dev.sillyangel.more_spear_enchantments.fabric.client; + +import net.fabricmc.api.ClientModInitializer; + +public final class MoreSpearEnchantmentsFabricClient implements ClientModInitializer { + @Override + public void onInitializeClient() { + // This entrypoint is suitable for setting up client-specific logic, such as rendering. + } +} diff --git a/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/datagen/ModItemTagProvider.java b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/datagen/ModItemTagProvider.java new file mode 100644 index 0000000..eb23e5e --- /dev/null +++ b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/datagen/ModItemTagProvider.java @@ -0,0 +1,29 @@ +package dev.sillyangel.more_spear_enchantments.fabric.datagen; + +import dev.sillyangel.more_spear_enchantments.util.ModTags; +import dev.sillyangel.more_spear_enchantments.MoreSpearEnchantments; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.minecraft.item.Items; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.ItemTags; + +import java.util.concurrent.CompletableFuture; + +public class ModItemTagProvider extends FabricTagProvider.ItemTagProvider { + public ModItemTagProvider(FabricDataOutput output, CompletableFuture completableFuture) { + super(output, completableFuture); + } + + @Override + protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) { + valueLookupBuilder(ModTags.Items.SPEARS) + .add(Items.WOODEN_SPEAR) + .add(Items.STONE_SPEAR) + .add(Items.COPPER_SPEAR) + .add(Items.IRON_SPEAR) + .add(Items.GOLDEN_SPEAR) + .add(Items.DIAMOND_SPEAR) + .add(Items.NETHERITE_SPEAR); + } +} \ No newline at end of file diff --git a/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/ModEnchantmentEffects.java b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/ModEnchantmentEffects.java new file mode 100644 index 0000000..13093ca --- /dev/null +++ b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/ModEnchantmentEffects.java @@ -0,0 +1,39 @@ +package dev.sillyangel.more_spear_enchantments.fabric.enchantment; + +import com.mojang.serialization.MapCodec; +import dev.sillyangel.more_spear_enchantments.MoreSpearEnchantments; +import dev.sillyangel.more_spear_enchantments.enchantment.effect.*; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.effect.EnchantmentEntityEffect; + +public class ModEnchantmentEffects { + public static final RegistryKey THUNDERING = of("thundering"); + public static final RegistryKey WITHERING = of("withering"); + public static final RegistryKey POISONING = of("poisoning"); + public static final RegistryKey CRIPPLING = of("crippling"); + + + private static RegistryKey of(String path) { + Identifier id = Identifier.of(MoreSpearEnchantments.MOD_ID, path); + return RegistryKey.of(RegistryKeys.ENCHANTMENT, id); + } + + private static MapCodec register(String id, MapCodec codec) { + return Registry.register(Registries.ENCHANTMENT_ENTITY_EFFECT_TYPE, Identifier.of(MoreSpearEnchantments.MOD_ID, id), codec); + } + + public static void registerModEnchantmentEffects() { + MoreSpearEnchantments.LOGGER.info("Registering EnchantmentEffects for " + MoreSpearEnchantments.MOD_ID); + + register("lightning", LightningEnchantmentEffect.CODEC); + register("poison", PoisonEnchantmentEffect.CODEC); + register("withering", WitheringEnchantmentEffect.CODEC); + register("crippling", CripplingEnchantmentEffect.CODEC); + } +} + diff --git a/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/ModEnchantmentGenerator.java b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/ModEnchantmentGenerator.java new file mode 100644 index 0000000..c65016d --- /dev/null +++ b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/ModEnchantmentGenerator.java @@ -0,0 +1,120 @@ +package dev.sillyangel.more_spear_enchantments.fabric.enchantment; + +import dev.sillyangel.more_spear_enchantments.util.ModTags; +import dev.sillyangel.more_spear_enchantments.enchantment.effect.*; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricDynamicRegistryProvider; +import net.fabricmc.fabric.api.resource.conditions.v1.ResourceCondition; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.RegistryKey; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.effect.EnchantmentEffectTarget; +import net.minecraft.enchantment.EnchantmentLevelBasedValue; +import net.minecraft.component.type.AttributeModifierSlot; +import net.minecraft.component.EnchantmentEffectComponentTypes; + +import java.util.concurrent.CompletableFuture; + +public class ModEnchantmentGenerator extends FabricDynamicRegistryProvider { + public ModEnchantmentGenerator(FabricDataOutput output, CompletableFuture registriesFuture) { + super(output, registriesFuture); + System.out.println("REGISTERING ENCHANTS"); + } + + @Override + protected void configure(RegistryWrapper.WrapperLookup registries, Entries entries) { + // Our new enchantment, "Thundering." + register(entries, ModEnchantmentEffects.THUNDERING, Enchantment.builder( + Enchantment.definition( + registries.getOrThrow(RegistryKeys.ITEM).getOrThrow(ModTags.Items.SPEARS), + // this is the "weight" or probability of our enchantment showing up in the table + 10, + // the maximum level of the enchantment + 3, + // base cost for level 1 of the enchantment, and min levels required for something higher + Enchantment.leveledCost(1, 10), + // same fields as above but for max cost + Enchantment.leveledCost(1, 15), + // anvil cost + 5, + // valid slots + AttributeModifierSlot.HAND + ) + ) + .addEffect( + // enchantment occurs POST_ATTACK + EnchantmentEffectComponentTypes.POST_ATTACK, + EnchantmentEffectTarget.ATTACKER, + EnchantmentEffectTarget.VICTIM, + new LightningEnchantmentEffect(EnchantmentLevelBasedValue.linear(0.4f, 0.2f)) // scale the enchantment linearly. + ) + ); + register(entries, ModEnchantmentEffects.POISONING, Enchantment.builder( + Enchantment.definition( + registries.getOrThrow(RegistryKeys.ITEM).getOrThrow(ModTags.Items.SPEARS), + 10, + 3, + Enchantment.leveledCost(1, 10), + Enchantment.leveledCost(1, 15), + 5, + AttributeModifierSlot.HAND + ) + ) + .addEffect( + EnchantmentEffectComponentTypes.POST_ATTACK, + EnchantmentEffectTarget.ATTACKER, + EnchantmentEffectTarget.VICTIM, + new PoisonEnchantmentEffect(EnchantmentLevelBasedValue.linear(3.0f, 1.0f)) // 3s base, +1s per level + ) + ); + // Our new enchantment, "Withering." + register(entries, ModEnchantmentEffects.WITHERING, Enchantment.builder( + Enchantment.definition( + registries.getOrThrow(RegistryKeys.ITEM).getOrThrow(ModTags.Items.SPEARS), + 10, + 3, + Enchantment.leveledCost(1, 10), + Enchantment.leveledCost(1, 15), + 5, + AttributeModifierSlot.HAND + ) + ) + .addEffect( + EnchantmentEffectComponentTypes.POST_ATTACK, + EnchantmentEffectTarget.ATTACKER, + EnchantmentEffectTarget.VICTIM, + new WitheringEnchantmentEffect(EnchantmentLevelBasedValue.linear(2.0f, 1.0f)) // 2s base, +1s per level + ) + ); + // Our new enchantment, "Crippling." + register(entries, ModEnchantmentEffects.CRIPPLING, Enchantment.builder( + Enchantment.definition( + registries.getOrThrow(RegistryKeys.ITEM).getOrThrow(ModTags.Items.SPEARS), + 10, + 3, + Enchantment.leveledCost(1, 10), + Enchantment.leveledCost(1, 15), + 5, + AttributeModifierSlot.HAND + ) + ) + .addEffect( + EnchantmentEffectComponentTypes.POST_ATTACK, + EnchantmentEffectTarget.ATTACKER, + EnchantmentEffectTarget.VICTIM, + new CripplingEnchantmentEffect(EnchantmentLevelBasedValue.linear(2.0f, 1.0f)) // 2s base, +1s per leve + ) + ); + } + + private void register(Entries entries, RegistryKey key, Enchantment.Builder builder, ResourceCondition... resourceConditions) { + entries.add(key, builder.build(key.getValue()), resourceConditions); + } + + @Override + public String getName() { + return "ModEnchantmentGenerator"; + } +} + diff --git a/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/effect/CripplingEnchantmentEffect.java b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/effect/CripplingEnchantmentEffect.java new file mode 100644 index 0000000..5d6083e --- /dev/null +++ b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/effect/CripplingEnchantmentEffect.java @@ -0,0 +1,52 @@ +package dev.sillyangel.more_spear_enchantments.fabric.enchantment.effect; + +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.enchantment.EnchantmentEffectContext; +import net.minecraft.enchantment.EnchantmentLevelBasedValue; +import net.minecraft.enchantment.effect.EnchantmentEntityEffect; +import net.minecraft.util.math.Vec3d; + +public record CripplingEnchantmentEffect(EnchantmentLevelBasedValue duration) implements EnchantmentEntityEffect { + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> + instance.group( + EnchantmentLevelBasedValue.CODEC.fieldOf("duration").forGetter(CripplingEnchantmentEffect::duration) + ).apply(instance, CripplingEnchantmentEffect::new) + ); + + @Override + public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity target, Vec3d pos) { + if (target instanceof LivingEntity victim) { + if (context.owner() != null && context.owner() instanceof PlayerEntity player) { + int Duration = (int) (this.duration.getValue(level) * 50); // Convert to ticks + int slownessAmplifier = level - 1; // Level 1 = Slowness 0, Level 2 = Slowness I, Level 3 = Slowness II + int weaknessAmplifier = level - 1; // Level 1 = Weakness 0, Level 2 = Weakness I, Level 3 = Weakness II + victim.addStatusEffect(new StatusEffectInstance( + StatusEffects.SLOWNESS, + Duration, + slownessAmplifier, + false, + true + )); + victim.addStatusEffect(new StatusEffectInstance( + StatusEffects.WEAKNESS, + Duration, + weaknessAmplifier, + false, + true + )); + } + } + } + + @Override + public MapCodec getCodec() { + return CODEC; + } +} diff --git a/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/effect/LightningEnchantmentEffect.java b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/effect/LightningEnchantmentEffect.java new file mode 100644 index 0000000..6078bac --- /dev/null +++ b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/effect/LightningEnchantmentEffect.java @@ -0,0 +1,43 @@ +package dev.sillyangel.more_spear_enchantments.fabric.enchantment.effect; + +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.util.math.BlockPos; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.SpawnReason; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.enchantment.EnchantmentEffectContext; +import net.minecraft.enchantment.EnchantmentLevelBasedValue; +import net.minecraft.enchantment.effect.EnchantmentEntityEffect; +import net.minecraft.util.math.Vec3d; + +public record LightningEnchantmentEffect(EnchantmentLevelBasedValue amount) implements EnchantmentEntityEffect { + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> + instance.group( + EnchantmentLevelBasedValue.CODEC.fieldOf("amount").forGetter(LightningEnchantmentEffect::amount) + ).apply(instance, LightningEnchantmentEffect::new) + ); + + @Override + public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity target, Vec3d pos) { + if (target instanceof LivingEntity victim) { + if (context.owner() != null && context.owner() instanceof PlayerEntity player) { + float numStrikes = this.amount.getValue(level); + + for (float i = 0; i < numStrikes; i++) { + BlockPos position = victim.getBlockPos(); + EntityType.LIGHTNING_BOLT.spawn(world, position, SpawnReason.TRIGGERED); + } + } + } + } + + @Override + public MapCodec getCodec() { + return CODEC; + } +} + diff --git a/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/effect/PoisonEnchantmentEffect.java b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/effect/PoisonEnchantmentEffect.java new file mode 100644 index 0000000..f3fb822 --- /dev/null +++ b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/effect/PoisonEnchantmentEffect.java @@ -0,0 +1,45 @@ +package dev.sillyangel.more_spear_enchantments.fabric.enchantment.effect; + +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.enchantment.EnchantmentEffectContext; +import net.minecraft.enchantment.EnchantmentLevelBasedValue; +import net.minecraft.enchantment.effect.EnchantmentEntityEffect; +import net.minecraft.util.math.Vec3d; + +public record PoisonEnchantmentEffect(EnchantmentLevelBasedValue duration) implements EnchantmentEntityEffect { + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> + instance.group( + EnchantmentLevelBasedValue.CODEC.fieldOf("duration").forGetter(PoisonEnchantmentEffect::duration) + ).apply(instance, PoisonEnchantmentEffect::new) + ); + + @Override + public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity target, Vec3d pos) { + if (target instanceof LivingEntity victim) { + if (context.owner() != null && context.owner() instanceof PlayerEntity player) { + int poisonDuration = (int) (this.duration.getValue(level) * 40); // Convert to ticks + int poisonAmplifier = level - 2; // Level 1 = Poison 0, Level 2 = Poison I, Level 3 = Poison II + + victim.addStatusEffect(new StatusEffectInstance( + StatusEffects.POISON, + poisonDuration, + poisonAmplifier, + false, + true + )); + } + } + } + + @Override + public MapCodec getCodec() { + return CODEC; + } +} diff --git a/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/effect/WitheringEnchantmentEffect.java b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/effect/WitheringEnchantmentEffect.java new file mode 100644 index 0000000..4fa1d23 --- /dev/null +++ b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/effect/WitheringEnchantmentEffect.java @@ -0,0 +1,46 @@ +package dev.sillyangel.more_spear_enchantments.fabric.enchantment.effect; + +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.enchantment.EnchantmentEffectContext; +import net.minecraft.enchantment.EnchantmentLevelBasedValue; +import net.minecraft.enchantment.effect.EnchantmentEntityEffect; +import net.minecraft.util.math.Vec3d; + +public record WitheringEnchantmentEffect(EnchantmentLevelBasedValue duration) implements EnchantmentEntityEffect { + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> + instance.group( + EnchantmentLevelBasedValue.CODEC.fieldOf("duration").forGetter(WitheringEnchantmentEffect::duration) + ).apply(instance, WitheringEnchantmentEffect::new) + ); + + @Override + public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity target, Vec3d pos) { + if (target instanceof LivingEntity victim) { + if (context.owner() != null && context.owner() instanceof PlayerEntity player) { + int witherDuration = (int) (this.duration.getValue(level) * 40); // Convert to ticks + int witherAmplifier = level - 2; // Level 1 = Wither 0, Level 2 = Wither I, Level 3 = Wither II + + victim.addStatusEffect(new StatusEffectInstance( + StatusEffects.WITHER, + witherDuration, + witherAmplifier, + false, + true + )); + } + } + } + + @Override + public MapCodec getCodec() { + return CODEC; + } +} + diff --git a/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/mixin/ExampleMixin.java b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/mixin/ExampleMixin.java new file mode 100644 index 0000000..bbe2c54 --- /dev/null +++ b/fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/mixin/ExampleMixin.java @@ -0,0 +1,15 @@ +package dev.sillyangel.more_spear_enchantments.fabric.mixin; + +import net.minecraft.server.MinecraftServer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(MinecraftServer.class) +public class ExampleMixin { + @Inject(at = @At("HEAD"), method = "loadWorld") + private void init(CallbackInfo info) { + // This code is injected into the start of MinecraftServer.loadWorld()V + } +} \ No newline at end of file diff --git a/fabric/src/main/resources/assets/more_spear_enchantments/icon.png b/fabric/src/main/resources/assets/more_spear_enchantments/icon.png new file mode 100644 index 0000000..920ad19 Binary files /dev/null and b/fabric/src/main/resources/assets/more_spear_enchantments/icon.png differ diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..750bbdd --- /dev/null +++ b/fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,46 @@ +{ + "schemaVersion": 1, + "id": "more_spear_enchantments", + "version": "${version}", + "name": "More Spear Enchantments", + "description": "more enchantments for the newly added spear from the Mounts of Mayhem update.", + "authors": [ + "sillyangel" + ], + "contact": { + "homepage": "https://sillyangel.dev/", + "sources": "https://git.sillyangel.dev/angel/more-spear-enchants" + }, + "license": "MIT", + "icon": "assets/more_spear_enchantments/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "dev.sillyangel.more_spear_enchantments.fabric.MoreSpearEnchantmentsFabric" + ], + "client": [ + "dev.sillyangel.more_spear_enchantments.fabric.client.MoreSpearEnchantmentsFabricClient" + ], + "fabric-datagen": [ + "dev.sillyangel.more_spear_enchantments.fabric.MoreSpearEnchantmentsDataGenerator" + ] + }, + "mixins": [ + "more_spear_enchantments.mixins.json" + ], + "depends": { + "fabricloader": ">=0.18.3", + "minecraft": "~1.21.11", + "java": ">=21", + "architectury": ">=19.0.1", + "fabric-api": "*" + }, + "custom": { + "modmenu": { + "links": { + "modmenu.discord": "https://discord.gg/gAfcZURgvJ" + }, + "update_checker": true + } + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..96023bf --- /dev/null +++ b/gradle.properties @@ -0,0 +1,20 @@ +# Done to increase the memory available to Gradle. +org.gradle.jvmargs=-Xmx2G +org.gradle.parallel=true + +# Mod properties +mod_version = 1.0.1 +maven_group = dev.sillyangel.more_spear_enchantments +archives_name = more_spear_enchantments +enabled_platforms = fabric,neoforge + +# Minecraft properties +minecraft_version = 1.21.11 +yarn_mappings = 1.21.11+build.3 + +# Dependencies +architectury_api_version = 19.0.1 +fabric_loader_version = 0.18.4 +fabric_api_version = 0.140.2+1.21.11 +neoforge_version = 21.11.17-beta +yarn_mappings_patch_neoforge_version = 1.21+build.6 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e644113 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..ca025c8 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..b740cf1 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..25da30d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/icon.png b/icon.png new file mode 100644 index 0000000..920ad19 Binary files /dev/null and b/icon.png differ diff --git a/neoforge/build.gradle b/neoforge/build.gradle new file mode 100644 index 0000000..8113ca4 --- /dev/null +++ b/neoforge/build.gradle @@ -0,0 +1,60 @@ +plugins { + id 'com.gradleup.shadow' +} + +architectury { + platformSetupLoomIde() + neoForge() +} + +configurations { + common { + canBeResolved = true + canBeConsumed = false + } + compileClasspath.extendsFrom common + runtimeClasspath.extendsFrom common + developmentNeoForge.extendsFrom common + + // Files in this configuration will be bundled into your mod using the Shadow plugin. + // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files. + shadowBundle { + canBeResolved = true + canBeConsumed = false + } +} + +repositories { + maven { + name = 'NeoForged' + url = 'https://maven.neoforged.net/releases' + } +} + +dependencies { + neoForge "net.neoforged:neoforge:$rootProject.neoforge_version" + + // Architectury API. This is optional, and you can comment it out if you don't need it. + modImplementation "dev.architectury:architectury-neoforge:$rootProject.architectury_api_version" + + common(project(path: ':common', configuration: 'namedElements')) { transitive = false } + shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge') +} + +processResources { + inputs.property 'version', project.version + + filesMatching('META-INF/neoforge.mods.toml') { + expand version: inputs.properties.version + } +} + +shadowJar { + configurations = [project.configurations.shadowBundle] + archiveClassifier = 'dev-shadow' +} + +remapJar { + inputFile.set shadowJar.archiveFile +} + diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties new file mode 100644 index 0000000..2e6ed76 --- /dev/null +++ b/neoforge/gradle.properties @@ -0,0 +1 @@ +loom.platform = neoforge diff --git a/neoforge/src/main/java/dev/sillyangel/more_spear_enchantments/neoforge/MoreSpearEnchantmentsNeoForge.java b/neoforge/src/main/java/dev/sillyangel/more_spear_enchantments/neoforge/MoreSpearEnchantmentsNeoForge.java new file mode 100644 index 0000000..752016b --- /dev/null +++ b/neoforge/src/main/java/dev/sillyangel/more_spear_enchantments/neoforge/MoreSpearEnchantmentsNeoForge.java @@ -0,0 +1,14 @@ +package dev.sillyangel.more_spear_enchantments.neoforge; + +import net.neoforged.fml.common.Mod; + +import dev.sillyangel.more_spear_enchantments.MoreSpearEnchantments; + +@Mod(MoreSpearEnchantments.MOD_ID) +public final class MoreSpearEnchantmentsNeoForge { + public MoreSpearEnchantmentsNeoForge() { + // Run our common setup. + MoreSpearEnchantments.init(); + } +} + diff --git a/neoforge/src/main/resources/META-INF/icon.png b/neoforge/src/main/resources/META-INF/icon.png new file mode 100644 index 0000000..920ad19 Binary files /dev/null and b/neoforge/src/main/resources/META-INF/icon.png differ diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml new file mode 100644 index 0000000..de6af79 --- /dev/null +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -0,0 +1,38 @@ +modLoader = "javafml" +loaderVersion = "[10,)" +issueTrackerURL = "https://git.sillyangel.dev/angel/more-spear-enchants-neoforge/issues" +license = "MIT" + +[[mods]] +modId = "more_spear_enchantments" +version = "${version}" +displayName = "More Spear Enchantments" +authors = "sillyangel" +description = ''' +more enchantments for the newly added spear from the Mounts of Mayhem update. +''' +logoFile = "icon.png" + +[[dependencies.more_spear_enchantments]] +modId = "neoforge" +type = "required" +versionRange = "[21.11,)" +ordering = "NONE" +side = "BOTH" + +[[dependencies.more_spear_enchantments]] +modId = "minecraft" +type = "required" +versionRange = "[1.21.11,)" +ordering = "NONE" +side = "BOTH" + +[[dependencies.more_spear_enchantments]] +modId = "architectury" +type = "required" +versionRange = "[19.0.1,)" +ordering = "AFTER" +side = "BOTH" + +[[mixins]] +config = "more_spear_enchantments.mixins.json" diff --git a/neoforge/src/main/resources/more_spear_enchantments/icon.png b/neoforge/src/main/resources/more_spear_enchantments/icon.png new file mode 100644 index 0000000..920ad19 Binary files /dev/null and b/neoforge/src/main/resources/more_spear_enchantments/icon.png differ diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..a9bf3f6 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,14 @@ +pluginManagement { + repositories { + maven { url = 'https://maven.fabricmc.net/' } + maven { url = 'https://maven.architectury.dev/' } + maven { url = 'https://files.minecraftforge.net/maven/' } + gradlePluginPortal() + } +} + +rootProject.name = 'more_spear_enchantments' + +include 'common' +include 'fabric' +include 'neoforge'