From 26e5f4b4ff5c8e95f9307a893e626e355162241f Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 8 Jul 2013 16:59:52 -0400 Subject: [PATCH] Test server-siding ResourceLocation --- .../mods/fml/common/registry/VillagerRegistry.java | 6 +++--- conf/packages.csv | 2 +- .../net/minecraft/util/ResourceLocation.java.patch | 13 +++++++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 patches/minecraft/net/minecraft/util/ResourceLocation.java.patch diff --git a/common/cpw/mods/fml/common/registry/VillagerRegistry.java b/common/cpw/mods/fml/common/registry/VillagerRegistry.java index 4c778ade56..63c1d0f70a 100644 --- a/common/cpw/mods/fml/common/registry/VillagerRegistry.java +++ b/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; diff --git a/conf/packages.csv b/conf/packages.csv index 0d1052fd7c..38decad11c 100644 --- a/conf/packages.csv +++ b/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 diff --git a/patches/minecraft/net/minecraft/util/ResourceLocation.java.patch b/patches/minecraft/net/minecraft/util/ResourceLocation.java.patch new file mode 100644 index 0000000000..6b8ed79c43 --- /dev/null +++ b/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;