Ellpeck/PrettyPipes
1
0
Fork 0
mirror of https://github.com/Ellpeck/PrettyPipes.git synced 2024-05-09 18:58:46 +02:00
Code Issues Projects Releases Wiki Activity
331 commits 6 branches 0 tags 3.8 MiB
Commit graph

254 commits

Author SHA1 Message Date
Ell bb62acf45f made the crafting terminal ghost transfer also consider craftables 
Closes #50
 2020-10-27 22:51:07 +01:00
Ell a5b7bd1e82 added high priority modules 
Closes #48
 2020-10-27 15:36:52 +01:00
Ell 23a4292f47 made crafting terminal slots not be cleared when picking up an item 2020-10-27 15:24:52 +01:00
Ell 36e358d2bd made crafting terminals select the crafting item that you have most of 
Closes #49
 2020-10-27 15:20:17 +01:00
Ell 072fc3b924 added compatibility for vanilla's weird composter special case 
Closes #47
 2020-10-24 15:00:11 +02:00
Ell a53e0cf5d5 fixed a crafting terminal overflow if the crafting slots are full 2020-10-20 18:31:13 +02:00
Ell c1100b02fe fixed the pipe not dropping its cover on break 2020-10-20 16:09:38 +02:00
Ell 27b3ddd869 fixed mek bins and over-sending not playing well together 2020-10-20 14:59:05 +02:00
Ell 636f40eee5 fixed network locks not being resolved when canceling crafting requests 2020-10-20 02:52:26 +02:00
Ell b6df64df57 fixed the pressurizer loading chunks 2020-10-20 01:31:36 +02:00
Ell afd055c8b1 made the retrieval module only retrieve when it's not waiting for crafting outputs 2020-10-20 01:30:33 +02:00
Ell 76f332c03e added a display that shows items that are currently being crafted 2020-10-20 00:52:56 +02:00
Ell 3dcda2f69a fixed lazy optionals 2020-10-19 21:31:23 +02:00
Ell 0aa78a2171 made getModelCount protected in PipeItem 2020-10-19 04:13:57 +02:00
Ell e32ff7bb02 fixed JEI favorites overlapping buttons in the item terminal 
Closes #45
 2020-10-18 15:40:02 +02:00
Ell dc9f7ed154 added IPipeItem 2020-10-18 02:32:28 +02:00
Ell d4a895fcde some more slight API changes 2020-10-18 01:57:51 +02:00
Ell b46fd3be72 removed chest special handling (since it was fixed in Forge) and added getNeighborCap to PipeTileEntity 2020-10-17 17:33:31 +02:00
Ell 64e2b9c4fe fixed non-stackable items not playing nice with the crafting terminal 2020-10-17 17:24:24 +02:00
Ell ae5b81e933 separated pipe collision and regular shapes and made pipes collide a bit higher 2020-10-17 14:52:35 +02:00
Ell 4ff3ac6851 made IPipeConnectable a capability 2020-10-17 14:29:37 +02:00
Ell 5cda7beca7 fixed inventories with max stack sizes over 64 not being seen by terminals correctly 2020-10-17 04:15:53 +02:00
Ell ff5368b108 added pipe covering 2020-10-17 00:58:31 +02:00
Ell cd1c508b6a
Merge pull request #44 from DrHesperus/patch-1 
Update Russian localisation
 2020-10-16 22:38:25 +02:00
Ell aba7738a8a added some more API stuff for Sky <3 2020-10-16 22:36:44 +02:00
Dr_Hesperus 41281af8a8
Update Russian localisation 2020-10-17 01:00:41 +05:00
Ell 585e003327 use linked lists in favor of ArrayDeques as they use far less memory when empty 2020-10-15 21:01:43 +02:00
Ell 4f78e7ecc8 added a mod filter modifier 2020-10-15 20:52:59 +02:00
Ell b7cd8e5cdd Fixed multiple modules of the same type not being openable 
Closes #43
 2020-10-15 19:06:09 +02:00
