From 86c8bfb7113b81769eb66611a97a1eaffc927cf6 Mon Sep 17 00:00:00 2001 From: Lenny Lord <32369619+thelennylord@users.noreply.github.com> Date: Thu, 22 Oct 2020 19:31:08 +0530 Subject: [PATCH] Add support for 1.16 & other improvements --- images/slots.png | Bin 570 -> 1207 bytes index.htm | 12 +++++- js/main.js | 98 ++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 95 insertions(+), 15 deletions(-) diff --git a/images/slots.png b/images/slots.png index f356b15eea172c6d5d21c4441b549b169f9fc374..7269b8a8b18709e9c47a44b08b42b79cd4409067 100644 GIT binary patch delta 1163 zcmV;61a$kl1h)y07Ybkq1^@s66w&gaks&C5!~g&e!~vBn4jTXf1WZXpK~z{r?O4rE zTvZf5k9oBPhG{C`jIldW9}6PVs4*tG zFy&8xNJ1oT3?h)gqAeO*LXnSQpul`w@9*;NF<>loFNhAbq z+}YWw#KyqDfFcQ|3eI;hH8mBC4xa8pECc|?y}iA`jA(UrRXv>p>j8{6mli`gwY^4z zgM-1{DE^;3fXg)ld0?1yMHXc=Z*i!q5XG3ru?;M=(0CiDIGO+}@ zsE|0-5({v8ptBBAtxAu*jgJW!0@t3q^pRRXDw};#r>sj4JpRNvqM_*K!RbPPK#Tc- zVSYro^pIExu14b0#|T`fvrGSf2yG+Y^vujmFymoG)=+DzD|HrAbhYJ8{=y1Tm%jdW4eDqUS&qFgSE`T2Q)F}uhm zrZKMniGVYPo?UE<%NP<{Y)ds`NI1x5vjU>$kfV$t;Q+?6NJ5fYj3JSK35?PAaIM7{ z;>^T_g#~JBYonf?9vUAXXNyb0W;DIf;Z&1ID!=(!vv@93PZNuc)ZgDvb8~YvHZ}%t zj`rY|2;N5HWOF={DXFO_i1bU0p0rbd%83AHC_JTBi0+1;FRxEBH@$p z60~0|Q6cdRC8akUSc0aO7s&S$GEK`QDizweJ4+RL&E+~af+Zn;Vg&hof&RI-sN4ri zB|({%vufPj+@h`~SPy&|LQ`Ws?U%}O?9r}&Ug`Jt_SDq`OVE&dNk?DwZlr{Den$m)u`2tOuJLYci3FG6%})9i*F6D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv00050NklwZU+?`M*-&25TQURbOGNDz&H~bdx z7@?gWk<*WmfsMq5@n-4TrOAHq1{HWyZJroJ^k^0qATo?TCZ70`0-%*9g#n_jBFAC@ z$lVLE7zPZZAgrzqa(_eN(FG+I3qYxVq#715MzrzOLoZN{W{ZL0d=Ge5pM(l>Z)8(} zfBvwkKp{QwUiDv0z17%_+@XZ0I0;D(7Ng<1#&s)metQ~% zl=yp61>yJgbKfoQhk&l2S|a1HvV}b~x6>31^`A{@gI1VUFq?e +
Replace @@ -241,6 +249,7 @@ +
Place @@ -249,6 +258,7 @@ +
diff --git a/js/main.js b/js/main.js index 60003d7..be30165 100644 --- a/js/main.js +++ b/js/main.js @@ -54,6 +54,10 @@ var equipColorShoes; var equipColorLeggings; var equipColorChestplate; var equipColorHelmet; +var helmetList; +var chestplateList; +var leggingsList; +var bootsList; var customName; var showCustomName; @@ -178,7 +182,12 @@ $(document).ready(function(){ $(el).colpickHide(); handleInput(); } - }); + }); + + helmetList = $("#list-helmet").find("option"); + chestplateList = $("#list-chestplate").find("option"); + leggingsList = $("#list-leggings").find("option"); + bootsList = $("#list-shoes").find("option"); }); @@ -439,18 +448,45 @@ function updateUI(){ } // Show disabled slots - if(useDisabledSlots) + if(useDisabledSlots) { + // Hide offhand disabled slot buttons for versions below 1.13 + switch (mcVersion) { + case "1.13": + case "1.11": + case "1.9": + case "1.8": + $(".sprite.offhand").hide(); + $("#dO").hide(); + $("#rO").hide(); + $("#pO").hide(); + break; + + default: + $(".sprite.offhand").show(); + $("#dO").show(); + $("#rO").show(); + $("#pO").show(); + break; + + } $("#disabledslots").slideDown(); + } else $("#disabledslots").slideUp(); //Hide 1.13 features for 1.12 and lower. - if (mcVersion == "1.13") { - $("#namecustomization").show() - $("#centercorrected").show() - } else { - $("#namecustomization").hide() - $("#centercorrected").hide() + switch (mcVersion) { + case "1.11": + case "1.9": + case "1.8": + $("#namecustomization").hide(); + $("#centercorrected").hide(); + break; + + default: + $("#namecustomization").show(); + $("#centercorrected").show(); + break; } // Generate code @@ -555,6 +591,31 @@ function generateCode(){ tags.push("HandItems:["+hands.join(",")+"]"); } + + // Hide netherite armour for lower versions + switch (mcVersion) { + case "1.14": + case "1.13": + $("#list-helmet").empty().append(helmetList.filter("[value!=netherite_helmet]")); + $("#list-chestplate").empty().append(chestplateList.filter("[value!=netherite_chestplate]")); + $("#list-leggings").empty().append(leggingsList.filter("[value!=netherite_leggings]")); + $("#list-shoes").empty().append(bootsList.filter("[value!=netherite_boots]")); + break; + case "1.11": + case "1.9": + case "1.8": + $("#list-helmet").empty().append(helmetList.filter("[value!=netherite_helmet]").filter("[value!=turtle_helmet]")); + $("#list-chestplate").empty().append(chestplateList.filter("[value!=netherite_chestplate]").filter("[value!=turtle_chestplate]")); + $("#list-leggings").empty().append(leggingsList.filter("[value!=netherite_leggings]").filter("[value!=turtle_leggings]")); + $("#list-shoes").empty().append(bootsList.filter("[value!=netherite_boots]").filter("[value!=turtle_boots]")); + break; + default: + $("#list-helmet").empty().append(helmetList); + $("#list-chestplate").empty().append(chestplateList); + $("#list-leggings").empty().append(leggingsList); + $("#list-shoes").empty().append(bootsList); + break; + } } // Custom name @@ -750,26 +811,29 @@ function getNameObfuscated() { } function calculateDisabledSlotsFlag() { + var dO = $("#dO").is(":checked") ? 1 << (5) : 0; var dH = $("#dH").is(":checked") ? 1 << (4) : 0; var dC = $("#dC").is(":checked") ? 1 << (3) : 0; var dL = $("#dL").is(":checked") ? 1 << (2) : 0; var dB = $("#dB").is(":checked") ? 1 << (1) : 0; var dW = $("#dW").is(":checked") ? 1 << (0) : 0; - var dR = dH + dC + dL + dB + dW; + var dR = dO + dH + dC + dL + dB + dW; + var rO = $("#rO").is(":checked") ? 1 << (5 + 8) : 0; var rH = $("#rH").is(":checked") ? 1 << (4 + 8) : 0; var rC = $("#rC").is(":checked") ? 1 << (3 + 8) : 0; var rL = $("#rL").is(":checked") ? 1 << (2 + 8) : 0; var rB = $("#rB").is(":checked") ? 1 << (1 + 8) : 0; var rW = $("#rW").is(":checked") ? 1 << (0 + 8) : 0; - var rR = rH + rC + rL + rB + rW; + var rR = rO + rH + rC + rL + rB + rW; + var pO = $("#pO").is(":checked") ? 1 << (5 + 16) : 0; var pH = $("#pH").is(":checked") ? 1 << (4 + 16) : 0; var pC = $("#pC").is(":checked") ? 1 << (3 + 16) : 0; var pL = $("#pL").is(":checked") ? 1 << (2 + 16) : 0; var pB = $("#pB").is(":checked") ? 1 << (1 + 16) : 0; var pW = $("#pW").is(":checked") ? 1 << (0 + 16) : 0; - var pR = pH + pC + pL + pB + pW; + var pR = pO + pH + pC + pL + pB + pW; var result = dR + rR + pR; return result; @@ -943,21 +1007,24 @@ function saveData() { chestplate: $("#dC").is(":checked"), leggings: $("#dL").is(":checked"), boots: $("#dB").is(":checked"), - weapons: $("#dW").is(":checked") + weapons: $("#dW").is(":checked"), + offhand: $("#dO").is(":checked") }, replace: { helmet: $("#rH").is(":checked"), chestplate: $("#rC").is(":checked"), leggings: $("#rL").is(":checked"), boots: $("#rB").is(":checked"), - weapons: $("#rW").is(":checked") + weapons: $("#rW").is(":checked"), + offhand: $("#rO").is(":checked") }, place: { helmet: $("#pH").is(":checked"), chestplate: $("#pC").is(":checked"), leggings: $("#pL").is(":checked"), boots: $("#pB").is(":checked"), - weapons: $("#pW").is(":checked") + weapons: $("#pW").is(":checked"), + offhand: $("#pO").is(":checked") } } }; @@ -1048,18 +1115,21 @@ function loadData(data) { //lock slot interaction $("input[name=usedisabledslots]").prop(`checked`, data.lock_slot_interaction.enabled); + $(`#dO`).prop(`checked`, data.lock_slot_interaction.remove.offhand); $(`#dH`).prop(`checked`, data.lock_slot_interaction.remove.helmet); $(`#dC`).prop(`checked`, data.lock_slot_interaction.remove.chestplate); $(`#dL`).prop(`checked`, data.lock_slot_interaction.remove.leggings); $(`#dB`).prop(`checked`, data.lock_slot_interaction.remove.boots); $(`#dW`).prop(`checked`, data.lock_slot_interaction.remove.weapons); + $(`#rO`).prop(`checked`, data.lock_slot_interaction.replace.offhand); $(`#rH`).prop(`checked`, data.lock_slot_interaction.replace.helmet); $(`#rC`).prop(`checked`, data.lock_slot_interaction.replace.chestplate); $(`#rL`).prop(`checked`, data.lock_slot_interaction.replace.leggings); $(`#rB`).prop(`checked`, data.lock_slot_interaction.replace.boots); $(`#rW`).prop(`checked`, data.lock_slot_interaction.replace.weapons); + $(`#pO`).prop(`checked`, data.lock_slot_interaction.place.offhand); $(`#pH`).prop(`checked`, data.lock_slot_interaction.place.helmet); $(`#pC`).prop(`checked`, data.lock_slot_interaction.place.chestplate); $(`#pL`).prop(`checked`, data.lock_slot_interaction.place.leggings);