Added JEI integration (#2436).

This commit is contained in:
Sebastian Hartte
2016-10-04 01:34:29 +02:00
parent b8344da734
commit 8df692053a
46 changed files with 1555 additions and 170 deletions
+4 -4
View File
@@ -94,7 +94,7 @@ public final class AEConfig extends Configuration implements IConfigurableObject
public int portableCellBattery = 20000;
public int colorApplicatorBattery = 20000;
public int chargedStaffBattery = 8000;
public boolean disableColoredCableRecipesInNEI = true;
public boolean disableColoredCableRecipesInJEI = true;
public boolean updatable = false;
public double meteoriteClusterChance = 0.1;
public double meteoriteSpawnChance = 0.3;
@@ -226,7 +226,7 @@ public final class AEConfig extends Configuration implements IConfigurableObject
private void clientSync()
{
this.disableColoredCableRecipesInNEI = this.get( "Client", "disableColoredCableRecipesInNEI", true ).getBoolean( true );
this.disableColoredCableRecipesInJEI = this.get( "Client", "disableColoredCableRecipesInJEI", true ).getBoolean( true );
this.enableEffects = this.get( "Client", "enableEffects", true ).getBoolean( true );
this.useLargeFonts = this.get( "Client", "useTerminalUseLargeFont", false ).getBoolean( false );
this.useColoredCraftingStatus = this.get( "Client", "useColoredCraftingStatus", true ).getBoolean( true );
@@ -365,9 +365,9 @@ public final class AEConfig extends Configuration implements IConfigurableObject
}
}
public boolean disableColoredCableRecipesInNEI()
public boolean disableColoredCableRecipesInJEI()
{
return this.disableColoredCableRecipesInNEI;
return this.disableColoredCableRecipesInJEI;
}
public String getFilePath()
@@ -65,8 +65,8 @@ public enum ButtonToolTips
SearchMode_Auto,
SearchMode_Standard,
SearchMode_NEIAuto,
SearchMode_NEIStandard,
SearchMode_JEIAuto,
SearchMode_JEIStandard,
SearchMode,
ItemName,
@@ -39,7 +39,7 @@ import appeng.core.sync.packets.PacketMEInventoryUpdate;
import appeng.core.sync.packets.PacketMatterCannon;
import appeng.core.sync.packets.PacketMockExplosion;
import appeng.core.sync.packets.PacketMultiPart;
import appeng.core.sync.packets.PacketNEIRecipe;
import appeng.core.sync.packets.PacketJEIRecipe;
import appeng.core.sync.packets.PacketNewStorageDimension;
import appeng.core.sync.packets.PacketPaintedEntity;
import appeng.core.sync.packets.PacketPartPlacement;
@@ -94,7 +94,7 @@ public class AppEngPacketHandlerBase
PACKET_PATTERN_SLOT( PacketPatternSlot.class ),
PACKET_RECIPE_NEI( PacketNEIRecipe.class ),
PACKET_RECIPE_JEI( PacketJEIRecipe.class ),
PACKET_PARTIAL_ITEM( PacketPartialItem.class ),
@@ -62,13 +62,13 @@ import appeng.util.item.AEItemStack;
import appeng.util.prioitylist.IPartitionList;
public class PacketNEIRecipe extends AppEngPacket
public class PacketJEIRecipe extends AppEngPacket
{
private ItemStack[][] recipe;
// automatic.
public PacketNEIRecipe( final ByteBuf stream ) throws IOException
public PacketJEIRecipe( final ByteBuf stream ) throws IOException
{
final ByteArrayInputStream bytes = new ByteArrayInputStream( stream.array() );
bytes.skip( stream.readerIndex() );
@@ -92,7 +92,7 @@ public class PacketNEIRecipe extends AppEngPacket
}
// api
public PacketNEIRecipe( final NBTTagCompound recipe ) throws IOException
public PacketJEIRecipe( final NBTTagCompound recipe ) throws IOException
{
final ByteBuf data = Unpooled.buffer();