From 79e7401cec3e1055e7160a839c35d2ca04b3e2b3 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 30 Oct 2016 21:25:56 +0000 Subject: [PATCH] Disabled the flugel tiara secret thing --- .../equipment/bauble/ItemFlightTiara.java | 50 ++++++------------ .../botania/textures/items/flightTiara9.png | Bin 9773 -> 0 bytes .../textures/items/flightTiara9.png.mcmeta | 7 --- 3 files changed, 16 insertions(+), 41 deletions(-) delete mode 100644 src/main/resources/assets/botania/textures/items/flightTiara9.png delete mode 100644 src/main/resources/assets/botania/textures/items/flightTiara9.png.mcmeta diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 413f5cde1..856f19eae 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -86,7 +86,9 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub private static final int MAX_FLY_TIME = 1200; private static final int SUBTYPES = 8; - public static final int WING_TYPES = 9; + public static final int WING_TYPES = SUBTYPES; + + private static final String SPECIAL_AWESOME_HASH = "16E1BDFD1D6AE1A954C9C5E1B2D9099780F3E1724541F1F2F77310B769CFFBAC"; public ItemFlightTiara() { super(LibItemNames.FLIGHT_TIARA); @@ -116,43 +118,23 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub @Override public void onEquipped(ItemStack stack, EntityLivingBase player) { super.onEquipped(stack, player); - if(stack.getItemDamage() != WING_TYPES && hash(stack.getDisplayName()).equals("16E1BDFD1D6AE1A954C9C5E1B2D9099780F3E1724541F1F2F77310B769CFFBAC")) { - stack.setItemDamage(WING_TYPES); - stack.getTagCompound().removeTag("display"); - } +// if(stack.getItemDamage() != WING_TYPES && hash(stack.getDisplayName()).equals(SPECIAL_AWESOME_HASH)) { +// stack.setItemDamage(WING_TYPES); +// stack.getTagCompound().removeTag("display"); +// } XXX disabled easter egg } String hash(String str) { if(str != null) try { MessageDigest md = MessageDigest.getInstance("SHA-256"); - return new HexBinaryAdapter().marshal(md.digest(salt(str).getBytes())); + return new HexBinaryAdapter().marshal(md.digest(str.getBytes())); } catch (NoSuchAlgorithmException e) { e.printStackTrace(); } return ""; } - // Might as well be called sugar given it's not secure at all :D - String salt(String str) { - str = str + "wowsuchsaltmuchsecurityverywow"; - SecureRandom rand = new SecureRandom(str.getBytes()); - int l = str.length(); - int steps = rand.nextInt(l); - char[] chrs = str.toCharArray(); - for(int i = 0; i < steps; i++) { - int indA = rand.nextInt(l); - int indB; - do { - indB = rand.nextInt(l); - } while(indB == indA); - char c = (char) (chrs[indA] ^ chrs[indB]); - chrs[indA] = c; - } - - return String.copyValueOf(chrs); - } - @Override public void onWornTick(ItemStack stack, EntityLivingBase player) { super.onWornTick(stack, player); @@ -409,14 +391,14 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub h = 0.1F; break; } - case 9 : { // The One - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); - rz = 180F; - rx = 0F; - s = 1.5F; - h = 1.2F; - GlStateManager.color(1F, 1F, 1F, 0.5F + (flying ? (float) Math.cos((double) (player.ticksExisted + partialTicks) * 0.3F) * 0.25F + 0.25F : 0F)); - } +// case 9 : { XXX disabled easter egg +// OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); +// rz = 180F; +// rx = 0F; +// s = 1.5F; +// h = 1.2F; +// GlStateManager.color(1F, 1F, 1F, 0.5F + (flying ? (float) Math.cos((double) (player.ticksExisted + partialTicks) * 0.3F) * 0.25F + 0.25F : 0F)); +// } } // account for padding in the texture diff --git a/src/main/resources/assets/botania/textures/items/flightTiara9.png b/src/main/resources/assets/botania/textures/items/flightTiara9.png deleted file mode 100644 index 727759e5eaff8a88b26563f36a29b8ee8bf8488e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9773 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

>+D_X8g z90t~~|vfHr~o`1E?`n3av82msMyN~F&|Em#w zOi}mLJ>`{;u;n=q%!yKSXd4}x$28dY>*jtWIEDllor>BMx!wg_ZvNM_iE{=#YK2c~ zeL!@045q>6Z=+yMv$9*K(QE~8p-ej%1)8>LYpTdTBMq^Na*Y1KY zrjP8g_Z4f3v#kvB7_>1czm4*VA92+X_4H>(73F<{^y+D!!R6(IO2>cWtKYNm=k$T)B=J*A@1BZvK@GJ>*gs!Jwtv> zXXZF5J)aEMnTDJ?fp7?E1Ql^=?Z$06|BlTN5`4A?a?-C?E2&Ns<8b{|)+?r#>lyFc zvdp);fj26{;vxQxmnb&-dqxHtZ Py{ObwG?a^!Ouzge;k2uF diff --git a/src/main/resources/assets/botania/textures/items/flightTiara9.png.mcmeta b/src/main/resources/assets/botania/textures/items/flightTiara9.png.mcmeta deleted file mode 100644 index 349719fd5..000000000 --- a/src/main/resources/assets/botania/textures/items/flightTiara9.png.mcmeta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "animation":{ - "width":60, - "height":60, - "frametime":4 - } -} \ No newline at end of file