lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
979 commits 12 branches 0 tags 44 MiB
Commit graph

288 commits

Author SHA1 Message Date
Vindex fa24ea4118 Eclipse and IDEA formatting settings and Prevent reformatting 
EnumAltarTier so that IDEA doesn't mess with it
 2016-01-01 10:12:14 +01:00
Nick a2e77adbff Fix LavaCrystal NPE 
When attempting to place an unbound Lava Crystal into a furnace, it would crash when looking for the bound player because... well... it was unbound... :D
 2016-01-01 01:06:56 -08:00
WayofTime 65d75313cb Now causes nausea when passive operations (such as rituals or the Lava Crystal). 
Added the Lava crystal model.
 2015-12-31 20:47:01 -05:00
WayofTime 6fb409f20f Fixed the Soul Network and made sure the majority of the items worked on it. 2015-12-31 20:10:57 -05:00
WayofTime 241c0b8dda Added the Ritual of the Feathered Knife 2015-12-31 19:11:58 -05:00
WayofTime 7eee77ffe1 Added Dusk and Dawn ritual diviners. Finished the majority of diviner logic. 2015-12-31 16:31:01 -05:00
WayofTime 9a610cc023 Implemented Well of Suffering. Tweaked AreaDescriptor slightly. 2015-12-31 16:01:47 -05:00
WayofTime e8d1ff4997 Reformatting with Vindex's magic 2015-12-31 13:50:38 -05:00
Vindex 17e814785e AreaDescriptor now returns unmodifiable collection 2015-12-31 18:11:19 +01:00
WayofTime 417114b6f0 Redefined the bounding for AreaDescriptor - it is now inclusive for the minimumOffset but is exclusive for the maximumOffset. 2015-12-31 11:25:24 -05:00
WayofTime 63da257260 Fixed AreaDescriptor and edited the Jumping ritual slightly. 2015-12-31 10:05:38 -05:00
WayofTime f56261e766 Merge pull request #527 from Arcaratus/1.8-Rewrite 
Jumping Ritual
 2015-12-31 09:32:53 -05:00
Arcaratus 23051088da Jumping Ritual 
Patch
 2015-12-31 09:06:58 -05:00
WayofTime a0546c6c27 Fixed improper import. 2015-12-31 08:59:10 -05:00
WayofTime d7a96c061d Added getNewCopy() to Ritual to allow tiles to hold their own copy of a Ritual. Created caching in AreaDescriptor for faster BlockPos access. 2015-12-31 08:01:39 -05:00
Arcaratus 2966f93260 New AreaDescriptor tryout 2015-12-30 20:22:39 -05:00
WayofTime 1d42ef50c3 Merge pull request #525 from Arcaratus/1.8-Rewrite 
Recipes commit
 2015-12-30 17:46:28 -05:00
Arcaratus 07097c00a9 Recipes commit 
Fix
 2015-12-30 17:26:40 -05:00
WayofTime 8b582bc0c4 Added better method for creating a range for a ritual. 2015-12-30 16:19:50 -05:00
WayofTime e48eedb874 Changed formatting to have bracing on a new line 2015-12-30 15:34:40 -05:00
WayofTime e5eddd6c45 Finished fixing issues in the rituals. Added an initial system for setting a boundary for an effect in a ritual. 2015-12-30 15:24:25 -05:00
WayofTime 27fa98b3cd Fixed improper import. 2015-12-30 12:29:19 -05:00
WayofTime 98ca2fbd16 Implemented the Ritual Diviner and added its recipe. Added unlocalized name to rituals. Removed a few unnecessary imports. 2015-12-30 11:34:04 -05:00
Nick c815960f5e Update for 1.8.9 
Update JEI for 1.8.9 as well.

Move recipe related stuff to ModRecipes class.
 2015-12-29 21:30:48 -08:00
Nick e16017bd56 JEI support for Binding/Alchemy Array recipes 
Needs pretty-fying
 2015-12-29 16:11:34 -08:00
WayofTime 7b69251713 Added shaped/shapeless orb recipes. 2015-12-29 18:30:36 -05:00
Nick fcc8f6153a Fix NPE when checking held item 2015-12-29 15:09:56 -08:00
WayofTime 46f3e7573e Added recipes for bound weapons. Created temporary recipe for the Binding Reagent. 2015-12-29 17:47:12 -05:00
Nick f09cf5d018 Fix javadoc compile errors 2015-12-29 13:37:54 -08:00
Nick 5774703c0d Ritual docs 2015-12-29 13:00:26 -08:00
Nick 1c8d6d6986 Allow rituals to specify an update time. Default is 20 2015-12-29 12:32:06 -08:00
Arcaratus aa0f7d81a0 Bound tools 
Fix errors

Fix

Fix

Patch

