Commit graph

843 commits

Author SHA1 Message Date
Ellpeck
b2372d4231 Adapt code to resource rename 2016-11-16 21:56:47 +01:00
Ellpeck
36c176dd2e Cleanup and some more validation checks ~ 2016-11-16 20:31:16 +01:00
Ellpeck
2ab8288282 Moved recipe inits to init, made the booklet JEI handler show all crafting options 2016-11-16 19:08:56 +01:00
Ellpeck
53f6ce0a24 Add Laser Relay priorities 2016-11-16 18:51:23 +01:00
Ellpeck
b355a66c97 Fix auto split 2016-11-16 17:06:53 +01:00
Ellpeck
6e34f9e345 This only took 20 years
Prepared for 1.11 ItemStack updates
2016-11-16 16:59:00 +01:00
Ellpeck
a94a49f9c9 Don't cache the parent screen! 2016-11-15 19:28:51 +01:00
Ellpeck
e1ec9e4afb Tweaks to the laser relay renderer
Closes #360
2016-11-14 15:30:06 +01:00
Ellpeck
6cdf74cd88 Added ore to gem crushing if no dust can be found
Closes #359
2016-11-14 15:11:46 +01:00
garantiertnicht Weichware
a89bfa5001 Make the Teleportation Stuff use Vanilla Cooldown rather than Own one (#350) 2016-11-13 12:38:17 +01:00
Ellpeck
83e85b4ac3 Made booklet chapters initialize in init instead of postinit 2016-11-12 23:29:36 +01:00
Ellpeck
d058878d30 Changed addTextReplacement to also accept ints 2016-11-12 23:10:41 +01:00
Ellpeck
83eb47787f Added back the addTextReplacement thing :v 2016-11-12 22:55:07 +01:00
Ellpeck
6648fb29e2 Made bookmark buttons only open when the page isn't already open 2016-11-12 16:17:11 +01:00
Ellpeck
ecafafe57e Fix a crash when typing in the search bar ~ 2016-11-12 16:06:30 +01:00
Ellpeck
05322f1392 Added display tips to the booklet 2016-11-12 15:48:24 +01:00
Ellpeck
931eba4cc4 API restored! ~ 2016-11-12 15:13:20 +01:00
Ellpeck
c983836f8d Finished up the new booklet.
Woo-hoo!
2016-11-12 15:09:30 +01:00
Ellpeck
19cfcfa1c1 Added bookmarks and store page and bookmarks on close 2016-11-12 13:54:49 +01:00
Ellpeck
0327ee9a26 Added search bar 2016-11-12 12:26:36 +01:00
Ellpeck
30849fb304 Finished all page types 2016-11-12 00:29:01 +01:00
Ellpeck
5507e2ce60 Changed player data to use variables instead of NBT 2016-11-11 21:41:07 +01:00
Ellpeck
c85a3c72a1 Some more booklet work 2016-11-11 21:07:18 +01:00
Ellpeck
81584c2fb1 B U T T O N S 2016-11-11 18:55:32 +01:00
Ellpeck
24e2a9e88d Finished crafting page. 2016-11-11 16:37:45 +01:00
Ellpeck
12abe6f6f6 Removed booklet word counting 2016-11-11 15:24:24 +01:00
Ellpeck
2760c794d6 Made the all items chapter use all chapters on its own 2016-11-11 15:21:57 +01:00
Ellpeck
b295672585 Added basic item display system and crafting page 2016-11-10 23:37:40 +01:00
Ellpeck
4a739b6ab4 Text pages! 2016-11-10 22:06:58 +01:00
Ellpeck
8c7bd9e696 //TODO invasion 2016-11-10 21:07:15 +01:00
Ellpeck
f35a041a55 Booklet rework, part 1.
This is an API breaking change, by the way.
2016-11-10 19:50:01 +01:00
Ellpeck
66aec5cfdf Allow plants to be planted on blocks other than farmland with the farmer
Closes #346
2016-11-10 16:38:37 +01:00
Ellpeck
20664fccf4 Make the Phantom Itemface work with IItemHandler only blocks.
Closes #299
2016-11-09 21:36:18 +01:00
Ellpeck
6cce2d47cf Center me senpai 2016-11-09 19:34:20 +01:00
Ellpeck
42784df86e Move laser stuff to a dedicated chapter
Closes #341
2016-11-09 19:26:53 +01:00
Ellpeck
c471f19f87 Remove this down to ensure reset 2016-11-08 23:52:31 +01:00
Ellpeck
3ad1da0a8c Made the bookler clear its search bar when opening a chapter 2016-11-08 23:48:25 +01:00
Ellpeck
57f16ec321 Update JEI 2016-11-08 23:35:11 +01:00
Ellpeck
691fabd5ef Finished new laser relay models 2016-11-08 23:04:05 +01:00
Ellpeck
9d7d7bd3fc Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java
2016-11-08 20:05:19 +01:00
Ellpeck
c129f6138d Sweepededeep~ 2016-11-08 20:04:36 +01:00
garantiertnicht Weichware
b5ecbb982a Make Item Filler work with Bocks that only have meta when placed in world. (#340)
* Made Filler Wand work with Meta you cant obtain in your inventory, and removed unused- and unexisting imports from the Laser Relay Tile Entity

* Revert "Made Filler Wand work with Meta you cant obtain in your inventory, and removed unused- and unexisting imports from the Laser Relay Tile Entity"
I dont think I should touch imports, so I revert this commit and re-commit only the ItemFiller.

This reverts commit e71769d7d7.

* Made Filler Wand work with Meta you cant obtain in your inventory (again)
2016-11-08 18:22:08 +01:00
Ellpeck
1a9a69a4bd Removed the laser wrench setting
Closes #339
2016-11-08 13:25:36 +01:00
Ellpeck
9337a6e6aa Added proper laser rendering instead of the particles 2016-11-08 08:53:30 +01:00
Ellpeck
2e96e00182 Made worms work with other grass and dirt types too. I hope.
Closes #338
2016-11-07 22:52:54 +01:00
Ellpeck
5c5829d503 Made the precision dropper mark dirty and such respond to comparators correctly
Closes #331
2016-11-07 20:10:04 +01:00
Ellpeck
9e31e0c404 Made the ranged collector show particles when picking items up 2016-11-07 20:07:37 +01:00
Ellpeck
14255ea801 removed performance config options. Yea, really. 2016-11-07 19:58:34 +01:00
Ellpeck
3e8d89c390 Made the magnet ring even more useful by making it pick up items directly 2016-11-07 18:02:06 +01:00
Ellpeck
cc554241f7 Made XP created by solidified XP not be picked up by the solidifier 2016-11-07 17:48:02 +01:00
Ellpeck
9282462a9a Added some more easter egg names to the smiley cloud~ 2016-11-07 00:00:05 +01:00
Ellpeck
642ff7b965 Made lush caves generate higher up too again 2016-11-06 17:12:49 +01:00
Ellpeck
e469c1d634 Made the AIOT work with spider webs
Closes #328
2016-11-06 15:30:04 +01:00
Ellpeck
eb3e6611db Additional Addons (Xathz) 2016-11-05 20:45:11 +01:00
Ellpeck
add64ce9ea Finished handheld filler
Closes #316
2016-11-05 16:16:42 +01:00
Ellpeck
584f6bc034 Filling thing, part 1 2016-11-05 15:36:16 +01:00
Ellpeck
bb9a8c0512 Made the AIOT able to make both farmland and paths
Closes #323
2016-11-05 13:41:49 +01:00
Ellpeck
149592cafa picky 2016-11-04 21:35:05 +01:00
Josh
393d8c8395 Redoing text for configs (#318) 2016-11-04 21:27:20 +01:00
Ellpeck
5b5e261181 It's EdwardR's fault 2016-11-03 22:43:40 +01:00
Ellpeck
de46e22840 Fix the item viewer, in very special cases, not updating its inventories 2016-11-03 10:54:28 +01:00
Ellpeck
d5ee51ff46 Made the change check in Laser Relays a bit more performance-good 2016-11-03 10:49:41 +01:00
Ellpeck
0c696d96db Make the reconstructor not spawn empty itemstacks into the world 2016-11-03 10:01:25 +01:00
Ellpeck
db5c3863a8 gone mad 2016-11-02 23:15:18 +01:00
Ellpeck
c2f04bc77f Made the reconstructor reconstruct even if it can't change the entire stack 2016-11-02 21:15:28 +01:00
Ellpeck
ad3bb33d03 Made the magnet ring a bit more useful
Closes #317
2016-11-02 21:03:41 +01:00
Ellpeck
b5e358d72d Made the reconstructor recipe handlers show the additional needed amount of power 2016-11-02 20:55:47 +01:00
Ellpeck
da082cbfa5 Make this method less hideous 2016-11-02 19:40:48 +01:00
Ellpeck
7524ee52fd Remove Util.RANDOM 2016-11-02 19:36:32 +01:00
Ellpeck
9b5ead76a2 Added lens of the killer
Closes #315
2016-11-02 18:49:57 +01:00
Ellpeck
89f953df03 this should be a lot more 2016-11-01 22:03:27 +01:00
Ellpeck
52c8e92f33 Re-added the villager and tweaked some dungeon loot 2016-11-01 20:47:37 +01:00
Ellpeck
a294ab4f7e clippy 2016-11-01 19:02:23 +01:00
Ellpeck
21340c975d Added some more mining lens ores (canitzp) 2016-11-01 18:40:26 +01:00
Ellpeck
c7c352606e Move the GUI up a bit to make bookmarks less mushed to the bottom 2016-11-01 16:51:35 +01:00
Ellpeck
93f957d4dd Rewrote the book tutorial page and added bookmarks for new users 2016-11-01 16:47:40 +01:00
Ellpeck
11b7ecb172 Add some more checks to the Farmer 2016-11-01 15:46:02 +01:00
Ellpeck
773f8c0196 Some more easter egg names 2016-11-01 12:22:33 +01:00
Ellpeck
13351e498e Made the booklet always show the search bar and just put you into the all items section 2016-11-01 12:00:49 +01:00
Ellpeck
1aaa3c64e4 Make crystals generate in lush caves 2016-11-01 00:12:15 +01:00
Ellpeck
2efcf0eddd Fixed the empowerer not allowing extractions 2016-10-31 22:36:42 +01:00
Ellpeck
204548ff75 right 2016-10-31 21:14:23 +01:00
Ellpeck
8f65ac4683 Added a method to the API to figure out which type a laser relay has 2016-10-31 21:12:15 +01:00
Ellpeck
aa75418653 Added tiny coal to normal coal recipes 2016-10-31 21:06:10 +01:00
Ellpeck
6ac7c24369 Make tiny torches less useless 2016-10-31 21:01:44 +01:00
Ellpeck
6e7789b7b8 added reviews 2016-10-31 20:52:41 +01:00
Ellpeck
9a0698a907 Some JEI changes 2016-10-31 20:19:55 +01:00
Ellpeck
a515839c5c move the ore lists to the API 2016-10-31 19:20:29 +01:00
Ellpeck
c05cdc1ec6 Cleanup~ 2016-10-31 19:05:29 +01:00
Ellpeck
e538ab5cad Finished farmer 2016-10-31 19:03:04 +01:00
Ellpeck
8828b9c8a9 Farmer 2016-10-31 18:03:18 +01:00
Ellpeck
508ae87bdf Mining lens recipe and doc 2016-10-31 16:56:04 +01:00
Ellpeck
c0a40d03e7 Mining lens 2016-10-31 16:36:22 +01:00
Ellpeck
7e46a77bcf Added the ability to add fluids to booklet pages 2016-10-30 23:36:39 +01:00
Ellpeck
020adc97b2 Added back jam house loot and added lush caves loot 2016-10-30 23:08:40 +01:00
Ellpeck
2afc7ba124 Added back loot from 1.7.10 2016-10-30 20:28:02 +01:00
Ellpeck
19b0cc7223 Remove old temporary stuff 2016-10-30 19:30:19 +01:00
Ellpeck
acebcb2fbd Changed the way crusher recipes are registered
Closes #297
2016-10-30 17:13:46 +01:00
Ellpeck
8f53736f6d Made empowering possible with any dyes, not just vanilla ones
Closes #298
2016-10-29 12:29:13 +02:00
Ellpeck
430beac2db Fixed AIOTs having wrong harvest levels,
closes #302
2016-10-29 12:23:53 +02:00
Ellpeck
f8f7940839 Added digit separators for large numbers, closes #305 2016-10-29 12:23:01 +02:00
Ellpeck
7a69273865 Significantly reduce performance loss when using Item Laser Relays and/or ESDs
Closes #279
2016-10-29 12:00:00 +02:00
Ellpeck
51e8d36ca5 Update forge and jei 2016-10-29 10:47:33 +02:00
Ellpeck
23878da6fb make it clear the energy mode doesn't change anything 2016-10-22 02:37:28 +02:00
Ellpeck
4e8e749f4f Made the empowerer work with all of its recipes
Closes #295
2016-10-21 00:13:21 +02:00
Ellpeck
64b62b4f80 Fixed player interface being broken 2016-10-21 00:03:58 +02:00
Bartosz Skrzypczak
b90c04c248 Fixed recursive/reentrant chunk generation caused by lush caves, closes #275 (#294) 2016-10-19 18:51:07 +02:00
Ellpeck
957bd16fe3 Add info to redstone control machines that holding a redstone torch is needed to toggle them 2016-10-19 18:42:07 +02:00
Ellpeck
e3e5910443 Add visual indication of where the Atomic Reconstructor hits 2016-10-19 18:38:57 +02:00
Ellpeck
1d5a40804d Change the "sneak!" info to something that makes it clear you need to hover over ActAdd blocks to see more info 2016-10-19 18:30:55 +02:00
Ellpeck
3407aa61ba Added description to the booklet to explain what it is and that it needs to be right-clicked 2016-10-19 18:24:50 +02:00
Ellpeck
93b42be9d8 Made fishing net accept chests from different sies
Closes #273
2016-10-19 16:28:09 +02:00
Ellpeck
7682e3a467 Fixed the spawner changer sometimes keeping old mob data
Closes #274
2016-10-19 16:09:50 +02:00
Ellpeck
f1eebaadf3 Added crusher output blacklist
Closes #293
2016-10-19 15:57:30 +02:00
Ellpeck
3a324ee09d Made batteries store more power the higher their tiers are
Closes #283
2016-10-19 15:25:26 +02:00
Ellpeck
0771585123 Made energy items not lose their power when crafted with
Closes #289
2016-10-19 15:23:54 +02:00
Ellpeck
25c1ceffd5 Fixed horses not being able to be fed with the feeder
Closes #290
2016-10-19 15:05:42 +02:00
Ellpeck
794383ccf1 Fixed Advanced Relays connected to Item Interfaces directly having their settings swapped 2016-10-11 14:41:26 +02:00
Ellpeck
d24a09ad67 Supposedly fix a bug with item interfaces ignoring whitelisting 2016-10-11 14:24:18 +02:00
Ellpeck
622cfef3ee Changed cheese recipe to require eggs too
Closes #271
2016-10-08 10:48:26 +02:00
Ellpeck
20f34ecc89 Move this check up to actually be done when it's needed
Closes #269
2016-10-03 16:50:36 +02:00
Ellpeck
80d044bb48 Use the new item handler system for inserting and extracting
Might fix #249?
2016-10-01 23:35:39 +02:00
Ellpeck
7d28a500f4 fix the fix 2016-10-01 23:03:45 +02:00
Ellpeck
e60b09c8e6 Merge remote-tracking branch 'origin/master' 2016-10-01 23:02:56 +02:00
Ellpeck
06d6aba0c5 Stop lush cave gen from destroying chests
Should close #266
2016-10-01 23:02:46 +02:00
xbony2
99bd586ce2 closes #260 (3 is the default metadata) (#261) 2016-09-26 06:41:45 +02:00
Ellpeck
fe974365b1 Make sure caves don't go through bedrock
Closes #248
2016-09-25 21:10:37 +02:00
Ellpeck
1d77f1e168 Added a recipe to clear the oil generator's liquid storage
Closes #253
2016-09-25 20:57:43 +02:00
Ellpeck
79e012181a Added tool materials to tools
Should close #255
2016-09-25 20:50:35 +02:00
Ellpeck
b420823330 Fixed player probe saving #258 2016-09-25 20:44:40 +02:00
Ellpeck
ea982f025e Added textures for stuff that doesn't have any yet 2016-09-17 12:24:49 +02:00
Ellpeck
7b16833139 bio reactor recipe and doc 2016-09-17 12:12:59 +02:00
Ellpeck
51ebdc729f new oils doc 2016-09-17 12:03:03 +02:00
Ellpeck
f89196a701 Made solar panel lose efficiency with transparent blocks above it
Closes #244
2016-09-17 11:48:25 +02:00
Ellpeck
936df5fd5f Made the bio reactor accept blocks as well 2016-09-14 21:48:29 +02:00
Ellpeck
c4ef288653 added bio reactor
Closes #234
2016-09-14 21:42:03 +02:00
Ellpeck
820f097c12 Added recipe for empowered oil 2016-09-13 20:40:26 +02:00
Ellpeck
541410be5e Made solar panels work through non-solid blocks 2016-09-13 17:27:39 +02:00
Ellpeck
ecb6eddc06 Grab the broom and sweep~ 2016-09-12 20:45:29 +02:00
Ellpeck
0853860810 Made the Lamp Controller toggle entire areas
Closes #242
2016-09-12 16:44:53 +02:00
Ellpeck
ce63aafe3f Add a breaking change to the API 2016-09-12 16:13:39 +02:00
Ellpeck
e66e5b7aa1 fixed bio coal burn time
Closes #229
2016-09-12 15:19:33 +02:00
Ellpeck
3573257010 remove console spam about syncing data 2016-09-11 20:54:04 +02:00
Ellpeck
b475d15c9f Removed that a lens knows about its item because it doesn't need to 2016-09-11 20:24:10 +02:00
Ellpeck
9007ccadee Added crystallized canola seeds to make crystal oil 2016-09-11 14:51:52 +02:00
Ellpeck
015e5121e2 item distributor recipe and doc 2016-09-11 13:33:47 +02:00
Ellpeck
4b7d9c3fd8 Made the distributor auto-pull 2016-09-11 13:14:39 +02:00
Ellpeck
9cac45a514 Rewrote the item distributor to be less broken 2016-09-11 12:57:20 +02:00
Ellpeck
e580fd2219 Added item distributor 2016-09-09 21:43:33 +02:00
Ellpeck
37d1bc95f9 Made every block be able to save the tile entities around it for future use 2016-09-09 18:40:09 +02:00