Merge branch '1.20.1' of github.com:iron431/Irons-Spells-n-Spellbooks…

… into 1.20.1
iron431 · Jun 21, 2023 · e25a995 · e25a995
2 parents 14b3a4c + 80f5f75
commit e25a995
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 15 deletions.
diff --git a/LATEST_CHANGES.MD b/LATEST_CHANGES.MD
@@ -1,5 +1,19 @@
+### Additions
+- Added a holy spellcasting mob: the Priest. Spawns in a new house in plains villages.
+- Added Guiding Bolt Spell
+- Added Chain Lightning Spell
+- Added Gust Spell
+- Added functionality to modded and vanilla projectiles to pass through players with evasion, instead of thinking there was an impact
+- Added Spellbook Category of Equipment to Apotheosis (Thanks to amo)
+- Added Poison Apotheosis Gem
+
 ### Changes
-- Invisibily removes you as the active target from nearby mobs that were targeting you.
+- Invisibility removes you as the active target from nearby mobs that were targeting you.
+- Slimmed down priest armor model.
+- Disabled first person animations entirely if both configs are disabled
+- Improved casting mob movement logic
 
 ### Fixes
-
+- Scroll Forge Ink Outline shifted to match ink texture
+- Fixed ground detection that prevented certain spells from working below y = 0
+- Fixed and issue where casting mobs could choose to drink a potion and cast a spell at the same time
diff --git a/gradle.properties b/gradle.properties
@@ -19,7 +19,7 @@ mapping_version=1.19.3-2023.03.12-1.20
 
 # Irons Mod
 mod_id=irons_spellbooks
-mod_version=1.20-1.1.4
+mod_version=1.20.1-1.1.5
 mod_group_id=io.redspace.ironsspellbooks
 mod_name=Iron's Spells 'n Spellbooks
 mod_license=All Rights Reserved

diff --git a/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86 b/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86
@@ -1,2 +1,2 @@
-// 1.20	2023-06-17T20:00:11.1131264	Pack Metadata
+// 1.20.1	2023-06-20T22:51:16.9320957	Pack Metadata
 03ad80174aa63f48467b0bcfad2cfa77ca26d96e pack.mcmeta
diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,4 +1,4 @@
-// 1.20	2023-06-20T16:25:13.0898144	Registries
+// 1.20.1	2023-06-20T22:51:16.9310979	Registries
 98e97fef80c4433bb746da6322c4a94d69fe2a7e data/irons_spellbooks/damage_type/blood_cauldron.json
 06e8e3da773193115e4569bed7f8964ea5b83917 data/irons_spellbooks/damage_type/blood_magic.json
 3ebbe39a8df6dae168eee32a471c5f2bf26a6b25 data/irons_spellbooks/damage_type/dragon_breath_pool.json

diff --git a/src/generated/resources/.cache/adbaa2ef8845883982e4c7d2678f6d0b4d6a509b b/src/generated/resources/.cache/adbaa2ef8845883982e4c7d2678f6d0b4d6a509b
@@ -1,4 +1,4 @@
-// 1.20	2023-06-17T20:31:24.0788559	Tags for minecraft:damage_type mod id irons_spellbooks
+// 1.20.1	2023-06-20T22:51:16.9301023	Tags for minecraft:damage_type mod id irons_spellbooks
 3dc0dbd0c904c58b17060f2abb8815db72c39675 data/irons_spellbooks/tags/damage_type/blood_magic.json
 f8dad72d46a3de9e4286f1c3ec4fbf7a31f848c3 data/irons_spellbooks/tags/damage_type/bypass_evasion.json
 01e962e95af2267dd18ada4e18daa8d24e25985d data/irons_spellbooks/tags/damage_type/ender_magic.json
@@ -7,6 +7,6 @@ f8dad72d46a3de9e4286f1c3ec4fbf7a31f848c3 data/irons_spellbooks/tags/damage_type/
 3ecc777ed8fa2753948f56e7679770c8253e876f data/irons_spellbooks/tags/damage_type/holy_magic.json
 ce256e399161078f499f4e70abc56c1b3b78d930 data/irons_spellbooks/tags/damage_type/ice_magic.json
 4792bf5179fdfe91dd7407bedd5d207287dd3aa1 data/irons_spellbooks/tags/damage_type/lightning_magic.json
-57796dca465dba62e84ef1176233798e6b99e877 data/irons_spellbooks/tags/damage_type/long_cast_ignore.json
+ef7eeceed023a4792b086b3b38bd2d501d937896 data/irons_spellbooks/tags/damage_type/long_cast_ignore.json
 814a36341bfca3e4f32f4bcd2ed771eaa76ccda1 data/irons_spellbooks/tags/damage_type/poison_magic.json
 0012e9560af1054dfd6cb5b8420d8b968fcb47a9 data/irons_spellbooks/tags/damage_type/void_magic.json
diff --git a/src/main/java/io/redspace/ironsspellbooks/datagen/DamageTypeTagGenerator.java b/src/main/java/io/redspace/ironsspellbooks/datagen/DamageTypeTagGenerator.java
@@ -63,7 +63,8 @@ protected void addTags(@NotNull Provider provider) {
                 DamageTypes.FREEZE,
                 DamageTypes.STARVE,
                 DamageTypes.ON_FIRE,
-                DamageTypes.WITHER
+                DamageTypes.WITHER,
+                DamageTypes.MAGIC
         );
     }
 }