Patch
 2015-12-29 14:56:32 -05:00
WayofTime 6c6d8067bf Fixed the rituals. Thanks, AlgorithmX2! 2015-12-29 14:22:33 -05:00
WayofTime 16a6333c6f Added the Ritual for Water and did some rudimentary tests. Issue: MRS does not load properly on world load. 2015-12-29 13:41:03 -05:00
WayofTime 0e1173ef5d Added directionality to rituals. 2015-12-29 09:10:03 -05:00
WayofTime 971d4c4d1e Fixed the ritual system so that it would properly validate the ritual from the list. 
Used the activation crystal's owner's LP to activate the ritual.
Removed some unnecessary imports.
 2015-12-29 08:44:34 -05:00
Nick 24058d7350 Move SoulNetwork to UUID system 
*Should* work correctly. As for all major changes, needs to be
thoroughly tested.
 2015-12-28 20:13:11 -08:00
Nick 8edb8a45e6 Fix build crash on Javadoc 2015-12-28 19:40:16 -08:00
Nick e7f5a1addf Fix @Nullable import 
@WayofTime, you want `javax.annotation.Nullable`, not
 2015-12-28 19:10:53 -08:00
Arcaratus b96725fe98 More sigils 
Deleted weird file
 2015-12-28 19:22:04 -05:00
Nick 0ec0570d1a Fix altar builder on servers 2015-12-28 14:27:59 -08:00
Nick beb85cf154 Generify 2015-12-28 14:04:34 -08:00
Nick e6354fb483 String lookup for ItemComponent 2015-12-28 13:50:32 -08:00
Nick 42c7162f3f Fix server startup crash 2015-12-28 13:43:26 -08:00
WayofTime 9ce9c66fb9 Created the base items class, for items that are mainly just used in recipes. 
Created reagents to be used in array crafting and added the array recipes for the water, lava, void, green grove, fast miner, elemental affinity, sight and air sigils.
Fixed the textures for the Sight sigil and Fast Miner sigil.
 2015-12-28 15:59:35 -05:00
WayofTime 440e629e11 Finished the Binding array, including lightning. Need to add special EntityItem to prevent items burning. 2015-12-27 21:11:42 -05:00
Nick dd8832e18f Fix TileAlchemyArray registered name 2015-12-27 16:43:11 -08:00
Arcaratus 5dff08380d Basic sigils implementation 2015-12-27 19:38:12 -05:00
WayofTime ae85224003 Added a new circle for the binding array. 2015-12-27 15:44:56 -05:00
WayofTime 9640d95d6f Finished fancifying the rendering for the binding circle. 2015-12-26 21:13:05 -05:00
Nick e6a11c2e4f Add a JEI description to the Altar Maker 2015-12-26 17:08:58 -08:00
Nick d9bc1105d8 First attempt at AlchemyArrayCrafting JEI support 
Does not work currently due to broken map lookups.
 2015-12-26 16:50:22 -08:00
Nick 03847ad6d9 Committing the Ritual stuff 
Incomplete. Ritual detection/rotation needs to be implemented. Currently hardcoded to a test ritual
 2015-12-26 16:49:25 -08:00
WayofTime 9faae07131 Improved Alchemy circle animation for Binding ritual. 2015-12-26 17:18:31 -05:00
WayofTime db5ab41728 Fancified the mock binding alchemy array. Need to work on angle math so that the path speed along the path is constant, not the angle. 2015-12-26 14:40:51 -05:00
WayofTime d4ec4dec8e Created initial mock binding ritual with the Alchemy arrays. 2015-12-26 10:32:53 -05:00
WayofTime e918b5692c Fix #514 2015-12-24 20:28:39 -05:00
WayofTime 3a59866475 Added a rotation effect to the array when it is "crafting" the item. 2015-12-23 22:30:13 -05:00
WayofTime c54aa5d00e Finished the infrastructure for Alchemy Array crafting. Updated some Utils so that they work more generally. Added the ability for a delay to be present for effects. 2015-12-23 20:19:06 -05:00
WayofTime 63c3853776 Generated the initial infrastructure for Alchemy Array effects, which includes crafting. Needs to be hooked into by TileAlchemyArray. 2015-12-23 18:45:47 -05:00
WayofTime 073830a785 Created initial AlchemyArray block which will be used in crafting. SightSigil array is used for testing purposes for rendering. Packets and changing the shown image need to be completed. 2015-12-23 15:20:26 -05:00
Nick cce3d6b79a Simpler way of obtaining items via API 2015-12-23 09:42:52 -08:00
Nick 61b2b293ba Clean up some logging + protect against negative values in Altar Recipes 2015-12-23 09:41:59 -08:00
Nick 43f2bdd28a Update JEI compat 
Should need less of these in the future. The API is becoming much more stable.
 2015-12-23 01:23:52 -08:00
