Stores whole image in the images folder and adds moderation commands #40

ghost · 2017-11-23T11:58:59Z

This pull req adds a few commands and removes a few unnecessary imports. Nothing too major; The new commands have permissions imageonmap.command.other, and simply allows administrative action. It's possible that merging could close Issue #30.

Update:
Config.yml is read now, and has lots of variables.
PluginConfiguration can init, which may or may not be necessary.
Full image saving works, so Issue #36 can close. The format for naming is "_<start MAPID>-<end MAPID>.png"

Closes #30
Closes #36

Added Delete/Get/List other commands, where the user can modify the maps of others. These commands require permissons imageonmap.list.other, imagonmap.delete.other, and imageonmap.get.other.

Closes Issue #36

AmauryCarrade

Hi! Thanks for the pull request.

I don't precisely understand—why did you do that to the plugin configuration loader? The class was intended to work that way, using zLib to read it and make the configuration available. And if you want anyway to parse config.yml, you should use a YAML parser (one is even included right into Bukkit), not a line-per-line manual parsing.

I cannot accept this PR as-is, sorry. Rollback your changes regarding the configuration, at least, as it's fully working right now.

On another side, your indentation is a bit weird. Is that normal?

On another side (we've got plenty of sides), you should make one PR per subject instead of a global one for everything :) .

AmauryCarrade · 2018-01-24T00:17:56Z

src/main/java/fr/moribus/imageonmap/ImageOnMap.java

@@ -69,6 +63,11 @@ public File getImageFile(short mapID)
        return new File(imagesDirectory, "map"+mapID+".png");
    }

+    public File getFullImageFile(short mapIDstart, short mapIDend)


This should go into the image.ImageMap class (and without parameters, using its attributes).

AmauryCarrade · 2018-01-24T00:18:25Z

src/main/java/fr/moribus/imageonmap/ImageOnMap.java

        saveDefaultConfig();

        loadComponents(I18n.class, Gui.class, Commands.class, PluginConfiguration.class, ImageIOExecutor.class, ImageRendererExecutor.class);

+        PluginConfiguration.initialize();


To be removed (the configuration is working right now).

AmauryCarrade · 2018-01-24T00:18:41Z

src/main/java/fr/moribus/imageonmap/ImageOnMap.java

        //Init all the things !
        MetricsLite.startMetrics();
-        I18n.setPrimaryLocale(PluginConfiguration.LANG.get());
+        I18n.setPrimaryLocale(PluginConfiguration.LANG);


To be rollbacked (the configuration is working right now).

AmauryCarrade · 2018-01-24T00:18:47Z

src/main/java/fr/moribus/imageonmap/MetricsLite.java

@@ -57,7 +57,7 @@
     */
    static public void startMetrics()
    {
-        if(!PluginConfiguration.COLLECT_DATA.get()) return;
+        if(!PluginConfiguration.COLLECT_DATA) return;


To be rollbacked (the configuration is working right now).

AmauryCarrade · 2018-01-24T00:19:08Z

src/main/java/fr/moribus/imageonmap/ImageOnMap.java

-import fr.moribus.imageonmap.commands.maptool.ListCommand;
-import fr.moribus.imageonmap.commands.maptool.MigrateCommand;
-import fr.moribus.imageonmap.commands.maptool.NewCommand;
+import fr.moribus.imageonmap.commands.maptool.*;


Avoid star imports please :)

AmauryCarrade · 2018-01-24T00:23:58Z

src/main/java/fr/moribus/imageonmap/commands/maptool/DeleteOtherCommand.java

+
+@CommandInfo (name =  "deleteother", usageParameters = "<player name> <map name>")
+@WithFlags ({"confirm"})
+public class DeleteOtherCommand extends IoMCommand


The same command should be used, instead of another set for moderators. This being said, it poses the problem regarding multi-words map names.

If we did make delete work for other players, shouldn't we also concatenate all of the commands to one? I feel it makes a little more sense as it is, and you're right- multi-word map names would pretty easily break it. (Especially if they had a playername in one)

AmauryCarrade · 2018-01-24T00:24:45Z

src/main/java/fr/moribus/imageonmap/gui/MapListGui.java

-        int mapGlobalLimit = PluginConfiguration.MAP_GLOBAL_LIMIT.get();
-        int mapPersonalLimit = PluginConfiguration.MAP_PLAYER_LIMIT.get();
+        int mapGlobalLimit = PluginConfiguration.MAP_GLOBAL_LIMIT;
+        int mapPersonalLimit = PluginConfiguration.MAP_PLAYER_LIMIT;


To be rollbacked (the configuration is working right now).

AmauryCarrade · 2018-01-24T00:25:31Z

src/main/java/fr/moribus/imageonmap/map/PlayerMapStore.java

