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

687 commits

Author SHA1 Message Date
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 b282e5d968 Closes #1270: Improves NEI grinder overlay localization 2015-04-13 12:53:55 +02:00
thatsIch 3410db7b45 Closes #1273: Replaced deprecated method call 2015-04-13 12:32:53 +02:00
thatsIch 817163dbf6 Merge pull request #1240 from bakaxyf/rv2 
Update zh_CN.lang
 2015-04-08 21:03:31 +02:00
bakaxyf 4f9b8db6fc Update zh_CN.lang 2015-04-08 12:16:13 +08: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 2667b8eac6 Merge pull request #1233 from yueh/fix-1230 
Changed to LinkedHashSet to maintain insertion order
 2015-04-07 12:50:27 +02:00
yueh 235fad439d Merge pull request #1228 from yueh/fix-1222 
Changed the order as WATs are special and needing a position
 2015-04-07 12:50:21 +02:00
yueh fcea444041 Changed to LinkedHashSet to maintain insertion order 
Fixes #1230
 2015-04-07 12:28:45 +02:00
yueh 80f56d4359 Changed the order as WATs are special and needing a position 
Fixes #1222
 2015-04-07 00:17:55 +02:00
bakaxyf a7d55ee520 Update zh_CN.lang 2015-04-07 04:39:19 +08:00
thatsIch aac2b598ea Merge pull request #1221 from Adaptivity/rv2 
Update ru_RU.lang
 2015-04-06 20:30:44 +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
Anton fbc44f47c8 Update ru_RU.lang 2015-04-06 16:32:05 +03: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 1bb8de3570 Merge pull request #1216 from yueh/cleanup-modifier-order 
Modifier are now using a consistent order based on the java conventions
 2015-04-06 13:31:21 +02:00
thatsIch 8666937117 Merge pull request #1210 from thatsIch/e-1207-channels 
Fixes #1207 → Enables resource packs more fine tuned information in WAILA channel display
 2015-04-06 13:09:54 +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 a30ef4679c Fixes #1207 → Enables resource packs more fine tuned information in WAILA channel display 2015-04-05 23:06:31 +02:00
yueh 0ee2ca72ac Merge pull request #1206 from yueh/fix-1068 
Stops AEBaseItemBlock from modifying the metadata before placing.
 2015-04-05 20:47:31 +02:00
thatsIch 881bb919da Merge pull request #1205 from thatsIch/b-npe-on-random-smashing-button 
Fixes NPE on random button smashing
 2015-04-05 20:18:10 +02:00
thatsIch e2d0e5d424 Dont use instance reference for static references 2015-04-05 15:59:23 +02:00
thatsIch e3bf7d63c0 Split one liner declarations 2015-04-05 15:57:37 +02:00
thatsIch 3fedcf273b Remove random semicolons 2015-04-05 15:56:10 +02:00
yueh e7e397c412 Stops AEBaseItemBlock from modifying the metadata before placing. 2015-04-05 14:01:42 +02:00
thatsIch ecc472a692 Fixes NPE on random button smashing 2015-04-05 13:07:19 +02:00
thatsIch 9790d9fd93 Merge pull request #1187 from thatsIch/b-1059-fmp-disables-interfaces 
Fixes #1059 FMP like TileEntities are not valid Interface targets anymore
 2015-04-04 14:55:21 +02:00
yueh f3f89344b4 Merge pull request #1192 from yueh/fix-1191 
Moved AEBaseBlock.setFeature() to the end of any constructor.
 2015-04-04 14:40:35 +02:00
thatsIch bac94b67b8 Merge pull request #1199 from thatsIch/b-skychest-invtweaks-interaction 
Fixes interaction bug between Sky Stone Chest and Inventory Tweaks
 2015-04-04 14:33:06 +02:00
