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

1211 commits

Author SHA1 Message Date
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
XFRGod
f054bd699b Update hu_HU.lang 
This is a language "correction"(?) and typo fixing update for the lang file and now it's 110% localized:D
 2015-12-23 14:43:49 +01:00
yueh
3a0eafce3c Fixes #2044: No longer uses internal exceptions 
Added 3 new exception as subclass to FailedConnection to allow a more
precise handling and/or logging.
 2015-12-23 14:43:30 +01:00
XFRGod
daf2587140 Update hu_HU.lang 
Okay now it's absolutely 100% done and I'm officially dead.
Onto EnderIO and Botania then!
 2015-12-23 14:42:28 +01:00
XFRGod
18bf78b379 Update hu_HU.lang 2015-12-23 14:42:05 +01:00
yueh
f2d9a7312b Exception during GridConnection now reports the machine and side. 2015-12-23 14:41:56 +01:00
yueh
f9835e589a Reverts some of the changes to ItemList. 
Removes the split collection as in some rare corner cases the insertion
order is important to maintain the correct data in terms of self cleaning.

Keeps the general cleanups and split of Fluid/ItemList.

Fixes #1964
 2015-12-23 14:41:32 +01:00
thatsIch
18d10e4cc4 Fixes #1995: Allows creation of version checker config file after start up 2015-12-23 14:39:42 +01:00
yueh
9fd183900a Fixes #1983: WorldData cleared too early when still needed. 2015-12-23 14:39:25 +01:00
thatsIch
e922bf02d4 Fixes #1973: 9th slot of ME Interface ignored work 2015-12-23 14:38:26 +01:00
bakaxyf
faaff58fde Update zh_CN.lang 
1728f683c3 d893e52eb0 24224a450b
 2015-12-23 14:38:17 +01:00
yueh
2521f11a40 Fixes #1932: Better VersionChecker exception handling 
ModVersionFetcher will now return a MissingVersion in case of an exception
instead of letting it propagate upwards.

Also added a generic try/catch to the VersionChecker itself, just in case
any unchecked exception might be triggered inside the thread and at least
not logged correctly.
 2015-12-23 14:37:49 +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
888b3e5600 Closes #1899, Fixed #1898: Adds an easy way to export interesting information into CSV format 
Mostly used for the recipe system, but can also be used for debugging purposes. Debug options needs to be ticked to use the full information gain. Recipes only require the normal localization and the specific name plus metadata.

Shifted the recipes into a recipes folder where the CSV will also reside. This will also elevate the copying of the readme to the user directory since it can reside in the recipes folder.

Fixed a bug where the copier would copy the would also copy empty folders
 2015-12-23 14:32:53 +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
yueh
3a30ca7570 ItemList refactoring 
Splitted the ItemList and MeaningfulIterator into an item and fluid
version.
Added an IdentityHashMap as additional item layer to the ItemList for a
faster access.
Refactored FluidList, findFuzzy will now return the same fluid instead of
an empty collection.
 2015-09-30 14:18:18 +02:00
thatsIch
71223a9d58 Remove base module 2015-09-30 14:17:15 +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
9d35f65e76 Remove unused imports 2015-09-30 14:14:50 +02:00
thatsIch
209298bb4d Remove redundant type casts 2015-09-30 14:14:12 +02:00
yueh
3b495c35d7 Fixes #1905: Export bus now considers failed crafting requests 
The export bus will now no longer speed up, if more than 1 of the last
crafting requests failed and slow down, if more then 5 failed.

Some code cleanup and moved the custom iterator into the helper package
as it is clearly related to the craftingtracker and not the export bus.
 2015-09-30 14:03:31 +02:00
yueh
c96cf10c86 Fixes 1896: Only update a monitor if the text would change 2015-09-30 14:03:20 +02:00
yueh
174818c6d8 Fixes 1878: Now saves worlddata more reliable. 2015-09-30 14:00:32 +02:00
yueh
97b7583ff2 Fixes incorrect handling of prioritized inventories 
Prioritized inventories are not longer used twice for storing leftover
items and thus finally reporting twice the amount of storable items when
they are the only possible option to store something.

