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

262 commits

Author SHA1 Message Date
yueh
7134e851e4 Use final 2016-01-01 01:49:45 +01:00
yueh
ab689f2a48 Code format 2016-01-01 01:48:15 +01:00
yueh
68c3ea5ae9 Organize imports 2016-01-01 01:47:22 +01:00
yueh
377c7a1c39 Added missing class 2016-01-01 01:45:22 +01:00
AlgorithmX2
71afa9bf53 1.8.8 + deleted all integration can be recovered later or something. 2015-12-31 17:19:44 -06:00
yueh
2e51ea5f78 Always use {} for statements 2015-12-24 02:11:17 +01:00
yueh
4a486673f6 Access using qualified this 2015-12-24 02:10:22 +01:00
yueh
a6ee559723 Final fields, params and variables 2015-12-24 02:09:38 +01:00
yueh
99215e1701 Organized imports 2015-12-24 02:07:03 +01:00
yueh
15664b2822 Fixed some messed up refactoring 2015-12-24 02:05:39 +01:00
yueh
c9e8a6e939 Formatted code 2015-12-24 02:03:16 +01:00
yueh
e94a0cfccf Reduces visibility of internal fields/methods 
Reduces the visibility of all fields to private and create setters/getters
when necessary. Exceptions are fields with GuiSync as these need to be
public.

Reduces the visibility of internal methods to private/protected/default when possible.
 2015-12-24 01:59:13 +01:00
yueh
1e7126f98e Added an option to toggle oredict subsitutions for patterns. 
It adds a backward compatibility to convert current patterns to use
oredict by default, which should be removed with rv4 stable.

Closes #1156
 2015-12-23 14:34:28 +01:00
thatsIch
7dee5699cf sort modifier 2015-09-30 14:27:21 +02:00
thatsIch
ebda927fb5 Add this qualifier 2015-09-30 14:26:54 +02:00
thatsIch
efecd4b8c1 Constant array init 2015-09-30 14:25:59 +02:00
thatsIch
2f65d41cd1 Javastyle array 2015-09-30 14:25:28 +02:00
thatsIch
8b3a954f73 final variables and parameters 2015-09-30 14:24:44 +02:00
thatsIch
059523f543 Reduce scope of variables 2015-09-30 14:22:21 +02:00
thatsIch
dca09fe0a6 Javadoc issues 2015-09-30 14:21:12 +02:00
thatsIch
2d71b0e34a prefer isEmpty over length() == 0 2015-09-30 14:16:03 +02:00
thatsIch
430b33b7a3 Replace with array initializer 
this can be done through http://docs.oracle.com/javase/specs/jls/se6/html/arrays.html#10.6
 2015-09-30 14:15:53 +02:00
thatsIch
209298bb4d Remove redundant type casts 2015-09-30 14:14:12 +02:00
yueh
3a6001e18f Wrong culling direction when rendering inscriber 
Fixes #1806
 2015-09-30 13:27:20 +02:00
yueh
2a5d26b349 Organize imports 2015-09-30 13:07:27 +02:00
yueh
67213462db Adds a round robin and random mode to export buses. 
Resolves #85
 2015-09-30 13:04:02 +02:00
yueh
c5848fe323 Fixes #1710 Use the correct culling face for the meteor compass 2015-09-30 12:57:31 +02:00
thatsIch
bcb4c0bc02 Fix compile errors 2015-09-30 12:47:23 +02:00
yueh
b013f3a8fa Fixes #1648 Removes unecessary cast to BlockQuartzTorch 2015-09-30 12:22:36 +02:00
thatsIch
e5ee4e0e61 Fixes #1474: Prevents crafting of disabled recipes and deletes invalid parts 2015-09-30 12:20:12 +02:00
thatsIch
59dbfb1452 Fixed stairs 2015-09-30 11:34:16 +02:00
thatsIch
e21dab14e5 Fixed stair rendering, still missing textures and itemblock for some reason 2015-06-26 22:44:47 +02:00
thatsIch
4e863e7d90 Removed old renamer 2015-06-26 22:13:04 +02:00
thatsIch
b20afd0ffa Optimize imports 2015-06-22 18:17:14 +02:00
thatsIch
28c30c44c5 Rename IRenderHelper to ModelGenerator 2015-06-22 18:16:25 +02:00
yueh
ed47a23156 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.

Conflicts:
	src/main/java/appeng/parts/AEBasePart.java
	src/main/java/appeng/parts/reporting/PartConversionMonitor.java
	src/main/java/appeng/parts/reporting/PartDarkMonitor.java
	src/main/java/appeng/parts/reporting/PartMonitor.java
	src/main/java/appeng/parts/reporting/PartPatternTerminal.java
	src/main/java/appeng/parts/reporting/PartSemiDarkMonitor.java
	src/main/java/appeng/parts/reporting/PartStorageMonitor.java
	src/main/java/appeng/parts/reporting/PartTerminal.java
 2015-06-22 15:34:46 +02:00
