mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-20 12:09:39 +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
@@ -16,6 +16,7 @@ import java.util.Map;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
@@ -163,11 +164,26 @@ public class PostRegistry implements IPostRegistry {
|
||||
return new MailAddress(gameProfile);
|
||||
}
|
||||
|
||||
public IMailAddress getValidMailAddress(World world, GameProfile gameProfile) {
|
||||
IMailAddress address = new MailAddress(gameProfile);;
|
||||
if (getPOBox(world, address) != null)
|
||||
return address;
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMailAddress getMailAddress(String traderName) {
|
||||
return new MailAddress(traderName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IMailAddress getValidMailAddress(World world, String traderName) {
|
||||
IMailAddress address = new MailAddress(traderName);
|
||||
if (getTradeStation(world, address) != null)
|
||||
return address;
|
||||
return null;
|
||||
}
|
||||
|
||||
/* CARRIER */
|
||||
private final HashMap<EnumAddressee, IPostalCarrier> carriers = new HashMap<EnumAddressee, IPostalCarrier>();
|
||||
|
||||
|
||||
Reference in new issue
Block a user