Commit Graph
172 Commits
Author SHA1 Message Date
Vincent Lee 77a2fa15fe Remove all thaumcraft stuff. F. 2020-07-08 22:04:48 -05:00
Vincent Lee b631775c32 Remove floral powders in favor of the generic vanilla dyes 2020-07-05 18:04:50 -05:00
Vincent Lee 3eaf807132 Fix all remaining non-worldgen compile errors 2020-06-28 15:47:31 -05:00
Vincent Lee 2fc16d628d More work 2020-06-26 11:27:05 -05:00
Hubry fdfc715cef Fix up formatting after objectholder pr 2020-06-25 00:34:42 +02:00
MoriyaShiine 94841df9aa de-objectholder blocks (#3336) 2020-06-24 16:12:41 -05:00
Hubry 6d36357bce Formatting: newline after field annotation, align javadoc tags per type 2020-06-23 19:21:55 +02:00
MoriyaShiine 79658cabb7 de-objectholder items (#3334)
* de-objectholder tiles

* thank you willie very cool

* a world of nightmares never seen before
2020-06-23 12:05:06 -05:00
Vincent Lee 5899036f44 De-objectholderify particles and containers 2020-06-22 18:35:54 -05:00
Vincent Lee f05ca91f09 Remove nearly all usages of getRegistryName, replacing with vanilla method 2020-06-22 18:09:10 -05:00
Vincent Lee daa1201e7f Interchange arguments to ModBlocks.register to match the vanilla signature, for future portability 2020-06-22 17:33:36 -05:00
Vincent Lee 7e676f081f Move all eventbussubscribers to explicit addListener calls for future portability purposes. Optimize imports. 2020-06-22 17:01:26 -05:00
Hubry 66388ac52d Replace forge nbt ingredient with ours, tweak base laputa shard recipe
The problem with the Forge NBT ingredient is that it strictly matches
the stack tags. If you rename an item, or add other data, it won't work.
This replacement works with any additional tags added onto the item,
and optionally can match stacks without any data at all.
The last part is used mostly as an upgrade option for people who crafted
laputa shards and got one without NBT - new ones will gain the proper
data anyways.

Closes #3234
2020-04-15 22:59:43 +02:00
Hubry 2152473edb Run Spotless, cleanup unused imports, add braces to one line for/if/etc. 2020-03-07 22:39:15 +01:00
Vincent Lee a6cf5653dc Merge 1.14 2020-02-20 21:00:55 -06:00
Hubry 337f9fe322 Add workaround crafting recipe for Botania banner patterns, rerun data
Closes #3114
I was planning to do this for a while, and accidentally added the empty
class for the recipe with the recipe generator...
2020-02-18 17:57:33 +01:00
Vincent Lee 9c23ff9257 Use forge's getHighlightTip for wand instead of rendering mode line ourselves 2020-02-14 20:24:02 -06:00
Vincent Lee 31de0d6dd1 Merge branch 'master' of github.com:Vazkii/Botania into 1.15 2020-01-31 13:14:42 -06:00
Hubry 12e67ab394 Replace 256 wand of the forest recipe jsons with one custom recipe type
Prevents flooding JEI with tons of irrelevant recipes, and recipe book
buttons going offscreen if you look at all the variants of the wand.
Side effect is not showing the colored wands in JEI/Patchouli, but
that's fine.
2020-01-30 19:02:41 +01:00
Vincent Lee d66058f661 Merge 1.14 2020-01-29 13:36:27 -06:00
ToMe25 ea30c6aa4a Add a recipe for the Haert of the Sea (#3157)
* Add a recipe for the Haert of the Sea

Add the infused nautilus shell as a crafting item for the heart of the sea

* change the recipe for the Heart of the See to use

a Mana Pearl instead of one of the Manasteel ingots

* Remove the Infused Nautilus Shell and added an Alchemy Recipe for the Heart of the Sea.

* Change the mana cost for the heart of the sea to 20k

as blazepowder to mana suggested

* Make heart of the sea recipe gog only

* fix the lexicon entries getting in the wrong directory
2020-01-27 11:36:00 -06:00
Vincent Lee 09352e7285 Snipe some todos, delete ItemMod class 2020-01-18 14:56:20 -06:00
Vincent Lee cf54cc2b13 More work, fix gaia head tesrFix gaia head tesr 2020-01-15 15:58:23 -06:00
ToMe25 e9c0bfb57e Redo #3087 without the Terra Harvester itself (#3130)
* Basically redo the Add Terra Harvester PR without the Terra Harvester itself

* Fix some stuff the merging somehow messed up
2020-01-08 13:58:23 -06:00
Vincent Lee ca495d6d5c Fix brews not returning the container after finishing them, fix vials looking like flasks when partially full 2020-01-05 19:31:17 -06:00
Vincent Lee 3d7dc85f5d Fix mana mirror counting as a tool 2019-12-30 16:40:35 -06:00
Vincent Lee 3e8f508bf2 Delete unneeded greater magnet ring class 2019-11-25 18:31:24 -06:00
Vincent Lee cd435822d7 Fix gaia head rendering on players, additionally now renders correctly on mobs that can wear skulls 2019-11-06 16:14:21 -06:00
Vincent Lee a158215fb0 More cleanups, optimize imports 2019-10-31 10:51:48 -05:00
Vincent Lee 4fac487589 Remove open and share commands and their corresponding vestiges from lexicon files, remove word counter 2019-10-18 14:31:29 -05:00
Vincent Lee 7ffdc27c49 Fix a ton of side safety issues 2019-10-18 11:48:08 -05:00
Hubry 99eb08a303 Convert items to objectholder, fix some i18n and missed recipes 2019-07-05 19:40:46 +02:00
Vincent Lee 27ec1e58fc Below 300 errors 2019-06-30 13:34:45 -07:00
Vincent Lee 207a66b121 more random fixes 2019-06-25 21:04:36 -07:00
Vincent Lee 7ef12b61d8 update gradle, apply migration mappings, start fixing stuff 2019-06-08 01:07:26 -07:00
Vincent Lee b80f998688 Crash fixes, fix more blocks 2019-03-21 23:43:16 -05:00
Vincent Lee 7c4797177d Tons of fixes to try to get things to load 2019-03-21 14:45:33 -05:00
Vincent Lee 9825900fe5 Fully compiling, but probably doesn't run yet 2019-03-20 23:58:24 -05:00
Vincent Lee ea50b40229 More work 2019-03-17 21:25:20 -05:00
Vincent Lee d0878c731b more cleaning 2019-03-14 00:54:29 -05:00
Vincent Lee d6bd0c021b Oredict/tag cleanup 2019-03-12 19:28:17 -05:00
Vincent Lee 3a8be04fa7 more cleaning, fix commands and delete download command 2019-03-12 18:38:56 -05:00
Vincent Lee 324369c7a6 'fix' teisrs 2019-03-07 01:09:42 -06:00
Vincent Lee 364cf37747 Minor fixes and cleanings 2019-03-01 13:40:36 -06:00
Vincent Lee 95fc132f9f Another pass through items/entities 2019-02-28 23:05:19 -06:00
Vincent Lee e1890a7aab Fix main itemblocks 2019-02-27 02:04:40 -06:00
Vincent Lee 5cc374eaaf A bunch of decorative blocks 2019-02-27 00:18:58 -06:00
Vincent Lee e7d0315ce3 lots more items 2019-02-23 23:02:01 -06:00
Vincent Lee cb2b082ef1 Armor and some other items 2019-02-21 01:42:44 -06:00
Vincent Lee 548898275e Lots of work on tools 2019-02-21 01:04:23 -06:00