Ell f74ffc4629 fixed batch crafting requests being calculated incorrectly when auto-crafting 2020-10-15 06:25:10 +02:00
Ell 6ae511e485 unify equality types and add jei transfer 2020-10-15 06:07:06 +02:00
Ell 70c1e82db1 finished the module items themselves 2020-10-15 05:22:23 +02:00
Ell 1f0c3952f3 added profiling for the crafting module 2020-10-15 05:09:55 +02:00
Ell 362a601e0a fixed crafting items that don't fit being ignored 2020-10-15 05:00:43 +02:00
Ell 4340b2ccb4 fixed message propagation for missing items 2020-10-15 04:46:23 +02:00
Ell f38ab16e4d even more fixes! 2020-10-15 04:15:52 +02:00
Ell 27954a9765 some more fixes and cleanup 2020-10-15 01:56:42 +02:00
Ell 87d983611e fixed all the bugs! 2020-10-15 01:19:22 +02:00
Ell 57c3b13b64 part 2: actual crafting implementation 2020-10-14 23:39:11 +02:00
Ell 8029cc21a0 part 2: display craftables in the terminal 2020-10-14 22:30:02 +02:00
Ell eb8f2695de added the basic crafting module setup 2020-10-14 22:04:52 +02:00
Ell 33262328ed made the pressurizer drop itself 
Closes #42
 2020-10-14 21:41:45 +02:00
Ell 1fa764854c remove outdated todo 2020-10-14 20:23:51 +02:00
Ell 035254227c give a bit of time before dropping modules 
Closes #39
 2020-10-14 18:53:02 +02:00
Ell 60dd405f5d fixed populating filters sometimes inserting more than one item into the filter 
Closes #38
 2020-10-14 18:34:38 +02:00
Ell bb06cb34eb allow pressing control to request 10 crafting items 
Closes #40
 2020-10-14 18:32:10 +02:00
Ell a06c91be5a made item terminals extract items faster if there is a pressurizer in the network 2020-10-14 18:24:52 +02:00
Ell 6fbedff388 added the filter increase modifier 2020-10-14 04:28:58 +02:00
Ell e3cbbae905 improve the performance of the pressurizer drastically 2020-10-13 23:02:11 +02:00
Ell cafa3f39c2 remove an unnecessary method 2020-10-13 19:00:11 +02:00
Ell 03a798649a made pipe item movement more accurate 2020-10-13 18:42:45 +02:00
Ell ee58eb30b3 finished the pipe pressurizer 2020-10-13 18:20:00 +02:00
Ell 5b808d346c pressurizer, part 1 2020-10-13 18:11:40 +02:00
Ell 486d43c5b4
Update mods.toml 
that was really.. outdated lol, I think I copied it from something else
 2020-10-13 03:17:56 +02:00
Ell 98a2bf6a43 Fixed a crash with invalid network nodes 
Closes #37
 2020-10-10 17:38:20 +02:00
Ell 9b36e0c444 finished the port? 2020-09-22 19:24:09 +02:00
Ell 85d080cb3a part 1? 2020-09-22 19:14:07 +02:00
Ell a56896b2b2 use the correct start inventory for re-routing 2020-09-02 22:17:12 +02:00
Ell 7667adaac1 made pipe items attempt to re-route before dropping onto the ground 
Closes #35
 2020-09-02 22:16:12 +02:00
Ell 2ab889c467 Merge remote-tracking branch 'origin/master' into master 2020-09-02 22:06:54 +02:00
Ell b20d15c05a only save filter data of modified filters 
Closes #26
 2020-09-02 22:06:44 +02:00
Quarris 05b4089af1
Expose items field 2020-08-28 16:14:29 +01:00
Ell f5443becf8 made PipeBlock#getConnectionType not static 2020-08-28 00:33:34 +02:00
Ell 9f049e8b89 made some stuff protected for Quarris 2020-08-28 00:29:44 +02:00
Ellpeck 8a7388ab57 Fixed pipes being openable with a non-empty hand 
Closes #23
 2020-05-28 14:47:25 +02:00
Ellpeck 544e383974 allow modules to be inserted into pipes by right-clicking 2020-05-17 21:05:41 +02:00
Ellpeck 718cef5c4e only update search text when there are items 
Closes #19
 2020-05-17 16:24:24 +02:00
Ellpeck a026cfc550 made modules be able to send less than their expected amount 
Closes #16
 2020-05-17 16:14:27 +02:00
Ellpeck 2a8d43bb30 Change stack limiter module recipe from dispenser to dropper 
Closes #17
 2020-05-17 15:30:47 +02:00
Ellpeck f2ebe8af90 allow modules in pipes connected to terminals 2020-05-17 15:29:10 +02:00
Ellpeck 57d2326d06 Merge remote-tracking branch 'origin/master' 2020-05-16 14:28:40 +02:00
Ellpeck b1d18d751d Fixed jei recipe transfer not working on servers 
Closes #15
 2020-05-16 14:28:25 +02:00