Also fixes import buses now respecting the amount of storable items inside
the network instead of trying to place the exported items back and failing
on any restricted inventory, potentially voiding the overflow.

Fixes #1892
 2015-09-30 13:52:08 +02:00
asd0210a
73f928d57a zh_tw.lang Updated 2015-09-30 13:52:01 +02:00
yueh
0d25b76b77 First iteration of making integrations typesafe 2015-09-30 13:51:47 +02:00
yueh
cdcba63c2d Fixes #1865: Spawn overflow items into the world 2015-09-30 13:42:41 +02:00
yueh
ef6bc3e58f Changed the interface to 9 slots to be consistent with every other machine 2015-09-30 13:42:31 +02:00
yueh
0ce551589e Added a missing whitespace and removed duplicate ones. 2015-09-30 13:42:14 +02:00
Mazdallier
f89f79d71c Update fr_FR.lang 2015-09-30 13:41:25 +02:00
thatsIch
0d312f91af Fixes #1850: Fixed support for second optional output of the AE2 Grindstone 2015-09-30 13:41:15 +02:00
thatsIch
468cb4e9df Fixes #1588: Charged Certus Quartz Ore was given a wrong name 2015-09-30 13:40:03 +02:00
yueh
6a2056562b Fixed the order craftinglinks are notified for the last item. 
Fixes #1833
 2015-09-30 13:39:24 +02:00
yueh
84fa5a38e0 Reorganizes the recipes in a more reasonable way. 
The recipes are now structured into multipe subfolder and split into more
distinct files, so the names are more appropriate and are better at
hinting which items the actually contain.

It also extends the RecipeResourceCopier to now handle the folder
recursively and extract all subdirectories and their files.

"import=" is currently requiring a relative path to the root directory
of the recipes. This would require a larger rewrite/refactoring, thus it
is kept for now until a potentially later changer.

This reverts splitting the oredict entries into their own directory and
moves them back into the recipes folder, as it currently is causing a
couple of issues like not being able to resolve the aliases or is not
working indev. But to keep it seperate it is now its own recipe file.

Fixes #1791
Reverts #1635
 2015-09-30 13:39:09 +02:00
yueh
621952e37d Closes #1283: Add custom Callable to prevent memory leaks 2015-09-30 13:37:35 +02:00
yueh
20a6e7631f Fixes #1810: Removes a CompassReader once the world is unloaded. 
This should no longer keep a reference to a World around and potentially
keep them loaded.
Also added a finalize() to CompassRegion to ensure the file is closed on a
GC.

Some cleanup regarding member order, final, etc
 2015-09-30 13:33:06 +02:00
yueh
851878cf18 Fixes 1481: Not using the right itemcount in a few cases 2015-09-30 13:27:29 +02:00
yueh
3a6001e18f Wrong culling direction when rendering inscriber 
Fixes #1806
 2015-09-30 13:27:20 +02:00
thatsIch
29a55f914b Fixes #1786: Locale critical code now uses the english local for transmission. Fixes Turkish Problem. 
Applied English Locale where localization is not expected as in internal recipe handling and IMC handling, basically which interacts with public API where we either require to enforce the incoming text with regex ([a-z0-9]) or just expect proper usage of the API, but with just using upper cases in recipe files it would break in Turkish Locale like

ALIAS

another option would have been to use `equalsIgnoreCase` in some cases, but not all applicable
 2015-09-30 13:26:56 +02:00
yueh
8fc62faf30 Fixes #1781 Do not crash after the tileentity was removed 2015-09-30 13:25:47 +02:00
yueh
465f9efbd5 Fixes #1481: Updated cell itemcount when empty 2015-09-30 13:22:26 +02:00
yueh
d26caa5f8b Fixes #1601: Do not allow 0 as stacksize for recipes 2015-09-30 13:20:50 +02:00
yueh
b0504f4141 Closes #1726: Added Pressure P2P tunnel (PneumaticCraft) 2015-09-30 13:19:57 +02:00
yueh
6488119318 Non static access of static members 2015-09-30 13:14:54 +02:00
thatsIch
b0bb793a0e Fix compile errors 2015-09-30 13:09:58 +02:00
yueh
2a5d26b349 Organize imports 2015-09-30 13:07:27 +02:00
bakaxyf
95b50748d2 Update zh_CN.lang 2015-09-30 13:04:22 +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
yueh
373fa522be Fixes #1718 Use the correct resolver for crystal seeds 2015-09-30 12:56:47 +02:00
yueh
432724623e Fixes #1728 Mark the entity as dead before spawning overflow 2015-09-30 12:56:35 +02:00
yueh
33e2eb5a74 Fixes #1686: Let PlayerRegistry handle nonexistent players 2015-09-30 12:54:22 +02:00
yueh
37f51db0d9 Changed to immutable list to prevent direct modifcations 2015-09-30 12:52:53 +02:00
yueh
0d6f80e813 Fixes #1706 Adds a test to disable unsupported BetterStorage integration 2015-09-30 12:48:25 +02:00
thatsIch
bcb4c0bc02 Fix compile errors 2015-09-30 12:47:23 +02:00
yueh
c978bf90f8 Ensure that disabled parts are actually disabled and removed. 2015-09-30 12:30:47 +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
yueh
5d34b4e182 Reset the lastUsedChannels on a gridstorage change 2015-09-30 12:09:18 +02:00
yueh
d866b6c167 Removed overly defensive code and ensure GL state to be restored. 
Fixes #1673
 2015-09-30 12:09:06 +02:00
yueh
accfc1221f Fixes #1666 Missing check for the memory card 2015-09-30 12:08:56 +02:00
yueh
ca97a7a5e3 Fixes #1656 Reduces the amount of block updates a controller sends. 2015-09-30 12:08:39 +02:00
yueh
b39a51a870 Fixes #1646 Save GridStorage properly 2015-09-30 11:51:59 +02:00
Cricket
8be68e9b22 Allows the automation of Vibration Chambers with lava buckets 2015-09-30 11:50:15 +02:00
thatsIch
59dbfb1452 Fixed stairs 2015-09-30 11:34:16 +02:00
thatsIch
8b921a7b79 Removed registration of layers 2015-06-26 22:50:09 +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
0e378d8ad4 Added all stairs 2015-06-26 01:06:35 +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
bakaxyf
cc78153fe4 Update zh_CN.lang 2015-06-22 15:38:43 +02:00
yueh
94ac69ce37 Removed meta based rotation of CGA 
Fixes #1618

Conflicts:
	src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java
 2015-06-22 15:38:32 +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
thatsIch
07a4a8505b Fixes #1599: Removes preconditions for world data and children 2015-06-22 14:51:00 +02:00
thatsIch
863b57fc3b Improves the message generated when generating the folder for the compass data. 
Outsources the encoding of the compass data into the file name
Written tests for the encoding
Did some internal cleaning of the class

Conflicts:
	src/main/java/appeng/block/solids/BlockSkyStone.java
	src/main/java/appeng/core/WorldSettings.java
	src/main/java/appeng/core/features/registries/PlayerRegistry.java
	src/main/java/appeng/core/sync/network/NetworkHandler.java
	src/main/java/appeng/core/worlddata/PlayerMapping.java
	src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java
	src/main/java/appeng/services/CompassService.java
	src/main/java/appeng/worldgen/MeteoritePlacer.java
	src/main/java/appeng/worldgen/MeteoriteWorldGen.java
 2015-06-22 14:49:35 +02:00
thatsIch
a62d9bfcbf Fixes wrong interface names for BuildCraft Transport 
Conflicts:
	src/main/java/appeng/parts/misc/PartStorageBus.java
	src/main/java/appeng/parts/p2p/PartP2PItems.java
 2015-06-18 20:12:18 +02:00
thatsIch
51ed55510c rest of BC commit 2015-06-18 20:10:37 +02:00
thatsIch
97f23cf955 Updates BuildCraft to 7.0.9 
Split dependency logic on the BuildCraft modules.
Config needs to be reset, if BuildCraft was disabled actively,
because now there are 3 BC modules to be taken account of

Conflicts:
	gradle.properties
	src/main/java/appeng/facade/FacadeContainer.java
	src/main/java/appeng/facade/FacadePart.java
	src/main/java/appeng/integration/abstraction/IBC.java
	src/main/java/appeng/integration/modules/BC.java
	src/main/java/appeng/integration/modules/BCHelpers/BCPipeHandler.java
	src/main/java/appeng/integration/modules/BCHelpers/BCPipeInventory.java
	src/main/java/appeng/items/tools/ToolNetworkTool.java
	src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java
	src/main/java/appeng/parts/CableBusStorage.java
	src/main/java/appeng/parts/layers/LayerIPipeConnection.java
	src/main/java/appeng/parts/misc/PartStorageBus.java
	src/main/java/appeng/parts/p2p/PartP2PItems.java
	src/main/java/appeng/util/inv/AdaptorBCPipe.java
	src/main/java/appeng/util/inv/WrapperBCPipe.java
 2015-06-18 20:09:36 +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
thatsIch
13d40c922b Fixes #1559: Level Emitter with P:R alloy wire does not crash anymore 
Required to implement a more advanced interface, if not done that way, the parts will update themselves recursively
 2015-06-18 01:19:56 +02:00
yueh
de260b5283 Splitted channeldata into two ints 
Previously it did encode the current and previous used channels into the
same as well as mask it with 0xFF. Which lead to an overflow every 256
gridnodes requiring a channel. This will not happen at > 2^31

Also removes the need to bitshift them for every access.

Fixes #1510
 2015-06-18 00:46:14 +02:00
thatsIch
efafaedf68 Fixes #1588: Charged Certus Quartz Ore has its own oredictionary entry 
Conflicts:
	src/main/java/appeng/block/solids/OreQuartz.java
 2015-06-18 00:45:55 +02:00
thatsIch
03eec78d6f Remove deprecated sameAs for blocks 2015-06-17 23:32:33 +02:00
thatsIch
0cd25428e6 Remove deprecated item definition 2015-06-17 23:30:23 +02:00
thatsIch
6d510d3912 Remove cell deprecation 2015-06-17 23:25:16 +02:00
Uristqwerty
41b8150ef4 Cleaned up CraftGuide Integration 
A NPE caused to open CraftGuide very slowly (several seconds)

Added Grinder recipes
Added Inscriber recipes

Conflicts:
	src/main/java/appeng/integration/modules/CraftGuide.java
 2015-06-17 21:35:46 +02:00
yueh
20f72cae04 No longer invalidate the cache of MEMonitorIInventory on simulate. 
Should fix #1036
 2015-06-17 21:34:11 +02:00
thatsIch
a95b9962b9 make it runnable 2015-06-17 19:39:18 +02:00
AlgorithmX2
38afde724b Most of the 1.8 Port. 2015-06-15 19:44:59 -05:00
thatsIch
17465e68e8 Merge pull request #1453 from thatsIch/f-1452-auto-gen-custom-recipes 
Closes #1452: Implements auto-generation of custom recipes
 2015-06-03 23:18:35 +02:00
thatsIch
7a731ec658 Closes #1541: Implements Thermal Dynamics attunements 
Adds itemduct to item P2P
Adds fluiducts to fluid P2P
Adds fluxduct to RF P2P
 2015-06-02 22:21:37 +02:00
thatsIch
3a9296f453 Merge pull request #1537 from thatsIch/b-1536-bc-checking 
Fixes #1536: Checking for all required BC classes
 2015-06-01 20:45:15 +02: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