thatsIch bb1c341c95 Fixes #1059 FMP Blocks don't disturb the ME Interface identifier 2015-04-04 14:32:17 +02:00
thatsIch 2ef04f1303 Fixes interaction bug between Sky Stone Chest and Inventory Tweaks upon sort via space + click 2015-04-04 12:56:42 +02:00
thatsIch 632d048ee2 Fixes #1197 Vibration Chamber does produce AE, not ae 2015-04-04 12:26:15 +02:00
yueh adea6b3dec Moved AEBaseBlock.setFeature() to the end of any constructor. 
Otherwise it can cause a registration of incomplete blocks, like missing
subtypes.
 2015-04-04 01:31:51 +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 4ff1631f89 Merge pull request #1175 from yueh/fix-1143 
Fixes api refactoring causing items to be null.
 2015-04-03 11:40:23 +02:00
yueh 4f364a46df Added missing Block.damageDropped() to OreQuartzCharged 
This was previously handled by a template method, but it was removed with
the api refactoring.

Fixes #1174
 2015-04-02 15:57:43 +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 c9d67e40af Using a unified number converter to display short versions of numbers 2015-03-30 13:06:59 +02:00
thatsIch 9a7329598e Merge pull request #1127 from thatsIch/b-1118-api-crash 
Fixes #1118 Does not crash with invalid ItemStacks anymore
 2015-03-30 11:54:28 +02:00
thatsIch 5c908c7404 Merge pull request #1130 from yueh/fix-1125 
Prevent matrix frames from explosions.
 2015-03-30 10:38:24 +02:00
thatsIch 65aceeffa8 Merge pull request #1134 from yueh/fix-newapi-nei-facade-handler 
Fixes NEI recipe handler
 2015-03-29 21:31:11 +02:00
thatsIch 08505e1fa3 Merge pull request #1065 from thatsIch/e-api-access 
instance() does not return null anymore, since else it would represent catching a major bug
 2015-03-29 21:02:41 +02:00
yueh b75e8d5824 Fixes NEI recipe handler 
.get() is used as it is safe to assert facades are present at this point.
If not there should be an exception being thrown.
 2015-03-29 15:51:22 +02:00
yueh fbda2c571b Prevent matrix frames from explosions. 
Fixes #1125
 2015-03-29 14:29:54 +02:00
thatsIch 2a89bdf52a Fixes #1118 Does not crash with invalid ItemStacks anymore 2015-03-29 12:46:55 +02:00
thatsIch a7b0872697 Fixes #1115 Does not crash anymore without RotaryCraft 2015-03-28 19:14:34 +01:00
thatsIch 371588ed79 instance() does not return null anymore, since else it would represent catching a major bug 
also does not catch any throwable anymore
 2015-03-28 17:11:19 +01: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 3dd81433ac Merge pull request #1103 from thatsIch/b-1013-rotarycraft-power 
Fixes #1013 Energy acceptor can receive RotaryCraft Power again
 2015-03-28 15:55:14 +01:00
thatsIch 22b965e15a Fixes #1013 Energy acceptor can receive RotaryCraft Power again 2015-03-26 20:28:34 +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 db7296c0a1 Final classes with private constructor 2015-03-26 13:57:31 +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 0519f60cb0 protected member in final class 2015-03-26 12:15:57 +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 0542a58e4b Merge pull request #1086 from thatsIch/b-1061-mekanism 
Fixes #1061 Recipes are properly registered with new Mekanism
 2015-03-26 11:34:16 +01:00
thatsIch 58db877006 Replaced dynamic regular expressions with compiled pattern 2015-03-26 11:33:08 +01:00
thatsIch dff3364eb5 Replace not needed StringBuffer with String concatenation 2015-03-26 11:24:09 +01:00
thatsIch 88310cf04b Single character string concatentation 2015-03-26 11:23:22 +01:00
thatsIch d81eb1fe2d Unnecessary null check before instanceof 2015-03-26 11:22:31 +01:00
thatsIch d8f452b665 Unnecessary enum modifiers 2015-03-26 11:21:55 +01:00
thatsIch ec05bd994c Typos or word-improvements 2015-03-26 11:20:31 +01:00
thatsIch dff48c07c9 finalized 2015-03-26 11:14:34 +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 b31f2df58d Unnecessary semicolons 2015-03-26 11:03:46 +01:00
thatsIch 14df50dbf3 Unnecessary modifier in interfaces 2015-03-26 11:03:30 +01:00
thatsIch 6aeca93b85 Unnecessary modifier in enums 2015-03-26 11:03:15 +01:00
thatsIch 3143c871d0 this access 2015-03-26 11:01:57 +01:00
thatsIch 7f7c71a22e Unused imports 2015-03-26 10:58:13 +01:00
thatsIch 05f522580b Unnecessary Javadoc link point to containing class 2015-03-26 10:53:09 +01:00
thatsIch 926af89029 Missing @Override annotation 2015-03-26 10:50:34 +01:00
thatsIch f1248c4c33 Unused imports 2015-03-26 10:49:48 +01:00
thatsIch bd2ee1c5ea Assignment replaceable with operator assignment 2015-03-26 10:41:45 +01:00
thatsIch 8ef286b9d6 Replace call to simple setter from within class with inlined version 2015-03-26 10:27:07 +01:00
thatsIch 4b4693498d Replace call to simple getter from within class with inlined version 2015-03-26 10:23:59 +01:00
thatsIch e41d6a0289 Use StringBuilder for creating appended Strings in a loop 2015-03-26 10:15:33 +01:00
thatsIch 33c1535bfa Fixes #1061 Most recipes are properly registered with new Mekanism. 2015-03-25 12:24:21 +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 96145e75f4 Merge pull request #1075 from thatsIch/b-822-io-port 
Fixes #822 Automation of IO Port works as intended again
 2015-03-25 12:19:09 +01:00
bakaxyf a870393edb Update zh_CN.lang 2015-03-25 16:37:46 +08:00
thatsIch 3745e6ce8d Fixes #1076 Crash on shift clicking a recipe from NEI 2015-03-24 13:42:32 +01:00
thatsIch c1a7a35192 Renamed Integration class to upper case 2015-03-24 13:17:01 +01:00
thatsIch eb98ec891b Merge pull request #1066 from thatsIch/e-remove-deprecated-access 
Removes deprecated method access of LocatableRegistry and getPickBlock
 2015-03-24 12:47:55 +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 da91585d69 Fixes #822 Automation of IO Port works as inteded again 
Top and bottom can insert into input slots 0 - 5 on the left
Sides can extract from output slots 6 - 11 on the eight
 2015-03-22 11:07:25 +01:00
downslope7 30191eb5ba Add coords to duplicate connection GridException. 
This exception isn't caught and crashes the server. Added block coordinates to aid in diagnostics.
 2015-03-21 20:05:08 -05:00
thatsIch 4552394f6e Removes deprecated method access of LocatableRegistry and getPickBlock 2015-03-21 16:03:26 +01:00
Kamran Mackey b5582688a3 Fixed a couple typos in en_US.lang. 2015-03-21 03:57:41 -06:00
thatsIch 34597a4e21 Merge pull request #1046 from thatsIch/b-976-version-checker 
Fixes #976 Now uses GitHub to retrieve most current version
 2015-03-17 20:23:14 +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
TheVikingWarrior f132ae3678 Update it_IT.lang 2015-03-16 20:59:01 +01:00
yueh 720b38442e Merge pull request #1034 from yueh/feature-improve-meinventoryhandler-getaccess 
Improved MEInventoryHandler.getAccess()
 2015-03-16 11:29:57 +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
yueh 1bb0109c45 Improved MEInventoryHandler.getAccess() 
Changed the public fields to setters and getters
Added a cache for the evaluated values instead of calculating with each
access
 2015-03-15 19:43:12 +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
bakaxyf 621ddc5535 Update zh_CN.lang 2015-03-15 11:05:24 +08:00
yueh ece09a956b Merge pull request #1016 from yueh/fix-1015 
Fixes #1015 no longer eat a single item when not able to satisfy the recipe
 2015-03-13 23:49:12 +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
yueh c53b3b5dfc Fixes #1011 skip null values 2015-03-11 23:57:48 +01:00
bakaxyf 99e4928542 Update zh_CN.lang 2015-03-12 00:09:12 +08:00
yueh 43995a4b32 Merge pull request #987 from yueh/feature-improve-aeitemstack-compareto 
Improved AEItemStack.compareTo performance.
 2015-03-11 16:54:09 +01:00
