misc cleaning
add lenses to non blocking list
This commit is contained in:
+1
-1
@@ -4,7 +4,7 @@ aebuild=7
|
|||||||
aegroup=appeng
|
aegroup=appeng
|
||||||
aebasename=appliedenergistics2
|
aebasename=appliedenergistics2
|
||||||
extended=extended_life
|
extended=extended_life
|
||||||
extendedversion=v49ac
|
extendedversion=v50
|
||||||
#########################################################
|
#########################################################
|
||||||
# Versions #
|
# Versions #
|
||||||
#########################################################
|
#########################################################
|
||||||
|
|||||||
@@ -97,6 +97,14 @@ public final class AEConfig extends Configuration implements IConfigurableObject
|
|||||||
"gregtech:shape.extruder.bottle", "gregtech:shape.extruder.foil",
|
"gregtech:shape.extruder.bottle", "gregtech:shape.extruder.foil",
|
||||||
"gregtech:shape.extruder.gear_small",
|
"gregtech:shape.extruder.gear_small",
|
||||||
"gregtech:shape.extruder.rod_long", "gregtech:shape.extruder.rotor",
|
"gregtech:shape.extruder.rod_long", "gregtech:shape.extruder.rotor",
|
||||||
|
"gregtech:glass_lens.white", "gregtech:glass_lens.orange",
|
||||||
|
"gregtech:glass_lens.magenta", "gregtech:glass_lens.light_blue",
|
||||||
|
"gregtech:glass_lens.yellow", "gregtech:glass_lens.lime",
|
||||||
|
"gregtech:glass_lens.pink", "gregtech:glass_lens.gray",
|
||||||
|
"gregtech:glass_lens.light_gray", "gregtech:glass_lens.cyan",
|
||||||
|
"gregtech:glass_lens.purple", "gregtech:glass_lens.blue",
|
||||||
|
"gregtech:glass_lens.brown", "gregtech:glass_lens.green",
|
||||||
|
"gregtech:glass_lens.red", "gregtech:glass_lens.black",
|
||||||
"contenttweaker:smallgearextrudershape",
|
"contenttweaker:smallgearextrudershape",
|
||||||
"contenttweaker:creativeportabletankmold"
|
"contenttweaker:creativeportabletankmold"
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ import static gregtech.api.block.machines.BlockMachine.getMetaTileEntity;
|
|||||||
|
|
||||||
public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, IConfigManagerHost, ICraftingProvider, IUpgradeableHost
|
public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, IConfigManagerHost, ICraftingProvider, IUpgradeableHost
|
||||||
{
|
{
|
||||||
private int[] failedCraftTriesSlot = {0, 0, 0, 0, 0, 0, 0, 0, 0};
|
private final int[] failedCraftTriesSlot = {0, 0, 0, 0, 0, 0, 0, 0, 0};
|
||||||
|
|
||||||
public static final int NUMBER_OF_STORAGE_SLOTS = 9;
|
public static final int NUMBER_OF_STORAGE_SLOTS = 9;
|
||||||
public static final int NUMBER_OF_CONFIG_SLOTS = 9;
|
public static final int NUMBER_OF_CONFIG_SLOTS = 9;
|
||||||
@@ -139,7 +139,6 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
|
|||||||
private final Accessor accessor = new Accessor();
|
private final Accessor accessor = new Accessor();
|
||||||
private EnumSet<EnumFacing> visitedFaces = EnumSet.noneOf( EnumFacing.class );
|
private EnumSet<EnumFacing> visitedFaces = EnumSet.noneOf( EnumFacing.class );
|
||||||
private EnumMap<EnumFacing, List<ItemStack>> waitingToSendFacing = new EnumMap<>( EnumFacing.class );
|
private EnumMap<EnumFacing, List<ItemStack>> waitingToSendFacing = new EnumMap<>( EnumFacing.class );
|
||||||
private BlockingInventoryAdaptor blockingInventoryAdaptor;
|
|
||||||
private boolean resetConfigCache = true;
|
private boolean resetConfigCache = true;
|
||||||
private IMEMonitor<IAEItemStack> configCachedHandler;
|
private IMEMonitor<IAEItemStack> configCachedHandler;
|
||||||
|
|
||||||
@@ -1285,7 +1284,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
|
|||||||
|
|
||||||
boolean isCustomInvBlocking( TileEntity te, EnumFacing s )
|
boolean isCustomInvBlocking( TileEntity te, EnumFacing s )
|
||||||
{
|
{
|
||||||
blockingInventoryAdaptor = BlockingInventoryAdaptor.getAdaptor( te, s.getOpposite() );
|
BlockingInventoryAdaptor blockingInventoryAdaptor = BlockingInventoryAdaptor.getAdaptor( te, s.getOpposite() );
|
||||||
return invIsCustomBlocking( blockingInventoryAdaptor );
|
return invIsCustomBlocking( blockingInventoryAdaptor );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -57,6 +57,18 @@ public class NonBlockingItems
|
|||||||
NON_BLOCKING_MAP.get( modid ).add( AEItemStack.fromItemStack( metaItem2.getStackForm() ) );
|
NON_BLOCKING_MAP.get( modid ).add( AEItemStack.fromItemStack( metaItem2.getStackForm() ) );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ItemStack itemStack = GameRegistry.makeItemStack( ModItemMeta[0] + ":" + ModItemMeta[1], ModItemMeta.length == 3 ? Integer.parseInt( ModItemMeta[2] ) : 0, 1, null );
|
||||||
|
if( !itemStack.isEmpty() )
|
||||||
|
{
|
||||||
|
NON_BLOCKING_MAP.get( modid ).add( AEItemStack.fromItemStack( itemStack ) );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
AELog.error( "Item not found on nonBlocking config: " + s );
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -5,13 +5,9 @@ import appeng.api.storage.data.IAEItemStack;
|
|||||||
import appeng.api.storage.data.IItemList;
|
import appeng.api.storage.data.IItemList;
|
||||||
import appeng.helpers.NonBlockingItems;
|
import appeng.helpers.NonBlockingItems;
|
||||||
import appeng.util.item.AEItemStack;
|
import appeng.util.item.AEItemStack;
|
||||||
import appeng.util.item.ItemList;
|
|
||||||
import net.minecraft.item.Item;
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraftforge.items.IItemHandler;
|
import net.minecraftforge.items.IItemHandler;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user