thatsIch
6e881fac2d Fixes #1536: Checking for all required BC classes 2015-06-01 19:14:45 +02:00
thatsIch
0076f2ea51 Closes #1452: Implements auto-generation of custom recipes 2015-06-01 17:37:25 +02:00
Lemmmy
58bdeb134c Proper English localisation 2015-06-01 01:54:44 +01:00
thatsIch
2722057c81 Merge pull request #1527 from thatsIch/b-1521-wrong-stable-channel 
Fixes #1521: Renames release to stable
 2015-05-30 22:30:07 +02:00
thatsIch
d6f29464c6 Fixes #1521: Renames release to stable 2015-05-30 19:52:06 +02:00
PetaByteBoy
c00962b044 add slabs 2015-05-23 15:02:29 +02:00
TheJulianJES
ade5e23458 Changed version from PartStack provider to rv2 (rv2) 
because @thatsIch merged it also to rv2
 2015-05-23 13:49:54 +02:00
yueh
61dfc05ae0 Added a simple ETA to crafting jobs 2015-05-21 21:31:13 +02:00
thatsIch
25fd03cb88 Revert cast to match Java 6 2015-05-21 21:00:45 +02:00
thatsIch
f16ae9c80b Merge pull request #1490 from bakaxyf/master 
Update zh_CN.lang
 2015-05-20 10:43:31 +02:00
bakaxyf
ed1f327c57 Update zh_CN.lang 2015-05-20 16:10:04 +08:00
thatsIch
4a19ea4c68 Merge pull request #1447 from jeremiahwinsley/master 
Fix for #1384 - Infinite Power
 2015-05-19 21:06:48 +02:00
thatsIch
57eb4c0a71 Lower case playerID 2015-05-19 16:24:08 +02:00
yueh
ecf2f3fdaf Merge pull request #1478 from yueh/fix-1465 
Fixes #1465 faulty item comparison
 2015-05-19 00:53:53 +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
Jeremiah Winsley
020740bf43 Fixes #1384 - implement AdvancedShaftPowerReceiver for RotaryCraft powersink 2015-05-18 14:38:38 -04:00
thatsIch
682c674696 Merge pull request #1467 from TheJulianJES/wailaStackPart 
Fix #1362 - Parts display in WAILA
 2015-05-18 19:35:14 +02:00
yueh
7fa7502770 Fixes #1465 faulty item comparison 2015-05-18 19:31:18 +02:00
thatsIch
962c7c0a92 Merge pull request #1468 from TheJulianJES/noRFtooltip 
Removes default RF tooltip on WAILA 1.5.9+
 2015-05-18 19:28:31 +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
a349e1a277 Usage of CONSTANTS 2015-05-18 08:59:27 +02:00
thatsIch
b72c766c16 Split raytrace 2015-05-18 00:37:06 +02:00
thatsIch
72eab029ab Static imports 2015-05-18 00:34:50 +02:00
thatsIch
3613c235be Unused imports 2015-05-18 00:34:37 +02:00
thatsIch
880ea762e5 missing javadoc 2015-05-18 00:34:14 +02:00
thatsIch
83c9c0efcb Better hyphing 2015-05-18 00:33:39 +02:00
thatsIch
733a53ec6d Typo in 'fward' 2015-05-18 00:33:04 +02:00
thatsIch
8c500c4016 Typo in 'fward' 2015-05-18 00:32:46 +02:00
thatsIch
abdd6e1915 Typo in 'constructor' 2015-05-18 00:31:41 +02:00
thatsIch
209333989e Typ in chisldQuartz 2015-05-18 00:31:16 +02:00
thatsIch
2803a671d1 Redundant type casts 2015-05-18 00:30:08 +02:00
thatsIch
1cf2e8d43e Instance field access not qualified with 'this' 2015-05-18 00:12:45 +02:00
thatsIch
e7746dc037 Static imports 2015-05-18 00:12:13 +02:00
thatsIch
72195ea784 Unused imports 2015-05-18 00:12:01 +02:00
thatsIch
f102c3b468 apply constant naming convention 2015-05-18 00:11:18 +02:00
thatsIch
f0215ca56a apply method parameter naming convetion 2015-05-18 00:09:09 +02:00
thatsIch
0f9ca7885a Lower case methods 2015-05-18 00:08:05 +02:00
thatsIch
124d14d3c3 Lower case Swap 2015-05-18 00:02:28 +02:00
thatsIch
f9e25b5a33 Lower case method name 2015-05-17 23:52:15 +02:00
thatsIch
72d85aecc9 Use interface for collections 2015-05-17 23:51:57 +02:00
TheJulianJES
0bfb7b7ed3 Removes default RF tooltip 
Removed tab