thatsIch 8ec9bb8b3b Merge pull request #998 from thatsIch/e-920-extended-reach 
Fixes #920 Increased GUI close distance to Vanilla MC
 2015-03-11 16:40:32 +01:00
thatsIch dd1ca1e286 Fixes #861 Wireless Terminal notifies player, if it is unlinked 2015-03-11 09:00:40 +01:00
thatsIch c9f0b4e489 Fixes #920 Increased GUI close distance to Vanilla MC 2015-03-11 07:00:45 +01:00
thatsIch 63a6037ad2 Merge pull request #992 from thatsIch/e-319-new-bc 
Fixes #743 crash with plugs, fixes #942 builder integration, closes #319 BC 6 prep
 2015-03-11 00:49:21 +01:00
Yves 5e5be0e192 Update fr_FR.lang 2015-03-09 13:46:12 +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 cdf949a557 Merge pull request #991 from thatsIch/b-972-level-emitter-tooltip 
Fixes #972 Tooltip now corresponds to the actual behaviour
 2015-03-09 13:00:03 +01:00
yueh a5f58bb22f Merge pull request #829 from yueh/fix-improve-orehelper-performance 
Improved OreHelper performance
 2015-03-09 12:59:38 +01:00
thatsIch dddfd6dbaf Fixes #972 Tooltip now corresponds to the actual behaviour 2015-03-09 10:07:13 +01:00
yueh 53f448e578 Improved AEItemStack.compareTo performance. 2015-03-08 15:27:27 +01:00
yueh 311939c63c Merge pull request #973 from yueh/feature-improve-security-audit-log 
Some further improvements to the security audit
 2015-03-07 16:37:59 +01:00
yueh d8a3556bc3 Merge pull request #983 from yueh/fix-982 
Removes creating a ItemStack with a full NBT copy
 2015-03-07 16:35:56 +01:00
yueh 57e84c3039 Removes creating a ItemStack with a full NBT copy 
There is no need to create a full copy just to fetch the already available
stacksize. It still respects the maximum stacksize of Integer.MAX_VALUE as they copy is doing.

Fixes #982
 2015-03-07 15:45:59 +01:00
yueh 1bcf7f9d52 Some further improvements to the security audit 2015-03-05 14:53:10 +01:00
yueh 2746002eb1 Merge pull request #949 from yueh/feature-optional-colored-crafting-status 
Added an option to disable the colored crafting status
 2015-02-28 18:50:11 +01:00
yueh ee6a3def22 Merge pull request #956 from yueh/feature-improve-security-audit-log 
Added some more information to the security audit
 2015-02-28 18:49:53 +01:00
yueh 0b15c56037 Added some more information to the security audit 2015-02-28 17:22:17 +01:00
yueh d2f62ef98c Merge pull request #940 from bakaxyf/patch-1 
Update zh_CN.lang
 2015-02-27 15:20:40 +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 5a2b35ccd0 Merge pull request #855 from yueh/fix-cable-renderer 
Fixes cable render crash and covered cables render as smart.
 2015-02-27 11:07:40 +01:00
yueh 16218e46ec Merge pull request #926 from yueh/fix-910 
Fixes #910, report the correct hitbox to fmp
 2015-02-27 11:07:10 +01:00
yueh 68aaec16bc Improved OreHelper performance 2015-02-27 00:17:33 +01:00
yueh ec8d393403 Fixes #943 readded callable for simultaneous block breaking 2015-02-26 22:41:51 +01:00
bakaxyf 27e5eac6aa Update zh_CN.lang 2015-02-25 13:47:40 +08:00
yueh ca521935e0 Fixes #910, report the correct hitbox to fmp 2015-02-22 12:42:39 +01:00
yueh f60798129c Fixes cable render crash and covered cables render as smart. 2015-02-06 19:39:08 +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
FireBall ef3cb0a455 Merge pull request #781 from yueh/fix-p2p-missing-super-call 
Added missing super calls
 2015-01-22 11:05:23 -05:00
yueh be82dfec1f Added missing super calls 2015-01-19 22:51:41 +01:00
Chris 8eb5ad01cf Merge pull request #776 from al-myr/patch-1 
Update pt_BR.lang
 2015-01-19 12:22:42 -08:00
