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

All parameters on one line (for now)

Browse Source 
Easier picking of 1.7 changes
This commit is contained in:
yueh
2016-01-01 02:02:05 +01:00
parent e08ab38c52
commit f84b9a7e1d
147 changed files with 840 additions and 1506 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/AEConfig.java
+4 -4
View File
@@ -76,13 +76,13 @@ public final class AEConfig extends Configuration implements IConfigurableObject
public double spatialPowerMultiplier = 1250.0;
public String[] grinderOres = {
// Vanilla Items
"Obsidian", "Ender", "EnderPearl", "Coal", "Iron", "Gold", "Charcoal", "NetherQuartz",
"Obsidian", "Ender", "EnderPearl", "Coal", "Iron", "Gold", "Charcoal", "NetherQuartz",
// Common Mod Ores
"Copper", "Tin", "Silver", "Lead", "Bronze",
"Copper", "Tin", "Silver", "Lead", "Bronze",
// AE
"CertusQuartz", "Wheat", "Fluix",
"CertusQuartz", "Wheat", "Fluix",
// Other Mod Ores
"Brass", "Platinum", "Nickel", "Invar", "Aluminium", "Electrum", "Osmium", "Zinc" };
"Brass", "Platinum", "Nickel", "Invar", "Aluminium", "Electrum", "Osmium", "Zinc" };
public double oreDoublePercentage = 90.0;
public boolean enableEffects = true;
public boolean useLargeFonts = false;
src/main/java/appeng/core/AppEng.java
+9 -9
View File
@@ -70,16 +70,16 @@ public final class AppEng
public static final String ASSETS = "appliedenergistics2:";
public static final String MOD_DEPENDENCIES =
// a few mods, AE should load after, probably.
// required-after:AppliedEnergistics2API|all;
// "after:gregtech_addon;after:Mekanism;after:IC2;after:ThermalExpansion;after:BuildCraft|Core;" +
// a few mods, AE should load after, probably.
// required-after:AppliedEnergistics2API|all;
// "after:gregtech_addon;after:Mekanism;after:IC2;after:ThermalExpansion;after:BuildCraft|Core;" +
// depend on version of forge used for build.
"after:appliedenergistics2-core;" + "required-after:Forge@[" // require forge.
+ net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion
+ net.minecraftforge.common.ForgeVersion.minorVersion + '.' // minorVersion
+ net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion
+ net.minecraftforge.common.ForgeVersion.buildVersion + ",)"; // buildVersion
// depend on version of forge used for build.
"after:appliedenergistics2-core;" + "required-after:Forge@[" // require forge.
+ net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion
+ net.minecraftforge.common.ForgeVersion.minorVersion + '.' // minorVersion
+ net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion
+ net.minecraftforge.common.ForgeVersion.buildVersion + ",)"; // buildVersion
@Nonnull
private static final AppEng INSTANCE = new AppEng();
src/main/java/appeng/core/CommonHelper.java
+1 -2
View File
@@ -74,6 +74,5 @@ public abstract class CommonHelper
public abstract void configureIcon( Object item, String name );
public abstract ResourceLocation addIcon(
String string );
public abstract ResourceLocation addIcon( String string );
}
src/main/java/appeng/core/features/AEFeature.java
+2 -1
View File
@@ -130,7 +130,8 @@ public enum AEFeature
InterfaceTerminal( Constants.CATEGORY_CRAFTING ),
EnableDisassemblyCrafting( Constants.CATEGORY_CRAFTING ),
AlphaPass( Constants.CATEGORY_RENDERING ), PaintBalls( Constants.CATEGORY_TOOLS ),
AlphaPass( Constants.CATEGORY_RENDERING ),
PaintBalls( Constants.CATEGORY_TOOLS ),
MolecularAssembler( Constants.CATEGORY_CRAFTING_FEATURES ),
Patterns( Constants.CATEGORY_CRAFTING_FEATURES ),
src/main/java/appeng/core/features/ActivityState.java
+1 -2
View File
@@ -21,8 +21,7 @@ package appeng.core.features;
public enum ActivityState
{
Enabled,
Disabled;
Enabled, Disabled;
public static ActivityState from( final boolean enabled )
{
src/main/java/appeng/core/localization/ButtonToolTips.java
+94 -20
View File
@@ -24,46 +24,120 @@ import net.minecraft.util.StatCollector;
public enum ButtonToolTips
{
PowerUnits, IOMode, CondenserOutput, RedstoneMode, MatchingFuzzy,
PowerUnits,
IOMode,
CondenserOutput,
RedstoneMode,
MatchingFuzzy,
MatchingMode, TransferDirection, SortOrder, SortBy, View,
MatchingMode,
TransferDirection,
SortOrder,
SortBy,
View,
PartitionStorage, Clear, FuzzyMode, OperationMode, TrashController,
PartitionStorage,
Clear,
FuzzyMode,
OperationMode,
TrashController,
InterfaceBlockingMode, InterfaceCraftingMode, Trash, MatterBalls,
InterfaceBlockingMode,
InterfaceCraftingMode,
Trash,
MatterBalls,
Singularity, Read, Write, ReadWrite, AlwaysActive,
Singularity,
Read,
Write,
ReadWrite,
AlwaysActive,
ActiveWithoutSignal, ActiveWithSignal, ActiveOnPulse,
ActiveWithoutSignal,
ActiveWithSignal,
ActiveOnPulse,
EmitLevelsBelow, EmitLevelAbove, MatchingExact, TransferToNetwork,
EmitLevelsBelow,
EmitLevelAbove,
MatchingExact,
TransferToNetwork,
TransferToStorageCell, ToggleSortDirection, SearchMode_Auto,
TransferToStorageCell,
ToggleSortDirection,
SearchMode_Auto,
SearchMode_Standard, SearchMode_NEIAuto, SearchMode_NEIStandard,
SearchMode_Standard,
SearchMode_NEIAuto,
SearchMode_NEIStandard,
SearchMode, ItemName, NumberOfItems, PartitionStorageHint,
SearchMode,
ItemName,
NumberOfItems,
PartitionStorageHint,
ClearSettings, StoredItems, StoredCraftable, Craftable,
ClearSettings,
StoredItems,
StoredCraftable,
Craftable,
FZPercent_25, FZPercent_50, FZPercent_75, FZPercent_99, FZIgnoreAll,
FZPercent_25,
FZPercent_50,
FZPercent_75,
FZPercent_99,
FZIgnoreAll,
MoveWhenEmpty, MoveWhenWorkIsDone, MoveWhenFull, Disabled, Enable,
MoveWhenEmpty,
MoveWhenWorkIsDone,
MoveWhenFull,
Disabled,
Enable,
Blocking, NonBlocking,
Blocking,
NonBlocking,
LevelType, LevelType_Energy, LevelType_Item, InventoryTweaks, TerminalStyle, TerminalStyle_Full, TerminalStyle_Tall, TerminalStyle_Small,
LevelType,
LevelType_Energy,
LevelType_Item,
InventoryTweaks,
TerminalStyle,
TerminalStyle_Full,
TerminalStyle_Tall,
TerminalStyle_Small,
Stash, StashDesc, Encode, EncodeDescription, Substitutions, SubstitutionsOn, SubstitutionsOff, SubstitutionsDescEnabled, SubstitutionsDescDisabled, CraftOnly, CraftEither,
Stash,
StashDesc,
Encode,
EncodeDescription,
Substitutions,
SubstitutionsOn,
SubstitutionsOff,
SubstitutionsDescEnabled,
SubstitutionsDescDisabled,
CraftOnly,
CraftEither,
Craft, Mod, DoesntDespawn, EmitterMode, CraftViaRedstone, EmitWhenCrafting, ReportInaccessibleItems, ReportInaccessibleItemsYes, ReportInaccessibleItemsNo,
Craft,
Mod,
DoesntDespawn,
EmitterMode,
CraftViaRedstone,
EmitWhenCrafting,
ReportInaccessibleItems,
ReportInaccessibleItemsYes,
ReportInaccessibleItemsNo,
BlockPlacement, BlockPlacementYes, BlockPlacementNo,
BlockPlacement,
BlockPlacementYes,
BlockPlacementNo,
// Used in the tooltips of the items in the terminal, when moused over
ItemsStored, ItemsRequestable,
ItemsStored,
ItemsRequestable,
SchedulingMode, SchedulingModeDefault, SchedulingModeRoundRobin, SchedulingModeRandom;
SchedulingMode,
SchedulingModeDefault,
SchedulingModeRoundRobin,
SchedulingModeRandom;
private final String root;
src/main/java/appeng/core/localization/GuiText.java
+114 -23
View File
@@ -26,28 +26,76 @@ public enum GuiText
{
inventory( "container" ), // mc's default Inventory localization.
Chest, StoredEnergy, Of, Condenser, Drive, GrindStone, SkyChest,
Chest,
StoredEnergy,
Of,
Condenser,
Drive,
GrindStone,
SkyChest,
VibrationChamber, SpatialIOPort, LevelEmitter, Terminal,
VibrationChamber,
SpatialIOPort,
LevelEmitter,
Terminal,
Interface, Config, StoredItems, Patterns, ImportBus, ExportBus,
Interface,
Config,
StoredItems,
Patterns,
ImportBus,
ExportBus,
CellWorkbench, NetworkDetails, StorageCells, IOBuses,
CellWorkbench,
NetworkDetails,
StorageCells,
IOBuses,
IOPort, BytesUsed, Types, QuantumLinkChamber, PortableCell,
IOPort,
BytesUsed,
Types,
QuantumLinkChamber,
PortableCell,
NetworkTool, PowerUsageRate, PowerInputRate, Installed, EnergyDrain,
NetworkTool,
PowerUsageRate,
PowerInputRate,
Installed,
EnergyDrain,
StorageBus, Priority, Security, Encoded, Blank, Unlinked, Linked,
StorageBus,
Priority,
Security,
Encoded,
Blank,
Unlinked,
Linked,
SecurityCardEditor, NoPermissions, WirelessTerminal, Wireless,
SecurityCardEditor,
NoPermissions,
WirelessTerminal,
Wireless,
CraftingTerminal, FormationPlane, Inscriber, QuartzCuttingKnife,
CraftingTerminal,
FormationPlane,
Inscriber,
QuartzCuttingKnife,
// tunnel names
METunnel, ItemTunnel, RedstoneTunnel, EUTunnel, FluidTunnel, OCTunnel, LightTunnel, RFTunnel, PressureTunnel,
METunnel,
ItemTunnel,
RedstoneTunnel,
EUTunnel,
FluidTunnel,
OCTunnel,
LightTunnel,
RFTunnel,
PressureTunnel,
StoredSize, CopyMode, CopyModeDesc, PatternTerminal,
StoredSize,
CopyMode,
CopyModeDesc,
PatternTerminal,
// Pattern tooltips
CraftingPattern,
@@ -62,34 +110,77 @@ public enum GuiText
MolecularAssembler,
StoredPower, MaxPower, RequiredPower, Efficiency, InWorldCrafting,
StoredPower,
MaxPower,
RequiredPower,
Efficiency,
InWorldCrafting,
inWorldFluix, inWorldPurificationCertus, inWorldPurificationNether,
inWorldFluix,
inWorldPurificationCertus,
inWorldPurificationNether,
inWorldPurificationFluix, inWorldSingularity, ChargedQuartz,
inWorldPurificationFluix,
inWorldSingularity,
ChargedQuartz,
NoSecondOutput,
OfSecondOutput,
MultipleOutputs,
Stores, Next, SelectAmount, Lumen, Empty,
Stores,
Next,
SelectAmount,
Lumen,
Empty,
ConfirmCrafting, Stored, Crafting, Scheduled, CraftingStatus, Cancel, ETA, ETAFormat,
ConfirmCrafting,
Stored,
Crafting,
Scheduled,
CraftingStatus,
Cancel,
ETA,
ETAFormat,
FromStorage, ToCraft, CraftingPlan, CalculatingWait, Start, Bytes,
FromStorage,
ToCraft,
CraftingPlan,
CalculatingWait,
Start,
Bytes,
CraftingCPU, Automatic, CoProcessors, Simulation, Missing,
CraftingCPU,
Automatic,
CoProcessors,
Simulation,
Missing,
InterfaceTerminal, NoCraftingCPUs, Clean, InvalidPattern,
InterfaceTerminal,
NoCraftingCPUs,
Clean,
InvalidPattern,
InterfaceTerminalHint, Range, TransparentFacades, TransparentFacadesHint,
InterfaceTerminalHint,
Range,
TransparentFacades,
TransparentFacadesHint,
NoCraftingJobs, CPUs, FacadeCrafting, inWorldCraftingPresses, ChargedQuartzFind,
NoCraftingJobs,
CPUs,
FacadeCrafting,
inWorldCraftingPresses,
ChargedQuartzFind,
Included, Excluded, Partitioned, Precise, Fuzzy,
Included,
Excluded,
Partitioned,
Precise,
Fuzzy,
// Used in a terminal to indicate that an item is craftable
SmallFontCraft, LargeFontCraft,
SmallFontCraft,
LargeFontCraft,
// Used in a ME Interface when no appropriate TileEntity was detected near it
Nothing;
src/main/java/appeng/core/localization/PlayerMessages.java
+13 -3
View File
@@ -25,11 +25,21 @@ import net.minecraft.util.IChatComponent;
public enum PlayerMessages
{
ChestCannotReadStorageCell, InvalidMachine, LoadedSettings, SavedSettings, MachineNotPowered,
ChestCannotReadStorageCell,
InvalidMachine,
LoadedSettings,
SavedSettings,
MachineNotPowered,
isNowLocked, isNowUnlocked,
isNowLocked,
isNowUnlocked,
AmmoDepleted,
CommunicationError, OutOfRange, DeviceNotPowered, DeviceNotWirelessTerminal, DeviceNotLinked, StationCanNotBeLocated,
CommunicationError,
OutOfRange,
DeviceNotPowered,
DeviceNotWirelessTerminal,
DeviceNotLinked,
StationCanNotBeLocated,
SettingCleared, ;
public IChatComponent get()
src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java
+8 -14
View File
@@ -39,11 +39,7 @@ public class AppEngClientPacketHandler extends AppEngPacketHandlerBase implement
{
@Override
public void onPacketData(
final INetworkInfo manager,
final INetHandler handler,
final FMLProxyPacket packet,
final EntityPlayer player )
public void onPacketData( final INetworkInfo manager, final INetHandler handler, final FMLProxyPacket packet, final EntityPlayer player )
{
final ByteBuf stream = packet.payload();
@@ -52,16 +48,14 @@ public class AppEngClientPacketHandler extends AppEngPacketHandlerBase implement
final int packetType = stream.readInt();
final AppEngPacket pack = PacketTypes.getPacket( packetType ).parsePacket( stream );
final PacketCallState callState =
new PacketCallState(){
final PacketCallState callState = new PacketCallState(){
@Override
public void call(
final AppEngPacket appEngPacket )
{
appEngPacket.clientPacketData( manager, appEngPacket, Minecraft.getMinecraft().thePlayer );
}
};
@Override
public void call( final AppEngPacket appEngPacket )
{
appEngPacket.clientPacketData( manager, appEngPacket, Minecraft.getMinecraft().thePlayer );
}
};
pack.setCallParam( callState );
PacketThreadUtil.checkThreadAndEnqueue( pack, handler, Minecraft.getMinecraft() );
src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java
+7 -9
View File
@@ -48,16 +48,14 @@ public final class AppEngServerPacketHandler extends AppEngPacketHandlerBase imp
final int packetType = stream.readInt();
final AppEngPacket pack = PacketTypes.getPacket( packetType ).parsePacket( stream );
final PacketCallState callState =
new PacketCallState(){
final PacketCallState callState = new PacketCallState(){
@Override
public void call(
final AppEngPacket appEngPacket )
{
appEngPacket.serverPacketData( manager, appEngPacket, player );
}
};
@Override
public void call( final AppEngPacket appEngPacket )
{
appEngPacket.serverPacketData( manager, appEngPacket, player );
}
};
pack.setCallParam( callState );
PacketThreadUtil.checkThreadAndEnqueue( pack, handler, ( (EntityPlayerMP) player ).getServerForPlayer() );
src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java
+2 -4
View File
@@ -58,8 +58,7 @@ public class PacketCompressedNBT extends AppEngPacket
this.data = null;
this.compressFrame = null;
final GZIPInputStream gzReader = new GZIPInputStream( new InputStream()
{
final GZIPInputStream gzReader = new GZIPInputStream( new InputStream(){
@Override
public int read() throws IOException
@@ -87,8 +86,7 @@ public class PacketCompressedNBT extends AppEngPacket
this.in = din;
this.compressFrame = new GZIPOutputStream( new OutputStream()
{
this.compressFrame = new GZIPOutputStream( new OutputStream(){
@Override
public void write( final int value ) throws IOException
src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java
+2 -4
View File
@@ -82,8 +82,7 @@ public class PacketMEInventoryUpdate extends AppEngPacket
// int originalBytes = stream.readableBytes();
final GZIPInputStream gzReader = new GZIPInputStream( new InputStream()
{
final GZIPInputStream gzReader = new GZIPInputStream( new InputStream(){
@Override
public int read() throws IOException
{
@@ -133,8 +132,7 @@ public class PacketMEInventoryUpdate extends AppEngPacket
this.data.writeInt( this.getPacketID() );
this.data.writeByte( this.ref );
this.compressFrame = new GZIPOutputStream( new OutputStream()
{
this.compressFrame = new GZIPOutputStream( new OutputStream(){
@Override
public void write( final int value ) throws IOException
{