tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity
2951 commits 7 branches 98 tags 24 MiB
Commit graph

1260 commits

Author SHA1 Message Date
yueh
4f9fd1b369 IC2 rework to avoid a coremod or @Optional (#3034) 
* IC2 rework to avoid a coremod or @Optional

Updated IC2 dependency

Refactored IC2 itemcharging to use an IBackupElectricManager.
Allows charging any ae powered item by using an IBackupElectricManager
instead of having to implement IElectricItem and stripping it by some
sort.

Updated IAEItemPowerStorage to use Actionable for an easier handling
with power APIs supporting a simulation.

Refactored EU P2P to avoid method stripping
Use a modified internal BasicSinkSource instead of implementing
IEnergySource and IEnergySink directly on the tunnel.

Removed the superfluous EU P2P layers.

* Removed internalBattery due to being too complex

* Creative Energy Cell is not a chargeable item
 2017-08-17 17:35:34 +02:00
yueh
630fae3f73 Fixes #3024: Crash on recipe lookup for disabled features (#3026) 
* Fixes #3024: Crash on recipe lookup for disabled features

Adds a new recipe condition for a single AEFeature or a list of them.
Moved the factories to their own package, in preparation of phasing out
the old recipe handling.
 2017-08-17 17:17:26 +02:00
yueh
488ef1b544 Fixes recipes to use correct ingredients 
Fluix Pearls instead of Fluix Crystals for spatial related items.
Fluix cables for most items, not any cable to avoid loops or unwanted
crafting steps.
 2017-08-17 15:12:34 +02:00
fscan
098ee2f000 Making charged certus ore glow again (#3035) 2017-08-17 11:01:31 +02:00
fscan
04d2b06c0d Ignore MOVE_REGION when clicking on crafting slots (#3032) 
Exclude crafting slots from list of slots to move on space click.

Fixes #3031
 2017-08-15 15:07:42 +02:00
fscan
ac48ab02fc Fix crash in clearStack (#3033) 2017-08-15 15:05:12 +02:00
fscan
9022150e38 Fill existing stacks first when adding to player inventory. (#3025) 2017-08-14 11:03:53 +02:00
yueh
65c6d2249a Fixes encoding issues with spatial cell names 2017-08-13 19:02:03 +02:00
fscan
95b48b9438 Registration rework (#3018) 
Refactored component registration.

Fixes #3008: crank rendering
 2017-08-12 15:02:50 +02:00
yueh
cdd76b7b22 Added helpers for hex and color output. (#3027) 2017-08-12 14:52:31 +02:00
fscan
3e2bc0e038 Inscriber improvements and fixes (#3028) 2017-08-12 14:52:01 +02:00
yueh
eec3e59eea Add missing annotations 2017-08-11 21:44:30 +02:00
yueh
e39855b48f Use qualified method and field access 2017-08-11 21:43:47 +02:00
yueh
cdcab7d91c Organise Imports 2017-08-11 21:42:26 +02:00
yueh
27ad2c2b96 Code format 2017-08-11 21:41:51 +02:00
yueh
542a2e5d5a Fixes NPE due to using wrong field. 2017-08-11 21:33:57 +02:00
fscan
3b58f5e8da fix me io port (#3019) 2017-08-09 10:39:07 +02:00
fscan
092afad4a5 Correctly detect redstone updates on all sides. (#3017) 2017-08-09 10:30:44 +02:00
Gunther De Wachter
6aa810d62a Re-add a missing piece of IC2 integration code. 
This should fix a bunch of IC2 spam in the console and allow items to be charged in IC2 blocks.
 2017-08-07 10:15:26 +02:00
Gunther De Wachter
41d98f9944 Fixed ME Chest visually not updating its cell state 2017-08-05 11:43:57 +02:00
Gunther De Wachter
1b198979fd Fixed export bus never speeding up. 2017-08-05 10:45:13 +02:00
tyra
8d5cc916e0 Adds improved tooltip to invalid encodedPattern (#2992) 
* Adds improved tooltip to invalid encodedPattern

This also fixes that encodedPattern might be shown as valid,
even though one or more input or output item is missing.
 2017-08-04 21:17:35 +02:00
Gunther De Wachter
5abb8bf886 Removed call to super in Crafting Terminal initialisation code. Fixes #2988 2017-08-04 20:28:11 +02:00
Gunther De Wachter
0bed78a144 Re-enabled JEI search integration in terminals. 2017-08-03 22:00:42 +02:00
fscan
30940e91ea InterfaceTerminal: Put into to cursor, not player hand (#2996) 2017-07-31 17:16:56 +02:00
fscan
0f9ac5fdda Fix Inscriber and Molecular Assembler (#2995) 
* Fix inscriber
* Allow GUI extraction for Molecular Assembler
 2017-07-31 16:06:39 +02:00
fscan
5e001d86cb Move model loading to the correct event. Fixes #2991 (#2994) 
* Use the correct event for loading models.
* Introduce IModelRegistry to wrap the ModelLoader
 2017-07-31 15:51:53 +02:00
fscan
b13a338948 Fix/Remove storage/import/export bus IItemHandler caching (#2987) 
* Fix storage/import/export bus IItemHandler caching
 2017-07-31 15:51:01 +02:00
yueh
454404b0c1 Changed ItemGen to use IItemHandler 2017-07-30 20:17:23 +02:00
yueh
bb1e191666 Changed IPart#onNeighborChanged() to add vanilla arguments (#2985) 
Allows more precise checks to limit an update to the facing side.
 2017-07-29 15:45:18 +02:00
yueh
b72fce97db Removes random energy P2P behaviour (#2986) 
Energy P2P now try to evenly distribute over all outputs (to a certain
limit)
Fixes some NPE regarding the caches.

Closes #2969
 2017-07-29 15:38:29 +02:00
yueh
bcc4a732ed Started P2P rework (#2966) 
* First iteration of P2P rework

Changed frequency to short instead of long.
Added a per grid RNG to request a new frequency, hopefully without many collisons.
Added a helper to convert between a frequency and 4 colours
 2017-07-28 22:06:19 +02:00
fscan
52d28fabe3 Use IItemHandler instead of IInventory internally (#2971) 
* Use IItemHandler instead of IInventory internally
 2017-07-28 22:04:32 +02:00
Gunther De Wachter
c077840988 Fixed formation plane crashing when placing a block down. 2017-07-26 07:39:59 +02:00
Gunther De Wachter
8f6510aad4 Fixed the spatial cells losing their "cubed" sign because of an encoding issue in the language files. 2017-07-25 02:20:40 +02:00
Gunther De Wachter
fa8427dcbd Fixed ItemStack initialisation in ContainerCellWorkbench. 2017-07-23 20:50:30 +02:00
Gunther De Wachter
7eb09fc4db Fixed Container Workbench (and other UI's) giving access to slots that shouldn't be there. 2017-07-23 20:39:01 +02:00
Gunther De Wachter
ac528d09ae Fixed empty list when toggling to "Craftable" view in a terminal. 2017-07-23 17:41:05 +02:00
fscan
c97165cc63 Fix NPE in MEMonitorIInventory.onTick (#2972) 2017-07-22 21:24:19 +02:00
Gunther De Wachter
727fcc528f Fixed crafting card recipe. 2017-07-22 18:31:30 +02:00
yueh
a4c468b9cf Updated caps to be manually disabled via config 
Moved the cap injection to a method, allows them to be configurable.
This is not possible for Forge Energy as it is injected before even the
configuration are lodaed, thus violating their own capability contract
to use the method injection to explicitly make it configurable.

Updated the ratio key for forge energy to "ForgeEnergy" without a space
 2017-07-22 13:29:14 +02:00
Gunther De Wachter
4ad31f5066 Integrated groups.recipes into the JSON recipes a bit more cleanly. 
Groups in groups.recipes that only had 1 item in the group haven't been converted into the JSON system.
That means "monitor" and "densecable" were just left as is.
 2017-07-22 02:08:01 +02:00
tyra
f70e97046f Fixes PatternTerminal crafting issue (#2964) 2017-07-22 01:12:07 +02:00
tyra
3a053d9ebe Fixes PatternTerminal clearing crafting slot on tried crafting (#2963) 2017-07-22 01:11:42 +02:00
Gunther De Wachter
fbaff342e4 Fixed cable anchor recipe. Apparently 32767 is the magic wildcard number we were looking for. 2017-07-22 00:33:16 +02:00
tyra
f0baea3be8 Fixes a ItemStack deletion issue in the grindstone (#2962) 
Fixes the Grinder eating the item in case of an input ItemStack with size equal to one.
 2017-07-21 23:03:13 +02:00
yueh
a24ed38e90 Added missing Override annotations 2017-07-20 21:28:16 +02:00
yueh
15582fd1df Always use qualified access for fields and methods 2017-07-20 21:27:22 +02:00
yueh
f9cad0758d Always use {} for control statements 2017-07-20 21:24:58 +02:00
yueh
406013142e Superfluous whitespace removal 2017-07-20 21:23:01 +02:00
yueh
7de90ed0ae Finally use Java7 <> 2017-07-20 21:21:45 +02:00
yueh
8ec8babb6a Organised imports 2017-07-20 21:18:49 +02:00
yueh
621910df91 Format sourcecode 2017-07-20 21:17:10 +02:00
yueh
66437897be Removed superfluous thirdparty sourceset 2017-07-20 20:59:37 +02:00
Gunther De Wachter
7414840530 Fixed facades not showing up before F3+A. This is caused by the BlockRendererDispatcher not existing yet in the ModelBakeEvent event. 2017-07-19 19:08:49 +02:00
Gunther De Wachter
0741e4ae09 Cosmetic change to smart fluix recipe. (Looks nicer in JEI) 2017-07-19 13:55:39 +02:00
Gunther De Wachter
87f6a63f47 Fixed seeds and P2P bus not having a localised name. 2017-07-19 13:55:09 +02:00
Gunther De Wachter
b0950683a1 Updated pack.mcmeta to new version. 2017-07-19 13:54:08 +02:00
Gunther De Wachter
009cf8ac40 Fixed fluix pearl and Dense Smart Fluix recipes. 2017-07-19 13:52:25 +02:00
Gunther De Wachter
4c272de77f Temporary fix for serverside JEI and valueconfig packets. 
It's not pretty but should do until we rewrite the packet/network handler.
 2017-07-19 13:50:21 +02:00
Gunther De Wachter
6648d18f00 Changed the Parts and Material enum to be more java compliant. 
Renamed Dense Cables to Dense Smart Cables.
 2017-07-16 02:22:30 +02:00
Gunther De Wachter
16b5b5aea2 Fixed setting a Tunnel Type to "Forge Energy". Forgot to edit the part that actually sets the tunnel. 2017-07-15 01:19:29 +02:00
Gunther De Wachter
e20697a7d9 Added the Forge Energy line to the language files. 2017-07-15 00:51:08 +02:00
Gunther De Wachter
dc0447d137 This layer isn't needed for the traversal of Forge Energy. 2017-07-15 00:49:13 +02:00
Gunther De Wachter
577b1fa757 Add a method to attune the P2P Tunnel by (supported) ModId, or check for ForgeEnergy support if it's not listed. 2017-07-14 22:54:19 +02:00
Gunther De Wachter
3d69dc9bc4 Merge branch 'rv5-1.12' of github.com:GuntherDW/Applied-Energistics-2 into rv5-1.12 2017-07-14 21:52:24 +02:00
Gunther De Wachter
66c87a2fa2 Re-enabled the RF and IC2 handler, as well as their P2P tunnels. Added Forge Energy P2P tunnel. 2017-07-14 21:52:04 +02:00
Gunther De Wachter
fdab91323c Re-enabled the WAILA handler, using Hwyla. 2017-07-14 21:48:20 +02:00
Gunther De Wachter
98a8c3d06b Forgot to remove extra debug line before pushing to github. 2017-07-14 16:21:16 +02:00
Gunther De Wachter
458356a2be First attempt at combining the Block registration and TE registration whilst still keeping support for addons. 
It might need some refinement in the future.
 2017-07-14 04:47:40 +02:00
Gunther De Wachter
c91b432e09 Added exceptions to the Recipe handlers. Don't crash, but log to the console what went wrong. 2017-07-13 22:18:59 +02:00
Gunther De Wachter
d67d93b343 Fixed a couple recipes that were wrong during the transition. 2017-07-13 11:31:26 +02:00
Gunther De Wachter
f6f8da28af Fixed Recipe handler only giving out 1 item instead of the amount specified in the json. 2017-07-13 11:29:00 +02:00
Gunther De Wachter
76fd3c1166 Fix potential crash in the recipes when the material was replaced. 2017-07-13 09:30:39 +02:00
Gunther De Wachter
3da881829e Fixed recipe crash when another mod registers a wooden gear. 
I'll have to go through every other recipe later.
 2017-07-13 09:03:18 +02:00
Gunther De Wachter
90ee7fb15d Fixed last commit. I should never trust kate's syntax hilighting in the future again. 2017-07-13 04:49:10 +02:00
Gunther De Wachter
e5e2714273 Really fixed NotNull this time. My local git repo got desync'ed for a bit. 2017-07-13 04:44:05 +02:00
Gunther De Wachter
1534521362 Fixed wrong interface being used for the NonNull ItemStacks causing issues. 2017-07-13 04:21:15 +02:00
Gunther De Wachter
0f8204cd93 Fixed serversided issue. Forgot to check for uses of isEnabled before changing it to a clientside only method. 2017-07-13 04:18:33 +02:00
Gunther De Wachter
eb11845a2f Fixed applying the type of tunnel for P2P tunnels. 
This was caused by the enforced lowercase mod id's and item names since 1.11.
 2017-07-12 06:04:06 +02:00
Gunther De Wachter
fe213e5ac5 Add item handler capabilities to Item P2P tunnels. 2017-07-12 06:02:31 +02:00
Gunther De Wachter
25c82b2c9f Forgot to remove test recipe. 2017-07-11 05:12:47 +02:00
Gunther De Wachter
d03faae983 JSON Recipes initial import. 
Moved the old recipe handler to a different direct to not confuse the vanilla/forge JSON loader.
 2017-07-11 04:50:02 +02:00
Gunther De Wachter
76e19874cf Small code cosmetics and null checks update. 2017-07-09 13:44:11 +02:00
Gunther De Wachter
1975c3c262 Moved makeUnique() a bit back to fix almost every AE item being disabled. 2017-07-09 13:43:16 +02:00
Gunther De Wachter
720feb4f16 Iron nuggets are vanilla nowadays. There's no sense in keeping them around in AE2. 2017-07-09 11:33:22 +02:00
Gunther De Wachter
588579d67f Updated CoFH RF API. Removed the old API from thirdparty/. 
Those files are available from their maven server now.
 2017-07-09 10:34:34 +02:00
Gunther De Wachter
043f6e9919 Fixed ME Drive not rendering in-world. 2017-07-09 10:10:56 +02:00
Gunther De Wachter
cc7824a0e5 Merge remote-tracking branch 'origin/rv5-1.12' into rv5-1.12 2017-07-09 07:18:45 +02:00
Gunther De Wachter
a57cd3f580 More 1.12 shenanigans. Still far from done. 2017-07-09 07:17:24 +02:00
tyra314
3008088ad7 Fixes creative tab leak 2017-07-08 11:26:51 +02:00
Gunther De Wachter
198ea9f16e Fixed crash caused by delayed block registration. 
Added Callback section for the Model Registry event to the builder setup.
Moved the State Mapper section to the Model Registry Callback section.
 2017-07-06 14:05:54 +02:00
Gunther De Wachter
d8c5e6a5fa Fixed UI background not being drawn. 
Mezz removed said displayGuiScreenWithoutClose() so said workaround can be removed.
 2017-07-06 08:07:51 +02:00
Gunther De Wachter
fbcf8c4705 Highly incomplete code. First work on porting to 1.12. Still need to rework a LOT of things. 2017-07-06 01:57:19 +02:00
Gunther De Wachter
d67f97cd16 FMLRelaunchLog is deprecated in favour of FMLLog. Small grammatical fixed as well. 
They want you to get a logger in the PreInit phase, but seeing as we are a coremod we run before those events take place.
 2017-07-04 17:50:10 +02:00
Gunther De Wachter
0e2f8a22a2 Decided to go for a more "separated" TE registration. 
This will still make it so addons still get to add custom blocks without having to change too much of the internals.

It still needs thorough testing though. I don't want to change this too much because it ruins older worlds.
 2017-07-04 15:40:57 +02:00
Gunther De Wachter
20fc0e136d Fixed more bugs caused by the new mappings. 2017-07-03 09:11:06 +02:00
Gunther De Wachter
7f7495f1df Fixed bug caused by mapping update, not being able to rclick on parts on a certain side. 2017-07-03 08:20:13 +02:00
Gunther De Wachter
e6e858820f Updated forge and added some more stuff from the new mappings. 2017-07-03 07:34:24 +02:00
Gunther De Wachter
4679b0ee61 Forgot to add this file for the Named Inventories fix. 2017-07-03 06:56:03 +02:00