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

691 commits

Author SHA1 Message Date
yueh
f955febb5d Merge pull request #1782 from yueh/fix-1781 
Fixes #1781: Do not crash after the tileentity was removed
 2015-08-15 18:10:44 +02:00
yueh
3115147edf Merge pull request #1774 from yueh/fix-1481 
Fixes #1481: Updated cell itemcount when empty
 2015-08-15 18:10:30 +02:00
thatsIch
322b296639 Fixes #1786: Locale critical code now uses the english local for transmission. Fixes Turkish Problem. 
Applied English Locale where localization is not expected as in internal recipe handling and IMC handling, basically which interacts with public API where we either require to enforce the incoming text with regex ([a-z0-9]) or just expect proper usage of the API, but with just using upper cases in recipe files it would break in Turkish Locale like

ALIAS

another option would have been to use `equalsIgnoreCase` in some cases, but not all applicable
 2015-08-10 13:34:31 +02:00
yueh
d1244f59ed Fixes #1781 Do not crash after the tileentity was removed 2015-08-08 14:14:38 +02:00
yueh
6a18102ea0 Fixes #1481: Updated cell itemcount when empty 2015-08-06 23:04:57 +02:00
yueh
300a9618b6 Fixes #1601: Do not allow 0 as stacksize for recipes 2015-08-06 22:47:24 +02:00
yueh
dfb435ae7d Removed unused imports 2015-08-06 19:49:56 +02:00
yueh
1728f683c3 Closes #1726: Added Pressure P2P tunnel (PneumaticCraft) 2015-08-06 19:37:19 +02:00
yueh
c0b62fd519 Added missing annotations 2015-08-06 19:08:33 +02:00
yueh
67c901966e Non static access of static members 2015-08-06 19:08:32 +02:00
yueh
a5287f6779 Qualified field and method access 2015-08-06 19:08:04 +02:00
yueh
8234c6dbb5 Added missing blocks for control statements 2015-08-06 19:08:03 +02:00
yueh
9c8deac9de Code format 2015-08-06 19:08:02 +02:00
yueh
c21a44d8c0 Organize imports 2015-08-06 19:06:49 +02:00
yueh
51c92d3dfb Merge pull request #1732 from yueh/fix-1718 
Use the correct resolver for crystal seeds
 2015-07-25 18:29:13 +02:00
yueh
c3ce9d9542 Adds a round robin and random mode to export buses. 
Resolves #85
 2015-07-25 17:27:56 +02:00
yueh
15993eb3c7 Merge pull request #1695 from yueh/b-prevents-crafting-of-disabled-parts 
Prevents crafting of disabled parts
 2015-07-24 22:27:21 +02:00
yueh
48d1a5aa88 Merge pull request #1687 from yueh/fix-1686 
Fixes #1686: Let PlayerRegistry handle nonexistent players
 2015-07-24 22:26:00 +02:00
yueh
3826b3b51f Merge pull request #1730 from yueh/fix-1728 
Fixes #1728 Mark the entity as dead before spawning overflow
 2015-07-24 22:25:43 +02:00
yueh
6f5a2888c0 Fixes #1710 Use the correct culling face for the meteor compass 2015-07-22 16:58:50 +02:00
yueh
6d42032738 Fixes #1718 Use the correct resolver for crystal seeds 2015-07-22 16:00:18 +02:00
yueh
1a38e5ba94 Fixes #1728 Mark the entity as dead before spawning overflow 2015-07-22 15:07:08 +02:00
yueh
ff3e51018f Fixes #1686: Let PlayerRegistry handle nonexistent players 2015-07-14 22:48:37 +02:00
yueh
65c47d4c4e Merge pull request #1633 from TheCricket/patch-2 
Allows the automation of Vibration Chambers with lava buckets
 2015-07-14 21:31:16 +02:00
yueh
d7486fec3c Merge pull request #1647 from yueh/fix-1646 
Fixes #1646 Save GridStorage properly
 2015-07-14 21:30:50 +02:00
yueh
796b6dc7a2 Merge pull request #1709 from yueh/fix-1706 
Fixes #1706 Adds a test to disable unsupported BetterStorage integration
 2015-07-14 21:30:30 +02:00
yueh
67b261cc7c Merge pull request #1698 from yueh/fix-1648 
Fixes #1648 Removes unecessary cast to BlockQuartzTorch
 2015-07-14 21:30:19 +02:00
yueh
3fb3f70392 Merge pull request #1678 from yueh/fix-1673 
Removed overly defensive code and ensure GL state to be restored.
 2015-07-14 21:30:03 +02:00
yueh
49321d72c1 Merge pull request #1667 from yueh/fix-1666 
Fixes #1666 Missing check for the memory card
 2015-07-14 21:29:49 +02:00
yueh
62fb0dc7f7 Merge pull request #1665 from yueh/fix-1656 
Fixes #1656 Reduces the amount of block updates a controller sends.
 2015-07-14 21:29:39 +02:00
yueh
e9e9535f2a Merge pull request #1635 from thatsIch/e-export-oredicts 
Exports the ore-dicts out of the recipe files
 2015-07-14 21:29:18 +02:00
yueh
ab9f4e7fd7 Merge pull request #1604 from yueh/e-immutable-inscriber-recipes 
Changed to immutable list to prevent direct modifcations
 2015-07-14 21:28:41 +02:00
yueh
1080b65404 Fixes #1706 Adds a test to disable unsupported BetterStorage integration 2015-07-14 20:49:39 +02:00
yueh
c823e1464b Ensure that disabled parts are actually disabled and removed. 2015-07-10 18:35:22 +02:00
yueh
4ba722cb51 Fixes #1648 Removes unecessary cast to BlockQuartzTorch 2015-07-10 18:16:27 +02:00
thatsIch
91b8d30a15 Fixes #1474: Prevents crafting of disabled recipes and deletes invalid parts 2015-07-09 13:35:31 +02:00
yueh
1c2df4f380 Reset the lastUsedChannels on a gridstorage change 2015-07-06 09:54:05 +02:00
yueh
3f013c8d1d Removed overly defensive code and ensure GL state to be restored. 
Fixes #1673
 2015-07-04 17:30:54 +02:00
yueh
4e46dc08af Fixes #1666 Missing check for the memory card 2015-07-01 22:01:46 +02:00
yueh
f5e3ae8949 Fixes #1656 Reduces the amount of block updates a controller sends. 2015-07-01 20:26:04 +02:00
yueh
b2c31e20b2 Fixes #1646 Save GridStorage properly 2015-06-26 00:35:59 +02:00
thatsIch
cd0aec123d Exports the ore-dicts out of the recipe files 
This will not alter the handler, because rewriting the parser for it being too static is not feasible at this point
 2015-06-21 23:57:36 +02:00
yueh
3844f3af87 Merge pull request #1619 from yueh/fix-1618 
Removed meta based rotation of CGA
 2015-06-21 20:33:54 +02:00
Cricket
1cc118c927 Allows the automation of Vibration Chambers with lava buckets 2015-06-21 12:57:59 -04:00
yueh
4acec30a66 Removed meta based rotation of CGA 
Fixes #1618
 2015-06-17 21:42:35 +02:00
thatsIch
ab32b2b357 Merge pull request #1600 from thatsIch/b-1599-precondition-failing-of-world-data 
Fixes #1599: Removes preconditions for world data and children
 2015-06-17 20:13:27 +02:00
thatsIch
db4a6c6cc0 Fixes #1599: Removes preconditions for world data and children 2015-06-16 19:26:37 +02:00
yueh
85de600d16 Splitted channeldata into two ints 
Previously it did encode the current and previous used channels into the
same as well as mask it with 0xFF. Which lead to an overflow every 256
gridnodes requiring a channel. This will not happen at > 2^31

Also removes the need to bitshift them for every access.

Fixes #1510
 2015-06-16 14:57:04 +02:00
yueh
6b47bf3ce8 Changed to immutable list to prevent direct modifcations 2015-06-16 00:18:01 +02:00
thatsIch
e5f59e0a00 Updates Forge to 1.7.10-10.13.4.1448-1.7.10 
the public field fluidID was removed and was replaced with the public getter
 2015-06-14 09:46:44 +02:00
thatsIch
2ba4f312d4 Fixes wrong interface names for BuildCraft Transport 2015-06-13 23:42:40 +02:00
thatsIch
2274ca79e4 Merge pull request #1578 from thatsIch/b-1559-infinite-recursion-crash 
Fixes #1559: Level Emitter with P:R alloy wire does not crash anymore
 2015-06-13 22:45:28 +02:00
thatsIch
a75dee0d08 Fixes #1559: Level Emitter with P:R alloy wire does not crash anymore 
Required to implement a more advanced interface, if not done that way, the parts will update themselves recursively
 2015-06-13 17:24:30 +02:00
thatsIch
349ac7e0a0 Merge pull request #1590 from thatsIch/b-1588-same-oredict-name-for-certus-ore-and-charged 
Fixes #1588: Charged Certus Quartz Ore has its own oredictionary entry
 2015-06-13 17:17:54 +02:00
thatsIch
b5d0db493b Fixes #1588: Charged Certus Quartz Ore has its own oredictionary entry 2015-06-13 17:06:24 +02:00
yueh
256c0258bb Merge pull request #1522 from yueh/feature-12 
Closes #12 Added visual lock state to monitors
 2015-06-13 16:55:03 +02:00
yueh
73ffbb268a Merge pull request #1577 from yueh/fix-1567 
Moved ETA to the title and also no longer display for empty jobs
 2015-06-13 16:50:01 +02:00
thatsIch
d1e4ea6579 Improves the message generated when generating the folder for the compass data. 
Outsources the encoding of the compass data into the file name
Written tests for the encoding
Did some internal cleaning of the class
 2015-06-13 16:05:59 +02:00
thatsIch
71ce42f26a Updates BuildCraft to 7.0.9 
Split dependency logic on the BuildCraft modules.
Config needs to be reset, if BuildCraft was disabled actively,
because now there are 3 BC modules to be taken account of
 2015-06-13 13:10:46 +02:00
yueh
cb013cf55b Moved ETA to the title and also no longer display for empty jobs 
Fixes #1567
 2015-06-11 20:00:47 +02:00
yueh
53c4529d7a Fixes #1574 Light detector no longer emitting light 2015-06-11 11:51:15 +02:00
yueh
5aaaeb6d42 Closes #12 Added visual lock state to monitors 
Some general refactoring of every monitor including panels and terminals.
Disabled glPushAttrib and glPopAttrib for StorageMonitor as this can be a
performance issue.
 2015-06-06 17:00:52 +02:00
Uristqwerty
e1ff0fe5ef Cleaned up CraftGuide Integration 
A NPE caused to open CraftGuide very slowly (several seconds)

Added Grinder recipes
Added Inscriber recipes
 2015-06-06 13:36:00 +02:00
yueh
05f90760f2 No longer invalidate the cache of MEMonitorIInventory on simulate. 
Should fix #1036
 2015-06-05 19:35:52 +02:00
thatsIch
17465e68e8 Merge pull request #1453 from thatsIch/f-1452-auto-gen-custom-recipes 
Closes #1452: Implements auto-generation of custom recipes
 2015-06-03 23:18:35 +02:00
thatsIch
7a731ec658 Closes #1541: Implements Thermal Dynamics attunements 
Adds itemduct to item P2P
Adds fluiducts to fluid P2P
Adds fluxduct to RF P2P
 2015-06-02 22:21:37 +02:00
thatsIch
3a9296f453 Merge pull request #1537 from thatsIch/b-1536-bc-checking 
Fixes #1536: Checking for all required BC classes
 2015-06-01 20:45:15 +02:00
yueh
6e76690835 Fixes #1517 improved performance of TESRWrapper 2015-06-01 19:57:14 +02:00
yueh
776d68bb03 Merge pull request #1486 from yueh/feature-1259 
Closes #1259 ETA for crafting jobs
 2015-06-01 19:51:47 +02:00
yueh
4befdecd25 Closes #1344 Added a silk touch annihilation plane 2015-06-01 19:50:38 +02:00
yueh
2d7917de14 Splits AEBaseBlock into AEBaseBlock + AEBaseTileBlock 2015-06-01 19:38:46 +02:00
thatsIch
6e881fac2d Fixes #1536: Checking for all required BC classes 2015-06-01 19:14:45 +02:00
thatsIch
0076f2ea51 Closes #1452: Implements auto-generation of custom recipes 2015-06-01 17:37:25 +02:00
thatsIch
2722057c81 Merge pull request #1527 from thatsIch/b-1521-wrong-stable-channel 
Fixes #1521: Renames release to stable
 2015-05-30 22:30:07 +02:00
thatsIch
d6f29464c6 Fixes #1521: Renames release to stable 2015-05-30 19:52:06 +02:00
PetaByteBoy
c00962b044 add slabs 2015-05-23 15:02:29 +02:00
TheJulianJES
ade5e23458 Changed version from PartStack provider to rv2 (rv2) 
because @thatsIch merged it also to rv2
 2015-05-23 13:49:54 +02:00
yueh
61dfc05ae0 Added a simple ETA to crafting jobs 2015-05-21 21:31:13 +02:00
thatsIch
25fd03cb88 Revert cast to match Java 6 2015-05-21 21:00:45 +02:00
thatsIch
4a19ea4c68 Merge pull request #1447 from jeremiahwinsley/master 
Fix for #1384 - Infinite Power
 2015-05-19 21:06:48 +02:00
yueh
ecf2f3fdaf Merge pull request #1478 from yueh/fix-1465 
Fixes #1465 faulty item comparison
 2015-05-19 00:53:53 +02:00
yueh
f3db010303 Merge pull request #1461 from yueh/fix-1389 
Fixes #1389 Enabled repeatable keyboard events
 2015-05-19 00:53:22 +02:00
Jeremiah Winsley
020740bf43 Fixes #1384 - implement AdvancedShaftPowerReceiver for RotaryCraft powersink 2015-05-18 14:38:38 -04:00
thatsIch
682c674696 Merge pull request #1467 from TheJulianJES/wailaStackPart 
Fix #1362 - Parts display in WAILA
 2015-05-18 19:35:14 +02:00
yueh
7fa7502770 Fixes #1465 faulty item comparison 2015-05-18 19:31:18 +02:00
thatsIch
962c7c0a92 Merge pull request #1468 from TheJulianJES/noRFtooltip 
Removes default RF tooltip on WAILA 1.5.9+
 2015-05-18 19:28:31 +02:00
thatsIch
12e0efa3e1 Merge pull request #1466 from thatsIch/e-instance-factory 
Uses an instance factory access for AE2
 2015-05-18 19:26:46 +02:00
thatsIch
a349e1a277 Usage of CONSTANTS 2015-05-18 08:59:27 +02:00
thatsIch
b72c766c16 Split raytrace 2015-05-18 00:37:06 +02:00
thatsIch
72eab029ab Static imports 2015-05-18 00:34:50 +02:00
thatsIch
3613c235be Unused imports 2015-05-18 00:34:37 +02:00
thatsIch
880ea762e5 missing javadoc 2015-05-18 00:34:14 +02:00
thatsIch
83c9c0efcb Better hyphing 2015-05-18 00:33:39 +02:00
thatsIch
733a53ec6d Typo in 'fward' 2015-05-18 00:33:04 +02:00
thatsIch
8c500c4016 Typo in 'fward' 2015-05-18 00:32:46 +02:00
thatsIch
abdd6e1915 Typo in 'constructor' 2015-05-18 00:31:41 +02:00
thatsIch
209333989e Typ in chisldQuartz 2015-05-18 00:31:16 +02:00
thatsIch
2803a671d1 Redundant type casts 2015-05-18 00:30:08 +02:00
thatsIch
1cf2e8d43e Instance field access not qualified with 'this' 2015-05-18 00:12:45 +02:00
thatsIch
e7746dc037 Static imports 2015-05-18 00:12:13 +02:00
thatsIch
72195ea784 Unused imports 2015-05-18 00:12:01 +02:00
thatsIch
f102c3b468 apply constant naming convention 2015-05-18 00:11:18 +02:00
thatsIch
f0215ca56a apply method parameter naming convetion 2015-05-18 00:09:09 +02:00
thatsIch
0f9ca7885a Lower case methods 2015-05-18 00:08:05 +02:00
thatsIch
124d14d3c3 Lower case Swap 2015-05-18 00:02:28 +02:00
thatsIch
f9e25b5a33 Lower case method name 2015-05-17 23:52:15 +02:00
thatsIch
72d85aecc9 Use interface for collections 2015-05-17 23:51:57 +02:00
TheJulianJES
0bfb7b7ed3 Removes default RF tooltip 
Removed tab

Did something
 2015-05-17 20:22:01 +02:00
TheJulianJES
e82e8a039b Parts display correctly in WAILA 
Register an method that can be overidden

Register the same method in the interface

New class that picks the item and displays it to WAILA

Register the new class and call the other class method

Import in PartWailaDataProvider

Fixed errors

Renamed all Display -> Stack

Stuff
 2015-05-17 20:03:32 +02:00
thatsIch
192848e383 Uses an instance factory access for AE2 
Removes the improper way to set itself into a public static non-final variable.
Removes the direct access to the IntegrationRegistry from AppEng. Will be added at some later point somewhere else for non-singleton access.
Constructor is set to package private to enable possible construction from unit tests. Are current not runnable sind it is currently tied to the FML Loader instance.
 2015-05-16 20:48:32 +02:00
yueh
96e79e9d9c Fixes #1389 Enabled repeatable keyboard events 2015-05-16 11:34:18 +02:00
TheJulianJES
0085909914 Don't add the player inventory two times (Inscriber) 2015-05-10 17:55:10 +02:00
TheJulianJES
afb9bb4379 Meteorites can now spawn in stained clay biomes 2015-05-10 11:37:42 +02:00
TheJulianJES
82efa151cc Fix warnings in eclipse 
Close scanner instead of doing it with a warning

Make the scanner final..
 2015-05-09 23:10:23 +02:00
thatsIch
71569cadb5 Merge pull request #1424 from thatsIch/e-simplified-bitwise-operations 
Simplified bitwise operation
 2015-05-09 15:58:04 +02:00
thatsIch
1d737c3167 Merge pull request #1425 from thatsIch/e-weaker-collection-type 
Use weaker collection types
 2015-05-09 15:57:57 +02:00
thatsIch
168038c595 Merge pull request #1426 from thatsIch/e-overly-strong-cast 
reduces overly strong type cast
 2015-05-09 15:57:47 +02:00
Florian Nücke
18503ac526 Added P2P tunnel part for OpenComputers. 
Includes cleanup provided by thatsIch.
 2015-05-09 14:53:54 +02:00
yueh
b6b76d145b Organize imports 2015-05-09 13:06:09 +02:00
thatsIch
7c9b734948 reduces overly strong type cast 2015-05-09 12:45:46 +02:00
thatsIch
16c0fbe3c1 Use weaker collection types 2015-05-09 12:33:16 +02:00
thatsIch
513292cd08 Replaces all local variables regarding their naming conventions 2015-05-08 23:50:36 +02:00
thatsIch
d8ac614a17 Merge pull request #1423 from thatsIch/e-import-issues 
Replaces * and static imports with more readable ones
 2015-05-08 23:45:51 +02:00
thatsIch
8dd0991a7d Merge pull request #1422 from thatsIch/e-constant-naming-convention 
Replaces all constants regarding their naming conventions
 2015-05-08 23:45:44 +02:00
thatsIch
5832e2d828 Merge pull request #1420 from thatsIch/e-method-parameter-naming-conventions 
Replaces all method parameter regarding their naming conventions
 2015-05-08 23:45:28 +02:00
thatsIch
c451a25c7f Merge pull request #1419 from thatsIch/e-non-constant-field-with-upper-case-name 
Replaces all non constant fields with upper case name
 2015-05-08 23:45:15 +02:00
thatsIch
9d4fd64c58 Merge pull request #1417 from thatsIch/e-reflection-stuff 
Removes the unneeded information about the current class in all blocks
 2015-05-08 23:45:02 +02:00
thatsIch
42c7cca64f Simplified bitwise operation 2015-05-08 23:44:07 +02:00
thatsIch
7f61ebebc8 Replaces * and static imports with more readable ones 2015-05-08 23:40:31 +02:00
thatsIch
7f14faeaa3 Replaces all constants regarding their naming conventions 2015-05-08 23:37:09 +02:00
thatsIch
f193c2adc4 Replaces all method parameter regarding their naming conventions 2015-05-08 23:25:19 +02:00
thatsIch
b748a1982f Replaces all non constant fields with upper case name 2015-05-08 22:53:50 +02:00
thatsIch
a44369a272 More efficient iteration 2015-05-08 22:42:08 +02:00
thatsIch
25a3573a76 Fix typos 2015-05-08 22:38:04 +02:00
thatsIch
9845e2a463 Merge pull request #1414 from thatsIch/e-1413-removal-of-rb 
Closes #1413: Removes RB integration since lacking 1.7.10+ support
 2015-05-08 19:44:09 +02:00
thatsIch
dbacb566bb Removes the unneeded information about the current class in all blocks 
Every Block had a call to its super, passing its own class.
This can easily be simulated by calling `this.getClass()` in the super class.
Also this was basically only used as using a name.
In the future it might be advisable to not use such methods,
since they are prone to refactoring.
 2015-05-08 19:03:03 +02:00
thatsIch
96576a7fc5 Closes #1413: Removes RB integration since lacking 1.7.10+ support 2015-05-08 18:58:37 +02:00
thatsIch
81464d7de1 Closes #1404: Added logo to AE2 2015-05-08 18:47:18 +02:00
thatsIch
1baed48b0a Merge pull request #1372 from thatsIch/b-1368-vibration-chamber-comparator 
Fixes #1368: Vibration Chamber notifies neighbors on inventory change and state change
 2015-05-03 16:24:26 +02:00
yueh
da6b31cdb1 Merge pull request #1352 from yueh/fix-1336 
Fixes part interface inventory model
 2015-05-02 20:39:42 +02:00
thatsIch
875214c166 Adds annotations by contract of the interface 2015-05-02 15:39:59 +02:00
thatsIch
a9ec31d72f Merge pull request #1332 from thatsIch/b-1331-crash-on-disabled-material 
Fixes #1331: Happened on deactivating features for intermediate crafting components
 2015-05-02 07:24:36 +02:00
thatsIch
e392ecd08d Fixes #1368: Vibration Chamber notifies neighbors on inventory change and state change 2015-05-01 17:58:59 +02:00
thatsIch
03f9436ef9 Fixes #1331: Happened on deactivating features for intermediate crafting components 
If a feature dependency of ItemMultiMaterial was disabled, the returned value was never assigned with the constructed. Pulling out the construction and setting it before checking it, prevents the NPE and also matches the behaviour in ItemMultiPart, where parts are constructed, but never registered.
 2015-05-01 17:52:23 +02:00
yueh
f15561c4dc Added missing check to detect missing cell workbenches 
Fixes #1360
 2015-05-01 12:48:08 +02:00
thatsIch
64ed05a1b4 Puts everywhere brackets 2015-04-29 18:38:24 +02:00
thatsIch
23aa8fd72d Merge pull request #1337 from thatsIch/e-1333-recipe-sorter 
Fixes #1333: Updated old code parts related to recipes
 2015-04-28 19:44:55 +02:00
yueh
332ea089e3 Fixes part interface inventory model 
Fixes #1336
 2015-04-28 19:13:51 +02:00
thatsIch
9210069d9b Fixes #1333: Updated old code parts related to recipes 
Fixed an additional bug, where the disassembling recipes were not working properly. The fail logic was flawed, so that it would never match the recipe
 2015-04-28 18:37:46 +02:00
thatsIch
e85acf2bee Fixes #1339: Was not able to retrieve the name of an unregistered part 
Added an additional map to store all parts and be able to access them if needed.
Added public preconditions
Added private asserts
Excluded public overridden methods, since behaviour can be unexpected
 2015-04-27 09:51:40 +02:00