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
GuntherDW
33f54a1bd6
Merge pull request #8 from tyra314/creative-tab-leak
...
Fixes creative tab leak
2017-07-09 05:53:32 +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
Gunther De Wachter
890eef1803
Update MCP Mappings to stable_32
...
Some mapping updates are just straight up weird. 20170516 -> isBlockSolid, 20170517 -> causesDownwardCurrent
2017-07-03 06:54:45 +02:00
Gunther De Wachter
780ce89ac3
Internal change to fix Named Inventories. This change will not affect the reobfed version (much).
2017-07-03 05:54:25 +02:00
Gunther De Wachter
e96339dd2b
Fix more items and unsafe checks that made items get deleted.
2017-07-02 07:44:21 +02:00
Gunther De Wachter
b67d7eed82
Fixed tools getting deleted when being used in off-hand.
2017-07-02 07:33:16 +02:00
Gunther De Wachter
5ebd8452bf
Fixed another crash from the Entropy Manipulator.
...
I have no words for this one.
2017-07-02 06:57:40 +02:00
Gunther De Wachter
ee774cd3f8
Even more null fixes.
2017-07-02 06:43:33 +02:00
Gunther De Wachter
0a2f90d115
Fixed Entropy Manipulator crash.
2017-07-02 06:17:23 +02:00
Gunther De Wachter
0f86efa3f5
Added workaround for dispenser logic.
2017-07-02 06:05:43 +02:00
Gunther De Wachter
7398af0e1c
Add an ease of use tooltip to the creative cell. Displays the items provided/formatted by the cell.
2017-07-02 05:26:37 +02:00
Gunther De Wachter
eb0b304fd9
Even more null fixes.
2017-07-02 04:13:49 +02:00
Gunther De Wachter
c455ee69b8
When not shifting an encoded item pattern item should let the right click through.
2017-07-02 04:11:26 +02:00
Gunther De Wachter
820a6bdbd6
Fixed the ME system not finding any Crafting CPU's.
...
Might have to rework it a bit later. looks kind of ugly like this.
2017-07-01 09:08:43 +02:00
Gunther De Wachter
7a8499c455
Fixed tools not working due to a change in the onItemUse method fields in ItemStack.java
...
I will have to fix the dispenser logic. Manually right clicking works.
2017-06-30 19:17:06 +02:00
Gunther De Wachter
76f17ba53c
Fixed Network Tool crashing on null ItemStacks.
2017-06-30 18:35:38 +02:00
