encoded patterns now stack up to 64
This commit is contained in:
@@ -92,7 +92,13 @@ public class GuiPatternTerm extends GuiMEMonitorable
|
|||||||
|
|
||||||
if( this.encodeBtn == btn )
|
if( this.encodeBtn == btn )
|
||||||
{
|
{
|
||||||
NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Encode", "1" ) );
|
if ( isShiftKeyDown() ){
|
||||||
|
NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Encode", "2" ) );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
NetworkHandler.instance().sendToServer( new PacketValueConfig( "PatternTerminal.Encode", "1" ) );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if( this.clearBtn == btn )
|
if( this.clearBtn == btn )
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ public class ContainerInterface extends ContainerUpgradeable
|
|||||||
for( int x = 0; x < DualityInterface.NUMBER_OF_PATTERN_SLOTS; x++ )
|
for( int x = 0; x < DualityInterface.NUMBER_OF_PATTERN_SLOTS; x++ )
|
||||||
{
|
{
|
||||||
this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, this.myDuality
|
this.addSlotToContainer( new SlotRestrictedInput( SlotRestrictedInput.PlacableItemType.ENCODED_PATTERN, this.myDuality
|
||||||
.getPatterns(), x, 8 + 18 * x, 90 + 7, this.getInventoryPlayer() ) );
|
.getPatterns(), x, 8 + 18 * x, 90 + 7, this.getInventoryPlayer() ).setStackLimit( 1 ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
for( int x = 0; x < DualityInterface.NUMBER_OF_CONFIG_SLOTS; x++ )
|
for( int x = 0; x < DualityInterface.NUMBER_OF_CONFIG_SLOTS; x++ )
|
||||||
|
|||||||
@@ -203,6 +203,19 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void encodeAndMoveToInventory()
|
||||||
|
{
|
||||||
|
encode();
|
||||||
|
ItemStack output = this.patternSlotOUT.getStack();
|
||||||
|
if ( !output.isEmpty() )
|
||||||
|
{
|
||||||
|
if (!getPlayerInv().addItemStackToInventory( output )){
|
||||||
|
getPlayerInv().player.dropItem( output , false );
|
||||||
|
}
|
||||||
|
this.patternSlotOUT.putStack( ItemStack.EMPTY );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void encode()
|
public void encode()
|
||||||
{
|
{
|
||||||
ItemStack output = this.patternSlotOUT.getStack();
|
ItemStack output = this.patternSlotOUT.getStack();
|
||||||
|
|||||||
@@ -175,7 +175,13 @@ public class PacketValueConfig extends AppEngPacket
|
|||||||
}
|
}
|
||||||
else if( this.Name.equals( "PatternTerminal.Encode" ) )
|
else if( this.Name.equals( "PatternTerminal.Encode" ) )
|
||||||
{
|
{
|
||||||
cpt.encode();
|
if (this.Value.equals( "2" )) {
|
||||||
|
cpt.encodeAndMoveToInventory();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
cpt.encode();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if( this.Name.equals( "PatternTerminal.Clear" ) )
|
else if( this.Name.equals( "PatternTerminal.Clear" ) )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
|
|||||||
|
|
||||||
public ItemEncodedPattern()
|
public ItemEncodedPattern()
|
||||||
{
|
{
|
||||||
this.setMaxStackSize( 1 );
|
this.setMaxStackSize( 64 );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -255,7 +255,7 @@ gui.tooltips.appliedenergistics2.SubstitutionsDescDisabled=Prevent substitutions
|
|||||||
gui.tooltips.appliedenergistics2.SubstitutionsOn=Substitutions Enabled
|
gui.tooltips.appliedenergistics2.SubstitutionsOn=Substitutions Enabled
|
||||||
gui.tooltips.appliedenergistics2.SubstitutionsOff=Substitutions Disabled
|
gui.tooltips.appliedenergistics2.SubstitutionsOff=Substitutions Disabled
|
||||||
gui.tooltips.appliedenergistics2.Encode=Encode Pattern
|
gui.tooltips.appliedenergistics2.Encode=Encode Pattern
|
||||||
gui.tooltips.appliedenergistics2.EncodeDescription=Write the entered pattern to the current encoded pattern, or to available blank pattern.
|
gui.tooltips.appliedenergistics2.EncodeDescription=Write the entered pattern to the current encoded pattern, or to available blank pattern. Hold Shift to transfer directly to your inventory
|
||||||
gui.tooltips.appliedenergistics2.FuzzyMode=Fuzzy Comparison
|
gui.tooltips.appliedenergistics2.FuzzyMode=Fuzzy Comparison
|
||||||
gui.tooltips.appliedenergistics2.FZPercent_25=Split Damage at 25%
|
gui.tooltips.appliedenergistics2.FZPercent_25=Split Damage at 25%
|
||||||
gui.tooltips.appliedenergistics2.FZPercent_50=Split Damage at 50%
|
gui.tooltips.appliedenergistics2.FZPercent_50=Split Damage at 50%
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"modid":"appliedenergistics2",
|
"modid":"appliedenergistics2",
|
||||||
"name":"Applied Energistics 2",
|
"name":"Applied Energistics 2 Trousers Edition",
|
||||||
"description":"A Mod about Matter, Energy and using them to conquer the world..",
|
"description":"A Mod about Matter, Energy and using them to conquer the world..",
|
||||||
"version":"${version}",
|
"version":"${version}",
|
||||||
"mcversion":"${mcversion}",
|
"mcversion":"${mcversion}",
|
||||||
"url":"http://ae2.ae-mod.info",
|
"url":"https://github.com/PrototypeTrousers/Applied-Energistics-2",
|
||||||
"updateUrl":"",
|
"updateUrl":"",
|
||||||
"authorList":[
|
"authorList":[
|
||||||
"AlgorithmX2"
|
"AlgorithmX2"
|
||||||
|
|||||||
Reference in New Issue
Block a user