Scoreboards #340

Aaron1011 · 2014-09-23T19:10:52Z

This PR continues SpaceManiac's scoreboard branch, updaing it for 1.8

Working so far:

Serialization/deserialization to/from NBT scoreboard format.
Teams
Player scores
Display slots - sidebar, below name, player list

In progress:

Team color display slots (sidebar.team.<color>)
Friendly fire toggling (Glowstone doesn't have damage
Friendly invisibles
Objective criterion (trigger, deathCount, playerKillCount, totalKillCount, health)
Statistic/achievement criteria

Also adds (Async)PlayerPreLoginEvent support.

Throw BlockBreakEvents in creative (fixes GlowstoneMC#273). Fix BlockPlaceEvents returning AIR (fixes GlowstoneMC#271). Prevent block break with swords in creative (fixes GlowstoneMC#214).

dequis · 2014-09-23T20:11:06Z

Ok sooooo, what about #331? Did you guys talk?

dequis · 2014-09-23T20:14:58Z

Oh, found the answer scrolling up on irc.

19:21 < Aaron1011> turt2live: I've fully implemented serialization and deserialization now
19:21 <+turt2live> Neat. Open a PR when ready
19:22 < Aaron1011> turt2live: Okay, will do. Is this going to be competing with the other
                   scoreboard PR?
19:22 <+turt2live> Yes
19:22 <+turt2live> Let the odds ever be in your favour. 
19:23 < Aaron1011> :)
19:23 < Aaron1011> Let Tte 49th PR games begin!

Fun.

Aaron1011 · 2014-09-23T20:21:04Z

@dequis: Yeah, it seems @turt2live wants some (friendly) PR competition 😀

Signed-off-by: William Lebel <[email protected]>

This commit changes the server startup code so that it starts even when encountering an unknown option. This change is motivated by the fact that most server hosts provide the nogui option in their startup script and would thus prevent the server from starting.

SpaceManiac · 2014-09-24T03:55:27Z

src/main/java/net/glowstone/net/codec/play/scoreboard/ScoreboardScoreCodec.java

Why this change?

SpaceManiac · 2014-09-24T03:58:35Z

I don't see where Criteria is coming from. Missing link to corresponding Glowkit PR?

Aaron1011 · 2014-09-24T10:27:43Z

@SpaceManiac: Oops, forgot to create the other PR :).
GlowstoneMC/Glowkit#20

New packets (play outbound): - 0x41 ServerDifficulty - 0x42 CombatEvent - 0x43 Camera - 0x44 WorldBorder - 0x45 Title - 0x47 UserListHeaderFooter - 0x48 ResourcePackSend - 0x49 UpdateEntityNBT Signed-off-by: William Lebel <[email protected]>

…oneMC#101).

gdude2002 · 2014-10-07T12:54:40Z

It lives! http://bamboo.gserv.me/browse/GLOW-SRV-PR340-51

turt2live · 2014-10-14T03:09:54Z

This is looking pretty inactive code-wise. If this is complete, please remove "WIP" from the title to have it reviewed. Your PR also does not merge.

If this is still a work in progress, please comment back stating so.

Thanks!

(PS: Remember to limit your scope. No need to implement all of scoreboards just yet. This PR looks pretty hefty in the size department)

turt2live · 2014-10-14T12:30:55Z