@@ -154,7 +155,7 @@ public void checkMapLimit(ImageMap map) throws MapManagerException

    public void checkMapLimit(int newMapsCount) throws MapManagerException
    {
-        int limit = PluginConfiguration.MAP_PLAYER_LIMIT.get();
+        int limit = PluginConfiguration.MAP_PLAYER_LIMIT;


To be rollbacked (the configuration is working right now).

AmauryCarrade · 2018-01-24T00:26:10Z

src/main/resources/help/maptool.txt

@@ -3,6 +3,7 @@ new: Creates a new ImageOnMap
 delete: Deletes a map.
 delete-noconfirm: Deletes a map. Deletion is permanent and made without confirmation
 get: Gives you a map.
+getother: Opens another's MapTool GUI


The description is wrong, this does not open a GUI.

AmauryCarrade · 2018-01-24T00:26:42Z

src/main/resources/help/maptool/getother.txt

+- get copies of maps you rendered;
+- get parts of posters in case of need;
+- delete or rename your maps (organization!);
+- see their statistics (maps rendered, left...).


Same as before: the description is wrong.

ghost · 2018-03-18T23:30:51Z

After a forever lol, I'm gonna start working on this. Sorry about all of the configuration trash- I was having lots of difficulty with it XD. I'm hoping to get the changes fixed by the end of the week, if someone hasn't already done them.

AmauryCarrade · 2018-03-19T01:16:10Z

While you're at it, prefer to open two separate pull requests, one for the images storage, and the other for the moderation commands & tools. Thanks!

ghost · 2018-03-19T13:44:49Z

Gotcha. I’ll make sure to do that! On Sunday, March 18, 2018, 9:16 PM, Amaury Carrade <notifications@github.com> wrote: While you're at it, prefer to open two separate pull requests, one for the images storage, and the other for the moderation commands & tools. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub, or mute the thread.

Pr/2

ghost · 2018-03-25T00:44:02Z

Closing for the next two pull requests: ImageRenderExecutor's save-full-image and limit-size-x/y, and the administrative commands.

kirbykirby56 added 3 commits November 23, 2017 03:06

Added three commands

1a3ee23

Added Delete/Get/List other commands, where the user can modify the maps of others. These commands require permissons imageonmap.list.other, imagonmap.delete.other, and imageonmap.get.other.

Removed unimportant imports

2bd7562

Fixes config.yml not being read and adds save-full-image option

4883120

Closes Issue #36

ghost changed the title ~~Kirbykirby56~~ Close Issues #30 and #36, config.yml is read. Nov 23, 2017

AmauryCarrade requested changes Jan 24, 2018

View reviewed changes

AmauryCarrade changed the title ~~Close Issues #30 and #36, config.yml is read.~~ Stores whole image in the images folder and adds moderation commands Jan 24, 2018

kirbykirby56 added 2 commits March 21, 2018 21:22

Merge branch 'Kirbykirby56' into pr/2

88d77bd

Merge pull request #3 from kirbykirby56/pr/2

3ed5388

Pr/2

ghost closed this Mar 25, 2018

ghost deleted the Kirbykirby56 branch March 25, 2018 01:48

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Stores whole image in the images folder and adds moderation commands #40

Stores whole image in the images folder and adds moderation commands #40

ghost commented Nov 23, 2017 •

edited by AmauryCarrade

Loading

AmauryCarrade left a comment •

edited

Loading

AmauryCarrade Jan 24, 2018

AmauryCarrade Jan 24, 2018

AmauryCarrade Jan 24, 2018

AmauryCarrade Jan 24, 2018

AmauryCarrade Jan 24, 2018

AmauryCarrade Jan 24, 2018

ghost Mar 22, 2018

AmauryCarrade Jan 24, 2018

AmauryCarrade Jan 24, 2018

AmauryCarrade Jan 24, 2018

AmauryCarrade Jan 24, 2018

ghost commented Mar 18, 2018

AmauryCarrade commented Mar 19, 2018 •

edited

Loading

ghost commented Mar 19, 2018 via email

ghost commented Mar 25, 2018

Stores whole image in the images folder and adds moderation commands #40

Stores whole image in the images folder and adds moderation commands #40

Conversation

ghost commented Nov 23, 2017 • edited by AmauryCarrade Loading

AmauryCarrade left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost commented Mar 18, 2018

AmauryCarrade commented Mar 19, 2018 • edited Loading

ghost commented Mar 19, 2018 via email

ghost commented Mar 25, 2018

ghost commented Nov 23, 2017 •

edited by AmauryCarrade

Loading

AmauryCarrade left a comment •

edited

Loading

AmauryCarrade commented Mar 19, 2018 •

edited

Loading