WayofTime 4e063e24a0 Removed latent System.out and reformatted to an inferior format. 2015-12-22 21:05:47 -05:00
WayofTime f1a3c5ee46 Fixed Orb filling and added the Weak Blood Orb as a fillable orb. 2015-12-22 21:03:00 -05:00
WayofTime 4145b2a11c Performed initial cleaning to BloodAltar/TileAltar and migrated all logic from the Tile to the BloodAltar class. 2015-12-22 20:32:25 -05:00
TehNut 0f26cbedd7 Update JEI compat to latest 2015-12-14 01:07:22 -06:00
Nick d51a908f6b Update JEI compat 2015-12-03 17:12:50 -08:00
WayofTime eaa6226861 Mostly finished the LivingArmour framework, which includes the upgrades and stat trackers. 2015-12-03 10:18:05 -05:00
Nick 13d9cb4b5a Add registry for Binding rituals and add JEI support 2015-12-02 19:27:28 -08:00
WayofTime a3b12cb7e2 Created framework for LivingArmour and the handling. Upgrade handling is not done. 2015-12-02 21:30:54 -05:00
Nick 42d6c4b59b Whoops, forgot EtherealSlates 2015-12-02 16:28:07 -08:00
Nick 96d94721c4 Revamp altar to only use EnumAltarComponent 
- Removes internal references in API
- Makes full use of the idea of the API
- No more special checks
 2015-12-02 16:02:18 -08:00
Nick 6db9b51350 Altar now resets capacity correctly 2015-12-02 15:07:36 -08:00
Nick 72d4c5e135 Config for ICompatibility 2015-12-02 13:28:50 -08:00
Nick 349efbd510 Move PotionArray size to Constants 2015-12-02 01:43:51 -08:00
Nick f35cef51bb Update JEI compat 2015-12-02 00:55:52 -08:00
Nick 7dd170e5ad Inscription Tools and Slates 2015-12-02 00:55:32 -08:00
Nick 437dc1b96e Tweaks to damage. It now uses the DamageSource correctly 2015-12-01 23:35:09 -08:00
Nick 305b5e165f Stop referencing deprecated method 2015-12-01 22:58:01 -08:00
Nick 26e3888004 Remove reference to sun.misc.Launcher 2015-12-01 21:59:07 -08:00
Nick b97f7d81c4 Docs for NetworkHelper 2015-12-01 21:55:56 -08:00
Nick c4e6f63ada Cleanup javadoc and make it compile correctly 2015-12-01 21:14:26 -08:00
Nick 427fb25424 Remove event registration with deprecated FML bus 2015-11-30 21:48:19 -08:00
Nick 3200683b74 Wrong Nullable import 2015-11-29 17:38:15 -08:00
Nick ff055a33da Some cleanup 
Changed AltarMaker chat anti-spam.
Fixed formatting for AltarMaker messages
 2015-11-29 17:12:44 -08:00
Arcaratus 225016e030 Finished the Altar 2015-11-29 19:04:50 -05:00
Nick c086c23915 Fix TileEntities not ticking 2015-11-29 10:49:13 -08:00
Nick 44a5063f0b Sigils descriptions now correctly support formatting 2015-11-29 00:00:46 -08:00
Nick 91f88b846f Add support for JustEnoughItems 
Will build on as we add more recipe types.
 2015-11-28 23:52:06 -08:00
Nick 6f96e200d2 Update to 1.8.8. It's stable enough, now 2015-11-28 23:51:41 -08:00
Nick 34dee6447b A whole lot of formatting cleanup 
Also changes NBTHolder to a standard Constants class with subclasses for each category
 2015-11-28 18:25:46 -08:00
Arcaratus 08e7844df1 Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite 2015-11-27 20:15:47 -05:00
Arcaratus a6d329cf98 Altar works 2015-11-27 20:15:19 -05:00
Nick cbd4f8c75f First pass on Pedestal/Plinth 
I just want this out of my uncommitted file list...
 2015-11-22 14:03:51 -08:00
Nick a12c72092a TileAltar now uses new SN methods 2015-11-22 14:02:56 -08:00
Nick e0b073b8b7 Cleanup the SoulNetwork a bit. 
Should work now?
 2015-11-22 13:43:15 -08:00
Nick 352c6b9e5f Remove the untested caps 
They NPE :D
 2015-11-21 10:36:02 -08:00
Nick 066d3a3f1b Temporarily cap to 16 per meta 
Will work on implementing automatic overflow handling (Creating a new block when all the meta is taken up)
 2015-11-17 16:30:08 -08:00