yueh
3b5b9b68ce Moved ETA to the title and also no longer display for empty jobs 
Fixes #1567
 2015-06-18 01:22:45 +02:00
AlgorithmX2
38afde724b Most of the 1.8 Port. 2015-06-15 19:44:59 -05: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
yueh
61dfc05ae0 Added a simple ETA to crafting jobs 2015-05-21 21:31:13 +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
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
e7746dc037 Static imports 2015-05-18 00:12:13 +02:00
thatsIch
f0215ca56a apply method parameter naming convetion 2015-05-18 00:09:09 +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
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
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
513292cd08 Replaces all local variables regarding their naming conventions 2015-05-08 23:50:36 +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
b748a1982f Replaces all non constant fields with upper case name 2015-05-08 22:53:50 +02:00
thatsIch
875214c166 Adds annotations by contract of the interface 2015-05-02 15:39:59 +02:00
thatsIch
64ed05a1b4 Puts everywhere brackets 2015-04-29 18:38:24 +02:00
thatsIch
2c5a54c210 Merge pull request #1269 from thatsIch/b-1256-number-converter 
Fixes #1256: Using new size logic to determine the abbreviation for a stack size
 2015-04-23 23:43:31 +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
cc29230ce5 Fixes #1256: Using new size logic to determine the abbreviation for a stack size 
Removes the usage of the old methods, since they were pretty, but not applicable for our use case. The displayed strings are determined by the size of the to be rendered string. Now the algorithm tries to use as much width as possible before trying to trim it down.

Added tests to reflect the changes and expected behaviour. Also using specific interfaces for the corresponding behaviour to shield from potential calls to the underlying enum singleton implementation.
 2015-04-13 14:59:44 +02:00
thatsIch
b58c92ebb6 Fixes #1202: Now 10000x items is the limit before being converted to next bigger unit 
Added a new method to display a number in a long fashion.
Added respective unit tests for them
 2015-04-07 23:46:52 +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
thatsIch
632d048ee2 Fixes #1197 Vibration Chamber does produce AE, not ae 2015-04-04 12:26:15 +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
thatsIch
c9d67e40af Using a unified number converter to display short versions of numbers 2015-03-30 13:06:59 +02:00
thatsIch
2a89bdf52a Fixes #1118 Does not crash with invalid ItemStacks anymore 2015-03-29 12:46:55 +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
b756a3f564 Final classes with private constructor 2015-03-26 12:25:44 +01:00
thatsIch
81c32d5181 Multiple variables in one declaration 2015-03-26 12:13:34 +01:00
thatsIch
58db877006 Replaced dynamic regular expressions with compiled pattern 2015-03-26 11:33:08 +01:00
thatsIch
ec05bd994c Typos or word-improvements 2015-03-26 11:20:31 +01:00
thatsIch
234d97b8ce Security issues: public static collections 2015-03-26 11:13:24 +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
bd2ee1c5ea Assignment replaceable with operator assignment 2015-03-26 10:41:45 +01:00
yueh
6476a519bb Added an option to disable the colored crafting status 2015-02-27 13:43:08 +01:00
yueh
b8e2d73aa0 Merge pull request #824 from Eearslya/request-817 
Added feature request #817
 2015-02-27 12:36:02 +01:00
yueh
b18addbf37 remove trailing whitespaces 2015-02-03 12:04:13 +01:00
Eearslya
3fa501d726 Added feature request #817 
Crafting CPU GUI now shows a yellow background on items being crafted, and a yellow background on scheduled items.
 2015-02-02 06:37:17 -08:00
yueh
a8c920932e Formation plane can now drop blocks as items 2015-01-16 19:58:11 +01:00
yueh
2f51568772 Effects should not collide with anything 2015-01-02 20:37:48 +01:00
thatsIch
52c512635d Renamed constants 2015-01-01 22:13:10 +01:00
thatsIch
236f6f72e3 finalize fields 2015-01-01 21:19:50 +01:00
thatsIch
eed0c11d7f Replaced equals enum equality check with == 2015-01-01 21:16:04 +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
yueh
f471513bd0 Changed access to use this qualifier 2014-12-29 15:13:47 +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
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
7505f9b66a Added copyright to all java files 2014-11-14 12:03:00 +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
ded86a0170 Suppress warning for fetch out of tooltips 2014-11-04 15:18:09 +01:00
thatsIch
075fd1848a Finalize variables 2014-11-04 12:34:56 +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
thatsIch
cea2a91b31 Fixes search-box click area 2014-10-16 17:19:12 +02:00
Chris
52e548eebc Merge pull request #281 from thatsIch/controlflow 
Simplified some control flow statements
 2014-10-09 13:22:55 -07:00
