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

2871 commits

This branch
This branch
All branches
Author SHA1 Message Date
yueh
4c7f065af3 Fixes #2729: Fix transformer regression introduced during FG downtime. (#2730) 
Added a unittest to verify the necessary string returns match the actual
existing classes, in case something screws up the refactoring.
 2017-06-29 06:00:23 +02:00
yueh
6c52f31686 Replaces old fluid handlers with the new capability based ones. (#2727) 
* Changed ME Chest and P2P tunnels to use fluid capabilities.
* Renamed all occurrences of liquid to fluids.
 2017-06-29 05:57:43 +02:00
Gunther De Wachter
3ac7e518b1 Fixed compile error from cherry-picked commit. 2017-06-29 05:47:51 +02:00
yueh
af85a2bf67 Fixes #2713: Call super#onBlockActivated() for wrench interaction. (#2728) 2017-06-29 05:39:31 +02:00
Gunther De Wachter
c4b4a257f3 Removed old ASMIntegration file, the rename didn't get picked up by the cherry-pick 2017-06-29 05:39:11 +02:00
yueh
4eba3bca5b Fixes IDE not correctly cleaning up the list of staged files. 2017-06-29 05:35:50 +02:00
yueh
cd78586910 Fixes #2768: Incorrect return value when charging items via Tesla. (#2771) 2017-06-29 05:26:00 +02:00
Gunther De Wachter
178198b0c6 Fixed render issue with cables/certain blocks on a specific side. 2017-06-29 04:16:35 +02:00
Gunther De Wachter
bdf46a6ee2 Fixed hoppers continuing to insert when they shouldn't into inscribers. Thanks @fscan 
Original pull request : #2933
 2017-06-28 18:11:11 +02:00
Gunther De Wachter
0be2011645 Fixed blank patterns in the pattern terminal not decreasing when encoding a pattern. 2017-06-28 06:21:11 +02:00
Gunther De Wachter
bce500616c Fixed exception being thrown when placing last item of a stack of parts. 2017-06-28 06:19:17 +02:00
Gunther De Wachter
e022c23c8f Fixed crash on startup. Apparently there's still null's lurking in the code. 2017-06-27 20:52:56 +02:00
Gunther De Wachter
61b81fc802 Fix facade recipes. Hopefully the last null check fix. 2017-06-27 20:39:06 +02:00
Gunther De Wachter
b819fe4adb Fixed "Air" tooltip displaying in the interface terminal. More missed null checks. 2017-06-27 18:00:55 +02:00
Gunther De Wachter
66a797dd7c Fixed grindstone not working with crank due to missed null checks. 2017-06-27 17:20:13 +02:00
Gunther De Wachter
99c294e948 More aesthetic and typo fixes. 2017-06-27 04:04:48 +02:00
Gunther De Wachter
6529de911a Code aesthetics and typo fixes. 2017-06-26 16:35:50 +02:00
Gunther De Wachter
650edae902 More ItemStack null changes. 2017-06-26 07:07:04 +02:00
Gunther De Wachter
78904204cf Fixed inscriber not starting due to vanilla changes. 2017-06-26 07:06:19 +02:00
Gunther De Wachter
df7ab00c37 Fixed a null check when the array wasn't initialised yet. I should fix this up in the future though. 2017-06-26 05:43:08 +02:00
Gunther De Wachter
5432decf95 Fix items showing up as craftable when they weren't after taking out the last one. 2017-06-26 05:42:21 +02:00
Gunther De Wachter
da5879b667 First batch of null -> isEmpty() checks. 
I most likely still missed a ton of checks...
 2017-06-26 05:15:25 +02:00
Gunther De Wachter
370fc49357 Temporary (?) hacky fix to display the craftable items 
This is kind of a hackjob IMO but it saves me the trouble of possibly rewriting large portions of either the AE codebase or ASM'ing the vanilla classes.
 2017-06-25 18:01:30 +02:00
Gunther De Wachter
c74aaddbd3 Fixed texture issue for the crafting window. 2017-06-24 16:50:26 +02:00
Gunther De Wachter
1a4db4b8d7 Fixed taking items out of the AE system 
Same issue as last commit. ItemStacks with a count of 0 get "nullified".
 2017-06-24 16:45:28 +02:00
Gunther De Wachter
d77d21858e Fixed manually crafting items 
This can hopefully be done in a more sensible fashion later.
 2017-06-24 15:51:03 +02:00
Gunther De Wachter
42bfc549be Fixed drawing of items in storage. 
An ItemStack count of 0 trips the check for isEmpty and hence doesn't give us the item we want.
 2017-06-24 15:01:06 +02:00
Gunther De Wachter
c6bdf845a8 Add a temporary (?) method to register the TileEntities because the Forge method changed from 1.10 to 1.11.2. 2017-06-03 00:53:32 +02:00
Gunther De Wachter
ccc46e77a3 Fix the coremod looking for the wrong minecraft version 2017-06-03 00:01:01 +02:00
Gunther De Wachter
7e45cf0e37 Add the remainder of the WAILA/IC2 disable comments for now while we focus on fixing the core mod 2017-06-02 23:57:57 +02:00
Gunther De Wachter
86dd8193f7 Add/Change some missing code for the 1.11.2 upgrade 2017-06-02 23:55:31 +02:00
Gunther De Wachter
5fff8310d6 Update gradle and dependencies for 1.11.2 2017-06-02 23:37:27 +02:00
yueh
1cde7bc933 Changed to Null ItemStack instead of null. 2016-12-21 20:38:37 +01:00
yueh
ed9e6dd21c Port to 1.11 2016-12-21 20:38:36 +01:00
yueh
589730bfad Fixes #2707: Calculuate the correct AABB for a rotated skychest. 2016-12-17 23:47:42 +01:00
yueh
8700a79ca6 Fixes #2684: Avoid transforming charged quartz when dead. 2016-12-17 23:04:35 +01:00
yueh
a14cf2204d Fixes anchor rendering (#2698) 
* Fixes #2680: Use a shorter cable anchor model when blocked by a facade.
* Fixes #2664: Prevent anchors from creating intersection.

Replaced the simple List<ResourceLocation> for the static models with a
new container also indicating a solid part, which can be used to prevent
the creation of an intersection.
 2016-12-14 22:37:10 +01:00
yueh
8bed7f223e TheOneProbe integration (#2696) 
Displayed information is equal to current the WAILA integration.

Added a preInit stage to IIntegrationModule.
Added a factory method to IntegrationType to avoid touching
IntegrationNode for every new integration.

Fixes #2650
 2016-12-14 22:36:40 +01:00
yueh
db85419702 Restructured registry packages (#2703) 
Moved larger registries together with their related classes instead of putting unrelated classes into the same package.
 2016-12-14 22:35:52 +01:00
yueh
fb79fd284d Replaced Watcher using Collection with a more fitting interface (#2693) 
Replaced the watchers for energy, storage and crafting with a more fitting interface compared to a common collection.

Fixes #229
 2016-12-14 18:30:49 +01:00
yueh
e3305c1963 Update Forge to latest RB 
Updated JEI
 2016-12-14 17:46:16 +01:00
yueh
a3c85b4a59 Fixes #2699: Do not trust the stackSize in case of internal changes. 
An external inventory might change the stacksize of the slot we currently
are extracting from. Thus we have to cache the initial stackSize for a later
calculation of the extracted amount per slot.
As other inventories might NOT change the stacksize after a modification,
we can not use the stack reaching 0 as conditions to break.
 2016-12-14 11:25:49 +01:00
yueh
a2b20f1d67 Fixes #2689: Do not pass our own blockstate to the adjacent block. 2016-12-08 21:29:46 +01:00
yueh
86908b1ae6 Fixes #2647: Prevent crafting status from crashing due to missing network. 2016-12-08 13:07:25 +01:00
dshadowwolf
6bf52b0b0f Fixes constant reequip animation on portable cells/terminals (#2690) 
Fix for portable cell and wireless terminal going into re-equip animations when GUI is open.
 2016-12-08 12:34:41 +01:00
yueh
eb1e86cacb Refactored GrinderRegistry. (#2644) 
* Refactored GrinderRegistry.

Changed IGrinderRegistry#getRecipes to return an unmodifiable collection.
Added a way to remove recipes explicitly instead the internal list.
Added a cache to lookup recipes instead of iterating a list.

Renamed IGrinderEntry to IGrinderRecipe
Made IGrindRecipe immutable for easy caching.

Improved GrinderLogging and Exception Handling
JEI Workaround as it expects a List instead Collection.

* Added blacklist of explicit oredict names for the grindstone.

This can be used should the automatic recipe generation create unintended
loopholes.
 2016-12-02 23:47:50 +01:00
yueh
c405e725b2 Fixes #2667: Use new IC2 item names for P2P attunement. 2016-12-02 22:16:29 +01:00
yueh
d377af9a69 Fixes #2675: Set fullBlock correctly afterwards. 
Reduces the visibility of some methods as these should be access through the public methods of Block or the overridden ones.
Removes now useless getCheckedSubBlocks.
 2016-12-02 22:15:56 +01:00
yueh
12dbd17320 Fixes #2666: Restore inventory after powerloss and still avoid dupes. 2016-12-01 16:17:46 +01:00
yueh
5028c8025b Fixes #2669: Missing particle texture for pylons. 2016-12-01 10:56:01 +01:00