Commit Graph
483 Commits
Author SHA1 Message Date
miozune 8775fbb9c4 Fix items and blocks being registered too late on dedicated server 2023-11-10 17:00:11 +01:00
Martin Robertz 7732cebf68 update deps 1.1.63-gtnh 2023-10-29 11:28:37 +01:00
Батьків Нестор-Євген Васильович 79dc0eb5bc Add dual interface p2p copy paste (#169)
* update deps

* add dualt interface p2p copy pasting
2023-10-29 11:25:08 +01:00
Martin Robertz ef5efd2e8b update deps 1.1.62-gtnh 2023-10-27 14:11:01 +02:00
f5912ef2e3 Add LevelMaintainerTerminal rework logic inside TileLevelMaintainer (#162)
* Use new interface terminal API

* Update dependencies.gradle

* feat: Update core hooks and integrations

* api: Add `LevelTerminalRegistry` functionality

* feat: Use `customName` to display in `GuiFluidLevelEmitter`

* feat: Rework scheduling and data storage in `TileLevelMaintainer` functionality

* feat: Add new item `LevelTerminal`

* feat: Support back navigation functionality

* feat: add back navigation in `LevelMaintainer` from terminal

* use `IGuiTooltipHandler` directly from ae2

include #160

* fix correct `InterfaceTerminalSupportedClassProvider` deprecation

* Implement new version of `InterfaceWireless` based on `InterfaceTerminal`

* Fix `LevelTerminal` data recursion and few in fixes gui

* Use `aeRenderItem` directly and fix `zIndex` in custom slots

* Fix rendering numbers bigger than 2.1G through `aeRenderItem`

* Fix fails on `getCraftingItem`

no root cause was found

* Fix add packet logging and try to not fail after receive corrupted packet

* Fix add logging around empty configuration

* Fix packet corruption and log invalid data

* Fix packet corruption with level emitters

* Correct handle overwrite packet

* Fix intercept dnd click from GT5 hook for `AppEngGuiHandler`

keyword `net.bdew.neiaddons.appeng.AppEngGuiHandler`

* update be+deps

* Update dependencies.gradle

* Update dependencies.gradle

* Fix `zIndexes` for compatability with `DuraDisplay`

* Update AE2 and fix compatability

* Change `ForgeDirection` side serialization to `byte`

* Fix tooltip zIndexes

* Rename all rest parts related to `Level terminal`

* Code cleanup after review

* Remove duplicated dependency declaration

---------

Co-authored-by: Firenoo <49818773+firenoo@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
2023-10-27 14:10:07 +02:00
Martin Robertz 1515ebe33f update deps
add gradlew bat
1.1.60-gtnh
2023-10-25 19:15:40 +02:00
miozune 567b1dbce5 Move DefaultExtractorLoader to FMLLoadCompleteEvent (#168) 2023-10-25 23:02:07 +09:00
miozune 1efa92adad Fix stacksize overflow when overlaying recipe (#167) 2023-10-25 23:01:56 +09:00
Eldrinn-Elantey bd0e7fabca Fix translation ME Dual Interface on RU (#165) 2023-10-16 11:37:43 +02:00
Martin Robertz c6d11305bb update bs+deps 2023-10-13 12:28:38 +02:00
Alexdoru a4892aee06 fix NPE in FluidPatternDetails (#163) 2023-10-13 02:16:18 +02:00
Dream-MasterXXL 8186653910 update bs+deps 1.1.45-gtnh 2023-10-09 22:49:23 +02:00
Glease 25ab0916a7 add fluid pattern blame (#161) 2023-10-07 10:59:40 +08:00
Martin Robertz cc6959eb03 update deps 1.1.43-gtnh 2023-09-27 16:07:11 +02: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) 1.1.42-gtnh 2023-08-28 21:49:03 +02:00
miozune 1f55def09f Revert fluid animation fix for Quartz Tank to mitigate FPS issue (#157) 1.1.41-gtnh 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.
1.1.40-gtnh
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
1.1.39-gtnh
2023-08-11 21:18:57 +02:00
firenoo 98ff754306 Fix doubling fluids for real now (#153)
If condition was inverted
1.1.38-gtnh
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) 1.1.37-gtnh 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
1.1.36-gtnh
2023-08-05 09:39:12 +02:00
firenoo dd842a182c Save search string when search unfocuses (#149) 1.1.35-gtnh 2023-08-02 18:02:12 +02:00
DancingSnow 3fa1b1e0e2 Update zh_CN.lang (#147) 2023-07-30 19:25:53 +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
StrangeMan1580 3df15eae97 Update ru_RU.lang (#146) 2023-07-29 15:47:41 +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.
1.1.34-gtnh
2023-07-24 08:26:39 -07:00
firenoo f51f09845a Register dual p2p interface for pattern capacity upgrade (#143) 1.1.33-gtnh 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>
1.1.32-gtnh
2023-07-22 17:00:43 +02:00
miozune e8f069375f Fix another typo (#142) 1.1.30-gtnh 2023-07-22 17:18:39 +09:00
Eraldoe b50fd74e9c Fix typo "encoded" pattern 2023-07-22 17:18:28 +09: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>
1.1.27-gtnh
2023-07-14 21:08:20 +02:00
miozune 95a72f0e08 Fix fluid texture animation (#136) 1.1.25-gtnh 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) 1.1.24-gtnh 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
1.1.22-gtnh
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>
1.1.21-gtnh
2023-05-20 19:46:37 +02:00
miozune 14853a2481 Fix NPE with FCStackStringifyHandler (#129) 1.1.20-gtnh 2023-05-13 19:03:22 +02:00
miozune 2cd049d40e ForgeDirection fix & update dependencies (#128) 1.1.19-gtnh 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
1.1.18-gtnh
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>
1.1.16-gtnh
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.
1.1.15-gtnh
2023-05-05 20:19:55 +02:00
firenoo d2df9beb31 Fix fluid export bus voiding fluids on crafting only mode (#120)
The Fluid Export Bus was voiding fluids on craft only mode because it
tried to craft it, and decided to continue with the normal export logic:
Extract fluid from ME system and fill the tank.

Unfortunately, there was a condition that prevented the extracted fluid
from going anywhere depending on craft only mode, so it got voided.

Commit fixes this by skipping the normal extract logic if set to craft
only.

The amount must be simulated before extracting from the ME system. This
helps prevent a scenario where we cannot insert the fluid back (such as
when we have a fluid storage bus on Extract Only).

Signed-off-by: Firenoo <49818773+firenoo@users.noreply.github.com>
1.1.14-gtnh
2023-05-01 19:43:07 +02:00
firenoo dab5a0dbf3 Add mappings for most important Extra Cells items (#115)
* EC2 deprecation: Part 1 - Items

Laying the groundwork for absorbing EC2 mappings.

* EC2 deprecation: Part 2 - Blocks

* EC2 Deprecation: Part 3 - Parts

Parts are deprecated.

* set config "replaceEC2" to default true

* API changes to make room for Extra Cells fluid placeholder

* Finish basic item replacement code

- parts work
- items are remapped properly, and converted when they enter the player inventory

* Fixed some storage cell conversion issues

The placeholders did not transfer NBT data properly

* Add handlers for deprecated item cells

Now the placeholder should work automatically in a drive.

The void cell is still a WIP.

* Add more tooltip help and cell handler for void cell

* apply spotless

too lazy to rebase
2023-05-01 19:42:52 +02:00
firenoo 6090f198e6 Allow all 63 partition items to be used for fluid cells (#121)
Previously, only one partition item was allowed. This fix will have
the cell consider all 63 slots. If you configure more than 1 or 5
cell slots, it works as expected - up to 1 or 5 of the whitelisted
fluids can be stored at a time.

This will degrade performance slightly.

Signed-off-by: Firenoo <49818773+firenoo@users.noreply.github.com>
2023-05-01 19:38:07 +02:00
firenoo c29f8cf846 Fix FluidContainerRegistry interactions w/ Certus Quart Tank (#122)
The Certus Quartz Tank previously did not consider the
FluidContainerRegistry API for fluid containers, so fluid containers
that implemented that (like ic2 cells) were voided when filling the
tank.

Signed-off-by: Firenoo <49818773+firenoo@users.noreply.github.com>
2023-05-01 19:37:53 +02:00
firenoo 77ec41812d Add null check for tanks (#118)
* Add null check for tanks

Some IFluidHandlers return null for getTankInfo(), so a null check is needed.

* spotless apply
1.1.9-gtnh
2023-04-28 19:19:53 +02:00