thatsIch
011ff54224 Simplified some control flow statements 2014-10-09 21:33:31 +02:00
thatsIch
5d9d6a865a Numeric redundancies. Could be bad when using copy paste 2014-10-09 21:12:43 +02: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
54ecc29758 Removed not needed conditions 2014-10-04 11:14:33 +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
33ce5283d0 Merge pull request #223 from yueh/feature-129 
Optimizes the search in interface terminals
 2014-10-01 20:26:21 -07:00
Chris
7ef413ab00 Merge pull request #222 from thatsIch/ignored 
Temporary set of catch to ignored if they are ignored
 2014-10-01 20:25:52 -07:00
Chris
c2fba2de55 Merge pull request #218 from thatsIch/localvars 
Remove redundant local variables
 2014-10-01 20:23:56 -07:00
yueh
287e783866 Reduced the amount of background rendering calls 2014-10-01 22:22:22 +02:00
yueh
132b36bb93 Optimizes the search in interface terminals 
Removed the amount of data by only searching the output names
Added a caching layer so every subsequent search will narrow the previous
one down and not search everything again
 2014-10-01 16:07:33 +02:00
thatsIch
c074280b68 Temporary set of catch to ignored if they are ignored 2014-10-01 15:20:42 +02:00
thatsIch
33d998034d Remove static call via super 2014-10-01 15:02:44 +02:00
FireBall1725
2141aa0318 Merge pull request #217 from thatsIch/super 
Remove only redirections to super call
 2014-10-01 08:15:56 -04:00
FireBall1725
51fe1e14b6 Merge pull request #214 from thatsIch/imports 
Remove not needed imports
 2014-10-01 08:12:53 -04:00
thatsIch
cd064ec05c Remove redundant local variables 2014-10-01 11:34:27 +02:00
thatsIch
cc9d89dc73 Remove only redirections to super call 2014-10-01 11:18:35 +02:00
thatsIch
4782877e8c Added missing javadoc 2014-10-01 10:54:50 +02:00
thatsIch
dedefee30b Remove not needed imports 2014-10-01 10:43:26 +02:00
Chris
e1627734b1 Merge pull request #207 from yueh/performance-optimizations 
Some performance or memory optimizations
 2014-09-30 15:07:13 -07: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
yueh
79837cf35f Adds filter by pattern to the interface terminals 
Some code cleanup
 2014-09-30 23:04:14 +02:00
yueh
185500c017 Adds filter by machine name to interface terminals 2014-09-30 23:03:45 +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
87126e1f11 Merge pull request #185 from thatsIch/Cast 
Removes not needed casts
 2014-09-29 14:14:25 -07:00
Chris
7b3bde7906 Merge pull request #182 from thatsIch/While 
Replaces while iterators with foreach call
 2014-09-29 14:10:03 -07:00
thatsIch
2688548479 Merge pull request #190 from yueh/feature-progress-provider 
Moving the handling of progress to GuiProgressBar
 2014-09-29 21:57:20 +02:00
yueh
21a7d815ae Moving the handling of progress to GuiProgressBar 
Adds an interface providing data for GuiProgressBar
Changed all containers simulating progress to implement the interface
 2014-09-29 20:00:18 +02:00
yueh
fd7c1ff5f8 Added checks for null and equal class to .equals() 
Also switched a check for null in OreHelper#sameOre to prevent null ==
null => true
 2014-09-29 12:39:40 +02:00
thatsIch
3ce47a167f Removes not needed casts 2014-09-29 09:42:50 +02:00
thatsIch
b6ec21c70a Replaces while iterators with foreach call 2014-09-29 09:26:35 +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
Chris
62fcf26fcc Merge pull request #175 from thatsIch/TypeSafety 
Type safety
 2014-09-28 19:51:31 -07:00
Andrew
fd18393a8b Merge remote-tracking branch 'upstream/rv2' into rv2 2014-09-28 14:33:43 -07:00
thatsIch
f1ffbf08a2 Resolved some unchecked Types 2014-09-28 22:20:14 +02:00
thatsIch
f63aa6d17e Merge pull request #172 from yueh/cleanup-forwarding-super 
Removed methods with only call to super
 2014-09-28 21:38:55 +02:00
yueh
0f6d49fbef Removed missed ones 2014-09-28 21:19:29 +02:00
Andrew
da63aca95c Deleted unnecessary casts with Eclipse 2014-09-28 11:56:16 -07:00
Andrew
8514e32f5f Added missing @Override annotations with Eclipse 2014-09-28 11:34:00 -07:00
thatsIch
b6273d9c0c Merge pull request #167 from yueh/cleanup-forwarding-super 
Removed methods only forwarding their call to the corresponding super class
 2014-09-28 20:20:32 +02:00