The_BadUser 7946aa57d5
Create ru_ru.json 2020-05-13 15:34:24 +07:00
Ellpeck 8d347473af make "items on the way" only look at items going to the current INVENTORY, not the current pipe 2020-05-10 12:50:24 +02:00
Ellpeck 9fab982e6a fixed some pipes loading chunks 2020-05-09 21:53:00 +02:00
Ellpeck 9d29ed53c0 fixed single-pipe networks not allowing items through 2020-05-09 21:35:34 +02:00
Ellpeck def337be85 didn't end up using this 2020-05-09 20:13:16 +02:00
Ellpeck 0af5ccde77 fixed items getting lost with the new system 2020-05-09 20:12:50 +02:00
Ellpeck ede06585f7 unify item requests into one method 2020-05-09 16:27:49 +02:00
Ellpeck 8391f2222a finished the crafting terminal 2020-05-09 15:42:09 +02:00
Ellpeck 3104062b82 crafting terminal JEI logic! 2020-05-09 14:56:58 +02:00
Ellpeck f9c5ea86f7 finished the crafting terminal! 2020-05-09 13:40:46 +02:00
Ellpeck 8bd5a0cae3 fixed single-pipe networks crashing 
Closes #10
 2020-05-09 13:07:05 +02:00
Ellpeck 172dcc7429 improved network caching 2020-05-09 12:57:25 +02:00
Ellpeck c21a5ddbb0 fixed network locks not being resolved when a terminal is broken 2020-05-09 12:31:04 +02:00
Ellpeck 88544368eb Revert "network lock equality, for the future" 
This reverts commit 58558781
 2020-05-09 01:21:16 +02:00
Ellpeck 58558781eb network lock equality, for the future 2020-05-09 01:16:45 +02:00
Ellpeck ccc981fee3 more crafting terminal work + network locks 2020-05-09 01:00:59 +02:00
Ellpeck 67e7da2b73 crafting terminal base 2020-05-08 22:58:16 +02:00
Ellpeck 0bb8fbaf5c added jei syncing to the terminal 2020-05-08 21:19:32 +02:00
Ellpeck 5632727d04 made player preferences client-sided 2020-05-08 20:56:27 +02:00
Ellpeck b65a73c77b added a search bar to the item terminal 2020-05-08 16:06:17 +02:00
Ellpeck e1752bb46d fixed over-sending prevention only working for items of the same type 2020-05-08 15:17:11 +02:00
Ellpeck 320abbe74e generalize item equality to fix some requesting inconsistencies 2020-05-08 02:51:07 +02:00
Ellpeck 157c6e4d8c item terminal loot table and also a nice picture for you 2020-05-07 23:28:10 +02:00
Ellpeck 5541d5d1a4 finished the item terminal, yay 2020-05-07 23:06:35 +02:00
Ellpeck 01dda04701 added scrolling to the terminal ui 2020-05-07 21:50:50 +02:00
Ellpeck c357550956 fixed terminals not updating when sending items 2020-05-07 21:25:46 +02:00
Ellpeck fe3d4380f3 IT'S DONE 2020-05-07 21:10:29 +02:00
Ellpeck ae74359ed5 item terminal, part 1 2020-05-07 18:30:40 +02:00
Ellpeck d4031c19e1 move containers package to the right place 2020-05-07 15:48:46 +02:00
Ellpeck f9bbc16b7b Revert "added pipe network energy storages" 
This reverts commit 9a934431
 2020-05-07 15:46:49 +02:00
Ellpeck 9a93443152 added pipe network energy storages 2020-05-07 14:39:26 +02:00
Ellpeck 16c7a67a13 added the redstone module 2020-05-03 15:51:16 +02:00
Ellpeck d8255ca07b added comparator output to pipes 2020-05-03 15:33:56 +02:00
Ellpeck c0c69807c0 fixed pipe tabs not updating occasionally 2020-05-02 19:37:11 +02:00
Ellpeck d46858507f added filter modules 2020-05-02 18:56:54 +02:00
Ellpeck 2b882649fb fixed filters being too picky 2020-04-30 17:14:15 +02:00
Ellpeck ccc1547292 fixed some stuff unnecessarily happening on the client 
Closes #2
 2020-04-29 14:06:19 +02:00
