fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add a healthy 1 sec delay between JEI transfer updates to avoid horrible

Browse Source 
GC pressure
This commit is contained in:
PrototypeTrousers
2022-10-25 22:32:53 -03:00
parent b2847677ed
commit 9bcf45b7e2
6 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
+1 -1
View File
@@ -4,7 +4,7 @@ aebuild=7
aegroup=appeng aegroup=appeng
aebasename=appliedenergistics2 aebasename=appliedenergistics2
extended=extended_life extended=extended_life
extendedversion=v0.54.4 extendedversion=v0.54.6
######################################################### #########################################################
# Versions # # Versions #
######################################################### #########################################################
src/main/java/appeng/fluids/helper/DualityFluidInterface.java
+1 -1
View File
@@ -266,7 +266,7 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
final Block directedBlock = directedBlockState.getBlock(); final Block directedBlock = directedBlockState.getBlock();
ItemStack what = new ItemStack(directedBlock, 1, directedBlock.getMetaFromState(directedBlockState)); ItemStack what = new ItemStack(directedBlock, 1, directedBlock.getMetaFromState(directedBlockState));
if (Loader.isModLoaded("gregtech") && directedBlock instanceof BlockMachine) { if (Platform.GTLoaded && directedBlock instanceof BlockMachine) {
MetaTileEntity metaTileEntity = Platform.getMetaTileEntity(directedTile.getWorld(), directedTile.getPos()); MetaTileEntity metaTileEntity = Platform.getMetaTileEntity(directedTile.getWorld(), directedTile.getPos());
if (metaTileEntity != null) { if (metaTileEntity != null) {
return metaTileEntity.getMetaFullName(); return metaTileEntity.getMetaFullName();
src/main/java/appeng/helpers/DualityInterface.java
+2 -2
View File
@@ -1105,7 +1105,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
final InventoryAdaptor ad = InventoryAdaptor.getAdaptor(te, s.getOpposite()); final InventoryAdaptor ad = InventoryAdaptor.getAdaptor(te, s.getOpposite());
if (ad != null) { if (ad != null) {
if (Loader.isModLoaded("actuallyadditions") && Loader.isModLoaded("gregtech") && te instanceof IPhantomTile) { if (Loader.isModLoaded("actuallyadditions") && Platform.GTLoaded && te instanceof IPhantomTile) {
IPhantomTile phantomTE = ((IPhantomTile) te); IPhantomTile phantomTE = ((IPhantomTile) te);
if (phantomTE.hasBoundPosition()) { if (phantomTE.hasBoundPosition()) {
TileEntity phantom = w.getTileEntity(phantomTE.getBoundPosition()); TileEntity phantom = w.getTileEntity(phantomTE.getBoundPosition());
@@ -1287,7 +1287,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
final Block directedBlock = directedBlockState.getBlock(); final Block directedBlock = directedBlockState.getBlock();
ItemStack what = new ItemStack(directedBlock, 1, directedBlock.getMetaFromState(directedBlockState)); ItemStack what = new ItemStack(directedBlock, 1, directedBlock.getMetaFromState(directedBlockState));
if (Loader.isModLoaded("gregtech") && directedBlock instanceof BlockMachine) { if (Platform.GTLoaded && directedBlock instanceof BlockMachine) {
MetaTileEntity metaTileEntity = Platform.getMetaTileEntity(directedTile.getWorld(), directedTile.getPos()); MetaTileEntity metaTileEntity = Platform.getMetaTileEntity(directedTile.getWorld(), directedTile.getPos());
if (metaTileEntity != null) { if (metaTileEntity != null) {
return metaTileEntity.getMetaFullName(); return metaTileEntity.getMetaFullName();
src/main/java/appeng/helpers/NonBlockingItems.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class NonBlockingItems {
continue; continue;
} }
if (ModItemMeta[0].equals("gregtech") && Platform.isModLoaded("gregtech")) { if (ModItemMeta[0].equals("gregtech") && Platform.GTLoaded) {
boolean found = false; boolean found = false;
for (MetaItem<?> metaItem : MetaItem.getMetaItems()) { for (MetaItem<?> metaItem : MetaItem.getMetaItems()) {
MetaItem<?>.MetaValueItem metaItem2 = metaItem.getItem(ModItemMeta[1]); MetaItem<?>.MetaValueItem metaItem2 = metaItem.getItem(ModItemMeta[1]);
src/main/java/appeng/integration/modules/jei/JEIMissingItem.java
+47 -20
View File
@@ -14,7 +14,6 @@ import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.recipe.transfer.IRecipeTransferError; import mezz.jei.api.recipe.transfer.IRecipeTransferError;
import mezz.jei.gui.recipes.RecipeLayout; import mezz.jei.gui.recipes.RecipeLayout;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
@@ -25,13 +24,19 @@ import java.awt.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import static mezz.jei.api.recipe.transfer.IRecipeTransferError.Type.USER_FACING; import static mezz.jei.api.recipe.transfer.IRecipeTransferError.Type.USER_FACING;
public class JEIMissingItem implements IRecipeTransferError { public class JEIMissingItem implements IRecipeTransferError {
private boolean errored; private boolean errored;
public long lastUpdate;
private final List<Integer> craftableSlots = new ArrayList<>();
private final List<Integer> foundSlots = new ArrayList<>();
IItemList<IAEItemStack> available = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList();
IItemList<IAEItemStack> used = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList();
JEIMissingItem(Container container, @Nonnull IRecipeLayout recipeLayout) { JEIMissingItem(Container container, @Nonnull IRecipeLayout recipeLayout) {
if (container instanceof ContainerCraftingTerm) { if (container instanceof ContainerCraftingTerm) {
@@ -110,31 +115,47 @@ public class JEIMissingItem implements IRecipeTransferError {
int currentSlot = 0; int currentSlot = 0;
this.errored = false; this.errored = false;
IItemList<IAEItemStack> available = mergeInventories(ir, (ContainerCraftingTerm) minecraft.player.openContainer); if (System.currentTimeMillis() - lastUpdate > 1000) {
lastUpdate = System.currentTimeMillis();
IItemList<IAEItemStack> used = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); available = mergeInventories(ir, (ContainerCraftingTerm) minecraft.player.openContainer);
this.foundSlots.clear();
this.craftableSlots.clear();
} else {
for (IGuiIngredient<?> i : recipeLayout.getItemStacks().getGuiIngredients().values()) {
if (i.isInput()) {
if (!foundSlots.contains(currentSlot)) {
if (craftableSlots.contains(currentSlot)) {
i.drawHighlight(minecraft, new Color(0.0f, 0.0f, 1.0f, 0.4f), recipeX, recipeY);
} else {
i.drawHighlight(minecraft, new Color(1.0f, 0.0f, 0.0f, 0.4f), recipeX, recipeY);
}
}
}
currentSlot++;
}
return;
}
this.used.resetStatus();
for (IGuiIngredient<?> i : recipeLayout.getItemStacks().getGuiIngredients().values()) { for (IGuiIngredient<?> i : recipeLayout.getItemStacks().getGuiIngredients().values()) {
found = false; found = false;
craftable = false; craftable = false;
List<ItemStack> valid = new ArrayList<>(); ArrayList<ItemStack> valid = new ArrayList<>();
if (i.isInput() && i.getAllIngredients().size() > 0) { if (i.isInput()) {
List<?> allIngredients = i.getAllIngredients(); List<?> allIngredients = i.getAllIngredients();
for (Object allIngredient : allIngredients) { for (Object allIngredient : allIngredients) {
if (allIngredient instanceof ItemStack) { if (allIngredient instanceof ItemStack) {
ItemStack stack = (ItemStack) allIngredient; ItemStack stack = (ItemStack) allIngredient;
if (!stack.isEmpty()) { if (!stack.isEmpty()) {
IAEItemStack search = AEItemStack.fromItemStack(stack);
if (stack.getItem().isDamageable() || Platform.isGTDamageableItem(stack.getItem())) { if (stack.getItem().isDamageable() || Platform.isGTDamageableItem(stack.getItem())) {
Collection<IAEItemStack> fuzzy = available.findFuzzy(AEItemStack.fromItemStack(stack), FuzzyMode.IGNORE_ALL); Collection<IAEItemStack> fuzzy = available.findFuzzy(search, FuzzyMode.IGNORE_ALL);
if (fuzzy.size() > 0) { if (fuzzy.size() > 0) {
for (IAEItemStack itemStack : fuzzy) { for (IAEItemStack itemStack : fuzzy) {
if (itemStack.getStackSize() > 0) { if (itemStack.getStackSize() > 0) {
if (itemStack.fuzzyComparison(AEItemStack.fromItemStack(stack), FuzzyMode.IGNORE_ALL)) { found = true;
found = true; used.add(itemStack.copy().setStackSize(1));
used.add(itemStack.copy().setStackSize(1)); valid.add(itemStack.copy().setStackSize(1).createItemStack());
valid.addAll(fuzzy.stream().map(IAEItemStack::createItemStack).collect(Collectors.toList()));
break;
}
} else { } else {
if (itemStack.isCraftable()) { if (itemStack.isCraftable()) {
craftable = true; craftable = true;
@@ -143,7 +164,7 @@ public class JEIMissingItem implements IRecipeTransferError {
} }
} }
} else { } else {
IAEItemStack ext = available.findPrecise(AEItemStack.fromItemStack(stack)); IAEItemStack ext = available.findPrecise(search);
if (ext != null) { if (ext != null) {
IAEItemStack usedStack = used.findPrecise(ext); IAEItemStack usedStack = used.findPrecise(ext);
if (ext.getStackSize() > 0 && (usedStack == null || usedStack.getStackSize() < ext.getStackSize())) { if (ext.getStackSize() > 0 && (usedStack == null || usedStack.getStackSize() < ext.getStackSize())) {
@@ -159,20 +180,26 @@ public class JEIMissingItem implements IRecipeTransferError {
} }
} }
} }
} else {
found = true;
} }
} }
} }
if (i.getAllIngredients().size() == 0) {
found = true;
}
if (!found) { if (!found) {
if (craftable) { if (craftable) {
i.drawHighlight(minecraft, new Color(0.0f, 0.0f, 1.0f, 0.4f), recipeX, recipeY); i.drawHighlight(minecraft, new Color(0.0f, 0.0f, 1.0f, 0.4f), recipeX, recipeY);
this.craftableSlots.add(currentSlot);
recipeLayout.getItemStacks().set(currentSlot, valid); recipeLayout.getItemStacks().set(currentSlot, valid);
} else { } else {
i.drawHighlight(minecraft, new Color(1.0f, 0.0f, 0.0f, 0.4f), recipeX, recipeY); i.drawHighlight(minecraft, new Color(1.0f, 0.0f, 0.0f, 0.4f), recipeX, recipeY);
} }
this.errored = true; this.errored = true;
} else { } else {
this.foundSlots.add(currentSlot);
recipeLayout.getItemStacks().set(currentSlot, valid); recipeLayout.getItemStacks().set(currentSlot, valid);
this.errored = false;
} }
} }
currentSlot++; currentSlot++;
@@ -183,10 +210,6 @@ public class JEIMissingItem implements IRecipeTransferError {
} }
} }
public boolean errored() {
return this.errored;
}
IItemList<IAEItemStack> mergeInventories(IItemList<IAEItemStack> repo, ContainerCraftingTerm containerCraftingTerm) { IItemList<IAEItemStack> mergeInventories(IItemList<IAEItemStack> repo, ContainerCraftingTerm containerCraftingTerm) {
IItemList<IAEItemStack> itemList = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList(); IItemList<IAEItemStack> itemList = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList();
for (IAEItemStack i : repo) { for (IAEItemStack i : repo) {
@@ -204,4 +227,8 @@ public class JEIMissingItem implements IRecipeTransferError {
} }
return itemList; return itemList;
} }
public boolean errored() {
return errored;
}
} }
src/main/java/appeng/util/Platform.java
+2 -1
View File
@@ -146,6 +146,7 @@ public class Platform {
private static final ItemComparisonHelper ITEM_COMPARISON_HELPER = new ItemComparisonHelper(); private static final ItemComparisonHelper ITEM_COMPARISON_HELPER = new ItemComparisonHelper();
private static final P2PHelper P2P_HELPER = new P2PHelper(); private static final P2PHelper P2P_HELPER = new P2PHelper();
private static Method reflectGTgetMTE; private static Method reflectGTgetMTE;
public static final boolean GTLoaded = isModLoaded("gregtech");
public static ItemComparisonHelper itemComparisons() { public static ItemComparisonHelper itemComparisons() {
return ITEM_COMPARISON_HELPER; return ITEM_COMPARISON_HELPER;
@@ -1416,7 +1417,7 @@ public class Platform {
//consider methods below moving to a compability class //consider methods below moving to a compability class
public static boolean isGTDamageableItem(Item item) { public static boolean isGTDamageableItem(Item item) {
return (isModLoaded("gregtech") && item instanceof IToolItem); return ((GTLoaded) && item instanceof IToolItem);
} }
public static MetaTileEntity getMetaTileEntity(IBlockAccess world, BlockPos pos) { public static MetaTileEntity getMetaTileEntity(IBlockAccess world, BlockPos pos) {