Skip to content

Commit 65c4883

Browse files
committed
fix config
1 parent b0ee80d commit 65c4883

8 files changed

Lines changed: 24 additions & 0 deletions

src/main/java/com/ref/extendedpick/integration/jei/DeepRecipeTransferPacket.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.ref.extendedpick.api.IDeepSearchProvider;
44
import com.ref.extendedpick.api.IPlayerInventoryAccess;
5+
import com.ref.extendedpick.config.ExtendedPickCommonConfig;
56
import java.util.ArrayList;
67
import java.util.Arrays;
78
import java.util.Collection;
@@ -97,6 +98,7 @@ public static void handle(DeepRecipeTransferPacket msg, Supplier<NetworkEvent.Co
9798
.enqueueWork(
9899
() -> {
99100
ServerPlayer player = ctx.get().getSender();
101+
if (!ExtendedPickCommonConfig.deepSearch) return;
100102
if (player == null) return;
101103
transfer(msg, player);
102104
});

src/main/java/com/ref/extendedpick/mixin/ae/CraftingTermMenuMixin.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package com.ref.extendedpick.mixin.ae;
22

33
import appeng.menu.me.items.CraftingTermMenu;
4+
import com.ref.extendedpick.ExtendedPick;
45
import com.ref.extendedpick.api.IDeepSearchProvider;
56
import com.ref.extendedpick.api.IPlayerInventoryAccess;
7+
import com.ref.extendedpick.config.ExtendedPickClientConfig;
68
import java.util.*;
79
import net.minecraft.world.entity.player.Player;
810
import net.minecraft.world.item.Item;
@@ -23,6 +25,8 @@ public class CraftingTermMenuMixin {
2325
private void onFindMissingIngredients(
2426
Map<Integer, Ingredient> ingredients,
2527
CallbackInfoReturnable<CraftingTermMenu.MissingIngredientSlots> cir) {
28+
if (!(ExtendedPickClientConfig.exPick && ExtendedPickClientConfig.exPickPacket)) return;
29+
if (!ExtendedPick.isServerModLoaded) return;
2630
CraftingTermMenu.MissingIngredientSlots result = cir.getReturnValue();
2731
if (result.missingSlots().isEmpty()) return;
2832

src/main/java/com/ref/extendedpick/mixin/ae/FillCraftingGridFromRecipePacketMixin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import appeng.helpers.IMenuCraftingPacket;
55
import com.ref.extendedpick.api.IDeepSearchProvider;
66
import com.ref.extendedpick.api.IPlayerInventoryAccess;
7+
import com.ref.extendedpick.config.ExtendedPickCommonConfig;
78
import java.util.concurrent.atomic.AtomicReference;
89
import net.minecraft.server.level.ServerPlayer;
910
import net.minecraft.world.item.ItemStack;
@@ -22,6 +23,7 @@ private void onTakeIngredientFromPlayer(
2223
ServerPlayer player,
2324
Ingredient ingredient,
2425
CallbackInfoReturnable<ItemStack> cir) {
26+
if (!ExtendedPickCommonConfig.deepSearch) return;
2527
if (!cir.getReturnValue().isEmpty()) return;
2628

2729
AtomicReference<ItemStack> extractedResult = new AtomicReference<>(ItemStack.EMPTY);

src/main/java/com/ref/extendedpick/mixin/aea/AdvancedFillCraftingGridPacketMixin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.ref.aea.integration.aea.advancedterminal.AdvancedFillCraftingGridPacket;
55
import com.ref.extendedpick.api.IDeepSearchProvider;
66
import com.ref.extendedpick.api.IPlayerInventoryAccess;
7+
import com.ref.extendedpick.config.ExtendedPickCommonConfig;
78
import java.util.concurrent.atomic.AtomicReference;
89
import net.minecraft.server.level.ServerPlayer;
910
import net.minecraft.world.item.ItemStack;
@@ -22,6 +23,7 @@ private static void onTakeIngredientFromPlayer(
2223
ServerPlayer player,
2324
Ingredient ingredient,
2425
CallbackInfoReturnable<ItemStack> cir) {
26+
if (!ExtendedPickCommonConfig.deepSearch) return;
2527
if (!cir.getReturnValue().isEmpty()) return;
2628

2729
AtomicReference<ItemStack> extractedResult = new AtomicReference<>(ItemStack.EMPTY);

src/main/java/com/ref/extendedpick/mixin/aea/AdvancedFillProcessingGridPacketMixin.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.ref.aea.integration.aea.advancedterminal.AdvancedTerminalMenu;
66
import com.ref.extendedpick.api.IDeepSearchProvider;
77
import com.ref.extendedpick.api.IPlayerInventoryAccess;
8+
import com.ref.extendedpick.config.ExtendedPickCommonConfig;
89
import java.util.concurrent.atomic.AtomicLong;
910
import net.minecraft.server.level.ServerPlayer;
1011
import org.spongepowered.asm.mixin.Mixin;
@@ -22,6 +23,8 @@ private static void onTakeItemsFromPlayer(
2223
AEItemKey itemKey,
2324
long needed,
2425
CallbackInfoReturnable<Long> cir) {
26+
if (!ExtendedPickCommonConfig.deepSearch) return;
27+
2528
long alreadyTaken = cir.getReturnValue();
2629
long remainingNeeded = needed - alreadyTaken;
2730

src/main/java/com/ref/extendedpick/mixin/aea/AdvancedProcessingRecipeTransferHandlerMixin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.ref.extendedpick.ExtendedPick;
77
import com.ref.extendedpick.api.IDeepSearchProvider;
88
import com.ref.extendedpick.api.IPlayerInventoryAccess;
9+
import com.ref.extendedpick.config.ExtendedPickClientConfig;
910
import java.util.HashSet;
1011
import java.util.Map;
1112
import java.util.Set;
@@ -29,6 +30,7 @@ private void onCountPlayerInventory(
2930
Map<AEKey, Long> availableCounts,
3031
Map<Item, Set<AEItemKey>> availableItemsMap,
3132
CallbackInfo ci) {
33+
if (!(ExtendedPickClientConfig.exPick && ExtendedPickClientConfig.exPickPacket)) return;
3234
if (!ExtendedPick.isServerModLoaded) return;
3335

3436
IPlayerInventoryAccess.findStacks(

src/main/java/com/ref/extendedpick/mixin/aea/AdvancedTerminalMenuMixin.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import appeng.menu.me.items.CraftingTermMenu;
44
import com.ref.aea.integration.aea.advancedterminal.AdvancedTerminalMenu;
5+
import com.ref.extendedpick.ExtendedPick;
56
import com.ref.extendedpick.api.IDeepSearchProvider;
67
import com.ref.extendedpick.api.IPlayerInventoryAccess;
8+
import com.ref.extendedpick.config.ExtendedPickClientConfig;
79
import java.util.*;
810
import net.minecraft.world.entity.player.Player;
911
import net.minecraft.world.item.Item;
@@ -24,6 +26,8 @@ public class AdvancedTerminalMenuMixin {
2426
private void onFindMissingIngredients(
2527
Map<Integer, Ingredient> ingredients,
2628
CallbackInfoReturnable<CraftingTermMenu.MissingIngredientSlots> cir) {
29+
if (!(ExtendedPickClientConfig.exPick && ExtendedPickClientConfig.exPickPacket)) return;
30+
if (!ExtendedPick.isServerModLoaded) return;
2731
CraftingTermMenu.MissingIngredientSlots result = cir.getReturnValue();
2832
if (result.missingSlots().isEmpty()) return;
2933

src/main/java/com/ref/extendedpick/mixin/jei/BasicRecipeTransferHandlerMixin.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.ref.extendedpick.ExtendedPick;
44
import com.ref.extendedpick.api.IDeepSearchProvider;
55
import com.ref.extendedpick.api.IPlayerInventoryAccess;
6+
import com.ref.extendedpick.config.ExtendedPickClientConfig;
67
import com.ref.extendedpick.integration.jei.DeepRecipeTransferPacket;
78
import com.ref.extendedpick.integration.jei.DeepTransferData;
89
import com.ref.extendedpick.integration.jei.DeepTransferItemRecord;
@@ -67,6 +68,10 @@ private RecipeTransferOperationsResult onGetRecipeTransferOperations(
6768
RecipeTransferUtil.getRecipeTransferOperations(
6869
stackHelper, availableItemStacks, requiredItemStacks, craftingSlots);
6970

71+
if (!(ExtendedPickClientConfig.exPick && ExtendedPickClientConfig.exPickPacket)) {
72+
return result;
73+
}
74+
7075
if (!ExtendedPick.isServerModLoaded || result.missingItems.isEmpty()) {
7176
return result;
7277
}

0 commit comments

Comments
 (0)