Nick 9035f800e2 Easier handling of meta blocks 2015-11-17 15:52:31 -08:00
Nick fb94914b91 Abstract altar inventory handling for usage elsewhere 2015-11-12 13:05:23 -08:00
Nick 9a6d8d6d60 Blood Letter's Pack + Coat of Arms 2015-11-11 10:45:46 -08:00
Nick 4b7ad55016 Fix TileAltar NBT saving 
@Arcaratus, why did you rmove that?
 2015-11-11 10:35:44 -08:00
WayofTime 94fbedd39e Created ItemLivingArmour as a replacement for the Bound armour. Initial implementation completed. 2015-11-08 17:42:02 -05:00
Arcaratus 258e9a1108 Remove unnecessary ISigil implements 2015-11-07 21:45:03 -05:00
Arcaratus 0788bbd3b2 Remove unnecessary ISigil implements 2015-11-07 21:44:44 -05:00
Arcaratus 86fcd4808b Finished Water, Lava, and Void sigils 
Also added in bloodstone
 2015-11-07 21:37:12 -05:00
Nick Ignoffo 5ec35fcd08 Merge pull request #494 from Arcaratus/1.8-Rewrite 
Sacrificial commit
 2015-11-07 09:09:42 -08:00
Nick e9cbcd4bfb Merge remote-tracking branch 'origin/1.8-Rewrite' into 1.8-Rewrite 2015-11-07 09:08:02 -08:00
Arcaratus 806f291d02 Fix spelling of 'incense' 2015-11-07 11:54:36 -05:00
Arcaratus 2fc34a5138 Sacrificial Commit 2015-11-07 11:51:41 -05:00
WayofTime bf912ae03f Created the BlockRitualStone and had it implement IRitualStone. Created .json files necessary 
Created PropertyRuneType.
 2015-11-06 21:41:15 -05:00
WayofTime 8f623de469 Created test block which is coupled to the Default Spell Modifier .json model. The model has three submodels: the core, the output, and the input. 2015-11-06 17:26:38 -05:00
Nick b419e9aae9 The last of the Imperfect Rituals + Tile handles lightning 2015-11-05 19:58:43 -08:00
Nick 6fc22c170e Lombokify 2015-11-03 10:44:08 -08:00
Nick 798d4b926c Use a wrapper instead of ItemStacks for Altar recipes 2015-11-03 10:00:40 -08:00
Nick e12c78877e Fix recipe by stack lookup 2015-11-03 09:47:38 -08:00
Nick ddcc1237e8 Inventories now don't NPE when broken 2015-11-03 09:11:39 -08:00
Nick 6a5f5356ce Fix inventory tiles not saving inventory 2015-11-03 08:42:38 -08:00
Nick bd564ee7cf Should fix altar crashing 2015-11-03 08:31:34 -08:00
Nick b1e8930c11 Rain imperfect ritual 2015-11-03 08:15:24 -08:00
Nick fa1bb906d3 Cleanup 2015-11-03 08:09:16 -08:00
Nick Ignoffo 081698c6f9 Merge pull request #490 from Arcaratus/1.8-Rewrite 
Finished the Altar
 2015-11-03 07:35:50 -08:00
Nick 68fae8c321 Fix Ritual Registry crashing with more than one registered.. 2015-11-03 07:35:14 -08:00
Arcaratus ab60e5f3fe Finished the Altar 2015-11-03 10:34:11 -05:00
Nick ed515f5c80 Air Sigil 2015-11-02 19:57:48 -08:00
Nick ac5402df6b Cleanup 
Renders for Runes
Creative crystal renders
Formatting
Lang additions
Some attempted (not successful) fixes for SoulNetwork
 2015-11-02 19:18:53 -08:00
Arcaratus 4734f1207a Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite 
Conflicts:
	src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java
 2015-11-02 21:35:23 -05:00
Arcaratus 75143520ed Pre-emptive things 2015-11-02 21:30:28 -05:00
Nick d285736ca9 Imperfect ritual system hopefully works correctly now 2015-11-02 18:00:48 -08:00
Nick 92bf7cc35b Imperfect rituals work mostly now 
Just need to figure out an issue with the config
 2015-11-02 17:45:11 -08:00
Nick 3a0dcae59a Fix startup possible crash issues 
how did i never notice this?
 2015-11-02 17:24:43 -08:00
Nick b59bc9766e Fix BlockRitualController's ItemBlock name 2015-11-02 15:55:17 -08:00
Nick 72041e936a Altar renders now 2015-11-02 15:28:33 -08:00
Nick 5985be1cd0 Fix RitualController not rendering 2015-11-02 13:20:29 -08:00
Nick 1d52cb5e67 Remove Unnecessary methods from RitualHelper 
Activation, updates, and stopping should all be handled within the tiles.
 2015-11-02 12:49:53 -08:00
Nick 096ba02450 Refactor everything to WayofTime.bloodmagic.* 2015-11-02 12:39:47 -08:00