Test server-siding ResourceLocation

fml/common/cpw/mods/fml/common/registry/VillagerRegistry.java

@@ -13,15 +13,15 @@
 package cpw.mods.fml.common.registry;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
-import java.util.Collection;
-import java.util.Collections;
 
-import net.minecraft.client.resources.ResourceLocation;
 import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.item.Item;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.Tuple;
 import net.minecraft.village.MerchantRecipeList;
 import net.minecraft.world.gen.structure.ComponentVillageStartPiece;

fml/conf/packages.csv

@@ -537,7 +537,6 @@ LanguageManager,net/minecraft/client/resources
 Locale,net/minecraft/client/resources
 ReloadableResourceManager,net/minecraft/client/resources
 Resource,net/minecraft/client/resources
-ResourceLocation,net/minecraft/client/resources
 ResourceManager,net/minecraft/client/resources
 ResourceManagerReloadListener,net/minecraft/client/resources
 ResourcePack,net/minecraft/client/resources
@@ -1298,6 +1297,7 @@ MovementInput,net/minecraft/util
 MovementInputFromOptions,net/minecraft/util
 MovingObjectPosition,net/minecraft/util
 ReportedException,net/minecraft/util
+ResourceLocation,net/minecraft/util
 ScreenShotHelper,net/minecraft/util
 Session,net/minecraft/util
 StatCollector,net/minecraft/util

fml/patches/minecraft/net/minecraft/util/ResourceLocation.java.patch

@@ -0,0 +1,13 @@
+--- ../src-base/minecraft/net/minecraft/util/ResourceLocation.java
++++ ../src-work/minecraft/net/minecraft/util/ResourceLocation.java
+@@ -1,10 +1,7 @@
+ package net.minecraft.util;
+ 
+-import cpw.mods.fml.relauncher.Side;
+-import cpw.mods.fml.relauncher.SideOnly;
+ import org.apache.commons.lang3.Validate;
+ 
+-@SideOnly(Side.CLIENT)
+ public class ResourceLocation
+ {
+     private final String field_110626_a;