Revert "Use generics for Chromosome type, begin unifying code"

This reverts commit 43e41034f6.

Conflicts:
	src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java
	src/main/java/forestry/api/genetics/IAlleleSpeciesCustom.java
	src/main/java/forestry/core/proxy/ProxyRenderClient.java
This commit is contained in:
mezz committed 2016-03-03 20:50:38 -08:00
1 parent 87f2dc0a0a
commit efcab41e04
217 files changed
+2408 -3136

No files matched your search

+4 -3
View File
@@ -15,6 +15,7 @@ import java.util.Locale;
import java.util.UUID;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTUtil;
import com.mojang.authlib.GameProfile;
@@ -68,7 +69,7 @@ public class MailAddress implements INbtWritable, IMailAddress {
gameProfile = invalidGameProfile;
} else if (nbt.hasKey("profile")) {
NBTTagCompound profileTag = nbt.getCompoundTag("profile");
gameProfile = PlayerUtil.readGameProfileFromNBT(profileTag);
gameProfile = NBTUtil.readGameProfileFromNBT(profileTag);
}
this.type = type;
@@ -135,12 +136,12 @@ public class MailAddress implements INbtWritable, IMailAddress {
}
@Override
public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) {
public void writeToNBT(NBTTagCompound nbttagcompound) {
nbttagcompound.setString("TP", type.toString());
if (gameProfile != null) {
NBTTagCompound profileNbt = new NBTTagCompound();
PlayerUtil.writeGameProfile(profileNbt, gameProfile);
NBTUtil.writeGameProfile(profileNbt, gameProfile);
nbttagcompound.setTag("profile", profileNbt);
}
}