Did something
 2015-05-17 20:22:01 +02:00
TheJulianJES
e82e8a039b Parts display correctly in WAILA 
Register an method that can be overidden

Register the same method in the interface

New class that picks the item and displays it to WAILA

Register the new class and call the other class method

Import in PartWailaDataProvider

Fixed errors

Renamed all Display -> Stack

Stuff
 2015-05-17 20:03:32 +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
thatsIch
4b5fd35056 Merge pull request #1462 from thatsIch/e-improved-test-coverage 
Adds tests to improve the test coverage
 2015-05-16 14:21:58 +02:00
thatsIch
e40f68d3fa Adds tests to improve the test coverage 2015-05-16 12:25:10 +02:00
yueh
96e79e9d9c Fixes #1389 Enabled repeatable keyboard events 2015-05-16 11:34:18 +02:00
TheJulianJES
0085909914 Don't add the player inventory two times (Inscriber) 2015-05-10 17:55:10 +02:00
TheJulianJES
afb9bb4379 Meteorites can now spawn in stained clay biomes 2015-05-10 11:37:42 +02:00
thatsIch
b0249244cc Merge pull request #1431 from TheJulianJES/GermanLang 
Changed things in de_DE.lang
 2015-05-09 23:23:26 +02:00
TheJulianJES
77873e135f Changed things in de_DE.lang 
Fixed a derp

Changed it, again!

Fixed it (all)

Added line 450
 2015-05-09 23:20:53 +02:00
TheJulianJES
82efa151cc Fix warnings in eclipse 
Close scanner instead of doing it with a warning

Make the scanner final..
 2015-05-09 23:10:23 +02:00
thatsIch
71569cadb5 Merge pull request #1424 from thatsIch/e-simplified-bitwise-operations 
Simplified bitwise operation
 2015-05-09 15:58:04 +02:00
thatsIch
1d737c3167 Merge pull request #1425 from thatsIch/e-weaker-collection-type 
Use weaker collection types
 2015-05-09 15:57:57 +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
Florian Nücke
18503ac526 Added P2P tunnel part for OpenComputers. 
Includes cleanup provided by thatsIch.
 2015-05-09 14:53:54 +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
16c0fbe3c1 Use weaker collection types 2015-05-09 12:33:16 +02:00
thatsIch
513292cd08 Replaces all local variables regarding their naming conventions 2015-05-08 23:50:36 +02:00
thatsIch
d8ac614a17 Merge pull request #1423 from thatsIch/e-import-issues 
Replaces * and static imports with more readable ones
 2015-05-08 23:45:51 +02:00
thatsIch
8dd0991a7d Merge pull request #1422 from thatsIch/e-constant-naming-convention 
Replaces all constants regarding their naming conventions
 2015-05-08 23:45:44 +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
c451a25c7f Merge pull request #1419 from thatsIch/e-non-constant-field-with-upper-case-name 
Replaces all non constant fields with upper case name
 2015-05-08 23:45:15 +02:00
thatsIch
9d4fd64c58 Merge pull request #1417 from thatsIch/e-reflection-stuff 
Removes the unneeded information about the current class in all blocks
 2015-05-08 23:45:02 +02:00
