The Wayback Machine - https://web.archive.org/web/20200928051353/https://github.com/cuberite/cuberite/pull/4842
Skip to content

/ cuberite

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding Loottables for item grids #4842

Draft
wants to merge 98 commits into
base: master
from
Draft

Adding Loottables for item grids #4842

wants to merge 98 commits into from
+12,651 −6

Conversation

@12xx12
Copy link
Contributor

12xx12 commented Aug 30, 2020 •
edited

As discussed here we'd like to add loot tables to the server
Minecraft Wiki

Fixes #3803

this is work in progress

This is only for chests. The other ones can be based on this also but are not yet supported

Things i would do

  • add default loot tables
    • add object that distributes them
    • add json parser
    • add function that interprets them
  • add custom loot tables per world

The loot tables are quite powerfull so it takes some time/effort and many enums to actually implement them.

At this point the cosole spamms some error messages because there are some features added in the loot tables that are not in cuberite and this is told to the user

Note: this pull request is quite big because it contains the json files
@12xx12 12xx12 marked this pull request as draft Aug 30, 2020
@12xx12 12xx12 changed the title Adding Loottables Adding Loottables for chests Aug 30, 2020
@12xx12
Copy link
Contributor Author

12xx12 commented Aug 30, 2020 •
edited

@madmaxoft
@bearbin

There are some errors in some travis-ci build caused from ossupport/file.h

It says that it doesn't know what type AString is.

Edit: I didn't change that file - no clue why it only fails here

Edit 2: Now I know... did the wrong order in the headers in the cpp file... facepalm
@peterbell10
peterbell10 reviewed Sep 1, 2020
View changes
Copy link
Member

peterbell10 left a comment

Some random comments, I know this isn't ready for a full review.
src/LootTableProvider.cpp Outdated Show resolved Hide resolved
src/LootTableProvider.cpp Outdated Show resolved Hide resolved
src/LootTableProvider.cpp Outdated Show resolved Hide resolved
src/LootTableProvider.cpp Outdated Show resolved Hide resolved
src/LootTableProvider.cpp Outdated Show resolved Hide resolved
src/LootTableProvider.h Outdated Show resolved Hide resolved
src/LootTableProvider.h Outdated Show resolved Hide resolved
src/LootTableProvider.h Outdated Show resolved Hide resolved
src/LootTableProvider.h Outdated Show resolved Hide resolved
src/LootTableProvider.cpp Outdated Show resolved Hide resolved
@12xx12
Copy link
Contributor Author

12xx12 commented Sep 1, 2020

Some random comments, I know this isn't ready for a full review.

Any help is appreciated - thank you
12xx12 added 25 commits Aug 28, 2020
12xx12
initial commit
d91ccad
12xx12
initial commit
14a96c6
12xx12
Revert "Merge branch '12xx12-Loottable' of https://github.com/12xx12/…
5b1bc8b 
…cuberite into 12xx12-Loottable"

