Making TFM at least somewhat standardized #1

DragonSlayer2189 · 2020-11-30T20:20:56Z

Hi yes, i just spent the last like 10 hours working on this, so here you go, I went through and corrected every inconsistency I could find and also made some other slight adjustments. I am about 80% sure that none of the edits made to this will break anything however you may want to look through everything just in case. I am also sorry for not doing it all in one commit because by the time i learned that was a thing i was already like 51 commits in.

so yeah, am i the official tfm nitpicker yet?

I want to make this bit not use partialname at all since it sometimes causes issues, but whatever

1) because the user has to manually accept the resource pack, the joke doesn't work too well 2) the file hasn't existed for more than 3 months 3) its just a bad command

maybe add -a flag just cuz, idk

this was added back??????

this was added back????????

DragonSlayer2189 · 2020-12-01T05:01:54Z

did... github break or something, it has been trying to check if the build is valid for the last 4 hours

autobuild fucked up so i added litterly nothing to see if that fixes it

Wild1145

I've more or less reviewed everything now. There are 8 files I've looked at but need to check through again with a fresh head so will look at those tomorrow.

Also tagged @AtlasMediaGroup/totalfreedom-developers on a load of these that need them to look at properly.

src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java

src/main/java/me/totalfreedom/totalfreedommod/command/Command_ban.java

src/main/java/me/totalfreedom/totalfreedommod/command/Command_banip.java

src/main/java/me/totalfreedom/totalfreedommod/command/Command_banname.java

src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockcmd.java

src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_schematic.java

src/main/java/me/totalfreedom/totalfreedommod/world/WorldManager.java

Wild1145 · 2020-12-01T19:31:18Z

src/main/java/me/totalfreedom/totalfreedommod/world/WorldRestrictions.java

@@ -27,7 +27,7 @@
 {

    private final List<String> BLOCKED_WORLDEDIT_COMMANDS = Arrays.asList(


WTF, why is this even here? Why is this entire thing not in config...?

CC @AtlasMediaGroup/totalfreedom-developers

good question

Someone please review my aditions to /unban where i added -q to make it follow the same structure as unbanip and unbanname (even though unbanip and unbanname don't have the -r flag that unban does, but i don't think they need it)

I also changed /ro to not send the blocks removed message to everyone because that gets spammy sometimes I don't remember who told me to do this but someone in vc said it was better with no periods on the staff actions

I am dumb

I am basicly just pushing this so that mabye the autobuild doens't fail

DragonSlayer2189 · 2020-12-02T18:21:03Z

if this build doesn't fail then I think I have fixed everything

Wild1145

Also to save my e-mail inbox this time, could you not reply to every single comment with resolved? Just mark it as resolved so I don't get 2000000000 e-mails again.

Still need to review other files but I've done my best with the time I had spare tonight.

src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java

src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockcmd.java

src/main/java/me/totalfreedom/totalfreedommod/command/Command_ban.java

src/main/java/me/totalfreedom/totalfreedommod/command/Command_coins.java

src/main/java/me/totalfreedom/totalfreedommod/command/Command_myadmin.java

src/main/resources/config.yml

Admin when refering to the rank admin when refering to anything else

"conflicting files" -_-

mbs couldn't use worledit it mbworld because of this

…eedomMod into patch-5

DragonSlayer2189 · 2020-12-04T05:34:14Z

I don't really feel like going through all of these commands that apparently now have conflicts (there was probably a refactor, but i haven't checked yet) but if i have to I will, for now, can a dev please look at the PLEASE FIX commit as the world restrictions are severely broken by brushes

DragonSlayer2189 · 2020-12-04T16:33:20Z

bruuuhh, the conflicts aren't resolved after doing any of those edits. whatever, I guess i willl let you guys deal with it

This reverts commit 491f04c.

updated stuff

Wild1145 · 2021-01-01T15:33:14Z

Given the nature of this PR and the fact it's ultimately just too large to reasonably review and the fact they are all minor changes, I'm going to close and decline this PR. I would suggest if you do want to make these changes to tackle them in smaller logical blocks rather than trying to change every single command and message in the entire plugin, because it's just not a sustainable way to make these changes.

Dependency cleanup

DragonSlayer2189 added 30 commits November 29, 2020 22:04

fixing tfm part 1

d76f043

Update Command_autotp.java

244855e

I am pretty sure i did this right

fd6fafe

fixing tfm part 1

1de70da

Making TFM comply with itself

6a5b8a2

I want to make this bit not use partialname at all since it sometimes causes issues, but whatever

Making TFM comply with itself

ab06b2d

Making TFM comply with itself

275a5b7

Making TFM comply with itself

1be0123

Making TFM comply with itself

971a096

Making TFM comply with itself

716bc29

Making TFM comply with itself

c5a8aa0

Update Command_colorme.java

a9146bf

Making TFM comply with itself

1d4a4ac

Deleting /curse because it doesn't work

5467fd9

1) because the user has to manually accept the resource pack, the joke doesn't work too well 2) the file hasn't existed for more than 3 months 3) its just a bad command

