Commit graph

2135 commits

Author SHA1 Message Date
Nicholas Ignoffo 81ad9bf764 Cleaner fuel handling 2018-03-03 19:17:06 -08:00
Nicholas Ignoffo 927fc6498f Cleanup harvest handling 2018-03-03 19:16:53 -08:00
WayofTime 7a02783e31 Changed the recipe of the Teleport array. 2018-03-02 15:29:45 -05:00
WayofTime 08031e65f8 Fixed client-sided crash in the Blood Light sigil by rearranging a few arguments. 2018-03-02 15:21:51 -05:00
Nicholas Ignoffo 4a709157b8 Merge remote-tracking branch 'origin/1.12' into 1.12 2018-03-02 11:52:32 -08:00
WayofTime 022fe00847 Worked on the Ellipsoid Ritual (currently disabled). No, it is not used to summon mathematical demons. 2018-03-02 14:46:59 -05:00
Nicholas Ignoffo f025407014 Move fuel handling to new event 2018-03-01 19:40:37 -08:00
Nicholas Ignoffo 70d98455b7 Cleaned up a lot of different inspections 2018-03-01 19:27:39 -08:00
Nicholas Ignoffo 0dd0854bd9 Move all SysOut references to debug logging 2018-03-01 18:23:56 -08:00
Nicholas Ignoffo 91d7f23b4f Add API method for registering recipes at proper time
The old access to IBloodMagicRecipeRegistrar still exists, but should not
be used so mods like CraftTweaker can do their thing.

