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

350 commits

Author SHA1 Message Date
thatsIch 608d58277f Merge pull request #605 from thatsIch/b-604-craftingcrash 
Fixes #604 Crash on crafting
 2014-12-22 15:24:41 +01:00
thatsIch c790f69b90 Merge pull request #616 from thatsIch/e-572-valid-inventory 
Fixes #572 Enable inventory validation for any kind of Player
 2014-12-22 15:24:07 +01:00
thatsIch 72b3be0062 Fixes #572 Enable inventory validation for any kind of Player 2014-12-21 23:42:28 +01:00
thatsIch 9bd33b58e1 Merge pull request #610 from TheJulianJES/Sound-Material-Fix 
Changed Sound and Material, also aligned some to vanilla
 2014-12-21 13:44:03 +01:00
TheJulianJES 20ccf65906 Better output log of starting 
thatsIch wanted it ;)
 2014-12-21 12:18:53 +01:00
TheJulianJES 689eddcba3 Changed Sounds + Materials + aligned to vanilla 
Aligned it to Quartz
 2014-12-21 12:05:45 +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 1fc2ddedec Merge pull request #562 from thatsIch/e-561-mcversion 
Solves #561 "The coremod does not have a MCVersion annotation" message
 2014-12-20 23:05:30 +01: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 fc07acbced Merge pull request #595 from thatsIch/e-593-newrfapi 
Closes #593 Updating RF Integration to use version 1.7.10R1.0.2
 2014-12-18 18:20:19 +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
yueh 98098ba86e Merged api and lang READMEs 2014-12-13 01:28:32 +01:00
thatsIch 2af5a17054 Merge pull request #543 from thatsIch/e-remove-submodules 
Remove gitmodules
 2014-12-12 21:10:05 +01:00
thatsIch aa75482232 #561 Solves "The coremod does not have a MCVersion annotation" message 2014-12-07 23:04:37 +01:00
thatsIch afca362814 Fixes 549, triggers missing power event 
Removed overflow calculation
 2014-12-06 12:21:33 +01:00
yueh f914d45711 Merge pull request #553 from yueh/fix-547 
Fixed overstocking items with export bus/interface #547
 2014-12-05 23:55:42 +01:00
thatsIch 8abf2ed8ac Basic enhancement of the grid for overall usage 
has some performance improvement
replaced outdated classes
 2014-12-05 23:51:01 +01:00
thatsIch 6a38893017 Merge pull request #544 from thatsIch/e-uuidmatcher 
Improve performance of the UUID matcher by using a pre-compiled pattern
 2014-12-05 22:55:10 +01:00
thatsIch fb5764a409 Missing commit due to fail PR/Reset PR/force push 2014-12-05 22:53:34 +01:00
yueh ea2037a261 Fixed overstocking items with export bus/interface 2014-12-05 22:20:31 +01:00
thatsIch db611aff7a Improve performance of the UUID matcher by using a pre-compiled pattern 2014-12-04 16:35:20 +01:00
thatsIch ede5fb938b Remove gitmodules 
Integrate api and lang into core
 2014-12-04 13:09:13 +01:00
thatsIch d54cf458b6 Merge pull request #537 from thatsIch/b-535-cells 
Remove tags in tag compound in inventories of cells if they are not needed anymore, should fix #535
 2014-12-04 12:49:29 +01:00
thatsIch b318041715 Uses storage knowledge to simulate the entry of RF energy, should fix #524 for BC kinesis pipe 2014-12-04 12:48:28 +01:00
yueh 00b6335a9e Merge pull request #519 from yueh/fix-348 
Fixes #348 by respecting the inventory stack limit
 2014-12-03 23:18:43 +01:00
thatsIch ca01e25f38 Remove tags in tag compound in inventories of cells if they are not needed anymore, should fix #535 2014-12-03 11:46:44 +01:00
thatsIch 2243c5a188 Refactoring 
Type-safety

Minor performance improvements
 2014-12-02 22:55:39 +01:00
thatsIch c1193f7767 Try to catch assemblers being build too high or low for ChunkCache 2014-12-02 19:36:51 +01:00
thatsIch 00278971b1 Updated korean localization 2014-12-01 22:26:00 +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 b317a8a229 Merge pull request #516 from TheJulianJES/CrankFakePlayer-Fix 
Drop the wooden crank if a fake player trys to use it
 2014-11-30 14:20:55 +01:00
thatsIch e1212cb609 Enhancement: put IMC handling into separate class 
Clarify documentation
 2014-11-29 18:02:56 +01:00
yueh cf89873447 Fixes #348 by respecting the inventory stack limit 2014-11-29 17:52:34 +01:00
TheJulianJES 58785428f7 Drop crank if fake player uses it 2014-11-29 12:34:33 +01:00
thatsIch 9600b52be5 Merge pull request #502 from thatsIch/enhancement-improve-generics 
Enhancement: better generics
 2014-11-27 20:52:47 +01:00
TheJulianJES bd7e48081b Fixed wrong sounds 
Block.class
 2014-11-27 18:28:04 +01:00
thatsIch 17ce3eadc4 Enhancement: better generics 2014-11-27 18:18:15 +01:00
TheJulianJES 0e74e980e3 Fixed 3D on powerd items 
Organized Wireless Terminal

Organized Portable Cell

Fixed something
 2014-11-26 20:21:17 +01:00
mstiles92 f4f3634b78 Use braces around if statement body. 2014-11-26 09:29:25 -05:00
mstiles92 a57eb8d263 #470 Prevent the search box from losing focus in Auto Search and NEI Synchronized Auto Search modes. 
Without this patch applied there is no real difference between the auto and manual search box modes (other than whether the search box initially has focus when the GUI is opened). The search box should always have focus in auto mode, and should be able to lose focus in manual mode, as has always been the case until recently. This patch fixes the problem by preventing the search box from losing focus when in Auto and NEI Synchronized Auto search modes.
 2014-11-26 08:19:13 -05:00
thatsIch 0ee3482dfd Updated chinese localization 2014-11-25 18:09:32 +01:00
thatsIch 17e996bdb8 Updated localization for stairs 2014-11-24 07:47:37 +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
cjo9900 cf9f36f3e5 #466 Change Crafting card recipe to shapeless 
Change crafting card to be shapeless, to be consistent with recipe of other cards.
 2014-11-19 22:46:57 +00:00
thatsIch c364678d1b Merge pull request #464 from yueh/fix-446 
Added a missing markDirty in AdaptorIInventory to update other inventories on inserting items, fixes #446
 2014-11-19 21:34:31 +01:00
thatsIch 925e5065bc Updated brazilian, french, korean localization 2014-11-19 21:12:41 +01:00
yueh fab30a0bd3 Added a missing markDirty in AdaptorIInventory 2014-11-19 20:44:18 +01:00
TheJulianJES 29572cfd20 Fix tiny tnt stuff 
Fix step sound, fix hardness, fix lightning..
 2014-11-18 20:46:16 +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
TheJulianJES bc43ec78be Fix #449 
Fixing right-click animation and some other kind of duplicate items. (Like portable cell did)
 2014-11-17 21:07:42 +01:00
thatsIch 8e59759d57 Merge pull request #432 from thatsIch/portcell 
Potentially fixes #287 by removing the second call hook to open the GUI of the portable cell
 2014-11-16 16:25:32 +01:00
thatsIch c56c351ef8 Merge pull request #435 from thatsIch/hotfix-260 
HotFix, potentially fixes #260 through catching a null node
 2014-11-15 12:48:35 +01:00
thatsIch 0f541484de HotFix, potentially fixes #260 through catching a null node 
Added copyright
Reformatted code
Rearranged code
 2014-11-14 17:56:34 +01:00
thatsIch 7505f9b66a Added copyright to all java files 2014-11-14 12:03:00 +01:00
thatsIch 38b9241846 Simplified return statement 
Added copyright
Reformatted code
Rearranged code
 2014-11-14 11:56:41 +01:00
thatsIch 0066ce461d Potentially fixes #287 by removing the second call hook to open the GUI of the portable cell 
Added copyrights
Reformated code
Rearranged code
 2014-11-14 11:28:33 +01:00
thatsIch ee0e64586a Remove unused imports 2014-11-13 22:16:23 +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 ae397b0256 Merge pull request #419 from yueh/fix-332 
Changed the iron facade to the general one, fixes #332
 2014-11-13 14:31:53 +01:00