thatsIch
42c7cca64f Simplified bitwise operation 2015-05-08 23:44:07 +02:00
thatsIch
7f61ebebc8 Replaces * and static imports with more readable ones 2015-05-08 23:40:31 +02:00
thatsIch
7f14faeaa3 Replaces all constants regarding their naming conventions 2015-05-08 23:37:09 +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
a44369a272 More efficient iteration 2015-05-08 22:42:08 +02:00
thatsIch
25a3573a76 Fix typos 2015-05-08 22:38:04 +02:00
thatsIch
9845e2a463 Merge pull request #1414 from thatsIch/e-1413-removal-of-rb 
Closes #1413: Removes RB integration since lacking 1.7.10+ support
 2015-05-08 19:44:09 +02:00
thatsIch
3d5fd2c5e8 Merge pull request #1408 from thatsIch/e-logo 
Closes #1404: Added logo to AE2
 2015-05-08 19:44:02 +02:00
thatsIch
dbacb566bb Removes the unneeded information about the current class in all blocks 
Every Block had a call to its super, passing its own class.
This can easily be simulated by calling `this.getClass()` in the super class.
Also this was basically only used as using a name.
In the future it might be advisable to not use such methods,
since they are prone to refactoring.
 2015-05-08 19:03:03 +02:00
thatsIch
96576a7fc5 Closes #1413: Removes RB integration since lacking 1.7.10+ support 2015-05-08 18:58:37 +02:00
thatsIch
81464d7de1 Closes #1404: Added logo to AE2 2015-05-08 18:47:18 +02:00
thatsIch
00248f574a Fixes #1411: Adds recipes for stairs 2015-05-08 18:32:44 +02:00
Lorenzo Dalla Costa Cervelin
34665d94df Update pt_BR.lang 2015-05-06 14:38:21 -03:00
thatsIch
1baed48b0a Merge pull request #1372 from thatsIch/b-1368-vibration-chamber-comparator 
Fixes #1368: Vibration Chamber notifies neighbors on inventory change and state change
 2015-05-03 16:24:26 +02:00
yueh
da6b31cdb1 Merge pull request #1352 from yueh/fix-1336 
Fixes part interface inventory model
 2015-05-02 20:39:42 +02:00
thatsIch
875214c166 Adds annotations by contract of the interface 2015-05-02 15:39:59 +02:00
thatsIch
a9ec31d72f Merge pull request #1332 from thatsIch/b-1331-crash-on-disabled-material 
Fixes #1331: Happened on deactivating features for intermediate crafting components
 2015-05-02 07:24:36 +02:00
thatsIch
e392ecd08d Fixes #1368: Vibration Chamber notifies neighbors on inventory change and state change 2015-05-01 17:58:59 +02:00
thatsIch
03f9436ef9 Fixes #1331: Happened on deactivating features for intermediate crafting components 
If a feature dependency of ItemMultiMaterial was disabled, the returned value was never assigned with the constructed. Pulling out the construction and setting it before checking it, prevents the NPE and also matches the behaviour in ItemMultiPart, where parts are constructed, but never registered.
 2015-05-01 17:52:23 +02:00
yueh
f15561c4dc Added missing check to detect missing cell workbenches 
Fixes #1360
 2015-05-01 12:48:08 +02:00
thatsIch
64ed05a1b4 Puts everywhere brackets 2015-04-29 18:38:24 +02:00
thatsIch
23aa8fd72d Merge pull request #1337 from thatsIch/e-1333-recipe-sorter 
Fixes #1333: Updated old code parts related to recipes
 2015-04-28 19:44:55 +02:00
yueh
332ea089e3 Fixes part interface inventory model 
Fixes #1336
 2015-04-28 19:13:51 +02:00
yueh
106003ebf9 Merge pull request #1349 from yueh/fix-1348 
Removed MJ as icon
 2015-04-28 19:11:21 +02:00
thatsIch
8271597394 Merge pull request #1341 from thatsIch/b-1339-server-crash 
Fixes #1339: Was not able to retrieve the name of an unregistered part
 2015-04-28 18:42:42 +02:00
thatsIch
9210069d9b Fixes #1333: Updated old code parts related to recipes 
Fixed an additional bug, where the disassembling recipes were not working properly. The fail logic was flawed, so that it would never match the recipe
 2015-04-28 18:37:46 +02:00