Chris a3c5e4cb05 Merge pull request #738 from TheJulianJES/Crank-Fix 
Fix #701
 2015-01-19 12:15:05 -08:00
yueh c35e057d96 Merge pull request #742 from LeerSpace/patch-1 
fixed two grammatical errors
 2015-01-19 19:53:35 +01:00
yueh a5a80b58d5 Merge pull request #677 from yueh/feature-remove-annihilation-buffer 
Removed buffer from annihilation plane
 2015-01-19 19:47:36 +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 3d2bd84450 Merge pull request #761 from yueh/fix-760 
Improved the logged warning for FailledConnection
 2015-01-19 19:44:15 +01:00
yueh 2776b2d430 Merge pull request #733 from yueh/fix-emitter-offline-network 
Disable level emitter on offline networks
 2015-01-19 19:44:01 +01:00
Al afbce77d0b Update pt_BR.lang 2015-01-19 07:51:22 -03:00
yueh 3a5844a0fe Improved the logged warning for FailledConnection 
Now displays to coordinates of the affected tunnels.
 2015-01-18 20:46:37 +01:00
John Reed e2798aaaf4 fixed two grammatical errors 
replaced "a" with "an" where appropriate
 2015-01-17 12:23:19 -06:00
TheJulianJES 99d86511a1 Fix #701 - Changed harvest tool to axe 2015-01-17 15:07:01 +01:00
yueh a8c920932e Formation plane can now drop blocks as items 2015-01-16 19:58:11 +01:00
yueh bd9eaa2d48 Disable level emitter on offline networks 
Turns off level emitters if the goes offline because it runs out of power,
channels or similar.
 2015-01-15 14:06:23 +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
yueh 29a4464e18 Removed buffer from annihilation plane 2015-01-03 16:26:23 +01:00
yueh 2f51568772 Effects should not collide with anything 2015-01-02 20:37:48 +01:00
thatsIch 59adde7c6b Spellings and enums equality 2015-01-02 00:01:34 +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 63ab2bbad0 Remove unsed method 2015-01-01 21:42:14 +01:00
thatsIch 33b04f6ff9 Removed obsolete Hashtable and replaced it with an HashMap 2015-01-01 21:38:52 +01:00
thatsIch 236f6f72e3 finalize fields 2015-01-01 21:19:50 +01:00
thatsIch 8920d949d2 this access 2015-01-01 21:17:00 +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
thatsIch e38293a291 Added missing javadoc return statement 2015-01-01 21:00:39 +01:00
yueh 15ba197083 Merge pull request #668 from yueh/fix-666 
Fixes #666 Only convert to a cablebus if an IPartItem is attached
 2015-01-01 15:35:57 +01:00
yueh ff903e65a5 Fixes #666 Only convert to a cablebus if an IPartItem is attached 2014-12-31 18:21:15 +01:00
thatsIch ada69b9a95 Fixes #663 NPE on disabled Facades 2014-12-30 23:18:38 +01:00
thatsIch fec00fee17 Fixes #659 NPE on usage of the FZ sculpting tool 2014-12-30 11:55:47 +01:00
thatsIch 02e59faa59 Remove comment 2014-12-29 23:02:48 +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
Anton e37d9099c7 Update ru_RU.lang 2014-12-28 22:24:53 +03: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 f7323289a5 Merge pull request #625 from thatsIch/b-624-pickaxe 
Fixes #624 Missing check to disable features
 2014-12-27 19:05:37 +01:00
Mitchell 0cf33c4ea3 Fix grammatical error 
Than = Comparison
 2014-12-25 09:16:22 -04: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
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 ee4f323977 More precise javadoc of IStorageCell 
Reflects the internal implementation of StorageCells
 2014-12-19 23:54:09 +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 2f7b4294c0 Merge pull request #588 from yueh/api-license 
Added MIT license to all api files
 2014-12-14 15:13:14 +01:00
yueh 98098ba86e Merged api and lang READMEs 2014-12-13 01:28:32 +01:00
yueh cab32b347b Added MIT license to all api files 2014-12-13 01:19:51 +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