Commit graph

214 commits

Author SHA1 Message Date
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
yueh 7fa7e43c29 Some performance or memory optimizations
Replaced String concat in loops with StringBuilder (performance)
Replaced for with keySet + Map.get() through for with entrySet (perf)
Changed inner classes to static classes, mostly struct like (memory)
2014-09-30 23:20:02 +02:00
thatsIch 474596f095 Make fields final if possible to ensure immutability 2014-09-30 09:52:57 +02:00
Chris 253085185f Merge pull request #186 from thatsIch/Return
Removes unnecessary returns
2014-09-29 17:58:58 -07:00
thatsIch aba0c44916 Removes unnecessary returns 2014-09-29 23:27:25 +02:00
Chris b48d35bf78 Merge pull request #178 from thatsIch/Redundant
Removed redundant array creations just to match varargs operations
2014-09-29 14:06:27 -07:00
thatsIch 9e97c51746 Merge pull request #180 from thatsIch/Boxing
Removes not needed Boxing
2014-09-29 21:55:28 +02:00
Andrew 5c5aaa21ee Merge remote-tracking branch 'upstream/rv2' into rv2
Conflicts:
	src/main/java/appeng/items/tools/powered/ToolMassCannon.java
2014-09-29 00:26:15 -07:00
thatsIch f95d221859 Removes not needed Boxing 2014-09-29 09:17:33 +02:00
thatsIch f49407de2c Removed redundant array creations just to match varargs operations 2014-09-29 09:12:06 +02:00
thatsIch f1ffbf08a2 Resolved some unchecked Types 2014-09-28 22:20:14 +02:00
Andrew da63aca95c Deleted unnecessary casts with Eclipse 2014-09-28 11:56:16 -07:00
Andrew 94d5319038 Fixed some warnings about unnecessary code 2014-09-28 11:55:09 -07:00
Andrew 8514e32f5f Added missing @Override annotations with Eclipse 2014-09-28 11:34:00 -07:00
thatsIch a745e00115 Fixed typos in MatterCannon 2014-09-28 19:46:10 +02:00
Chris f9b9729fb5 Merge pull request #157 from thatsIch/Spelling
Spelling
2014-09-28 10:09:39 -07:00
thatsIch 76b147fd5b Improved readability of variables
Hopefully improved semantics of variables

Fixed typos

Added hyphenations
2014-09-28 12:21:34 +02:00
thatsIch 1e71e86acc Removes unnecessary semicolons 2014-09-28 12:08:47 +02:00
yueh cdcae974e2 Changed Inscriber to be upgradable with Cards
Supports up to 3 cards
Currently max 3 Acceleration Cards, each reducing the crafting time by 25%
2014-09-28 00:36:43 +02:00
thatsIch 4088cca5ad Fixing internal javadoc 2014-09-27 23:17:47 +02:00
algorithmx2 5d57e9dff8 Remove pointless ore dictionary registration. 2014-09-26 18:12:03 -05:00
AlgorithmX2 53039cdd5f Delete AppEng.java.rej 2014-09-23 20:14:52 -05:00
AlgorithmX2 386d18a059 Relocate Source to proper directory. 2014-09-23 19:26:27 -05:00