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 000000000..4d38074b9 Binary files /dev/null and b/src/main/java/assets/hbm/textures/models/capes/CapeSweatySwiggs.png differ 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 000000000..ef5edd117 Binary files /dev/null and b/src/main/java/assets/hbm/textures/models/capes/CapeWiki.png differ 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 bbbaeb0b0..4d38074b9 100644 Binary files a/src/main/java/assets/hbm/textures/models/capes/CapeZippySqrl.png and b/src/main/java/assets/hbm/textures/models/capes/CapeZippySqrl.png differ 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; }