Adding Loottables for item grids #4842

12xx12 · 2020-08-30T00:04:31Z

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

this is work in progress

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

Things i would do

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

Todo:

support other seeds then the world seed
parsing a whole table in tests (there is some bug in the item parsing)

Note: this pull request is quite big because it contains the json files

12xx12 · 2020-08-30T23:06:14Z

@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

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

src/LootTableProvider.cpp

src/LootTableProvider.h

src/LootTableProvider.cpp

12xx12 · 2020-09-01T22:41:22Z

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

Any help is appreciated - thank you

…cuberite into 12xx12-Loottable" This reverts commit 9f3be5e, reversing changes made to 45501d6.

added loot table json files removed unwanted types from binary

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

…ions to add

added custom loot tables

start of filling with loot

12xx12 · 2020-10-23T16:35:58Z

Ok, so now everything is working again.

Time to finish the last functions and rip it apart

added some more functions

12xx12 · 2020-10-26T23:50:13Z

I need a way to check the Entity Type (Monsters, And "Normal" entities) from string... Do you have any Idea?

fixed wrong abs method

…ace serializer PR

12xx12 · 2020-10-28T21:21:19Z

waiting for #4941 for the string <-> monster enum conversion

tigerw · 2020-10-28T21:37:49Z

I'll look tomorrow if no one else beats me to it

12xx12 · 2021-04-19T10:06:10Z

I need some help @cuberite/core-team
The travis build fails due to a missing submodule (jsoncpp). I think i meddeld with submodules. I fixed it on my machine but on the remote it doesn't seem to work

12xx12 · 2021-04-19T10:10:34Z

Things that need to be done:

convert the json files to c++ code.
Add options for a parser in lua
- reveal the stuff to the API

Things i am waiting for:

Block State PR #5151

tigerw · 2021-04-20T19:32:49Z

tests/LootTable/CMakeLists.txt

+        )
+
+
+target_link_libraries(jsoncpp_lib)


is this needed? if so, I think it's now jsoncpp_static

12xx12 · 2021-04-20T19:37:06Z

There is the problem :o

At this point yes - but it's gonna be removed soon. I just want to make it compile for now

12xx12 marked this pull request as draft August 30, 2020 00:07

12xx12 changed the title ~~Adding Loottables~~ Adding Loottables for chests Aug 30, 2020

peterbell10 reviewed Sep 1, 2020

View changes

12xx12 added 25 commits September 7, 2020 22:14

initial commit

d91ccad

initial commit

14a96c6

Revert "Merge branch '12xx12-Loottable' of https://github.com/12xx12/…

5b1bc8b

…cuberite into 12xx12-Loottable" This reverts commit 9f3be5e, reversing changes made to 45501d6.

added loot table lookup for mobs and chests

64e06a4

adding lua export script part 1

84b992f

updated .gitignore

3fdc9ed

Delete LootTables.h

929ccc5

finished generator script try 1

fa205ed

script generates now valic c++ code

5722da5

script now generates mostly valid c++ code

c6d1a3b

fixed small error in export script

e6287fc

script now matched cuberite cold style and the server compiles

9a68334

clang fix

2adaade

removed loot tables from binary

bb2577f

added loot table json files removed unwanted types from binary

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

small changes to prepare for parsing

5fe35f6

removed loot tables registry

cc7a1fd

removed registry and tools

430c7a4

moved a header possible prevent crash

155e233

added function string lookup

1a28b38

json parser now parses all chest loot tables. there are some more opt…

f5c5ad9

…ions to add

moved to default pointer

1dfc70e

added custom loot tables

added lookup

3be6500

start of filling with loot

added loot table interpretation beginning

11b8fd5

removed weird pointer lookup

8cca97b

12xx12 added 2 commits October 23, 2020 18:10

fixed test

956aa48

fixed parsing

fdb9fa6

12xx12 mentioned this pull request Oct 23, 2020

Adding Item Tags and struct for easy variant access #5002

Closed

12xx12 added 2 commits October 23, 2020 18:23

added new synonymes to items.ini

4eeac5e

fixed checkstyle

ee82c2a

12xx12 added 3 commits October 25, 2020 23:26

fixed clang

16d764b

fixed uninitialized variable

b37da5d

fixed running

d570595

added some more functions

12xx12 added 4 commits October 28, 2020 12:20

fixed unreachable code

c7cdf42

fixed wrong abs method

added entity type check (monsters are missing) waiting for mob namesp…

7e00298

…ace serializer PR

fixed test

1252ce4

removed move operation

0994c24

12xx12 added 8 commits February 22, 2021 22:18

Merge remote-tracking branch 'upstream/master' into 12xx12-Loottable

1b6ced9

fixed build

3ca1db1

fixed monster comparison

f2c86dd

fixed build

db53fcc

Merge branch 'master' into 12xx12-Loottable

65e22e0

fixed clang

9f0462d

Merge branch 'master' into 12xx12-Loottable

caad66d

fixed build after merge

584cb3d

tigerw reviewed Apr 20, 2021

View changes

tests/LootTable/CMakeLists.txt Outdated

)

target_link_libraries(jsoncpp_lib)

Copy link

Member

tigerw Apr 20, 2021

Choose a reason for hiding this comment

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

is this needed? if so, I think it's now jsoncpp_static

fixed test

5385025

12xx12 marked this pull request as draft July 19, 2021 08:34

Adding Loottables for item grids #4842

Adding Loottables for item grids #4842

12xx12 commented Aug 30, 2020 •

edited

12xx12 commented Aug 30, 2020 •

edited

peterbell10 left a comment

12xx12 commented Sep 1, 2020

12xx12 commented Oct 23, 2020

12xx12 commented Oct 26, 2020

12xx12 commented Oct 28, 2020

tigerw commented Oct 28, 2020

12xx12 commented Apr 19, 2021

12xx12 commented Apr 19, 2021

tigerw Apr 20, 2021

12xx12 commented Apr 20, 2021

Adding Loottables for item grids #4842

Are you sure you want to change the base?

Adding Loottables for item grids #4842

Conversation

12xx12 commented Aug 30, 2020 • edited

12xx12 commented Aug 30, 2020 • edited

peterbell10 left a comment

Choose a reason for hiding this comment

12xx12 commented Sep 1, 2020

12xx12 commented Oct 23, 2020

12xx12 commented Oct 26, 2020

12xx12 commented Oct 28, 2020

tigerw commented Oct 28, 2020

12xx12 commented Apr 19, 2021

12xx12 commented Apr 19, 2021

tigerw Apr 20, 2021

Choose a reason for hiding this comment

12xx12 commented Apr 20, 2021

12xx12 commented Aug 30, 2020 •

edited

12xx12 commented Aug 30, 2020 •

edited