MightyPirates · May 21, 2016
diff --git a/Diff for: ‎src/main/java/li/cil/oc/api/prefab/ManagedEnvironment.java
+5-3 b/Diff for: ‎src/main/java/li/cil/oc/api/prefab/ManagedEnvironment.java
+5-3
diff --git a/Diff for: ‎src/main/scala/li/cil/oc/common/component/TerminalServer.scala
+10-6 b/Diff for: ‎src/main/scala/li/cil/oc/common/component/TerminalServer.scala
+10-6
@@ -9,6 +9,8 @@
  * unused methods don't clutter the implementing class.
  */
 public abstract class ManagedEnvironment implements li.cil.oc.api.network.ManagedEnvironment {
+    public static final String NODE_TAG = "node";
+
     // Should be initialized using setNode(api.Network.newNode()). See TileEntityEnvironment.
     private Node _node;
 
@@ -45,7 +47,7 @@ public void onMessage(final Message message) {
     @Override
     public void load(final NBTTagCompound nbt) {
         if (node() != null) {
-            node().load(nbt.getCompoundTag("node"));
+            node().load(nbt.getCompoundTag(NODE_TAG));
         }
     }
 
@@ -61,13 +63,13 @@ public void save(final NBTTagCompound nbt) {
 
                 final NBTTagCompound nodeTag = new NBTTagCompound();
                 node().save(nodeTag);
-                nbt.setTag("node", nodeTag);
+                nbt.setTag(NODE_TAG, nodeTag);
 
                 node().remove();
             } else {
                 final NBTTagCompound nodeTag = new NBTTagCompound();
                 node().save(nodeTag);
-                nbt.setTag("node", nodeTag);
+                nbt.setTag(NODE_TAG, nodeTag);
             }
         }
     }
 
@@ -147,21 +147,25 @@ class TerminalServer(val rack: api.internal.Rack, val slot: Int) extends Environ
   // ----------------------------------------------------------------------- //
   // Persistable
 
+  private final val BufferTag = Settings.namespace + "buffer"
+  private final val KeyboardTag = Settings.namespace + "keyboard"
+  private final val KeysTag = Settings.namespace + "keys"
+
   override def load(nbt: NBTTagCompound): Unit = {
     if (!rack.world.isRemote) {
       node.load(nbt)
     }
-    buffer.load(nbt.getCompoundTag(Settings.namespace + "buffer"))
-    keyboard.load(nbt.getCompoundTag(Settings.namespace + "keyboard"))
+    buffer.load(nbt.getCompoundTag(BufferTag))
+    keyboard.load(nbt.getCompoundTag(KeyboardTag))
     keys.clear()
-    nbt.getTagList(Settings.namespace + "keys", NBT.TAG_STRING).foreach((tag: NBTTagString) => keys += tag.getString)
+    nbt.getTagList(KeysTag, NBT.TAG_STRING).foreach((tag: NBTTagString) => keys += tag.getString)
   }
 
   override def save(nbt: NBTTagCompound): Unit = {
     node.save(nbt)
-    nbt.setNewCompoundTag(Settings.namespace + "buffer", buffer.save)
-    nbt.setNewCompoundTag(Settings.namespace + "keyboard", keyboard.save)
-    nbt.setNewTagList(Settings.namespace + "keys", keys)
+    nbt.setNewCompoundTag(BufferTag, buffer.save)
+    nbt.setNewCompoundTag(KeyboardTag, keyboard.save)
+    nbt.setNewTagList(KeysTag, keys)
   }
 
   // ----------------------------------------------------------------------- //
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`	`* unused methods don't clutter the implementing class.`
`10`	`10`	`*/`
`11`	`11`	`public abstract class ManagedEnvironment implements li.cil.oc.api.network.ManagedEnvironment {`
	`12`	`+ public static final String NODE_TAG = "node";`
	`13`	`+`
`12`	`14`	`// Should be initialized using setNode(api.Network.newNode()). See TileEntityEnvironment.`
`13`	`15`	`private Node _node;`
`14`	`16`
`@@ -45,7 +47,7 @@ public void onMessage(final Message message) {`
`45`	`47`	`@Override`
`46`	`48`	`public void load(final NBTTagCompound nbt) {`
`47`	`49`	`if (node() != null) {`
`48`		`- node().load(nbt.getCompoundTag("node"));`
	`50`	`+ node().load(nbt.getCompoundTag(NODE_TAG));`
`49`	`51`	`}`
`50`	`52`	`}`
`51`	`53`
`@@ -61,13 +63,13 @@ public void save(final NBTTagCompound nbt) {`
`61`	`63`
`62`	`64`	`final NBTTagCompound nodeTag = new NBTTagCompound();`
`63`	`65`	`node().save(nodeTag);`
`64`		`- nbt.setTag("node", nodeTag);`
	`66`	`+ nbt.setTag(NODE_TAG, nodeTag);`
`65`	`67`
`66`	`68`	`node().remove();`
`67`	`69`	`} else {`
`68`	`70`	`final NBTTagCompound nodeTag = new NBTTagCompound();`
`69`	`71`	`node().save(nodeTag);`
`70`		`- nbt.setTag("node", nodeTag);`
	`72`	`+ nbt.setTag(NODE_TAG, nodeTag);`
`71`	`73`	`}`
`72`	`74`	`}`
`73`	`75`	`}`