From 0bcaa1ef0ba1a5729f07e63622debde6a9fcb2bc Mon Sep 17 00:00:00 2001 From: pedroksl Date: Fri, 10 Jan 2025 17:53:25 -0300 Subject: [PATCH] Bump version / spotless --- CHANGELOG.md | 7 ++----- gradle.properties | 2 +- .../gui/SmallAdvPatternProviderScreen.java | 1 - .../gui/widgets/AAESettingToggleButton.java | 14 +++++++++++-- .../AdvPatternProviderReturnInventory.java | 11 +++++----- .../common/logic/AdvPatternProviderLogic.java | 20 +++++++++++-------- .../advanced_ae/gui/StockExportBusMenu.java | 2 +- 7 files changed, 34 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bcb486..0c0f73a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,2 @@ -# New -- Added the Import Export Bus. A bus part capable of importing and exporting at the same time - -# Bug Fixes -- Fixed quantum armor auto stock card not working \ No newline at end of file +- Filtered import for Advanced Pattern Providers. You can enable this setting to only allow inputs of active patterns/patterns present in the pattern provider. +- ME Stock Export Bus behavior changed to be able to set stack sizes bigger than 64 (up to Max Int). \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index a5e5395..e2f79a9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ loader_version_range=[4,) mod_id=advanced_ae mod_name=Advanced AE mod_license=LGPL-3.0 -mod_version=1.2.0-1.21.1 +mod_version=1.2.1-1.21.1 mod_group_id=net.pedroksl.advanced_ae mod_authors=Pedroksl mod_description=An AE2 addon that adds a lot of utilities and quality of life. diff --git a/src/main/java/net/pedroksl/advanced_ae/client/gui/SmallAdvPatternProviderScreen.java b/src/main/java/net/pedroksl/advanced_ae/client/gui/SmallAdvPatternProviderScreen.java index be390cd..5c276b8 100644 --- a/src/main/java/net/pedroksl/advanced_ae/client/gui/SmallAdvPatternProviderScreen.java +++ b/src/main/java/net/pedroksl/advanced_ae/client/gui/SmallAdvPatternProviderScreen.java @@ -6,7 +6,6 @@ import net.pedroksl.advanced_ae.api.AAESettings; import net.pedroksl.advanced_ae.client.gui.widgets.AAEServerSettingToggleButton; import net.pedroksl.advanced_ae.client.gui.widgets.AAESettingToggleButton; -import net.pedroksl.advanced_ae.client.gui.widgets.AAEToggleButton; import net.pedroksl.advanced_ae.gui.advpatternprovider.SmallAdvPatternProviderLockReason; import net.pedroksl.advanced_ae.gui.advpatternprovider.SmallAdvPatternProviderMenu; diff --git a/src/main/java/net/pedroksl/advanced_ae/client/gui/widgets/AAESettingToggleButton.java b/src/main/java/net/pedroksl/advanced_ae/client/gui/widgets/AAESettingToggleButton.java index 7de70e0..168d5c5 100644 --- a/src/main/java/net/pedroksl/advanced_ae/client/gui/widgets/AAESettingToggleButton.java +++ b/src/main/java/net/pedroksl/advanced_ae/client/gui/widgets/AAESettingToggleButton.java @@ -59,8 +59,18 @@ public AAESettingToggleButton( appearances = new HashMap<>(); registerApp(AAEIcon.ME_EXPORT_ON, AAESettings.ME_EXPORT, YesNo.YES, AAEText.MeExport, AAEText.MeExportOn); registerApp(AAEIcon.ME_EXPORT_OFF, AAESettings.ME_EXPORT, YesNo.NO, AAEText.MeExport, AAEText.MeExportOff); - registerApp(AAEIcon.FILTERED_IMPORT_ON, AAESettings.FILTERED_IMPORT, YesNo.YES, AAEText.FilteredImport, AAEText.FilteredImportOn); - registerApp(AAEIcon.FILTERED_IMPORT_OFF, AAESettings.FILTERED_IMPORT, YesNo.NO, AAEText.FilteredImport, AAEText.FilteredImportOff); + registerApp( + AAEIcon.FILTERED_IMPORT_ON, + AAESettings.FILTERED_IMPORT, + YesNo.YES, + AAEText.FilteredImport, + AAEText.FilteredImportOn); + registerApp( + AAEIcon.FILTERED_IMPORT_OFF, + AAESettings.FILTERED_IMPORT, + YesNo.NO, + AAEText.FilteredImport, + AAEText.FilteredImportOff); } } diff --git a/src/main/java/net/pedroksl/advanced_ae/common/inventory/AdvPatternProviderReturnInventory.java b/src/main/java/net/pedroksl/advanced_ae/common/inventory/AdvPatternProviderReturnInventory.java index 01ba409..14963bb 100644 --- a/src/main/java/net/pedroksl/advanced_ae/common/inventory/AdvPatternProviderReturnInventory.java +++ b/src/main/java/net/pedroksl/advanced_ae/common/inventory/AdvPatternProviderReturnInventory.java @@ -1,13 +1,14 @@ package net.pedroksl.advanced_ae.common.inventory; -import appeng.api.config.YesNo; -import appeng.api.stacks.AEKey; -import appeng.helpers.patternprovider.PatternProviderReturnInventory; +import java.util.HashSet; +import java.util.Set; + import net.pedroksl.advanced_ae.api.AAESettings; import net.pedroksl.advanced_ae.common.logic.AdvPatternProviderLogic; -import java.util.HashSet; -import java.util.Set; +import appeng.api.config.YesNo; +import appeng.api.stacks.AEKey; +import appeng.helpers.patternprovider.PatternProviderReturnInventory; public class AdvPatternProviderReturnInventory extends PatternProviderReturnInventory { public AdvPatternProviderReturnInventory(Runnable listener, AdvPatternProviderLogic logic) { diff --git a/src/main/java/net/pedroksl/advanced_ae/common/logic/AdvPatternProviderLogic.java b/src/main/java/net/pedroksl/advanced_ae/common/logic/AdvPatternProviderLogic.java index baa636d..e16b1ab 100644 --- a/src/main/java/net/pedroksl/advanced_ae/common/logic/AdvPatternProviderLogic.java +++ b/src/main/java/net/pedroksl/advanced_ae/common/logic/AdvPatternProviderLogic.java @@ -2,10 +2,6 @@ import java.util.*; -import appeng.api.networking.*; -import appeng.api.networking.crafting.ICraftingWatcherNode; -import net.pedroksl.advanced_ae.api.AAESettings; -import net.pedroksl.advanced_ae.common.inventory.AdvPatternProviderReturnInventory; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,6 +21,8 @@ import net.minecraft.world.item.component.ItemContainerContents; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; +import net.pedroksl.advanced_ae.api.AAESettings; +import net.pedroksl.advanced_ae.common.inventory.AdvPatternProviderReturnInventory; import net.pedroksl.advanced_ae.common.patterns.IAdvPatternDetails; import appeng.api.config.Actionable; @@ -38,7 +36,9 @@ import appeng.api.implementations.blockentities.ICraftingMachine; import appeng.api.implementations.blockentities.PatternContainerGroup; import appeng.api.inventories.InternalInventory; +import appeng.api.networking.*; import appeng.api.networking.crafting.ICraftingProvider; +import appeng.api.networking.crafting.ICraftingWatcherNode; import appeng.api.networking.security.IActionSource; import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.TickRateModulation; @@ -90,6 +90,7 @@ public class AdvPatternProviderLogic implements InternalInventoryHost, ICrafting * target, the pattern won't be pushed. Always contains keys with the secondary component dropped. */ private final Set patternInputs = new HashSet<>(); + private final Set trackedCrafts = new HashSet<>(); // Pattern sending logic private final List sendList = new ArrayList<>(); @@ -152,10 +153,13 @@ public AdvPatternProviderLogic( .registerSetting(AAESettings.FILTERED_IMPORT, YesNo.NO) .build(); - this.returnInv = new AdvPatternProviderReturnInventory(() -> { - this.mainNode.ifPresent((grid, node) -> grid.getTickManager().alertDevice(node)); - this.host.saveChanges(); - }, this); + this.returnInv = new AdvPatternProviderReturnInventory( + () -> { + this.mainNode.ifPresent( + (grid, node) -> grid.getTickManager().alertDevice(node)); + this.host.saveChanges(); + }, + this); } public int getPriority() { diff --git a/src/main/java/net/pedroksl/advanced_ae/gui/StockExportBusMenu.java b/src/main/java/net/pedroksl/advanced_ae/gui/StockExportBusMenu.java index f41fee2..0bd8c84 100644 --- a/src/main/java/net/pedroksl/advanced_ae/gui/StockExportBusMenu.java +++ b/src/main/java/net/pedroksl/advanced_ae/gui/StockExportBusMenu.java @@ -1,6 +1,5 @@ package net.pedroksl.advanced_ae.gui; -import appeng.menu.MenuOpener; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; @@ -12,6 +11,7 @@ import appeng.api.stacks.GenericStack; import appeng.core.definitions.AEItems; +import appeng.menu.MenuOpener; import appeng.menu.SlotSemantics; import appeng.menu.implementations.UpgradeableMenu;