From 2f6f5fcd27f54cec7c70354726da9b8b75473379 Mon Sep 17 00:00:00 2001 From: Provismet <17149901+Provismet@users.noreply.github.com> Date: Mon, 12 Feb 2024 00:02:59 +0000 Subject: [PATCH 1/9] Fix and improve shattered effect. --- .../effect/ShatteredStatusEffect.java | 2 +- .../AdditionalArmoury/items/MaceItem.java | 2 +- .../textures/mob_effect/shattered.png | Bin 244 -> 236 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/provismet/AdditionalArmoury/effect/ShatteredStatusEffect.java b/src/main/java/com/provismet/AdditionalArmoury/effect/ShatteredStatusEffect.java index f9dfaf7..8332891 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/effect/ShatteredStatusEffect.java +++ b/src/main/java/com/provismet/AdditionalArmoury/effect/ShatteredStatusEffect.java @@ -10,6 +10,6 @@ public class ShatteredStatusEffect extends StatusEffect { public ShatteredStatusEffect () { super(StatusEffectCategory.HARMFUL, 0x726760); - this.addAttributeModifier(EntityAttributes.GENERIC_ARMOR, UUID.nameUUIDFromBytes("Additional Armoury: Shattered Armour".getBytes()).toString(), 0.75, EntityAttributeModifier.Operation.MULTIPLY_TOTAL); + this.addAttributeModifier(EntityAttributes.GENERIC_ARMOR, UUID.nameUUIDFromBytes("Additional Armoury: Shattered Armour".getBytes()).toString(), -0.25, EntityAttributeModifier.Operation.MULTIPLY_TOTAL); } } diff --git a/src/main/java/com/provismet/AdditionalArmoury/items/MaceItem.java b/src/main/java/com/provismet/AdditionalArmoury/items/MaceItem.java index be1d0a2..f61cc8b 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/items/MaceItem.java +++ b/src/main/java/com/provismet/AdditionalArmoury/items/MaceItem.java @@ -63,7 +63,7 @@ public float getWeaponDamage () { public void postCriticalHit (ItemStack itemStack, LivingEntity user, LivingEntity target) { int shredding = EnchantmentHelper.getLevel(AAEnchantments.SHREDDING, itemStack); int dismantle = EnchantmentHelper.getLevel(AAEnchantments.DISMANTLE, itemStack); - target.addStatusEffect(new StatusEffectInstance(AAStatusEffects.SHATTERED, 30 + shredding * 20), user); + target.addStatusEffect(new StatusEffectInstance(AAStatusEffects.SHATTERED, 40 + shredding * 20), user); if (user.getWorld() instanceof ServerWorld serverWorld) { serverWorld.spawnParticles(AAParticleTypes.SHATTER, target.getX(), target.getHeight() + target.getY() + 0.5f, target.getZ(), 1, 0, 0, 0, 0); diff --git a/src/main/resources/assets/additional-armoury/textures/mob_effect/shattered.png b/src/main/resources/assets/additional-armoury/textures/mob_effect/shattered.png index d14ee452c662f86157639d5007e69d229552b00c..601815b7c9f4ac97b4d2870a37fd0aa2589e1654 100644 GIT binary patch delta 179 zcmeyu_=a(UV?BR>Pl&6Sm{??FWKT~|w4x#d0|PH(HqilC}f>JSf=Kd%y7`>Y4?vA z1ydjB2QTR=)+lm*$9H^<FMGaq7m%d@5#rYz`-o|_W%Bz(~G_|oNI9~I51;f zO=9=PH9~)Oc86>5dDnkiltDap71Q>*wvQmkFnGH9xvX Date: Mon, 12 Feb 2024 00:16:26 +0000 Subject: [PATCH 2/9] Add missing mace translation key. --- src/main/generated/assets/additional-armoury/lang/en_us.json | 1 + .../provismet/datagen/AdditionalArmoury/LanguageGenerator.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/generated/assets/additional-armoury/lang/en_us.json b/src/main/generated/assets/additional-armoury/lang/en_us.json index eb681d5..7a9f328 100644 --- a/src/main/generated/assets/additional-armoury/lang/en_us.json +++ b/src/main/generated/assets/additional-armoury/lang/en_us.json @@ -147,6 +147,7 @@ "item.additional-armoury.golden_dagger.effect.water": "Wet Golden Dagger", "item.additional-armoury.golden_dagger.effect.water_breathing": "Water Breathing-Tipped Golden Dagger", "item.additional-armoury.golden_dagger.effect.weakness": "Weakness-Tipped Golden Dagger", + "item.additional-armoury.golden_mace": "Golden Mace", "item.additional-armoury.iron_dagger": "Iron Dagger", "item.additional-armoury.iron_dagger.effect.awkward": "Iron Dagger", "item.additional-armoury.iron_dagger.effect.fire_resistance": "Fire Resistance-Tipped Iron Dagger", diff --git a/src/main/java/com/provismet/datagen/AdditionalArmoury/LanguageGenerator.java b/src/main/java/com/provismet/datagen/AdditionalArmoury/LanguageGenerator.java index 88e69a3..ac30ded 100644 --- a/src/main/java/com/provismet/datagen/AdditionalArmoury/LanguageGenerator.java +++ b/src/main/java/com/provismet/datagen/AdditionalArmoury/LanguageGenerator.java @@ -73,6 +73,7 @@ public void generateTranslations (TranslationBuilder translationBuilder) { translationBuilder.add(AAItems.WOODEN_MACE, "Wooden Mace"); translationBuilder.add(AAItems.STONE_MACE, "Stone Mace"); + translationBuilder.add(AAItems.GOLDEN_MACE, "Golden Mace"); translationBuilder.add(AAItems.IRON_MACE, "Iron Mace"); translationBuilder.add(AAItems.DIAMOND_MACE, "Diamond Mace"); translationBuilder.add(AAItems.NETHERITE_MACE, "Netherite Mace"); From 1d7b1a87383a8a7a98440791c6cd695842e617c5 Mon Sep 17 00:00:00 2001 From: Provismet <17149901+Provismet@users.noreply.github.com> Date: Tue, 13 Feb 2024 02:05:01 +0000 Subject: [PATCH 3/9] Improve boomerang visuals. --- .../entity/BoomerangProjectileEntity.java | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/provismet/AdditionalArmoury/entity/BoomerangProjectileEntity.java b/src/main/java/com/provismet/AdditionalArmoury/entity/BoomerangProjectileEntity.java index 9ac3f67..f764bc3 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/entity/BoomerangProjectileEntity.java +++ b/src/main/java/com/provismet/AdditionalArmoury/entity/BoomerangProjectileEntity.java @@ -23,6 +23,7 @@ import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; public class BoomerangProjectileEntity extends ThrownItemEntity implements WorldItemEntity { @@ -76,6 +77,17 @@ public void tick () { if (this.ricochetCounterCooldown > 0) --this.ricochetCounterCooldown; } super.tick(); + this.setYaw(0f); + this.prevYaw = 0f; + this.setPitch(0f); + this.prevPitch = 0f; + } + + @Override + public void setVelocity (double x, double y, double z, float speed, float divergence) { + super.setVelocity(x, y, z, speed, divergence); + this.setYaw(0f); + this.setPitch(0f); } @Override @@ -226,11 +238,23 @@ public float getXRotation (float tickDelta) { @Override public float getZRotation (float tickDelta) { - return (this.age * 33f) % 360f; + float currentRotation = this.age * 33f; + float nextRotation = (this.age + 1) * 33f; + return MathHelper.lerp(tickDelta, currentRotation, nextRotation) % 360f; + } + + @Override + public float getXOffset (float tickDelta) { + return -MathHelper.cos((this.getZRotation(tickDelta) - 15f) / MathHelper.DEGREES_PER_RADIAN) * 0.25f; } @Override public float getYOffset (float tickDelta) { return this.getHeight() / 2f; } + + @Override + public float getZOffset (float tickDelta) { + return -MathHelper.sin((this.getZRotation(tickDelta) - 15f) / MathHelper.DEGREES_PER_RADIAN) * 0.25f; + } } From f90e239cf7928377cc85a1ee78a04f21ccac352c Mon Sep 17 00:00:00 2001 From: Provismet <17149901+Provismet@users.noreply.github.com> Date: Tue, 13 Feb 2024 02:05:27 +0000 Subject: [PATCH 4/9] Staff enchantments are not compatible with anything. --- .../AdditionalArmoury/enchantments/staff/StaffEnchantment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/StaffEnchantment.java b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/StaffEnchantment.java index 17b1d1a..4ae8258 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/StaffEnchantment.java +++ b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/StaffEnchantment.java @@ -33,7 +33,7 @@ public int getMaxPower (int level) { @Override protected boolean canAccept (Enchantment other) { - return super.canAccept(other) && !(other instanceof StaffEnchantment); + return false; } @Override From 8277c4dc753b5092c491d6fd1b14c3d5369891de Mon Sep 17 00:00:00 2001 From: Provismet <17149901+Provismet@users.noreply.github.com> Date: Tue, 13 Feb 2024 02:15:10 +0000 Subject: [PATCH 5/9] Rename StaffEnchantment to AbstractStaffEnchantment. --- ...ent.java => AbstractStaffEnchantment.java} | 4 ++-- .../enchantments/staff/BoostEnchantment.java | 2 +- .../staff/EruptionEnchantment.java | 2 +- .../staff/ExplosionEnchantment.java | 2 +- .../staff/FireballEnchantment.java | 2 +- .../staff/FrostballEnchantment.java | 2 +- .../enchantments/staff/GaleEnchantment.java | 2 +- .../staff/GhostOrbEnchantment.java | 2 +- .../enchantments/staff/JumpEnchantment.java | 2 +- .../staff/MissileEnchantment.java | 2 +- .../AdditionalArmoury/items/StaffItem.java | 24 +++++++++---------- .../registries/AAEnchantments.java | 20 ++++++++-------- .../registries/AAItemGroups.java | 4 ++-- 13 files changed, 35 insertions(+), 35 deletions(-) rename src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/{StaffEnchantment.java => AbstractStaffEnchantment.java} (89%) diff --git a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/StaffEnchantment.java b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/AbstractStaffEnchantment.java similarity index 89% rename from src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/StaffEnchantment.java rename to src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/AbstractStaffEnchantment.java index 4ae8258..21e73cd 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/StaffEnchantment.java +++ b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/AbstractStaffEnchantment.java @@ -9,12 +9,12 @@ import net.minecraft.util.math.random.Random; import net.minecraft.world.World; -public abstract class StaffEnchantment extends Enchantment { +public abstract class AbstractStaffEnchantment extends Enchantment { public final int colour; public final int maxUses; public final int chargeTime; - protected StaffEnchantment (Rarity weight, int colour, int maxUses, int chargeTime) { + protected AbstractStaffEnchantment (Rarity weight, int colour, int maxUses, int chargeTime) { super(weight, AAEnchantmentTargets.STAFF, new EquipmentSlot[] {EquipmentSlot.MAINHAND}); this.colour = colour; this.maxUses = maxUses; diff --git a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/BoostEnchantment.java b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/BoostEnchantment.java index 56d46b2..33c1fc3 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/BoostEnchantment.java +++ b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/BoostEnchantment.java @@ -6,7 +6,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; -public class BoostEnchantment extends StaffEnchantment { +public class BoostEnchantment extends AbstractStaffEnchantment { public BoostEnchantment () { super(Rarity.COMMON, 0x7AFFE6, 64, 10); } diff --git a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/EruptionEnchantment.java b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/EruptionEnchantment.java index acb496f..ec5df57 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/EruptionEnchantment.java +++ b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/EruptionEnchantment.java @@ -17,7 +17,7 @@ import net.minecraft.util.math.Direction; import net.minecraft.world.World; -public class EruptionEnchantment extends StaffEnchantment { +public class EruptionEnchantment extends AbstractStaffEnchantment { private static final int RADIUS = 5; public EruptionEnchantment () { diff --git a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/ExplosionEnchantment.java b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/ExplosionEnchantment.java index f940e2f..db41db8 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/ExplosionEnchantment.java +++ b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/ExplosionEnchantment.java @@ -13,7 +13,7 @@ import net.minecraft.world.World; import net.minecraft.world.explosion.Explosion; -public class ExplosionEnchantment extends StaffEnchantment { +public class ExplosionEnchantment extends AbstractStaffEnchantment { public ExplosionEnchantment () { super(Rarity.VERY_RARE, 0xCE0000, 16, 160); } diff --git a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/FireballEnchantment.java b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/FireballEnchantment.java index 270f48f..0c7d23d 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/FireballEnchantment.java +++ b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/FireballEnchantment.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.server.world.ServerWorld; -public class FireballEnchantment extends StaffEnchantment { +public class FireballEnchantment extends AbstractStaffEnchantment { public FireballEnchantment () { super(Rarity.COMMON, 0xFF331F, 64, 20); } diff --git a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/FrostballEnchantment.java b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/FrostballEnchantment.java index 139e5fe..a013fbd 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/FrostballEnchantment.java +++ b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/FrostballEnchantment.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.server.world.ServerWorld; -public class FrostballEnchantment extends StaffEnchantment { +public class FrostballEnchantment extends AbstractStaffEnchantment { public FrostballEnchantment () { super(Rarity.COMMON, 0xBADCFF, 64, 20); } diff --git a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/GaleEnchantment.java b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/GaleEnchantment.java index 6e12ff8..87bfdd4 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/GaleEnchantment.java +++ b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/GaleEnchantment.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.server.world.ServerWorld; -public class GaleEnchantment extends StaffEnchantment { +public class GaleEnchantment extends AbstractStaffEnchantment { public GaleEnchantment () { super(Rarity.UNCOMMON, 0xFFFFFF, 32, 30); } diff --git a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/GhostOrbEnchantment.java b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/GhostOrbEnchantment.java index c5abe84..b4bf320 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/GhostOrbEnchantment.java +++ b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/GhostOrbEnchantment.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.server.world.ServerWorld; -public class GhostOrbEnchantment extends StaffEnchantment { +public class GhostOrbEnchantment extends AbstractStaffEnchantment { public GhostOrbEnchantment () { super(Rarity.UNCOMMON, 0x6B6B6B, 64, 20); } diff --git a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/JumpEnchantment.java b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/JumpEnchantment.java index a812e60..563fe5f 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/JumpEnchantment.java +++ b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/JumpEnchantment.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.Vec3d; -public class JumpEnchantment extends StaffEnchantment { +public class JumpEnchantment extends AbstractStaffEnchantment { public JumpEnchantment () { super(Rarity.COMMON, 0xA2C663, 32, 10); } diff --git a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/MissileEnchantment.java b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/MissileEnchantment.java index a7a1083..427f3e0 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/MissileEnchantment.java +++ b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/MissileEnchantment.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.server.world.ServerWorld; -public class MissileEnchantment extends StaffEnchantment { +public class MissileEnchantment extends AbstractStaffEnchantment { public MissileEnchantment () { super(Rarity.RARE, 0x975DFF, 96, 20); } diff --git a/src/main/java/com/provismet/AdditionalArmoury/items/StaffItem.java b/src/main/java/com/provismet/AdditionalArmoury/items/StaffItem.java index c27d326..b0062e0 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/items/StaffItem.java +++ b/src/main/java/com/provismet/AdditionalArmoury/items/StaffItem.java @@ -6,7 +6,7 @@ import org.jetbrains.annotations.Nullable; -import com.provismet.AdditionalArmoury.enchantments.staff.StaffEnchantment; +import com.provismet.AdditionalArmoury.enchantments.staff.AbstractStaffEnchantment; import com.provismet.AdditionalArmoury.particles.effects.SpellChargeParticleEffect; import com.provismet.AdditionalArmoury.registries.AASounds; @@ -35,36 +35,36 @@ public StaffItem (Settings settings) { } public static int getColour (ItemStack stack) { - StaffEnchantment enchantment = StaffItem.getFirstStaffEnchantment(stack); + AbstractStaffEnchantment enchantment = StaffItem.getFirstStaffEnchantment(stack); if (enchantment == null) return 0xC18920; else return enchantment.colour; } - protected static List getStaffEnchantments (ItemStack stack) { + protected static List getStaffEnchantments (ItemStack stack) { Iterator iter = EnchantmentHelper.get(stack).keySet().iterator(); - List out = new ArrayList<>(); + List out = new ArrayList<>(); while (iter.hasNext()) { Enchantment enchantment = iter.next(); - if (enchantment instanceof StaffEnchantment staffEnchantment) out.add(staffEnchantment); + if (enchantment instanceof AbstractStaffEnchantment staffEnchantment) out.add(staffEnchantment); } return out; } @Nullable - protected static StaffEnchantment getFirstStaffEnchantment (ItemStack stack) { + protected static AbstractStaffEnchantment getFirstStaffEnchantment (ItemStack stack) { Iterator iter = EnchantmentHelper.get(stack).keySet().iterator(); while (iter.hasNext()) { Enchantment enchantment = iter.next(); - if (enchantment instanceof StaffEnchantment staffEnchantment) return staffEnchantment; + if (enchantment instanceof AbstractStaffEnchantment staffEnchantment) return staffEnchantment; } return null; } @Override public String getTranslationKey (ItemStack stack) { - StaffEnchantment enchantment = StaffItem.getFirstStaffEnchantment(stack); + AbstractStaffEnchantment enchantment = StaffItem.getFirstStaffEnchantment(stack); if (enchantment == null) return this.getTranslationKey(); else return this.getTranslationKey() + ".enchanted"; @@ -85,7 +85,7 @@ public TypedActionResult use (World world, PlayerEntity user, Hand ha @Override public void usageTick (World world, LivingEntity user, ItemStack stack, int remainingUseTicks) { - StaffEnchantment enchantment = StaffItem.getFirstStaffEnchantment(stack); + AbstractStaffEnchantment enchantment = StaffItem.getFirstStaffEnchantment(stack); if (enchantment != null) { enchantment.onChargeTick(world, user, stack, remainingUseTicks); @@ -105,7 +105,7 @@ public UseAction getUseAction (ItemStack stack) { @Override public int getMaxUseTime (ItemStack stack) { - StaffEnchantment enchantment = StaffItem.getFirstStaffEnchantment(stack); + AbstractStaffEnchantment enchantment = StaffItem.getFirstStaffEnchantment(stack); if (enchantment == null) return 0; else return enchantment.chargeTime; } @@ -154,11 +154,11 @@ public int getItemBarColor (ItemStack stack) { @Override public ItemStack finishUsing (ItemStack stack, World world, LivingEntity user) { - List enchantments = StaffItem.getStaffEnchantments(stack); + List enchantments = StaffItem.getStaffEnchantments(stack); boolean wasUsed = false; if (enchantments.size() > 0) { - for (StaffEnchantment enchant : enchantments) { + for (AbstractStaffEnchantment enchant : enchantments) { if (enchant.castSpell(stack, user)) wasUsed = true; } diff --git a/src/main/java/com/provismet/AdditionalArmoury/registries/AAEnchantments.java b/src/main/java/com/provismet/AdditionalArmoury/registries/AAEnchantments.java index fd6e513..8ba60bb 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/registries/AAEnchantments.java +++ b/src/main/java/com/provismet/AdditionalArmoury/registries/AAEnchantments.java @@ -19,7 +19,7 @@ import com.provismet.AdditionalArmoury.enchantments.staff.GhostOrbEnchantment; import com.provismet.AdditionalArmoury.enchantments.staff.JumpEnchantment; import com.provismet.AdditionalArmoury.enchantments.staff.MissileEnchantment; -import com.provismet.AdditionalArmoury.enchantments.staff.StaffEnchantment; +import com.provismet.AdditionalArmoury.enchantments.staff.AbstractStaffEnchantment; import com.provismet.CombatPlusCore.enchantments.WeaponUtilityEnchantment; import net.minecraft.enchantment.Enchantment; @@ -27,15 +27,15 @@ import net.minecraft.registry.Registry; public class AAEnchantments { - public static final StaffEnchantment BOOST = new BoostEnchantment(); - public static final StaffEnchantment ERUPTION = new EruptionEnchantment(); - public static final StaffEnchantment JUMP = new JumpEnchantment(); - public static final StaffEnchantment FIREBALL = new FireballEnchantment(); - public static final StaffEnchantment FROSTBALL = new FrostballEnchantment(); - public static final StaffEnchantment GHOSTLY_ORB = new GhostOrbEnchantment(); - public static final StaffEnchantment GALE = new GaleEnchantment(); - public static final StaffEnchantment MAGIC_MISSILE = new MissileEnchantment(); - public static final StaffEnchantment EXPLOSION = new ExplosionEnchantment(); + public static final AbstractStaffEnchantment BOOST = new BoostEnchantment(); + public static final AbstractStaffEnchantment ERUPTION = new EruptionEnchantment(); + public static final AbstractStaffEnchantment JUMP = new JumpEnchantment(); + public static final AbstractStaffEnchantment FIREBALL = new FireballEnchantment(); + public static final AbstractStaffEnchantment FROSTBALL = new FrostballEnchantment(); + public static final AbstractStaffEnchantment GHOSTLY_ORB = new GhostOrbEnchantment(); + public static final AbstractStaffEnchantment GALE = new GaleEnchantment(); + public static final AbstractStaffEnchantment MAGIC_MISSILE = new MissileEnchantment(); + public static final AbstractStaffEnchantment EXPLOSION = new ExplosionEnchantment(); public static final AdhesiveEnchantment ADHESIVE = new AdhesiveEnchantment(); public static final WeaponUtilityEnchantment SPLATTER = new SplatterEnchantment(); diff --git a/src/main/java/com/provismet/AdditionalArmoury/registries/AAItemGroups.java b/src/main/java/com/provismet/AdditionalArmoury/registries/AAItemGroups.java index 729229f..400d5c0 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/registries/AAItemGroups.java +++ b/src/main/java/com/provismet/AdditionalArmoury/registries/AAItemGroups.java @@ -1,6 +1,6 @@ package com.provismet.AdditionalArmoury.registries; -import com.provismet.AdditionalArmoury.enchantments.staff.StaffEnchantment; +import com.provismet.AdditionalArmoury.enchantments.staff.AbstractStaffEnchantment; import com.provismet.AdditionalArmoury.items.DaggerItem; import com.provismet.AdditionalArmoury.items.MaceItem; @@ -41,7 +41,7 @@ public static void register () { ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register(content -> { content.getContext().lookup().getOptionalWrapper(RegistryKeys.ENCHANTMENT).ifPresent(wrapper -> { wrapper.streamEntries() - .filter(entry -> entry.value() instanceof StaffEnchantment) + .filter(entry -> entry.value() instanceof AbstractStaffEnchantment) .map(entry -> { ItemStack stack = AAItems.STAFF.getDefaultStack(); stack.addEnchantment(entry.value(), 1); From 7fbdbcf1ea81d31e7457ba51929b09356f99a9aa Mon Sep 17 00:00:00 2001 From: Provismet <17149901+Provismet@users.noreply.github.com> Date: Tue, 13 Feb 2024 02:20:08 +0000 Subject: [PATCH 6/9] Update metadata. --- gradle.properties | 2 +- src/main/resources/fabric.mod.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3117fde..9a75262 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,5 +17,5 @@ modid=additional-armoury #Fabric api fabric_version=0.91.0+1.20.1 fabric_asm_version=v2.3 -combatplus_version=0.6.0-mc1.20.1 +combatplus_version=1.0.0-mc1.20.1 lilylib_version=1.1.3-mc1.20 \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index d5da26d..59f349c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -32,8 +32,8 @@ "additional-armoury.mixins.json" ], "depends": { - "fabricloader": ">=0.14.0", - "minecraft": "~1.20", + "fabricloader": ">=0.15.0", + "minecraft": "~1.20 <1.20.2", "java": ">=17", "fabric-api": "*", "combat-plus": "*" From 235d2b43d628e09cb516170c8fa5ee5fee8b68e0 Mon Sep 17 00:00:00 2001 From: Provismet <17149901+Provismet@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:00:29 +0000 Subject: [PATCH 7/9] Add issues page to metadata. --- src/main/resources/fabric.mod.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 59f349c..ccbfb60 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -3,13 +3,14 @@ "id": "additional-armoury", "version": "${version}", "name": "Additional Armoury", - "description": "Adds additional weapons and materials.", + "description": "Adds additional weapons, magic, and materials. Part of the Combat+ collection.", "authors": [ "Provismet" ], "contact": { "homepage": "https://github.com/Provismet/Additional-Armoury", - "sources": "https://github.com/Provismet/Additional-Armoury" + "sources": "https://github.com/Provismet/Additional-Armoury", + "issues": "https://github.com/Provismet/Additional-Armoury/issues" }, "license": "Lily License", "icon": "assets/additional-armoury/icon.png", From 03dd97a23bd0ffe38cd6f7562047a83899c21fba Mon Sep 17 00:00:00 2001 From: Provismet <17149901+Provismet@users.noreply.github.com> Date: Wed, 14 Feb 2024 17:28:36 +0000 Subject: [PATCH 8/9] Spell rings resize smoothly. --- .../AdditionalArmoury/particles/SpellRingParticle.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/com/provismet/AdditionalArmoury/particles/SpellRingParticle.java b/src/main/java/com/provismet/AdditionalArmoury/particles/SpellRingParticle.java index 41e7216..76197a9 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/particles/SpellRingParticle.java +++ b/src/main/java/com/provismet/AdditionalArmoury/particles/SpellRingParticle.java @@ -15,10 +15,13 @@ public class SpellRingParticle extends FlatParticle { private final float rotation; private final float maxScale; + private float prevScale = 0f; + protected SpellRingParticle(ClientWorld world, double x, double y, double z, SpriteProvider spriteProvider, SpellRingParticleEffect effect) { super(world, x, y, z, spriteProvider); this.scale = 0.1f; + this.prevScale = this.scale; this.maxScale = effect.getScale(); this.maxAge = effect.getDuration(); this.rotation = this.random.nextBoolean() ? (this.maxScale / 1.5f) / MathHelper.DEGREES_PER_RADIAN : (this.maxScale / -1.5f) / MathHelper.DEGREES_PER_RADIAN; @@ -28,10 +31,16 @@ protected SpellRingParticle(ClientWorld world, double x, double y, double z, Spr public void tick () { super.tick(); this.setAngleY(this.angle + this.rotation); + this.prevScale = this.scale; if (this.age <= MOVING_TICKS) this.scale = this.maxScale * ((float)this.age / MOVING_TICKS); else if (this.maxAge - this.age <= MOVING_TICKS) this.scale = this.maxScale * ((float)(this.maxAge - this.age) / MOVING_TICKS); } + + @Override + public float getSize (float tickDelta) { + return MathHelper.lerp(tickDelta, this.prevScale, this.scale); + } public static class Factory implements ParticleFactory { private final SpriteProvider spriteProvider; From f2077f8f29f087b653bff92c30c887dbac9ffa2e Mon Sep 17 00:00:00 2001 From: Provismet <17149901+Provismet@users.noreply.github.com> Date: Thu, 15 Feb 2024 15:14:19 +0000 Subject: [PATCH 9/9] Revert "Merge branch '1.20.2' into 1.20" This reverts commit 87e0b8ae91251f943b2c24fa42318cbd4ccb3226, reversing changes made to 03dd97a23bd0ffe38cd6f7562047a83899c21fba. --- gradle.properties | 8 ++++---- .../building_blocks/endernether_block.json | 4 ++-- .../building_blocks/overnether_block.json | 4 ++-- .../recipes/combat/diamond_dagger.json | 4 ++-- .../recipes/combat/diamond_mace.json | 4 ++-- .../combat/endernether_axe_smithing.json | 4 ++-- .../combat/endernether_boots_smithing.json | 4 ++-- .../endernether_chestplate_smithing.json | 4 ++-- .../combat/endernether_dagger_smithing.json | 4 ++-- .../combat/endernether_helmet_smithing.json | 4 ++-- .../combat/endernether_hoe_smithing.json | 4 ++-- .../combat/endernether_leggings_smithing.json | 4 ++-- .../combat/endernether_mace_smithing.json | 4 ++-- .../combat/endernether_pickaxe_smithing.json | 4 ++-- .../combat/endernether_shovel_smithing.json | 4 ++-- .../combat/endernether_sword_smithing.json | 4 ++-- .../recipes/combat/golden_dagger.json | 4 ++-- .../recipes/combat/golden_mace.json | 4 ++-- .../recipes/combat/iron_dagger.json | 4 ++-- .../recipes/combat/iron_mace.json | 4 ++-- .../combat/netherite_dagger_smithing.json | 4 ++-- .../combat/netherite_mace_smithing.json | 4 ++-- .../combat/overnether_axe_smithing.json | 4 ++-- .../combat/overnether_boots_smithing.json | 4 ++-- .../overnether_chestplate_smithing.json | 4 ++-- .../combat/overnether_dagger_smithing.json | 4 ++-- .../combat/overnether_helmet_smithing.json | 4 ++-- .../combat/overnether_hoe_smithing.json | 4 ++-- .../combat/overnether_leggings_smithing.json | 4 ++-- .../combat/overnether_mace_smithing.json | 4 ++-- .../combat/overnether_pickaxe_smithing.json | 4 ++-- .../combat/overnether_shovel_smithing.json | 4 ++-- .../combat/overnether_sword_smithing.json | 4 ++-- .../recipes/combat/stone_dagger.json | 4 ++-- .../recipes/combat/stone_mace.json | 4 ++-- .../recipes/combat/wooden_dagger.json | 4 ++-- .../recipes/combat/wooden_mace.json | 4 ++-- .../recipes/misc/endernether_ingot.json | 4 ++-- .../misc/endernether_ingot_decompressed.json | 4 ++-- ...endernether_upgrade_smithing_template.json | 4 ++-- .../recipes/misc/overnether_ingot.json | 4 ++-- .../misc/overnether_ingot_decompressed.json | 4 ++-- .../overnether_upgrade_smithing_template.json | 4 ++-- .../Crafting/TippedDaggerRecipe.java | 5 +++-- .../staff/ExplosionEnchantment.java | 4 ++-- .../AdvancementGenerator.java | 19 ++++++++---------- .../AdditionalArmoury/RecipeGenerator.java | 20 ++++++++++--------- 47 files changed, 112 insertions(+), 112 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0a33490..9a75262 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,9 +4,9 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.2 -yarn_mappings=1.20.2+build.4 -loader_version=0.15.6 +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.10 +loader_version=0.15.3 # Mod Properties mod_version=1.0.0 @@ -15,7 +15,7 @@ archives_base_name=additional-armoury modid=additional-armoury #Fabric api -fabric_version=0.91.6+1.20.2 +fabric_version=0.91.0+1.20.1 fabric_asm_version=v2.3 combatplus_version=1.0.0-mc1.20.1 lilylib_version=1.1.3-mc1.20 \ No newline at end of file diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/building_blocks/endernether_block.json b/src/main/generated/data/additional-armoury/advancements/recipes/building_blocks/endernether_block.json index 21eac69..c79b579 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/building_blocks/endernether_block.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/building_blocks/endernether_block.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_endernether_ingot" + "has_endernether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/building_blocks/overnether_block.json b/src/main/generated/data/additional-armoury/advancements/recipes/building_blocks/overnether_block.json index f330e8b..094bead 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/building_blocks/overnether_block.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/building_blocks/overnether_block.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_overnether_ingot" + "has_overnether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/diamond_dagger.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/diamond_dagger.json index d323209..70e5fc0 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/diamond_dagger.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/diamond_dagger.json @@ -32,9 +32,9 @@ }, "requirements": [ [ - "has_the_recipe", "has_stick", - "has_diamond" + "has_diamond", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/diamond_mace.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/diamond_mace.json index 42b8fc4..38cee48 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/diamond_mace.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/diamond_mace.json @@ -32,9 +32,9 @@ }, "requirements": [ [ - "has_the_recipe", "has_stick", - "has_diamond" + "has_diamond", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_axe_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_axe_smithing.json index 984a0a2..798ee98 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_axe_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_axe_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_endernether_ingot" + "has_endernether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_boots_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_boots_smithing.json index 01bb252..9d2c509 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_boots_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_boots_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_endernether_ingot" + "has_endernether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_chestplate_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_chestplate_smithing.json index 73df909..57615bb 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_chestplate_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_chestplate_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_endernether_ingot" + "has_endernether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_dagger_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_dagger_smithing.json index 0c00d4d..1f44693 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_dagger_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_dagger_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_endernether_ingot" + "has_endernether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_helmet_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_helmet_smithing.json index 5233968..2c86952 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_helmet_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_helmet_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_endernether_ingot" + "has_endernether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_hoe_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_hoe_smithing.json index 07037c3..5037aec 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_hoe_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_hoe_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_endernether_ingot" + "has_endernether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_leggings_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_leggings_smithing.json index f7a4b5a..48baa82 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_leggings_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_leggings_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_endernether_ingot" + "has_endernether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_mace_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_mace_smithing.json index 880f579..842df48 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_mace_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_mace_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_endernether_ingot" + "has_endernether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_pickaxe_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_pickaxe_smithing.json index bd63e4b..5f0f97a 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_pickaxe_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_pickaxe_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_endernether_ingot" + "has_endernether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_shovel_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_shovel_smithing.json index a0c5774..2f6f927 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_shovel_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_shovel_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_endernether_ingot" + "has_endernether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_sword_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_sword_smithing.json index 1745e9c..342dbff 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_sword_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/endernether_sword_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_endernether_ingot" + "has_endernether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/golden_dagger.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/golden_dagger.json index 50f4591..3cdc31a 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/golden_dagger.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/golden_dagger.json @@ -32,9 +32,9 @@ }, "requirements": [ [ - "has_the_recipe", "has_stick", - "has_gold_ingot" + "has_gold_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/golden_mace.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/golden_mace.json index 8013d5b..bbe99f8 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/golden_mace.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/golden_mace.json @@ -32,9 +32,9 @@ }, "requirements": [ [ - "has_the_recipe", "has_stick", - "has_gold_ingot" + "has_gold_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/iron_dagger.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/iron_dagger.json index 460fafd..90de4df 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/iron_dagger.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/iron_dagger.json @@ -32,9 +32,9 @@ }, "requirements": [ [ - "has_the_recipe", "has_stick", - "has_iron_ingot" + "has_iron_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/iron_mace.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/iron_mace.json index c9efb66..21c6874 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/iron_mace.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/iron_mace.json @@ -32,9 +32,9 @@ }, "requirements": [ [ - "has_the_recipe", "has_stick", - "has_iron_ingot" + "has_iron_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/netherite_dagger_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/netherite_dagger_smithing.json index 4cf31b8..fe364bb 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/netherite_dagger_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/netherite_dagger_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_netherite_ingot" + "has_netherite_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/netherite_mace_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/netherite_mace_smithing.json index 2a006fc..e4e7310 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/netherite_mace_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/netherite_mace_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_netherite_ingot" + "has_netherite_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_axe_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_axe_smithing.json index 2648c40..7c3a869 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_axe_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_axe_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_overnether_ingot" + "has_overnether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_boots_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_boots_smithing.json index aa27096..4009750 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_boots_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_boots_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_overnether_ingot" + "has_overnether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_chestplate_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_chestplate_smithing.json index 3acd183..b7c5cd7 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_chestplate_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_chestplate_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_overnether_ingot" + "has_overnether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_dagger_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_dagger_smithing.json index 8ad5188..5da533e 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_dagger_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_dagger_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_overnether_ingot" + "has_overnether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_helmet_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_helmet_smithing.json index d81486b..e2a6afa 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_helmet_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_helmet_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_overnether_ingot" + "has_overnether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_hoe_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_hoe_smithing.json index dcc4108..b97f31a 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_hoe_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_hoe_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_overnether_ingot" + "has_overnether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_leggings_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_leggings_smithing.json index c7c1eef..bd511b3 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_leggings_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_leggings_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_overnether_ingot" + "has_overnether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_mace_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_mace_smithing.json index a349aa6..e13e11d 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_mace_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_mace_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_overnether_ingot" + "has_overnether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_pickaxe_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_pickaxe_smithing.json index 2d6c29c..c7e9610 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_pickaxe_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_pickaxe_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_overnether_ingot" + "has_overnether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_shovel_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_shovel_smithing.json index 9893b0b..7b67e43 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_shovel_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_shovel_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_overnether_ingot" + "has_overnether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_sword_smithing.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_sword_smithing.json index cee4657..ada2d11 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_sword_smithing.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/overnether_sword_smithing.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_overnether_ingot" + "has_overnether_ingot", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/stone_dagger.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/stone_dagger.json index f30df52..6fbcc0c 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/stone_dagger.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/stone_dagger.json @@ -32,9 +32,9 @@ }, "requirements": [ [ - "has_the_recipe", "has_stick", - "has_cobblestone" + "has_cobblestone", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/stone_mace.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/stone_mace.json index 186227b..9f3a4bd 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/stone_mace.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/stone_mace.json @@ -32,9 +32,9 @@ }, "requirements": [ [ - "has_the_recipe", "has_stick", - "has_cobblestone" + "has_cobblestone", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/wooden_dagger.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/wooden_dagger.json index 1bfb0c2..7934eae 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/wooden_dagger.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/wooden_dagger.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_stick" + "has_stick", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/combat/wooden_mace.json b/src/main/generated/data/additional-armoury/advancements/recipes/combat/wooden_mace.json index efcc5c6..7b78fe6 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/combat/wooden_mace.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/combat/wooden_mace.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_stick" + "has_stick", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_ingot.json b/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_ingot.json index ce9f766..f245842 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_ingot.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_ingot.json @@ -34,9 +34,9 @@ }, "requirements": [ [ - "has_the_recipe", "has_netherite_scrap", - "has_popped_chorus_fruit" + "has_popped_chorus_fruit", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_ingot_decompressed.json b/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_ingot_decompressed.json index 3f8f3b3..39402cc 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_ingot_decompressed.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_ingot_decompressed.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_endernether_block" + "has_endernether_block", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_upgrade_smithing_template.json b/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_upgrade_smithing_template.json index c278dbe..a4519bf 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_upgrade_smithing_template.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/misc/endernether_upgrade_smithing_template.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_endernether_upgrade_smithing_template" + "has_endernether_upgrade_smithing_template", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_ingot.json b/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_ingot.json index 68795e9..70cf857 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_ingot.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_ingot.json @@ -34,9 +34,9 @@ }, "requirements": [ [ - "has_the_recipe", "has_netherite_scrap", - "has_echo_shard" + "has_echo_shard", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_ingot_decompressed.json b/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_ingot_decompressed.json index c208e60..e185569 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_ingot_decompressed.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_ingot_decompressed.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_overnether_block" + "has_overnether_block", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_upgrade_smithing_template.json b/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_upgrade_smithing_template.json index 402fce8..09d99f2 100644 --- a/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_upgrade_smithing_template.json +++ b/src/main/generated/data/additional-armoury/advancements/recipes/misc/overnether_upgrade_smithing_template.json @@ -22,8 +22,8 @@ }, "requirements": [ [ - "has_the_recipe", - "has_overnether_upgrade_smithing_template" + "has_overnether_upgrade_smithing_template", + "has_the_recipe" ] ], "rewards": { diff --git a/src/main/java/com/provismet/AdditionalArmoury/Crafting/TippedDaggerRecipe.java b/src/main/java/com/provismet/AdditionalArmoury/Crafting/TippedDaggerRecipe.java index f1dd63a..451451a 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/Crafting/TippedDaggerRecipe.java +++ b/src/main/java/com/provismet/AdditionalArmoury/Crafting/TippedDaggerRecipe.java @@ -12,11 +12,12 @@ import net.minecraft.recipe.SpecialCraftingRecipe; import net.minecraft.recipe.book.CraftingRecipeCategory; import net.minecraft.registry.DynamicRegistryManager; +import net.minecraft.util.Identifier; import net.minecraft.world.World; public class TippedDaggerRecipe extends SpecialCraftingRecipe { - public TippedDaggerRecipe (CraftingRecipeCategory category) { - super(category); + public TippedDaggerRecipe (Identifier id, CraftingRecipeCategory category) { + super(id, category); } @Override diff --git a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/ExplosionEnchantment.java b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/ExplosionEnchantment.java index 8d48b2e..db41db8 100644 --- a/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/ExplosionEnchantment.java +++ b/src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/ExplosionEnchantment.java @@ -3,7 +3,7 @@ import com.provismet.AdditionalArmoury.AdditionalArmouryMain; import com.provismet.AdditionalArmoury.particles.effects.SpellRingParticleEffect; -import net.minecraft.advancement.AdvancementEntry; +import net.minecraft.advancement.Advancement; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; @@ -26,7 +26,7 @@ public boolean castSpell (ItemStack stack, LivingEntity user) { if (user instanceof ServerPlayerEntity serverPlayer) { try { // I don't expect this to break, and it never has in testing. But I have no idea how advancements work. - AdvancementEntry archWizard = MinecraftClient.getInstance().getServer().getAdvancementLoader().get(AdditionalArmouryMain.identifier("story/explosion_magic")); + Advancement archWizard = MinecraftClient.getInstance().getServer().getAdvancementLoader().get(AdditionalArmouryMain.identifier("story/explosion_magic")); for (String criterion : serverPlayer.getAdvancementTracker().getProgress(archWizard).getUnobtainedCriteria()) { serverPlayer.getAdvancementTracker().grantCriterion(archWizard, criterion); } diff --git a/src/main/java/com/provismet/datagen/AdditionalArmoury/AdvancementGenerator.java b/src/main/java/com/provismet/datagen/AdditionalArmoury/AdvancementGenerator.java index e43655b..a7dabde 100644 --- a/src/main/java/com/provismet/datagen/AdditionalArmoury/AdvancementGenerator.java +++ b/src/main/java/com/provismet/datagen/AdditionalArmoury/AdvancementGenerator.java @@ -1,6 +1,5 @@ package com.provismet.datagen.AdditionalArmoury; -import java.util.Optional; import java.util.function.Consumer; import com.provismet.AdditionalArmoury.AdditionalArmouryMain; @@ -10,11 +9,8 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricAdvancementProvider; import net.minecraft.advancement.Advancement; -import net.minecraft.advancement.AdvancementCriterion; -import net.minecraft.advancement.AdvancementEntry; import net.minecraft.advancement.AdvancementFrame; import net.minecraft.advancement.AdvancementRewards; -import net.minecraft.advancement.criterion.Criteria; import net.minecraft.advancement.criterion.EnchantedItemCriterion; import net.minecraft.advancement.criterion.ImpossibleCriterion; import net.minecraft.advancement.criterion.InventoryChangedCriterion; @@ -23,6 +19,7 @@ import net.minecraft.potion.PotionUtil; import net.minecraft.potion.Potions; import net.minecraft.predicate.NumberRange; +import net.minecraft.predicate.entity.LootContextPredicate; import net.minecraft.predicate.item.ItemPredicate; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -33,16 +30,16 @@ protected AdvancementGenerator (FabricDataOutput output) { } @Override - public void generateAdvancement (Consumer consumer) { + public void generateAdvancement (Consumer consumer) { ItemStack enchantedStaff = AAItems.STAFF.getDefaultStack(); enchantedStaff.addEnchantment(AAEnchantments.BOOST, 1); ItemStack bakuretsu = AAItems.STAFF.getDefaultStack(); bakuretsu.addEnchantment(AAEnchantments.EXPLOSION, 1); - AdvancementCriterion staffCondition = Criteria.ENCHANTED_ITEM.create(new EnchantedItemCriterion.Conditions(Optional.empty(), Optional.of(ItemPredicate.Builder.create().items(AAItems.STAFF).build()), NumberRange.IntRange.ANY)); - AdvancementEntry enchanter = Advancement.Builder.create().build(new Identifier("story/enchant_item")); - AdvancementEntry enchantStaff = Advancement.Builder.create().parent(enchanter) + EnchantedItemCriterion.Conditions staffCondition = new EnchantedItemCriterion.Conditions(LootContextPredicate.EMPTY, ItemPredicate.Builder.create().items(AAItems.STAFF).build(), NumberRange.IntRange.ANY); + Advancement enchanter = Advancement.Builder.create().build(new Identifier("story/enchant_item")); + Advancement enchantStaff = Advancement.Builder.create().parent(enchanter) .display( enchantedStaff, this.buildTranslationKey("enchant_staff.title"), @@ -67,10 +64,10 @@ public void generateAdvancement (Consumer consumer) { true, false ) - .criterion("used_explosion_magic", Criteria.IMPOSSIBLE.create(new ImpossibleCriterion.Conditions())) + .criterion("used_explosion_magic", new ImpossibleCriterion.Conditions()) .build(consumer, AdditionalArmouryMain.identifier("story/explosion_magic").toString()); - AdvancementEntry dragonBreath = Advancement.Builder.create().build(new Identifier("end/dragon_breath")); + Advancement dragonBreath = Advancement.Builder.create().build(new Identifier("end/dragon_breath")); Advancement.Builder.create().parent(dragonBreath) .display( PotionUtil.setPotion(AAItems.DIAMOND_DAGGER.getDefaultStack(), Potions.POISON), @@ -85,7 +82,7 @@ public void generateAdvancement (Consumer consumer) { .criterion("crafted_tipped_dagger", RecipeCraftedCriterion.Conditions.create(AdditionalArmouryMain.identifier("tipped_dagger"))) .build(consumer, AdditionalArmouryMain.identifier("end/craft_tipped_dagger").toString()); - AdvancementEntry ancientDebris = Advancement.Builder.create().build(new Identifier("nether/obtain_ancient_debris")); + Advancement ancientDebris = Advancement.Builder.create().build(new Identifier("nether/obtain_ancient_debris")); Advancement.Builder.create().parent(ancientDebris) .display( AAItems.OVERNETHER_CHESTPLATE, diff --git a/src/main/java/com/provismet/datagen/AdditionalArmoury/RecipeGenerator.java b/src/main/java/com/provismet/datagen/AdditionalArmoury/RecipeGenerator.java index dddba25..49fca9f 100644 --- a/src/main/java/com/provismet/datagen/AdditionalArmoury/RecipeGenerator.java +++ b/src/main/java/com/provismet/datagen/AdditionalArmoury/RecipeGenerator.java @@ -1,5 +1,7 @@ package com.provismet.datagen.AdditionalArmoury; +import java.util.function.Consumer; + import com.provismet.AdditionalArmoury.AdditionalArmouryMain; import com.provismet.AdditionalArmoury.items.DaggerItem; import com.provismet.AdditionalArmoury.items.MaceItem; @@ -10,7 +12,7 @@ import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.fabricmc.fabric.api.tag.convention.v1.ConventionalItemTags; import net.minecraft.data.server.recipe.ComplexRecipeJsonBuilder; -import net.minecraft.data.server.recipe.RecipeExporter; +import net.minecraft.data.server.recipe.RecipeJsonProvider; import net.minecraft.data.server.recipe.RecipeProvider; import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; @@ -31,7 +33,7 @@ public RecipeGenerator (FabricDataOutput output) { } @Override - public void generate (RecipeExporter exporter) { + public void generate (Consumer exporter) { RecipeGenerator.offerOvernetherUpgradeRecipe(exporter, Items.DIAMOND_SWORD, RecipeCategory.COMBAT, AAItems.OVERNETHER_SWORD); RecipeGenerator.offerEndernetherUpgradeRecipe(exporter, Items.DIAMOND_SWORD, RecipeCategory.COMBAT, AAItems.ENDERNETHER_SWORD); RecipeGenerator.offerOvernetherUpgradeRecipe(exporter, Items.DIAMOND_AXE, RecipeCategory.COMBAT, AAItems.OVERNETHER_AXE); @@ -92,7 +94,7 @@ public void generate (RecipeExporter exporter) { RecipeGenerator.offerReversibleCompactingRecipe(exporter, AAItems.ENDERNETHER_INGOT, AAItems.ENDERNETHER_BLOCK); } - public static void offerDaggerRecipe (DaggerItem dagger, Item material, RecipeExporter exporter) { + public static void offerDaggerRecipe (DaggerItem dagger, Item material, Consumer exporter) { ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, dagger) .pattern("i") .pattern("s") @@ -112,7 +114,7 @@ public static ShapedRecipeJsonBuilder createDaggerRecipe (DaggerItem dagger, Tag .criterion(FabricRecipeProvider.hasItem(Items.STICK), FabricRecipeProvider.conditionsFromItem(Items.STICK)); } - public static void offerDaggerRecipe (DaggerItem dagger, TagKey tag, ItemConvertible baseTagItem, RecipeExporter exporter) { + public static void offerDaggerRecipe (DaggerItem dagger, TagKey tag, ItemConvertible baseTagItem, Consumer exporter) { ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, dagger) .pattern("i") .pattern("s") @@ -123,7 +125,7 @@ public static void offerDaggerRecipe (DaggerItem dagger, TagKey tag, ItemC .offerTo(exporter); } - public static void offerMaceRecipe (MaceItem mace, Item material, RecipeExporter exporter) { + public static void offerMaceRecipe (MaceItem mace, Item material, Consumer exporter) { ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, mace) .pattern(" i ") .pattern("isi") @@ -135,7 +137,7 @@ public static void offerMaceRecipe (MaceItem mace, Item material, RecipeExporter .offerTo(exporter); } - public static void offerMaceRecipe (MaceItem mace, TagKey tag, ItemConvertible baseTagItem, RecipeExporter exporter) { + public static void offerMaceRecipe (MaceItem mace, TagKey tag, ItemConvertible baseTagItem, Consumer exporter) { ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, mace) .pattern(" i ") .pattern("isi") @@ -157,19 +159,19 @@ public static ShapedRecipeJsonBuilder createMaceRecipe (MaceItem mace, TagKey exporter, Item input, RecipeCategory category, Item result) { SmithingTransformRecipeJsonBuilder.create(Ingredient.ofItems(AAItems.OVERNETHER_UPGRADE_SMITHING_TEMPLATE), Ingredient.ofItems(input), Ingredient.ofItems(AAItems.OVERNETHER_INGOT), category, result) .criterion(FabricRecipeProvider.hasItem(AAItems.OVERNETHER_INGOT), FabricRecipeProvider.conditionsFromItem(AAItems.OVERNETHER_INGOT)) .offerTo(exporter, RecipeProvider.getItemPath(result) + "_smithing"); } - public static void offerEndernetherUpgradeRecipe(RecipeExporter exporter, Item input, RecipeCategory category, Item result) { + public static void offerEndernetherUpgradeRecipe(Consumer exporter, Item input, RecipeCategory category, Item result) { SmithingTransformRecipeJsonBuilder.create(Ingredient.ofItems(AAItems.ENDERNETHER_UPGRADE_SMITHING_TEMPLATE), Ingredient.ofItems(input), Ingredient.ofItems(AAItems.ENDERNETHER_INGOT), category, result) .criterion(FabricRecipeProvider.hasItem(AAItems.ENDERNETHER_INGOT), FabricRecipeProvider.conditionsFromItem(AAItems.ENDERNETHER_INGOT)) .offerTo(exporter, RecipeProvider.getItemPath(result) + "_smithing"); } - private static void offerReversibleCompactingRecipe (RecipeExporter exporter, Item input, Item result) { + private static void offerReversibleCompactingRecipe (Consumer exporter, Item input, Item result) { ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, result) .input(input, 9) .criterion(FabricRecipeProvider.hasItem(input), FabricRecipeProvider.conditionsFromItem(input))