yueh
f364359905 Removed MJ as icon 
Fixes #1348
 2015-04-28 18:28:54 +02:00
Yves
43a47f8971 Update fr_FR.lang 
Minor correction and group organisation
 2015-04-27 13:23:28 +02:00
thatsIch
e85acf2bee Fixes #1339: Was not able to retrieve the name of an unregistered part 
Added an additional map to store all parts and be able to access them if needed.
Added public preconditions
Added private asserts
Excluded public overridden methods, since behaviour can be unexpected
 2015-04-27 09:51:40 +02:00
thatsIch
bbde2443e1 Merge pull request #1335 from TheVikingWarrior/patch-3 
Update it_IT.lang
 2015-04-26 16:54:21 +02:00
TheVikingWarrior
ee977720ca Update it_IT.lang 2015-04-26 15:48:53 +02:00
thatsIch
ca953f4596 Fixes #1327: Prevents crash when configuring a GUI 2015-04-25 20:09:53 +02:00
thatsIch
2adc055536 Merge pull request #1276 from thatsIch/b-1186-disassembling-storage-missing-upgrades 
Fixes #1186: Storage Cells drop upgrades upon disassembling
 2015-04-24 19:12:17 +02:00
Anton
9451106c81 Update ru_RU.lang 2015-04-24 07:51:44 +03:00
thatsIch
eca598516e Fixes #1277: Removed config option for MJ-P2P Tunnel 2015-04-23 23:45:32 +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
199b17b9c6 Merge pull request #1274 from thatsIch/e-1273-deprecated 
Closes #1273: Replaced deprecated method call
 2015-04-23 23:42:42 +02:00
thatsIch
f582c8081b Merge pull request #1275 from thatsIch/e-1270-nei-grinder-localization 
Closes #1270: Improves NEI grinder overlay localization
 2015-04-23 23:42:26 +02:00
thatsIch
77d66b1817 Merge pull request #1279 from thatsIch/b-1264-render-crash-missing-rf-api 
Fixes #1264: Does not crash on missing RF API
 2015-04-23 23:42:01 +02:00
thatsIch
df370396b1 Merge pull request #1299 from thatsIch/e-qol-exception-messages 
Improved exceptions
 2015-04-23 23:41:44 +02:00
thatsIch
ceeb84a439 Merge pull request #1302 from thatsIch/e-qol-parthelper 
Removes unrequired part helper getter, since it already existed
 2015-04-23 23:41:24 +02:00
yueh
d151313253 Replaced static field with with a unique BaseActionSource 
Fixes #329
 2015-04-23 23:22:55 +02:00
yueh
6d935cc8ae Merge pull request #1311 from yueh/fix-1310 
Refactored the NEI handling to use an InventoryAdaptor
 2015-04-23 23:17:11 +02:00
thatsIch
8087a43df5 Fixes #1186: Storage Cells drop upgrades upon disassembling 2015-04-23 22:54:10 +02:00
yueh
c2cd395ca1 Fixed interface dropping items into itself 
Fixes #456
 2015-04-23 15:57:12 +02:00
yueh
a6e2975677 Refactored the NEI handling to use an InventoryAdaptor 
Fixes #1310
 2015-04-23 15:00:34 +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
be17616836 Removes unrequired part helper getter, since it already existed 2015-04-20 21:12:03 +02:00
theelixzammuto
f878a7598d Update it_IT.lang 2015-04-14 18:07:07 +02:00
thatsIch
071ae6d680 Fixes #1264: Does not crash on missing RF API 2015-04-13 22:15:39 +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
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
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
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
df7aa02a11 Bumped API to rv2 2014-10-18 19:05:55 +02:00
thatsIch
d78b0f87d5 Merge pull request #311 from thatsIch/textfield 
Fixes search-box click area
 2014-10-18 10:03:26 +02:00
thatsIch
c82de5db8f Fixed typos in localizations 2014-10-17 12:30:57 +02:00
thatsIch
7230485039 Updated localizations 2014-10-16 17:31:17 +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