mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-19 11:49:14 +00:00
Merge branch 'dev' into inventory-cleanup
Conflicts: src/main/java/forestry/apiculture/gadgets/TileAlvearyHygroregulator.java src/main/java/forestry/core/circuits/ItemSolderingIron.java src/main/java/forestry/core/gadgets/TileAnalyzer.java src/main/java/forestry/energy/gadgets/EngineBronze.java src/main/java/forestry/energy/gadgets/MachineGenerator.java src/main/java/forestry/factory/gadgets/MachineBottler.java src/main/java/forestry/factory/gadgets/MachineCarpenter.java src/main/java/forestry/factory/gadgets/MachineFabricator.java src/main/java/forestry/factory/gadgets/MachineMoistener.java src/main/java/forestry/factory/gadgets/MachineRaintank.java src/main/java/forestry/factory/gadgets/MachineSqueezer.java src/main/java/forestry/factory/gadgets/MachineStill.java src/main/java/forestry/mail/gadgets/MachineTrader.java
This commit is contained in:
commit
db93c6e930
107 files changed
+1673
-1763
No files matched your search
@@ -50,13 +50,13 @@ public class ContainerTradeName extends ContainerForestry {
|
||||
PacketUpdate packet = new PacketUpdate(PacketIds.TRADING_ADDRESS_SET, payload);
|
||||
Proxies.net.sendToServer(packet);
|
||||
|
||||
IMailAddress address = PostManager.postRegistry.getMailAddress(addressName);
|
||||
IMailAddress address = PostManager.postRegistry.getValidMailAddress(machine.getWorld(), addressName);
|
||||
machine.setAddress(address);
|
||||
}
|
||||
|
||||
public void handleSetAddress(PacketUpdate packet) {
|
||||
String addressName = packet.payload.stringPayload[0];
|
||||
IMailAddress address = PostManager.postRegistry.getMailAddress(addressName);
|
||||
IMailAddress address = PostManager.postRegistry.getValidMailAddress(machine.getWorld(), addressName);
|
||||
machine.setAddress(address);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user