From 6833fb011ae56f10c3a55e30f35a6a7a9962093f Mon Sep 17 00:00:00 2001 From: tastybento Date: Tue, 30 Jun 2020 16:14:07 -0700 Subject: [PATCH] Enable backwards compatibility with 1.15.2 --- .../world/bentobox/bskyblock/Settings.java | 4 +++- .../resources/blueprints/nether-island.blu | Bin 2707 -> 2771 bytes src/main/resources/config.yml | 3 --- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/world/bentobox/bskyblock/Settings.java b/src/main/java/world/bentobox/bskyblock/Settings.java index 133d38f..ecbbe7e 100644 --- a/src/main/java/world/bentobox/bskyblock/Settings.java +++ b/src/main/java/world/bentobox/bskyblock/Settings.java @@ -12,6 +12,8 @@ import org.bukkit.block.Biome; import org.bukkit.entity.EntityType; +import com.google.common.base.Enums; + import world.bentobox.bentobox.api.configuration.ConfigComment; import world.bentobox.bentobox.api.configuration.ConfigEntry; import world.bentobox.bentobox.api.configuration.StoreAt; @@ -148,7 +150,7 @@ public class Settings implements WorldSettings { private Biome defaultBiome = Biome.PLAINS; @ConfigComment("The default biome for the nether world (this may affect what mobs can spawn)") @ConfigEntry(path = "world.default-nether-biome") - private Biome defaultNetherBiome = Biome.NETHER_WASTES; + private Biome defaultNetherBiome = Enums.getIfPresent(Biome.class, "NETHER").or(Enums.getIfPresent(Biome.class, "NETHER_WASTES").or(Biome.BADLANDS)); @ConfigComment("The default biome for the end world (this may affect what mobs can spawn)") @ConfigEntry(path = "world.default-end-biome") private Biome defaultEndBiome = Biome.THE_END; diff --git a/src/main/resources/blueprints/nether-island.blu b/src/main/resources/blueprints/nether-island.blu index f66d7f22f83e97b8171e9d7649b3a57eadf18ae8..2df9b66cc2e81462cd84441323fffb9711f1d048 100644 GIT binary patch delta 2726 zcmV;X3R(4&71I?CP)h>@6aWYa2mm%lA5W1EAAf64+ej4sE6AT+WRG8yNcj-JOA!#N zgzjoLi!4J-ut;pyF;H6Z-`9`eIM|-Yy@5&4$pF2g9eN&MTiAN%*-Dx62tBu@P_jH7|3KKp5qEaLe*m-34$?}@U$<3Xz#t=Eo zm8t|$8m3_pO6AmWvY$?FVERi*UmkMF4u8&u|F{LD^22YYRn4sJX8&BAADmR}NZHPQ z6SvD;uV`kzW!KeAFPa(6;J%$4d)uDZ5$0`eZd;=umo~GRoVsW3<;AFKX>S+nrlmVN za>wVxs%4Q8ZMJKAr*ADCw(r7X3*#LYxh=C2DQak4AZw{8ufkSo90lHW66VO)x_`$C9Osk$=T16CGb^x)^z4CS*w@n?bJu^jxwK!O&OdKqDC_&+* zQ#|PuK{`c{P7$QjU6L++kvMqL9R%qPf^-K#x`QX(7GsVL1>ah2G2+-z@P94U-X(p~ zHEY3{x5SudLxIy3$gQ&ml^y|_aGFeMnlg?3Fj-A+{hKhF51xZns^0mF+rf35rtwl; z-T4o}V3j6*IKNBV)>0d;MQQ#3*P=4*%(Vg6iol_|7?d|hKn(0`_&@;!wJPYR7xuwi!Bzm)RJ*=2pHTvcYl!hccvmfcg8rT=3T_{sH)TWto| z#ixapqp~H{G&Ofw|BU3HCBc7>VG_)~Wgi8}*pKF!AF7sq*Z(zN8wq{-<)T-vQH5*s z3b)h1x_m7_4c4H{8VsVD_YfzkzwmAoe;G`Jmtc@4kAb?TFYs6CRe#ecv$|T17Tj{I zG9{J@bv?_lc;a!5uHwh^uEi=-Q9c1t_U+xf(K$rt8g!R=QbeA0tJ`Th9}=tcF`C#r zx`6Wjr^P7p0_w1eyMVTg>SFnaNgR3Ce%9aSm)|1oOaid<_o5fekQ*~SOb#)WoER)$Y_2KeD~O>{3A za-p5!Z}3e0=8O2bKsR7a&ECVD3dSt7^7){gu(vczhIH95YdEPmdt&YyarVUAF>uU< zjrUBUJC4iHh77qOgmYP@?83n=MPuYk-U3V#bI8LEyCRj%aLC9d&$ z02WY^91Tj21|>(slLNUR0SWB^`J_Nzs2DFxf4=m+;=2Y=jubJBeA~GH#o80rS-n`RZc%&J+JB zSTsSHL`AyvZLB6n(sr;Kf*lROPEX8V2WD403+Kb*^PzY6{h+qJU>f8zw-=l$Ddyec zHnTVN=fOZXRpv5R`TOHT_kvH^e{&x-Yww72m=1$6g@5jbF}3c7F>|{PX31vURYNiF zpzXcBG?7Fswfd#z-3HN3P%iitD|=nKi?8^>1Ar{B=HIpW7w+7;{MS}IB?u_50PY5O zbA-OG6bE(@a5td4VN9WzakAH*w(bEN5PK!K>CONXS{^&%ZmxFCUDi@^@okCPFcrDG zvE49{!GBUS#SNZW1zjn!*U36S0yCGENDYV>hFGMXP6@Jt${R3u+a>E{7Tzj9`?*!Q z+})|>v}*&DTv4*cB4q(3XNVi1+*EdbSpvwhpyXIkax5r07L**b0s>~j+%5WU82h=Y z_w{W;B{ZQDnotQ%sDvh7LiYLU2CD{?RRhYZ0e@xHfU;^pStU?%2$UQGC5J%CAy9I3 z;C)JmMp{m{tE1}>prni&prnix8Y+c`N}-`T&`=$jP}`0!h(_Cqm0yb5U`57uU09L9 zXv;(Qq9k`><$1OdJlhDKZ3NHuPIzYD23x@vLL>_zk|icmqa(Et0$B)wEQCN7Mj#U* zkbj8~$OH;xA_OuK0+|SbOpHJVLLdVnkO36PKnP?Y1Tqi;85n^GLLh<=hyVp52!RMf zAc7ExUu_@EO}-8P8hP&Vaew}W zzliyx44&5y`r0_#@d@dJfN8ZWk_~No|-z?1InW|?o zsXHj+$J2Cpc5!%Ga$%v3jol-!Gh(Y$7GIEmoSlp=z2WG{n_Rl?S!ot8FrF@Jt@*Jfb5Hu9SjAiGNd^wdK~0^;Yqh}gYB@~I1m zf8h~iNB*#fKJ?#QKsru;_JC3@0A>MfhO!oRD68Wn$EU2}G{*-}P9L~0H}0H%P%-=t zH4}V=bM4k5_yXq*qDV@YJ{Y%wNge&ND;VIoiOzi-zx5cN&V3rcJvr{-hJS9D-2NpM zi;{tpI`rqjNU_C8=~%50d_27s2RZ8{`0#Wq4ss|B6DQyVmEcqNZ7{&OGI>&ZFiv_% zN&wf7Jd+g0B!w|aVN6mOlN83J1Ea)&QR2WTagezI4v@*`X2Wu`VRG9rN^BS<7A!~$ z7Ni9WvK&Eik4SXyesEu2+<(0nK*jo^E+}x<1R1dWo{0v}RfFfM!E@DikgN3eP)~@Z zcMq8M!2I-t=y~UkLSm#sF?NAu!gJn0>=y-!A5r`3q*(c^{$@&bPEGreQ);^1eoW1J z%S-T-nueW+79AV+#Ek6BU2?gK`({wd)iT-TD*pS5>pMBQ=TG0rIe!^fi`&ET`Ng@6aWYa2mtq3+fb1XAAf02Gd zOSoD2(Ogj#KTZAHWiVIzv)Sy6ZXRpu7h+^Td&k& zV}JkN+k}f~mc*%_hH*5|)Mq~pl2yD|1oOe2zuE-Xnfd&pQ3l&&_LbS@!GDgt%zyD+ z_3!%iTHSZ8YjVD+knhw_(iXRN;g)1SO_tX*PHvY^C(!E`QT$aaqov#k#DFnl>++esf3e)#Z45rM+JT zyDQ!CnLGJD++JCDrp+|!7PIUNdaB&3q$rQPO&UjmcawxU^0m&#HUk*cVL`K>xA(!^ zYcZksz=7AGvVqs2HXO>#c^z*yFPx02tZxb@i^9pGaI&ZvS!^hiCRS}Z@SGiZ&VLR( zX9u6N4KEQJPL~a*%Yu8g#JsZTGVvx1F~++)1Ov{1ametc%heDo*ET4@l1AX95qPl@ zI9UWvmX0M$7bA;RCOW>-bTRV8OvsX0jaBj<)&P31nPBQ5W&)~2%>-15nhDu5u0atB zFsDJ?Vk=94u2N4i-F=pm5SDo^*;Jogzr5 z2-4{xNtbRU4xV%eLArw=-9eD<;7PZ|m}5i1w^mz>I5re~OSKP4pLESyaON#B=Gjo- zbOmzjtU;wmfF_(KQ<|nsV?RtbvpfGbj246EV3Vp#e|0ywiPJP*tDB|&5Pu9dY2t^A zW!kn(*l;aM^9Q&VmFZxv4Y*bW4%Nk=yg345U}wVz3LvPpg?@Tr?_9GBJ71X(5=B*R zlfX|OlVDnX(*LQHU(T=Ui^{4p4_5w*(zooMs;vG0#(|&QytvzSZoBxjuyR&jNi|K) zUDiJ%`DaP+?_-z*^WU?Nf`4SV z8kAXsK{WRs;w1G~-d*CagIVwr4ASH=P%HWZf0JG}jWVmN)o8&j$0}1|sZgs~hQ$+) zYjhJorpp$qOhx$wMA^5?ccXKN&Nb*E^Q4G8>sI&EbUq|j=VLUn4}a8v^8TmAD6#={ zSj9DvAb#_$_?F-7-1+IJc-< zgbD9DKu~=Pm7b>TpvbjW6EQKYXfxonaiQIkmEjYf0e<*g6WvROTxe(bJ3Ldr#VUR- z&OTc~W~oPJ2K~dq75eKtg*!J}HnFD#pv&U#xwv_^ttzBY%d<5YyGAV)$X+02(+4 zST_!k9tT)A4v-fI$cqh((+0*_E^Lv!c@P#bzS)HH(2trhWDX2QIgFmDFTn}PKv z&{ecOC{$ntnnT-~I6qttRz7BOkeCIUaoe;Dn6Hk=R~O57k@!!+stLj*D$=FzV>L07 z_Jh?B>}UXXdVga6IxvUYS@=FY|336i|2U~_FPH}T%nzeVtIZTJam_m2Mm|Azkn7Q2q^JF*fs-c*7(Dq(mnn)s+TD_@x zcR_R;lnZ{v%3hc5;wyge03Zvj`FAb;g*&${|FsoQ34a307Qo#AZ;sHbN^xL~fV%ArL_bL=XZIj6ga+_3_G9VG%=N5(lts;7qc+%N|6jF)n!m&@ zjGlrhjgyyr7hTKDg`56A(b3Uh&_9Zk#eeb5|T9!C*H~A;`E#Mn>#*r_uP=e57F_tT#nAXi}Cs8Ro%W>n8!0!&th74P{xm^>3?)| zdHSv7!a^IHxMyBx#8#;+z94@aU5u~1;rPs(Ub*h5G>aGV?Y)HF*UQP&tyib=+Gw=Q zTdN-?&1TLX^3)*4FYek5Y}ZD9aRTIU34oq@=tw~PoEH(hH%LBp0r4+9g6zm2_Rxp^ ziwj7{>CYZe$_2nIfZb5m!VYD1oPXr_lr@~@_yEf31NXhXozo90hCiTYf^R3T-C6|S zO}s-CN$JuD<90BqqhIzG1~_h_b05cVJ%*=qpT=)bj(fPF8z#4ZNyVaM;G_=yIWSUe zF;Y5KD+C`;Z^c2*dI>%}-HL-8O2fnnI6)=&)O{NaaIQ?Alpc(e9+DD3`+t#VlERpz zFeWLCNeW|~hGWpzWSZ+2 ziSFGG?#qk2_X4O`U(^K!?wTM2mfthc;JIq>Ts3&E+5vKv-X7`+vGnc%(;k?go)A6n z+)+r3R4B$SkW6^a8;Jd)K!5QgYJXl7E1%oHZ?Zk7rhUjMHQjDMre?k6C3s3r!_GsC zj*WX_Mt0^dxm?A4GpOWhne1{E|9!>vot)hBr*Gt3Oty>L!^!u{NxAAz&~}SI{NuTQ zxd+;km=4d*M(&}O^-nKPFNfZVI~-3-llX0p{T;E_;*U7}Hw}MOjYIOK{MFD^;C~zO9u!M$Y+ZO3IG6rYXAUHO928D02BZS2nYc8Sldt$$Y+ZO T3IG6rYm=M`F$O{k00000jR_AU diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 0236402..e41a4a2 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -90,8 +90,6 @@ world: default-game-mode: SURVIVAL # The default biome for the overworld default-biome: PLAINS - # The default biome for the nether world (this may affect what mobs can spawn) - default-nether-biome: NETHER_WASTES # The default biome for the end world (this may affect what mobs can spawn) default-end-biome: THE_END # The maximum number of players a player can ban at any one time in this game mode. @@ -127,7 +125,6 @@ world: remove-mobs-whitelist: - ZOMBIE_VILLAGER - ENDERMAN - - ZOMBIFIED_PIGLIN - WITHER # World flags. These are boolean settings for various flags for this world flags: