mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-20 03:59:45 +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
@@ -10,24 +10,25 @@
|
||||
******************************************************************************/
|
||||
package forestry.mail;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import forestry.api.core.INBTTagable;
|
||||
import forestry.api.mail.EnumAddressee;
|
||||
import forestry.api.mail.IMailAddress;
|
||||
import forestry.core.network.EntityNetData;
|
||||
import forestry.core.utils.PlayerUtil;
|
||||
import java.util.Locale;
|
||||
import java.util.UUID;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTUtil;
|
||||
|
||||
import java.util.Locale;
|
||||
import java.util.UUID;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
|
||||
import forestry.api.core.INBTTagable;
|
||||
import forestry.api.mail.EnumAddressee;
|
||||
import forestry.api.mail.IMailAddress;
|
||||
import forestry.core.network.PacketPayload;
|
||||
import forestry.core.utils.PlayerUtil;
|
||||
|
||||
public class MailAddress implements INBTTagable, IMailAddress {
|
||||
|
||||
private static final GameProfile invalidGameProfile = new GameProfile(new UUID(0, 0), "");
|
||||
@EntityNetData
|
||||
|
||||
private EnumAddressee type;
|
||||
@EntityNetData
|
||||
private GameProfile gameProfile; // gameProfile is a fake GameProfile for traders, and real for players
|
||||
|
||||
public MailAddress() {
|
||||
|
||||
Reference in new issue
Block a user