From 0e2227e76dc81c5ddf9de11a4a7ce9899cde9383 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sun, 9 Dec 2018 14:13:05 +0100 Subject: [PATCH 01/12] Updated maxIslands comment --- src/main/java/world/bentobox/bskyblock/Settings.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/world/bentobox/bskyblock/Settings.java b/src/main/java/world/bentobox/bskyblock/Settings.java index 07a86c2..3b2cb6e 100644 --- a/src/main/java/world/bentobox/bskyblock/Settings.java +++ b/src/main/java/world/bentobox/bskyblock/Settings.java @@ -97,8 +97,8 @@ public class Settings implements DataObject, WorldSettings { @ConfigEntry(path = "world.sea-height", needsReset = true) private int seaHeight = 0; - @ConfigComment("Maximum number of islands in the world. Set to -1 for unlimited.") - @ConfigComment("If the number of islands is greater than this number, no new island will be created.") + @ConfigComment("Maximum number of islands in the world. Set to -1 or 0 for unlimited.") + @ConfigComment("If the number of islands is greater than this number, it will stop players from creating islands.") @ConfigEntry(path = "world.max-islands") private int maxIslands = -1; From 8319070d6d8d88cae9485a87a1a766527fd22a04 Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 20 Dec 2018 14:08:04 -0800 Subject: [PATCH 02/12] Added locale text for start sign and adjusted schem to use it Requires lastest version of BentoBox to work https://github.com/BentoBoxWorld/bentobox/issues/372 --- pom.xml | 2 +- src/main/resources/locales/en-US.yml | 12 ++++++++++++ src/main/resources/schems/island.schem | Bin 1424 -> 1831 bytes 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100755 src/main/resources/locales/en-US.yml diff --git a/pom.xml b/pom.xml index 31a8c46..ef1958e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ world.bentobox BSkyBlock - 0.5.0-SNAPSHOT + 0.5.1-SNAPSHOT BSkyBlock BSkyBlock is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like ASkyBlock or AcidIsland. diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml new file mode 100755 index 0000000..42e0ff6 --- /dev/null +++ b/src/main/resources/locales/en-US.yml @@ -0,0 +1,12 @@ +########################################################################################### +# This is a YML file. Be careful when editing. Check your edits in a YAML checker like # +# the one at http://yaml-online-parser.appspot.com # +########################################################################################### + +bskyblock: + sign: + line0: "&cBSkyBlock" + line1: "Welcome!" + line2: "[name]" + line3: "Do not fall! &c<3" + \ No newline at end of file diff --git a/src/main/resources/schems/island.schem b/src/main/resources/schems/island.schem index a8a100c4fcc02d62eb173cfc5b304950b2916f14..acd3d3c13aa3a93c583cab11d755485f7bb75c04 100644 GIT binary patch literal 1831 zcmWIWW@Zs#-~htI1yg((kN_Kl07GVRPGVk4Xao;~k&sM`FA#ra6k*sJ7bZm-d9Et**t9Z|%R__dw4&+Lpqz<249rqFXPj9d|1|OO+>6RVTY`%VbXM-Z z`u3fFe0OS`n*NsmXFps0TgtzUf8KVV-}kb^CM-F0e$D(Tr&Ikjw7G?X+ctOU%`2QF zx|;Fel%Lsi?D->pKD%sMr_6jxYtGthXZ|1Q38~x}HL>JFPq9~>%#;=-RqKztIb-bw zd?P|zG8w0&NIkGDo z+Jhukeq(uPCdE4`f1#<~mIbDICAr4;zFHq!Xa4^WQ}=oO4L=~%uRpu$QuZthf8Q>m zlRW$H=I0Mv8ounDJda&N^|^t<-OqV9UeEo0>742d7f*dhN89V4Z#?V$viIYgm6gE{ z!v8(nrt|avGgZI)#n-+^eBJl|T$6*$7NPw|EDy@J=w0ej_nA0>@ymS=*Pr@%>9_0j zoF!Z)_5=W_kcm7B(-nC(O_V**Xy3qG&%pkVVfioSA0CnE4C_mr%0CwU_MFx(xyp;p zWUI)Dtjz3~8B2A!RgP|(xM1B@hv4kSW!IQ|*RqOj6^pnMl@OTS=!(n<+&lSci|1b9 z=V}J4${S;jUHrLrgY%0D<$8%LKCL~MYqJ83m)e=Gn8{`B_dWB)0r`c@^(}mV82yhL zH+$l{9=+-G-K-f0snkd8W#tI>RW z+S_Fpq@o&G0mk@)`I53ZuT~z)Rmq-r%2a>(Q|sv8yK9#HDfc^~`L;6h zCBv*(=TJ=MSe?z`XTR=SW|_g?er z*$?v*ZK`DA{pGTL9$5P4=i~1WYi;EG)VEf=2>SE)$@(AP3jclon^P98-4Ua;WA2?Z z%Rc^jmUSmbp+KrZ|KOZ``=-5TeZGD{;8PQ^#WzEip3Y22JN&xBZqM$Wv+D9iEO^h{ zef;+B*Q;9u@0DuS*vQ!1oSWTJAobzm-#3}Rj=OWuajUYC?#)yC%pQ0kaPg(g1MZVg zGT*-tE?PLdjlKNn=k}AA7oOmHZFe^8=prr2w8%&vt4*tBeP%7$|L=}<^ab-jkw>zF zCd#LO_5OG`Y@>k9ztuac*Ce%RFS{;T(&sKO%%@@9KdZpu<4voO;sf@%cE4oST_`uv zpZM-}!)wiyIq$4Rum8SV&Njzy;ro*Nk_A>PWwrdi|K7*DV|K{=mI}$Yw;TRzzOk6t z?j*S}+p0Cd>n-1Pqkv;~ZwZGyVb9t%H=w+j#q5N@-xVldxqn}>cJWR9O|k!rzdwlmbo}f;LyjMx*Z=yuKfs%v`eNf361uQi|7*ukCv|%r81(CJs z#bYmclM_Uf(-V>sKKS~Cec%u42xwrMAi=CIAkFyEO@ZyBys-eQjI&eI0-p(e$__gH z%UU?K&YeG?FmKNM)zc#aCQM!>J}D~j(X8on=1-bAoiDIlvV&DZVu?Ujkx;j{S9fr5 zkdSxKROTkfE+^+ZCAw>PdwqL&&g$y=^t7ZTIUK4we%Y}v9pra*4xV<|f;OQ49|LiK zHzSiMGs0WQ;l#$k1FKRT-Zp}mFrRV2s}zWST%n23|JTu+l>s?yIpAT7?gV7#2_iXR aNn;+e5r}X`b`2{V$eqkUcn(NAgLwc$CHGJO literal 1424 zcmY+EdoDUXuM4)Pi&ER~SSP|V~}2%DG*mB$Pb4q7(DWEsXI zX+1_5k7bPUT(pEp#w!U)o@;g(WZUiRS^GWroO|#2+;ji@V68>PKtMu50+_Bcv;}qr z`gQgV^tJ79LP02kLmSbb5F6k*k$7m}jzc{emTCPK*rhXA7 zBq}qmAXS5m$l5ekJ&(Uw7?9?easCxc&_?1drorzbk}4CzdaP3(Kj+$co$k6?oZ5?i zb>V_F9Squdn6F9@NIom5Z<@n3{_f^d*Hre@?xl#vyzLz2T?**Sai!MoJj7k3D5b4q z)WTLaC6$M!Y@Lwl{lqGrdsdZO9wQ)clE8Fo(X%LrDwLRI+`{Ou?;I`1H3ys0!D$k` zepu5U1y|Fz@0J|BJ)j^qVeUb{W#&Pj=Y_JTs;gYeb~Zww42Jjex3;zsJZc(dTf;+i zc0C%Tn;_;9h@*1-> zt^1f$Ra?22b=1&3f?v*cgF=V=n-@PDOcZj&Bi7}%CJDRM9_%9)^k&v4vl(xA1_S#X3 zAzf&$Ko~w9hjW7z){{}AwxHoI=vAZAEC}_ zEPZyTM&`DY=2bR*CSbaKY*xps5!Y%a4ca9_&U|8mW{(!`HRR^euj$NbzHoZCuO9 zieC@hpvV!wcb$mIuG~w$B2({sKj^AKX7ZtAOBzAoThT+abbXKRtfUYe9C6i=s5dqA zL^X2TA?I2Z@eR`Dh7V^ygMm#`jS0pY$5B1mH7&Yl7dg|I6x}Yjjv*e?g<4$wk+A3) zGN*lgZm2=cbu-AO|9Wg5u4tdm2SzQ~P-kmohH5vvpR7@NV3MPEFvp^OgG2p}dzM_- zw5BTT5oAGM%koq_LL(Ll(S4G9$&cx8IC@UGtw}n=$HBgax(JDwhfDXJMJ*pO4b9HQ z=j6fmI0~$=O`SPWR5Qy&Sxp0Z2O`>s`)dwlHVR6IE3gc5A&6)wMoM8>`=e1~K(W>^i4GeX@_umuIB^UBu+|U}5ctodyV>6!{eQk$6>Ba24}t&?K= Date: Sat, 22 Dec 2018 17:55:12 +0100 Subject: [PATCH 03/12] Updated pom --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index ef1958e..43d9a36 100644 --- a/pom.xml +++ b/pom.xml @@ -9,24 +9,24 @@ 0.5.1-SNAPSHOT BSkyBlock - BSkyBlock is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like ASkyBlock or AcidIsland. - https://github.com/BentoBoxWorld/addon-bskyblock + BSkyBlock is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like SkyBlock or AcidIsland. + https://github.com/BentoBoxWorld/BSkyBlock 2018 - scm:git:https://github.com/BentoBoxWorld/addon-bskyblock.git - scm:git:git@github.com:BentoBoxWorld/addon-bskyblock.git - https://github.com/BentoBoxWorld/addon-bskyblock + scm:git:https://github.com/BentoBoxWorld/BSkyBlock.git + scm:git:git@github.com:BentoBoxWorld/BSkyBlock.git + https://github.com/BentoBoxWorld/BSkyBlock jenkins - http://ci.codemc.org/job/BentoBoxWorld/job/addon-bskyblock + http://ci.codemc.org/job/BentoBoxWorld/job/BSkyBlock GitHub - https://github.com/BentoBoxWorld/addon-bskyblock/issues + https://github.com/BentoBoxWorld/BSkyBlock/issues From ceb1cfb358d44de130708a2a32a07cad26b7d538 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 22 Dec 2018 17:55:49 +0100 Subject: [PATCH 04/12] Version 0.6.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 43d9a36..e8b4759 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ world.bentobox BSkyBlock - 0.5.1-SNAPSHOT + 0.6.0-SNAPSHOT BSkyBlock BSkyBlock is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like SkyBlock or AcidIsland. From f8cfec332acfcb4745528a8147e5295a886313ff Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 22 Dec 2018 18:01:32 +0100 Subject: [PATCH 05/12] Updated to BentoBox 0.18.0 (Alpha 13) --- pom.xml | 4 ++-- .../java/world/bentobox/bskyblock/commands/AdminCommand.java | 3 +++ .../java/world/bentobox/bskyblock/commands/IslandCommand.java | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e8b4759..97bcda6 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ BSkyBlock BSkyBlock is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like SkyBlock or AcidIsland. https://github.com/BentoBoxWorld/BSkyBlock - 2018 + 2017 scm:git:https://github.com/BentoBoxWorld/BSkyBlock.git @@ -91,7 +91,7 @@ world.bentobox bentobox - 0.12.0-SNAPSHOT + 0.18.0 provided diff --git a/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java b/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java index be9a476..555c6aa 100644 --- a/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java +++ b/src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java @@ -14,6 +14,7 @@ import world.bentobox.bentobox.api.commands.admin.AdminTeleportCommand; import world.bentobox.bentobox.api.commands.admin.AdminUnregisterCommand; import world.bentobox.bentobox.api.commands.admin.AdminVersionCommand; import world.bentobox.bentobox.api.commands.admin.AdminWhyCommand; +import world.bentobox.bentobox.api.commands.admin.deaths.AdminDeathsCommand; import world.bentobox.bentobox.api.commands.admin.range.AdminRangeCommand; import world.bentobox.bentobox.api.commands.admin.schem.AdminSchemCommand; import world.bentobox.bentobox.api.commands.admin.team.AdminTeamAddCommand; @@ -63,6 +64,8 @@ public class AdminCommand extends CompositeCommand { new AdminDeleteCommand(this); // Why new AdminWhyCommand(this); + + new AdminDeathsCommand(this); } @Override diff --git a/src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java b/src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java index b16e1d0..8944965 100644 --- a/src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java +++ b/src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java @@ -8,6 +8,7 @@ import world.bentobox.bentobox.api.commands.island.IslandBanCommand; import world.bentobox.bentobox.api.commands.island.IslandBanlistCommand; import world.bentobox.bentobox.api.commands.island.IslandCreateCommand; import world.bentobox.bentobox.api.commands.island.IslandGoCommand; +import world.bentobox.bentobox.api.commands.island.IslandInfoCommand; import world.bentobox.bentobox.api.commands.island.IslandLanguageCommand; import world.bentobox.bentobox.api.commands.island.IslandResetCommand; import world.bentobox.bentobox.api.commands.island.IslandResetnameCommand; @@ -38,6 +39,7 @@ public class IslandCommand extends CompositeCommand { setWorld(((BSkyBlock)getAddon()).getIslandWorld()); // Set up subcommands new IslandAboutCommand(this); + new IslandInfoCommand(this); new IslandCreateCommand(this); new IslandGoCommand(this); new IslandResetCommand(this); From 3415c77706f23f9925bedf4d7ef4c58eb019ca5e Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 22 Dec 2018 18:04:49 +0100 Subject: [PATCH 06/12] Updated to Spigot 1.13.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 97bcda6..d9830dd 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ org.spigotmc spigot-api - 1.13-R0.1-SNAPSHOT + 1.13.2-R0.1-SNAPSHOT provided From d8c0400e3cd515a2ff224eab6adbb9efa373d96d Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 22 Dec 2018 18:10:09 +0100 Subject: [PATCH 07/12] Version 0.6.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d9830dd..66fe740 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ world.bentobox BSkyBlock - 0.6.0-SNAPSHOT + 0.6.0 BSkyBlock BSkyBlock is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like SkyBlock or AcidIsland. From f9121edbe237f04690e62a72b2dfb5986f9535ca Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 22 Dec 2018 18:12:42 +0100 Subject: [PATCH 08/12] Version 0.6.1-SNAPSHOT (develop) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 66fe740..f0cc5c1 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ world.bentobox BSkyBlock - 0.6.0 + 0.6.1-SNAPSHOT BSkyBlock BSkyBlock is an add-on for BentoBox, an expandable Minecraft Bukkit plugin for island-type games like SkyBlock or AcidIsland. From 51b6860fffe24a5c4da162335db992adfc5d0685 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 22 Dec 2018 20:27:11 +0100 Subject: [PATCH 09/12] That should fix the builds failing on the CI --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f0cc5c1..e0bc24e 100644 --- a/pom.xml +++ b/pom.xml @@ -53,8 +53,8 @@ https://hub.spigotmc.org/nexus/content/repositories/snapshots - codemc - https://repo.codemc.org/repository/maven-snapshots/ + codemc-repo + https://repo.codemc.org/repository/maven-public/ From 926e2cfcfb3ba9e85424e6c256d364d12a6320a3 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 22 Dec 2018 20:30:26 +0100 Subject: [PATCH 10/12] Trying again to get the CI working --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e0bc24e..8dd0195 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ codemc-repo - https://repo.codemc.org/repository/maven-public/ + https://repo.codemc.org/repository/maven-public From 9ac2acf990666aec8ca96af05a9d8708355fa697 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 22 Dec 2018 20:34:23 +0100 Subject: [PATCH 11/12] Trying again... It seems we need to use the 0.18.0-SNAPSHOT, because Jenkins didn't build 0.18.0 and switched to 0.19.0-SNAPSHOT instead.... --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8dd0195..c7c9040 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ world.bentobox bentobox - 0.18.0 + 0.18.0-SNAPSHOT provided From ab1d4744e5fcaad770c528e3bad455d3d63dd152 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 22 Dec 2018 20:40:20 +0100 Subject: [PATCH 12/12] Updated Readme --- README.md | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index f9007c2..bbf62fd 100755 --- a/README.md +++ b/README.md @@ -1,13 +1,6 @@ BSkyBlock ========== - -[![Build Status](https://travis-ci.org/tastybento/bskyblock.svg?branch=master)](https://travis-ci.org/tastybento/bskyblock) -![Lines Of Code](https://sonarcloud.io/api/project_badges/measure?project=us.tastybento%3Abskyblock&metric=ncloc) -![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=us.tastybento%3Abskyblock&metric=sqale_rating) -![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=us.tastybento%3Abskyblock&metric=reliability_rating) -![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=us.tastybento%3Abskyblock&metric=security_rating) -![Bugs](https://sonarcloud.io/api/project_badges/measure?project=us.tastybento%3Abskyblock&metric=bugs) - +[![Build Status](https://ci.codemc.org/buildStatus/icon?job=BentoBoxWorld/BSkyBlock)](https://ci.codemc.org/job/BentoBoxWorld/job/BSkyBlock/) This is a survival game where the player starts with an island in the sky. @@ -28,4 +21,4 @@ You can find the projects on GitHub. Bugs and Feature requests ========================= -File bug and feature requests here: https://github.com/BentoBoxWorld/addon-bskyblock/issues +File bug and feature requests here: https://github.com/BentoBoxWorld/BSkyBlock/issues