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

799 commits

Author SHA1 Message Date
Timo Ley 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
LordMZTE ce2277c8ec
feat: initial very glitchy transition plane implementation 2022-12-03 16:05:52 +01:00
LordMZTE f67fb6a129
chore: format code
Some checks failed
continuous-integration/drone/push Build is failing
Details
2022-12-02 17:40:47 +01:00
LordMZTE ed0cc5f181
feat: add legacy wireless access point 2022-12-02 17:39:49 +01:00
Timo Ley fbe3e1deb0 feat: add back entropy tools 2022-11-23 14:56:24 +01:00
Timo Ley c41fb8f795 Added Legacy Controller textures and recipe 2021-04-03 12:02:52 +02:00
Timo Ley 27ff3fb1d6 Side was broken, must be between 0 and 5 to prevent other mods from crashing 2021-04-03 00:02:44 +02:00
LordMZTE 5b0844dd69 add gui to legacy controller 2021-03-29 22:53:57 +02:00
Timo Ley 66f03f1abe Added legacy Controller base functionality 2021-03-29 10:15:59 +02:00
Timo Ley bfa013b73c Added legacy Crafting Monitor 2021-03-28 21:30:48 +02:00
Timo Ley 425d3868dd Added legacy Crafting Terminal 2021-03-28 18:20:02 +02:00
tilera Ley 97e2388d02 Config option to make Controller mandatory 2021-03-28 17:58:25 +02:00
tilera Ley 822e2e5e11 Added legacy Access Terminal 2021-03-28 16:19:18 +02:00
Timo Ley 62b0907395 Add Logistics Pipes integration 2021-03-19 11:41:03 +01:00
Timo Ley f0311d3fd9 Config for item type limit 2021-03-19 11:09:01 +01:00
Timo Ley 404b4dbab9 Controller now required for infinite channels 2021-03-19 11:08:34 +01:00
Timo Ley 5a2089941d
Merge pull request #1 from xsun2001/rv3-1.7.10 
merge
 2020-08-21 23:53:45 +02:00
xsun2001 f0170caea3
Fix #28 2019-12-07 23:47:44 +08: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 5da42ca598
Fixes #26: Annihilation plane can cause NPE. 2019-06-23 14:21:46 +08:00
Sebastian Hartte c067f5905d Fixes #24: IndexOutOfBoundsException with FMP parts. 
(cherry picked from commit e67969f52f)
 2019-06-23 14:19:08 +08:00
Sirse dd14ac0f79 Fix duplication glitch (cherry-pick 8a72ebca8925959bce8809e690f0fb4772ce8c8e) 2019-05-14 22:28:54 +07:00
xsun2001 5d0748aade
fix NPE in getting bounding box. fix #22 . fix #23 . 2019-02-04 16:22:01 +08:00
Sebastian Hartte 6bac87e2c9 Fixes #2536: Mark host for save when placing facades. 
(cherry picked from commit 4f53f5910b)
 2018-06-16 23:53:47 +08:00
xsun2001 761fddaa55 re-add the null check and the permission check 2018-06-16 23:50:50 +08:00
yueh a2e11b1a3a Fixes #2542: Prevent memory card from opening a GUI 
Some additional cleanup of AEBaseTileBlock#onBlockActivated()

(cherry picked from commit b6d3be41e1)
 2018-06-16 23:44:09 +08:00
Sebastian Hartte ca2dc468f9 Fixes #2546: When touching an annihilation plane horizontally, use the middle of the entities bounding box on the y-axis to determine whether it is touching the annihilation plane side or not. Otherwise entities did not get picked up when they were *exactly* on the same y-level as the annihilation plane. 
(cherry picked from commit dfe7a29c92)
 2018-06-16 23:38:23 +08:00
Sebastian Hartte d050451bce Fixes #2547: Crystal growing and forming fluix crystals was not possible on top of an annihilation plane (or any block with a not-quite-full bounding box), because the crystals thought they were not in water. Fixed by using the center of the crystal bounding box to determine water-status, instead of the bottom center. 
(cherry picked from commit 2b02dc19c0)
 2018-06-16 00:00:01 +08:00
Sebastian Hartte d8bdfeb5dc Fixes #2548: Disable item.csv export on the server side, because we're unable to access creative tab information on the server. 
(cherry picked from commit 071ee83b7a)
 2018-06-15 23:51:58 +08:00
yueh 61fcc75a72 Fixes #2551: Prevent chunk rebuilds when drive is unchanged. 
(cherry picked from commit d7d99c5e7e)
 2018-06-15 23:50:23 +08:00
Sebastian Hartte c5bf7f6be3 Fixes #2526: Using 5-bit for 0-32 is not sufficient. Rewrote packet for syncing cables to clients to use an easier to deal with format while still saving space in the normal case (2 sides connected to a cable). 
(cherry picked from commit 6b90c70755)
 2018-06-15 23:45:05 +08:00