Making TFM comply with itself

4d0a09e

Making TFM comply with itself

aa39d82

Making TFM comply with itself

567f014

help

62c6670

help

47b2648

Making TFM comply with itself

7fc5766

Update Command_findip.java

9d10d7b

Making TFM comply with itself

8319c21

Making TFM comply with itself

bf34b49

maybe add -a flag just cuz, idk

Making TFM comply with itself

d6f56bc

Update Command_fuckoff.java

c100e91

Making TFM comply with itself

c876728

this was added back??????

Making TFM comply with itself

5a21fab

Making TFM comply with itself

8510baa

Making TFM comply with itself

c14168d

this was added back????????

Making TFM comply with itself

5720a2f

DragonSlayer2189 added 2 commits December 1, 2020 00:04

literally just pushing this to see if it fixes autobuil

51a8cdc

autobuild fucked up so i added litterly nothing to see if that fixes it

fix minor issues

338fc81

Wild1145 requested changes Dec 1, 2020

View reviewed changes

DragonSlayer2189 added 9 commits December 1, 2020 16:48

fixing things

cf414a6

a funny name

6a85ac0

Update Command_verify.java

487c29f

Deletion of command_curse.java

4c7bb9d

Fixing Syntax & Other Stuff

457678e

Someone please review my aditions to /unban where i added -q to make it follow the same structure as unbanip and unbanname (even though unbanip and unbanname don't have the -r flag that unban does, but i don't think they need it)

Removing fullstops from staff actions

a900877

I also changed /ro to not send the blocks removed message to everyone because that gets spammy sometimes I don't remember who told me to do this but someone in vc said it was better with no periods on the staff actions

Minor fixes

3b0173d

Fixed Build Error

5ed2863

I am dumb

dumb

17ec748

I am basicly just pushing this so that mabye the autobuild doens't fail

Wild1145 requested changes Dec 2, 2020

View reviewed changes

DragonSlayer2189 added 6 commits December 2, 2020 17:14

Admin & admin

f4e4723

Admin when refering to the rank admin when refering to anything else

bruh moment

fe3d43c

"conflicting files" -_-

Merge branch 'development' into patch-5

d71b33b

Fixed world restriction bug

8d1db0f

mbs couldn't use worledit it mbworld because of this

PLEASE FIX

485269b

Merge branch 'patch-5' of https://github.com/DragonSlayer2189/TotalFr…

1d9f54d

…eedomMod into patch-5

Resolving conflicts part 1 of many

491f04c

Revert "Resolving conflicts part 1 of many"

519a709

This reverts commit 491f04c.

SupItsDillon added a commit that referenced this pull request Dec 14, 2020

Merge pull request #1 from AtlasMediaGroup/development

4a3ce64

updated stuff

Wild1145 closed this Jan 1, 2021

Wild1145 added the wontfix This will not be worked on label Jan 1, 2021

allinkdev pushed a commit that referenced this pull request Jun 18, 2023

Merge pull request #1 from IPTFreedom/fix/dependency-cleanup

862ad7d

Dependency cleanup

Making TFM at least somewhat standardized #1

Making TFM at least somewhat standardized #1

DragonSlayer2189 commented Nov 30, 2020

DragonSlayer2189 commented Dec 1, 2020

Wild1145 left a comment

Wild1145 Dec 1, 2020

DragonSlayer2189 Dec 1, 2020

DragonSlayer2189 commented Dec 2, 2020

Wild1145 left a comment

DragonSlayer2189 commented Dec 4, 2020

DragonSlayer2189 commented Dec 4, 2020

Wild1145 commented Jan 1, 2021

		@@ -27,7 +27,7 @@
		{

		private final List<String> BLOCKED_WORLDEDIT_COMMANDS = Arrays.asList(

Making TFM at least somewhat standardized #1

Making TFM at least somewhat standardized #1

Conversation

DragonSlayer2189 commented Nov 30, 2020

DragonSlayer2189 commented Dec 1, 2020

Wild1145 left a comment

Choose a reason for hiding this comment

Wild1145 Dec 1, 2020

Choose a reason for hiding this comment

DragonSlayer2189 Dec 1, 2020

Choose a reason for hiding this comment

DragonSlayer2189 commented Dec 2, 2020

Wild1145 left a comment

Choose a reason for hiding this comment

DragonSlayer2189 commented Dec 4, 2020

DragonSlayer2189 commented Dec 4, 2020

Wild1145 commented Jan 1, 2021