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

370 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
thatsIch
ff584ab627 Remove redundant array creations for calling varargs methods 2014-11-04 02:05:09 +01:00
thatsIch
bff5a3ec5c Remove double negations 2014-11-04 02:01:47 +01:00
thatsIch
aa15af0a08 base block now has a specified add information list 2014-11-04 01:52:04 +01:00
thatsIch
f5823b6802 Reduced dependency scope of CompassReader 2014-11-04 01:46:36 +01:00
thatsIch
dbbfb12cc2 Restrict view of CompassReader fields 2014-11-04 00:51:51 +01:00
thatsIch
00f67e94e4 Use constant for four hours and reuse them in the versionchecker 2014-11-04 00:47:44 +01:00
thatsIch
6d45cecbf2 Finalize version checker delay 2014-11-04 00:44:50 +01:00
thatsIch
1015214dea Removed version checker ran variable, because thread closes anyways now 2014-11-04 00:41:38 +01:00
thatsIch
1abe08cee3 Removed version checker instance 2014-11-04 00:39:59 +01:00
thatsIch
68c6f24876 Reduce visibility of the static variables in the MA TileEntity 2014-11-03 03:06:03 +01:00
thatsIch
2835e2139d Shorten variable name to fit into the horizontal space. 2014-11-03 00:01:36 +01:00
thatsIch
19fb264b3b Fixes #376 IO Port now dropping upgrades properly. 2014-11-02 23:55:01 +01:00
thatsIch
c19ed27f0e Merge pull request #373 from yueh/fix-326 
Moved getGrid() (WeakReference) to a local var
 2014-11-02 12:19:18 +01:00
yueh
8d2f8f3369 Prevent anything but boosters inside WAPs 2014-11-02 10:52:45 +01:00
yueh
9e48eb40a0 Moved getGrid() (WeakReference) to a local var 2014-11-02 10:23:32 +01:00
thatsIch
9b18abdb3c Re-use the self-declared variable 2014-10-31 18:01:49 +01:00
thatsIch
efaa44a6f4 Add check when placing multiblocks near the sky limit or bedrock level 2014-10-31 17:26:22 +01:00
Cisien
9bb0722495 Fixed certus worldgen 2014-10-18 20:29:02 -07:00
Cisien
e12688516d fix merge conflict 2014-10-18 17:52:35 -07:00
Cisien
0cfa6b306a Add config option to whitelist dimensions for meteorite gen 2014-10-18 17:32:51 -07:00
thatsIch
d78b0f87d5 Merge pull request #311 from thatsIch/textfield 
Fixes search-box click area
 2014-10-18 10:03:26 +02:00
thatsIch
cea2a91b31 Fixes search-box click area 2014-10-16 17:19:12 +02:00
yueh
dc30df522c Fixes dupe bug. #309 2014-10-16 14:57:43 +02:00
FireBall1725
88570117bc Merge pull request #277 from yueh/fix-276 
Changed TreeMap to a threadsafe implementation
 2014-10-13 08:32:55 -04:00
yueh
43a80d67d8 Switched to a concurrent collection in ItemList 
Replaced the TreeMap inside ItemList with a CSLM
Formated code to match the current formatting
 2014-10-13 12:49:54 +02:00
yueh
4978037b55 Code formatting 2014-10-13 00:11:56 +02:00
yueh
11f5594812 Fixes duping of damaged items. #298 2014-10-12 23:41:06 +02:00
Chris
c737de91e3 Merge pull request #289 from yueh/fix-288 
Fixed an off by one error in CableBusStorage
 2014-10-11 07:34:11 -07:00
yueh
ae1a7ddc0f Fixed an off by one error in CableBusStorage 
This will fix #269 and #288
 2014-10-11 12:09:17 +02:00
Chris
52e548eebc Merge pull request #281 from thatsIch/controlflow 
Simplified some control flow statements
 2014-10-09 13:22:55 -07:00
Chris
cbe2ef3dfb Merge pull request #279 from thatsIch/numeric 
Numeric redundancies. Could be bad when using copy paste
 2014-10-09 13:22:17 -07:00
