upstream/Hardcore-Ender-Expansion
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Hardcore-Ender-Expansion.git synced 2026-10-26 14:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaked compendium loading, added profiling

Browse Source
This commit is contained in:
chylex committed 2014-09-01 01:18:26 +02:00
1 parent 1aa31d2e7c
commit a9206db7d6
2 files changed
+10 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/chylex/hee/mechanics/compendium/player/PlayerCompendiumData.java
+6 -1
View File
@@ -18,6 +18,7 @@ import chylex.hee.mechanics.compendium.content.objects.ObjectMob;
import chylex.hee.mechanics.compendium.content.type.KnowledgeFragment;
import chylex.hee.mechanics.compendium.content.type.KnowledgeObject;
import chylex.hee.mechanics.compendium.player.PlayerDiscoveryList.IObjectSerializer;
import chylex.hee.system.logging.Stopwatch;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
import cpw.mods.fml.relauncher.Side;
@@ -136,6 +137,7 @@ public class PlayerCompendiumData implements IExtendedEntityProperties{
@Override
public void saveNBTData(NBTTagCompound nbt){
Stopwatch.time("PlayerCompendiumData - save");
NBTTagCompound hee = new NBTTagCompound();
hee.setInteger("kps",pointAmount);
hee.setTag("fndBlocks",discoveredBlocks.saveToNBTList());
@@ -143,16 +145,19 @@ public class PlayerCompendiumData implements IExtendedEntityProperties{
hee.setTag("fndMobs",discoveryMobs.saveToNBTList());
hee.setTag("unlocked",new NBTTagIntArray(unlockedFragments.toArray()));
nbt.setTag("HEE",hee);
Stopwatch.finish("PlayerCompendiumData - save");
}
@Override
public void loadNBTData(NBTTagCompound nbt){
Stopwatch.time("PlayerCompendiumData - load");
NBTTagCompound hee = nbt.getCompoundTag("HEE");
pointAmount = hee.getInteger("kps");
discoveredBlocks.loadFromNBTList(hee.getTagList("fndBlocks",NBT.TAG_STRING));
discoveredItems.loadFromNBTList(hee.getTagList("fndItems",NBT.TAG_STRING));
discoveryMobs.loadFromNBTList(hee.getTagList("fndMobs",NBT.TAG_STRING));
unlockedFragments.addAll(hee.getIntArray("unlocked"));
Stopwatch.finish("PlayerCompendiumData - load");
}
// SERIALIZERS
@@ -169,7 +174,7 @@ public class PlayerCompendiumData implements IExtendedEntityProperties{
int colonIndex = data.indexOf(":"), nextColonIndex = data.indexOf(":",colonIndex+1);
String meta = data.substring(nextColonIndex+1);
if (!StringUtils.isNumeric(meta) && !meta.equals("-1"))return null;
if (!meta.equals("-1") && !StringUtils.isNumeric(meta))return null;
else return new BlockMetaWrapper(GameRegistry.findBlock(data.substring(0,colonIndex),data.substring(colonIndex+1,nextColonIndex)),Integer.parseInt(meta));
}
}
src/main/java/chylex/hee/mechanics/compendium/player/PlayerDiscoveryList.java
+4 -12
View File
@@ -1,10 +1,10 @@
package chylex.hee.mechanics.compendium.player;
import java.util.HashSet;
import java.util.Set;
import chylex.hee.mechanics.compendium.content.objects.IKnowledgeObjectInstance;
import chylex.hee.mechanics.compendium.content.type.KnowledgeObject;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagString;
import chylex.hee.mechanics.compendium.content.objects.IKnowledgeObjectInstance;
import chylex.hee.mechanics.compendium.content.type.KnowledgeObject;
public class PlayerDiscoveryList<P extends IKnowledgeObjectInstance<T>,T>{
private final IObjectSerializer<T> serializer;
@@ -22,7 +22,7 @@ public class PlayerDiscoveryList<P extends IKnowledgeObjectInstance<T>,T>{
return discoveredObjects.contains(object.getUnderlyingObject());
}
public NBTTagList saveToNBTList(){
public NBTTagList saveToNBTList(){
NBTTagList list = new NBTTagList();
for(T object:discoveredObjects)list.appendTag(new NBTTagString(serializer.serialize(object)));
return list;
@@ -31,15 +31,7 @@ public class PlayerDiscoveryList<P extends IKnowledgeObjectInstance<T>,T>{
public void loadFromNBTList(NBTTagList list){
for(int a = 0, count = list.tagCount(); a < count; a++){
T object = serializer.deserialize(list.getStringTagAt(a));
if (object != null){
for(KnowledgeObject obj:KnowledgeObject.getAllObjects()){
if (obj.getObject().checkEquality(object)){
discoveredObjects.add((T)obj.getObject().getUnderlyingObject());
break;
}
}
}
if (object != null)discoveredObjects.add((T)KnowledgeObject.getObject(object).getObject().getUnderlyingObject());
}
}