This commit also introduces @BloodMagicPlugin.Inject which will inject the
active API instance into an annotated field with the API interface as it's
type. These fields are populated during pre init.
2018-02-28 17:53:23 -08:00
Nicholas Ignoffo 395f1188e7 Put fast miner array back up at Haste 3
It was ~~our~~ my fault.
2018-02-27 18:19:41 -08:00
WayofTime d783c1419b Merge branch '1.12' of https://github.com/wayoftime/bloodmagic into 1.12 2018-02-27 21:18:07 -05:00
WayofTime f4b72bed8b Added temp recipe to try out a new Teleport array. Don't stick only your hand in it, though. 2018-02-27 21:17:31 -05:00
Nicholas Ignoffo caab4dcbef Fix rituals crashing when deserializing the owner 2018-02-27 18:17:30 -08:00
Nicholas Ignoffo eaf4bfb857 Fix Haste being... *constricted* when above level 2 (#1239) 2018-02-27 18:17:03 -08:00
Nicholas Ignoffo 2a43e53842 Rewrite IBindable to provide an object instead of storing 2 strings 2018-02-27 16:59:51 -08:00
WayofTime 941173dbf4 Added book entry for the Burning Furnace array. 2018-02-27 17:25:41 -05:00
WayofTime 57c25f0064 - Added the Furnace Array (name pending), which takes health from nearby players to power adjacent furnaces. Not covered by standard medical insurance. 2018-02-24 20:31:09 -05:00
Nicholas Ignoffo bf2fe1166e Safety for UUID check in lava crystal (#1238)
some weird mod was doing weird tooltip things weirdly
2018-02-23 16:47:34 -08:00
Nicholas Ignoffo 106532061d Alchemy Table now supports new recipe API 2018-02-19 15:41:18 -08:00
Nicholas Ignoffo 562e62725c Add Sulfur and Saltpeter to OreDict (#1235) 2018-02-19 14:07:44 -08:00
Nicholas Ignoffo 77bdbed8b5 Nullcheck tile in Lava/Water/Void sigils (#1236) 2018-02-19 14:06:05 -08:00
Nicholas Ignoffo 0beef19ba1 Seer Sigil should display tranquility data (#1234) 2018-02-19 14:04:32 -08:00
Nicholas Ignoffo 7a288a7292 Update changelog + version 2018-02-18 16:05:11 -08:00
Nicholas Ignoffo 37c8012741 Ignore blank inscription tools 2018-02-18 15:56:03 -08:00
Nicholas Ignoffo 64336f6f78 Sigils should only stack to 1 2018-02-18 15:55:52 -08:00
Nicholas Ignoffo c5b0b61315 Add HUD elements for tranquility (#1233) 2018-02-18 15:55:40 -08:00
Nicholas Ignoffo ea47db3e5d Wrong extenderoo 2018-02-18 14:33:50 -08:00
Nicholas Ignoffo ee42f6ddc2 Slates and inscription tools should use ItemEnum properly 2018-02-18 14:20:36 -08:00
Nicholas Ignoffo 74eaabff8e Bounce array now behaves as a pillow while sneak (#1196) 2018-02-17 16:37:04 -08:00
Nicholas Ignoffo c05336ac9f "Temporarily" disable cross-dimension entity teleports 2018-02-17 16:27:57 -08:00
Nicholas Ignoffo 539879dbd7 Mod ID filter should only be based on the modid (#1179)
Dangit way
2018-02-17 16:10:27 -08:00
Nicholas Ignoffo 0cb9d66c81 Satiated Stomach will now let you gorge yourself if you're really hungry (#1188)
If the user is below 5 saturation, it will no longer ignore above-max saturation
foods.
2018-02-17 15:50:11 -08:00
Nicholas Ignoffo 6ffe4b8f58 Fix localization for augmented capacity and self sacrifice runes 2018-02-17 15:36:50 -08:00
Nicholas Ignoffo 41baaaf28e YARTF (yet another ray trace fix) (#1228) 2018-02-17 15:07:54 -08:00
Nicholas Ignoffo 441e7b8952 Fix Lava Crystal being consumed 2018-02-17 10:38:33 -08:00
Nicholas Ignoffo 90a071ae23 Fix some logger usages 2018-02-17 09:54:29 -08:00
Nicholas Ignoffo f89b5a005a Logging for plugin gathering
Moved spammy API stuff to a separate logger
2018-02-17 09:48:17 -08:00
Nicholas Ignoffo f49e661eb6 Make sure we're looking at a block before doing blocky things (#1227) 2018-02-17 09:26:35 -08:00
Nicholas Ignoffo 0e986a0bdf Slightly alter the altar renderer 2018-02-16 23:58:24 -08:00
Nicholas Ignoffo b29ade63f0 Logging overhaul 2018-02-16 23:48:28 -08:00
Nicholas Ignoffo 49394b56d6 Coerced augmented flask recipe outputs out of hiding (#1200) 2018-02-16 17:10:00 -08:00
Nicholas Ignoffo 5920d9124d Blood Altar will now be less stingy without outputs 2018-02-16 16:48:21 -08:00
Nicholas Ignoffo e4e6a8c4ca Cleanup Altar Upgrade system 2018-02-16 16:37:02 -08:00
Nicholas Ignoffo 2fecb427fd Merge apibutnotreally with the main packages
Do not consider anything outside of the true API safe to use. And even then,
I'm changing things. Just wait. Please I beg you.
2018-02-15 18:49:07 -08:00
Nicholas Ignoffo 616c08094b Run formatter 2018-02-14 23:38:57 -08:00
Nicholas Ignoffo 2afc235af7 Move API to it's own source set 2018-02-14 23:37:23 -08:00
Nicholas Ignoffo c03af41c88 Some subitem cleanup
Still lots left to do. This will help prepare for The Flattening.
2018-02-13 23:32:15 -08:00
Nicholas Ignoffo 65b89795bc Remove unnecessary base bindable class
Jarbo 8 exists
2018-02-13 17:24:06 -08:00
Nicholas Ignoffo 3fb708d2be Fixed crafting order of decor bricks so polished is no longer a lonely boi (#1221) 2018-02-13 16:57:21 -08:00
Nicholas Ignoffo fa59e7000a Mark of the Falling Tower now demands sacrifices again (#1222) 2018-02-13 16:31:30 -08:00
Nicholas Ignoffo 7167aba23c Move Divination output to a HUD element
RIP chat spam 2014-2018

:hype:
2018-02-12 19:45:09 -08:00
Nicholas Ignoffo 3286849309 Nerf fast miner array which is actually a buff (#1219)
I guess Vanilla can't handle Haste III?
2018-02-11 15:02:55 -08:00
Nicholas Ignoffo 33d6cdb3a9 Fix mundane component being really really really thirsty (#1218) 2018-02-11 14:43:00 -08:00
Nicholas Ignoffo beb71e4c41 Include a dummied version of the alchemy table recipe method so it builds 2018-02-11 12:02:44 -08:00
Nicholas Ignoffo f974f44aeb Fixup Alchemy Array JEI compat 2018-02-11 11:53:45 -08:00
Nicholas Ignoffo 123b06c288 Alchemy arrays should mostly function now (#1202)
Rewrites the crafting recipe portion of alchemy arrays. Currently the rewritten
portion is wrapped in the old stuff. Ideally the remaining old stuff will
be rewritten as well.

Mods who wish to do custom array effects still need to depend on internal
classes and I think this is fine.
2018-02-11 11:40:13 -08:00
Nicholas Ignoffo 4b5f8a9685 Move entity registry to new Forge system 2018-02-11 10:16:09 -08:00
Nicholas Ignoffo 163fe864e5 Soul Snares should not trigger on players. Especially not in a weird way (#1216) 2018-02-11 10:15:16 -08:00
Nicholas Ignoffo 47482b6add Javadoc the new API 2018-02-11 00:39:04 -08:00
Nicholas Ignoffo 03fece58fa Rewrite Hwyla integration
Now properly makes use of the API
2018-02-08 19:01:12 -08:00
Nicholas Ignoffo 9f6a4983a6 Update JEI compat for Forge and Altar 2018-02-07 21:45:40 -08:00
Nicholas Ignoffo 2d3f86aaf8 Fixup Soul Forge crafting 2018-02-07 18:46:18 -08:00
Nicholas Ignoffo e3cef5ee76 Add support for being in the mood to run on dedicated servers (#1211) 2018-02-07 17:02:53 -08:00
Nicholas Ignoffo 80e7b50dde Move Soul Forge to new recipe API 2018-02-06 22:17:06 -08:00
Nicholas Ignoffo 57591973a3 Move Altar to new recipe API 2018-02-06 21:40:50 -08:00
Nicholas Ignoffo 50fd02b6aa Missed some value manager references 2018-02-06 21:27:23 -08:00
Nicholas Ignoffo f8c734bc96 Implemented new Tranquility value API
For quick compat, mods can now register a static state-based tranquility
value for their blocks. More
2018-02-06 21:24:40 -08:00
Nicholas Ignoffo d67ed054ff New recipe registration API 2018-02-06 19:18:29 -08:00
Nicholas Ignoffo 59f171ca5b Forgot lang 2018-02-06 19:00:15 -08:00
Nicholas Ignoffo 739c1aa05f Cleaner sub-item implementation
Todo: Move more sub items to use it
2018-02-06 18:59:47 -08:00
Nicholas Ignoffo 8be8cc30b9 nullcheck obtained entity entries (#1206, 1207)
No idea what's going on here but aight
2018-02-06 17:04:04 -08:00
Nicholas Ignoffo 27e41e2e77 Fix crash when obtaining owner from an unbound bindable item (#1205) 2018-02-05 17:56:06 -08:00
Nicholas Ignoffo e79f6c44d6 Fix crash on servers (#1204) 2018-02-05 17:37:23 -08:00
Nicholas Ignoffo 63f88f6bff Sorted out the sentient sword's identity crisis (#1201) 2018-02-05 17:36:13 -08:00
Nicholas Ignoffo 1205c41712 Fix GUIs not rendering backgrounds and tooltips (#1203) 2018-02-05 17:25:25 -08:00
Nicholas Ignoffo ddaadfbe52 Swap the API packages
The new one is now built for the api jar and the old one is now internal.
It will slowly be moved around to sane places within the internal code. Most
of the features provided in the old "api" are addon specific features which
will generally rely on the main jar anyways. The new API will be specific
to compatibility features, such as blacklists, recipes, and value modification.
2018-02-05 17:04:46 -08:00
Nicholas Ignoffo 3536a25cc3 Add modid to subscriber annotations
(cherry picked from commit 7cac007)
2018-02-04 19:16:09 -08:00
Nicholas Ignoffo 8a4117106d Stop using a custom bus subscriber annotation
I'm sorry, past self, but Forge has had one since like 1.10, it's time to
move on. It's for the better.

(cherry picked from commit 9de2354)
2018-02-04 19:15:37 -08:00
Nicholas Ignoffo 66ea131377 Fix JEI not seeing orbs as different items 2018-02-04 19:12:24 -08:00
Nicholas Ignoffo acdf40e2b6 Update tile entity mappings
(cherry picked from commit c00affa)
2018-02-04 19:10:07 -08:00
Nicholas Ignoffo 42931bcf0e JSON recipes, much to the displeasure of Elucent and shadows
feelsgoodman

(cherry picked from commit c23d577)
2018-02-04 19:09:37 -08:00
Nicholas Ignoffo cc8d5af401 Rename meteor files to lowercase
(cherry picked from commit 59df51a)
2018-02-04 19:02:07 -08:00
Nicholas Ignoffo d99cf77288 Move config to annotation system
All old configs must be deleted for this to work properly. Since the rest
of the update is filled with world breaking changes, this should be fine.

Also some mapping updates

(cherry picked from commit d587a8c)
2018-02-04 19:01:27 -08:00
Nicholas Ignoffo a10b2ece9a Fixed altar detection 2017-08-16 17:29:24 -07:00
Nicholas Ignoffo 37ec0582eb Fixed the last of the model errors 2017-08-16 16:39:57 -07:00
Nicholas Ignoffo 3b173ecf17 Some models work, some don't 2017-08-15 23:01:37 -07:00
Nicholas Ignoffo 08258fd6ef Run formatter 2017-08-15 21:30:56 -07:00
Nicholas Ignoffo 61c44a831b Fix some things that went missing 2017-08-15 21:24:59 -07:00
Nicholas Ignoffo 348fee1e2a It compiles. Somehow. 2017-08-15 20:21:55 -07:00
Nicholas Ignoffo 554c9852e6 Move commonly used API systems to a plugin based system
Create a class that implements IBloodMagicPlugin and annotate it with
`@BloodMagicPlugin`. The `register` method will be called during init.

Currently implemented systems:
- Blacklisting
  - Teleposer
  - Teleposer (entity)
  - Transposition
  - Well of Suffering
  - Green Grove
- Setting sacrificial values
- Adding altar components
2017-08-15 18:14:28 -07:00
Nicholas Ignoffo 5fcdd978d7 this doesn't compile yet, but have something to peek at 2017-08-14 20:53:46 -07:00
Nicholas Ignoffo 8c12b48695 Fix ItemStackWrapper ignoring stack's NBT (#1155)
who even made this class i mean come on this is such a stupid thing to do like omgwtf what a moron
2017-06-21 19:14:25 -07:00
Nicholas Ignoffo 16d4609a48 Fix HarvestHandlerStem not working (#1165) 2017-06-21 19:11:08 -07:00
Graham Hughes 061850ee29 Add crop support for Pam's Harvestcraft and Roots herbs (#1164)
* Add harvest ritual support for Pam's crops.

* Add roots crops.

* Per @TehNut, use BM instance logger.

* Call getMaxAge rather than hardcode 3.
2017-06-21 18:46:42 -07:00
Nicholas Ignoffo f576ec595b Fix some inverted logic with Sentient Mimics (#1149) 2017-06-01 22:31:17 -07:00
Nicholas Ignoffo 273dca3e4d Fix client not registering capability (#1150) 2017-06-01 22:17:46 -07:00
Nicholas Ignoffo f7b8dc0d84 API-facing methods for removing recipes (#1152) 2017-06-01 22:16:24 -07:00
Nicholas Ignoffo 95634f01c3 Merge remote-tracking branch 'origin/1.11' into 1.11 2017-05-27 16:04:55 -07:00
Nicholas Ignoffo 6656fe58dc Moved living armor notifications to action bar 2017-05-27 16:04:40 -07:00
NoX-programer e95b6f3bf2 Update ru_RU.lang: fix many typos (branch 1.11) (#1148)
* Update ru_RU.lang

* Update ru_RU.lang
2017-05-24 06:00:48 -07:00
Nicholas Ignoffo 38e54a4e2f Fixed NPE in Fluid Filter (#1139)
(cherry picked from commit 9a7db20)
2017-05-23 18:56:43 -07:00
Nicholas Ignoffo e9ce88fc73 Fixed capacity on tank being reset when tile was reloaded (#1138) 2017-05-23 18:53:32 -07:00
Nicholas Ignoffo 2c08d046f8 Node Router now prints to action bar instead of chat 2017-05-21 13:45:24 -07:00
Nicholas Ignoffo abef1bada7 Add support for ExU and AA crops to plantable handler (#1107)
Theoretically. Don't actually know if their stuff is written properly.
2017-05-21 13:08:29 -07:00
Nicholas Ignoffo c7f644528b Fix permission level for commands (#1117) 2017-05-21 12:56:51 -07:00
Nicholas Ignoffo 5b9bb07d8d Large Bloodstone Bricks should get 4 from crafting (#1125) 2017-05-21 12:29:52 -07:00
Nicholas Ignoffo a2ceee3218 Fix diamond meteor giving blocks + dynamically calculate weight (#1126) 2017-05-21 12:25:35 -07:00
Nicholas Ignoffo 2789e351c0 Bound tools now properly mark themselves as tools
Because *somebody* forgot to do that.

(cherry picked from commit 717279d)
2017-05-08 19:37:38 -07:00
Nicholas Ignoffo 7c19e2e2d2 Sanity check pos passed by client
Prevents malicious clients from loading arbitrary chunks.

Thanks to @pau101 for spotting it.
2017-04-30 17:20:17 -07:00
Nicholas Ignoffo bffd191efd Re-implement Soul Fray on death
This should be all that's needed
2017-04-03 17:57:40 -07:00
Nicholas Ignoffo 83bba44ab6 Forgot to lowercase these 2017-04-03 17:32:20 -07:00
NatsuArashi dd7f94e756 Traditional Chinese update. (#1116)
* Update zh_TW.lang

* Create zh_TW.lang

* Update zh_TW.lang

(cherry picked from commit f44ad3a)
2017-04-03 17:10:35 -07:00
Nicholas Ignoffo 805576a19b Allow commands to be used in command blocks (#1117) 2017-04-03 17:03:46 -07:00
Nicholas Ignoffo 78a71e47e0 Fix Alchemy Table overwriting output each time it crafts (#1119) 2017-04-03 16:56:21 -07:00
Urey. Xue 22e3d4d62c Update zh_CN.lang (#1052)
* Simp. Chinese translation for SANGVINE SCIENTIEM, round I

* Simp. Chinese translation for SANGVINE SCIENTIEM, round I

Also contains update for main language file

* Amendment I

* Amendment II

* use "/cut" to trick String.split(), so that we could manually split page
* Minor improvements on translation

* Amendment III

* Amendment IV

* Amendment V

* Amendment VI

(cherry picked from commit ad46745)
2017-03-28 19:35:31 -07:00
Nicholas Ignoffo ed59c4633e Fixed null stack in plantable harvest handler 2017-03-28 19:07:16 -07:00
Nicholas Ignoffo 487c7e4aa3 Forgot one... 2017-03-28 18:48:27 -07:00
Nicholas Ignoffo f17f284575 Nullcheck the ritual activator (#1113) 2017-03-28 18:45:45 -07:00
Nicholas Ignoffo 3134f6b9f3 Fix bound tools not checking if they're bound (#1114) 2017-03-28 18:40:24 -07:00
Nicholas Ignoffo d524cc32b7 Another null stack in the Sentient Specters 2017-03-28 18:32:25 -07:00
Nicholas Ignoffo 7cafd833c3 Fix fluid dupe when inserting into blood tank with bucket (#1108) 2017-03-20 22:37:23 -07:00
Nicholas Ignoffo a5a47c42aa Rewrite the placer ritual
Includes a slight nerf: Instead of placing the entire 25x25 at the same time, it now places 1 block at a time.

This was brought on by 30 minutes of debugging an intended feature that was mistaken for a bug in #1103

TODO: Rewrite most of the rituals to get rid of any remaining legacy code
2017-03-14 20:17:57 -07:00
Nicholas Ignoffo 216bdb2d2e Fixed many sigils using the wrong stack for their logic (#1102)
This is why you use custom methods for things like this instead of MC methods
2017-03-14 19:33:13 -07:00
Nicholas Ignoffo 41c2f37042 Change lots of recipes to use oredict (#1101)
I probably missed a few
2017-03-14 19:13:08 -07:00
Nicholas Ignoffo 68ca7cf9a5 Fix Grave Digger not applying damage bonus (#1098) 2017-03-13 16:14:07 -07:00
A_D 35ceb9d21e fixed inconsistent altar tier readout with seer's sigil (#1094)
(cherry picked from commit 2b92151)
2017-03-13 16:04:36 -07:00
Nicholas Ignoffo 0208d5412c Fix crash when meteor hits (#1088) 2017-03-11 16:09:57 -08:00
Nicholas Ignoffo 9cea8e8b73 Fix dupe with Crash of the Timberman (#1090)
Also took the time to add IItemHandler support
2017-03-11 16:01:00 -08:00
Nicholas Ignoffo c4f04b1589 Fix another null check crash (#1091) 2017-03-11 15:53:43 -08:00
Nicholas Ignoffo 7c8e9b6d8d Move some of the ritual chat lines to action bar 2017-03-08 18:00:36 -08:00
majikguy b4603a4b9a Entity Registration Fix (#1087)
* Replaced the Entity registration code. Before, the code was manually adding entities to the GameRegistry.

Doing this prevents the engine from fully registering the added entities in all the proper places. The result was that the Client was never informed of when these entities were created or what they were doing, as all of that behavior is managed by the EntityRegistry.

Changing to the proper EntityRegistry calls fixes issue #1065.

* Changed ResourceLocation calls to the one with two arguments. Didn't know that was a thing before. :D

Also added more consistent whitespace.
2017-03-07 16:17:18 -08:00
Nicholas Ignoffo 85a16ac075 Should fix Blood Light being collidable (#1083)
Why did this only occur in obfuscated environments?
2017-03-06 16:18:55 -08:00
Nicholas Ignoffo 333ad6a09e Fix null stacks in Utils class 2017-03-06 16:09:11 -08:00
Nicholas Ignoffo fceb50bd00 Initialize default altar result as empty stack (#1086) 2017-03-06 16:05:52 -08:00
Nicholas Ignoffo 52861ef7c2 Fix Cutting Fluid returning null when it empties (#1082) 2017-03-05 10:44:55 -08:00
Nicholas Ignoffo 3a707df23c Fix inability to remove gem from crucible (#1079) 2017-03-05 10:38:23 -08:00
Nicholas Ignoffo f083e4e036 Fix Sigil of Holding (#1081) 2017-03-05 10:28:06 -08:00
Nicholas Ignoffo 4e5bc46e21 Fix JEI not displaying armor tomes 2017-03-03 17:21:36 -08:00
majikguy 58db36033a Fixed a typo that made stage 4 of the Body Builder upgrade 5x as difficult as stage 5. (#1080)
(cherry picked from commit 9540df7)
2017-03-03 16:57:26 -08:00
Nicholas Ignoffo fd54ab0458 Fix tartaric gem returning null (#1068) 2017-03-03 16:45:53 -08:00
neconeco2 b1670cdbd5 Update ja_JP.lang (#1076)
(cherry picked from commit 22354ea)
2017-03-02 20:37:32 -08:00
Nicholas Ignoffo 203a2f5fc7 Fix off by 1 letter in inventory serialization (#1072) 2017-03-02 17:36:28 -08:00
Nicholas Ignoffo f3d980ee89 Rewrite Hymn of Syphoning for caps
Needs testing and needs to be optimized.

(cherry picked from commit 3f24e46)
2017-03-02 17:01:23 -08:00
Nicholas Ignoffo 3cbfb0a40f Sort rituals by component count to avoid conflicts (#1070)
Large rituals can now use, for example, the Serenade of the Nether layout if wanted.

(cherry picked from commit 0b93c11)
2017-03-02 16:59:08 -08:00
Nicholas Ignoffo 4e7f0d12f9 Fix Alchemy Table JEI compat being fundamentally wrong (#1069)
(cherry picked from commit fedea85)
2017-03-02 16:57:51 -08:00
Nicholas Ignoffo 8360041da2 Child mobs are now viable for sacrifice at half the rate
(cherry picked from commit 719cff0)
2017-03-02 16:53:29 -08:00
Nicholas Ignoffo 6ac31ba1e8 Dagger of Sacrifice should not work for FakePlayers
(cherry picked from commit c4f9270)
2017-03-02 16:52:53 -08:00
Nicholas Ignoffo 45faf42167 Fix OBO when getting blood tank capacity (#1066) 2017-02-25 14:07:11 -08:00
Nicholas Ignoffo 40bac68190 Break early if activation crystal isn't bound
Fixes annoying and usually false "not configured correctly" message.

https://redd.it/5vte95

(cherry picked from commit 32668f7)
2017-02-23 20:03:26 -08:00
Nicholas Ignoffo 72bf53f8d3 Fix crash when teleposing Demon Will Crystals (#1062)
(cherry picked from commit 970acd4)
2017-02-23 19:47:01 -08:00
Nicholas Ignoffo 88efd672d5 Fix crash when using newly created toggle sigils (#1059)
(cherry picked from commit b55b453)
2017-02-22 16:28:57 -08:00
Nicholas Ignoffo 0927fa16f6 Special case RAW will when converting enums
(cherry picked from commit e8f0194)
2017-02-22 16:27:44 -08:00
Nicholas Ignoffo 91aeb4bf48 Update version + changelog 2017-02-21 16:52:39 -08:00
Nicholas Ignoffo a7a6b1fddc Fix oddity with comparators on Altars (#1058)
*shakes fist at @Arcaratus*

(cherry picked from commit 461c476)
2017-02-21 16:13:23 -08:00
Nicholas Ignoffo da1bb01ff0 Return past functionality to canCombine 2017-02-20 14:15:41 -08:00
Nicholas Ignoffo 93d7efcb40 Fix crash when creating a tank stack with meta > 15 (#1057)
Also finally fixes the tanks so they properly drop themselves.
2017-02-20 13:47:36 -08:00
Nicholas Ignoffo 58d11dfbdc Fix Sigil of Holding crash when opening gui (#1056) 2017-02-20 13:13:15 -08:00
Nicholas Ignoffo 5475549c18 More null stack fixes 2017-02-19 16:06:29 -08:00
Nicholas Ignoffo 72c321acb0 Implement an inverted MRS that requires an RS signal to function (#1022)
(cherry picked from commit ddb7542)
2017-02-19 14:41:06 -08:00
Nicholas Ignoffo 64bc427c1c Missed a couple files
(cherry picked from commit f0e3aa6)
2017-02-19 14:38:28 -08:00
Nicholas Ignoffo 49b8c40e6a More proper fix for #1019
(cherry picked from commit 2ee2cc5)
2017-02-19 14:38:02 -08:00
Nicholas Ignoffo cdb5127598 Fix ore doubling potentially adding invalid recipes (#1051)
(cherry picked from commit 9027f76)
2017-02-19 14:34:19 -08:00
Nicholas Ignoffo 8259676d1b Downgrade tomes are now know that they're downgrades
Also Disoriented is localized finally

(cherry picked from commit e092161)
2017-02-19 14:33:56 -08:00
neconeco2 61bf9c1b08 Update ja_JP.lang (MC1.11) (#1050) 2017-02-13 12:12:45 -08:00
Nicholas Ignoffo c13be9ebce Cache the bound SoulNetwork for rituals
Avoids looking up the map data once or more each tick
2017-02-12 17:00:18 -08:00
Nicholas Ignoffo b0d35577a9 Fix server crash when adding categories to book (#1046) 2017-02-12 16:11:55 -08:00
Nicholas Ignoffo 1728ba7b83 Migrate alchemy table blocking to a boolean array 2017-02-12 11:09:39 -08:00
Nicholas Ignoffo 2db775346c Fix crash when unblocking slot in alchemy table
why way why

`boolean[] blocked = new boolean[slotCount]` :I
2017-02-12 01:59:30 -08:00
Nicholas Ignoffo ac5cf52151 Fix some model errors 2017-02-12 01:39:19 -08:00
Nicholas Ignoffo 7f50780d2f Fix modid references in API javadoc 2017-02-12 01:36:01 -08:00
Nicholas Ignoffo f135dab7ba IMC API for adding new altar components (#1039)
CC @Drullkus

(cherry picked from commit 8a8bff8)
2017-02-12 01:34:51 -08:00
pksiazek 9010cebc40 #1036 Fixed Living Armor sacrifical upgrade (#1037)
(cherry picked from commit 6802bc5)
2017-02-12 01:34:34 -08:00
Nicholas Ignoffo d0e9174446 Bound tools should drain LP (#1033)
(cherry picked from commit 59920ef)
2017-02-12 01:34:20 -08:00
Nicholas Ignoffo 86ea69eaca Temporarily remove item rendering for tank fluid
You cannot bake GL stuff. This is bad. Also it got broken at one point.

I'll re-add this once I remove the need for a TESR.

(cherry picked from commit 13228f6)
2017-02-12 01:33:48 -08:00
Nicholas Ignoffo 53afcc2fb0 No-spam messages should be handled on the main thread (#1035)
(cherry picked from commit 305e001)
2017-02-12 01:31:58 -08:00
Nicholas Ignoffo 930660bc30 Update Blood Tank model and texture
Thanks @InsomniaKitten

Need to rewrite inventory model handler because you *cannot* use GL there.

(cherry picked from commit 6ff12aa)
2017-02-12 01:31:37 -08:00
Nicholas Ignoffo 11fe41c654 Fix durability bars 2017-01-02 02:28:02 -08:00
Nicholas Ignoffo e845332846 Fix compile/model errors 2017-01-02 02:07:52 -08:00
Nicholas Ignoffo 78093631c5 Empty flasks can now be refilled (#976)
Right click a water source (any block that uses Material.WATER, same as vanilla potions) to refill it. This removes all potion effects. The model will display without the fluid inside as a visual indicator.

(cherry picked from commit 4c614df)
2017-01-02 01:59:24 -08:00
Nicholas Ignoffo f3f1dfb08a Fix Expulsion whitelist (#1010)
(cherry picked from commit b6eae2f)
2017-01-02 01:58:31 -08:00
Nicholas Ignoffo 91a900d84e Add current charge to Waila tooltip (#1013)
(cherry picked from commit c7f2b7d)
2017-01-02 01:58:24 -08:00
Nicholas Ignoffo 4c3938c0f9 Change meteor config NPE with EnderCore to a useful error message
(cherry picked from commit 09007c5)
2017-01-02 01:57:44 -08:00
Nicholas Ignoffo 1f3686720c Gold meteor only needs it's version set once
(cherry picked from commit fffed0e)
2017-01-02 01:57:42 -08:00
Nicholas Ignoffo e0c0d095df Fix meteor config not generating new defaults
(cherry picked from commit 5c1b8b1)
2017-01-02 01:57:35 -08:00
Nicholas Ignoffo bd4efb1320 Blacklist sentient spectres from WoS and Sacrifice (#1015)
A config refresh is required for this to take effect. Needs mentioning in changelog.

(cherry picked from commit a5449d3)
2017-01-02 01:57:29 -08:00
WayofTime e8dd07893e Added a null check for the Will getter for the Aura incase the WillChunk somehow does not generate. (#1011)
(cherry picked from commit f083071)
2017-01-02 01:57:23 -08:00
WayofTime 60eba2071d Made it so the book does not give the filling recipe when the Blood Orb recipe is queried.
(cherry picked from commit afa3d1e)
2017-01-02 01:57:17 -08:00
Nicholas Ignoffo c46ed3e648 Sigils should draw LP from the bound network, not the user
(cherry picked from commit 082d2b8)
2017-01-02 01:57:07 -08:00
tartaric_acid 852d32f233 Update zh_CN file (#1003)
* Update zh_CN file

* Fix some mistakes (WIP)

* Finish all fix

* Fix some mistakes

(cherry picked from commit ae2ff03)
2017-01-02 01:35:48 -08:00
WayofTime 65104db564 Added Fluid routing to the routing nodes - this is done by using the Fluid Filter and placing a fluid container as the filter.
(cherry picked from commit a5a17f6)
2017-01-02 01:34:33 -08:00
Nicholas Ignoffo a628adfde8 Lowercase all the tooltip strings 2017-01-02 01:18:29 -08:00
Nicholas Ignoffo 574056203d Fix JEI compat 2017-01-02 01:18:02 -08:00
Nicholas Ignoffo 4ec321aaac Annnd they're back 2017-01-02 00:19:45 -08:00
Nicholas Ignoffo c34ee90b4e Okay let's fix these the hard way. 2017-01-02 00:18:39 -08:00
Nicholas Ignoffo ed27873fbe It runs! 2017-01-02 00:10:28 -08:00
Nicholas Ignoffo 51e10eaad2 Everything else except sigils 2017-01-01 22:26:42 -08:00
Nicholas Ignoffo 128b3d29b0 Lowercase modid 2017-01-01 21:50:35 -08:00
Nicholas Ignoffo f5a68adc2e Remove all the package-info.java's
Except the API one
2017-01-01 21:49:52 -08:00
Nicholas Ignoffo d80afb18f0 More progress 2017-01-01 21:43:34 -08:00
Nicholas Ignoffo 00d6f8eb46 Initial stab at 1.11
About halfway.
2016-12-12 19:56:37 -08:00
Nicholas Ignoffo ce52aea512 Recipes for Blood Tank 2016-12-12 00:33:25 -08:00
Nicholas Ignoffo b7e2730bcc Implement the new model for the Blood Tank
- Texture needs some tinkering. Will bother @InsomniaKitten about it
- Minor cleanup and improvements
2016-12-11 23:54:03 -08:00
Arcaratus aac2623440 Implement a functioning Blood Tank (#969)
Added a search bar to the Upgrade Tomes Creative Tab
Updated some Altar fluid code (remove deprecated stuff)
Moved Rendering classes into appropriate package
Fix the localization errors on the Demon Crystals
A few cleanups here and there
2016-12-11 17:28:47 -08:00
WayofTime d1f4e95a7e Added deprecated methods for easier updating - Oops! 2016-12-07 08:14:05 -05:00
WayofTime 99f9d06659 - Fixed Phantom Bridge sigil glitch when travelling between dimensions and teleporting large distances. 2016-12-06 11:53:47 -05:00
WayofTime 89bd91197d Fixed silly dupe bug with the Zephyr ritual. (#988) 2016-11-29 22:06:43 -05:00
WayofTime efb3077fdf Fixed Ritual of Regeneration's text (#987) 2016-11-27 20:33:13 -05:00
WayofTime 9e6c8d8a43 Final push for -67. 2016-11-27 11:32:07 -05:00
WayofTime 1ad2fc0ae4 Added some placeholder recipes for the Living Armour Downgrades - they will eventually change. 2016-11-23 18:46:18 -05:00
WayofTime 82f04d4b6c Updated the book so it contains most of the rituals. 2016-11-20 10:32:13 -05:00
WayofTime a04c8af550 Did some minor bug fixes and updates with some rituals. 2016-11-19 17:06:11 -05:00
Sokratis Fotkatzikis 841eb2a1df Create bg_BG.lang (#765)
* Create bg_BG.lang

done until L23
--------------------

* Update bg_BG.lang

DONE #L43 - #L48 ; #L66 - #L92
~~~~~~~~~~~~~~~~~~~~~~~~
TODO #L25 - #L41 ; #l50- #L64

* More Translation

Still not doe *Will finish it tomorrow* (Ping me at discord if I forget :P)

* here you go
2016-11-16 14:40:11 -08:00
Nicholas Ignoffo 104fb855b4 Run the guide images through a PNG compressor
Drops the jar size by quite a bit
2016-11-13 15:24:10 -08:00
Nicholas Ignoffo bd6b181a1b Wrong @Nullable annotation 2016-11-12 11:52:38 -08:00
Nicholas Ignoffo b0007a1d36 Re-add FakePlayer check to sigils (#970)
whar did dey go?
2016-11-11 16:57:50 -08:00
Nicholas Ignoffo 1f31268669 Fix Mimic render ignoring meta (#965)
Also re-implements Waila handler correctly
2016-11-11 16:50:44 -08:00
WayofTime 3956c9f7dd Setup the .json of the Demon Will to use the new aspected textures. 2016-11-11 17:29:05 -05:00
Yulife d46a5e16ae souls 2016-11-11 23:04:46 +01:00
WayofTime fb38c2e8b8 Snares can no longer hit the thrower of the snare within 20 ticks of throwing it (#745)
Added the "Diseased" upgrade, which vastly decreases healing potency.
2016-11-11 10:42:56 -05:00
WayofTime 33b799723c Made it so you can view the recipes for downgrades in JEI. 2016-11-10 10:39:19 -05:00
WayofTime 1f6c4b47e2 Fixed a crash with the Ritual Diviner when attempting to replace certain blocks. (#967) 2016-11-08 06:54:39 -05:00
WayofTime 97907367a1 Made a ritual augment that makes the Ritual of Regeneration steal health from mobs to heal the player. Also tinkered with having the ritual give absorption hearts (at a slow rate) 2016-11-06 21:49:48 -05:00
WayofTime 0419800a86 Finished most of the Augments for the Ritual of the Shepherd. 2016-11-06 17:03:10 -05:00
WayofTime d1e6076cca Added some more meteors - one that uses a gold block, another that uses a diamond block. 2016-11-05 19:29:03 -04:00
WayofTime faef980e59 - Made it so peaceful animals provide more LP by default (to encourage creating your own farm).
- Increased the effectiveness of animals for the Gathering of the Forsaken Souls ritual by a factor of 4.
- Added the framework for the Purification Altar.
2016-11-05 11:14:56 -04:00
WayofTime da4de55c2e Finished the Augments for the Ritual of the Crusher. 2016-11-03 10:52:14 -04:00
WayofTime 655c2880dc Made the aspected Sentient Tools drop their corresponding Will type on killing enemies. #753 2016-11-02 12:16:24 -04:00
Nicholas Ignoffo 6c4fe34152 Fix Waila altar progress percent (#796)
After rewriting half of Waila, I understand how these things should be done, now
2016-10-31 00:07:59 -07:00
WayofTime 3feb19a22d - Finished the Augments for the Ritual of the Feathered Knife.
- Changed the Ritual of the Feathered Knife so it respects the Tough Palms Living Armour Upgrade.
- Fixed the Ritual of the Feathered Knife so that its health threshold is percent-based.
2016-10-30 17:45:40 -04:00
WayofTime a2317a3a8a Minor code laying out a new sigil. No functionality currently. 2016-10-25 17:02:33 -04:00
WayofTime 5743d9f475 Finished the Augments for the Serenade of the Nether. 2016-10-24 21:23:45 -04:00
WayofTime 77b5f898ca Made the Blood Altar respect the new capability system for fluid management. 2016-10-24 18:15:30 -04:00
WayofTime db33b87b1c Changed the Blood Altar to be more in-line with the rest of the blocks in the mod (credits to wiiv for the model) 2016-10-24 11:38:25 -04:00
WayofTime 8e39b6fb2a Expanded the max damage range of the Ritual of the Feathered Knife 2016-10-24 11:06:13 -04:00
WayofTime 6b27896859 Added more augmentations for the Lava Ritual. 2016-10-23 20:59:49 -04:00
WayofTime 731ba99fa3 Added the Destructive Will effect to the Ritual of the Green Grove. This ritual now is done~ 2016-10-23 18:57:24 -04:00
Nicholas Ignoffo 62f3847d88 Add missing wildcard check for altar recipes 2016-10-22 16:06:48 -07:00
WayofTime 5e1c791908 Added the pages for a few arrays. Also disabled the Ritual for the downgrades temporarily. Final commit for -66 2016-10-22 16:52:35 -04:00
WayofTime 44e1c47e1c Added an alchemy array, the Array of the Fast Miner 2016-10-22 16:11:30 -04:00
Nicholas Ignoffo 1a5d9d3e45 Fix occasional crash when looking at Mimic blocks with Waila installed (#949) 2016-10-18 17:05:06 -07:00
Nicholas Ignoffo 66974716ef Fix deserialization of EnumDemonWillType 2016-10-18 16:59:50 -07:00
Nicholas Ignoffo b1335f9e9a Fix inversion pillar inventory rendering 2016-10-18 16:59:09 -07:00
Nicholas Ignoffo 1aad7ee531 Cleanup enum container implementation 2016-10-18 16:38:56 -07:00
Nicholas Ignoffo 6a4c56293b Fix massive FPS drop when looking at a ritual with the tinkerer (#950)
Caused by a majorly unfinished feature I was working on long ago and forgot about :D
2016-10-18 16:28:27 -07:00
Nicholas Ignoffo d7b0abafd9 Fix NPE in mimic when loading some tiles (#951) 2016-10-18 16:12:39 -07:00
Nicholas Ignoffo 37fad3f349 Fix localization of /bm network get NAME (#955) 2016-10-18 16:09:22 -07:00
Nicholas Ignoffo f2931deec6 Fix loading of keybinds being at initial use (#922)
Binds correctly load from disk, now.
2016-10-18 16:05:37 -07:00
neconeco2 28f9c367b8 Update ja_JP.lang (#952) 2016-10-16 19:51:33 -07:00
WayofTime 59e10a782b Modified the Sigil of the Phantom Bridge so it better performs with speed modifications 2016-10-16 19:33:14 -04:00
WayofTime e3c55da214 - Added the entries for the Skeleton Turret Array and the Updraft Array
- Added the Bounce Array
2016-10-16 15:19:57 -04:00
WayofTime 5cb5ec4264 Changed most of the BlockString blocks to a BlockEnum in order to solve a loading issue with schematics. 2016-10-15 22:02:16 -04:00
Nicholas Ignoffo 3e0f3f5aa1 Rewrite base blocks to be less weird
Added base ItemBlock classes for each base type (to be used later)
2016-10-15 09:21:30 -07:00
WayofTime ea43fbce7d Added the Sigil of Elasticity, the Sigil of the Claw, and the Sigil of Winter's Breath. 2016-10-14 20:51:21 -04:00
WayofTime 0a1d66a1d9 Fixed the recipes for some of the Demon Will blocks 2016-10-13 22:08:28 -04:00
WayofTime 5ad3c0eda1 Added new potion effects for bouncing as well as clinging to walls - the sigils will come later (Hai, Yulife~) 2016-10-13 19:58:39 -04:00
WayofTime 2e192ff29c Attempted to add a new schematic, but for some reason the generated schematic is non-functional. (Divination Sigil is in testing mode)
Added some more stuff to the Downgrade ritual.
2016-10-10 10:57:29 -04:00
WayofTime f74f46ab4a Removed the stat trackers for the downgrades and prevented downgrades from combining with each other in an anvil. 2016-10-09 10:44:50 -04:00
WayofTime ed8427c04e Added the framework for a ritual that grants downgrades (instead of the potion method) 2016-10-08 21:23:16 -04:00
Nicholas Ignoffo 43f86abc58 Fix guide recipe for Lesser Gem (#946) 2016-10-08 16:52:20 -07:00
Nicholas Ignoffo 6be0af947a Mimic blocks containing altar components work with altar (#945)
This only provides minimal support. So your Blood Runes won't provide their effects. They are a *mimic*, after all.
2016-10-08 16:47:04 -07:00
WayofTime 2b11aeaad7 I missed a few files... 2016-10-05 17:00:46 -04:00
WayofTime b5f7344ca6 Added a Dig Slowdown armour downgrade called "Weakened Pick", trained by having weakness on while mining. Also expanded Dwarven Might so that it can get to level 10. 2016-10-05 16:38:58 -04:00
WayofTime f9b1b91c6d Modified the Dwarven Might skill to better change the mining speed when mining. 2016-10-05 16:06:52 -04:00
WayofTime 16a4857dfb Added a Repairing Living Armour Upgrade (trained by damaging the chestplate of the Living Armour while you have a full set on - it repairs all of your armour pieces over time)
Added the stat trackers for various Living Armour Downgrades.
2016-10-04 17:10:27 -04:00
WayofTime 6ea17510b7 - Added a potion effect called "(-) Immunity", which allows the training of Living Armour Downgrades. This potion is crafted using a Draft of Angelus with a potion flask. Check the uses of the flask!
- Added some more framework for the Living Armour Downgrades.
- Modified the Grim Reaper's Sprint so it is better at later levels.
2016-10-02 15:03:31 -04:00
Joseph C. Sible e5276fba6f More Sigil of the Green Grove fixes and cleanup (#938)
When applying the bonemeal effect, apply it from the player using the sigil,
rather than from a fake player. (Looking at the commit history, this seems
to be this way solely because of overzealous copying and pasting from vanilla
ItemDye.) Also, play the effect for the use of bonemeal, rather than for
breaking a block. Finally, remove a parameter that's no longer necessary.
2016-10-01 13:18:48 -07:00
Joseph C. Sible 59704162a6 Fix Sigil of the Green Grove disappearing on modded crops (#937)
Currently, the Sigil of the Green Grove uses ForgeEventFactory.onApplyBonemeal
for its effects, which gives the right answer for all crops, but for modded
crops, it has the side effect of removing one item from the current stack
(since it's intended for actual bonemeal). That's not desired in this case,
since the sigil isn't supposed to get used up, so this change directly makes
and fires the event itself. This problem was originally reported in
josephcsible/ExpandedBonemeal#1.
2016-10-01 10:35:34 -07:00
ImmortalPharaoh7 55bc3ead7f Update fr_FR.lang (#766)
* Update fr_FR.lang

* Update fr_FR.lang

* Update fr_FR.lang

* Update fr_FR.lang

* Update fr_FR.lang

* Update fr_FR.lang

* Update fr_FR.lang

* Update fr_FR.lang

* Update fr_FR.lang

* Update fr_FR.lang

* Update fr_FR.lang

* Update fr_FR.lang

* Update fr_FR.lang
2016-10-01 07:20:30 -04:00
WayofTime 81257e1263 Merge branch '1.9' of https://github.com/WayofTime/BloodMagic into 1.9 2016-09-30 16:50:17 -04:00
WayofTime d1a7a77034 Made it so that when you acquire a Living Armour Upgrade from a Tome, it raises the corresponding Stat Tracker up to that upgrade level. 2016-09-30 16:49:56 -04:00
Nicholas Ignoffo 418dcd095a DoS should not affect boss mobs (#932) 2016-09-29 18:44:38 -07:00
WayofTime 7a42968633 Fixed NPE when attacking mobs when you don't have a set of Living Armour. Oops. Fixes #934 2016-09-29 19:53:28 -04:00
WayofTime 006cbeaa83 Changed the Quick Feet upgrade and the speed boost sigil so that their speeds are applied when strafing and walking backwards as well.
Added the Disoriented Downgrade. Muahaha
2016-09-29 16:37:41 -04:00
WayofTime 1a510c694c Finished the Dulled Blade downgrade 2016-09-27 21:10:09 -04:00
WayofTime 8d2ea249ac Added the Quenched Living Armour Downgrade. 2016-09-27 17:15:24 -04:00
WayofTime 82a73ba0cd Experimented with loosening traction with an Armour Upgrade (Forward works, strafing fails) 2016-09-26 06:49:44 -04:00
mezz a1eb8aad56 Fix JEI Altar recipe (#933) 2016-09-26 00:17:20 -07:00
WayofTime f9185817a1 Added another proper Armour Downgrade: Battle Hunger. More to follow. 2016-09-25 19:08:06 -04:00
Nicholas Ignoffo 9112f5ae04 Add redundant name of redundancy (#930) 2016-09-22 16:35:31 -07:00
WayofTime 22ffed51b9 Fixed 1.9 support 2016-09-22 19:30:07 -04:00
WayofTime e9517194f9 Fixed the Sigil of Translocation so that it does not crash when picking up certain blocks. Also removed the damned lightning. #918 2016-09-22 15:37:11 -04:00
WayofTime 7d91cc40ff Added the entries for the Rune of Augmented Capacity, Charging Rune, and Rune of Acceleration 2016-09-22 15:08:42 -04:00
WayofTime ca96afa375 - Changed the recipe of the Acceleration rune so that it is a T4 rune.
- Added the Charging rune, which accumulates charge by using the LP from the Blood Altar (1 charge = 1 LP always). If enough charge is stored when crafting, the crafting occurs instantly.
2016-09-22 14:20:05 -04:00
WayofTime dade5f0837 Fixed the symmetry issues of the Ritual of Containment 2016-09-21 07:37:48 -04:00
WayofTime 9538e9aa0d Added a corrupted chicken, which hits very hard but stealths itself in between attacks. 2016-09-20 17:28:58 -04:00
Nicholas Ignoffo 6f5e96bd52 Add current ritual to diviner highlight tip (#926) 2016-09-18 18:17:10 -07:00
WayofTime d6c1d59e5d Updated the hp/damage/etc logic of the corrupted mobs in general, and made it so the sheep will cast resistance on hurt allies when nearby on a cooldown.
Added an alchemy array layer (WIP) for the sheep when it is casting a "spell".
2016-09-18 18:44:18 -04:00
Nicholas Ignoffo cbd2609fe2 Blacklist armor stands from WoS 2016-09-18 14:51:54 -07:00
Nicholas Ignoffo 908c638bb2 Ritual diviner will now ignore replaceable blocks (#923)
Tall grass and stuff
2016-09-18 10:50:34 -07:00
WayofTime f7ff728c0d Added a corruption handler so that blocks can be corrupted by a wide variety of processes. 2016-09-18 10:07:02 -04:00
qianzha e12b1a7042 Update zh_CN.lang (#921) 2016-09-17 10:18:09 -04:00
WayofTime 7b55293a40 Added the initial body of the Corrupted sheep, as well as the rendering. Moved most of the aspected demon stuff to a new base class. 2016-09-17 08:06:31 -04:00
WayofTime f900fef846 Removed the darn testing code from the Divination Sigil. >.> 2016-09-16 14:54:43 -04:00
WayofTime c4b879eaa6 Updated the changelog and removed the test outputs. This is all that's needed for -62. (Mainly testing the compilation?) 2016-09-16 14:45:07 -04:00
WayofTime 21607213d4 Added some test System.out outputs to test the ritual (local compilation was successful). 2016-09-16 14:33:44 -04:00
WayofTime e541ed67e9 Fixed the Sentient Specters, stopping them dropping null items if they have nothing in their hand (only happens due to spawners). Solves #920 2016-09-16 14:11:52 -04:00
WayofTime f0a5b5274f Added a temporary texture overlay (borrowed from the Faithful 32x texture pack, until a unique one is made) for the corrupted zombie. Generalized enough so that new mobs can have them added easily. 2016-09-15 17:07:06 -04:00
Nicholas Ignoffo 80af2463b3 Temporary fix for obtaining bedrock in Survival (#919)
This stops the mimic from being placed inside of any block marked as unbreakable. This should be expanded to a blacklist when I'm not late for work.
2016-09-15 06:54:00 -07:00
WayofTime a0b92c0c2f Finished up the Inversion Pillar animation rendering. 2016-09-14 10:07:53 -04:00
WayofTime dab6e0842b Initial (unsuccessful) tests of the Inversion Pillar animations. 2016-09-14 08:47:46 -04:00
WayofTime f40f5abc0d Decreased the overall Will costs and numbers of the Inversion Pillar - Will per block is down from 2.5 to 0.5, and the Will generated was also divided by 5. Also minor adjustments to the spreading logic. 2016-09-13 22:02:13 -04:00
Nicholas Ignoffo d1f98be462 Fix server crash with holding sigil keybind (#915)
@Arcaratus, poking because this will break BA again. I separated things into new classes.
2016-09-13 16:09:45 -07:00
WayofTime e9549fd9db Did a lot of work on the behaviour of the Inversion Pillar. Also added a Corrupted Zombie for later testing. 2016-09-13 17:20:35 -04:00
Nicholas Ignoffo d1455920ec Rewrite Meteor system to be fully json (#914)
Also cleans up some other JSON stuff
2016-09-12 19:54:46 -07:00
WayofTime 0bb2fa6002 Removed unwanted System.out lines when clicking on the slots in the routing node 2016-09-12 19:04:53 -04:00
Nicholas Ignoffo ccacb0acfc Fix routing node serialization (#913) 2016-09-12 16:01:47 -07:00
WayofTime 8375daf7d4 Cleaned up the "proximity" algorithm for the Pillars, allowing quick access to the nearby pillars. Hopefully will allow better scaling of computation for large networks of pillars. 2016-09-11 19:51:42 -04:00
WayofTime 1e77b16bd7 Yeah. 2016-09-11 17:58:54 -04:00
WayofTime 3e71ac3496 - Merged the three brick variants into one.
- Added the Inversion Pillar models and caps
2016-09-11 15:45:54 -04:00
Yulife cfa6979056 Dungeon blocks 2016-09-11 16:13:09 +02:00
WayofTime 5c627d123c Initial push of the Inversion Pillars - this is before full implementation of features and before fixing the item model. 2016-09-11 10:02:06 -04:00
Yulife 540e6941ef Incense Pillar 2016-09-11 14:22:53 +02:00
WayofTime aad1b541f8 Did some work on the Inversion Pillar 2016-09-10 20:15:17 -04:00
Nicholas Ignoffo 24b4c4b8d1 Made all item fields final 2016-09-10 17:04:24 -07:00
Nicholas Ignoffo 537ccc092c Made all block fields final 2016-09-10 16:13:20 -07:00
Nicholas Ignoffo f244f2c053 Remove the Pedestal
It's unused and probably won't ever be used.
2016-09-10 13:19:11 -07:00
WayofTime 4b54f6d94c Initial push of the Inversion Pillar before testing. 2016-09-10 16:13:05 -04:00
WayofTime abfc7b13b6 Fixed it so you can set the meta of the key stack for the meteors. 2016-09-09 14:07:03 -04:00
WayofTime 4c79a4f2ff Configurified the Meteor Ritual - Modpacks and users can edit all of the major properties of the meteor ritual, including what items need to be dropped onto the ritual as well as what you get in the ritual, radius, etc. The config will refresh if there is a version change unless you set "resyncOnVersionChange" to false. 2016-09-09 12:28:23 -04:00
WayofTime 63febfeb85 Added Mimic entry to The Architect. 2016-09-08 19:20:14 -04:00
Nicholas Ignoffo 4190031710 Fix remaining cases of calling readFrom/writeTo NBT 2016-09-07 17:53:09 -07:00
Nicholas Ignoffo 9b51b28dbb Let's not write ourself and all our children to our own NBT recursively... 2016-09-07 17:49:28 -07:00
Nicholas Ignoffo 798bad5583 Clean up TE implementations
Offload some work to base classes that provide some helpers

TODO: Implementations for Inventories (using caps) and ticking tiles with inventories.
2016-09-07 17:46:06 -07:00
Nicholas Ignoffo 4d331aa758 Implement missing data syncing methods
Fix MRS not syncing data immediately.
2016-09-07 17:12:25 -07:00
Nicholas Ignoffo f4feb07e47 Waila should display if a ritual is deactivated 2016-09-07 16:58:45 -07:00
WayofTime 5451f1ff8d Made the costs scale properly for players and non-players 2016-09-07 19:44:28 -04:00
Nicholas Ignoffo 8f6bb85362 Fix Regen ritual so it affects non-player entities too (#906) 2016-09-07 16:40:12 -07:00
WayofTime 30cf11075b Added a temporary texture (finally) for the Inspectoris Scandalum 2016-09-07 17:05:05 -04:00
neconeco2 de3c7f2168 Update ja_JP.lang (#904)
* Update ja_JP.lang

* Update ja_JP.lang +
2016-09-06 22:12:02 -07:00
Nicholas Ignoffo 5ee2cb2a90 Do these look small to you? I didn't think so 2016-09-06 21:50:04 -07:00
Nicholas Ignoffo 8f48f3a2d0 Restore Java 6 compatibility
Removes a lot of needless TODO's
2016-09-06 19:06:07 -07:00
Nicholas Ignoffo 09b331fdbe Fix client having NBT that the server doesn't
This was reported months ago but I forgot because it was in the WRONG PLACE.
2016-09-06 18:55:32 -07:00
Nicholas Ignoffo 137975331c Fix specters spawning with /give (#885) 2016-09-06 18:38:52 -07:00
Nicholas Ignoffo 5989f37f59 Add node type name to GUI (#901) 2016-09-06 17:41:15 -07:00
Nicholas Ignoffo 7f24698651 Fix sacrifice range of altar (#905)
@Arcaratus, you swapped Y and Z when you copied this.
2016-09-06 17:27:45 -07:00
Nicholas Ignoffo aec841ef85 Restore 1.9.4 compatibility
Also includes cleanup of the stair class
2016-09-06 17:13:43 -07:00
WayofTime 2662114b7c Finished adding the recipes for all of the blocks (except the Demon Alloy) 2016-09-06 19:42:48 -04:00
WayofTime 976fa1981d Finished dungeon block localization of all current Dungeon Blocks. Finished implementing BlockStringStairs. Added the WAILA compat for the Stairs. 2016-09-06 16:53:52 -04:00
Nicholas Ignoffo 348664c3fe Fix Waila stack display for pillars 2016-09-05 15:04:02 -07:00
Nicholas Ignoffo 246eb7950c Add the rest of the walls 2016-09-05 14:59:24 -07:00
WayofTime 74196dd67b Finished Wall framework, including the fancy break particles. 2016-09-05 17:42:26 -04:00
Nicholas Ignoffo a62e377801 Walls render in inventory now
Includes a bit of cleanup and fixes pickblock on Pillars and Caps
2016-09-05 11:40:25 -07:00
WayofTime 78b035d0fd Started work on most of the framework for the BlockStringWall - commiting so TehNut can fix my mistakes in life 2016-09-05 13:11:07 -04:00
WayofTime afcba54df4 Finished adding all of the dungeon blocks and localized them. Added the appropriate models for rotated pillars/pillar caps. 2016-09-05 10:30:59 -04:00
neconeco2 b08c7fd7ae Update ja_JP.lang (#903) 2016-09-04 23:22:37 -07:00
WayofTime 10e9d046c3 Fixed the problem with the pillars not showing their proper textures \o\ /o/ \o/ 2016-09-04 21:54:25 -04:00
WayofTime f1b3d6f4bc Finished the pillar but rearranged the .json for testing 2016-09-04 21:25:32 -04:00
WayofTime 1286efbca7 Finished adding the standard blocks and localized them - pillars are next 2016-09-04 18:09:04 -04:00
WayofTime d52240813e Initial work on pillars - needs some serious bug fixing! 2016-09-04 16:20:10 -04:00
WayofTime bafbd0b076 Added more blocks for Yulife to bang his head against 2016-09-04 10:04:46 -04:00
WayofTime 4174be42b0 Added some Demon Will blocks for Yulife to peruse - more coming 2016-09-04 09:50:34 -04:00
Yulife 2c4aac9beb Folder 2016-09-04 10:42:21 +02:00
Yulife a40084ebbb Dungeon Blocks 2016-09-04 10:42:21 +02:00
WayofTime 0bc3824814 Added the Living Armour Upgrade, Nocturnal Prowess, which gives night vision in dark areas and increases damage while the area is dark 2016-09-03 11:17:36 -04:00
WayofTime 0a2074c110 More testing (successful!) with loot tables! 2016-09-02 11:52:16 -04:00
WayofTime 99a4ac4fb3 Added a test loot table for later testing. Also fixed a small issue in the Routing Node documentation. 2016-09-02 11:36:28 -04:00
Nicholas Ignoffo 59135f5142 Add support for Buttons
Currently just a "Fill network" button
2016-09-01 19:33:49 -07:00
Nicholas Ignoffo 58150ab075 Fix reading dungeon files (#899)
Now requires new rooms to be registered in `resources/assets/bloodmagic/schematics/Schematics.json`. This *can* be overwritten by a resource pack, so adding new rooms is still possible. Also allows sub-folders, so sorting rooms is now possible (sort by themes maybe?)
2016-08-31 20:32:31 -07:00
WayofTime 5a44ac53e0 Temporarily removed the dungeon stuff so that it doesn't crash. 2016-08-31 21:05:29 -04:00
WayofTime 8df391a2b7 Prepping a small bit before working on the Tether - final push before build -57. 2016-08-31 18:41:32 -04:00
WayofTime 4080a6add8 Satisfied @Vazkii 's BIZARRE OCD 2016-08-31 16:56:25 -04:00
WayofTime fd684588d4 Further improved the routing GUI by allowing an amount to be typed into the amount bar 2016-08-31 16:19:20 -04:00
WayofTime 4a21e6cbf0 Updated the toggleable sigils so they drain the user's LP based on the user's total ticks existed instead of the world time. This is to solve the doDaylightCycle glitch in this scenario.
Also further tweaked the Routing Node GUI
2016-08-31 11:45:25 -04:00
WayofTime 78c7a63190 Expanded the size of the Routing GUI and moved the buttons over to the right. Future movement is planned. 2016-08-31 08:30:35 -04:00
WayofTime 5b13be4965 Disabled the cobblestone ritual 2016-08-31 08:12:50 -04:00
WayofTime 3d372d18e3 Removed the Master Routing Node GUI. 2016-08-31 07:27:11 -04:00
WayofTime 3e7187610a Further un-stupified the routing GUI. 2016-08-31 07:26:22 -04:00
WayofTime 413b150142 Updated the Filtered Item Routing Nodes' GUI so that it behaved less like ass. Also added the necessary nbt porting code. 2016-08-30 21:12:40 -04:00
WayofTime 7d690ad598 Generalized the demon entity AI logic. Also improved the behaviour of the mimic entities. 2016-08-29 18:56:21 -04:00
qianzha 043c4cab6a Update zh_CN.lang (#893) 2016-08-27 22:48:49 -07:00
Nicholas Ignoffo 3a26dbb567 Move guide recipe registration to Mod mapping
The guide's index after loading a world may not be the same as the guide's index at preInit.

In the 1.10 version of GuideAPI, there is a `setMappingFunction(Function<Book, Void>)` method that will clean this up.
2016-08-26 19:03:43 -07:00
Nicholas Ignoffo ffeb0309a8 Fix Elytra upgrade causing server to think you're always flying (#780) 2016-08-26 18:10:33 -07:00
WayofTime 95983732b1 Fixed #792. 2016-08-26 20:57:32 -04:00
Nicholas Ignoffo 5240755a05 Rewrite keybinding system
@Arcaratus, I don't even know what you were thinking with that...

I'm still not happy with IKeybindable, but the system is at least better than it was
2016-08-26 15:56:32 -07:00
WayofTime 4c514224d5 SUPPOSEDLY fixed 1.9.4 compat again. >.> 2016-08-26 18:40:15 -04:00
WayofTime f998481329 Fixed 1.9.4 compat. 2016-08-26 18:14:04 -04:00
Nicholas Ignoffo 280340182d Fix Draft of Angelus not using Ore Dictionary (#890) 2016-08-26 15:10:45 -07:00
WayofTime b422e00019 Fixed SILLY rendering errors with the Mimic 2016-08-26 17:11:03 -04:00
WayofTime 215b337f71 Added peaceful-friendly settings for the Sentient Mimics 2016-08-26 17:01:34 -04:00
WayofTime fc6f99df75 Set it so that clicking on a mimic block that has a potion set to it on different sides will allow the person to set the player detection radius, potion spawn radius, and potion spawn intervals.
Also made it so that you can set the player detection of the sentient mimic blocks.
2016-08-26 15:53:58 -04:00
Nicholas Ignoffo 89ec81a78b Register and localize the keybinds
Forgot that
2016-08-25 23:43:17 -07:00
Nicholas Ignoffo da2120434d Keybind for Holding Sigil cycling
For those 3 weird people who don't have a scroll wheel in 2016.
2016-08-25 23:35:26 -07:00
WayofTime 166b629ccb Players in creative can add a potion to the mimic block, which causes them to drop potions from them... >:D Needs tweaking to be more configurable. 2016-08-25 21:07:09 -04:00
WayofTime 42d2c454f8 Changed the Demon Will Aura Gauge so it refreshes based on the player's ticks existed 2016-08-24 22:10:12 -04:00
WayofTime 8a94dd8acd Mimic entities will spawn when the player can see their block and they are within 5 blocks (mimics with inventories only spawn on interacting with them). 2016-08-24 17:06:24 -04:00
WayofTime 421aa77c02 Worked on mimic spawning and death - needs some adjustments 2016-08-23 19:41:05 -04:00
WayofTime 1adbe04ab8 Made it so that replaced chests from mimics keep their inventory and when broken will drop their inventory. 2016-08-23 17:53:33 -04:00
WayofTime 0420779e5e Added different types of mimic blocks and created their recipes 2016-08-23 17:35:43 -04:00
WayofTime ebd7b1f8da Updated mimics so that they store and display the meta for the block they want to mimic (using reflection). 2016-08-23 15:13:03 -04:00
WayofTime 117e692969 Made the mimics actually render chests and other TESRs properly - need to add non-opaque mimics for wider selection and for chests to not look like crud. 2016-08-22 19:55:15 -04:00
WayofTime 80bf140ee5 Made it so placed mimic blocks replace the block that you place it on unless you hold shift. Also worked on dungeon schematic saving/loading. 2016-08-22 14:22:18 -04:00
WayofTime 61b11a88bf Properly serialize and deserialize the Dungeon rooms 2016-08-21 13:17:04 -04:00
WayofTime 9b64e2a2f6 More tests with dungeon generation 2016-08-20 17:16:07 -04:00
WayofTime f734e93921 Testing the infrastructure and adding more things such as AreaDescriptor transforms and checking for overlaps. 2016-08-20 14:00:08 -04:00
WayofTime 7fefea3243 Fixed compatability issue in the Specter AI 2016-08-19 22:02:01 -04:00
WayofTime 51275f99b3 Added recipe for the Mimic block and updated the changelog for release. Also minor update to the particles that spawn from the specter when it heals. 2016-08-19 20:45:50 -04:00
WayofTime 0fe442d804 Prevented the Specter from despawning on Peaceful.
Changed the healing algorithm to make it more evil.
2016-08-18 16:31:30 -04:00
Nicholas Ignoffo aa31592ba7 Repairing items should not replenish flask uses (#883) 2016-08-18 05:49:17 -07:00
WayofTime fdc20b63c7 Fixed a funky issue where the Sound of the Cleansing Soul did not reset the upgrade points internally 2016-08-18 07:41:56 -04:00