From d07f7699264bb0ee62f2691f34d673cad6bfc584 Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 14 Jul 2020 00:27:46 +0200 Subject: [PATCH] more cape handouts --- src/main/java/assets/hbm/lang/en_US.lang | 2 +- .../textures/models/capes/CapeSweatySwiggs.png | Bin 0 -> 1294 bytes .../hbm/textures/models/capes/CapeWiki.png | Bin 0 -> 2543 bytes .../textures/models/capes/CapeZippySqrl.png | Bin 995 -> 1294 bytes src/main/java/com/hbm/lib/Library.java | 10 ++++++++++ .../render/util/RenderAccessoryUtility.java | 12 ++++++++++++ 6 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 src/main/java/assets/hbm/textures/models/capes/CapeSweatySwiggs.png create mode 100644 src/main/java/assets/hbm/textures/models/capes/CapeWiki.png diff --git a/src/main/java/assets/hbm/lang/en_US.lang b/src/main/java/assets/hbm/lang/en_US.lang index 76b873e4f..2adcf8eb5 100644 --- a/src/main/java/assets/hbm/lang/en_US.lang +++ b/src/main/java/assets/hbm/lang/en_US.lang @@ -2528,4 +2528,4 @@ tile.cheater_virus_seed.name=Unstable Euphemium Schrabide Block item.mysteryshovel.name=Brittle Spade tile.ntm_dirt.name=Dirt -item.memory.name=item.null.name +item.memory.name=item.null.name \ No newline at end of file diff --git a/src/main/java/assets/hbm/textures/models/capes/CapeSweatySwiggs.png b/src/main/java/assets/hbm/textures/models/capes/CapeSweatySwiggs.png new file mode 100644 index 0000000000000000000000000000000000000000..4d38074b9bc84e2ae1e43f7434f7d66d029ec574 GIT binary patch literal 1294 zcmV+p1@ZccP)4!wCP>unF>VQLAB&^FQ3BnINC z2c;g26%~us76WR)YJ{K%@ei~LK_jhAV_Vx;I|z2{p@-ZW^rkm!F^TMEUpAfbusfT~ z?#}*UXSY^<9~hQ>`{tL&&UY85m)QWK6_)D;fG%;EB7w))|idN4H6VrG_Pz1@C1$6*=r{l+x;2_{?F^ZxQ)&P zGV)u?mjje4{qpB-Ojj%~y{OeunJISd ze=gJp7>40HM0@GcXcX@NNR9mjdJOCIXtC0%i9Ou9{SUp}_i=6J1A4l*^ZpCTz@S@W z)^p#kHS)K{72&G96s$!-k78dOuRD-^;aRNHquBE!VYN-PL0Jv}U=GgYJAoF%nt!!w z0Q>SWthvL5`Ud8KZ|lwh8YMYE_yQjWrG`HT-2g4du02oE)4iQPZ?6_#cMm^ZzG_wq1mv>Nh~gX~DX64Ze{yKifg>oTnCyR$Tj?Atxy?S4>K{ibg}v}r zq5cLCydR)hk^_XVYzDB-jO9nRyNWEx4eO(wR|~%IdrM~k*t#eEk{?}DC+>;J-<|=IY7OS zfh7kBU)6O0`@5&X&0r3E#BxUQKxYIf{2S<`!AUoL&#!kgh-i(f>i{?zaMBn?$>;}C zBVT}<|J?d!pYOAJ*8xg5gVfp-A~`_#g4Y3N`@qd&9yn7RnO-MY$>}JiFbBWRcM`Yp zsX1snn9Kz2Rr6VZH!A;L*KmR5!a9Igo*KIffIYXjcuuWn0YM|b)=VHdK=`WW0Ors_ zaYUZF{zq{U=;SZI`$nrdv{3gStTpmwCTK4$nM@Xc92$$oFbo50wlBXoutC;rALh^k zYin!1axZQ(lv1p%t+BYcC_fGjQCSBFL!}N7R$S=-;p(V#Uk&SL-R+7igb+dqA%qY@ z2qA8f!P*d;kCd07*qoM6N<$ Eg5XhH;Q#;t literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/models/capes/CapeWiki.png b/src/main/java/assets/hbm/textures/models/capes/CapeWiki.png new file mode 100644 index 0000000000000000000000000000000000000000..ef5edd1173d633787d42ceed0c9137f3af424482 GIT binary patch literal 2543 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 Cw)?>V literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/models/capes/CapeZippySqrl.png b/src/main/java/assets/hbm/textures/models/capes/CapeZippySqrl.png index bbbaeb0b0e026df18136e7fe6a35ad1ef2149c95..4d38074b9bc84e2ae1e43f7434f7d66d029ec574 100644 GIT binary patch delta 1259 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 diff --git a/src/main/java/com/hbm/lib/Library.java b/src/main/java/com/hbm/lib/Library.java index 71495794f..fdfc3db41 100644 --- a/src/main/java/com/hbm/lib/Library.java +++ b/src/main/java/com/hbm/lib/Library.java @@ -1,9 +1,12 @@ package com.hbm.lib; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Random; +import java.util.Set; +import com.google.common.collect.Sets; import com.hbm.blocks.ModBlocks; import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids; @@ -70,6 +73,13 @@ public class Library { public static String GOD___TM = "57146e3f-16b5-4e9f-b0b8-139bec2ca2cb"; public static String ZippySqrl = "03c20435-a229-489a-a1a1-671b803f7017"; public static String Schrabby = "3a4a1944-5154-4e67-b80a-b6561e8630b7"; + public static String SweatySwiggs = "5544aa30-b305-4362-b2c1-67349bb499d5"; + public static String Drillgon = "41ebd03f-7a12-42f3-b037-0caa4d6f235b"; + + public static Set contributors = Sets.newHashSet(new String[] { + "06ab7c03-55ce-43f8-9d3c-2850e3c652de", //mustang_rudolf + "5bf069bc-5b46-4179-aafe-35c0a07dee8b", //JMF781 + }); //the old list that allowed superuser mode for the ZOMG //currently unused diff --git a/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java b/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java index 316c0a229..0004a3402 100644 --- a/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java +++ b/src/main/java/com/hbm/render/util/RenderAccessoryUtility.java @@ -26,6 +26,8 @@ public class RenderAccessoryUtility { private static ResourceLocation zippy = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeZippySqrl.png"); private static ResourceLocation test = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeTest.png"); private static ResourceLocation schrabby = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeSchrabbyAlt.png"); + private static ResourceLocation swiggs = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeSweatySwiggs.png"); + private static ResourceLocation wiki = new ResourceLocation(RefStrings.MODID + ":textures/models/capes/CapeWiki.png"); public static ResourceLocation getCloakFromPlayer(EntityPlayer player) { @@ -39,6 +41,10 @@ public class RenderAccessoryUtility { else return hbm2; } + + if(uuid.equals(Library.Drillgon)) { + return hbm; + } if(uuid.equals(Library.Dafnik)) { return dafnik; } @@ -82,6 +88,12 @@ public class RenderAccessoryUtility { if(uuid.equals(Library.Schrabby)) { return schrabby; } + if(uuid.equals(Library.SweatySwiggs)) { + return swiggs; + } + if(Library.contributors.contains(uuid)) { + return wiki; + } if(name.startsWith("Player")) { return test; }