thatsIch
011ff54224 Simplified some control flow statements 2014-10-09 21:33:31 +02:00
thatsIch
54f479e827 Removed some imports 2014-10-09 21:17:48 +02:00
thatsIch
5d9d6a865a Numeric redundancies. Could be bad when using copy paste 2014-10-09 21:12:43 +02:00
yueh
fdd1a362d6 Changed TreeMap to a threadsafe implementation 2014-10-09 16:37:25 +02:00
thatsIch
bb865c72a4 Stopping versionchecker after finding the information successfully 
Adding information about the termination of the versionchecker
 2014-10-09 15:57:43 +02:00
Cisien
4eb70c92de Migrate rv1 worlds to rv2 api for storage bus mode 2014-10-07 15:55:18 -07:00
FireBall1725
c017e90e87 BugFix for #260 2014-10-06 10:02:17 -04:00
Chris
dff63d25ee Merge pull request #249 from thatsIch/meaningfuliterator 
Implement correct Iterator type
 2014-10-05 08:56:56 -07:00
Chris
6d2f399cca Merge pull request #253 from thatsIch/craftinggridcache 
Craftinggridcache
 2014-10-05 08:56:29 -07:00
thatsIch
da148ef787 Renames, visibility, other cleanups 2014-10-05 16:15:36 +02:00
thatsIch
f32010a538 Renamed to a more readable version 2014-10-05 15:57:30 +02:00
thatsIch
9717450f13 Added missing Type 2014-10-05 15:43:52 +02:00
thatsIch
060255e9c7 Reduce visibility of fields 
Implement against interfaces
Enforce immutability instead resetting it hard via new instantiation.
 2014-10-05 15:38:56 +02: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
thatsIch
016a6410aa Implement correct Iterator type 2014-10-05 12:04:20 +02:00
Chris
add0bd41e4 Merge pull request #245 from thatsIch/pathsegment 
Remove redundant exception and instantiation
 2014-10-04 16:43:50 -07:00
Chris
93c8460f9d Merge pull request #244 from thatsIch/pathgridcache 
Fixed single loop
 2014-10-04 16:42:42 -07:00
thatsIch
0b55e69eb8 Merge pull request #246 from yueh/fix-227 
More optimizations to speedup interface terminals
 2014-10-04 22:38:05 +02:00
yueh
9c24151a39 More optimizations to speedup interface terminals 2014-10-04 21:53:23 +02:00
thatsIch
fd59d244df Remove redundant exception and instantiation 2014-10-04 19:05:11 +02:00
thatsIch
bba04d0de9 Added missing types of collections 
Fixed single loop
 2014-10-04 19:00:41 +02:00
thatsIch
c19d780979 Added type safe addInformation for the AE base class of ItemBlock with addCheckedInformation 
Added type safe class reference for all energy cells
 2014-10-04 15:53:55 +02:00
FireBall1725
739b4f8432 Merge pull request #239 from thatsIch/emptyif 
Removed empty if cases
 2014-10-04 09:38:11 -04:00
FireBall1725
eac1765def Merge pull request #240 from thatsIch/alwaystrue 
Removed not needed conditions
 2014-10-04 09:33:42 -04:00
yueh
494584ac8b Prevent matrix frames from being placeable 
Formated code and organized imports
 2014-10-04 14:57:39 +02:00
thatsIch
54ecc29758 Removed not needed conditions 2014-10-04 11:14:33 +02:00
thatsIch
f6b6e4d804 Removed empty if cases 2014-10-04 11:10:08 +02:00
thatsIch
116213d197 Added typesafe method to obtain the inventory slots 2014-10-04 10:50:53 +02:00
thatsIch
cbaff9cd64 Merge pull request #237 from iloveportalz0r/rv2 
Deleted useless things
 2014-10-04 10:21:13 +02:00
Andrew
7f225a5ec1 Deleted useless things 2014-10-03 23:08:28 -07:00
The Paper Pilot
09c70ed59b Re-enabled unfocusing the search bar in AUTOSEARCH and NEI_AUTOSEARCH mode 2014-10-03 23:51:20 -05:00
Chris
b8cc7fb788 Merge pull request #234 from TrinaryBrain/patch-1 
Update TileSpatialIOPort.java
 2014-10-03 17:31:43 -07:00