c97165cc63
Fix NPE in MEMonitorIInventory.onTick ( #2972 )
2017-07-22 21:24:19 +02:00
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
f70e97046f
Fixes PatternTerminal crafting issue ( #2964 )
2017-07-22 01:12:07 +02:00
3a053d9ebe
Fixes PatternTerminal clearing crafting slot on tried crafting ( #2963 )
2017-07-22 01:11:42 +02:00
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
a24ed38e90
Added missing Override annotations
2017-07-20 21:28:16 +02:00
15582fd1df
Always use qualified access for fields and methods
2017-07-20 21:27:22 +02:00
f9cad0758d
Always use {} for control statements
2017-07-20 21:24:58 +02:00
406013142e
Superfluous whitespace removal
2017-07-20 21:23:01 +02:00
7de90ed0ae
Finally use Java7 <>
2017-07-20 21:21:45 +02:00
8ec8babb6a
Organised imports
2017-07-20 21:18:49 +02:00
621910df91
Format sourcecode
2017-07-20 21:17:10 +02:00
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
87f6a63f47
Fixed seeds and P2P bus not having a localised name.
2017-07-19 13:55:09 +02:00
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
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
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
dc0447d137
This layer isn't needed for the traversal of Forge Energy.
2017-07-15 00:49:13 +02:00
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
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
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
fdab91323c
Re-enabled the WAILA handler, using Hwyla.
2017-07-14 21:48:20 +02:00
98a8c3d06b
Forgot to remove extra debug line before pushing to github.
2017-07-14 16:21:16 +02:00
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
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
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
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
90ee7fb15d
Fixed last commit. I should never trust kate's syntax hilighting in the future again.
2017-07-13 04:49:10 +02:00
e5e2714273
Really fixed NotNull this time. My local git repo got desync'ed for a bit.
2017-07-13 04:44:05 +02:00
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
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
fe213e5ac5
Add item handler capabilities to Item P2P tunnels.
2017-07-12 06:02:31 +02:00
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
76e19874cf
Small code cosmetics and null checks update.
2017-07-09 13:44:11 +02:00
1975c3c262
Moved makeUnique() a bit back to fix almost every AE item being disabled.
2017-07-09 13:43:16 +02:00
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
043f6e9919
Fixed ME Drive not rendering in-world.
2017-07-09 10:10:56 +02:00
cc7824a0e5
Merge remote-tracking branch 'origin/rv5-1.12' into rv5-1.12
2017-07-09 07:18:45 +02:00
a57cd3f580
More 1.12 shenanigans. Still far from done.
2017-07-09 07:17:24 +02:00
3008088ad7
Fixes creative tab leak
2017-07-08 11:26:51 +02:00
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
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
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
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
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
20fc0e136d
Fixed more bugs caused by the new mappings.
2017-07-03 09:11:06 +02:00
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
e6e858820f
Updated forge and added some more stuff from the new mappings.
2017-07-03 07:34:24 +02:00
4679b0ee61
Forgot to add this file for the Named Inventories fix.
2017-07-03 06:56:03 +02:00
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
fscan