From 42537be055082f09ff20a80e6cafa89576d94568 Mon Sep 17 00:00:00 2001 From: Obique Date: Sat, 16 Feb 2019 19:06:56 -0600 Subject: [PATCH] Fixed some misc. code that still used the old CustomizationVariable method --- .../resources/ClientUtilities.java | 75 +++++++++---------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/src/integration/java/com/projectswg/holocore/integration/resources/ClientUtilities.java b/src/integration/java/com/projectswg/holocore/integration/resources/ClientUtilities.java index 3870c5b30..f900e172f 100644 --- a/src/integration/java/com/projectswg/holocore/integration/resources/ClientUtilities.java +++ b/src/integration/java/com/projectswg/holocore/integration/resources/ClientUtilities.java @@ -1,7 +1,6 @@ package com.projectswg.holocore.integration.resources; import com.projectswg.common.data.customization.CustomizationString; -import com.projectswg.common.data.customization.CustomizationVariable; import com.projectswg.common.network.packets.swg.login.creation.*; import org.junit.Assert; @@ -42,48 +41,48 @@ public class ClientUtilities { private static CustomizationString createCharacterCustomization() { CustomizationString str = new CustomizationString(); - str.put("/shared_owner/blend_lipfullness_0", new CustomizationVariable(33)); - str.put("/shared_owner/blend_lipfullness_1", new CustomizationVariable(0)); - str.put("/shared_owner/blend_chinsize_0", new CustomizationVariable(208)); - str.put("/shared_owner/blend_chinsize_1", new CustomizationVariable(0)); - str.put("/shared_owner/blend_fat", new CustomizationVariable(0)); - str.put("/shared_owner/blend_ears_1", new CustomizationVariable(0)); - str.put("/shared_owner/blend_ears_0", new CustomizationVariable(191)); - str.put("/shared_owner/blend_noselength_0", new CustomizationVariable(0)); - str.put("/shared_owner/blend_noselength_1", new CustomizationVariable(40)); - str.put("/shared_owner/blend_jaw_1", new CustomizationVariable(0)); - str.put("/shared_owner/blend_jaw_0", new CustomizationVariable(156)); - str.put("/shared_owner/blend_eyeshape_1", new CustomizationVariable(32)); - str.put("/shared_owner/blend_nosewidth_1", new CustomizationVariable(0)); - str.put("/shared_owner/blend_eyeshape_0", new CustomizationVariable(0)); - str.put("/shared_owner/blend_nosewidth_0", new CustomizationVariable(35)); - str.put("/shared_owner/index_color_skin", new CustomizationVariable(35)); - str.put("/shared_owner/blend_cheeks_1", new CustomizationVariable(5)); - str.put("/shared_owner/blend_eyedirection_1", new CustomizationVariable(16)); - str.put("/shared_owner/blend_skinny", new CustomizationVariable(26)); - str.put("/shared_owner/blend_cheeks_0", new CustomizationVariable(0)); - str.put("/shared_owner/blend_eyedirection_0", new CustomizationVariable(0)); - str.put("/shared_owner/blend_nosedepth_1", new CustomizationVariable(0)); - str.put("/shared_owner/blend_nosedepth_0", new CustomizationVariable(107)); - str.put("/shared_owner/blend_lipwidth_0", new CustomizationVariable(23)); - str.put("/shared_owner/blend_lipwidth_1", new CustomizationVariable(0)); - str.put("/shared_owner/blend_muscle", new CustomizationVariable(144)); - str.put("/shared_owner/blend_eyesize_0", new CustomizationVariable(117)); - str.put("/shared_owner/blend_eyesize_1", new CustomizationVariable(0)); - str.put("/private/index_style_beard", new CustomizationVariable(0)); - str.put("/private/index_style_freckles", new CustomizationVariable(0)); - str.put("/private/index_age", new CustomizationVariable(0)); - str.put("/private/index_color_skin", new CustomizationVariable(0)); - str.put("/private/index_color_2", new CustomizationVariable(1)); - str.put("/private/index_color_3", new CustomizationVariable(0)); - str.put("/private/index_color_facial_hair", new CustomizationVariable(1)); - str.put("/private/index_style_eyebrow", new CustomizationVariable(0)); + str.put("/shared_owner/blend_lipfullness_0", 33); + str.put("/shared_owner/blend_lipfullness_1", 0); + str.put("/shared_owner/blend_chinsize_0", 208); + str.put("/shared_owner/blend_chinsize_1", 0); + str.put("/shared_owner/blend_fat", 0); + str.put("/shared_owner/blend_ears_1", 0); + str.put("/shared_owner/blend_ears_0", 191); + str.put("/shared_owner/blend_noselength_0", 0); + str.put("/shared_owner/blend_noselength_1", 40); + str.put("/shared_owner/blend_jaw_1", 0); + str.put("/shared_owner/blend_jaw_0", 156); + str.put("/shared_owner/blend_eyeshape_1", 32); + str.put("/shared_owner/blend_nosewidth_1", 0); + str.put("/shared_owner/blend_eyeshape_0", 0); + str.put("/shared_owner/blend_nosewidth_0", 35); + str.put("/shared_owner/index_color_skin", 35); + str.put("/shared_owner/blend_cheeks_1", 5); + str.put("/shared_owner/blend_eyedirection_1", 16); + str.put("/shared_owner/blend_skinny", 26); + str.put("/shared_owner/blend_cheeks_0", 0); + str.put("/shared_owner/blend_eyedirection_0", 0); + str.put("/shared_owner/blend_nosedepth_1", 0); + str.put("/shared_owner/blend_nosedepth_0", 107); + str.put("/shared_owner/blend_lipwidth_0", 23); + str.put("/shared_owner/blend_lipwidth_1", 0); + str.put("/shared_owner/blend_muscle", 144); + str.put("/shared_owner/blend_eyesize_0", 117); + str.put("/shared_owner/blend_eyesize_1", 0); + str.put("/private/index_style_beard", 0); + str.put("/private/index_style_freckles", 0); + str.put("/private/index_age", 0); + str.put("/private/index_color_skin", 0); + str.put("/private/index_color_2", 1); + str.put("/private/index_color_3", 0); + str.put("/private/index_color_facial_hair", 1); + str.put("/private/index_style_eyebrow", 0); return str; } private static CustomizationString createHairCustomization() { CustomizationString str = new CustomizationString(); - str.put("/private/index_color_1", new CustomizationVariable(1)); + str.put("/private/index_color_1", 1); return str; }