From 97ae7e1f142f6c76afcfdc9ea6dcf59756be2bb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salom=C3=A3o?= Date: Mon, 8 Feb 2021 22:14:37 -0300 Subject: [PATCH] encoded patterns now stack up to 64 --- .../client/gui/implementations/GuiPatternTerm.java | 8 +++++++- .../implementations/ContainerInterface.java | 2 +- .../implementations/ContainerPatternTerm.java | 13 +++++++++++++ .../appeng/core/sync/packets/PacketValueConfig.java | 8 +++++++- .../java/appeng/items/misc/ItemEncodedPattern.java | 2 +- .../assets/appliedenergistics2/lang/en_us.lang | 2 +- src/main/resources/mcmod.info | 4 ++-- 7 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java index 6078b8b18..ffaa435b3 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java @@ -92,7 +92,13 @@ public class GuiPatternTerm extends GuiMEMonitorable 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 ) diff --git a/src/main/java/appeng/container/implementations/ContainerInterface.java b/src/main/java/appeng/container/implementations/ContainerInterface.java index 98d11e194..b38bb2c13 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterface.java +++ b/src/main/java/appeng/container/implementations/ContainerInterface.java @@ -53,7 +53,7 @@ public class ContainerInterface extends ContainerUpgradeable for( int x = 0; x < DualityInterface.NUMBER_OF_PATTERN_SLOTS; x++ ) { 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++ ) diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java index 71023ebe5..c46aa94a7 100644 --- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java @@ -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() { ItemStack output = this.patternSlotOUT.getStack(); diff --git a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java index 08648d22f..9601e6daf 100644 --- a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java +++ b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java @@ -175,7 +175,13 @@ public class PacketValueConfig extends AppEngPacket } 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" ) ) { diff --git a/src/main/java/appeng/items/misc/ItemEncodedPattern.java b/src/main/java/appeng/items/misc/ItemEncodedPattern.java index 7f64305a0..d91d6015f 100644 --- a/src/main/java/appeng/items/misc/ItemEncodedPattern.java +++ b/src/main/java/appeng/items/misc/ItemEncodedPattern.java @@ -56,7 +56,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt public ItemEncodedPattern() { - this.setMaxStackSize( 1 ); + this.setMaxStackSize( 64 ); } @Override diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_us.lang b/src/main/resources/assets/appliedenergistics2/lang/en_us.lang index 8cb9956e7..9f3c87d22 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/en_us.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/en_us.lang @@ -255,7 +255,7 @@ gui.tooltips.appliedenergistics2.SubstitutionsDescDisabled=Prevent substitutions gui.tooltips.appliedenergistics2.SubstitutionsOn=Substitutions Enabled gui.tooltips.appliedenergistics2.SubstitutionsOff=Substitutions Disabled 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.FZPercent_25=Split Damage at 25% gui.tooltips.appliedenergistics2.FZPercent_50=Split Damage at 50% diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 974500c1c..823b51dc8 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,11 +1,11 @@ [ { "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..", "version":"${version}", "mcversion":"${mcversion}", - "url":"http://ae2.ae-mod.info", + "url":"https://github.com/PrototypeTrousers/Applied-Energistics-2", "updateUrl":"", "authorList":[ "AlgorithmX2"