This reverts commit 9f3be5e, reversing
changes made to 45501d6.
12xx12
added loot table lookup for mobs and chests
64e06a4
12xx12
adding lua export script part 1
84b992f
12xx12
updated .gitignore
3fdc9ed
12xx12
Delete LootTables.h
929ccc5
12xx12
finished generator script try 1
fa205ed
12xx12
script generates now valic c++ code
5722da5
12xx12
script now generates mostly valid c++ code
c6d1a3b
12xx12
fixed small error in export script
e6287fc
12xx12
script now matched cuberite cold style and the server compiles
9a68334
12xx12
clang fix
2adaade
12xx12
removed loot tables from binary
bb2577f 
added loot table json files
removed unwanted types from binary
12xx12
moved loot tables to cuberite naming convention
ab511ff 
added loot tables to symlink CMakeLists.txt
added loot tables to WindowsExecutables.list and UnixExecutables.list
added cLootTableProvider to World.cpp
added file reading for loot tables - no parsing at this point
12xx12
small changes to prepare for parsing
5fe35f6
12xx12
removed loot tables registry
cc7a1fd
12xx12
removed registry and tools
430c7a4
12xx12
moved a header possible prevent crash
155e233
12xx12
added function string lookup
1a28b38
12xx12
json parser now parses all chest loot tables. there are some more opt…
f5c5ad9 
…ions to add
12xx12
moved to default pointer
1dfc70e 
added custom loot tables
12xx12
added lookup
3be6500 
start of filling with loot
12xx12
added loot table interpretation beginning
11b8fd5
12xx12
removed weird pointer lookup
8cca97b
12xx12 added 3 commits Sep 16, 2020
12xx12
added player import
a6a3eee
12xx12
fixed some small brainfarts
e3d8724
12xx12
Functions are represented in classes too
14ef6a4
@bearbin bearbin self-requested a review Sep 17, 2020
12xx12 added 2 commits Sep 18, 2020
12xx12
Merge remote-tracking branch 'upstream/master' into 12xx12-Loottable
1fc4ae2
12xx12
removed incidental symbol
Loading status checks…
97dde90
@12xx12
Copy link
Contributor Author

12xx12 commented Sep 18, 2020

Ok - the loot tables for chests work now. As you can see there a ton of todo's in the code... some will not be resolved in this PR due to missing implementation. Those are marked with a date and my username.
@12xx12
Copy link
Contributor Author

12xx12 commented Sep 18, 2020

I'll add everthing i can add (even the stuff unrelated to chests) and leave and issue with the list of things left
12xx12 added 13 commits Sep 18, 2020
12xx12
fixed clang error
Loading status checks…
6efb1c5
12xx12
added more error messages to the parser
b968709
12xx12
fixed clang error
Loading status checks…
fc23e84
12xx12
added another import for clang - MVSC compiles ⭕
Loading status checks…
944b112
12xx12
added undocumented symbol and fixed strange compiler behaviour
Loading status checks…
8cbbadf
12xx12
Merge remote-tracking branch 'upstream/master' into 12xx12-Loottable
c1b3488
12xx12
removed some todo messages. Added more error messages
7060b33
12xx12
Merge remote-tracking branch 'upstream/master' into 12xx12-Loottable
Loading status checks…
02de098
12xx12
removed unused imports
fec913f
12xx12
Merge remote-tracking branch 'upstream/master' into 12xx12-Loottable
6a9290f
12xx12
added damage source check
665fefc
12xx12
Merge remote-tracking branch 'upstream/master' into 12xx12-Loottable
Loading status checks…
0091344
12xx12
addressed some compiler warnings
Loading status checks…
9f90c5d
@12xx12 12xx12 mentioned this pull request Sep 21, 2020
Open
12xx12
added more functions
Loading status checks…
19bc768
@12xx12 12xx12 mentioned this pull request Sep 23, 2020
Open
12xx12
fixed errors
Loading status checks…
f700d93
@12xx12 12xx12 changed the title Adding Loottables for chests Adding Loottables for item grids Sep 24, 2020
12xx12 added 3 commits Sep 27, 2020
12xx12
starting unit testing and fixing some detected errors
2a64dab
12xx12
Merge remote-tracking branch 'upstream/master' into 12xx12-Loottable
Loading status checks…
3408a09
12xx12
fixed compiler bug on some systems
Loading status checks…
5e8f9b8 
and removed compiler warning
@12xx12
Copy link
Contributor Author

12xx12 commented Sep 27, 2020

At the moment each world spits out 20 error messages that some feature isn't added i'm not shure what to do:

Removing the entries in the loot tables doesn't seem fitting.
Disableing the error messages doesn't seem that good because then if someone wan'ts to use the feature he/her isn't notified that this isn't working...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@madmaxoft madmaxoft

@peterbell10 peterbell10

@bearbin bearbin

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

Implement loot tables
3 participants
@12xx12 @madmaxoft @peterbell10
You can’t perform that action at this time.