From a40e70bbc7d1deb03679fabeafaba14a645baa9f Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 20 Mar 2015 20:26:21 +0100 Subject: [PATCH] There we go. --- .../items/metalists/TheSpecialDrops.java | 1 - .../java/ellpeck/actuallyadditions/util/Util.java | 4 ++-- .../textures/items/ItemSpecialPearlShard.png | Bin 605 -> 0 bytes .../items/ItemSpecialSolidifiedExperience.png | Bin 601 -> 0 bytes .../textures/items/itemSpecialPearlShdard.png | Bin 0 -> 566 bytes .../items/itemSpecialSolidifiedEdxperience.png | Bin 0 -> 531 bytes 6 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/ItemSpecialPearlShard.png delete mode 100644 src/main/resources/assets/actuallyadditions/textures/items/ItemSpecialSolidifiedExperience.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemSpecialPearlShdard.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemSpecialSolidifiedEdxperience.png diff --git a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheSpecialDrops.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheSpecialDrops.java index 1e338ee24..8faa77f34 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheSpecialDrops.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheSpecialDrops.java @@ -12,7 +12,6 @@ public enum TheSpecialDrops implements IName{ SOLIDIFIED_EXPERIENCE("SolidifiedExperience", 70, 3, EntityCreature.class, EnumRarity.uncommon, ConfigValues.enableExperienceDrop), BLOOD_FRAGMENT("BloodFragment", 30, 1, EntityCreature.class, EnumRarity.uncommon, ConfigValues.enableBloodDrop), - //Change this into a Heart Fragment that is later crafted into a heart used to revive Villagers HEART_PART("HeartPart", 10, 1, EntityCreature.class, EnumRarity.rare, ConfigValues.enableHeartDrop), UNKNOWN_SUBSTANCE("UnknownSubstance", 5, 1, EntitySkeleton.class, EnumRarity.epic, ConfigValues.enableSubstanceDrop), PEARL_SHARD("PearlShard", 20, 3, EntityEnderman.class, EnumRarity.epic, ConfigValues.enablePearlShardDrop), diff --git a/src/main/java/ellpeck/actuallyadditions/util/Util.java b/src/main/java/ellpeck/actuallyadditions/util/Util.java index 8753a6768..6b933af53 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/Util.java +++ b/src/main/java/ellpeck/actuallyadditions/util/Util.java @@ -48,8 +48,8 @@ public class Util{ public static final String BOLD = (char)167 + "l"; public static final String UNDERLINE = (char)167 + "n"; public static final String ITALIC = (char)167 + "o"; - public static final String OBFUSCATED = (char) 167 + "k"; - public static final String RESET = (char) 167 + "r"; + public static final String OBFUSCATED = (char)167 + "k"; + public static final String RESET = (char)167 + "r"; public static final String[] ROMAN_NUMERALS = new String[]{"", "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX", "X"}; diff --git a/src/main/resources/assets/actuallyadditions/textures/items/ItemSpecialPearlShard.png b/src/main/resources/assets/actuallyadditions/textures/items/ItemSpecialPearlShard.png deleted file mode 100644 index b726e96d86b22d7a068424e7b40ab5f53873d3cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 605 zcmV-j0;2tiP)WFU8GbZ8()Nlj2>E@cM*00F^CL_t(I%WacgYg0iG zhM$?;lcYAWu?h-;7rpXYYM|8odRv5A{2hX{`KXYbWM{^UX zytE<$b7!;JkaK4Kv}8PbO->0_ZR_M15D|z-2M`ei@OC z^<@k$K0yTKVMba0Z6WIWQ(B@30myzozP^m=^9A|CJMzc($mkR~=`*_e62*-CtaqY? zxH$l2z9fo)2)r7g+f!^+@8)wnkcgnhsZbOcPbaY<(D@QC1_F6_3Mv4uNxKf7Hfv6* zKIX=FI*EEy6RVn7*TlAv&(E-R4Zk1!@#ZcObO9&1N4Vp@v+k=JN`a*Kwjh6I4)FN> zE@e%adl#T0hze)ZNvs#kop?7G`l>#=`I$rn5n*damC^wa5o}ALS5=1_>Gv26hYql~ zy-$c7uGx)V&PZc7j>4lNy!rOk0Oq&%saTKeDt-U2{fw)Atg4^$urWFU8GbZ8()Nlj2>E@cM*00F&8L_t(I%Z-z}ZWBQi zhQGP&?8;_kTp%H$AOVFVfw%}!b9n$HN=iEXMo>`DQ$_A+Ku}+Yj# zJ~b8}1i90cUQNNW!gl9p5L5tFio5}q%6D{PG&qavBhq9#~> zC3*H~&G)*JN!cRNlH4WO%CNnEhOKeV_0t6(e$H2<4?7y}J-!?O-t20+$#0B`*!_CG z2HrWFVU#0Qisu^_nmw?U=GN*603ReiNP69UMtO(#Kj36?z@$vr9(TBXbyyFhCP+;| zW?S4?*_=!9W;Q>&>zZ~I}k_5 nR1++Fh5r)h8RIh7*wFm}6&a`B<;!uP00000NkvXXu0mjf{rLD3 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemSpecialPearlShdard.png b/src/main/resources/assets/actuallyadditions/textures/items/itemSpecialPearlShdard.png new file mode 100644 index 0000000000000000000000000000000000000000..abde59bd995e034dc01e58dca7c5dce01c9f3e15 GIT binary patch literal 566 zcmV-60?GY}P)#UYPN0000ObVXQn zQ*UN;cVTj60B~VxZgehgWpp4kE-)@NWrZ?j0004@Nkl7J{S(hbMshnthW7vylM38;7}NUmBdxzYQDb~X)w8acV8SJXjCcZGQ$Dk!SA$Ec z-vv~^AF%?e4bQ~@`FNdS6lJNvct+7mw?k{EM^wJuQV)9Ueo7*s}mfsqda_6#(?6W}P0#h}1&p|wH9ofef2cLfxfYb0o7 z;2Iz}lg(2{XTV~x-4YnUyk?#cOmbM>pF88y8lbc7im>h1!5Z@WgA)+4mvBZW3*v01 zWAzn<5-#dQd@cs=XS7Bz0SKcw(dzAUDzKdvvRn@57mf*jBm^t}#zGzTOCjPAig;uT z0CsB@XP)Z_}I0000ObVXQn zQ*UN;cVTj60B~VxZgehgWpp4kE-)@NWrZ?j0004gNklKMTH*zjfiU26Qo)Hpji+-s4R@YihLAAgCNp;glIvNC>r!D8aHUraCO%4-m>l~ z3c9d3hkN$=_S*L$0NDSaCR4(^8V+q5HJVLX06ODWSs;d84;bDZz+^g%@l*t(d;J(n zMwLd?eo&VD0H7&e?8bK4g_E0Rq-suNuUfHi7C|f@3v;?uxj81J9J=nQ)WA508>&IRzfJGa! zE46mv!)o5IR(9uEy4EHEF16Pt;OvZFyc3^9AWhrlP8?L*^#ECDpGt?YoC_#Z^+lle zS_drUg37d2@<@mqd_#JGoSWSg;8~#ZR0nW``kV10Aya4p<$H(YyAgPg3087`^-a)h z0aPBGEwRI(dT@+P6W2tk3-N+iB`{~#0w@C5fuh0O(`cAk_q$J7qxa5+{_AfP;tjK7 VK0ZZdf=~be002ovPDHLkV1o3<+Oq%v literal 0 HcmV?d00001