diff --git a/README.md b/README.md index 8553262..763743a 100644 --- a/README.md +++ b/README.md @@ -23,24 +23,13 @@ Once the recode is done the master branch will be releases and the dev branch wi [Bukkit Page](http://dev.bukkit.org/bukkit-plugins/advanced-portals/) # Supported Platforms + * Spigot/Craftbukkit (planned for release of recode) - * Forge (planned) + * Forge (possibly, tho not priority) # API -Still needs major work on the documentation however javadocs will be made available on my website on release. +I need to finish documenting the api though also May be out of date but I will keep whatever javadocs there are updated every now and then here http://www.sekwah.com/javadocs/advancedportals/ -# Usage Data - -![Global Plugin Stats](http://i.mcstats.org/AdvancedPortals/Global+Statistics.borderless.png) - -The api isn't implemented in this version, sorry for any inconvenience. Check the recode tree for possibly a working recode at some point. - -To get the needed bukkit versions download the spigot buildtools and run the appropriate commands for the versions listed in the pom file. -e.g. "java -jar BuildTools.jar --rev 1.10.2" (Enter this into git bash) - -Use the versions to test code before you turn it into reflection or suggest it to be turned into reflection. - -You should never use direct craftbukkit references in public builds as it would only work in one spigot version diff --git a/build.gradle b/build.gradle index fc903a4..2f5c3d0 100644 --- a/build.gradle +++ b/build.gradle @@ -39,14 +39,12 @@ dependencies { compile group: 'com.google.code.gson', name: 'gson', version:'2.8.2' includeLibs group: 'com.google.inject', name: 'guice', version:'4.0' compile group: 'com.google.inject', name: 'guice', version:'4.0' - compile "org.bukkit:bukkit:1.13-R0.1-SNAPSHOT" - minecraft "com.mojang:minecraft:19w03c" - mappings "net.fabricmc:yarn:19w03c.6" - modCompile "net.fabricmc:fabric-loader:0.3.3.101" + // For spigot api + implementation "org.bukkit:bukkit:1.16.1-R0.1-SNAPSHOT" - // Fabric API. This is technically optional, but you probably want it anyway. - modCompile "net.fabricmc:fabric:0.1.4.78" + // For bukkit api + implementation "net.md-5:bungeecord-api:1.15-SNAPSHOT" } jar { diff --git a/src/main/resources/lang/en_GB.lang b/src/main/resources/lang/en_GB.lang index 7950931..033e520 100644 --- a/src/main/resources/lang/en_GB.lang +++ b/src/main/resources/lang/en_GB.lang @@ -1,63 +1,43 @@ -# Same as default minecraft lang files but can handle comments if a # is -the first character -# Anything not set in translations will be defaulted back to the en_GB -file. -# The default en_GB will always be loaded before any other file, even if -you make a new en_GB so that new strings +# Same as default minecraft lang files but can handle comments if a # is the first character +# Anything not set in translations will be defaulted back to the en_GB file. +# The default en_GB will always be loaded before any other file, even if you make a new en_GB so that new strings # do not have blank values possibly making new features unusable. # -# The format of included strings is %(number of argument)$s (starts at -1 not 0) -# So the order of variables being inserted into the string is not a set -order. Just like minecraft +# The format of included strings is %(number of argument)$s (starts at 1 not 0) +# So the order of variables being inserted into the string is not a set order. Just like minecraft # -# For colors use \u00A7 or § (can be entered by holding alt and pressing -2 then 1 on the numpad) +# For colors use \u00A7 or § (can be entered by holding alt and pressing 2 then 1 on the numpad) # http://minecraft.gamepedia.com/Formatting_codes # -# Also note that some debug messages may not be listed here for -translation. +# Also note that some debug messages may not be listed here for translation. # translatedata.lastchange=1.0.0 -translatedata.translationsoutdated= Some of the translations from the -current translation file \u00A7e%1$s\u00A7c are out of date. -translatedata.replacecommand= Use \u00A7e/portal transupdate\u00A7c to -copy out a new default \u00A7een_GB\u00A7c file. -translatedata.replaced= A new \u00A7een_GB\u00A7a file has been copied -to the data folder. +translatedata.translationsoutdated= Some of the translations from the current translation file \u00A7e%1$s\u00A7c are out of date. +translatedata.replacecommand= Use \u00A7e/portal transupdate\u00A7c to copy out a new default \u00A7een_GB\u00A7c file. +translatedata.replaced= A new \u00A7een_GB\u00A7a file has been copied to the data folder. messageprefix.positive=\u00A7a[\u00A7eAdvancedPortals\u00A7a] messageprefix.negative=\u00A7c[\u00A77AdvancedPortals\u00A7c] logger.pluginenable=Advanced portals have been enabled! logger.plugindisable=Advanced portals are being disabled! -logger.plugincrafterror=This version of craftbukkit is not yet supported -or something went wrong, please post this message with the version -number and the above stacktrace in an issue on GitHub v:%1$s +logger.plugincrafterror=This version of craftbukkit is not yet supported or something went wrong, please post this message with the version number and the above stacktrace in an issue on GitHub v:%1$s -command.noargs= Sorry but you need to specify a sub command, please use -\u00A7e/%1$s help \u00A7cif you would like a list of possible sub -commands. +command.noargs= Sorry but you need to specify a sub command, please use \u00A7e/%1$s help \u00A7cif you would like a list of possible subcommands. command.subcommand.invalid= Sorry but that is not a valid sub command. -command.help.header=\u00A7e--------------- \u00A7a%1$s Help - Page %2$s -of %3$s\u00A7e --------------- -command.help.subcommandheader=\u00A7e--------- \u00A7a%1$s Help - -%2$s\u00A7e --------- -command.help.invalidhelp= Sorry but \u00A7e%1$s\u00A7c is not a valid -page number or sub command. +command.help.header=\u00A7e--------------- \u00A7a%1$s Help - Page %2$s of %3$s\u00A7e --------------- +command.help.subcommandheader=\u00A7e--------- \u00A7a%1$s Help - %2$s\u00A7e --------- +command.help.invalidhelp= Sorry but \u00A7e%1$s\u00A7c is not a valid page number or sub command. command.reload.help=Reloads portal data -command.reload.detailedhelp=Reloads all portal data from files in the -data folder +command.reload.detailedhelp=Reloads all portal data from files in the data folder command.reload.reloaded= All Advanced Portals data reloaded command.create.help=Creates portals command.create.error= There was an error making the portal: command.create.console= You cannot create a portal using the console. -command.create.detailedhelp=Format is /portal create (name) -[tag:tagvalue] List tags after create in the format tag:value, if your -value needs spaces use the format tag:"value with spaces" +command.create.detailedhelp=Format is /portal create (name) [tag:tagvalue] List tags after create in the format tag:value, if your value needs spaces use the format tag:"value with spaces" command.create.complete= The portal has been successfully created. command.createdesti.help=Creates destinations @@ -70,33 +50,26 @@ command.create.tags=\u00A7aTags: command.playeronly= Sorry but that command can only be run by a player. -command.remove.noname= You need to give the name of the portal you want -to remove. +command.remove.noname= You need to give the name of the portal you want to remove. command.remove.error= Removing the portal was blocked: command.remove.noname=No portal by that name was found -command.remove.invalidselection=The portal selection you had is no -longer valid +command.remove.invalidselection=The portal selection you had is no longer valid command.remove.noselection=You don't have a portal selected command.remove.complete= The portal has been successfully removed. command.selector= You have been given a portal selector. command.selector.help=Gives you a portal region selector -command.selector.detailedhelp=Gives you a portal selector to select the -regions for making portals. +command.selector.detailedhelp=Gives you a portal selector to select the regions for making portals. command.portalblock= You have been given a \u00A7ePortal Block\u00A7a! -command.endportalblock= You have been given a \u00A78End Portal Block -Placer\u00A7a! +command.endportalblock= You have been given a \u00A78End Portal Block Placer\u00A7a! -command.gatewayblock= You have been given a \u00A78Gateway Block -Placer\u00A7a! +command.gatewayblock= You have been given a \u00A78Gateway Block Placer\u00A7a! -portal.error.invalidselection=You must have both pos1 and pos2 selected -to create a portal. +portal.error.invalidselection=You must have both pos1 and pos2 selected to create a portal. portal.error.takenname=The name given for the portal is already taken. -portal.error.selection.differentworlds=Both the selected points need to -be in the same world. +portal.error.selection.differentworlds=Both the selected points need to be in the same world. desti.info.noargs=\u00A7cNo tags were given @@ -106,14 +79,11 @@ desti.error.takenname=The name given for the portal is already taken. error.notplayer=Only players can do that. -portal.selector.poschange=\u00A7eYou have selected pos%1$s X:%2$s Y:%3$s -Z:%4$s +portal.selector.poschange=\u00A7eYou have selected pos%1$s X:%2$s Y:%3$s Z:%4$s command.trans.help=Copy translation new default translation file command.version.help=Returns the current version of the plugin -command.subcommand.nopermission= Sorry but you don't have permission for -that, please use \u00A7e/%1$s help \u00A7cif you would like a list of -possible sub commands. +command.subcommand.nopermission= Sorry but you don't have permission for that, please use \u00A7e/%1$s help \u00A7cif you would like a list of possible sub commands.