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

685 commits

Author SHA1 Message Date
thatsIch
db76915b7e sort modifier 2015-09-27 00:00:50 +02:00
thatsIch
d5b352abda Add this qualifier 2015-09-27 00:00:34 +02:00
thatsIch
90af295750 Constant array init 2015-09-27 00:00:11 +02:00
thatsIch
b004e6eb27 Javastyle array 2015-09-26 23:59:47 +02:00
thatsIch
37ae2131fe 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-09-26 23:15:25 +02:00
thatsIch
410d2f1e0d final variables and parameters 
seeing some methods it does actually help to enforce the parameters
 2015-09-26 21:08:18 +02:00
thatsIch
0387d30d1c Reduce scope of variables 2015-09-26 20:07:51 +02:00
yueh
1bec11f616 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-26 19:00:59 +02:00
yueh
9b685d5b73 Merge pull request #1915 from thatsIch/e-remove-base-module 
Remove base module
 2015-09-26 11:57:04 +02:00
yueh
4b984452ad Merge pull request #1914 from thatsIch/e-prefer-is-empty 
prefer isEmpty over length() == 0
 2015-09-26 11:56:50 +02:00
yueh
b3e33b1c3b Merge pull request #1912 from thatsIch/e-replace-with-array-initializer 
Replace with array initializer
 2015-09-26 11:56:44 +02:00
yueh
572c2bb403 Merge pull request #1910 from thatsIch/e-redundant-type-casts 
Remove redundant type casts
 2015-09-26 11:56:28 +02:00
yueh
645c2b0e1c Merge pull request #1907 from yueh/fix-1905 
Fixes #1905: Export bus now considers failed crafting requests
 2015-09-26 11:40:38 +02:00
thatsIch
6952a2f958 Remove base module 2015-09-25 23:28:57 +02:00
thatsIch
dbf84428a5 Remove unnecessary semicolon 2015-09-25 23:19:34 +02:00
thatsIch
734d50d086 prefer isEmpty over length() == 0 2015-09-25 23:18:27 +02:00
thatsIch
4b3d7c7d03 Replace with array initializer 
this can be done through http://docs.oracle.com/javase/specs/jls/se6/html/arrays.html#10.6
 2015-09-25 23:04:36 +02:00
thatsIch
7a220e253d Remove unused imports 2015-09-25 22:33:03 +02:00
thatsIch
80e1a2863b Remove redundant type casts 2015-09-25 22:30:38 +02:00
yueh
92331b4d2e 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-25 19:58:07 +02:00
yueh
bcba2329b7 Merge pull request #1902 from yueh/fix-1896 
Fixes 1896: Only update a monitor if the text would change
 2015-09-23 23:46:43 +02:00
yueh
597e17b52b Fixes 1896: Only update a monitor if the text would change 2015-09-23 22:28:50 +02:00
yueh
759b6daa59 Merge pull request #1893 from yueh/fix-1892 
Fixes incorrect handling of prioritized inventories
 2015-09-23 15:28:13 +02:00
yueh
72518ad977 Merge pull request #1772 from yueh/feature-1569 
Feature 1569 Typesafe Integration Modules
 2015-09-23 00:20:00 +02:00
yueh
21fa2718f8 Merge pull request #1879 from yueh/fix-1878 
Fixes #1878: Now saves the dimensionlist correctly
 2015-09-23 00:15:36 +02:00
yueh
777bec184a Fixes 1878: Now saves worlddata more reliable. 2015-09-23 00:12:53 +02:00
yueh
b9d615c4ba 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-23 00:09:27 +02:00
yueh
f303c17ae0 First iteration of making integrations typesafe 2015-09-16 15:59:33 +02:00
yueh
26f13d4109 Fixes #1865: Spawn overflow items into the world 2015-09-11 20:05:17 +02:00
yueh
0df445c6a8 Merge pull request #1862 from yueh/feature-interface-9-slots 
Changed the interface to 9 slots to be consistent with every other machine
 2015-09-11 20:04:29 +02:00
thatsIch
8c817b2f85 Merge pull request #1851 from thatsIch/b-1850-add-second-optional-to-grindstone 
Fixes #1850: Fixed support for second optional output of the AE2 Grindstone
 2015-09-10 19:15:29 +02:00
yueh
7bd8cf3f59 Changed the interface to 9 slots to be consistent with every other machine 2015-09-08 00:19:05 +02:00
thatsIch
d893e52eb0 Fixes #1850: Fixed support for second optional output of the AE2 Grindstone 2015-09-01 23:58:40 +02:00
yueh
40dcf711f6 Fixed the order craftinglinks are notified for the last item. 
Fixes #1833
 2015-08-28 13:29:24 +02:00
yueh
5dfca5eb93 Merge pull request #1776 from yueh/feature-1283 
Closes #1283: Add custom Callable to prevent memory leaks
 2015-08-22 23:22:17 +02:00