Ellpeck ac0c456196 also fix the toml here 2020-04-28 21:22:04 +02:00
Ellpeck 0493df938f fixed pipe frames picking the wrong item in creative 2020-04-20 19:22:30 +02:00
Ellpeck bd417aae7c fixed double chests not being recognized properly 2020-04-20 16:40:16 +02:00
Ellpeck 9b28509542 fixed pipes reconnecting when they shouldn't 2020-04-20 16:20:33 +02:00
Ellpeck 871995e807 misc pipe frame fixes 2020-04-20 16:07:44 +02:00
Ellpeck 3e10688a96 finished the pipe frame 2020-04-20 13:12:26 +02:00
Ellpeck cfee160573 pipe frames, part 1 2020-04-20 03:37:23 +02:00
Ellpeck 1865eaa8cb fixed node caches not being invalidated correctly for small networks 2020-04-19 22:04:39 +02:00
Ellpeck 34f037a8fd fixed items being seen as in the network multiple times when connected at multiple pipes 2020-04-19 18:23:53 +02:00
Ellpeck dd894f996e allow pipes to connect to other blocks 2020-04-19 17:38:13 +02:00
Ellpeck d28bff3fcf added stack size module 2020-04-18 22:30:14 +02:00
Ellpeck d66b5260ef fixed lazy optional npe 
Closes #1
 2020-04-18 13:14:50 +02:00
Ellpeck c9c5852b1d fixed some issues, made pipes waterloggable 2020-04-18 00:45:19 +02:00
Ellpeck 648d860910 this didn't work, guess I'll have to accept wonky placement logic 2020-04-18 00:20:21 +02:00
Ellpeck c64c4b3a58 ALL THE RECIPES 2020-04-17 23:17:46 +02:00
Ellpeck a7bdd85139 prevent over-sending 2020-04-17 22:29:02 +02:00
Ellpeck 16dae95d50 moved some stuff around in preparation for over-sending module 2020-04-17 21:32:01 +02:00
Ellpeck c4329167c4 retrieval module 2020-04-17 20:03:54 +02:00
Ellpeck 4368f2945b fixed a crash with trying to find a path to a nonexistant pipe 2020-04-17 17:40:04 +02:00
Ellpeck 10645ac54d fixed pipe items not going around corners nicely when directly connected to an inventory 2020-04-17 17:35:41 +02:00
Ellpeck 9682636103 added priority modules 2020-04-17 17:18:25 +02:00
Ellpeck dc5ce8a26c added pipe speed modules 2020-04-16 23:40:35 +02:00
Ellpeck c6d9803f64 added auto-populate feature to filters 2020-04-16 22:25:58 +02:00
Ellpeck 592e524153 added filter modules 2020-04-16 21:19:40 +02:00
Ellpeck 23462bbe00 fixed pipes connecting too late 2020-04-16 20:03:18 +02:00
Ellpeck 046637a1b5 added little pipe legs 2020-04-16 19:47:09 +02:00
Ellpeck 50e2285680 fixed pipe items getting stuck when inserting into themselves 2020-04-16 16:44:23 +02:00
Ellpeck 68933f4b49 added module tooltips 2020-04-16 15:45:11 +02:00
Ellpeck 3409945c77 finished filter ui 2020-04-16 15:19:13 +02:00
Ellpeck 0cc6dfc3b7 almost finished module tabs! 2020-04-16 04:42:42 +02:00
Ellpeck 3646fc4611 don't look at this code, it's truly terrible 2020-04-16 02:48:58 +02:00
Ellpeck f7957bfc0a basic upgrade structure 2020-04-16 00:39:53 +02:00
Ellpeck fffcb9da6d made pipe items speed based only 2020-04-15 23:13:05 +02:00
Ellpeck 9ea6f7353f fixed items looking funky in pipes sometimes 2020-04-15 20:53:56 +02:00
Ellpeck ab7e472a0f remove CONNECTED_INVENTORY 2020-04-15 18:35:00 +02:00
Ellpeck 4c764023f4 added proper priority handling 2020-04-15 02:16:23 +02:00
Ellpeck 44a5d6b4ec misc pipe fixes 2020-04-14 21:04:41 +02:00
Ellpeck 6abfec9c94 finished basic pipe logistics! 2020-04-14 18:51:43 +02:00
Ellpeck a11693632d pipe movement, part 1 2020-04-14 17:14:24 +02:00
Ellpeck 0a674ba1b5 network serialization 2020-04-14 15:02:21 +02:00
Ellpeck 87de8e353d got network connections fully working! 2020-04-14 14:10:58 +02:00