diff --git a/src/main/java/io/redspace/ironsspellbooks/entity/spells/AbstractMagicProjectile.java b/src/main/java/io/redspace/ironsspellbooks/entity/spells/AbstractMagicProjectile.java
@@ -73,7 +73,7 @@ public void tick() {
 
         }
         HitResult hitresult = ProjectileUtil.getHitResultOnMoveVector(this, this::canHitEntity);
-        if (hitresult.getType() != HitResult.Type.MISS) {
+        if (hitresult.getType() != HitResult.Type.MISS  && !net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, hitresult)) {
             onHit(hitresult);
         }
         setPos(position().add(getDeltaMovement()));

diff --git a/src/main/java/io/redspace/ironsspellbooks/entity/spells/fireball/MagicFireball.java b/src/main/java/io/redspace/ironsspellbooks/entity/spells/fireball/MagicFireball.java
@@ -1,14 +1,12 @@
 package io.redspace.ironsspellbooks.entity.spells.fireball;
 
-import io.redspace.ironsspellbooks.capabilities.magic.MagicManager;
 import io.redspace.ironsspellbooks.damage.DamageSources;
 import io.redspace.ironsspellbooks.entity.spells.AbstractMagicProjectile;
 import io.redspace.ironsspellbooks.registries.EntityRegistry;
 import io.redspace.ironsspellbooks.spells.SchoolType;
 import io.redspace.ironsspellbooks.spells.SpellType;
 import io.redspace.ironsspellbooks.util.ParticleHelper;
 import io.redspace.ironsspellbooks.util.Utils;
-import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.entity.Entity;
@@ -50,7 +48,6 @@ public void trailParticles() {
 
     @Override
     public void impactParticles(double x, double y, double z) {
-        MagicManager.spawnParticles(level(), ParticleTypes.LAVA, x, y, z, 50, .1, .1, .1, 0.5 * getExplosionRadius(), false);
     }
 
     @Override

diff --git a/src/main/java/io/redspace/ironsspellbooks/gui/arcane_anvil/ArcaneAnvilMenu.java b/src/main/java/io/redspace/ironsspellbooks/gui/arcane_anvil/ArcaneAnvilMenu.java
@@ -91,6 +91,20 @@ else if (Utils.canBeUpgraded(baseItemStack) && UpgradeUtils.getUpgradeCount(base
                 UpgradeUtils.appendUpgrade(result, upgradeOrb.getUpgradeType(), slot);
                 //IronsSpellbooks.LOGGER.debug("ArcaneAnvilMenu: upgrade system test: total upgrades on {}: {}", result.getDisplayName().getString(), UpgradeUtils.getUpgradeCount(result));
             }
+            //Shriving Stone
+            else if (modifierItemStack.is(ItemRegistry.SHRIVING_STONE.get())) {
+                if (!(baseItemStack.getItem() instanceof Scroll)) {
+                    if (SpellData.hasSpellData(baseItemStack)) {
+                        result = baseItemStack.copy();
+                        result.removeTagKey(SpellData.ISB_SPELL);
+
+                    } else if (UpgradeUtils.isUpgraded(baseItemStack)) {
+                        result = baseItemStack.copy();
+                        result.removeTagKey(UpgradeUtils.Upgrades);
+
+                    }
+                }
+            }
         }
 
         resultSlots.setItem(0, result);

diff --git a/src/main/java/io/redspace/ironsspellbooks/registries/CommandRegistry.java b/src/main/java/io/redspace/ironsspellbooks/registries/CommandRegistry.java
@@ -16,7 +16,7 @@ public static void onCommandsRegister(RegisterCommandsEvent event) {
         CreateDebugWizardCommand.register(event.getDispatcher());
         ManaCommand.register(event.getDispatcher());
         GenerateModList.register(event.getDispatcher());
-        LocateBlock.register(event.getDispatcher(), event.getBuildContext());
+//        LocateBlock.register(event.getDispatcher(), event.getBuildContext());
         //GenerateSiteData.register(event.getDispatcher());
     }
 }
diff --git a/src/main/java/io/redspace/ironsspellbooks/render/GeoSpinAttackLayer.java b/src/main/java/io/redspace/ironsspellbooks/render/GeoSpinAttackLayer.java
@@ -32,7 +32,8 @@ public GeoSpinAttackLayer(AbstractSpellCastingMobRenderer entityRendererIn) {
 
     @Override
     public void render(PoseStack poseStack, AbstractSpellCastingMob animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) {
-        if (animatable.isAutoSpinAttack()) {
+        //TODO: 1.20 port
+        if (animatable.isAutoSpinAttack() && false ) {
             for (int i = 0; i < 3; ++i) {
                 poseStack.pushPose();
                 float f = animatable.tickCount * (float) (-(45 + i * 5));

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -60,7 +60,7 @@ description='''${mod_description}'''
     side="BOTH"
 [[dependencies.${mod_id}]]
     modId="curios" #mandatory
-    mandatory=false #mandatory
+    mandatory=true #mandatory
     versionRange="[1.19.4-5.1.5.3,)" #mandatory
     ordering="NONE"
     side="BOTH"