yueh c4d21c3721 Fixes #2530: Use ItemListIgnoreCrafting to ignore craftable items. 
Wraps the internal inventory into an ItemListIgnoreCrafting to hide
craftable items from it. As the ItemLists will always create a copy of the
actual stack before changing them, it will not affect any itemstack stored
elsewhere.

(cherry picked from commit a9c5019554)
 2018-06-15 23:31:21 +08:00
fscan 768a023897 Fix fluid P2p voiding excess liquids (#3090) 
Backported from 1.12
 2018-06-14 23:55:11 +08:00
fscan 0120df7f8c we dont use scala ... (#3097) 2018-06-14 23:53:59 +08:00
Florian Scandella 83e1e8beed Save changes in AppEngInternalAEInventory too. 2018-06-14 23:52:36 +08:00
Florian Scandella 881cbb63ab always save changes when inventory changes. 
should fix #3059
 2018-06-14 23:52:12 +08: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
xsun2001 337d1c8c0e add more permission check 2018-02-16 23:56:03 +08:00
xsun2001 bc7ff9409b fix #16 2018-02-16 18:39:12 +08:00
tilera 2b42bae8e3 item type config 2018-02-07 21:35:07 +01:00
tilera b2859863b4
changed item type limit value 2018-02-03 21:52:45 +01:00
tilera 05fa7abdb8 Controller is enabled without channels and item type limit removed 2018-02-03 21:24:01 +01:00
LOKKO12 18cf4c0a30
Fix #2435 
https://github.com/GTNewHorizons/NewHorizons/issues/2435
 2018-01-16 17:16:56 +01:00
xsun2001 b8f9d19bb3 add event check to EntropyManipulator 2017-12-31 13:54:30 +08:00
xsun2001 4f7a9f5237 fix the wrench can break ME network using shift + right click. 2017-12-31 13:39:57 +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
xsun2001 eae0c766a3 make annihilationPlane and FormationPlane to use the player who placed them to fire events 2017-12-16 21:41:00 +08:00
xsun2001 118d49c653 make it to check version at the unofficial repository 2017-12-02 22:37:48 +08:00
徐晨曦 85de4c5889 prevent the StackOverflowError 2017-09-20 20:47:26 +08:00
xsun2001 e51e3c7b10 Another fix for issue #9 2017-08-14 19:49:11 +08:00
xsun2001 9c7e22b914 Sky chest 2017-08-13 21:47:30 +08:00
xsun2001 107fc55165 fix of version's comparing.(I don't know why it was wrong but...) 2017-08-13 21:23:28 +08:00
xsun2001 63880be5d8 fixed #11 2017-08-13 21:21:55 +08:00
yueh d826e429a9 Fixes #2608: Handle scrollbar on mouseclicks not during rendering. 
(cherry picked from commit 6c91e85)
 2017-08-08 09:53:29 +08:00
yueh f296445521 Fixes #2515: Incorrectly version comparison 
Incorrectly prefer the channel over revision to determine the newest
version.

(cherry picked from commit 3600c72)
 2017-08-08 09:40:44 +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
yueh 23877ab72c Fixes #2647: Prevent crafting status from crashing due to missing network. 
(cherry picked from commit 86908b1)
 2017-08-08 09:29:17 +08:00
yueh fa59de5cac Fixes #2714: Use a concurrent list to back NetworkList (#2715) 
(cherry picked from commit 497f1c9)
 2017-08-08 09:24:40 +08:00
yueh c6a80ded4b Calculuate the correct AABB for a rotated skychest. 2017-08-08 09:22:53 +08:00
xsun2001 df1d373f60 Call super#onBlockActivated() for wrench interaction 2017-08-08 08:57:45 +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
xsun2001 765c5d2b9d fix issue #9. 2017-06-04 20:28:47 +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 439ae2e563 fire PlayerInteractEvent when player right click on the most ME network part. #6 2017-04-13 19:57:11 +08:00
xsun 5be7ace0b1 add cache for Annihilation Plane's permission check.#4 2017-04-13 12:32:25 +08:00
xsun 4557bb6f15 clean up completely.(Although I think Intellij IDEA did a lot of useless thing) 2017-04-12 22:10:39 +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
xsun 4ecb87f6dc post BlockEvent before the Formation/Annihilation Planes start work. #4 2017-04-11 22:45:34 +08:00
xsun aec886ae81 fix #3 2017-03-23 21:10:41 +08:00
xsun c869ce00e0 fix a bug that cannot access items after lossing power. 
https://github.com/AppliedEnergistics/Applied-Energistics-2/issues/2666/
 2017-03-16 15:39:35 +08:00
xsun da7e58a3ef make the log information meaningful and simple. 2017-03-09 19:13:21 +08:00
xsun f453fd1976 fix the bug that may crash the game when there is a mod including a old AE2 api class bytecode, such as TT, completely. 2017-03-07 21:04:06 +08:00
xsun 24b6d69c08 fix some bugs that allow us to dupe any items. 2017-02-16 20:02:40 +08:00
yueh ac45095cb4 Merge pull request #2100 from yueh/fix-2099 
Fixes #2099: No neighbor update of Pressure P2P before IAirHandler is validated.
 2016-01-13 14:57:59 +01:00
yueh 68d3025fac Fixes #2099: No neighbor update of Pressure P2P before IAirHandler is validated. 2016-01-10 21:01:02 +01:00
Florian Nücke 2ea05bce5f Reworked computer P2P tunnel to use events, and cleaned up reconnection, fixes #2087. 
Just `onTunnelNetworkChange` with tickable is apparently less exhaustive, and less stable. This now avoids issues with network splits and reconnects not being handled in some cases. Also simplified reconnection; there was some duplicate logic in there, with a missing validity check which potentially led to invalid connections.
 2016-01-05 19:05:25 +01:00
yueh 38e7e579fa Fixes #2043: Storage buses updates should happen in the correct order. 
This is loosely based on #2032 and should prevent any duplicated event,
but still does a refresh the whole cache due to potentially issues with
some inventories.

It also ensures that storage buses will not announce a CellArrayUpdate
before they are fully initialized, thus no longer causing them to return
null during an update.

Fixes #2403
 2016-01-03 13:23:51 +01:00
yueh 17bdd085b1 Merge pull request #2010 from yueh/feature-logger-refactoring 
Refactored the logging
 2015-12-27 12:53:01 +01:00
yueh 684cda58c2 Merge pull request #2074 from yueh/backport-1.8-cleanup 
Backport some 1.8 cleanups
 2015-12-27 12:50:11 +01:00
yueh a3abc7a1f0 Backport some 1.8 cleanups 2015-12-27 12:33:50 +01:00
yueh dd1ae4a9b5 Interfaces now slow down with failed crafting attempts. 
Cleanup of unneeded tracking of failed attempts of MultiCraftingTracker.
Followup of #1905
 2015-12-27 00:00:12 +01: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 c14f688100 Merge pull request #1997 from thatsIch/b-1995-versionchecker-config 
Fixes #1995: Allows creation of version checker config file after start up
 2015-12-11 22:38:54 +01:00
yueh 1862ab3562 Revert "Changed NetworkMonitor to update its cache." 2015-12-11 22:26:21 +01:00
yueh 12cf76a62f Merge pull request #1880 from yueh/feature-rendering-cleanup 
Rendering cleanup
 2015-12-10 16:36:01 +01:00
yueh 919faefb15 Merge pull request #2032 from yueh/feature-cached-networkmonitor 
Changed NetworkMonitor to update its cache.
 2015-12-10 16:34:24 +01:00
yueh e877eac7bb 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-10 16:24:40 +01:00
yueh 0696662254 Changed NetworkMonitor to update its cache. 
No longer invalidates and refresh it with every single change.
This should now also ensure that updates are send exactly once per network
instead of multiple times scaling up with the amount of chained networks.
 2015-12-10 16:11:30 +01:00
yueh b0d3a6c743 Merge pull request #2022 from yueh/feature-revert-itemlist-changes 
Reverts some of the changes to ItemList.
 2015-12-06 14:36:45 +01:00
yueh b252d1f269 Merge pull request #2028 from yueh/fix-2027 
Fixes 2027: TinyTNT not triggered by flint&steel.
 2015-12-06 14:36:09 +01:00
yueh 599e6f3e64 Exception during GridConnection now reports the machine and side. 2015-11-30 12:55:47 +01:00
yueh 478d400627 Fixes 2027: TinyTNT not triggered by flint&steel. 2015-11-29 18:21:05 +01:00
yueh fbfd13d163 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-11-28 11:12:31 +01:00
yueh 8b4a39085e Fixes #1998: Using the correct culling mode and rotation 
Blocks are now rendered with the correct culling mode and rotated similar
to the icon itself, but slightly shifted to the left that the front
texture appears larger (This applies to items following the normal
minecraft rotation like furnaces)

Items are also now rotated a bit differently and more in line with their
item rendering as well as longer being mirror inverted.
 2015-11-16 11:31:02 +01:00
yueh d5dfc31210 Rendering cleanup 
Replaces the reflexive instantiation of the Renderes with a factory
method.

Some optimizations to the renderers to no longer push the whole OpenGL state to the stack.

General cleanup of duplicate code, etc
 2015-11-16 10:52:20 +01:00