Commit graph

2492 commits

Author SHA1 Message Date
AEon - Tobias ecebe75f33 Third stage of "Dagger of Sacrifice"-glow (#1389)
* Added Soul Fray check.
Sacrificial dagger now glows even more if you're fully prepared!
Added NBT field for maximum incense altar bonus from the last incense altar the player has encountered.
(There is a case in which the dagger glows even if the player is not at maximum incense bonus:
 The player must have been at maximum incense bonus and then gone into the vincinity of a stronger incense altar.
 The maximum incense bonus data field only updates once the maximum bonus has been reached for efficiency.)

* Multiplayer fixed.

* Fixed weirdness that occurred during a phase I don't remember.
2018-08-07 17:51:46 -07:00
AEon - Tobias 2c92a9e0c1 Crossdimensional Teleposition (including entities, into unloaded chunks etc) (#1385)
* AWAITING ALLOWANCE FROM BRANDON3055 (PERMISSION TO USE CODE SNIPPET FOR INTERDIMENSIONAL/CROSSDIMENSIONAL TELEPORT) COPYRIGHT ALL RIGHTS RESERVED FOR BRANDON3055 (CODE SNIPPET)
AWAITING ALLOWANCE FROM TEHNUT, WAYOFTIME TO USE FOREIGN CODE (AS IT NEEDS ALLOWANCE & POSSIBLE CREDITS)

DO NOT USE.

* Forgot something.

                   Requires permission from Brandon3055 (copyright on code snippet)
                   Requires permission from WayofTime, TehNut (because it uses foreign code that might need attribution)

                   Do not use.

* License permits usage.

Sorry for bothering everyone involved.

Don't merge. Teleposer broken. Teleposition sigil works though.

* IT WORKS!!!!

- re-enabled cross dimensional telepositioning
- works even if target teleposer is unloaded at the time of activation (force loads the chunk so the teleposer can be found, releases ticket when player arrives)
- entity teleposition works properly
- I'm tired and slightly insane
- nobody asked for this.

closes #973 (rewrite might still be needed though)

might be able to close the following issue:
    - #1198 (improved cross dimensional teleportation code thanks to brandon3055)

* Zombies stop holding onto tickets now.

* Oversight.
2018-08-07 17:50:56 -07:00
AEon - Tobias c0570af36f Disorient upgrade typo fix (#1320) (#1395) 2018-08-07 16:50:26 -07:00
AEon - Tobias 4941d0b361 Language files en_US -> de_DE (FINISHED), minor language file edits (#1321)
* Fixed downgrade level inconsistency

* Squashed commit of the following:

commit 7263e6fbc2
Author: PiscesdanAT <40119554+PiscesdanAT@users.noreply.github.com>
Date:   Sat Jun 9 18:01:30 2018 +0200

    Update de_DE.lang (#1337)

    Someone mixed up dusk and dawn

Updated de_DE.lang
Added some missing stuff in en_US.lang

* Update en_US.lang

Fixed the typo I inserted with previous commit.

* bloodmagic/.../de_DE.lang

 * more fitting translations

bloodmagicguide/.../de_DE.lang

 * 1/3 finished

.. en_US.lang

Whitespaces

Signed-off-by: Iorce <tgremeyer@icloud.com>

* bloodmagic/.../de_DE.lang:
- improved translations - again

bloodmagicguide/.../en_US:
- mudpack -> modpack (someone doesn't like them, it seems)
- wares off -> wears off (Typo)

bloodmagicguide/.../de_DE:
- another batch of translations

Signed-off-by: Iorce <tgremeyer@icloud.com>

* bloodmagic/.../de_DE.lang:
- improved translations - again

bloodmagicguide/.../en_US:
- mudpack -> modpack (someone doesn't like them, it seems)
- wares off -> wears off (Typo)

bloodmagicguide/.../de_DE:
- another batch of translations
- finished the "Ritual Master"

Signed-off-by: Iorce <tgremeyer@icloud.com>

* bloodmagic/.../de_DE.lang:
- improved translations - a bit more literal for some while keeping variety (Suppression and Displacement can have the same translation)

bloodmagicguide/.../de_DE:
- translated architect entry texts / titles

* bloodmagicguide/.../en_US.lang:
consistency (was Sacrificial Knife, every occurrence of that item is now called "Sacrifical Dagger"

bloodmagicguide/.../de_DE.lang:
some more....

* bloodmagicguide/.../en_US.lang:
corrected required Blood Altar tier from "greater than" to "greater than or equal to"

bloodmagicguide/.../de_DE.lang:
some more....

* bloodmagicguide/.../en_US.lang:
added clarification for Incense Altar block range

bloodmagicguide/.../de_DE.lang:
changed "Wahrheitssiegel" to "Siegel der Weissagung"
changed "Weihrauchaltar" to "Räucheraltar"
some more....

* bloodmagicguide/.../en_US.lang:
clarification for Sigil of the Fast Miner entry ("and" -> "at")

bloodmagicguide/.../de_DE.lang:
some more....

* bloodmagicguide/.../de_DE.lang:
some more....

* Changed "Blutorb" to "Blutkugel" in translation. Might have missed some cases of severe german grammar.

bloodmagicguide/.../en_US.lang:
Removed a "my", if someone misses it, it myght be readded.

bloodmagicguide/.../de_DE.lang:
some more....

* long overdue: closes #1320 (the disorient thing that nobody cares about)
bloodmagicguide/.../en_US.lang:
  people are now less warry and more wary about sentient mimics.

bloodmagicguide/.../de_DE.lang:
  some more.... (just the mimic stuff, since I commit after every typo I fix :o )

* bloodmagicguide/.../de_DE.lang:
some more....

Completed "The Architect"

* bloodmagic/.../de_DE.lang:
Leere Tafel -> Leere Schiefertafel (material clarification, remaining names unchanged to keep the names short)
Rudimentäre Falle -> [...] Schlinge (item icon looks like the latter, word has multiple meanings)
Ansammlung Kristalle [...] -> Kirstallansammlung (easier on the tongue, better text flow)

bloodmagicguide/.../en_US.lang:
fixed mistake in textflow

bloodmagicguide/.../de_DE.lang:
some more....

* bloodmagic/.../de_DE.lang:
  clarification
  Haupt- -> Meister

bloodmagicguide/.../de_DE.lang:
  some more....

bloodmagicguide/.../en_US.lang:
  Updated entry to reflect the new mechanic for creating pure will types

* bloodmagic/.../de_DE.lang:
  Ansammlung -> Gruppe

bloodmagicguide/.../de_DE.lang:
finished!

bloodmagicguide/.../en_US.lang:
fixed ritual name

* Finalized de_DE.lang

Ätzend -> Korrosiv

Contains: -> Enthält:

* Finalized de_DE.lang

ätzend -> korrosiv

* Update de_DE.lang

* Update de_DE.lang

Drained -> Verbraucht
Item -> Gegenstand

* Update de_DE.lang

Knoten-Router -> Netzknoten-Router

* Update de_DE.lang

Changed the base names for demonic Will to "Willpower"

-> clarification for the user that the residue is actualy willpower and the quality of said will is a measure of the potential

-> not changing other occurrences or notions in the book as no sane person would repeat "willpower" at every occasion.

* Applied quick fixes to de_DE.lang

* Merge me!
reverted a whitespace change in gradle.properties (no idea where that came from) and moved the disorient thingy to another PR)

* Take No.2

at fixing whitespaces.

* TAKE NO.3

(HOPEFULLY FINAL TAKE)
2018-08-07 16:45:15 -07:00
KohaiKhaos ebfd8ce9a3 Several mimic fixes, with actually cleaned up commit history. (#1379)
* Reimplemented a lot of mimic logic and did a first run of changing how mimics store their states.

* Finished removing all metadata calls for blocks replaced by mimics.

* Update EntityMimic.java

* Update ItemBlockMimic.java

* Update TileMimic.java

* How did I even replace a semicolon with a slash.

* Changed all tabs to 4 spaces. Changed Serializer to StateUtil

* Fixed spacing again, hopefully for the last time
2018-08-07 16:28:55 -07:00
KohaiKhaos 7954d04421 Fixed a null pointer exception with certain modded blocks with the Ritual of Magnetism (#1380)
* Replaced a null RayTraceResult in Magnetism Ritual with a real one

* Added a fake player to the code. No more passing nulls.
2018-08-07 16:24:41 -07:00
AEon - Tobias e8ad057662 Added RitualReader/Ritual Tinkerer to creative tab (#1393) 2018-08-07 16:02:22 -07:00
AEon - Tobias ce46de0d0a Fixed Crystal Cluster behavior. (#1390)
* Players in creative mode can now add crystals to crystal blocks by right clicking them with an item demon crystal.
Crystal block texture now updates on the next tick. The render update is only called when a new crystal has been added (by natural or unnatural means).
Adding a crystal imitates a positive result of checkAndGrowCrystal()

closes #1151

* fixed conditional to allow harvesting crystals if not in creative and holding crystal
2018-08-07 15:59:09 -07:00
Urey. Xue daa52f4d3d Corrections of manual translation (#1386)
* Update zh_CN.lang of blood magic guide

* Clarification

* Clarification on Laputa Shard

* "Messagner" -> "Child"

* More fix

* Correct some misintepretations
2018-08-07 15:52:11 -07:00
AEon - Tobias d30dcf1ae5 Sentient Sword to not attack players unless provoked/auto attack mobs (#1381)
* Should close #1121

Not tested (yet) (because I haven't figured out how to launch the server with a fake player entity... yet).

* will close #1121

Tested.

Specters only attack players if they attack the owner or the specter.
Spectres now autoattack every instance of EntityMob in range.

//TODO: (fluff) make Bow Specter change angle based on target position (it currently always looks like it shoots into the ground)
2018-08-07 15:48:01 -07:00
Arcaratus b441e7fc1e SoulTicket internal implementation (#1372)
* Fix the Blood Tank BB

* Add modid to command localizations to prevent conflicts

* Fixed the items not being drawn on the right Y-level for the Sigil of Holding HUD
Corrected localizations of other lang files

* SoulTicket internal implementation

* do what TehNut says

* implement hashCode()

* Fix toggleable sigils draining on r-click when it shouldn't
Also moved the ItemSigil and ItemSigilToggleable to the sigil package (why wasn't it there???)
2018-08-07 15:27:12 -07:00
Nicholas Ignoffo 093cfb13ef Changelog + version 2018-07-22 07:10:00 -07:00
Arcaratus 6c5bbed348 Quick Fixes (#1362)
* Add modid to command localizations to prevent conflicts

* Corrected localizations of other lang files

* Fixed the items not being drawn on the right Y-level for the Sigil of Holding HUD
2018-07-22 07:07:27 -07:00
Nicholas Ignoffo e82510d553 Fix will type serializer using lowercased names for lookups (#1369) 2018-07-22 06:56:10 -07:00
KohaiKhaos 5ac52fa8c9 Mob Sacrifice Array no longer kills bosses or players (#1371)
This is solving the issue I raised in https://github.com/WayofTime/BloodMagic/issues/1368
Added a single check to line 123 of src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyArrayEffectMobSacrifice.java.
The check makes sure the effective health of the currently targeted entity is above 0. So bosses and players are no longer set to -1 health when the array finishes crafting.
2018-07-22 06:54:46 -07:00
Nicholas Ignoffo 7aadc505ab Fix Ritual of Magnetism not being registered 2018-07-22 06:51:38 -07:00
Nicholas Ignoffo a28f6308aa Update changelog + version 2018-07-16 16:42:24 -07:00
Nicholas Ignoffo fb90656335 Green Grove ritual should apply to Reeds and Cactus (#1359) 2018-07-16 16:42:10 -07:00
Nicholas Ignoffo a7fcfbd2d0 Laputa Array should not be able to move unbreakable blocks (#1360) 2018-07-16 16:05:13 -07:00
Nicholas Ignoffo 42c69eb557 Rework of ritual registration
Moves to annotation based registration. Configs are handled for automatically
2018-06-28 21:56:25 -07:00
Nicholas Ignoffo e3d65a9e3a Rework of HUD element system
Allows configuration because that's probably a good thing. The values in
the json config are percentages of the screen.
2018-06-28 20:37:53 -07:00
Nicholas Ignoffo 47b88b95b0 Base work for ticket based syphoning
To be used for providing a history. This commit breaks any usage of the
network events.

Heads up @TeamDMan @Arcaratus
2018-06-28 18:24:17 -07:00
Nicholas Ignoffo c8e42e3288 Fix lava crystal not syphoning LP (#1326) 2018-06-26 17:15:45 -07:00
Nicholas Ignoffo 22e8290921 Teleposition Sigil should make sure a Teleposer is the destination (#1328) 2018-06-26 17:09:18 -07:00
Nicholas Ignoffo 86f54886c5 Mending should not work on potion flasks (#1332) 2018-06-26 16:53:16 -07:00
Nicholas Ignoffo d1e77acc73 Bandaid crushing ritual to pass a valid player instance (#1345)
This entire thing needs to be cleaned up. It's so bad right now :(
2018-06-26 16:50:34 -07:00
Nicholas Ignoffo 954f2c87e1 Fix bound orbs not allowing JEI interactions (#1349) 2018-06-26 16:42:35 -07:00
Nicholas Ignoffo b38c3022ee Fix crafted inscription tools not having the proper durability (#1353) 2018-06-26 16:32:07 -07:00
Arcaratus 1096c697f4 Fix the Blood Tank BB (#1347) 2018-06-20 18:43:33 -07:00
Urey. Xue 8bec2f3872 Update zh_CN.lang of blood magic guide (#1327)
* Update zh_CN.lang of blood magic guide

* Clarification

* Clarification on Laputa Shard

* "Messagner" -> "Child"

* More fix
2018-06-12 21:49:24 -07:00
PiscesdanAT 7263e6fbc2 Update de_DE.lang (#1337)
Someone mixed up dusk and dawn
2018-06-09 09:01:30 -07:00
WayofTime edf4564a07 Fancied up the rendering of the Mob Sacrifice array, as well as added more behaviour 2018-05-15 12:40:00 -04:00
Nicholas Ignoffo f563da152e Fix Teleposer swapping blocks even if the event is cancelled (#1303) 2018-05-13 22:20:33 -07:00
WayofTime 389043dc64 Implemented the Mob Sacrifice Array.
Needs some cleaning up + added visuals, but appears functional.
2018-05-07 22:10:59 -04:00
WayofTime 32227afd9d Fixed Syntax error in the recipes, as well as annoyed Nut with another class with bracing changes.
(Wonder when I should change all the classes...)
2018-05-05 15:20:37 -04:00
Vegar Guldal c94af26a64 Require water potion instead of uncraftable potion (#1297)
Fixes issue where cutting fluid is uncraftable.
2018-05-04 13:58:39 -07:00
WayofTime 6a56a13aac Final push before 2.2.12. 2018-05-04 14:34:46 -04:00
cpw 778838e2b0 Fix light calculation to use actual visible level. Should now work on (#1295)
surface at night as well as underground. Tweak duration to reduce
flicker.
2018-05-03 19:26:28 -07:00
WayofTime 383be360ff Improved collision "i.e. actually made a non-retarded position update" for the Scroll of Icarus. 2018-05-01 21:39:15 -04:00
WayofTime 3f8a455b90 Made some WIP additions to the Scroll of Icarus, allowing it to pick up mobs. Lacks costs and may break. 2018-05-01 16:29:19 -04:00
WayofTime 920d105374 Needed to be more pushy. 2018-05-01 06:51:37 -04:00
Nicholas Ignoffo 29ae24b044 Fix altar double counting upgrades (#1291) 2018-04-30 19:01:54 -07:00
WayofTime d29b91a106 Fixed the Fluid filters so that they now work perfectly in the routing system. 2018-04-29 09:57:29 -04:00
WayofTime b20e1ac4d7 Fixed Cutting Fluids so they now work properly. 2018-04-29 08:40:42 -04:00
WayofTime 7cecdef6c5 Fixed the Hellfire Forge and Alchemy Table so that they now accept ingredients in any order. 2018-04-29 07:39:20 -04:00
WayofTime eb6b8a3aa5 Small bit of framework for Soul Breath items, plus testing with the "Scroll of Icarus". Crafting mechanic as well as refilling of its resource not implemented. 2018-04-28 21:56:57 -04:00
Nicholas Ignoffo 560d167765 Check the proper maps when looking up fluid priorities (#1286)
When copypasta goes wrong.
2018-04-26 19:12:14 -07:00
WayofTime 26d67e68eb Quickly fixed something to avoid the wrath that anyone with a nut allergy would fear. 2018-04-26 17:16:41 -04:00
WayofTime 842c9d1411 Fixed the Alchemy Array from voiding items when broken when it shouldn't have. 2018-04-26 16:33:22 -04:00
Nicholas Ignoffo 151c1dfd67 "way pls" - TehNut 2018 (#1279) 2018-04-24 17:08:08 -07:00