yueh
26daaf2232 Merge pull request #1805 from yueh/feature-recipes-refactoring 
Reorganizes the recipes in a more reasonable way.
 2015-08-22 23:21:14 +02:00
yueh
c2022a7208 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-08-21 12:23:20 +02:00
yueh
0de7a2d83a Closes #1283: Add custom Callable to prevent memory leaks 2015-08-20 21:04:06 +02:00
yueh
517a832ac1 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-08-20 19:04:33 +02:00
yueh
1ecc811559 Merge pull request #1813 from yueh/fix-1481 
Fixes #1481: Not using the right itemcount in a few cases
 2015-08-16 15:39:33 +02:00
yueh
7dd283cf9f Fixes 1481: Not using the right itemcount in a few cases 2015-08-16 15:32:58 +02:00
yueh
a567dcc026 Wrong culling direction when rendering inscriber 
Fixes #1806
 2015-08-15 19:48:12 +02:00
yueh
7f72ba97f0 Merge pull request #1769 from yueh/feature-1726 
Closes #1726: Added Pressure P2P tunnel (PneumaticCraft)
 2015-08-15 18:12:37 +02:00
yueh
c3db5ef9e4 Merge pull request #1787 from thatsIch/b-1786-turkish-locale 
Fixes #1786: Locale critical code now uses the english local. Fixes Turkish Problem.
 2015-08-15 18:11:48 +02:00
yueh
f955febb5d Merge pull request #1782 from yueh/fix-1781 
Fixes #1781: Do not crash after the tileentity was removed
 2015-08-15 18:10:44 +02:00
yueh
3115147edf Merge pull request #1774 from yueh/fix-1481 
Fixes #1481: Updated cell itemcount when empty
 2015-08-15 18:10:30 +02:00
thatsIch
322b296639 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-08-10 13:34:31 +02:00
yueh
d1244f59ed Fixes #1781 Do not crash after the tileentity was removed 2015-08-08 14:14:38 +02:00
yueh
6a18102ea0 Fixes #1481: Updated cell itemcount when empty 2015-08-06 23:04:57 +02:00
yueh
300a9618b6 Fixes #1601: Do not allow 0 as stacksize for recipes 2015-08-06 22:47:24 +02:00
yueh
dfb435ae7d Removed unused imports 2015-08-06 19:49:56 +02:00
yueh
1728f683c3 Closes #1726: Added Pressure P2P tunnel (PneumaticCraft) 2015-08-06 19:37:19 +02:00
yueh
c0b62fd519 Added missing annotations 2015-08-06 19:08:33 +02:00
yueh
67c901966e Non static access of static members 2015-08-06 19:08:32 +02:00
yueh
a5287f6779 Qualified field and method access 2015-08-06 19:08:04 +02:00
yueh
8234c6dbb5 Added missing blocks for control statements 2015-08-06 19:08:03 +02:00
yueh
9c8deac9de Code format 2015-08-06 19:08:02 +02:00
yueh
c21a44d8c0 Organize imports 2015-08-06 19:06:49 +02:00
yueh
51c92d3dfb Merge pull request #1732 from yueh/fix-1718 
Use the correct resolver for crystal seeds
 2015-07-25 18:29:13 +02:00
yueh
c3ce9d9542 Adds a round robin and random mode to export buses. 
Resolves #85
 2015-07-25 17:27:56 +02:00
yueh
15993eb3c7 Merge pull request #1695 from yueh/b-prevents-crafting-of-disabled-parts 
Prevents crafting of disabled parts
 2015-07-24 22:27:21 +02:00
yueh
48d1a5aa88 Merge pull request #1687 from yueh/fix-1686 
Fixes #1686: Let PlayerRegistry handle nonexistent players
 2015-07-24 22:26:00 +02:00
yueh
3826b3b51f Merge pull request #1730 from yueh/fix-1728 
Fixes #1728 Mark the entity as dead before spawning overflow
 2015-07-24 22:25:43 +02:00
yueh
6f5a2888c0 Fixes #1710 Use the correct culling face for the meteor compass 2015-07-22 16:58:50 +02:00
yueh
6d42032738 Fixes #1718 Use the correct resolver for crystal seeds 2015-07-22 16:00:18 +02:00
yueh
1a38e5ba94 Fixes #1728 Mark the entity as dead before spawning overflow 2015-07-22 15:07:08 +02:00
yueh
ff3e51018f Fixes #1686: Let PlayerRegistry handle nonexistent players 2015-07-14 22:48:37 +02:00
yueh
65c47d4c4e Merge pull request #1633 from TheCricket/patch-2 
Allows the automation of Vibration Chambers with lava buckets
 2015-07-14 21:31:16 +02:00
yueh
d7486fec3c Merge pull request #1647 from yueh/fix-1646 
Fixes #1646 Save GridStorage properly
 2015-07-14 21:30:50 +02:00
yueh
796b6dc7a2 Merge pull request #1709 from yueh/fix-1706 
Fixes #1706 Adds a test to disable unsupported BetterStorage integration
 2015-07-14 21:30:30 +02:00
