Commit Graph
359 Commits
Author SHA1 Message Date
Martin RobertzandAndrei Laiff bad5622723 Feature/level maintainer terminal (#166)
* Fix `zIndexes` for compatability with `DuraDisplay`

* Update AE2 and fix compatability

---------

Co-authored-by: Andrei Laiff <[email protected]>
2023-10-22 22:15:39 +02:00
Andrei Laiff 63b507edb0 Fix intercept dnd click from GT5 hook for AppEngGuiHandler
keyword `net.bdew.neiaddons.appeng.AppEngGuiHandler`
2023-10-21 22:41:45 +03:00
Andrei Laiff c341f22a36 Correct handle overwrite packet 2023-10-21 22:41:45 +03:00
Andrei Laiff ffb3b05d2e Fix packet corruption with level emitters 2023-10-21 22:41:45 +03:00
Andrei Laiff c92fa2af8a Fix packet corruption and log invalid data 2023-10-21 22:41:45 +03:00
Andrei Laiff a93f3f51ff Fix add logging around empty configuration 2023-10-21 22:41:45 +03:00
Andrei Laiff 7ac1c2f4c4 Fix add packet logging and try to not fail after receive corrupted packet 2023-10-21 22:41:45 +03:00
Andrei Laiff 0a3e7deb79 Fix fails on getCraftingItem
no root cause was found
2023-10-21 22:41:45 +03:00
Andrei Laiff 0ab87779b8 Fix rendering numbers bigger than 2.1G through aeRenderItem 2023-10-21 22:41:45 +03:00
Andrei Laiff c429150e21 Use aeRenderItem directly and fix zIndex in custom slots 2023-10-21 22:41:45 +03:00
Andrei Laiff f94792bc1b Fix LevelTerminal data recursion and few in fixes gui 2023-10-21 22:41:45 +03:00
Andrei Laiff 79e6448dce Implement new version of InterfaceWireless based on InterfaceTerminal 2023-10-21 22:41:45 +03:00
Andrei Laiff 8ba192c9cc fix correct InterfaceTerminalSupportedClassProvider deprecation 2023-10-21 22:41:45 +03:00
Andrei Laiff 42741d84bd use IGuiTooltipHandler directly from ae2
include #160
2023-10-21 22:41:43 +03:00
Andrei Laiff cf3e18aa08 feat: add back navigation in LevelMaintainer from terminal 2023-10-21 22:41:00 +03:00
Andrei Laiff e78194ef68 feat: Support back navigation functionality 2023-10-21 22:41:00 +03:00
Andrei Laiff 1eadad7e1e feat: Add new item LevelTerminal 2023-10-21 22:41:00 +03:00
Andrei Laiff f26d18e321 feat: Rework scheduling and data storage in TileLevelMaintainer functionality 2023-10-21 22:41:00 +03:00
Andrei Laiff 827bbf8aa8 feat: Use customName to display in GuiFluidLevelEmitter 2023-10-21 22:41:00 +03:00
Andrei Laiff d025c1f095 api: Add LevelTerminalRegistry functionality 2023-10-21 22:41:00 +03:00
Andrei Laiff 3ab27d4231 feat: Update core hooks and integrations 2023-10-21 22:41:00 +03:00
Alexdoru a4892aee06 fix NPE in FluidPatternDetails (#163) 2023-10-13 02:16:18 +02:00
Glease 25ab0916a7 add fluid pattern blame (#161) 2023-10-07 10:59:40 +08:00
miozune 861791f4fb Fix GUIs not accepting numpad enter key (#159)
* updateBuildScript

* updateDependencies

* Fix GUIs not accepting numpad enter key

* Fix wildcard import
2023-09-27 16:03:59 +02:00
miozune 5b6540f637 Fix Wireless Pattern Terminal not saving stack size change to blank pattern slot (#158) 2023-08-28 21:49:03 +02:00
miozune 1f55def09f Revert fluid animation fix for Quartz Tank to mitigate FPS issue (#157) 2023-08-27 17:58:49 +02:00
firenoo 4de0ee4b1a Fix gt++ fluid cells not extracting properly (#156)
* Fix gt++ fluid cells not extracting properly

If GT++ fluid tank item sees a stacksize > 1, it refuses to fill/drain the
tank item, so we need to set the tank size to 1 before performing tests.

* Fix GT cells not working with fluid terminal

GT cells use IFluidContainerItem, despite the fact that they act like
FluidContainerRegistry items. Unfortunately this threw off the test code;
need to extract the entire container at a time for the test.
2023-08-19 12:34:36 +02:00
Fox_white bcdd765870 Fix Crafting Input Bus Compatibility & fix general bugs (#154)
* fix: uses IInterfaceTerminalSupport for interface terminal

fix custom target not registered in ae2fc wireless interface terminal

* fix: empty string caused channel crash && check if custom name exist before getting

* fix: Fluid interface not registered

* Revert "fix: Fluid interface not registered"

This reverts commit bc21ee2673.

* fix: remove ASM in favor of the new API

* fix: remove zero size character bypass as checking hasCustomName is enough
2023-08-11 21:18:57 +02:00
firenoo 98ff754306 Fix doubling fluids for real now (#153)
If condition was inverted
2023-08-07 23:50:39 +02:00
firenoo 1ed32d46dc A collection of fixes (#152)
* Fix the adv blocking mode setting shown w/o upgrade

* Use else ifs instead of ifs when looking for button

* Register dual p2p interface to interface term

* Fix moving inventory region when space is held

* Fix scrollbars not initialized when terminal is empty

* Fix fluid handling for the 3rd time

Rearranges the steps to insertion and validates whether the tank can be
drained.

* Fix fluid extraction for the 3rd time
2023-08-07 09:28:11 +02:00
firenoo 3d01f50100 Fix fluid stack not doubling (#151) 2023-08-05 17:15:07 +02:00
Raven Szewczyk 64977b87a9 Lazy monitor updates (#150)
* Update buildscript and dependencies

* Implement getAvailableItem for faster network updates

* Use findPrecise
2023-08-05 09:39:12 +02:00
firenoo dd842a182c Save search string when search unfocuses (#149) 2023-08-02 18:02:12 +02:00
firenoo 3fce70a406 Add pattern doubling to ae2fc terminals (#148)
* Brings pattern doubling to ae2fc pattern terms

Literally copied and pasted the code over

* Update dep
2023-07-30 12:59:03 +02:00
firenoo 0374c1c521 Add null check for retrieving tank info (#145)
ThaumicTinkerer returns null for sides. Normally this is handled when
it is directly adjacent to the dual interface via a null check, but for
p2ps it is not checked, leading to a NPE. Adds a check for it
2023-07-28 13:35:52 +02:00
firenoo b0d67ac917 Render drops as fluids in GuiCraftConfirm (#144)
* Render drops as fluids in GuiCraftConfirm

The crafting tree feature changed where the itemstacks were being drawn
from `drawFG` to `drawListFG`. This changes the ASM to include that in
its visit.

* Render drops as fluid in GuiCraftingTree

Now look for fluid drops in crafting tree.
Temporarily permanent ASM.
2023-07-24 08:26:39 -07:00
firenoo f51f09845a Register dual p2p interface for pattern capacity upgrade (#143) 2023-07-24 09:14:18 +02:00
firenooandGitHub GTNH Actions c94876b02e Add the dual P2P interface (#139)
* Add the dual P2P interface

- Can be disabled in the config
- Updated dependencies
- We now require a hard inheritance dependency on beta-238+.
- CANNOT BE ATTUNED.

* Dependency cleanup (don't use pre)

* Fix dual interface background

* Fix null icon for p2p dual interface

BetterP2P needs this to properly display the icon.

* spotlessApply

---------

Co-authored-by: GitHub GTNH Actions <unknown>
2023-07-22 17:00:43 +02:00
firenooGitHub GTNH Actionsgithub-actions[bot]
51229e972b Untangle Baubles hard dependency and skip on unmapped items/blocks (#137)
* Untangle Baubles hard dependency and skip on unmapped items/blocks

Have forge issue the standard "Missing items" screen when updating, so
players are warned before joining the world. Previously we consumed all
missing mapping by mistake.

Remove the hard dependency on baubles by adding Optional.Interface

* spotlessApply (#138)

Co-authored-by: GitHub GTNH Actions <>

* Update dependencies and fix wrong gui channel

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-07-14 21:08:20 +02:00
miozune 95a72f0e08 Fix fluid texture animation (#136) 2023-07-13 19:37:54 +09:00
firenoo 6afa01da74 Fix modulate/sim bug (#135)
Actionable.SIMULATE gives faulty results. Using Actionable.MODULATE will
force the AE system to extract the correct amount, which fixes a dupe bug
with the previous implementation.
2023-07-12 13:39:40 +02:00
Maxim 7895fce275 Changed craft amount config ref from priority to crafting amount (#134) 2023-06-28 19:29:45 +02:00
chill d5b8ef6ea9 Code cleanup (#133)
* gradle updateBuildScript

* fix comments and commented-out code

Code deletion, converting comments into javadocs, and refactoring code to not
need comments.

* remove redundant suppressions

* replace C-style array declaration with Java-style

* make private field final

* remove unnecessary semicolon

* extract a common part from an if

* simplify boolean expression

* simplify ternary if

* remove unused imports

* convert escaped characters for clarity

* replace while with for

* replace explicit types with diamond operators

* replace anonymous type with lambda

* enable modern Java syntax

* migrate to enhanced switch

* migrate to pattern variables for instanceof

* remove empty javadoc

* add Nonnull annotation to overrides of Nonnull methods

* replace wailaStack with null

When wailaStack is not null, the flow breaks out of the loop,
so there's no need to confuse the reader with putting wailaStack
both as the result and the parameter of the call - there's no
recursion.

* int cannot be bigger than its max value

* suppress dataflow warning

* remove redundant initializer

The default value of int is 0.

* null check is covered by instanceof

* simplify some calls of addVertexWithUV

* fix typos and add TODOs

* make flipState more understandable
2023-06-18 23:29:57 +02:00
firenooandGitHub GTNH Actions f87b76347e Update APIs (#130)
* Add an API to allow other mods to blacklist fluids from this mod.

* Removed Thaumic Energistics config setting. This will be handled by
Thaumic Energistic's side (which also happens to have a config setting).

* Added an API that allows for blacklisting fluids from either the storage
or the display individually.

* Prevent blacklisted fluids from being discretized

* Update API usage

- use AE2's new API

- use ThE's config setting for aspect -> gas

* spotlessApply

---------

Co-authored-by: GitHub GTNH Actions <unknown>
2023-05-20 19:46:37 +02:00
miozune 14853a2481 Fix NPE with FCStackStringifyHandler (#129) 2023-05-13 19:03:22 +02:00
miozune 2cd049d40e ForgeDirection fix & update dependencies (#128) 2023-05-09 07:39:00 +02:00
miozune f01cde7659 Show detailed fluid amount tooltip for Fluid Drop and Packet item (#127)
* Show detailed fluid amount tooltip for Fluid Drop and Packet item

* Guard against division by zero
2023-05-08 17:57:35 +02:00
miozune 56cda9f9e2 Fix fluid animation with Hodgepodge loaded (#126)
* Fix fluid animation with Hodgepodge loaded

* updateBuildScript
2023-05-07 17:55:46 +02:00
firenooGitHub GTNH Actionsgithub-actions[bot]
3da14b3bbe More ec2 mappings (#124)
* Replace ore dictionary bus

Extra Cells ore dict bus -> export bus w/ ore dict card
(retains ore filter setting, not verified they are 1:1)

* Add OpenComputer migration

Moves migration to postInit, and migrates OC upgrades.

* Remap wireless w/ correct encryption key + power

Basically now works without needing to relink in security term

* Update buildscript

* spotless apply

* spotlessApply (#125)

Co-authored-by: GitHub GTNH Actions <>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-05-06 19:04:59 +02:00
firenoo 97c7533ffb Add support for the Advanced Blocking Card to Dual Interfaces (#123)
* Update ae2 to latest (beta-203)

* Add support for the Advanced Blocking Card to Dual Interfaces

Behavior: The Dual Interface acts in the same way as the regular ME
interface when the advanced blocking card is used, but has an additional
check for fluids on top of items contained in the ME system.
2023-05-05 20:19:55 +02:00