@Aaron1011 It still does not merge :(

dequis · 2014-10-14T15:15:24Z

He merged against master but this PR is against the scoreboard branch.

I recommend resubmitting!

gdude2002 · 2014-10-14T15:35:22Z

Well, that could cause some problems ._.

turt2live · 2014-10-19T20:47:02Z

Closing in favour of GlowstoneMC/Glowstone#459

JeromSar and others added 9 commits September 16, 2014 22:37

Prevent clients logging in multiple times (fixes GlowstoneMC#150).

266ba97

Also adds (Async)PlayerPreLoginEvent support.

Provide hostname in PlayerLoginEvent.

b4ecf2c

Implemented AsyncPlayerChatEvent (fixes GlowstoneMC#103).

d2e4454

Tidied up EventFactory and its uses.

d3ed79e

Made some utility classes final.

c41bf0e

Revamped place and dig event handling.

9c54b73

Throw BlockBreakEvents in creative (fixes GlowstoneMC#273). Fix BlockPlaceEvents returning AIR (fixes GlowstoneMC#271). Prevent block break with swords in creative (fixes GlowstoneMC#214).

Simplified dig and place logic slightly.

2ea5576

Added basic potion effect definitions (fixes GlowstoneMC#295).

64345cd

Added checkstyle and fixed code to obey it (thanks @meggawatts).

62590b7

turt2live added the PR: Addition label Sep 23, 2014

JeromSar and others added 6 commits September 23, 2014 21:10

Added more command-line parameters.

dc35436

Added command line parameters for jline.

a85637d

Signed-off-by: William Lebel <[email protected]>

Further tidied up command line handling.

2f6ccc2

Added ClientSettings to players for storing settings sent by the client.

5a6084c

Handle torch placement (see GlowstoneMC#119).

0a659d0

SpaceManiac reviewed Sep 24, 2014
View reviewed changes

src/main/java/net/glowstone/net/codec/play/scoreboard/ScoreboardScoreCodec.java Outdated

Copy link

Member

SpaceManiac Sep 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this change?

Aaron1011 and others added 3 commits September 24, 2014 00:54

Toggle between normal and inverted daylight sensor on interact.

a8d6eef

Use difficulty set in config (thanks @wow4201).

37076f0

Added config option for keeping spawn chunks loaded.

2cb16e4

greatman and others added 3 commits September 24, 2014 21:55

Added Eclipse and IDEA gradle plugins and title-cased project name.

ed97e68

Reverted project name change for now.

1fa24a7

Aaron1011 force-pushed the scoreboard branch from a589544 to bee13b7 Compare September 27, 2014 01:59

Improved tree support and fixed lack of tree generation (fixes Glowst…

5d54121

…oneMC#101).

SpaceManiac and others added 11 commits October 7, 2014 08:26

Tracking for teams.

ca4fbc6

Scoreboard protocol stuff.

29b27c0

Scoreboards now associate with players and keep them updated on changes.

5bab5a8

Update towards 1.8

6562c24

More work

557049c

Working serialization

4847e36

Use Criteria enum

dc85d3e

Make Criteria a string

187a304

Use 'Criterias' instead of 'Criteria'

ebb9014

Checkstyle fixes

14e652c

Lombok-ify the messages

3469249

Aaron1011 force-pushed the scoreboard branch from 78b9fcd to 3469249 Compare October 7, 2014 12:46

Aaron1011 changed the title ~~[WIP] Scoreboards~~ Scoreboards Oct 14, 2014

turt2live self-assigned this Oct 14, 2014

turt2live added PR: Cannot Merge and removed PR: Cannot Merge labels Oct 14, 2014

dequis mentioned this pull request Oct 16, 2014

Broken pull requests #422

Closed

Aaron1011 mentioned this pull request Oct 19, 2014

Scoreboards #459

Open

turt2live closed this Oct 19, 2014

turt2live added PR: Cannot Merge and removed PR: Cannot Merge labels Oct 19, 2014

Aaron1011 unassigned turt2live Dec 8, 2014

puigru pushed a commit to puigru/Glowstone-Legacy that referenced this pull request Aug 30, 2017

Fixes GlowstoneMC#340, also writes correct scoreboard nbt values

0fc7a1b

Scoreboards #340

Scoreboards #340

Uh oh!

Conversation

Aaron1011 commented Sep 23, 2014

Uh oh!

dequis commented Sep 23, 2014

Uh oh!

dequis commented Sep 23, 2014

Uh oh!

Aaron1011 commented Sep 23, 2014

Uh oh!

SpaceManiac Sep 24, 2014

Choose a reason for hiding this comment

Uh oh!

SpaceManiac commented Sep 24, 2014

Uh oh!

Aaron1011 commented Sep 24, 2014

Uh oh!

gdude2002 commented Oct 7, 2014

Uh oh!

turt2live commented Oct 14, 2014

Uh oh!

turt2live commented Oct 14, 2014

Uh oh!

dequis commented Oct 14, 2014

Uh oh!

gdude2002 commented Oct 14, 2014

Uh oh!

turt2live commented Oct 19, 2014

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants