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

172 commits

Author SHA1 Message Date
thatsIch 209333989e Typ in chisldQuartz 2015-05-18 00:31:16 +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
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 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 f193c2adc4 Replaces all method parameter regarding their naming conventions 2015-05-08 23:25:19 +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 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
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
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
thatsIch ca953f4596 Fixes #1327: Prevents crash when configuring a GUI 2015-04-25 20:09:53 +02:00
thatsIch eca598516e Fixes #1277: Removed config option for MJ-P2P Tunnel 2015-04-23 23:45:32 +02:00
thatsIch 77d66b1817 Merge pull request #1279 from thatsIch/b-1264-render-crash-missing-rf-api 
Fixes #1264: Does not crash on missing RF API
 2015-04-23 23:42:01 +02:00
thatsIch df370396b1 Merge pull request #1299 from thatsIch/e-qol-exception-messages 
Improved exceptions
 2015-04-23 23:41:44 +02:00
thatsIch ceeb84a439 Merge pull request #1302 from thatsIch/e-qol-parthelper 
Removes unrequired part helper getter, since it already existed
 2015-04-23 23:41:24 +02:00
yueh a6e2975677 Refactored the NEI handling to use an InventoryAdaptor 
Fixes #1310
 2015-04-23 15:00:34 +02:00
thatsIch 3783ae8619 Improved exceptions 
Many exceptions got an improvement due to changed class or description or details it is providing.
Is not complete, needs to be done in patches in the regions, where it is needed, since some are just
swallowed.

Removed total usage of pure RuntimeExceptions to 0.
 2015-04-21 17:43:24 +02:00
thatsIch be17616836 Removes unrequired part helper getter, since it already existed 2015-04-20 21:12:03 +02:00
thatsIch 071ae6d680 Fixes #1264: Does not crash on missing RF API 2015-04-13 22:15:39 +02:00
yueh fcea444041 Changed to LinkedHashSet to maintain insertion order 
Fixes #1230
 2015-04-07 12:28:45 +02:00
yueh 788de6d432 Merge pull request #964 from yueh/fix-889 
Fixes #889 possible dupe bug
 2015-04-06 15:54:23 +02:00
thatsIch 04a6a683bc Merge pull request #1220 from thatsIch/e-1219-hardcoded-localizations 
Fixes #1219: Improved localization options
 2015-04-06 15:44:36 +02:00
thatsIch 06bca227d0 Closes #1054: Adds an Inscriber API for Developers 2015-04-06 13:45:27 +02:00
thatsIch 8321a5fe1c Fixes #1219: Improved localization options 2015-04-06 13:37:40 +02:00
yueh eaf57bedf6 Modifier are now using a consistent order based on the java conventions 2015-04-06 00:35:42 +02:00
yueh 5416ea2365 Fixes 889 possible dupe bug 
Adds a hotfix to prevent duping with portable cells.
Should possibly fix the NPE crash with switching slots on laggy servers.
 2015-04-03 17:23:17 +02:00
thatsIch d34c988c88 Basic reformat, hit once, hope never again 2015-04-03 15:07:13 +02:00
yueh c699ed44aa Fixes api refactoring causing items to be null. 
This happens as nothing is registered with minecraft at this point, so it
will always return null for the ItemBlock.
 2015-04-02 14:33:39 +02:00
thatsIch 9986ffc458 Fixes #675 No disabled feature should log spam or crash anymore. 
Deprecates the old usage of the AEItemDefinitions via the direct method access of

* blocks()
* parts()
* items()
* materials()

and thus use the new re-direct via definitions().

All definitions are now initialized, no matter what. But SubItems, Items and Blocks are not registered, if by chance are disabled.
 2015-03-28 16:21:37 +01:00
thatsIch 0b86887962 Completes #854 Use superior file constructor to not care about file separator 2015-03-26 18:20:49 +01:00
thatsIch d1f2625262 Fixes #1099 Client crash on load up due to FML quirks 2015-03-26 13:57:08 +01:00
thatsIch b756a3f564 Final classes with private constructor 2015-03-26 12:25:44 +01:00
thatsIch dfa595ad2a Split logic of crash enhancement 2015-03-26 12:23:55 +01:00
thatsIch 81c32d5181 Multiple variables in one declaration 2015-03-26 12:13:34 +01:00
thatsIch b609b08f98 Null checks before instanceof 2015-03-26 12:12:40 +01:00
thatsIch 58db877006 Replaced dynamic regular expressions with compiled pattern 2015-03-26 11:33:08 +01:00
thatsIch d8f452b665 Unnecessary enum modifiers 2015-03-26 11:21:55 +01:00
thatsIch 9bf8b4388f Extract ++ and -- from expressions 2015-03-26 11:07:26 +01:00
thatsIch 6aeca93b85 Unnecessary modifier in enums 2015-03-26 11:03:15 +01:00
thatsIch 05f522580b Unnecessary Javadoc link point to containing class 2015-03-26 10:53:09 +01:00
thatsIch 1067d30264 Merge pull request #1078 from thatsIch/b-1077-hotfix-packet-size 
Fixes #1077 Hotfix: Opening a terminal will not crash as fast anymore in systems with many items.
 2015-03-25 12:19:49 +01:00
thatsIch 3745e6ce8d Fixes #1076 Crash on shift clicking a recipe from NEI 2015-03-24 13:42:32 +01:00
thatsIch a1f43ff51a Fixes #1077 Hotfix: Opening a terminal will not crash as fast anymore in systems with many items. 2015-03-23 16:36:06 +01:00
thatsIch 4552394f6e Removes deprecated method access of LocatableRegistry and getPickBlock 2015-03-21 16:03:26 +01:00
thatsIch 6baf952904 Fixes #976 Now uses GitHub to retrieve most current version 
Reworked whole Version Checker with an extensible interface to add any other service later on easier.
The version checker now has its own config file, to collect the different options and extract them from the main config file.
In that you can specify how fine the versions should be checked.
 2015-03-17 07:18:49 +01:00
yueh 136f5d7314 Merge pull request #1037 from yueh/fix-1030 
Fixes #1030 IndexOutOfBoundsException caused by using wrong index
 2015-03-16 11:23:49 +01:00
yueh a83e4b7c3d Fixes #1030 IndexOutOfBoundsException caused by using wrong index 2015-03-15 19:55:58 +01:00
thatsIch 7dedd4700f Fixes #1024 Added zinc to the grindstone, which is part of Flaxbeards Steam Power (FSP) 
Added zinc to the array of checked ore dictionary names, so if any mod decides to add Zinc in the future or uses it via the OreDictionary, it will be automatically added to the grindstone.

The commit also contains some scoping and code cleanup of the underlaying calls
 2015-03-15 09:02:23 +01:00
yueh f0482dd391 Fixes #1015 no longer eat a single item when not able to satisfy the recipe 2015-03-12 19:07:59 +01:00
thatsIch dd1ca1e286 Fixes #861 Wireless Terminal notifies player, if it is unlinked 2015-03-11 09:00:40 +01:00
thatsIch e300bf93fd Fixes #743 crash with plugs, fixes #942 builder integration, closes #319 BC 6 prep 2015-03-09 13:10:43 +01:00
yueh 6476a519bb Added an option to disable the colored crafting status 2015-02-27 13:43:08 +01:00
yueh b18addbf37 remove trailing whitespaces 2015-02-03 12:04:13 +01:00
yueh c10c809c9e Merge pull request #734 from yueh/feature-formation-plane-drop-blocks 
Formation plane can now drop blocks as items
 2015-01-19 19:45:04 +01:00
yueh a8c920932e Formation plane can now drop blocks as items 2015-01-16 19:58:11 +01:00
thatsIch c6f232ab63 Fixes #304 WAILA Integration updated and fixed 
WAILA offers a new interface to sync the server data to the client.
 2015-01-04 00:06:09 +01:00
thatsIch 52c512635d Renamed constants 2015-01-01 22:13:10 +01:00
thatsIch e0175bac98 Finalize static field 2015-01-01 21:45:03 +01:00
thatsIch 8179259afa Replaced C-style array instantiation with Java-Style 2015-01-01 21:15:03 +01:00
yueh 9b7b0fc0fb Organize imports 2014-12-29 21:59:05 +01:00
thatsIch ddf71c5072 Merge pull request #611 from TheJulianJES/Log-Fix 
Better log output at AE2 starting
 2014-12-29 21:54:34 +01:00
thatsIch 3554b5f48d Fixes #644 Several missing null checks when disabling huge chunks of the mod via config 2014-12-29 17:58:19 +01:00
yueh f471513bd0 Changed access to use this qualifier 2014-12-29 15:13:47 +01:00
thatsIch e712a9d8ce Merge pull request #640 from thatsIch/b-639-crash-on-disabled-channels 
Fixes #639 Missing null check for people with disabled channels
 2014-12-28 18:38:56 +01:00
thatsIch 0cb58b4d93 Fixes #639 Missing null check for people with disabled channels 2014-12-28 18:00:04 +01:00
thatsIch 21b70d0dda Fixes #624 Missing check to disable features 2014-12-24 11:32:24 +01:00
thatsIch 608d58277f Merge pull request #605 from thatsIch/b-604-craftingcrash 
Fixes #604 Crash on crafting
 2014-12-22 15:24:41 +01:00
TheJulianJES 20ccf65906 Better output log of starting 
thatsIch wanted it ;)
 2014-12-21 12:18:53 +01:00
riking 60569ac221 Also use the player's inventory to handle NEI fills 
If the items for a recipe are not available in the ME network when you
shift-left-click the NEI question mark, also try to pull from the
player's inventory.

The 'ic' local variable was renamed to 'testInv', as it's used to test
the IRecipe on various crafting propositions to see if the item
satisfies the recipe.

Closes #564, "Shift clicking "?" on NEI recipe ignores items in the
player's inventory".
 2014-12-20 23:30:39 -08:00
thatsIch 48f9ca1fcb Fixes #604 Crash on crafting 
The AE2 has in the contract that the item field in an IAEItemDefinition can be null due to the fact, if a special item is deactivated. This needs to be checked.

The base code was enhanced through Javadoc and split in responsibilities
 2014-12-19 12:28:41 +01:00
thatsIch 825567c122 Closes #593 Updating RF Integration to use version 1.7.10R1.0.2 
The new update contained a split of the IEnergyHandler into the IEnergyReceiver and IEnergyProvider.
Since all tiles in AE2 are basically IEnergyReceivers we use them and changed the detection of opposing tile entities from IEnergyHandler to IEnergyReceiver
 2014-12-15 22:10:26 +01:00
thatsIch 2243c5a188 Refactoring 
Type-safety

Minor performance improvements
 2014-12-02 22:55:39 +01:00
thatsIch 78bf0ec608 Merge pull request #480 from thatsIch/uuid 
Fixes #473, catches outdated player names and checks if all entries are UUIDs before converted and thus prevents the server crashing.
 2014-11-30 14:21:38 +01:00
thatsIch e1212cb609 Enhancement: put IMC handling into separate class 
Clarify documentation
 2014-11-29 18:02:56 +01:00
thatsIch 17ce3eadc4 Enhancement: better generics 2014-11-27 18:18:15 +01:00
thatsIch a1bc6a56ac Merge pull request #455 from thatsIch/develop 
Added skystone, skystone block, skystone brick, skystone small brick, certus quartz, certus quartz pillar, chiseled certus quartz and fluix stars, closes #52
 2014-11-24 07:12:07 +01:00
thatsIch 7a06a8bc06 Fixes #473, catches outdated player names and checks if all entries are UUIDs before converted and thus prevents the server crashing. 
Split off logic into single responsibilities for storing, initializing and matching the UUID mappings. Added JUnit to create tests for the UUID Matcher to see if its legit. It tests against simple problems like unconform UUIDs and also tests against a valid UUID.
 2014-11-23 13:43:23 +01:00
thatsIch cdfd886fd2 Merge pull request #427 from yueh/development 
Fix potentially unclosed streams
 2014-11-21 12:45:55 +01:00
thatsIch 56aad10ffe Added skystone, skystone block, skystone brick, skystone small brick, certus quartz, certus quartz pillar, chiseled certus quartz and fluix stars 
To integrate these into the current system, some changes to the background had to be done, especially to the feature handler. It now uses an interface to work against which you can implement to get your own feature handler instead modifying the base one and add several special cases code
 2014-11-18 16:47:30 +01:00
thatsIch 7505f9b66a Added copyright to all java files 2014-11-14 12:03:00 +01:00
yueh b43f520554 Fix potentially unclosed streams 
Simplified some file checks
Code formatting and added copyright
 2014-11-13 15:42:14 +01:00
thatsIch b37d995d35 Added copyrights 
Reformated code
Rearrnaged code
Changed the integration registry into a real singleton independent about its instantiation by other classes
 2014-11-13 14:48:04 +01:00
yueh ea618985fb Changed the iron facade to the general one 
Fixes #332
 2014-11-12 00:13:22 +01:00
thatsIch 8c144b22cc Simplified return 2014-11-04 15:24:03 +01:00
thatsIch 4584b5569d Specify class 2014-11-04 15:19:17 +01:00
thatsIch ff584ab627 Remove redundant array creations for calling varargs methods 2014-11-04 02:05:09 +01:00
thatsIch 1abe08cee3 Removed version checker instance 2014-11-04 00:39:59 +01:00
Cisien 9bb0722495 Fixed certus worldgen 2014-10-18 20:29:02 -07:00
Cisien 0cfa6b306a Add config option to whitelist dimensions for meteorite gen 2014-10-18 17:32:51 -07:00
thatsIch d889dda406 Add correct types for classes to show that its really unknown at runtime which classes they use 2014-10-05 15:28:55 +02:00
thatsIch 6b7e821e7c lower case field 2014-10-05 15:25:36 +02:00
thatsIch 13cf7e7b50 Reduce visibility of fields 2014-10-05 15:25:09 +02:00
thatsIch bfc14ddc54 Use correct way to check if layerInterface is in the map 2014-10-05 15:24:29 +02:00
Andrew 7f225a5ec1 Deleted useless things 2014-10-03 23:08:28 -07:00
thatsIch c074280b68 Temporary set of catch to ignored if they are ignored 2014-10-01 15:20:42 +02:00
thatsIch dedefee30b Remove not needed imports 2014-10-01 10:43:26 +02:00