Commit Graph

827 Commits

Author SHA1 Message Date
Electroblob77 cd6fa03990 Limit cooldowns to a minimum of 1 tick and replace armour cooldown reductions with correct values, fixes #603 2021-01-31 15:50:55 +00:00
Electroblob77 dcb7038833 Remove JSON generator code, fixes #615 2021-01-30 17:50:29 +00:00
Electroblob77 f8a058259d ItemArmor#getEquipmentSlot() is client-side only for some reason... fixes #608 2021-01-30 17:47:30 +00:00
Electroblob77 07acea53e3 A couple of tweaks for backwards compatiblity 2021-01-17 21:33:09 +00:00
Electroblob77 1fcb3a2b1b Reduce capacity of medium mana flask and reduce number of crystals required to craft it accordingly 2021-01-17 20:27:21 +00:00
Electroblob77 16eabc8deb Update version number 2021-01-17 20:23:28 +00:00
Electroblob77 e0efd8d407 Make mana flasks take time to use 2021-01-17 19:25:14 +00:00
Electroblob77 969f0b96fd Have custom large fireballs deal magic damage to ghasts in order to get around vanilla's hardcoded instanceof check, fixes #443 2021-01-17 17:40:09 +00:00
Electroblob77 8a9d88c9ac Guard against null item entities in LivingDropsEvent, fixes #464 2021-01-17 17:19:07 +00:00
Electroblob77 3b55728c75 Actually register font of mana with the event bus, fixes #477 2021-01-17 15:26:30 +00:00
Electroblob77 240bffa7ed Sometimes, I surprise even myself with my own stupidity... fixes #594
(This is literally why I have a helper method. To prevent exactly this error :/)
2021-01-17 15:14:23 +00:00
Electroblob77 c313236eec Disable weather forfeit when invoke weather is disabled, closes #554 2021-01-17 15:08:34 +00:00
Electroblob77 21f7928b9c Guard against null target in remant AI, fixes #600 2021-01-17 14:58:59 +00:00
Electroblob77 1304c11381 People don't listen to me, so let's spell it out to them 2021-01-17 14:41:21 +00:00
Electroblob77 79932e15ab Allow class armour to be imbued properly at the imbuement altar 2021-01-17 13:36:56 +00:00
Electroblob77 25ee166e41 Derp 2021-01-17 13:32:38 +00:00
Electroblob77 299510e663 Add armour classes!
- Added 3 new armour variants - the sage, the battlemage and the warlock - each in the 8 elemental varieties
- Added resplendent thread, crystal silver plating and ethereal crystalweave, used to upgrade regular armour into class armour
- Added the new armour upgrades to loot tables
- Added recipes for the new armour to JEI, along with info pages for the 3 upgrade items
- Added advancements for the new armour classes
- Removed legendary wizard armour
- Removed arcane seal of protection
- Removed the 'legendary' advancement
2021-01-16 23:02:03 +00:00
Electroblob77 0e815c676d Fix conjured items not disappearing in offhand (actually fixes #493) 2021-01-04 00:18:37 +00:00
Electroblob77 f81ad670ed Change donation perk element sync to per-dimension and use EntityJoinWorldEvent instead of PlayerLoggedInEvent, fixes #541 2021-01-03 23:42:27 +00:00
Electroblob77 5b3aebaba1 Update version number 2021-01-03 23:40:57 +00:00
Electroblob77 a3c15d673b Set arcane lock data server-side and sync the tile entity properly, fixes #580 2021-01-03 23:18:20 +00:00
Electroblob77 d8f1c5f77c Merge branch '1.12.2' of https://github.com/Electroblob77/Wizardry into 1.12.2 2021-01-01 23:26:43 +00:00
Electroblob77 1ddcdafe50 Fix the utter mess that is spell property syncing (what was I thinking when I wrote this? and how did it ever work in the first place?!)
This fix is kinda cheating but I don't care, it works and it's certainly better than the mess that was there before
2021-01-01 23:26:24 +00:00
SettingDust 094ce5a427 Try to fix #513 #567
Try to fix  ConcurrentModificationException in LightningWeb
2020-12-21 22:38:15 +08:00
Electroblob77 e19d324dca Include offhand inventory in imbued item updating (and armour, while we're at it), fixes #493 2020-12-20 23:32:12 +00:00
Electroblob77 58f6d55b0d Add timeout when crystal flower charm's effect activates to prevent infinite looping when mod plants don't behave, fixes #488 2020-12-20 23:29:05 +00:00
Electroblob77 32e92b4b04 Guard against null element in writeEntityToNBT for wizards and evil wizards, fixes #491 2020-12-20 23:24:30 +00:00
Electroblob77 24a06e0bac Change dire wolf pelt's effect from different marker colours to different marker shapes 2020-12-20 23:12:27 +00:00
Electroblob77 ae9da5b7c1 Query the position using the block at that position, not the one below... 🤦Fixes #519. 2020-12-20 19:13:41 +00:00
Electroblob77 e3130ca936 Cleanup 2020-12-20 18:57:23 +00:00
Electroblob77 e2fd978d8b Catch NPEs when accessing IBakedModel#getOverrides from ModelBakeEvent, fixes #537 2020-12-20 17:07:58 +00:00
Electroblob77 8f8ce7a453 Populate model lists in PlayerAnimator when a new player renderer is found, fixes #551
Also adds the missing null check to RenderPlayerPostEvent, just in case
2020-12-20 14:45:20 +00:00
Electroblob77 ddfffd3d31 Guard against IOOBEs when rendering the new spell trade icon, fixes #565 2020-12-20 00:16:17 +00:00
Electroblob77 d23c15476a Guard against null spell HUD skins in all places, fixes #566 2020-12-20 00:10:16 +00:00
Electroblob77 55bb40a684 Copy contents of imbuement altar to new tile entity when activated or deactivated, fixes #576 2020-12-20 00:02:10 +00:00
Electroblob77 c483591ea8 Merge branch '1.12.2' of https://github.com/Electroblob77/Wizardry into 1.12.2
# Conflicts:
#	src/main/resources/assets/ebwizardry/lang/ru_ru.lang
2020-12-19 23:41:22 +00:00
Electroblob77 f4cf98089c New contributors 2020-12-19 23:24:38 +00:00
Aralu 1d247e2d56 Re-implment layer fix from Pull Request 312 2020-12-17 11:39:50 -06:00
Electroblob77 fb010d3726 Update version number 2020-11-03 01:36:16 +00:00
Electroblob77 c64731e7a9 Fix ClassCastException in player animations, fixes #533
Somehow some unwrapped model parts managed to slip through (exactly *how* is a mystery!) so we're just safety-checking everything, I doubt this incurs much performance cost in the scheme of things.
2020-11-03 01:33:22 +00:00
Electroblob77 80cf77ecc6 Fix GL stack overflow / weird rendering when arrows are stuck in the player, fixes #529 and #530 2020-11-03 01:08:14 +00:00
Electroblob77 3d3806c20b Prevent receptacles dropping on neighbour change when attached to an imbuement altar, fixes #520 2020-11-03 01:08:11 +00:00
Electroblob77 315f2e4b02 Reinstate missing null check in SpellRay, fixes part of #519 2020-10-28 23:43:08 +00:00
Electroblob77 d3df59df73 Have PlayerAnimator ignore renderers for which no layers/models are stored, fixes #518
This will stop the crashing but might well mean broken animations - for now there's not much I can do about that
2020-10-28 23:37:51 +00:00
Electroblob77 cfd3e796e1 Make PlayerAnimator disable itself when MoBends is installed 2020-10-28 23:27:04 +00:00
Electroblob77 d97e843f7b Guard against all possible nulls to be on the safe side, fixes #517 2020-10-28 23:20:48 +00:00
Electroblob77 3b4ce68606 Third time lucky 2020-10-23 15:55:03 +01:00
Electroblob77 164e9dbe36 And that one 2020-10-23 15:48:59 +01:00
Electroblob77 2a21eb4392 Fix NPE in donor perk packet 2020-10-23 15:38:29 +01:00
Electroblob77 97061f7a32 Merge branch '4.3-dev' into 1.12.2 2020-10-23 15:14:53 +01:00