yueh
67b261cc7c Merge pull request #1698 from yueh/fix-1648 
Fixes #1648 Removes unecessary cast to BlockQuartzTorch
 2015-07-14 21:30:19 +02:00
yueh
3fb3f70392 Merge pull request #1678 from yueh/fix-1673 
Removed overly defensive code and ensure GL state to be restored.
 2015-07-14 21:30:03 +02:00
yueh
49321d72c1 Merge pull request #1667 from yueh/fix-1666 
Fixes #1666 Missing check for the memory card
 2015-07-14 21:29:49 +02:00
yueh
62fb0dc7f7 Merge pull request #1665 from yueh/fix-1656 
Fixes #1656 Reduces the amount of block updates a controller sends.
 2015-07-14 21:29:39 +02:00
yueh
e9e9535f2a Merge pull request #1635 from thatsIch/e-export-oredicts 
Exports the ore-dicts out of the recipe files
 2015-07-14 21:29:18 +02:00
yueh
ab9f4e7fd7 Merge pull request #1604 from yueh/e-immutable-inscriber-recipes 
Changed to immutable list to prevent direct modifcations
 2015-07-14 21:28:41 +02:00
yueh
1080b65404 Fixes #1706 Adds a test to disable unsupported BetterStorage integration 2015-07-14 20:49:39 +02:00
yueh
c823e1464b Ensure that disabled parts are actually disabled and removed. 2015-07-10 18:35:22 +02:00
yueh
4ba722cb51 Fixes #1648 Removes unecessary cast to BlockQuartzTorch 2015-07-10 18:16:27 +02:00
thatsIch
91b8d30a15 Fixes #1474: Prevents crafting of disabled recipes and deletes invalid parts 2015-07-09 13:35:31 +02:00
yueh
1c2df4f380 Reset the lastUsedChannels on a gridstorage change 2015-07-06 09:54:05 +02:00
yueh
3f013c8d1d Removed overly defensive code and ensure GL state to be restored. 
Fixes #1673
 2015-07-04 17:30:54 +02:00
yueh
4e46dc08af Fixes #1666 Missing check for the memory card 2015-07-01 22:01:46 +02:00
yueh
f5e3ae8949 Fixes #1656 Reduces the amount of block updates a controller sends. 2015-07-01 20:26:04 +02:00
yueh
b2c31e20b2 Fixes #1646 Save GridStorage properly 2015-06-26 00:35:59 +02:00
thatsIch
cd0aec123d Exports the ore-dicts out of the recipe files 
This will not alter the handler, because rewriting the parser for it being too static is not feasible at this point
 2015-06-21 23:57:36 +02:00
yueh
3844f3af87 Merge pull request #1619 from yueh/fix-1618 
Removed meta based rotation of CGA
 2015-06-21 20:33:54 +02:00
Cricket
1cc118c927 Allows the automation of Vibration Chambers with lava buckets 2015-06-21 12:57:59 -04:00
yueh
4acec30a66 Removed meta based rotation of CGA 
Fixes #1618
 2015-06-17 21:42:35 +02:00
thatsIch
ab32b2b357 Merge pull request #1600 from thatsIch/b-1599-precondition-failing-of-world-data 
Fixes #1599: Removes preconditions for world data and children
 2015-06-17 20:13:27 +02:00
thatsIch
db4a6c6cc0 Fixes #1599: Removes preconditions for world data and children 2015-06-16 19:26:37 +02:00
yueh
85de600d16 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-16 14:57:04 +02:00
yueh
6b47bf3ce8 Changed to immutable list to prevent direct modifcations 2015-06-16 00:18:01 +02:00
thatsIch
e5f59e0a00 Updates Forge to 1.7.10-10.13.4.1448-1.7.10 
the public field fluidID was removed and was replaced with the public getter
 2015-06-14 09:46:44 +02:00
thatsIch
2ba4f312d4 Fixes wrong interface names for BuildCraft Transport 2015-06-13 23:42:40 +02:00
thatsIch
2274ca79e4 Merge pull request #1578 from thatsIch/b-1559-infinite-recursion-crash 
Fixes #1559: Level Emitter with P:R alloy wire does not crash anymore
 2015-06-13 22:45:28 +02:00
thatsIch
a75dee0d08 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-13 17:24:30 +02:00
thatsIch
349ac7e0a0 Merge pull request #1590 from thatsIch/b-1588-same-oredict-name-for-certus-ore-and-charged 
Fixes #1588: Charged Certus Quartz Ore has its own oredictionary entry
 2015-06-13 17:17:54 +02:00
thatsIch
b5d0db493b Fixes #1588: Charged Certus Quartz Ore has its own oredictionary entry 2015-06-13 17:06:24 +02:00
yueh
256c0258bb Merge pull request #1522 from yueh/feature-12 
Closes #12 Added visual lock state to monitors
 2015-06-13 16:55:03 +02:00