yueh 433c2265ca Merge pull request #421 from yueh/fix-392 
Fixes condenser dupe bug
 2014-11-13 14:31:46 +01:00
thatsIch 4a63b81d86 Added copyright 
Rearrange code

Reformat code
 2014-11-13 14:24:21 +01:00
thatsIch 6729c2c55e Remove not thrown exception in javadoc 2014-11-13 14:03:09 +01:00
thatsIch 2194bd708c Use correct return type as variable 
Added copyright
Reformat code
Rearrange code
 2014-11-13 13:35:51 +01:00
yueh 9a33bb03c0 Fixes condenser dupe bug 2014-11-12 12:49:55 +01:00
yueh ea618985fb Changed the iron facade to the general one 
Fixes #332
 2014-11-12 00:13:22 +01:00
thatsIch d6506a1778 Fixes #354 Changed searge name lead to regressed compability with Immibis-MB 2014-11-10 23:59:42 +01:00
thatsIch e446158559 Fixes #413 Adding removed reflection called constructor 2014-11-10 22:10:01 +01:00
thatsIch c7bae7f448 Smash the typos 2014-11-06 22:08:14 +01:00
thatsIch ea10da6f69 Restore default constructor of EntityItem with single argument. Potentially fixes #400 2014-11-06 19:34:01 +01:00
thatsIch 537465563c Add oredict entry for pure fluix crystals as crystalPureFluix 2014-11-05 21:53:59 +01:00
thatsIch a1b15da87a Merge branch 'rv2' of https://github.com/AppliedEnergistics/Applied-Energistics-2 into rv2 2014-11-05 19:55:00 +01:00
thatsIch 0ced725f9b Merge pull request #361 from thatsIch/tilepos 
Add check when placing multiblocks near the sky limit or bedrock level
 2014-11-05 19:20:20 +01:00
thatsIch ea64517a8e Merge pull request #378 from thatsIch/eatingIOPort 
Fixes #376 IO Port now dropping upgrades properly.
 2014-11-05 19:20:05 +01:00
thatsIch 61588fd736 Implement against interface 2014-11-05 10:21:50 +01:00
thatsIch 4e1b93b842 Use type safe base method to add information to the tooltip 2014-11-04 15:31:55 +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 ded86a0170 Suppress warning for fetch out of tooltips 2014-11-04 15:18:09 +01:00
thatsIch 8a144949d6 Supress warning for using List without generic. No need for helper, since no child class overrides this yet 2014-11-04 15:16:23 +01:00
thatsIch fb006fb25a Remove not used throws 2014-11-04 12:36:16 +01:00
thatsIch 075fd1848a Finalize variables 2014-11-04 12:34:56 +01:00
thatsIch 542c1dcdbd Improved various typos 2014-11-04 12:32:33 +01:00
thatsIch fe7510d607 Rename to destination 2014-11-04 11:48:26 +01:00
thatsIch b123419486 Use type-safe version of list for AxisAlignedBB 2014-11-04 02:40:10 +01:00
thatsIch 89030ed3a4 Remove unused variables 2014-11-04 02:35:31 +01:00
thatsIch 53b7744695 Better specification which class is returned 2014-11-04 02:33:31 +01:00
thatsIch bfc8fac0dd Simplified return condition 2014-11-04 02:30:59 +01:00
thatsIch a80728de01 Use clarifying parameter names 2014-11-04 02:25:07 +01:00
thatsIch 4dcb1480f3 Remove unused parameter 2014-11-04 02:24:30 +01:00
thatsIch b569c72761 Remove unsed method 2014-11-04 02:23:22 +01:00
thatsIch b60321a9ca Simplify return statement 2014-11-04 02:22:48 +01:00
thatsIch 7d7a2ad334 Unused import 2014-11-04 02:21:20 +01:00
thatsIch f828dc11b2 Added to collection but never queried 2014-11-04 02:20:20 +01:00
thatsIch 83262093eb Adding save handle to get Entities Within AABB Excluding Entity 2014-11-04 02:18:37 +01:00
thatsIch 0622b8bb83 Simplify return logic 2014-11-04 02:07:36 +01:00
thatsIch 3eedc60e9f Explicitly stating that it is an unknown object class also here 2014-11-04 02:07:20 +01:00
thatsIch e1091d647c Explicitly stating that it is an unknown object class 2014-11-04 02:06:52 +01:00