From 1abf0456673fdb114f2cb1b6b834850409c57ee3 Mon Sep 17 00:00:00 2001 From: chronosacaria Date: Sun, 26 May 2024 15:39:44 -0400 Subject: [PATCH] 1.20.6 Update III - Started on Enchantment Reworks - Updated to 24w21b Snapshot - Added Boiler Plate --- .gitignore | 3 + build.gradle | 7 +- gradle.properties | 10 +- src/main/java/dev/timefall/mcdw/Mcdw.java | 2 +- .../timefall/mcdw/api/util/AbilityHelper.java | 2 +- .../mcdw/api/util/CleanlinessHelper.java | 4 +- .../mcdw/api/util/ProjectileEffectHelper.java | 16 +- .../timefall/mcdw/bases/McdwSwordItem.java | 2 +- .../dev/timefall/mcdw/client/McdwClient.java | 12 +- .../component/McdwEffectComponentTypes.java | 28 ++ .../mcdw/configs/stats/IMcdwWeaponStats.java | 6 +- .../stats/McdwEnchantmentStatsConfig.java | 4 +- .../configs/stats/McdwWeaponStatsConfig.java | 4 +- .../stats/item_sections/McdwAxeItemStats.java | 10 +- .../stats/item_sections/McdwBowItemStats.java | 60 ++-- .../item_sections/McdwCrossbowItemStats.java | 58 ++-- .../item_sections/McdwDaggerItemStats.java | 24 +- .../item_sections/McdwDoubleAxeItemStats.java | 6 +- .../item_sections/McdwGauntletItemStats.java | 6 +- .../item_sections/McdwGlaiveItemStats.java | 8 +- .../item_sections/McdwHammerItemStats.java | 16 +- .../item_sections/McdwLongbowItemStats.java | 6 +- .../item_sections/McdwPickaxeItemStats.java | 8 +- .../item_sections/McdwScytheItemStats.java | 8 +- .../item_sections/McdwShieldItemStats.java | 6 +- .../item_sections/McdwShortbowItemStats.java | 8 +- .../item_sections/McdwSickleItemStats.java | 8 +- .../McdwSoulDaggerItemStats.java | 6 +- .../item_sections/McdwSpearItemStats.java | 6 +- .../item_sections/McdwStaffItemStats.java | 6 +- .../item_sections/McdwSwordItemStats.java | 60 ++-- .../item_sections/McdwWhipItemStats.java | 4 +- .../mcdw/data/ConfigItemEnabledCondition.java | 6 +- .../timefall/mcdw/data/McdwTagGenerator.java | 308 +++++++++--------- .../mcdw/effects/EnchantmentEffects.java | 7 +- .../mcdw/effects/NewEnchantmentEffects.java | 12 + .../effect/McdwEntityEffectTypes.java | 11 + .../enchantments/AccelerateEnchantment.java | 18 +- .../enchantments/AmbushEnchantment.java | 16 +- .../enchantments/AnimaConduitEnchantment.java | 14 +- .../enchantments/BonusShotEnchantment.java | 14 +- .../BurstBowstringEnchantment.java | 14 +- .../enchantments/BusyBeeEnchantment.java | 13 +- .../ChainReactionEnchantment.java | 15 +- .../enchantments/ChainsEnchantment.java | 16 +- .../enchantments/ChargeEnchantment.java | 18 +- .../enchantments/CobwebShotEnchantment.java | 15 +- .../enchantments/CommittedEnchantment.java | 14 +- .../enchantments/CriticalHitEnchantment.java | 15 +- .../DippingPoisonEnchantment.java | 14 +- .../enchantments/DynamoEnchantment.java | 12 +- .../enchantments/EchoEnchantment.java | 12 +- .../EnigmaResonatorEnchantment.java | 12 +- .../enchantments/ExplodingEnchantment.java | 12 +- .../enchantments/FreezingEnchantment.java | 10 +- .../enchantments/FuseShotEnchantment.java | 12 +- .../enchantments/GravityEnchantment.java | 12 +- .../enchantments/GrowingEnchantment.java | 12 +- .../GuardingStrikeEnchantment.java | 10 +- .../enchantments/IllagersBaneEnchantment.java | 10 +- .../enchantments/JunglePoisonEnchantment.java | 10 +- .../enchantments/LeechingEnchantment.java | 12 +- .../LevitationShotEnchantment.java | 12 +- .../enchantments/MultishotBowEnchantment.java | 10 +- .../enchantments/OverchargeEnchantment.java | 12 +- .../enchantments/PainCycleEnchantment.java | 12 +- .../enchantments/PhantomsMarkEnchantment.java | 10 +- .../enchantments/PoisonCloudEnchantment.java | 12 +- .../enchantments/ProspectorEnchantment.java | 10 +- .../enchantments/RadianceEnchantment.java | 12 +- .../enchantments/RampagingEnchantment.java | 10 +- .../enchantments/RefreshmentEnchantment.java | 10 +- .../enchantments/ReplenishEnchantment.java | 12 +- .../enchantments/RicochetEnchantment.java | 12 +- .../enchantments/RushdownEnchantment.java | 10 +- .../enchantments/ShadowBarbEnchantment.java | 12 +- .../enchantments/ShadowShotEnchantment.java | 12 +- .../enchantments/SharedPainEnchantment.java | 12 +- .../enchantments/ShockwaveEnchantment.java | 12 +- .../enchantments/SmitingEnchantment.java | 12 +- .../enchantments/SoulDevourerEnchantment.java | 10 +- .../enchantments/SoulSiphonEnchantment.java | 10 +- .../enchantments/StunningEnchantment.java | 10 +- .../enchantments/SwirlingEnchantment.java | 12 +- .../enchantments/TempoTheftEnchantment.java | 12 +- .../enchantments/ThunderingEnchantment.java | 12 +- .../enchantments/VoidShotEnchantment.java | 12 +- .../enchantments/VoidStrikeEnchantment.java | 12 +- .../enchantments/WeakeningEnchantment.java | 12 +- .../enchantments/WildRageEnchantment.java | 12 +- .../mcdw/enchants/goals/GoalUtils.java | 2 +- .../enchants/goals/WildRageAttackGoal.java | 2 +- .../mcdw/enchants/summons/IBeeSummoning.java | 2 +- .../summons/entity/SummonedBeeEntity.java | 2 +- .../summons/render/SummonedBeeRenderer.java | 10 +- .../mcdw/enchants/types/AoEEnchantment.java | 2 +- .../types/DamageBoostEnchantment.java | 2 +- .../enchants/types/HealingEnchantment.java | 2 +- .../enchants/types/RangedEnchantment.java | 2 +- .../timefall/mcdw/mixin/McdwMixinPlugin.java | 56 ---- .../mcdw/AreaEffectCloudEntityMixin.java | 9 +- .../{ => old_mixins}/mcdw/BowItemMixin.java | 44 ++- .../mcdw/CraftingScreenHandlerMixin.java | 9 +- .../mcdw/CreeperEntityAccessor.java | 9 +- .../mcdw/CrossbowItemMixin.java | 9 +- .../mcdw/EnchantmentHelperMixin.java | 9 +- .../mcdw/EnchantmentMixin.java | 9 +- .../mcdw/ExperienceOrbEntityMixin.java | 26 +- .../mcdw/GetExperienceMixin.java | 9 +- .../mcdw/GrindstoneScreenHandlerMixin.java | 9 +- .../mcdw/InsulatedAxeItemAccessor.java | 9 +- .../{ => old_mixins}/mcdw/ItemStackMixin.java | 9 +- .../mcdw/LivingEntityMixin.java | 51 ++- .../mcdw/LivingEntityPlayerEntityMixin.java | 29 +- .../mcdw/MobEntityAccessor.java | 9 +- .../mcdw/PersistentProjectileEntityMixin.java | 9 +- .../mcdw/PlayerEntityMixin.java | 11 +- .../mcdw/ShieldPlayerEntityMixin.java | 9 +- .../mcdw/SmithingScreenHandlerMixin.java | 9 +- .../mcdw/UnbreakingEnchantmentMixin.java | 9 +- .../AbstractClientPlayerEntityMixin.java | 9 +- .../mcdw/client/HeldItemRendererInvoker.java | 9 +- .../mcdw/client/HeldItemRendererMixin.java | 9 +- .../mcdw/client/InGameHudMixin.java | 9 +- .../ModelPredicateProviderRegistryMixin.java | 9 +- .../client/PlayerEntityRendererMixin.java | 9 +- .../mcdw/networking/OffhandAttackPacket.java | 4 +- .../registries/EntityAttributesRegistry.java | 4 +- .../mcdw/registries/ParticlesRegistry.java | 2 +- .../mcdw/registries/SoundEventsRegistry.java | 2 +- .../registries/StatusEffectsRegistry.java | 2 +- src/main/resources/mcdw.mixins.json | 2 +- 132 files changed, 1293 insertions(+), 563 deletions(-) create mode 100644 src/main/java/dev/timefall/mcdw/component/McdwEffectComponentTypes.java create mode 100644 src/main/java/dev/timefall/mcdw/effects/NewEnchantmentEffects.java create mode 100644 src/main/java/dev/timefall/mcdw/enchants/effect/McdwEntityEffectTypes.java delete mode 100644 src/main/java/dev/timefall/mcdw/mixin/McdwMixinPlugin.java rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/AreaEffectCloudEntityMixin.java (89%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/BowItemMixin.java (77%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/CraftingScreenHandlerMixin.java (71%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/CreeperEntityAccessor.java (64%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/CrossbowItemMixin.java (92%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/EnchantmentHelperMixin.java (86%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/EnchantmentMixin.java (75%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/ExperienceOrbEntityMixin.java (67%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/GetExperienceMixin.java (77%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/GrindstoneScreenHandlerMixin.java (73%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/InsulatedAxeItemAccessor.java (63%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/ItemStackMixin.java (85%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/LivingEntityMixin.java (81%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/LivingEntityPlayerEntityMixin.java (90%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/MobEntityAccessor.java (62%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/PersistentProjectileEntityMixin.java (97%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/PlayerEntityMixin.java (89%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/ShieldPlayerEntityMixin.java (87%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/SmithingScreenHandlerMixin.java (74%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/UnbreakingEnchantmentMixin.java (66%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/client/AbstractClientPlayerEntityMixin.java (86%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/client/HeldItemRendererInvoker.java (60%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/client/HeldItemRendererMixin.java (93%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/client/InGameHudMixin.java (90%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/client/ModelPredicateProviderRegistryMixin.java (90%) rename src/main/java/dev/timefall/mcdw/mixin/{ => old_mixins}/mcdw/client/PlayerEntityRendererMixin.java (73%) diff --git a/.gitignore b/.gitignore index 3c37caf3..aeef3cec 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,6 @@ run/ # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) !gradle-wrapper.jar +/index.html +/styles.css +/script.js diff --git a/build.gradle b/build.gradle index 8d40c996..942d4de7 100644 --- a/build.gradle +++ b/build.gradle @@ -51,14 +51,15 @@ dependencies { mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}" // TODO REMOVE WHEN NOT NEEDED ANYMORE - modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabricKotlinVersion}" - modImplementation "net.peanuuutz.tomlkt:tomlkt:0.3.7" + //modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabricKotlinVersion}" + //modImplementation "net.peanuuutz.tomlkt:tomlkt:0.3.7" // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" // Clumps - modImplementation "com.blamejared.clumps:Clumps-fabric-${project.minecraft_version}:${project.clumps_version}" + //modImplementation "com.blamejared.clumps:Clumps-fabric-${project.minecraft_version}:${project.clumps_version}" + modImplementation "com.blamejared.clumps:Clumps-fabric-1.20.6:${project.clumps_version}" // Ranged Weapon API //modImplementation "maven.modrinth:ranged-weapon-api:${project.ranged_weapon_api_version}" diff --git a/gradle.properties b/gradle.properties index c33259f9..3412eb68 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,8 +4,8 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop/ - minecraft_version=1.20.6 - yarn_mappings=1.20.6+build.1 + minecraft_version=24w21b + yarn_mappings=24w21b+build.5 fabric_loader_version=0.15.11 # Mod Properties @@ -15,9 +15,9 @@ org.gradle.parallel=true # Dependencies # check this on https://fabricmc.net/develop/ - fabricKotlinVersion = 1.10.18+kotlin.1.9.22 - fabric_version=0.98.0+1.20.6 - fzzy_config=0.3.3+1.20.6 + #fabricKotlinVersion = 1.10.18+kotlin.1.9.22 + fabric_version=0.99.1+1.21 + fzzy_config=0.3.3+24w21b # Compatibility clumps_version=17.0.0.1 diff --git a/src/main/java/dev/timefall/mcdw/Mcdw.java b/src/main/java/dev/timefall/mcdw/Mcdw.java index 9e553080..1c77cf55 100644 --- a/src/main/java/dev/timefall/mcdw/Mcdw.java +++ b/src/main/java/dev/timefall/mcdw/Mcdw.java @@ -20,7 +20,7 @@ public class Mcdw implements ModInitializer { @SuppressWarnings("unused") public static final Logger LOGGER = LogManager.getLogger(); public static Identifier ID(String path) { - return new Identifier(MOD_ID, path); + return Identifier.of(MOD_ID, path); } @Override diff --git a/src/main/java/dev/timefall/mcdw/api/util/AbilityHelper.java b/src/main/java/dev/timefall/mcdw/api/util/AbilityHelper.java index 46aaf2cc..263a8051 100644 --- a/src/main/java/dev/timefall/mcdw/api/util/AbilityHelper.java +++ b/src/main/java/dev/timefall/mcdw/api/util/AbilityHelper.java @@ -6,7 +6,7 @@ */ package dev.timefall.mcdw.api.util; -import dev.timefall.mcdw.enchants.goals.GoalUtils; +import dev.timefall.mcdw.enchantment.goals.GoalUtils; import dev.timefall.mcdw.enums.SettingsID; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.effect.StatusEffectInstance; diff --git a/src/main/java/dev/timefall/mcdw/api/util/CleanlinessHelper.java b/src/main/java/dev/timefall/mcdw/api/util/CleanlinessHelper.java index 2c6e45fc..88106e37 100644 --- a/src/main/java/dev/timefall/mcdw/api/util/CleanlinessHelper.java +++ b/src/main/java/dev/timefall/mcdw/api/util/CleanlinessHelper.java @@ -62,7 +62,7 @@ public static boolean canRepairCheck(String[] repairIngredient, ItemStack ingred else if (repIngredient.contentEquals("minecraft:stone_crafting_materials")) isStone.set(true); potentialIngredients.add( - Registries.ITEM.get(new Identifier(repIngredient))); + Registries.ITEM.get(Identifier.of(repIngredient))); } }); } @@ -361,7 +361,7 @@ public static AttributeModifiersComponent createDualWieldWithRangeAttributeModif } public static TagKey mcdw$getItemTagKey(String tag) { - return TagKey.of(RegistryKeys.ITEM, new Identifier(tag)); + return TagKey.of(RegistryKeys.ITEM, Identifier.of(tag)); } } diff --git a/src/main/java/dev/timefall/mcdw/api/util/ProjectileEffectHelper.java b/src/main/java/dev/timefall/mcdw/api/util/ProjectileEffectHelper.java index 8cd146d2..dd165fcd 100644 --- a/src/main/java/dev/timefall/mcdw/api/util/ProjectileEffectHelper.java +++ b/src/main/java/dev/timefall/mcdw/api/util/ProjectileEffectHelper.java @@ -20,16 +20,18 @@ import org.joml.Quaternionf; import org.joml.Vector3f; +import java.util.List; + public class ProjectileEffectHelper { public static void mcdw$spawnExtraArrows(LivingEntity owner, LivingEntity makeArrowFromMe, int numArrowsLimit, int distance, double bonusShotDamageMultiplier) { - //List nearbyEntities = mcdw$getSecondaryTargets(makeArrowFromMe, distance); - //for (int i = 0; i < Math.min(numArrowsLimit, nearbyEntities.size()); i++) { - // PersistentProjectileEntity arrowEntity = mcdw$createProjectileEntityTowards(makeArrowFromMe, nearbyEntities.get(i)); - // arrowEntity.setDamage(arrowEntity.getDamage() * bonusShotDamageMultiplier); - // arrowEntity.setOwner(owner); - // makeArrowFromMe.getWorld().spawnEntity(arrowEntity); - //} + List nearbyEntities = mcdw$getSecondaryTargets(makeArrowFromMe, distance); + for (int i = 0; i < Math.min(numArrowsLimit, nearbyEntities.size()); i++) { + PersistentProjectileEntity arrowEntity = mcdw$createProjectileEntityTowards(makeArrowFromMe, nearbyEntities.get(i)); + arrowEntity.setDamage(arrowEntity.getDamage() * bonusShotDamageMultiplier); + arrowEntity.setOwner(owner); + makeArrowFromMe.getWorld().spawnEntity(arrowEntity); + } } public static PersistentProjectileEntity mcdw$createAbstractArrow(LivingEntity attacker) { diff --git a/src/main/java/dev/timefall/mcdw/bases/McdwSwordItem.java b/src/main/java/dev/timefall/mcdw/bases/McdwSwordItem.java index 6d05b9b7..f7c5676e 100644 --- a/src/main/java/dev/timefall/mcdw/bases/McdwSwordItem.java +++ b/src/main/java/dev/timefall/mcdw/bases/McdwSwordItem.java @@ -9,7 +9,7 @@ import com.google.common.collect.BiMap; import dev.timefall.mcdw.api.util.CleanlinessHelper; import dev.timefall.mcdw.configs.stats.IMcdwWeaponStats; -import dev.timefall.mcdw.mixin.mcdw.InsulatedAxeItemAccessor; +import dev.timefall.mcdw.mixin.old_mixins.mcdw.InsulatedAxeItemAccessor; import dev.timefall.mcdw.registries.ItemGroupRegistry; import dev.timefall.mcdw.registries.items.McdwSwordItemRegistry; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; diff --git a/src/main/java/dev/timefall/mcdw/client/McdwClient.java b/src/main/java/dev/timefall/mcdw/client/McdwClient.java index eceea62f..707e43b4 100644 --- a/src/main/java/dev/timefall/mcdw/client/McdwClient.java +++ b/src/main/java/dev/timefall/mcdw/client/McdwClient.java @@ -24,7 +24,7 @@ public void onInitializeClient() { } public static void registerRangedWeaponPredicates(Item item) { - ModelPredicateProviderRegistry.register(item, new Identifier("pull"), (itemStack, clientWorld, livingEntity, seed) -> { + ModelPredicateProviderRegistry.register(item, Identifier.of("pull"), (itemStack, clientWorld, livingEntity, seed) -> { if (livingEntity == null) { return 0.0F; } else if (item instanceof McdwBowItem bow) { @@ -40,11 +40,11 @@ public static void registerRangedWeaponPredicates(Item item) { }); if (item instanceof BowItem) { - ModelPredicateProviderRegistry.register(item, new Identifier("pulling"), (itemStack, clientWorld, livingEntity, seed) -> + ModelPredicateProviderRegistry.register(item, Identifier.of("pulling"), (itemStack, clientWorld, livingEntity, seed) -> livingEntity != null && livingEntity.isUsingItem() && livingEntity.getActiveItem() == itemStack ? 1.0F : 0.0F); } if (item instanceof CrossbowItem) { - ModelPredicateProviderRegistry.register(item, new Identifier("pulling"), (itemStack, clientWorld, livingEntity, seed) -> { + ModelPredicateProviderRegistry.register(item, Identifier.of("pulling"), (itemStack, clientWorld, livingEntity, seed) -> { if (livingEntity == null) { return 0.0F; } else { @@ -52,7 +52,7 @@ public static void registerRangedWeaponPredicates(Item item) { } }); - ModelPredicateProviderRegistry.register(item, new Identifier("charged"), (itemStack, clientWorld, livingEntity, seed) -> { + ModelPredicateProviderRegistry.register(item, Identifier.of("charged"), (itemStack, clientWorld, livingEntity, seed) -> { if (livingEntity == null) { return 0.0F; } else { @@ -60,7 +60,7 @@ public static void registerRangedWeaponPredicates(Item item) { } }); - ModelPredicateProviderRegistry.register(item, new Identifier("firework"), (itemStack, clientWorld, livingEntity, seed) -> { + ModelPredicateProviderRegistry.register(item, Identifier.of("firework"), (itemStack, clientWorld, livingEntity, seed) -> { if (livingEntity == null) { return 0.0F; } else { @@ -71,7 +71,7 @@ public static void registerRangedWeaponPredicates(Item item) { } } public static void registerShieldPredicates(McdwShieldItem shield) { - ModelPredicateProviderRegistry.register(shield, new Identifier("blocking"), + ModelPredicateProviderRegistry.register(shield, Identifier.of("blocking"), (itemStack, clientWorld, livingEntity, seed) -> livingEntity != null && livingEntity.isUsingItem() && livingEntity.getActiveItem() == itemStack ? 1.0F : 0.0F ); diff --git a/src/main/java/dev/timefall/mcdw/component/McdwEffectComponentTypes.java b/src/main/java/dev/timefall/mcdw/component/McdwEffectComponentTypes.java new file mode 100644 index 00000000..3e355e90 --- /dev/null +++ b/src/main/java/dev/timefall/mcdw/component/McdwEffectComponentTypes.java @@ -0,0 +1,28 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + +package dev.timefall.mcdw.component; + +import dev.timefall.mcdw.Mcdw; +import net.minecraft.component.ComponentType; +import net.minecraft.enchantment.effect.EnchantmentEffectEntry; +import net.minecraft.enchantment.effect.EnchantmentValueEffectType; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; + +import java.util.List; +import java.util.function.UnaryOperator; + +public class McdwEffectComponentTypes { + + public static final ComponentType>> ACCELERATE_CHARGE_TIME = register("accelerate_charge_time", builder -> builder); + + + private static ComponentType register(String id, UnaryOperator> builderOperator) { + return Registry.register(Registries.ENCHANTMENT_EFFECT_COMPONENT_TYPE, Mcdw.ID(id), (builderOperator.apply(ComponentType.builder())).build()); + } +} diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/IMcdwWeaponStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/IMcdwWeaponStats.java index 754b36e7..808f6499 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/IMcdwWeaponStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/IMcdwWeaponStats.java @@ -39,7 +39,7 @@ class MeleeStats implements Walkable { public double additionalAttackRange = 0d; @ValidatedInt.Restrict(min = 0) public int weaponSpawnWeight = 0; - public ValidatedIngredient repairIngredient = new ValidatedIngredient(new Identifier("iron_ingot")); + public ValidatedIngredient repairIngredient = new ValidatedIngredient(Identifier.of("iron_ingot")); } @@ -123,7 +123,7 @@ class RangedStats implements Walkable { public int range = 15; @ValidatedInt.Restrict(min = 0) public int weaponSpawnWeight = 0; - public ValidatedIngredient repairIngredient = new ValidatedIngredient(new Identifier("iron_ingot")); + public ValidatedIngredient repairIngredient = new ValidatedIngredient(Identifier.of("iron_ingot")); } static RangedStats rangedStats( @@ -197,7 +197,7 @@ class ShieldStats implements Walkable { public boolean isLootable = true; public ToolMaterial material = ToolMaterials.IRON; public int weaponSpawnWeight = 0; - public ValidatedIngredient repairIngredient = new ValidatedIngredient(new Identifier("iron_ingot")); + public ValidatedIngredient repairIngredient = new ValidatedIngredient(Identifier.of("iron_ingot")); } static ShieldStats shieldStats( diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/McdwEnchantmentStatsConfig.java b/src/main/java/dev/timefall/mcdw/configs/stats/McdwEnchantmentStatsConfig.java index 61734047..8f738648 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/McdwEnchantmentStatsConfig.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/McdwEnchantmentStatsConfig.java @@ -14,13 +14,11 @@ import me.fzzyhmstrs.fzzy_config.api.ConfigApi; import me.fzzyhmstrs.fzzy_config.config.Config; -import java.util.function.Supplier; - @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwEnchantmentStatsConfig extends Config { - public static final McdwEnchantmentStatsConfig CONFIG = ConfigApi.registerAndLoadConfig((Supplier) McdwEnchantmentStatsConfig::new); + public static final McdwEnchantmentStatsConfig CONFIG = ConfigApi.registerAndLoadConfig(McdwEnchantmentStatsConfig::new); public McdwEnchantmentStatsConfig() { super(Mcdw.ID("mcdw_enchantment_stats_config")); diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/McdwWeaponStatsConfig.java b/src/main/java/dev/timefall/mcdw/configs/stats/McdwWeaponStatsConfig.java index 20d7153e..4f63bf8b 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/McdwWeaponStatsConfig.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/McdwWeaponStatsConfig.java @@ -14,13 +14,11 @@ import me.fzzyhmstrs.fzzy_config.api.ConfigApi; import me.fzzyhmstrs.fzzy_config.config.Config; -import java.util.function.Supplier; - @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwWeaponStatsConfig extends Config { - public static final McdwWeaponStatsConfig CONFIG = ConfigApi.registerAndLoadConfig((Supplier) McdwWeaponStatsConfig::new); + public static final McdwWeaponStatsConfig CONFIG = ConfigApi.registerAndLoadConfig(McdwWeaponStatsConfig::new); public McdwWeaponStatsConfig() { super(Mcdw.ID("mcdw_weapon_stats_config")); diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwAxeItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwAxeItemStats.java index 8fae93b4..a491739e 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwAxeItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwAxeItemStats.java @@ -16,11 +16,11 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwAxeItemStats extends ConfigSection { - private IMcdwWeaponStats.MeleeStats axeAnchor = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 8, -3.4f, 0.0d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats axeAxe = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 6, -3.1f, 0.0d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats axeEncrustedAnchor = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 8, -3.4f, 0.0d, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.MeleeStats axeFirebrand = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 4, -2.9f, 0.0d, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.MeleeStats axeHighland = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 4, -2.9f, 0.0d, 5, new Identifier("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats axeAnchor = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 8, -3.4f, 0.0d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats axeAxe = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 6, -3.1f, 0.0d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats axeEncrustedAnchor = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 8, -3.4f, 0.0d, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.MeleeStats axeFirebrand = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 4, -2.9f, 0.0d, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.MeleeStats axeHighland = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 4, -2.9f, 0.0d, 5, Identifier.of("minecraft:iron_ingot")); public IMcdwWeaponStats.MeleeStats getAxeAnchor() { return axeAnchor; } public IMcdwWeaponStats.MeleeStats getAxeAxe() { return axeAxe; } diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwBowItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwBowItemStats.java index b1d35b1e..8a2ea4b3 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwBowItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwBowItemStats.java @@ -16,36 +16,36 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwBowItemStats extends ConfigSection { - private IMcdwWeaponStats.RangedStats bowAncientBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.NETHERITE, 7, 14, 18, 0, new Identifier("minecraft:netherite_scrap")); - private IMcdwWeaponStats.RangedStats bowBonebow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.STONE, 4, 16, 12, 5, new Identifier("minecraft:bone")); - private IMcdwWeaponStats.RangedStats bowBubbleBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 5, 15, 12, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats bowBubbleBurster = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 15, 13, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats bowBurstGaleBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 12, 16, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats bowCallOfTheVoid = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.NETHERITE, 6, 15, 16, 5, new Identifier("minecraft:netherite_scrap")); - private IMcdwWeaponStats.RangedStats bowEchoOfTheValley = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 11, 16, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats bowElitePowerBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 5, 20, 15, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats bowGreenMenace = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 17, 13, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats bowHauntedBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.NETHERITE, 7, 18, 16, 5, new Identifier("minecraft:netherite_scrap")); - private IMcdwWeaponStats.RangedStats bowHuntersPromise = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 5, 15, 16, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats bowHuntingBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 5, 16, 15, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats bowLostSouls = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.NETHERITE, 7, 12, 17, 5, new Identifier("minecraft:netherite_scrap")); - private IMcdwWeaponStats.RangedStats bowMastersBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 5, 17, 16, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats bowNocturnalBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 17, 14, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats bowPhantomBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 20, 14, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats bowPinkScoundrel = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 17, 13, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats bowPowerBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 5, 20, 14, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats bowSabrewing = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 10, 13, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats bowShiveringBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 14, 15, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats bowSnowBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 4, 16, 13, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats bowSoulBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 4, 14, 15, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats bowTrickbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 5, 12, 12, 10, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats bowTwinBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 5, 12, 12, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats bowTwistingVineBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 4, 15, 13, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats bowVoidBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 15, 16, 10, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats bowWebBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 15, 12, 10, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats bowWeepingVineBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 5, 15, 13, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats bowWindBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 11, 15, 10, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats bowWintersTouch = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 15, 14, 5, new Identifier("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats bowAncientBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.NETHERITE, 7, 14, 18, 0, Identifier.of("minecraft:netherite_scrap")); + private IMcdwWeaponStats.RangedStats bowBonebow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.STONE, 4, 16, 12, 5, Identifier.of("minecraft:bone")); + private IMcdwWeaponStats.RangedStats bowBubbleBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 5, 15, 12, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats bowBubbleBurster = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 15, 13, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats bowBurstGaleBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 12, 16, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats bowCallOfTheVoid = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.NETHERITE, 6, 15, 16, 5, Identifier.of("minecraft:netherite_scrap")); + private IMcdwWeaponStats.RangedStats bowEchoOfTheValley = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 11, 16, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats bowElitePowerBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 5, 20, 15, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats bowGreenMenace = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 17, 13, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats bowHauntedBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.NETHERITE, 7, 18, 16, 5, Identifier.of("minecraft:netherite_scrap")); + private IMcdwWeaponStats.RangedStats bowHuntersPromise = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 5, 15, 16, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats bowHuntingBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 5, 16, 15, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats bowLostSouls = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.NETHERITE, 7, 12, 17, 5, Identifier.of("minecraft:netherite_scrap")); + private IMcdwWeaponStats.RangedStats bowMastersBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 5, 17, 16, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats bowNocturnalBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 17, 14, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats bowPhantomBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 20, 14, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats bowPinkScoundrel = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 17, 13, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats bowPowerBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 5, 20, 14, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats bowSabrewing = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 10, 13, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats bowShiveringBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 14, 15, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats bowSnowBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 4, 16, 13, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats bowSoulBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 4, 14, 15, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats bowTrickbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 5, 12, 12, 10, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats bowTwinBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 5, 12, 12, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats bowTwistingVineBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 4, 15, 13, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats bowVoidBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 15, 16, 10, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats bowWebBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 15, 12, 10, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats bowWeepingVineBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 5, 15, 13, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats bowWindBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 11, 15, 10, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats bowWintersTouch = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 6, 15, 14, 5, Identifier.of("minecraft:diamond")); public IMcdwWeaponStats.RangedStats getBowAncientBow() { return bowAncientBow; diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwCrossbowItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwCrossbowItemStats.java index 1e9c4142..4ced9bf5 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwCrossbowItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwCrossbowItemStats.java @@ -16,35 +16,35 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwCrossbowItemStats extends ConfigSection { - private IMcdwWeaponStats.RangedStats crossbowAutoCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 28, 8, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowAzureSeeker = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 10, 28, 8, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowBabyCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 8, 23, 7, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowBurstCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 28, 8, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowButterflyCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 10, 28, 9, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowCogCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 10, 28, 8, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowCorruptedCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.NETHERITE, 16, 22, 14, 5, new Identifier("minecraft:netherite_scrap")); - private IMcdwWeaponStats.RangedStats crossbowDoomCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.NETHERITE, 9, 26, 8, 5, new Identifier("minecraft:netherite_scrap")); - private IMcdwWeaponStats.RangedStats crossbowDualCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 8, 24, 7, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowExplodingCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 28, 8, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowFeralSoulCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 10, 28, 9, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowFireboltThrower = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 28, 8, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowHarpoonCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 12, 28, 11, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowHarpCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 10, 28, 9, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowHeavyCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 28, 8, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowImplodingCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 28, 8, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowLightningHarpCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 16, 28, 14, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats crossbowNauticalCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 16, 24, 14, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats crossbowPrideOfThePiglins = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.NETHERITE, 15, 20, 13, 5, new Identifier("minecraft:netherite_scrap")); - private IMcdwWeaponStats.RangedStats crossbowRapidCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 20, 8, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowScatterCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 28, 8, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowShadowCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 14, 25, 12, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats crossbowSlayerCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 10, 26, 9, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats crossbowSoulCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 28, 8, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowSoulHunterCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 12, 28, 11, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats crossbowSpellboundCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 10, 28, 9, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowTheSlicer = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 12, 28, 10, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats crossbowVeiledCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 16, 22, 15, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats crossbowVoidcallerCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 14, 26, 13, 5, new Identifier("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats crossbowAutoCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 28, 8, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowAzureSeeker = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 10, 28, 8, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowBabyCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 8, 23, 7, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowBurstCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 28, 8, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowButterflyCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 10, 28, 9, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowCogCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 10, 28, 8, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowCorruptedCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.NETHERITE, 16, 22, 14, 5, Identifier.of("minecraft:netherite_scrap")); + private IMcdwWeaponStats.RangedStats crossbowDoomCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.NETHERITE, 9, 26, 8, 5, Identifier.of("minecraft:netherite_scrap")); + private IMcdwWeaponStats.RangedStats crossbowDualCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 8, 24, 7, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowExplodingCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 28, 8, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowFeralSoulCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 10, 28, 9, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowFireboltThrower = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 28, 8, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowHarpoonCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 12, 28, 11, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowHarpCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 10, 28, 9, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowHeavyCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 28, 8, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowImplodingCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 28, 8, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowLightningHarpCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 16, 28, 14, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats crossbowNauticalCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 16, 24, 14, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats crossbowPrideOfThePiglins = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.NETHERITE, 15, 20, 13, 5, Identifier.of("minecraft:netherite_scrap")); + private IMcdwWeaponStats.RangedStats crossbowRapidCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 20, 8, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowScatterCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 28, 8, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowShadowCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 14, 25, 12, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats crossbowSlayerCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 10, 26, 9, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats crossbowSoulCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 9, 28, 8, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowSoulHunterCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 12, 28, 11, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats crossbowSpellboundCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 10, 28, 9, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowTheSlicer = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 12, 28, 10, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats crossbowVeiledCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 16, 22, 15, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats crossbowVoidcallerCrossbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 14, 26, 13, 5, Identifier.of("minecraft:diamond")); public IMcdwWeaponStats.RangedStats getCrossbowAutoCrossbow() { return crossbowAutoCrossbow; diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwDaggerItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwDaggerItemStats.java index ca000cf4..be2ce157 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwDaggerItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwDaggerItemStats.java @@ -22,18 +22,18 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwDaggerItemStats extends ConfigSection { - private IMcdwWeaponStats.MeleeStats daggerBackstabber = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 1, -1.7f, -1.0d, 10, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.MeleeStats daggerChillGaleKnife = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 2, -2.2f, -1.0d, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.MeleeStats daggerDagger = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 1, -1.5f, -1.0d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats daggerFangsOfFrost = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 1, -1.5f, -1.0d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats daggerMoon = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 1, -1.5f, -1.0d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats daggerResoluteTempestKnife = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 2, -2.2f, -1.0d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats daggerShearDagger = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 0, -1.5f, -1.0d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats daggerSwiftStriker = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE, 1, -1.7f, -1.0d, 5, new Identifier("minecraft:netherite_scrap")); - private IMcdwWeaponStats.MeleeStats daggerTempestKnife = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 2, -2.2f, -1.0d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats daggerTheBeginning = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE, 1, -1.8f, -1.0d, 5, new Identifier("minecraft:netherite_scrap")); - private IMcdwWeaponStats.MeleeStats daggerTheEnd = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE, 1, -1.8f, -1.0d, 5, new Identifier("minecraft:netherite_scrap")); - private IMcdwWeaponStats.MeleeStats daggerVoidTouchedBlade = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 1, -1.8f, -1.0d, 10, new Identifier("minecraft:diamond")); + private IMcdwWeaponStats.MeleeStats daggerBackstabber = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 1, -1.7f, -1.0d, 10, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.MeleeStats daggerChillGaleKnife = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 2, -2.2f, -1.0d, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.MeleeStats daggerDagger = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 1, -1.5f, -1.0d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats daggerFangsOfFrost = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 1, -1.5f, -1.0d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats daggerMoon = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 1, -1.5f, -1.0d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats daggerResoluteTempestKnife = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 2, -2.2f, -1.0d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats daggerShearDagger = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 0, -1.5f, -1.0d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats daggerSwiftStriker = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE, 1, -1.7f, -1.0d, 5, Identifier.of("minecraft:netherite_scrap")); + private IMcdwWeaponStats.MeleeStats daggerTempestKnife = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 2, -2.2f, -1.0d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats daggerTheBeginning = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE, 1, -1.8f, -1.0d, 5, Identifier.of("minecraft:netherite_scrap")); + private IMcdwWeaponStats.MeleeStats daggerTheEnd = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE, 1, -1.8f, -1.0d, 5, Identifier.of("minecraft:netherite_scrap")); + private IMcdwWeaponStats.MeleeStats daggerVoidTouchedBlade = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 1, -1.8f, -1.0d, 10, Identifier.of("minecraft:diamond")); public IMcdwWeaponStats.MeleeStats getDaggerBackstabber() { return daggerBackstabber; diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwDoubleAxeItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwDoubleAxeItemStats.java index b5f5750d..0c4ad664 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwDoubleAxeItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwDoubleAxeItemStats.java @@ -16,9 +16,9 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwDoubleAxeItemStats extends ConfigSection { - private IMcdwWeaponStats.MeleeStats doubleAxeCursed = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 7, -2.9f, 0.0d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats doubleAxeDouble = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 6, -2.9f, 0.0d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats doubleAxeWhirlwind = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 6, -2.9f, 0.0d, 5, new Identifier("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats doubleAxeCursed = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 7, -2.9f, 0.0d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats doubleAxeDouble = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 6, -2.9f, 0.0d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats doubleAxeWhirlwind = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 6, -2.9f, 0.0d, 5, Identifier.of("minecraft:iron_ingot")); public IMcdwWeaponStats.MeleeStats getDoubleAxeCursed() { return doubleAxeCursed; } public IMcdwWeaponStats.MeleeStats getDoubleAxeDouble() { return doubleAxeDouble; } diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwGauntletItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwGauntletItemStats.java index 2e7cc30b..6bcdee72 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwGauntletItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwGauntletItemStats.java @@ -16,9 +16,9 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwGauntletItemStats extends ConfigSection { - private IMcdwWeaponStats.MeleeStats gauntletGauntlet = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 0, -1.5f, -1.0d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats gauntletMauler = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 1, -1.5f, -1.0d, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.MeleeStats gauntletSoulFist = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE, 0, -1.5f, -1.0d, 5, new Identifier("minecraft:netherite_scrap")); + private IMcdwWeaponStats.MeleeStats gauntletGauntlet = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 0, -1.5f, -1.0d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats gauntletMauler = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 1, -1.5f, -1.0d, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.MeleeStats gauntletSoulFist = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE, 0, -1.5f, -1.0d, 5, Identifier.of("minecraft:netherite_scrap")); public IMcdwWeaponStats.MeleeStats getGauntletGauntlet() { return gauntletGauntlet; } public IMcdwWeaponStats.MeleeStats getGauntletMauler() { return gauntletMauler; } diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwGlaiveItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwGlaiveItemStats.java index 4663c064..a66657a7 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwGlaiveItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwGlaiveItemStats.java @@ -16,10 +16,10 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwGlaiveItemStats extends ConfigSection { - private IMcdwWeaponStats.MeleeStats glaiveCacklingBroom = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -3f, 1.0d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats glaiveGlaive = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -3f, 1.0d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats glaiveGraveBane = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 6, -3f, 1.0d, 5, new Identifier("minecraft:gold_ingot")); - private IMcdwWeaponStats.MeleeStats glaiveVenomGlaive = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 6, -3f, 1.0d, 5, new Identifier("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats glaiveCacklingBroom = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -3f, 1.0d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats glaiveGlaive = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -3f, 1.0d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats glaiveGraveBane = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 6, -3f, 1.0d, 5, Identifier.of("minecraft:gold_ingot")); + private IMcdwWeaponStats.MeleeStats glaiveVenomGlaive = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 6, -3f, 1.0d, 5, Identifier.of("minecraft:iron_ingot")); public IMcdwWeaponStats.MeleeStats getGlaiveCacklingBroom() { return glaiveCacklingBroom; diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwHammerItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwHammerItemStats.java index 4e53c189..927985bf 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwHammerItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwHammerItemStats.java @@ -16,14 +16,14 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwHammerItemStats extends ConfigSection { - private IMcdwWeaponStats.MeleeStats hammerBoneclub = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 7, -3.2f, 0.0d, 10, new Identifier("minecraft:bone_block")); - private IMcdwWeaponStats.MeleeStats hammerBoneCudgel = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE, 7, -3.2f, 0.0d, 5, new Identifier("minecraft:netherite_scrap")); - private IMcdwWeaponStats.MeleeStats hammerFlail = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -2.8f, 0.0d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats hammerGravity = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 6, -3.2f, 0.0d, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.MeleeStats hammerGreatHammer = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 6, -3.2f, 0.0d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats hammerMace = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -2.8f, 0.0d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats hammerStormlander = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 7, -3.2f, 0.0d, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.MeleeStats hammerSunsGrace = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 4, -2.8f, 0.0d, 5, new Identifier("minecraft:diamond")); + private IMcdwWeaponStats.MeleeStats hammerBoneclub = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 7, -3.2f, 0.0d, 10, Identifier.of("minecraft:bone_block")); + private IMcdwWeaponStats.MeleeStats hammerBoneCudgel = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE, 7, -3.2f, 0.0d, 5, Identifier.of("minecraft:netherite_scrap")); + private IMcdwWeaponStats.MeleeStats hammerFlail = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -2.8f, 0.0d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats hammerGravity = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 6, -3.2f, 0.0d, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.MeleeStats hammerGreatHammer = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 6, -3.2f, 0.0d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats hammerMace = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -2.8f, 0.0d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats hammerStormlander = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 7, -3.2f, 0.0d, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.MeleeStats hammerSunsGrace = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 4, -2.8f, 0.0d, 5, Identifier.of("minecraft:diamond")); public IMcdwWeaponStats.MeleeStats getHammerBoneclub() { return hammerBoneclub; diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwLongbowItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwLongbowItemStats.java index 2a86ff72..1a728a24 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwLongbowItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwLongbowItemStats.java @@ -16,9 +16,9 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwLongbowItemStats extends ConfigSection { - private IMcdwWeaponStats.RangedStats longbowGuardianBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 8, 30, 19, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.RangedStats longbowLongbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 7, 25, 17, 10, new Identifier("minecraft:planks")); - private IMcdwWeaponStats.RangedStats longbowRedSnake = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 7, 30, 18, 5, new Identifier("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats longbowGuardianBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 8, 30, 19, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.RangedStats longbowLongbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 7, 25, 17, 10, Identifier.of("minecraft:planks")); + private IMcdwWeaponStats.RangedStats longbowRedSnake = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.DIAMOND, 7, 30, 18, 5, Identifier.of("minecraft:diamond")); public IMcdwWeaponStats.RangedStats getLongbowGuardianBow() { return longbowGuardianBow; diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwPickaxeItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwPickaxeItemStats.java index 1dd36f09..57bc93e2 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwPickaxeItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwPickaxeItemStats.java @@ -16,10 +16,10 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwPickaxeItemStats extends ConfigSection { - private IMcdwWeaponStats.MeleeStats pickaxeDiamondPickaxeVar = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 1, -2.8f, 0.0d, 10, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.MeleeStats pickaxeHailingPinnacle = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 1, -2.8f, 0.0d, 10, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.MeleeStats pickaxeHowlingPick = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 1, -2.8f, 0.0d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats pickaxeMountineerPick = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 1, -2.8f, 0.0d, 10, new Identifier("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats pickaxeDiamondPickaxeVar = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 1, -2.8f, 0.0d, 10, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.MeleeStats pickaxeHailingPinnacle = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 1, -2.8f, 0.0d, 10, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.MeleeStats pickaxeHowlingPick = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 1, -2.8f, 0.0d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats pickaxeMountineerPick = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 1, -2.8f, 0.0d, 10, Identifier.of("minecraft:iron_ingot")); public IMcdwWeaponStats.MeleeStats getPickaxeDiamondPickaxeVar() { return pickaxeDiamondPickaxeVar; diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwScytheItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwScytheItemStats.java index a35235ff..55dbe373 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwScytheItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwScytheItemStats.java @@ -16,10 +16,10 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwScytheItemStats extends ConfigSection { - private IMcdwWeaponStats.MeleeStats scytheFrostScythe = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 4, -2.9f, 0.5d,5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.MeleeStats scytheJailorsScythe = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 4, -2.9f, 0.5d,10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats scytheSkullScythe = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 4, -2.9f, 0.5d,5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.MeleeStats scytheSoulScythe = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 3, -2.9f, 0.5d,5, new Identifier("minecraft:diamond")); + private IMcdwWeaponStats.MeleeStats scytheFrostScythe = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 4, -2.9f, 0.5d,5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.MeleeStats scytheJailorsScythe = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 4, -2.9f, 0.5d,10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats scytheSkullScythe = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 4, -2.9f, 0.5d,5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.MeleeStats scytheSoulScythe = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 3, -2.9f, 0.5d,5, Identifier.of("minecraft:diamond")); public IMcdwWeaponStats.MeleeStats getScytheFrostScythe() { return scytheFrostScythe; diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwShieldItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwShieldItemStats.java index 9e8f6e61..f53e6b32 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwShieldItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwShieldItemStats.java @@ -19,9 +19,9 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwShieldItemStats extends ConfigSection { - private IMcdwWeaponStats.ShieldStats shieldRoyalGuardShield = IMcdwWeaponStats.shieldStats(true, true, ToolMaterials.DIAMOND, 5, Set.of(new Identifier("minecraft:iron_ingot"), new Identifier("minecraft:gold_ingot"))); - private IMcdwWeaponStats.ShieldStats shieldTowerGuardShield = IMcdwWeaponStats.shieldStats(true, true, ToolMaterials.DIAMOND, 5, Set.of(new Identifier("minecraft:iron_ingot"), new Identifier("minecraft:gold_ingot"), new Identifier("minecraft:copper_ingot"))); - private IMcdwWeaponStats.ShieldStats shieldVanguardShield = IMcdwWeaponStats.shieldStats(true, true, ToolMaterials.DIAMOND, 5, Set.of(CleanlinessHelper.mcdw$getItemTagKey("minecraft:planks"), new Identifier("minecraft:iron_ingot"))); + private IMcdwWeaponStats.ShieldStats shieldRoyalGuardShield = IMcdwWeaponStats.shieldStats(true, true, ToolMaterials.DIAMOND, 5, Set.of(Identifier.of("minecraft:iron_ingot"), Identifier.of("minecraft:gold_ingot"))); + private IMcdwWeaponStats.ShieldStats shieldTowerGuardShield = IMcdwWeaponStats.shieldStats(true, true, ToolMaterials.DIAMOND, 5, Set.of(Identifier.of("minecraft:iron_ingot"), Identifier.of("minecraft:gold_ingot"), Identifier.of("minecraft:copper_ingot"))); + private IMcdwWeaponStats.ShieldStats shieldVanguardShield = IMcdwWeaponStats.shieldStats(true, true, ToolMaterials.DIAMOND, 5, Set.of(CleanlinessHelper.mcdw$getItemTagKey("minecraft:planks"), Identifier.of("minecraft:iron_ingot"))); diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwShortbowItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwShortbowItemStats.java index 154d717e..b8288320 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwShortbowItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwShortbowItemStats.java @@ -16,10 +16,10 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwShortbowItemStats extends ConfigSection { - private IMcdwWeaponStats.RangedStats shortbowLoveSpellBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 3, 9, 8, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats shortbowMechanicalShortbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 4, 9, 9, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats shortbowPurpleStorm = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 3, 9, 8, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.RangedStats shortbowShortbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 3, 9, 8, 10, new Identifier("minecraft:planks")); + private IMcdwWeaponStats.RangedStats shortbowLoveSpellBow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 3, 9, 8, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats shortbowMechanicalShortbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 4, 9, 9, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats shortbowPurpleStorm = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 3, 9, 8, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.RangedStats shortbowShortbow = IMcdwWeaponStats.rangedStats(true, true, ToolMaterials.IRON, 3, 9, 8, 10, Identifier.of("minecraft:planks")); public IMcdwWeaponStats.RangedStats getShortbowLoveSpellBow() { return shortbowLoveSpellBow; diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwSickleItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwSickleItemStats.java index c483c042..d250da47 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwSickleItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwSickleItemStats.java @@ -23,10 +23,10 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwSickleItemStats extends ConfigSection { - private IMcdwWeaponStats.MeleeStats sickleLastLaughGold = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 2, -2.1f, -1.0d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats sickleLastLaughSilver = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 2, -2.1f, -1.0d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats sickleNightmaresBite = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 2, -2.1f, -1.0d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats sickleSickle = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 1, -2.1f, -1.0d, 10, new Identifier("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats sickleLastLaughGold = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 2, -2.1f, -1.0d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats sickleLastLaughSilver = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 2, -2.1f, -1.0d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats sickleNightmaresBite = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 2, -2.1f, -1.0d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats sickleSickle = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 1, -2.1f, -1.0d, 10, Identifier.of("minecraft:iron_ingot")); public IMcdwWeaponStats.MeleeStats getSickleLastLaughGold() { return sickleLastLaughGold; } diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwSoulDaggerItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwSoulDaggerItemStats.java index b7b76f25..87a01210 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwSoulDaggerItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwSoulDaggerItemStats.java @@ -16,9 +16,9 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwSoulDaggerItemStats extends ConfigSection { - private IMcdwWeaponStats.MeleeStats soul_dagger_eternal_knife = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE, 4, -2.8f, -1.0d, 5, new Identifier("minecraft:netherite_scrap")); - private IMcdwWeaponStats.MeleeStats soul_dagger_soul_knife = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 4, -2.8f, -1.0d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats soul_dagger_truthseeker = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE, 3, -2.8f, 0.0d, 5, new Identifier("minecraft:netherite_scrap")); + private IMcdwWeaponStats.MeleeStats soul_dagger_eternal_knife = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE, 4, -2.8f, -1.0d, 5, Identifier.of("minecraft:netherite_scrap")); + private IMcdwWeaponStats.MeleeStats soul_dagger_soul_knife = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 4, -2.8f, -1.0d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats soul_dagger_truthseeker = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE, 3, -2.8f, 0.0d, 5, Identifier.of("minecraft:netherite_scrap")); public IMcdwWeaponStats.MeleeStats getSoul_dagger_eternal_knife() { return soul_dagger_eternal_knife; diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwSpearItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwSpearItemStats.java index 83c472a1..a5842cb7 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwSpearItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwSpearItemStats.java @@ -16,9 +16,9 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwSpearItemStats extends ConfigSection { - private IMcdwWeaponStats.MeleeStats spearSpear = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 4, -2.5f, 1.0d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats spearWhisperingSpear = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -2.5f, 1.0d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats spearFortuneSpear = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -2.5f, 1.0d, 5, new Identifier("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats spearSpear = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 4, -2.5f, 1.0d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats spearWhisperingSpear = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -2.5f, 1.0d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats spearFortuneSpear = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -2.5f, 1.0d, 5, Identifier.of("minecraft:iron_ingot")); public IMcdwWeaponStats.MeleeStats getSpearSpear() { return spearSpear; diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwStaffItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwStaffItemStats.java index 044f5777..eb0f8b1d 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwStaffItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwStaffItemStats.java @@ -16,9 +16,9 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwStaffItemStats extends ConfigSection { - private IMcdwWeaponStats.MeleeStats staffBattlestaff = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.WOOD, 2, -2.6f, 1.0d, 10, new Identifier("minecraft:planks")); - private IMcdwWeaponStats.MeleeStats staffBattlestaffOfTerror = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -2.6f, 1.0d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats staffGrowingStaff = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -2.6f, 1.0d, 5, new Identifier("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats staffBattlestaff = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.WOOD, 2, -2.6f, 1.0d, 10, Identifier.of("minecraft:planks")); + private IMcdwWeaponStats.MeleeStats staffBattlestaffOfTerror = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -2.6f, 1.0d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats staffGrowingStaff = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -2.6f, 1.0d, 5, Identifier.of("minecraft:iron_ingot")); public IMcdwWeaponStats.MeleeStats getStaffBattlestaff() { return staffBattlestaff; diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwSwordItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwSwordItemStats.java index f7256545..c34233ee 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwSwordItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwSwordItemStats.java @@ -16,36 +16,36 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwSwordItemStats extends ConfigSection { - private IMcdwWeaponStats.MeleeStats swordBeeStinger = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 0, -1.1f, 0.0d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats swordFreezingFoil = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 1, -1.1f, 0.0d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats swordRapier = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 0, -1.14f, 0.0d, 10, new Identifier("minecraft:iron_ingot")); - - private IMcdwWeaponStats.MeleeStats swordBroadsword = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -3.0f, 0.5d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats swordClaymore = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 7, -3.2f, 0.5d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats swordFrostSlayer = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 6, -3.2f, 0.5d, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.MeleeStats swordGreatAxeblade = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 7, -3.2f, 0.5d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats swordHeartstealer = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 6, -3.2f, 0.5d, 5, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.MeleeStats swordObsidianClaymore = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE,6, -3.3f, 0.5d, 5, new Identifier("minecraft:netherite_scrap")); - private IMcdwWeaponStats.MeleeStats swordTheStarlessNight = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE,6, -3.3f, 0.5d, 1, new Identifier("minecraft:netherite_scrap")); - - private IMcdwWeaponStats.MeleeStats swordBrokenSawblade = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 3, -2.4f, 0.0d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats swordMechanizedSawblade = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 3, -2.4f, 0.0d, 1, new Identifier("minecraft:blaze_rod")); - - private IMcdwWeaponStats.MeleeStats swordCoralBlade = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 3, -2.4f, 0.0d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats swordSpongeStriker = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 3, -2.4f, 0.0d, 5, new Identifier("minecraft:diamond")); - - private IMcdwWeaponStats.MeleeStats swordCutlass = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 2, -2.3f, 0.0d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats swordNamelessBlade = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 4, -2.3f, 0.0d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats swordDancersSword = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 3, -2.0f, 0.0d, 5, new Identifier("minecraft:iron_ingot")); - - private IMcdwWeaponStats.MeleeStats swordDarkKatana = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE,4, -2.9f, 0.25d, 5, new Identifier("minecraft:netherite_scrap")); - private IMcdwWeaponStats.MeleeStats swordKatana = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 4, -2.9f, 0.25d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats swordMastersKatana = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 4, -2.9f, 0.25d, 5, new Identifier("minecraft:diamond")); - - private IMcdwWeaponStats.MeleeStats swordDiamondSwordVar = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 3, -2.4f, 0.0d, 10, new Identifier("minecraft:diamond")); - private IMcdwWeaponStats.MeleeStats swordHawkbrand = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 6, -2.9f, 0.0d, 5, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats swordIronSwordVar = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 3, -2.4f, 0.0d, 10, new Identifier("minecraft:iron_ingot")); - private IMcdwWeaponStats.MeleeStats swordSinisterSword = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 6, -2.9f, 0.0d, 1, new Identifier("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats swordBeeStinger = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 0, -1.1f, 0.0d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats swordFreezingFoil = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 1, -1.1f, 0.0d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats swordRapier = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 0, -1.14f, 0.0d, 10, Identifier.of("minecraft:iron_ingot")); + + private IMcdwWeaponStats.MeleeStats swordBroadsword = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -3.0f, 0.5d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats swordClaymore = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 7, -3.2f, 0.5d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats swordFrostSlayer = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 6, -3.2f, 0.5d, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.MeleeStats swordGreatAxeblade = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 7, -3.2f, 0.5d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats swordHeartstealer = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 6, -3.2f, 0.5d, 5, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.MeleeStats swordObsidianClaymore = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE,6, -3.3f, 0.5d, 5, Identifier.of("minecraft:netherite_scrap")); + private IMcdwWeaponStats.MeleeStats swordTheStarlessNight = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE,6, -3.3f, 0.5d, 1, Identifier.of("minecraft:netherite_scrap")); + + private IMcdwWeaponStats.MeleeStats swordBrokenSawblade = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 3, -2.4f, 0.0d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats swordMechanizedSawblade = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 3, -2.4f, 0.0d, 1, Identifier.of("minecraft:blaze_rod")); + + private IMcdwWeaponStats.MeleeStats swordCoralBlade = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 3, -2.4f, 0.0d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats swordSpongeStriker = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 3, -2.4f, 0.0d, 5, Identifier.of("minecraft:diamond")); + + private IMcdwWeaponStats.MeleeStats swordCutlass = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 2, -2.3f, 0.0d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats swordNamelessBlade = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 4, -2.3f, 0.0d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats swordDancersSword = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 3, -2.0f, 0.0d, 5, Identifier.of("minecraft:iron_ingot")); + + private IMcdwWeaponStats.MeleeStats swordDarkKatana = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.NETHERITE,4, -2.9f, 0.25d, 5, Identifier.of("minecraft:netherite_scrap")); + private IMcdwWeaponStats.MeleeStats swordKatana = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 4, -2.9f, 0.25d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats swordMastersKatana = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 4, -2.9f, 0.25d, 5, Identifier.of("minecraft:diamond")); + + private IMcdwWeaponStats.MeleeStats swordDiamondSwordVar = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.DIAMOND, 3, -2.4f, 0.0d, 10, Identifier.of("minecraft:diamond")); + private IMcdwWeaponStats.MeleeStats swordHawkbrand = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 6, -2.9f, 0.0d, 5, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats swordIronSwordVar = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 3, -2.4f, 0.0d, 10, Identifier.of("minecraft:iron_ingot")); + private IMcdwWeaponStats.MeleeStats swordSinisterSword = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 6, -2.9f, 0.0d, 1, Identifier.of("minecraft:iron_ingot")); public IMcdwWeaponStats.MeleeStats getSwordBeeStinger() { return swordBeeStinger; diff --git a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwWhipItemStats.java b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwWhipItemStats.java index 48a1378a..cd60e3c2 100644 --- a/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwWhipItemStats.java +++ b/src/main/java/dev/timefall/mcdw/configs/stats/item_sections/McdwWhipItemStats.java @@ -22,8 +22,8 @@ @SuppressWarnings("FieldMayBeFinal") @IgnoreVisibility public class McdwWhipItemStats extends ConfigSection { - private IMcdwWeaponStats.MeleeStats whipVineWhip = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -3.1f, 1.5d, 5, new Identifier("minecraft:vine")); - private IMcdwWeaponStats.MeleeStats whipWhip = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 3, -3.1f, 1.5d, 10, new Identifier("minecraft:string")); + private IMcdwWeaponStats.MeleeStats whipVineWhip = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 5, -3.1f, 1.5d, 5, Identifier.of("minecraft:vine")); + private IMcdwWeaponStats.MeleeStats whipWhip = IMcdwWeaponStats.meleeStats(true, true, ToolMaterials.IRON, 3, -3.1f, 1.5d, 10, Identifier.of("minecraft:string")); public IMcdwWeaponStats.MeleeStats getWhipWhip(){ return whipWhip; diff --git a/src/main/java/dev/timefall/mcdw/data/ConfigItemEnabledCondition.java b/src/main/java/dev/timefall/mcdw/data/ConfigItemEnabledCondition.java index 5477e435..ae1f8ccc 100644 --- a/src/main/java/dev/timefall/mcdw/data/ConfigItemEnabledCondition.java +++ b/src/main/java/dev/timefall/mcdw/data/ConfigItemEnabledCondition.java @@ -11,7 +11,7 @@ public class ConfigItemEnabledCondition { public static void register() { // Register a resource condition for checking if multiple config values are all true - ResourceConditions.register(new Identifier(Mcdw.MOD_ID, "config_enabled"), jsonObject -> { + ResourceConditions.register(Identifier.of(Mcdw.MOD_ID, "config_enabled"), jsonObject -> { JsonArray values = JsonHelper.getArray(jsonObject, "values"); List booleanList = new ArrayList<>(); @@ -42,14 +42,14 @@ public static void register() { }); // Register a resource condition for checking if an item is enabled - ResourceConditions.register(new Identifier(Mcdw.MOD_ID, "item_enabled"), jsonObject -> { + ResourceConditions.register(Identifier.of(Mcdw.MOD_ID, "item_enabled"), jsonObject -> { JsonArray values = JsonHelper.getArray(jsonObject, "values"); for (JsonElement element : values) { if (element.isJsonPrimitive()) { try { // Check if the item exists in the item registry - return Registries.ITEM.get(new Identifier(element.getAsString())) != Items.AIR; + return Registries.ITEM.get(Identifier.of(element.getAsString())) != Items.AIR; } catch (Exception e) { throw new RuntimeException(e); } diff --git a/src/main/java/dev/timefall/mcdw/data/McdwTagGenerator.java b/src/main/java/dev/timefall/mcdw/data/McdwTagGenerator.java index c7f9c077..62999307 100644 --- a/src/main/java/dev/timefall/mcdw/data/McdwTagGenerator.java +++ b/src/main/java/dev/timefall/mcdw/data/McdwTagGenerator.java @@ -24,10 +24,10 @@ public McdwTagGenerator(FabricDataOutput output, CompletableFuture COMMON_LOOT_POOL_ITEMS = TagKey.of(RegistryKeys.ITEM, new Identifier("mcdw:common_loot_pool_items")); - private static final TagKey UNCOMMON_LOOT_POOL_ITEMS = TagKey.of(RegistryKeys.ITEM, new Identifier("mcdw:uncommon_loot_pool_items")); - private static final TagKey RARE_LOOT_POOL_ITEMS = TagKey.of(RegistryKeys.ITEM, new Identifier("mcdw:rare_loot_pool_items")); - private static final TagKey EPIC_LOOT_POOL_ITEMS = TagKey.of(RegistryKeys.ITEM, new Identifier("mcdw:epic_loot_pool_items")); + private static final TagKey COMMON_LOOT_POOL_ITEMS = TagKey.of(RegistryKeys.ITEM, Identifier.of("mcdw:common_loot_pool_items")); + private static final TagKey UNCOMMON_LOOT_POOL_ITEMS = TagKey.of(RegistryKeys.ITEM, Identifier.of("mcdw:uncommon_loot_pool_items")); + private static final TagKey RARE_LOOT_POOL_ITEMS = TagKey.of(RegistryKeys.ITEM, Identifier.of("mcdw:rare_loot_pool_items")); + private static final TagKey EPIC_LOOT_POOL_ITEMS = TagKey.of(RegistryKeys.ITEM, Identifier.of("mcdw:epic_loot_pool_items")); @Override @@ -35,165 +35,165 @@ protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) { getOrCreateTagBuilder(COMMON_LOOT_POOL_ITEMS) .setReplace(false) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwAxeItemRegistry.AXE_ANCHOR.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwAxeItemRegistry.AXE_AXE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_DAGGER.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwDoubleAxeItemRegistry.DOUBLE_AXE_DOUBLE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwGauntletItemRegistry.GAUNTLET_GAUNTLET.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwGlaiveItemRegistry.GLAIVE_GLAIVE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwHammerItemRegistry.HAMMER_GREAT_HAMMER.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwHammerItemRegistry.HAMMER_MACE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwLongbowItemRegistry.LONGBOW_LONGBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwPickaxeItemRegistry.PICK_HOWLING_PICK.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwPickaxeItemRegistry.PICK_MOUNTAINEER_PICK.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwShortbowItemRegistry.SHORTBOW_SHORTBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSickleItemRegistry.SICKLE_SICKLE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSpearItemRegistry.SPEAR_SPEAR.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwStaffItemRegistry.STAFF_BATTLESTAFF.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_CUTLASS.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_IRON_SWORD_VAR.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_KATANA.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_RAPIER.toString())); + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwAxeItemRegistry.AXE_ANCHOR.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwAxeItemRegistry.AXE_AXE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_DAGGER.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwDoubleAxeItemRegistry.DOUBLE_AXE_DOUBLE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwGauntletItemRegistry.GAUNTLET_GAUNTLET.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwGlaiveItemRegistry.GLAIVE_GLAIVE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwHammerItemRegistry.HAMMER_GREAT_HAMMER.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwHammerItemRegistry.HAMMER_MACE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwLongbowItemRegistry.LONGBOW_LONGBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwPickaxeItemRegistry.PICK_HOWLING_PICK.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwPickaxeItemRegistry.PICK_MOUNTAINEER_PICK.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwShortbowItemRegistry.SHORTBOW_SHORTBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSickleItemRegistry.SICKLE_SICKLE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSpearItemRegistry.SPEAR_SPEAR.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwStaffItemRegistry.STAFF_BATTLESTAFF.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_CUTLASS.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_IRON_SWORD_VAR.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_KATANA.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_RAPIER.toString())); getOrCreateTagBuilder(UNCOMMON_LOOT_POOL_ITEMS) .setReplace(false) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_BONEBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_BUBBLE_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_HUNTERS_PROMISE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_HUNTING_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_MASTERS_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_POWER_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_SNOW_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_SOUL_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_TWISTING_VINE_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_WEEPING_VINE_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_WIND_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_AUTO_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_AZURE_SEEKER.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_BURST_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_BUTTERFLY_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_DUAL_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_EXPLODING_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_FIREBOLT_THROWER.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_HARPOON_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_HARP_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_HEAVY_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_IMPLODING_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_RAPID_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_SCATTER_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_SOUL_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_THE_SLICER.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_MOON.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwDoubleAxeItemRegistry.DOUBLE_AXE_CURSED.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwHammerItemRegistry.HAMMER_BONECLUB.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwHammerItemRegistry.HAMMER_BONE_CUDGEL.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwPickaxeItemRegistry.PICK_HOWLING_PICK.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwScytheItemRegistry.SCYTHE_JAILORS_SCYTHE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwScytheItemRegistry.SCYTHE_SKULL_SCYTHE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSickleItemRegistry.SICKLE_NIGHTMARES_BITE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_BROADSWORD.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_BROKEN_SAWBLADE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_CLAYMORE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_DIAMOND_SWORD_VAR.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_MECHANIZED_SAWBLADE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_NAMELESS_BLADE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_SINISTER_SWORD.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwWhipItemRegistry.WHIP_VINE_WHIP.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwWhipItemRegistry.WHIP_WHIP.toString())); + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_BONEBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_BUBBLE_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_HUNTERS_PROMISE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_HUNTING_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_MASTERS_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_POWER_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_SNOW_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_SOUL_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_TWISTING_VINE_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_WEEPING_VINE_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_WIND_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_AUTO_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_AZURE_SEEKER.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_BURST_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_BUTTERFLY_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_DUAL_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_EXPLODING_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_FIREBOLT_THROWER.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_HARPOON_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_HARP_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_HEAVY_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_IMPLODING_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_RAPID_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_SCATTER_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_SOUL_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_THE_SLICER.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_MOON.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwDoubleAxeItemRegistry.DOUBLE_AXE_CURSED.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwHammerItemRegistry.HAMMER_BONECLUB.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwHammerItemRegistry.HAMMER_BONE_CUDGEL.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwPickaxeItemRegistry.PICK_HOWLING_PICK.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwScytheItemRegistry.SCYTHE_JAILORS_SCYTHE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwScytheItemRegistry.SCYTHE_SKULL_SCYTHE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSickleItemRegistry.SICKLE_NIGHTMARES_BITE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_BROADSWORD.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_BROKEN_SAWBLADE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_CLAYMORE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_DIAMOND_SWORD_VAR.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_MECHANIZED_SAWBLADE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_NAMELESS_BLADE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_SINISTER_SWORD.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwWhipItemRegistry.WHIP_VINE_WHIP.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwWhipItemRegistry.WHIP_WHIP.toString())); getOrCreateTagBuilder(RARE_LOOT_POOL_ITEMS) .setReplace(false) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwAxeItemRegistry.AXE_ENCRUSTED_ANCHOR.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwAxeItemRegistry.AXE_FIREBRAND.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwAxeItemRegistry.AXE_HIGHLAND.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_BUBBLE_BURSTER.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_BURST_GALE_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_CALL_OF_THE_VOID.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_ECHO_OF_THE_VALLEY.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_ELITE_POWER_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_GREEN_MENACE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_NOCTURNAL_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_PHANTOM_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_PINK_SCOUNDREL.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_SABREWING.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_SHIVERING_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_TRICKBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_TWIN_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_VOID_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_WEB_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_WINTERS_TOUCH.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_BABY_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_COG_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_FERAL_SOUL_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_LIGHTNING_HARP_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_NAUTICAL_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_SHADOW_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_SLAYER_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_SOUL_HUNTER_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_SPELLBOUND_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_VEILED_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_VOIDCALLER_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_CHILL_GALE_KNIFE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_FANGS_OF_FROST.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_RESOLUTE_TEMPEST_KNIFE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_SHEAR_DAGGER.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_TEMPEST_KNIFE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwDoubleAxeItemRegistry.DOUBLE_AXE_WHIRLWIND.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwGauntletItemRegistry.GAUNTLET_MAULER.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwGlaiveItemRegistry.GLAIVE_GRAVE_BANE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwGlaiveItemRegistry.GLAIVE_VENOM_GLAIVE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwHammerItemRegistry.HAMMER_FLAIL.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwLongbowItemRegistry.LONGBOW_GUARDIAN_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwLongbowItemRegistry.LONGBOW_RED_SNAKE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwPickaxeItemRegistry.PICK_DIAMOND_PICKAXE_VAR.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwScytheItemRegistry.SCYTHE_FROST_SCYTHE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwShieldItemRegistry.SHIELD_ROYAL_GUARD_SHIELD.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwShieldItemRegistry.SHIELD_VANGUARD_SHIELD.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwShortbowItemRegistry.SHORTBOW_LOVE_SPELL_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwShortbowItemRegistry.SHORTBOW_MECHANICAL_SHORTBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwShortbowItemRegistry.SHORTBOW_PURPLE_STORM.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSickleItemRegistry.SICKLE_LAST_LAUGH_GOLD.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSickleItemRegistry.SICKLE_LAST_LAUGH_GOLD.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSickleItemRegistry.SICKLE_LAST_LAUGH_SILVER.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSpearItemRegistry.SPEAR_FORTUNE_SPEAR.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSpearItemRegistry.SPEAR_WHISPERING_SPEAR.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwStaffItemRegistry.STAFF_BATTLESTAFF_OF_TERROR.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwStaffItemRegistry.STAFF_GROWING_STAFF.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_BEE_STINGER.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_CORAL_BLADE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_DANCERS_SWORD.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_FREEZING_FOIL.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_FROST_SLAYER.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_GREAT_AXEBLADE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_HAWKBRAND.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_HEARTSTEALER.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_MASTERS_KATANA.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_SPONGE_STRIKER.toString())); + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwAxeItemRegistry.AXE_ENCRUSTED_ANCHOR.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwAxeItemRegistry.AXE_FIREBRAND.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwAxeItemRegistry.AXE_HIGHLAND.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_BUBBLE_BURSTER.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_BURST_GALE_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_CALL_OF_THE_VOID.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_ECHO_OF_THE_VALLEY.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_ELITE_POWER_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_GREEN_MENACE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_NOCTURNAL_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_PHANTOM_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_PINK_SCOUNDREL.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_SABREWING.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_SHIVERING_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_TRICKBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_TWIN_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_VOID_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_WEB_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_WINTERS_TOUCH.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_BABY_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_COG_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_FERAL_SOUL_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_LIGHTNING_HARP_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_NAUTICAL_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_SHADOW_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_SLAYER_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_SOUL_HUNTER_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_SPELLBOUND_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_VEILED_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_VOIDCALLER_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_CHILL_GALE_KNIFE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_FANGS_OF_FROST.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_RESOLUTE_TEMPEST_KNIFE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_SHEAR_DAGGER.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_TEMPEST_KNIFE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwDoubleAxeItemRegistry.DOUBLE_AXE_WHIRLWIND.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwGauntletItemRegistry.GAUNTLET_MAULER.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwGlaiveItemRegistry.GLAIVE_GRAVE_BANE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwGlaiveItemRegistry.GLAIVE_VENOM_GLAIVE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwHammerItemRegistry.HAMMER_FLAIL.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwLongbowItemRegistry.LONGBOW_GUARDIAN_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwLongbowItemRegistry.LONGBOW_RED_SNAKE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwPickaxeItemRegistry.PICK_DIAMOND_PICKAXE_VAR.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwScytheItemRegistry.SCYTHE_FROST_SCYTHE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwShieldItemRegistry.SHIELD_ROYAL_GUARD_SHIELD.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwShieldItemRegistry.SHIELD_VANGUARD_SHIELD.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwShortbowItemRegistry.SHORTBOW_LOVE_SPELL_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwShortbowItemRegistry.SHORTBOW_MECHANICAL_SHORTBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwShortbowItemRegistry.SHORTBOW_PURPLE_STORM.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSickleItemRegistry.SICKLE_LAST_LAUGH_GOLD.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSickleItemRegistry.SICKLE_LAST_LAUGH_GOLD.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSickleItemRegistry.SICKLE_LAST_LAUGH_SILVER.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSpearItemRegistry.SPEAR_FORTUNE_SPEAR.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSpearItemRegistry.SPEAR_WHISPERING_SPEAR.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwStaffItemRegistry.STAFF_BATTLESTAFF_OF_TERROR.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwStaffItemRegistry.STAFF_GROWING_STAFF.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_BEE_STINGER.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_CORAL_BLADE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_DANCERS_SWORD.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_FREEZING_FOIL.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_FROST_SLAYER.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_GREAT_AXEBLADE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_HAWKBRAND.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_HEARTSTEALER.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_MASTERS_KATANA.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_SPONGE_STRIKER.toString())); getOrCreateTagBuilder(EPIC_LOOT_POOL_ITEMS) .setReplace(false) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_ANCIENT_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_HAUNTED_BOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_LOST_SOULS.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_CORRUPTED_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_DOOM_CROSSBOW.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_PRIDE_OF_THE_PIGLINS.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_BACKSTABBER.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_SWIFT_STRIKER.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_THE_BEGINNING.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_THE_END.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_VOID_TOUCHED_BLADE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwGauntletItemRegistry.GAUNTLET_SOUL_FIST.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwHammerItemRegistry.HAMMER_GRAVITY.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwHammerItemRegistry.HAMMER_STORMLANDER.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwHammerItemRegistry.HAMMER_SUNS_GRACE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwScytheItemRegistry.SCYTHE_SOUL_SCYTHE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSoulDaggerItemRegistry.SOUL_DAGGER_ETERNAL_KNIFE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSoulDaggerItemRegistry.SOUL_DAGGER_SOUL_KNIFE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSoulDaggerItemRegistry.SOUL_DAGGER_TRUTHSEEKER.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_DARK_KATANA.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_OBSIDIAN_CLAYMORE.toString())) - .addOptional(new Identifier(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_THE_STARLESS_NIGHT.toString())); + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_ANCIENT_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_HAUNTED_BOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwBowItemRegistry.BOW_LOST_SOULS.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_CORRUPTED_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_DOOM_CROSSBOW.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwCrossbowItemRegistry.CROSSBOW_PRIDE_OF_THE_PIGLINS.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_BACKSTABBER.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_SWIFT_STRIKER.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_THE_BEGINNING.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_THE_END.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwDaggerItemRegistry.DAGGER_VOID_TOUCHED_BLADE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwGauntletItemRegistry.GAUNTLET_SOUL_FIST.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwHammerItemRegistry.HAMMER_GRAVITY.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwHammerItemRegistry.HAMMER_STORMLANDER.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwHammerItemRegistry.HAMMER_SUNS_GRACE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwScytheItemRegistry.SCYTHE_SOUL_SCYTHE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSoulDaggerItemRegistry.SOUL_DAGGER_ETERNAL_KNIFE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSoulDaggerItemRegistry.SOUL_DAGGER_SOUL_KNIFE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSoulDaggerItemRegistry.SOUL_DAGGER_TRUTHSEEKER.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_DARK_KATANA.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_OBSIDIAN_CLAYMORE.toString())) + .addOptional(Identifier.of(Mcdw.MOD_ID, McdwSwordItemRegistry.SWORD_THE_STARLESS_NIGHT.toString())); } } diff --git a/src/main/java/dev/timefall/mcdw/effects/EnchantmentEffects.java b/src/main/java/dev/timefall/mcdw/effects/EnchantmentEffects.java index d1e6882f..aec5701a 100644 --- a/src/main/java/dev/timefall/mcdw/effects/EnchantmentEffects.java +++ b/src/main/java/dev/timefall/mcdw/effects/EnchantmentEffects.java @@ -8,13 +8,12 @@ import dev.timefall.mcdw.api.interfaces.IMcdwEnchantedArrow; import dev.timefall.mcdw.api.util.*; -import dev.timefall.mcdw.configs.stats.McdwEnchantmentStatsConfig; import dev.timefall.mcdw.configs.stats.McdwWeaponStatsConfig; -import dev.timefall.mcdw.enchants.goals.WildRageAttackGoal; +import dev.timefall.mcdw.enchantment.goals.WildRageAttackGoal; import dev.timefall.mcdw.registries.items.McdwBowItemRegistry; import dev.timefall.mcdw.enums.EnchantmentsID; -import dev.timefall.mcdw.mixin.mcdw.CreeperEntityAccessor; -import dev.timefall.mcdw.mixin.mcdw.MobEntityAccessor; +import dev.timefall.mcdw.mixin.old_mixins.mcdw.CreeperEntityAccessor; +import dev.timefall.mcdw.mixin.old_mixins.mcdw.MobEntityAccessor; import dev.timefall.mcdw.registries.EnchantsRegistry; import dev.timefall.mcdw.registries.SoundEventsRegistry; import dev.timefall.mcdw.registries.StatusEffectsRegistry; diff --git a/src/main/java/dev/timefall/mcdw/effects/NewEnchantmentEffects.java b/src/main/java/dev/timefall/mcdw/effects/NewEnchantmentEffects.java new file mode 100644 index 00000000..d5383b80 --- /dev/null +++ b/src/main/java/dev/timefall/mcdw/effects/NewEnchantmentEffects.java @@ -0,0 +1,12 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + +package dev.timefall.mcdw.effects; + +public class NewEnchantmentEffects { + // Hooks live here +} diff --git a/src/main/java/dev/timefall/mcdw/enchants/effect/McdwEntityEffectTypes.java b/src/main/java/dev/timefall/mcdw/enchants/effect/McdwEntityEffectTypes.java new file mode 100644 index 00000000..c70d12a0 --- /dev/null +++ b/src/main/java/dev/timefall/mcdw/enchants/effect/McdwEntityEffectTypes.java @@ -0,0 +1,11 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + +package dev.timefall.mcdw.enchants.effect; + +public class McdwEntityEffectTypes { +} diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/AccelerateEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/AccelerateEnchantment.java index a5057e7e..ec2a9420 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/AccelerateEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/AccelerateEnchantment.java @@ -4,15 +4,27 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.RangedEnchantment; +import dev.timefall.mcdw.enchantment.types.RangedEnchantment; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.MultishotEnchantment; import net.minecraft.item.BowItem; import net.minecraft.item.CrossbowItem; import net.minecraft.item.ItemStack; + +/* + * Effects Needed: + * ACCELERATE_CHARGE_TIME -> New Effect Type, Custom CODEC, pain + * APPLY_STACKING_MOB_EFFECT -> Registries.ENCHANTMENT_ENTITY_EFFECT_TYPE + */ + +/* + * Effects Present: + * + */ + public class AccelerateEnchantment extends RangedEnchantment { public AccelerateEnchantment(Properties properties) { super(properties); @@ -36,6 +48,6 @@ public boolean isAcceptableItem(ItemStack stack) { @Override protected boolean canAccept(Enchantment other) { - return !(other instanceof MultishotEnchantment || other instanceof OverchargeEnchantment); + return !(other instanceof MultishotEnchantment || other instanceof dev.timefall.mcdw.enchantment.enchantments.OverchargeEnchantment); } } \ No newline at end of file diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/AmbushEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/AmbushEnchantment.java index f93a8d6f..e162cdb8 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/AmbushEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/AmbushEnchantment.java @@ -4,15 +4,27 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.DamageBoostEnchantment; +import dev.timefall.mcdw.enchantment.types.DamageBoostEnchantment; import dev.timefall.mcdw.registries.items.McdwDaggerItemRegistry; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + * SOUND -> PlaySoundEnchantmentEffectType + * SNEAKING -> EntityFlagsPredicate + * INVISIBILITY -> NBT Predicate + * DAMAGE -> MultiplyEnchantmentEffectType + */ + public class AmbushEnchantment extends DamageBoostEnchantment { public AmbushEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/AnimaConduitEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/AnimaConduitEnchantment.java index 947ece0b..221fde8d 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/AnimaConduitEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/AnimaConduitEnchantment.java @@ -4,14 +4,24 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.HealingEnchantment; +import dev.timefall.mcdw.enchantment.types.HealingEnchantment; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + * REPAIR_PLAYER -> AddEnchantmentEffectType (add from MutableFloat of zero); + * would be like: ComponentType>> REPAIR_WITH_XP + */ + +/* + * Effects Present: + */ + public class AnimaConduitEnchantment extends HealingEnchantment { public AnimaConduitEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/BonusShotEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/BonusShotEnchantment.java index f1caecca..abafb292 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/BonusShotEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/BonusShotEnchantment.java @@ -4,15 +4,25 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.RangedEnchantment; +import dev.timefall.mcdw.enchantment.types.RangedEnchantment; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.MultishotEnchantment; import net.minecraft.item.BowItem; import net.minecraft.item.CrossbowItem; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + * BONUS_ARROWS_DAMAGE -> AddEnchantmentEffectType (add from MutableFloat of zero); + * would be like: ComponentType>> DAMAGE + */ + +/* + * Effects Present: + */ + public class BonusShotEnchantment extends RangedEnchantment { public BonusShotEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/BurstBowstringEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/BurstBowstringEnchantment.java index 9706fc0b..cbdf6c3c 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/BurstBowstringEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/BurstBowstringEnchantment.java @@ -4,13 +4,23 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.RangedEnchantment; +import dev.timefall.mcdw.enchantment.types.RangedEnchantment; import net.minecraft.item.BowItem; import net.minecraft.item.CrossbowItem; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + * BONUS_ARROWS_COUNT -> AddEnchantmentEffectType (add from MutableFloat of zero); + * would be like: ComponentType>> DAMAGE + */ + +/* + * Effects Present: + */ + public class BurstBowstringEnchantment extends RangedEnchantment { public BurstBowstringEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/BusyBeeEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/BusyBeeEnchantment.java index 6f6edea5..762f9287 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/BusyBeeEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/BusyBeeEnchantment.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; import net.minecraft.enchantment.Enchantment; @@ -12,6 +12,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + + +/* + * Effects Present: + * EntityEquipmentPredicate / EntityPropertiesLootCondition -> for bee stinger + * SummonEntityEnchantmentEffectType -> Like CHANNELING + */ + public class BusyBeeEnchantment extends Enchantment { public BusyBeeEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ChainReactionEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ChainReactionEnchantment.java index a83a0ddd..9725ed6c 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ChainReactionEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ChainReactionEnchantment.java @@ -4,13 +4,24 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.RangedEnchantment; +import dev.timefall.mcdw.enchantment.types.RangedEnchantment; import net.minecraft.item.BowItem; import net.minecraft.item.CrossbowItem; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + * ComponentType> + */ + + +/* + * Effects Present: + * RandomChanceLootCondition + */ + public class ChainReactionEnchantment extends RangedEnchantment { public ChainReactionEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ChainsEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ChainsEnchantment.java index 2baceab4..48b31890 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ChainsEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ChainsEnchantment.java @@ -4,14 +4,26 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.AoEEnchantment; +import dev.timefall.mcdw.enchantment.types.AoEEnchantment; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + * AREA_OF_EFFECT_MULTIPLIER -> MultiplyEnchantmentEffectType -> ComponentType>> + */ + + +/* + * Effects Present: + * ApplyMobEffectEnchantmentEffectType -> for chains application itself + * RandomChanceLootCondition + */ + public class ChainsEnchantment extends AoEEnchantment { public ChainsEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ChargeEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ChargeEnchantment.java index 3171a142..22c7316d 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ChargeEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ChargeEnchantment.java @@ -4,9 +4,23 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.RangedEnchantment; +import dev.timefall.mcdw.enchantment.types.RangedEnchantment; + +/* + * Effects Needed: + * HEALTH_BASED_DAMAGE -> EnchantmentValueEffectType + * would be like: ComponentType>> DAMAGE + */ + + +/* + * Effects Present: + * ApplyMobEffectEnchantmentEffectType -> for charge application itself; + * would be like: BANE_OF_ARTHROPODS + * RandomChanceLootCondition + */ public class ChargeEnchantment extends RangedEnchantment { public ChargeEnchantment(Properties properties) { diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/CobwebShotEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/CobwebShotEnchantment.java index 8b853c72..b2823717 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/CobwebShotEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/CobwebShotEnchantment.java @@ -4,13 +4,24 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.RangedEnchantment; +import dev.timefall.mcdw.enchantment.types.RangedEnchantment; import net.minecraft.item.BowItem; import net.minecraft.item.CrossbowItem; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + * OFFSET_HIT_BLOCK -> would be like ComponentType>> HIT_BLOCK + */ + +/* + * Effects Present: + * for POST_ATTACK -> SetBlockPropertiesEnchantmentEffectType + * for OFFSET_HIT_BLOCK -> SetBlockPropertiesEnchantmentEffectType + */ + public class CobwebShotEnchantment extends RangedEnchantment { public CobwebShotEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/CommittedEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/CommittedEnchantment.java index c3a928bd..2e425a23 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/CommittedEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/CommittedEnchantment.java @@ -4,14 +4,24 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.DamageBoostEnchantment; +import dev.timefall.mcdw.enchantment.types.DamageBoostEnchantment; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + * SOUND -> PlaySoundEnchantmentEffectType + * RandomChanceLootCondition + */ + public class CommittedEnchantment extends DamageBoostEnchantment { public CommittedEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/CriticalHitEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/CriticalHitEnchantment.java index a182b26b..d9155e87 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/CriticalHitEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/CriticalHitEnchantment.java @@ -4,14 +4,25 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.DamageBoostEnchantment; +import dev.timefall.mcdw.enchantment.types.DamageBoostEnchantment; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + * DAMAGE -> MultiplyEnchantmentEffectType + * RandomChanceLootCondition + * SOUND -> PlaySoundEnchantmentEffectType + */ + public class CriticalHitEnchantment extends DamageBoostEnchantment { public CriticalHitEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/DippingPoisonEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/DippingPoisonEnchantment.java index 55f0972b..11de56d6 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/DippingPoisonEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/DippingPoisonEnchantment.java @@ -4,13 +4,23 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.RangedEnchantment; +import dev.timefall.mcdw.enchantment.types.RangedEnchantment; import net.minecraft.item.BowItem; import net.minecraft.item.CrossbowItem; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + * DropItemsEffectType? -> Not sure anything like it exists + */ + +/* + * Effects Present: + * EntityEquipmentPredicate / EntityPropertiesLootCondition -> for potions + */ + public class DippingPoisonEnchantment extends RangedEnchantment { public DippingPoisonEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/DynamoEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/DynamoEnchantment.java index 6e57e26d..eb87eddc 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/DynamoEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/DynamoEnchantment.java @@ -4,12 +4,20 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.DamageBoostEnchantment; +import dev.timefall.mcdw.enchantment.types.DamageBoostEnchantment; import net.minecraft.item.*; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class DynamoEnchantment extends DamageBoostEnchantment { public DynamoEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/EchoEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/EchoEnchantment.java index 1c3e80a0..e9b39713 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/EchoEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/EchoEnchantment.java @@ -4,15 +4,23 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.AoEEnchantment; +import dev.timefall.mcdw.enchantment.types.AoEEnchantment; import dev.timefall.mcdw.registries.items.McdwDaggerItemRegistry; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class EchoEnchantment extends AoEEnchantment { public EchoEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/EnigmaResonatorEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/EnigmaResonatorEnchantment.java index ee66bc38..bfa349bf 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/EnigmaResonatorEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/EnigmaResonatorEnchantment.java @@ -4,12 +4,20 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.DamageBoostEnchantment; +import dev.timefall.mcdw.enchantment.types.DamageBoostEnchantment; import net.minecraft.item.*; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class EnigmaResonatorEnchantment extends DamageBoostEnchantment { public EnigmaResonatorEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ExplodingEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ExplodingEnchantment.java index e20e3a40..28062d62 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ExplodingEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ExplodingEnchantment.java @@ -4,14 +4,22 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.AoEEnchantment; +import dev.timefall.mcdw.enchantment.types.AoEEnchantment; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class ExplodingEnchantment extends AoEEnchantment { public ExplodingEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/FreezingEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/FreezingEnchantment.java index 736fd87f..6e5476a0 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/FreezingEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/FreezingEnchantment.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; import net.minecraft.enchantment.Enchantment; @@ -12,6 +12,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class FreezingEnchantment extends Enchantment{ public FreezingEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/FuseShotEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/FuseShotEnchantment.java index 7f4b0a40..2ef52a65 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/FuseShotEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/FuseShotEnchantment.java @@ -4,13 +4,21 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.RangedEnchantment; +import dev.timefall.mcdw.enchantment.types.RangedEnchantment; import net.minecraft.item.BowItem; import net.minecraft.item.CrossbowItem; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class FuseShotEnchantment extends RangedEnchantment { public FuseShotEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/GravityEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/GravityEnchantment.java index 51fd180d..cfccdca2 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/GravityEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/GravityEnchantment.java @@ -4,12 +4,20 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.AoEEnchantment; +import dev.timefall.mcdw.enchantment.types.AoEEnchantment; import net.minecraft.item.*; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class GravityEnchantment extends AoEEnchantment { public GravityEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/GrowingEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/GrowingEnchantment.java index 734cdac9..0f473a99 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/GrowingEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/GrowingEnchantment.java @@ -4,13 +4,21 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.RangedEnchantment; +import dev.timefall.mcdw.enchantment.types.RangedEnchantment; import net.minecraft.item.BowItem; import net.minecraft.item.CrossbowItem; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class GrowingEnchantment extends RangedEnchantment { public GrowingEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/GuardingStrikeEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/GuardingStrikeEnchantment.java index aeb85c0a..b4c98ba3 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/GuardingStrikeEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/GuardingStrikeEnchantment.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; import net.minecraft.enchantment.Enchantment; @@ -12,6 +12,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class GuardingStrikeEnchantment extends Enchantment { public GuardingStrikeEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/IllagersBaneEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/IllagersBaneEnchantment.java index c086eef7..a663431c 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/IllagersBaneEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/IllagersBaneEnchantment.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; import net.minecraft.enchantment.Enchantment; @@ -12,6 +12,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class IllagersBaneEnchantment extends Enchantment { public IllagersBaneEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/JunglePoisonEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/JunglePoisonEnchantment.java index 5b96b062..a9e795bf 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/JunglePoisonEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/JunglePoisonEnchantment.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; import net.minecraft.enchantment.Enchantment; @@ -12,6 +12,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class JunglePoisonEnchantment extends Enchantment{ public JunglePoisonEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/LeechingEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/LeechingEnchantment.java index 867073d2..0548e374 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/LeechingEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/LeechingEnchantment.java @@ -4,14 +4,22 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.HealingEnchantment; +import dev.timefall.mcdw.enchantment.types.HealingEnchantment; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class LeechingEnchantment extends HealingEnchantment { public LeechingEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/LevitationShotEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/LevitationShotEnchantment.java index 6c10be64..b74167e2 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/LevitationShotEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/LevitationShotEnchantment.java @@ -4,13 +4,21 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.RangedEnchantment; +import dev.timefall.mcdw.enchantment.types.RangedEnchantment; import net.minecraft.item.BowItem; import net.minecraft.item.CrossbowItem; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class LevitationShotEnchantment extends RangedEnchantment { public LevitationShotEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/MultishotBowEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/MultishotBowEnchantment.java index 78f3e247..b036e5db 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/MultishotBowEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/MultishotBowEnchantment.java @@ -4,13 +4,21 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.Enchantments; import net.minecraft.item.BowItem; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class MultishotBowEnchantment extends Enchantment { public MultishotBowEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/OverchargeEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/OverchargeEnchantment.java index 8ffc3d2d..5c4ddb23 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/OverchargeEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/OverchargeEnchantment.java @@ -4,12 +4,20 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.RangedEnchantment; +import dev.timefall.mcdw.enchantment.types.RangedEnchantment; import net.minecraft.item.BowItem; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class OverchargeEnchantment extends RangedEnchantment { public OverchargeEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/PainCycleEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/PainCycleEnchantment.java index 7212b84b..8cf6e063 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/PainCycleEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/PainCycleEnchantment.java @@ -4,14 +4,22 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.DamageBoostEnchantment; +import dev.timefall.mcdw.enchantment.types.DamageBoostEnchantment; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class PainCycleEnchantment extends DamageBoostEnchantment { public PainCycleEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/PhantomsMarkEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/PhantomsMarkEnchantment.java index ca5ef599..bb3bac10 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/PhantomsMarkEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/PhantomsMarkEnchantment.java @@ -4,13 +4,21 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import net.minecraft.enchantment.Enchantment; import net.minecraft.item.BowItem; import net.minecraft.item.CrossbowItem; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class PhantomsMarkEnchantment extends Enchantment { public PhantomsMarkEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/PoisonCloudEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/PoisonCloudEnchantment.java index 02ff74b6..28032fc5 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/PoisonCloudEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/PoisonCloudEnchantment.java @@ -4,12 +4,20 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.AoEEnchantment; +import dev.timefall.mcdw.enchantment.types.AoEEnchantment; import net.minecraft.item.*; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class PoisonCloudEnchantment extends AoEEnchantment { public PoisonCloudEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ProspectorEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ProspectorEnchantment.java index 9037cbcc..ac058e86 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ProspectorEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ProspectorEnchantment.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; import net.minecraft.enchantment.Enchantment; @@ -12,6 +12,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class ProspectorEnchantment extends Enchantment { public ProspectorEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/RadianceEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/RadianceEnchantment.java index 4fcbd904..fd8ae942 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/RadianceEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/RadianceEnchantment.java @@ -4,12 +4,20 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.HealingEnchantment; +import dev.timefall.mcdw.enchantment.types.HealingEnchantment; import net.minecraft.item.*; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class RadianceEnchantment extends HealingEnchantment { public RadianceEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/RampagingEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/RampagingEnchantment.java index d2c1b014..91eee816 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/RampagingEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/RampagingEnchantment.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; import net.minecraft.enchantment.Enchantment; @@ -12,6 +12,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class RampagingEnchantment extends Enchantment { public RampagingEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/RefreshmentEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/RefreshmentEnchantment.java index b0272d4a..400d30db 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/RefreshmentEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/RefreshmentEnchantment.java @@ -4,12 +4,20 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; import net.minecraft.enchantment.Enchantment; import net.minecraft.item.*; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class RefreshmentEnchantment extends Enchantment { public RefreshmentEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ReplenishEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ReplenishEnchantment.java index 201df59d..9c98d808 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ReplenishEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ReplenishEnchantment.java @@ -4,13 +4,21 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.RangedEnchantment; +import dev.timefall.mcdw.enchantment.types.RangedEnchantment; import net.minecraft.item.BowItem; import net.minecraft.item.CrossbowItem; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class ReplenishEnchantment extends RangedEnchantment { public ReplenishEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/RicochetEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/RicochetEnchantment.java index be5601b2..53c25681 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/RicochetEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/RicochetEnchantment.java @@ -4,13 +4,21 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.RangedEnchantment; +import dev.timefall.mcdw.enchantment.types.RangedEnchantment; import net.minecraft.item.BowItem; import net.minecraft.item.CrossbowItem; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class RicochetEnchantment extends RangedEnchantment { public RicochetEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/RushdownEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/RushdownEnchantment.java index 4fdcbd26..b4245d19 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/RushdownEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/RushdownEnchantment.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; import net.minecraft.enchantment.Enchantment; @@ -12,6 +12,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class RushdownEnchantment extends Enchantment { public RushdownEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ShadowBarbEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ShadowBarbEnchantment.java index ef4859ca..3898a272 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ShadowBarbEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ShadowBarbEnchantment.java @@ -4,12 +4,20 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.RangedEnchantment; +import dev.timefall.mcdw.enchantment.types.RangedEnchantment; import dev.timefall.mcdw.registries.items.McdwCrossbowItemRegistry; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class ShadowBarbEnchantment extends RangedEnchantment { public ShadowBarbEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ShadowShotEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ShadowShotEnchantment.java index f39d52e5..875cb906 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ShadowShotEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ShadowShotEnchantment.java @@ -4,12 +4,20 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.RangedEnchantment; +import dev.timefall.mcdw.enchantment.types.RangedEnchantment; import dev.timefall.mcdw.registries.items.McdwCrossbowItemRegistry; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class ShadowShotEnchantment extends RangedEnchantment { public ShadowShotEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/SharedPainEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/SharedPainEnchantment.java index 8ce9960f..86ca70bf 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/SharedPainEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/SharedPainEnchantment.java @@ -4,13 +4,21 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.DamageBoostEnchantment; +import dev.timefall.mcdw.enchantment.types.DamageBoostEnchantment; import dev.timefall.mcdw.registries.items.McdwSwordItemRegistry; import net.minecraft.enchantment.Enchantment; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class SharedPainEnchantment extends Enchantment { public SharedPainEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ShockwaveEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ShockwaveEnchantment.java index c3e79074..a2b874bd 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ShockwaveEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ShockwaveEnchantment.java @@ -4,14 +4,22 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.AoEEnchantment; +import dev.timefall.mcdw.enchantment.types.AoEEnchantment; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class ShockwaveEnchantment extends AoEEnchantment { public ShockwaveEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/SmitingEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/SmitingEnchantment.java index 82aa71e3..de042fde 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/SmitingEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/SmitingEnchantment.java @@ -4,14 +4,22 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.AoEEnchantment; +import dev.timefall.mcdw.enchantment.types.AoEEnchantment; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class SmitingEnchantment extends AoEEnchantment { public SmitingEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/SoulDevourerEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/SoulDevourerEnchantment.java index 29ba19a3..1a6e4c05 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/SoulDevourerEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/SoulDevourerEnchantment.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; import net.minecraft.enchantment.Enchantment; @@ -12,6 +12,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class SoulDevourerEnchantment extends Enchantment { public SoulDevourerEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/SoulSiphonEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/SoulSiphonEnchantment.java index e6adf170..a33af8b0 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/SoulSiphonEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/SoulSiphonEnchantment.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; import net.minecraft.enchantment.Enchantment; @@ -12,6 +12,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class SoulSiphonEnchantment extends Enchantment { public SoulSiphonEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/StunningEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/StunningEnchantment.java index 70de3b7d..6921f15c 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/StunningEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/StunningEnchantment.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; import net.minecraft.enchantment.Enchantment; @@ -12,6 +12,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class StunningEnchantment extends Enchantment{ public StunningEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/SwirlingEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/SwirlingEnchantment.java index e8cdf4a0..596ef1ad 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/SwirlingEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/SwirlingEnchantment.java @@ -4,14 +4,22 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.AoEEnchantment; +import dev.timefall.mcdw.enchantment.types.AoEEnchantment; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class SwirlingEnchantment extends AoEEnchantment { public SwirlingEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/TempoTheftEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/TempoTheftEnchantment.java index 4a3c706f..a948f04c 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/TempoTheftEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/TempoTheftEnchantment.java @@ -4,13 +4,21 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.RangedEnchantment; +import dev.timefall.mcdw.enchantment.types.RangedEnchantment; import net.minecraft.item.BowItem; import net.minecraft.item.CrossbowItem; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class TempoTheftEnchantment extends RangedEnchantment { public TempoTheftEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ThunderingEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ThunderingEnchantment.java index 1d577f05..e04c81a9 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/ThunderingEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/ThunderingEnchantment.java @@ -4,14 +4,22 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.AoEEnchantment; +import dev.timefall.mcdw.enchantment.types.AoEEnchantment; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class ThunderingEnchantment extends AoEEnchantment { public ThunderingEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/VoidShotEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/VoidShotEnchantment.java index fa789dd7..8273d4da 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/VoidShotEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/VoidShotEnchantment.java @@ -4,13 +4,21 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.DamageBoostEnchantment; +import dev.timefall.mcdw.enchantment.types.DamageBoostEnchantment; import net.minecraft.item.BowItem; import net.minecraft.item.CrossbowItem; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class VoidShotEnchantment extends DamageBoostEnchantment { public VoidShotEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/VoidStrikeEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/VoidStrikeEnchantment.java index 53687332..98b33545 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/VoidStrikeEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/VoidStrikeEnchantment.java @@ -4,14 +4,22 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.DamageBoostEnchantment; +import dev.timefall.mcdw.enchantment.types.DamageBoostEnchantment; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class VoidStrikeEnchantment extends DamageBoostEnchantment { public VoidStrikeEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/WeakeningEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/WeakeningEnchantment.java index 5f161d62..e251c94f 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/WeakeningEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/WeakeningEnchantment.java @@ -4,14 +4,22 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; import dev.timefall.mcdw.bases.McdwCustomWeaponItem; -import dev.timefall.mcdw.enchants.types.AoEEnchantment; +import dev.timefall.mcdw.enchantment.types.AoEEnchantment; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class WeakeningEnchantment extends AoEEnchantment { public WeakeningEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/enchantments/WildRageEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/enchantments/WildRageEnchantment.java index 69e0d3ad..3d1f6e25 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/enchantments/WildRageEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/enchantments/WildRageEnchantment.java @@ -4,13 +4,21 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.enchantments; +package dev.timefall.mcdw.enchantment.enchantments; -import dev.timefall.mcdw.enchants.types.RangedEnchantment; +import dev.timefall.mcdw.enchantment.types.RangedEnchantment; import net.minecraft.item.BowItem; import net.minecraft.item.CrossbowItem; import net.minecraft.item.ItemStack; +/* + * Effects Needed: + */ + +/* + * Effects Present: + */ + public class WildRageEnchantment extends RangedEnchantment { public WildRageEnchantment(Properties properties) { super(properties); diff --git a/src/main/java/dev/timefall/mcdw/enchants/goals/GoalUtils.java b/src/main/java/dev/timefall/mcdw/enchants/goals/GoalUtils.java index 98c0e5a9..435cc8fe 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/goals/GoalUtils.java +++ b/src/main/java/dev/timefall/mcdw/enchants/goals/GoalUtils.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.goals; +package dev.timefall.mcdw.enchantment.goals; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.passive.AbstractHorseEntity; diff --git a/src/main/java/dev/timefall/mcdw/enchants/goals/WildRageAttackGoal.java b/src/main/java/dev/timefall/mcdw/enchants/goals/WildRageAttackGoal.java index 007a1ef2..b0f9f68a 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/goals/WildRageAttackGoal.java +++ b/src/main/java/dev/timefall/mcdw/enchants/goals/WildRageAttackGoal.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.goals; +package dev.timefall.mcdw.enchantment.goals; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.goal.ActiveTargetGoal; diff --git a/src/main/java/dev/timefall/mcdw/enchants/summons/IBeeSummoning.java b/src/main/java/dev/timefall/mcdw/enchants/summons/IBeeSummoning.java index aa2103c4..3b4d8bbc 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/summons/IBeeSummoning.java +++ b/src/main/java/dev/timefall/mcdw/enchants/summons/IBeeSummoning.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.summons; +package dev.timefall.mcdw.enchantment.summons; public interface IBeeSummoning { void mcdw$setLastSummonedBee(int time); diff --git a/src/main/java/dev/timefall/mcdw/enchants/summons/entity/SummonedBeeEntity.java b/src/main/java/dev/timefall/mcdw/enchants/summons/entity/SummonedBeeEntity.java index f7ad1feb..64857139 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/summons/entity/SummonedBeeEntity.java +++ b/src/main/java/dev/timefall/mcdw/enchants/summons/entity/SummonedBeeEntity.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.summons.entity; +package dev.timefall.mcdw.enchantment.summons.entity; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; diff --git a/src/main/java/dev/timefall/mcdw/enchants/summons/render/SummonedBeeRenderer.java b/src/main/java/dev/timefall/mcdw/enchants/summons/render/SummonedBeeRenderer.java index 429f35e2..5665a324 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/summons/render/SummonedBeeRenderer.java +++ b/src/main/java/dev/timefall/mcdw/enchants/summons/render/SummonedBeeRenderer.java @@ -4,15 +4,15 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.summons.render; +package dev.timefall.mcdw.enchantment.summons.render; /* @Environment(EnvType.CLIENT) public class SummonedBeeRenderer extends MobEntityRenderer> { - private static final Identifier ANGRY_TEXTURE = new Identifier("textures/entity/bee/bee_angry.png"); - private static final Identifier ANGRY_NECTAR_TEXTURE = new Identifier("textures/entity/bee/bee_angry_nectar.png"); - private static final Identifier PASSIVE_TEXTURE = new Identifier("textures/entity/bee/bee.png"); - private static final Identifier NECTAR_TEXTURE = new Identifier("textures/entity/bee/bee_nectar.png"); + private static final Identifier ANGRY_TEXTURE = Identifier.of("textures/entity/bee/bee_angry.png"); + private static final Identifier ANGRY_NECTAR_TEXTURE = Identifier.of("textures/entity/bee/bee_angry_nectar.png"); + private static final Identifier PASSIVE_TEXTURE = Identifier.of("textures/entity/bee/bee.png"); + private static final Identifier NECTAR_TEXTURE = Identifier.of("textures/entity/bee/bee_nectar.png"); public SummonedBeeRenderer(EntityRendererFactory.Context context) { super(context, new BeeEntityModel<>(context.getPart(EntityModelLayers.BEE)), 0.4F); diff --git a/src/main/java/dev/timefall/mcdw/enchants/types/AoEEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/types/AoEEnchantment.java index 78775108..e5bc849c 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/types/AoEEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/types/AoEEnchantment.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.types; +package dev.timefall.mcdw.enchantment.types; import net.minecraft.enchantment.Enchantment; diff --git a/src/main/java/dev/timefall/mcdw/enchants/types/DamageBoostEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/types/DamageBoostEnchantment.java index db54be18..378b7c57 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/types/DamageBoostEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/types/DamageBoostEnchantment.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.types; +package dev.timefall.mcdw.enchantment.types; import net.minecraft.enchantment.Enchantment; diff --git a/src/main/java/dev/timefall/mcdw/enchants/types/HealingEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/types/HealingEnchantment.java index 6577e672..e5944afa 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/types/HealingEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/types/HealingEnchantment.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.types; +package dev.timefall.mcdw.enchantment.types; import net.minecraft.enchantment.Enchantment; diff --git a/src/main/java/dev/timefall/mcdw/enchants/types/RangedEnchantment.java b/src/main/java/dev/timefall/mcdw/enchants/types/RangedEnchantment.java index 31961262..01dc185b 100644 --- a/src/main/java/dev/timefall/mcdw/enchants/types/RangedEnchantment.java +++ b/src/main/java/dev/timefall/mcdw/enchants/types/RangedEnchantment.java @@ -4,7 +4,7 @@ * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.enchants.types; +package dev.timefall.mcdw.enchantment.types; import net.minecraft.enchantment.Enchantment; diff --git a/src/main/java/dev/timefall/mcdw/mixin/McdwMixinPlugin.java b/src/main/java/dev/timefall/mcdw/mixin/McdwMixinPlugin.java deleted file mode 100644 index 81d25578..00000000 --- a/src/main/java/dev/timefall/mcdw/mixin/McdwMixinPlugin.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Timefall Development License 1.2 - * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. - * - * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt - */ -package dev.timefall.mcdw.mixin; - -import net.fabricmc.loader.api.FabricLoader; -import org.objectweb.asm.tree.ClassNode; -import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; -import org.spongepowered.asm.mixin.extensibility.IMixinInfo; - -import java.util.List; -import java.util.Set; - -public class McdwMixinPlugin implements IMixinConfigPlugin { - @Override - public void onLoad(String mixinPackage) { - - } - - @Override - public String getRefMapperConfig() { - return null; - } - - @Override - public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { - if (FabricLoader.getInstance().isModLoaded("reach-entity-attributes") - && mixinClassName.contains("reach")) { - return false; - } - return true; - } - - @Override - public void acceptTargets(Set myTargets, Set otherTargets) { - - } - - @Override - public List getMixins() { - return null; - } - - @Override - public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - - } - - @Override - public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - - } -} diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/AreaEffectCloudEntityMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/AreaEffectCloudEntityMixin.java similarity index 89% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/AreaEffectCloudEntityMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/AreaEffectCloudEntityMixin.java index 2a4f50ba..f20fff95 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/AreaEffectCloudEntityMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/AreaEffectCloudEntityMixin.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; +package dev.timefall.mcdw.mixin.old_mixins.mcdw; import dev.timefall.mcdw.api.interfaces.IExclusiveAOECloud; import dev.timefall.mcdw.api.util.AbilityHelper; diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/BowItemMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/BowItemMixin.java similarity index 77% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/BowItemMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/BowItemMixin.java index 8e61c6ad..7e197de3 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/BowItemMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/BowItemMixin.java @@ -1,12 +1,48 @@ /* * Timefall Development License 1.2 - * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; /* + * Timefall Development License 1.2 + * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ +package dev.timefall.mcdw.mixin.old_mixins.mcdw; + + +import dev.timefall.mcdw.api.interfaces.IMcdwEnchantedArrow; +import dev.timefall.mcdw.api.util.CleanlinessHelper; +import dev.timefall.mcdw.api.util.ProjectileEffectHelper; +import dev.timefall.mcdw.api.util.RangedAttackHelper; +import dev.timefall.mcdw.bases.McdwBowItem; +import dev.timefall.mcdw.bases.McdwLongbowItem; +import dev.timefall.mcdw.bases.McdwShortbowItem; +import dev.timefall.mcdw.enums.EnchantmentsID; +import dev.timefall.mcdw.registries.EnchantsRegistry; +import dev.timefall.mcdw.registries.StatusEffectsRegistry; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.projectile.PersistentProjectileEntity; +import net.minecraft.item.ArrowItem; +import net.minecraft.item.BowItem; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyArgs; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; + @Mixin(BowItem.class) public abstract class BowItemMixin{ @@ -54,7 +90,7 @@ public void setLivingEntity(LivingEntity livingEntity){ @Inject(method = "onStoppedUsing", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/projectile" + "/PersistentProjectileEntity;setVelocity(Lnet/minecraft/entity/Entity;FFFFF)V"), locals = LocalCapture.CAPTURE_FAILHARD) private void mcdw$applyBowEnchantmentLevel(ItemStack stack, World world, LivingEntity user, int remainingUseTicks, - CallbackInfo ci, PlayerEntity playerEntity, boolean bl, ItemStack itemStack, int i, float f, boolean bl2, + CallbackInfo ci, PlayerEntity playerEntity, boolean bl, ItemStack itemStack, int i, float f, boolean bl2, ArrowItem arrowItem, PersistentProjectileEntity ppe){ // Not the level of Overcharge @@ -124,5 +160,3 @@ public void setLivingEntity(LivingEntity livingEntity){ args.set(4, velocity); } } - - */ \ No newline at end of file diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/CraftingScreenHandlerMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/CraftingScreenHandlerMixin.java similarity index 71% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/CraftingScreenHandlerMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/CraftingScreenHandlerMixin.java index fa82ef4f..05e63f20 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/CraftingScreenHandlerMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/CraftingScreenHandlerMixin.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; +package dev.timefall.mcdw.mixin.old_mixins.mcdw; /* @Mixin(net.minecraft.screen.CraftingScreenHandler.class) diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/CreeperEntityAccessor.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/CreeperEntityAccessor.java similarity index 64% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/CreeperEntityAccessor.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/CreeperEntityAccessor.java index 12292e86..0aee9eb9 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/CreeperEntityAccessor.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/CreeperEntityAccessor.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; +package dev.timefall.mcdw.mixin.old_mixins.mcdw; import net.minecraft.entity.data.TrackedData; import net.minecraft.entity.mob.CreeperEntity; diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/CrossbowItemMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/CrossbowItemMixin.java similarity index 92% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/CrossbowItemMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/CrossbowItemMixin.java index 55665dc1..5f373da7 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/CrossbowItemMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/CrossbowItemMixin.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; +package dev.timefall.mcdw.mixin.old_mixins.mcdw; import dev.timefall.mcdw.bases.McdwCrossbowItem; import net.minecraft.entity.LivingEntity; diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/EnchantmentHelperMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/EnchantmentHelperMixin.java similarity index 86% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/EnchantmentHelperMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/EnchantmentHelperMixin.java index f6910a47..a0634bd5 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/EnchantmentHelperMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/EnchantmentHelperMixin.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; +package dev.timefall.mcdw.mixin.old_mixins.mcdw; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/EnchantmentMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/EnchantmentMixin.java similarity index 75% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/EnchantmentMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/EnchantmentMixin.java index 03d120cb..4148be8e 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/EnchantmentMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/EnchantmentMixin.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; +package dev.timefall.mcdw.mixin.old_mixins.mcdw; import dev.timefall.mcdw.api.util.EnchantmentRestriction; import net.minecraft.enchantment.Enchantment; diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/ExperienceOrbEntityMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/ExperienceOrbEntityMixin.java similarity index 67% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/ExperienceOrbEntityMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/ExperienceOrbEntityMixin.java index 570cd2cb..3defa7a8 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/ExperienceOrbEntityMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/ExperienceOrbEntityMixin.java @@ -1,13 +1,31 @@ /* * Timefall Development License 1.2 - * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; /* + * Timefall Development License 1.2 + * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ +package dev.timefall.mcdw.mixin.old_mixins.mcdw; + + +import dev.timefall.mcdw.damagesources.OffHandDamageSource; +import dev.timefall.mcdw.effects.EnchantmentEffects; +import dev.timefall.mcdw.enums.EnchantmentsID; +import net.minecraft.entity.ExperienceOrbEntity; +import net.minecraft.entity.player.PlayerEntity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyArgs; + @Mixin({ExperienceOrbEntity.class}) public class ExperienceOrbEntityMixin { @@ -46,6 +64,4 @@ public class ExperienceOrbEntityMixin { return experience; } -} - - */ \ No newline at end of file +} \ No newline at end of file diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/GetExperienceMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/GetExperienceMixin.java similarity index 77% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/GetExperienceMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/GetExperienceMixin.java index 937b03a2..9f8fea80 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/GetExperienceMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/GetExperienceMixin.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; +package dev.timefall.mcdw.mixin.old_mixins.mcdw; /* @Mixin(targets = "net/minecraft/screen/GrindstoneScreenHandler$4") diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/GrindstoneScreenHandlerMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/GrindstoneScreenHandlerMixin.java similarity index 73% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/GrindstoneScreenHandlerMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/GrindstoneScreenHandlerMixin.java index 4ad35f52..f38af914 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/GrindstoneScreenHandlerMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/GrindstoneScreenHandlerMixin.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; +package dev.timefall.mcdw.mixin.old_mixins.mcdw; /* @Mixin(GrindstoneScreenHandler.class) diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/InsulatedAxeItemAccessor.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/InsulatedAxeItemAccessor.java similarity index 63% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/InsulatedAxeItemAccessor.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/InsulatedAxeItemAccessor.java index 40d16fc9..2794b4dc 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/InsulatedAxeItemAccessor.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/InsulatedAxeItemAccessor.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; +package dev.timefall.mcdw.mixin.old_mixins.mcdw; import net.minecraft.block.Block; import net.minecraft.item.AxeItem; diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/ItemStackMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/ItemStackMixin.java similarity index 85% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/ItemStackMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/ItemStackMixin.java index 23b64a89..3ab769ab 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/ItemStackMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/ItemStackMixin.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; +package dev.timefall.mcdw.mixin.old_mixins.mcdw; /* @Mixin(ItemStack.class) diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/LivingEntityMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/LivingEntityMixin.java similarity index 81% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/LivingEntityMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/LivingEntityMixin.java index 2656821a..b71060ff 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/LivingEntityMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/LivingEntityMixin.java @@ -1,12 +1,57 @@ /* * Timefall Development License 1.2 - * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; /* + * Timefall Development License 1.2 + * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ +package dev.timefall.mcdw.mixin.old_mixins.mcdw; + + +import dev.timefall.mcdw.api.util.CleanlinessHelper; +import dev.timefall.mcdw.damagesources.OffHandDamageSource; +import dev.timefall.mcdw.effects.EnchantmentEffects; +import dev.timefall.mcdw.enchantment.summons.IBeeSummoning; +import dev.timefall.mcdw.enchantment.summons.entity.SummonedBeeEntity; +import dev.timefall.mcdw.enums.EnchantmentsID; +import dev.timefall.mcdw.enums.ItemsID; +import dev.timefall.mcdw.enums.SettingsID; +import dev.timefall.mcdw.registries.EnchantsRegistry; +import dev.timefall.mcdw.registries.EntityAttributesRegistry; +import dev.timefall.mcdw.registries.ItemsRegistry; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.attribute.DefaultAttributeContainer; +import net.minecraft.entity.damage.DamageSource; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; +import net.minecraft.entity.passive.TameableEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.item.PotionItem; +import net.minecraft.potion.Potions; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.ModifyVariable; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.util.List; + @SuppressWarnings("ConstantValue") @Mixin(LivingEntity.class) public abstract class LivingEntityMixin extends Entity { @@ -190,5 +235,3 @@ public LivingEntityMixin(EntityType type, World world) { cir.getReturnValue().add(EntityAttributesRegistry.REACH).add(EntityAttributesRegistry.ATTACK_RANGE); } } - - */ diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/LivingEntityPlayerEntityMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/LivingEntityPlayerEntityMixin.java similarity index 90% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/LivingEntityPlayerEntityMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/LivingEntityPlayerEntityMixin.java index c04da2da..fd43d1a6 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/LivingEntityPlayerEntityMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/LivingEntityPlayerEntityMixin.java @@ -1,12 +1,36 @@ /* * Timefall Development License 1.2 - * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; /* + * Timefall Development License 1.2 + * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ +package dev.timefall.mcdw.mixin.old_mixins.mcdw; + + +import dev.timefall.mcdw.api.util.PlayerAttackHelper; +import dev.timefall.mcdw.damagesources.OffHandDamageSource; +import dev.timefall.mcdw.effects.EnchantmentEffects; +import dev.timefall.mcdw.enums.EnchantmentsID; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.damage.DamageSource; +import net.minecraft.entity.damage.DamageTypes; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.projectile.PersistentProjectileEntity; +import net.minecraft.item.BowItem; +import net.minecraft.item.CrossbowItem; +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.ModifyVariable; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + @Mixin({LivingEntity.class, PlayerEntity.class}) public class LivingEntityPlayerEntityMixin { @@ -175,4 +199,3 @@ public class LivingEntityPlayerEntityMixin { } } - */ \ No newline at end of file diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/MobEntityAccessor.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/MobEntityAccessor.java similarity index 62% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/MobEntityAccessor.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/MobEntityAccessor.java index ad95f600..2d0ee475 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/MobEntityAccessor.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/MobEntityAccessor.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; +package dev.timefall.mcdw.mixin.old_mixins.mcdw; import net.minecraft.entity.ai.goal.GoalSelector; import net.minecraft.entity.mob.MobEntity; diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/PersistentProjectileEntityMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/PersistentProjectileEntityMixin.java similarity index 97% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/PersistentProjectileEntityMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/PersistentProjectileEntityMixin.java index d4085fa9..da2e3fb0 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/PersistentProjectileEntityMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/PersistentProjectileEntityMixin.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; +package dev.timefall.mcdw.mixin.old_mixins.mcdw; import dev.timefall.mcdw.api.interfaces.IMcdwEnchantedArrow; import net.minecraft.entity.projectile.PersistentProjectileEntity; diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/PlayerEntityMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/PlayerEntityMixin.java similarity index 89% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/PlayerEntityMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/PlayerEntityMixin.java index 413c8297..eb214e71 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/PlayerEntityMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/PlayerEntityMixin.java @@ -1,14 +1,21 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; +package dev.timefall.mcdw.mixin.old_mixins.mcdw; import dev.timefall.mcdw.api.interfaces.IDualWielding; import dev.timefall.mcdw.configs.CompatibilityFlags; -import dev.timefall.mcdw.enchants.summons.IBeeSummoning; +import dev.timefall.mcdw.enchantment.summons.IBeeSummoning; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.attribute.EntityAttributes; diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/ShieldPlayerEntityMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/ShieldPlayerEntityMixin.java similarity index 87% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/ShieldPlayerEntityMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/ShieldPlayerEntityMixin.java index fc4b000d..7d4b8b45 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/ShieldPlayerEntityMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/ShieldPlayerEntityMixin.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; +package dev.timefall.mcdw.mixin.old_mixins.mcdw; import dev.timefall.mcdw.registries.items.McdwShieldItemRegistry; import net.minecraft.entity.EntityType; diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/SmithingScreenHandlerMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/SmithingScreenHandlerMixin.java similarity index 74% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/SmithingScreenHandlerMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/SmithingScreenHandlerMixin.java index 0a4baa8c..53f1be0b 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/SmithingScreenHandlerMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/SmithingScreenHandlerMixin.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; +package dev.timefall.mcdw.mixin.old_mixins.mcdw; import dev.timefall.mcdw.registries.items.McdwSwordItemRegistry; import net.minecraft.enchantment.Enchantments; diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/UnbreakingEnchantmentMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/UnbreakingEnchantmentMixin.java similarity index 66% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/UnbreakingEnchantmentMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/UnbreakingEnchantmentMixin.java index 5f988858..bad39ef9 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/UnbreakingEnchantmentMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/UnbreakingEnchantmentMixin.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw; +package dev.timefall.mcdw.mixin.old_mixins.mcdw; /* @Mixin(UnbreakingEnchantment.class) diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/client/AbstractClientPlayerEntityMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/AbstractClientPlayerEntityMixin.java similarity index 86% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/client/AbstractClientPlayerEntityMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/AbstractClientPlayerEntityMixin.java index ef81962e..4efba4bc 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/client/AbstractClientPlayerEntityMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/AbstractClientPlayerEntityMixin.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw.client; +package dev.timefall.mcdw.mixin.old_mixins.mcdw.client; /* @Environment(EnvType.CLIENT) diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/client/HeldItemRendererInvoker.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/HeldItemRendererInvoker.java similarity index 60% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/client/HeldItemRendererInvoker.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/HeldItemRendererInvoker.java index 3a0f7269..a15fde36 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/client/HeldItemRendererInvoker.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/HeldItemRendererInvoker.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw.client; +package dev.timefall.mcdw.mixin.old_mixins.mcdw.client; /* @Mixin(HeldItemRenderer.class) diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/client/HeldItemRendererMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/HeldItemRendererMixin.java similarity index 93% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/client/HeldItemRendererMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/HeldItemRendererMixin.java index 3d361aac..edb118a0 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/client/HeldItemRendererMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/HeldItemRendererMixin.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw.client; +package dev.timefall.mcdw.mixin.old_mixins.mcdw.client; /* @Mixin(HeldItemRenderer.class) diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/client/InGameHudMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/InGameHudMixin.java similarity index 90% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/client/InGameHudMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/InGameHudMixin.java index cc68610f..dd8cbed3 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/client/InGameHudMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/InGameHudMixin.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw.client; +package dev.timefall.mcdw.mixin.old_mixins.mcdw.client; /* @Environment(EnvType.CLIENT) diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/client/ModelPredicateProviderRegistryMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/ModelPredicateProviderRegistryMixin.java similarity index 90% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/client/ModelPredicateProviderRegistryMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/ModelPredicateProviderRegistryMixin.java index e44842e0..a30c36b9 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/client/ModelPredicateProviderRegistryMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/ModelPredicateProviderRegistryMixin.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw.client; +package dev.timefall.mcdw.mixin.old_mixins.mcdw.client; /* @SuppressWarnings("InjectCouldBeOverwrite") diff --git a/src/main/java/dev/timefall/mcdw/mixin/mcdw/client/PlayerEntityRendererMixin.java b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/PlayerEntityRendererMixin.java similarity index 73% rename from src/main/java/dev/timefall/mcdw/mixin/mcdw/client/PlayerEntityRendererMixin.java rename to src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/PlayerEntityRendererMixin.java index fece17a8..b87842fd 100644 --- a/src/main/java/dev/timefall/mcdw/mixin/mcdw/client/PlayerEntityRendererMixin.java +++ b/src/main/java/dev/timefall/mcdw/mixin/old_mixins/mcdw/client/PlayerEntityRendererMixin.java @@ -1,10 +1,17 @@ +/* + * Timefall Development License 1.2 + * Copyright (c) 2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. + * + * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt + */ + /* * Timefall Development License 1.2 * Copyright (c) 2020-2024. Chronosacaria, Kluzzio, Timefall Development. All Rights Reserved. * * This software's content is licensed under the Timefall Development License 1.2. You can find this license information here: https://github.com/Timefall-Development/Timefall-Development-Licence/blob/main/TimefallDevelopmentLicense1.2.txt */ -package dev.timefall.mcdw.mixin.mcdw.client; +package dev.timefall.mcdw.mixin.old_mixins.mcdw.client; /* @Mixin(PlayerEntityRenderer.class) diff --git a/src/main/java/dev/timefall/mcdw/networking/OffhandAttackPacket.java b/src/main/java/dev/timefall/mcdw/networking/OffhandAttackPacket.java index d09ede68..8a1a6b18 100644 --- a/src/main/java/dev/timefall/mcdw/networking/OffhandAttackPacket.java +++ b/src/main/java/dev/timefall/mcdw/networking/OffhandAttackPacket.java @@ -12,8 +12,8 @@ @SuppressWarnings("deprecation") public class OffhandAttackPacket { - public static final Identifier OFFHAND_ATTACK_PACKET = new Identifier(Mcdw.MOD_ID, "offhand_attack_entity"); - public static final Identifier OFFHAND_MISS_PACKET = new Identifier(Mcdw.MOD_ID, "offhand_miss_entity"); + public static final Identifier OFFHAND_ATTACK_PACKET = Identifier.of(Mcdw.MOD_ID, "offhand_attack_entity"); + public static final Identifier OFFHAND_MISS_PACKET = Identifier.of(Mcdw.MOD_ID, "offhand_miss_entity"); //public static Packet offhandAttackPacket(Entity entity) { // PacketByteBuf buf = new PacketByteBuf(Unpooled.buffer()); diff --git a/src/main/java/dev/timefall/mcdw/registries/EntityAttributesRegistry.java b/src/main/java/dev/timefall/mcdw/registries/EntityAttributesRegistry.java index a6594c85..5a1ca4ff 100644 --- a/src/main/java/dev/timefall/mcdw/registries/EntityAttributesRegistry.java +++ b/src/main/java/dev/timefall/mcdw/registries/EntityAttributesRegistry.java @@ -43,7 +43,7 @@ private static EntityAttribute createAttribute(String attributeName, double defa return new ClampedEntityAttribute("attribute.name.generic." + Mcdw.MOD_ID + '.' + attributeName, defaultValue, minimumValue, maximumValue).setTracked(true); } public static void register() { - Registry.register(Registries.ATTRIBUTE, new Identifier(Mcdw.MOD_ID, "reach"), REACH); - Registry.register(Registries.ATTRIBUTE, new Identifier(Mcdw.MOD_ID, "attack_range"), ATTACK_RANGE); + Registry.register(Registries.ATTRIBUTE, Identifier.of(Mcdw.MOD_ID, "reach"), REACH); + Registry.register(Registries.ATTRIBUTE, Identifier.of(Mcdw.MOD_ID, "attack_range"), ATTACK_RANGE); } } diff --git a/src/main/java/dev/timefall/mcdw/registries/ParticlesRegistry.java b/src/main/java/dev/timefall/mcdw/registries/ParticlesRegistry.java index 4651f84a..2ac4e26c 100644 --- a/src/main/java/dev/timefall/mcdw/registries/ParticlesRegistry.java +++ b/src/main/java/dev/timefall/mcdw/registries/ParticlesRegistry.java @@ -12,7 +12,7 @@ public class ParticlesRegistry { public static final SimpleParticleType OFFHAND_SWEEP_PARTICLE = FabricParticleTypes.simple(true); public static void registerOnServer() { - Registry.register(Registries.PARTICLE_TYPE, new Identifier(Mcdw.MOD_ID, "offhand_sweep"), OFFHAND_SWEEP_PARTICLE); + Registry.register(Registries.PARTICLE_TYPE, Identifier.of(Mcdw.MOD_ID, "offhand_sweep"), OFFHAND_SWEEP_PARTICLE); } public static void registerOnClient() { diff --git a/src/main/java/dev/timefall/mcdw/registries/SoundEventsRegistry.java b/src/main/java/dev/timefall/mcdw/registries/SoundEventsRegistry.java index 99fbab6a..868bfbad 100644 --- a/src/main/java/dev/timefall/mcdw/registries/SoundEventsRegistry.java +++ b/src/main/java/dev/timefall/mcdw/registries/SoundEventsRegistry.java @@ -12,7 +12,7 @@ import net.minecraft.util.Identifier; public class SoundEventsRegistry { - public static final Identifier ECHO_SOUND = new Identifier("mcdw:echo_sound"); + public static final Identifier ECHO_SOUND = Identifier.of("mcdw:echo_sound"); public static final SoundEvent ECHO_SOUND_EVENT = SoundEvent.of(ECHO_SOUND); public static void register(){ diff --git a/src/main/java/dev/timefall/mcdw/registries/StatusEffectsRegistry.java b/src/main/java/dev/timefall/mcdw/registries/StatusEffectsRegistry.java index f0be0800..4ae74a05 100644 --- a/src/main/java/dev/timefall/mcdw/registries/StatusEffectsRegistry.java +++ b/src/main/java/dev/timefall/mcdw/registries/StatusEffectsRegistry.java @@ -31,6 +31,6 @@ public static void register() { } private static RegistryEntry register(String id, StatusEffect statusEffect) { - return Registry.registerReference(Registries.STATUS_EFFECT, new Identifier(id), statusEffect); + return Registry.registerReference(Registries.STATUS_EFFECT, Identifier.of(id), statusEffect); } } diff --git a/src/main/resources/mcdw.mixins.json b/src/main/resources/mcdw.mixins.json index 535a3693..c8904ab6 100644 --- a/src/main/resources/mcdw.mixins.json +++ b/src/main/resources/mcdw.mixins.json @@ -2,7 +2,7 @@ "required": true, "package": "dev.timefall.mcdw.mixin", "compatibilityLevel": "JAVA_8", - "plugin": "dev.timefall.mcdw.mixin.McdwMixinPlugin", + "plugin": "dev.timefall.mcdw.mixin.old_mixins.McdwMixinPlugin", "mixins": [ ], "client": [