Commit graph

120 commits

Author SHA1 Message Date
dea4766634
feat: WIP storage monitor implementation 2022-12-05 17:42:32 +01:00
8c0236bb29 Merge branch 'rv3-1.7.10' of https://git.tilera.org/tilera/Applied-Energistics-2-tilera-Edition into rv3-1.7.10 2022-12-03 21:46:13 +01:00
f67fb6a129
chore: format code
Some checks failed
continuous-integration/drone/push Build is failing
2022-12-02 17:40:47 +01:00
fbe3e1deb0 feat: add back entropy tools 2022-11-23 14:56:24 +01:00
822e2e5e11 Added legacy Access Terminal 2021-03-28 16:19:18 +02:00
5a2089941d
Merge pull request #1 from xsun2001/rv3-1.7.10
merge
2020-08-21 23:53:45 +02:00
徐晨曦
538eed5a9a
Merge pull request #27 from GTNewHorizons/backport_waila_stuff
Backport waila stuff
2019-08-07 16:11:41 +08:00
shartte
52d91ddecb Backport waila features from upstream:
Show P2P-Tunnel Link Status on WAILA

Implemented QoL improvement for P2P tunnels by showing their link status via WAILA.

Backport - Add P2P frequency to waila & memory card.
2019-07-17 23:24:57 -07:00
xsun2001
e72845ec4a some fix for the cherry-pick 2018-06-14 23:42:23 +08:00
yueh
df57a8f04f Fixes #2724: Use capitalized oredict name for dyes, not uppercase.
(cherry picked from commit 2ab0528015)
2018-06-14 23:40:38 +08:00
xsun2001
3cc48fec60 fix a bug that allows network tool to rotate blocks without the permission. 2018-02-18 20:47:13 +08:00
xsun2001
27fecccec4 fix a bug which can make entropy manipulator still consumes energy when it is prevented from melting a block. 2018-02-18 20:20:36 +08:00
tilera
05fa7abdb8 Controller is enabled without channels and item type limit removed 2018-02-03 21:24:01 +01:00
xsun2001
b8f9d19bb3 add event check to EntropyManipulator 2017-12-31 13:54:30 +08:00
xsun2001
77889845bf fix the bug that allows the NetworkTool to open the chests, which protected by LMC or other plugins, when press shift + right click. 2017-12-29 20:30:01 +08:00
yueh
1f22bc4205 Fixes #2623: Network Tool not removing facades with shift rightlick.
(cherry picked from commit 4eeb554)
2017-08-08 09:36:39 +08:00
xsun2001
563d902ff9 check the block's type when firing the event 2017-08-08 08:56:04 +08:00
xsun2001
11bc4b60a2 fix the event firing of AE2's items 2017-08-08 08:31:44 +08:00
xsun
87d82d6f2b fire events on some special AE items used, such as Wrench and MemoryCard. #6 2017-04-13 19:57:22 +08:00
xsun
53d3eafdbf clean up completely.(Although I think Intellij IDEA did a lot of useless thing) 2017-04-12 22:10:28 +08:00
yueh
c9ef1beea1 Refactored the logging
Using LogManager instead of FMLRelaunchLog to access the logger instance.
Added logging of the name of failed exports instead of exception.
Improved crafting log to include issuer including their location and the
requested item.
Removed superfluous FMLRelaunchLog instance.
Removed superfluous parameters for PlayerData constructor.

Closes #2009
Refs #2069
2015-12-26 23:14:29 +01:00
yueh
500fc47490 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-10-30 18:52:20 +01:00
yueh
24224a450b 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-10-06 11:33:27 +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
f303c17ae0 First iteration of making integrations typesafe 2015-09-16 15:59:33 +02:00
yueh
1728f683c3 Closes #1726: Added Pressure P2P tunnel (PneumaticCraft) 2015-08-06 19:37:19 +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
c823e1464b Ensure that disabled parts are actually disabled and removed. 2015-07-10 18:35:22 +02:00
thatsIch
91b8d30a15 Fixes #1474: Prevents crafting of disabled recipes and deletes invalid parts 2015-07-09 13:35:31 +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
thatsIch
d1e4ea6579 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
2015-06-13 16:05:59 +02:00
thatsIch
71ce42f26a 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
2015-06-13 13:10:46 +02:00
yueh
5aaaeb6d42 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.
2015-06-06 17:00:52 +02:00
yueh
4befdecd25 Closes #1344 Added a silk touch annihilation plane 2015-06-01 19:50:38 +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
1cf2e8d43e Instance field access not qualified with 'this' 2015-05-18 00:12:45 +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
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
513292cd08 Replaces all local variables regarding their naming conventions 2015-05-08 23:50:36 +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
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
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
thatsIch
64ed05a1b4 Puts everywhere brackets 2015-04-29 18:38:24 +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
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