item changes

client/src/main/java/client/Client.java

@@ -110,6 +110,8 @@ import common.collect.Lists;
 import common.collect.Maps;
 import common.color.TextColor;
 import common.dimension.Space;
+import common.effect.Effect;
+import common.effect.StatusEffect;
 import common.entity.Entity;
 import common.entity.animal.EntityHorse;
 import common.entity.npc.Energy;
@@ -161,8 +163,6 @@ import common.packet.CPacketCheat;
 import common.packet.CPacketMessage;
 import common.packet.HPacketHandshake;
 import common.packet.CPacketAction.Action;
-import common.potion.Effect;
-import common.potion.StatusEffect;
 import common.properties.Property;
 import common.sound.EventType;
 import common.sound.PositionedSound;

client/src/main/java/client/gui/character/GuiChar.java

@@ -411,9 +411,9 @@ public class GuiChar extends GuiList<GuiChar.SkinEntry>
 		}, IPlayer.VALID_NICK, this.gm.player == null ? "" : this.gm.player.getCustomNameTag()));
         this.templateButton.enabled = false;
         this.dimension = new Random().zrange(UniverseRegistry.getBaseDimensions().size());
-    	EntityInfo egg = EntityRegistry.SPAWN_EGGS.get(this.gm.player == null ? EntityRegistry.getEntityString(EntityHuman.class) : EntityRegistry.getEntityString(this.gm.player));
-    	if(egg != null && egg.origin() != null) {
-    		Dimension dim = UniverseRegistry.getDimension(egg.origin());
+    	EntityInfo info = EntityRegistry.DNA.get(this.gm.player == null ? EntityRegistry.getEntityString(EntityHuman.class) : EntityRegistry.getEntityString(this.gm.player));
+    	if(info != null && info.origin() != null) {
+    		Dimension dim = UniverseRegistry.getDimension(info.origin());
     		if(dim != null) {
 	        	for(int z = 0; z < UniverseRegistry.getBaseDimensions().size(); z++) {
 	        		if(UniverseRegistry.getBaseDimensions().get(z) == dim) {

client/src/main/java/client/gui/container/GuiContainer.java

@@ -127,6 +127,10 @@ public abstract class GuiContainer extends Gui
 		s = s + TextColor.RESET;
 		list.add(s);
 		stack.getItem().addInformation(stack, this.gm.player, list);
+		if(stack.getItem().isAdminItem())
+			list.add(TextColor.RED + "Admin-Gegenstand");
+		if(stack.getItem().isMagnetic())
+			list.add(TextColor.LGRAY + "Magnetisch");
 		if(stack.getItem().canBeDyed())
 			list.add("Farbe: #" + Integer.toHexString(stack.getDyeColor()).toUpperCase());
 

client/src/main/java/client/network/ClientPlayer.java

@@ -28,6 +28,7 @@ import client.world.WorldClient;
 import common.block.Block;
 import common.block.tech.BlockWorkbench;
 import common.dimension.Dimension;
+import common.effect.StatusEffect;
 import common.entity.DataWatcher;
 import common.entity.Entity;
 import common.entity.effect.EntityLightning;
@@ -116,7 +117,6 @@ import common.packet.SPacketTrades;
 import common.packet.SPacketUpdateDisplay;
 import common.packet.SPacketUpdateHealth;
 import common.packet.SPacketWorld;
-import common.potion.StatusEffect;
 import common.rng.Random;
 import common.sound.Sound;
 import common.tileentity.TileEntity;

client/src/main/java/client/renderer/EntityRenderer.java

@@ -16,6 +16,7 @@ import client.world.WorldClient;
 import common.biome.Biome;
 import common.block.Block;
 import common.block.Material;
+import common.effect.Effect;
 import common.entity.Entity;
 import common.entity.npc.EntityNPC;
 import common.entity.types.EntityAnimal;
@@ -24,7 +25,6 @@ import common.init.Blocks;
 import common.init.Items;
 import common.init.SoundEvent;
 import common.model.BlockLayer;
-import common.potion.Effect;
 import common.rng.Random;
 import common.util.BlockPos;
 import common.util.BoundingBox;