Adds Loot Tables #7242

Burbulinis · 2024-12-04T10:15:13Z

Description

Adds loot tables and loot generation to Skript.

Target Minecraft Versions: any
Requirements: none
Related Issues: #5937

src/main/java/ch/njol/skript/classes/data/BukkitClasses.java

Moderocky

Good start :)

src/main/java/ch/njol/skript/expressions/ExprLootTable.java

src/main/java/ch/njol/skript/expressions/ExprLootTableFromString.java

src/main/java/ch/njol/skript/conditions/CondIsALootable.java

src/main/java/ch/njol/skript/classes/data/DefaultConverters.java

src/main/java/ch/njol/skript/expressions/ExprLootTableSeed.java

Asleeepp

tests tests tests!!!

src/main/java/ch/njol/skript/conditions/CondHasLootTable.java

src/main/java/ch/njol/skript/conditions/CondIsALootable.java

src/main/java/ch/njol/skript/expressions/ExprLootTableSeed.java

src/main/java/ch/njol/skript/expressions/ExprLootTable.java

src/main/java/ch/njol/skript/classes/data/BukkitClasses.java

Fusezion

Just to cause more mayham, wanna make this a module?

Change toString for LootTable class info, Change syntax

…killer/entity of context

src/main/java/ch/njol/skript/expressions/ExprLootContextWithEntity.java

src/main/java/ch/njol/skript/expressions/ExprLootContextWithKiller.java

src/main/java/ch/njol/skript/expressions/ExprLootContextWithLuck.java

src/main/java/ch/njol/skript/expressions/ExprLootItems.java

src/main/java/ch/njol/skript/expressions/ExprLootTable.java

src/test/skript/tests/syntaxes/expressions/ExprLootTableSeed.sk

src/main/java/ch/njol/skript/expressions/ExprLootContextWithLuck.java

src/main/java/ch/njol/skript/expressions/ExprLootContextWithKiller.java

src/main/java/ch/njol/skript/expressions/ExprLootContextWithEntity.java

src/main/java/ch/njol/skript/conditions/CondHasLootTable.java

src/main/java/ch/njol/skript/expressions/ExprLootContextEntity.java

src/main/java/ch/njol/skript/expressions/ExprLootContextKiller.java

src/main/java/ch/njol/skript/expressions/ExprLootContextLuck.java

src/main/java/ch/njol/skript/expressions/ExprLootContextWithEntity.java

src/main/java/ch/njol/skript/expressions/ExprLootContextWithKiller.java

src/main/java/ch/njol/skript/expressions/ExprLootTable.java

src/main/java/ch/njol/skript/expressions/ExprLootTableSeed.java

Fusezion

After talking a bit with someone else and getting their feedback on a suggestion I wanna post it here for you as well.

What's the thought about making a wrapper class for the loot context similar to how recipes were done?

Currently every time you wanna change the syntax you end up doing new builder -> copy old stats -> add new stat for each of the stats in other words

ExprLootContextWithEntity -> new -> edit entity -> return
ExprLootContextWithKiller -> new -> edit killer -> return
ExprLootContextWithLuck   -> new -> edit luck   -> return

Due to this you ended up with two expressions for the same things
ExprLootContextWithX and ExprLootContextX these could be merged into 1 expression allowing changers and using a wrapper around LootContext with methods for setting the values you can do something like

LootContextWrapper#setKiller
LootContextWrapper#setLuck
LootContextWrapper#setEntity

Hell you could probably even change the loot context location. This addition will also allow the usage of a Secpression meaning we could instead see syntax like

set {_plank} to a new loot context:
    set loot context entity to {_player}
    set loot context luck to 10
    set loot context killer to {_players twin brother}
    set loot context location to location({_x},-5,10, "World")

sovdeeth

A lot of the syntaxes are worryingly generic. As a specific example, I can see people getting very confused with killer of {_thing}. I would prefer a lot of these to have required keywords that make sure they don't conflict/get confused with other syntaxes.

…rom the Recipe pull request, and changes

Efnilite

Looking good, your test files need to end with new lines though :)

src/main/java/org/skriptlang/skript/bukkit/loottables/LootContextWrapper.java

src/main/java/org/skriptlang/skript/bukkit/loottables/LootTableUtils.java

src/main/java/org/skriptlang/skript/bukkit/loottables/elements/conditions/CondHasLootTable.java

Fusezion

I didn't look at changers and I removed things that mentioned to use Loottabletypes until they're added back for for a first look it's good. I really wish github didn't force line breaks on long lines

src/main/java/ch/njol/skript/bukkitutil/NamespacedUtils.java

src/main/java/ch/njol/skript/classes/data/BukkitClasses.java

src/main/java/ch/njol/skript/classes/data/DefaultConverters.java

src/main/java/org/skriptlang/skript/bukkit/loottables/LootContextCreateEvent.java

src/main/java/org/skriptlang/skript/bukkit/loottables/LootContextWrapper.java

src/test/skript/tests/syntaxes/expressions/ExprLootContextWithLuck.sk

src/test/skript/tests/syntaxes/expressions/ExprLootContextWithEntity.sk

src/test/skript/tests/syntaxes/expressions/ExprLootContext.sk

src/test/skript/tests/syntaxes/conditions/CondIsLootable.sk

src/test/skript/tests/syntaxes/conditions/CondHasLootTable.sk

TheAbsolutionism

Slight look over.

...java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextEntity.java

...java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextKiller.java

...n/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextLuck.java

...java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextEntity.java

...java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextKiller.java

...n/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextLuck.java

...a/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprSecCreateLootContext.java

src/main/java/org/skriptlang/skript/bukkit/loottables/LootContextWrapper.java

src/main/java/ch/njol/skript/bukkitutil/NamespacedUtils.java

src/main/java/ch/njol/skript/classes/data/DefaultConverters.java

src/main/java/org/skriptlang/skript/bukkit/loottables/LootContextCreateEvent.java

src/main/java/ch/njol/skript/bukkitutil/NamespacedUtils.java

src/test/skript/tests/syntaxes/conditions/CondHasLootTable.sk

src/test/skript/tests/syntaxes/conditions/CondIsLootable.sk

src/test/skript/tests/syntaxes/expressions/ExprLootContext.sk

src/test/skript/tests/syntaxes/expressions/ExprLootTable.sk

src/test/skript/tests/syntaxes/expressions/ExprLootTableSeed.sk

…tems

src/main/java/org/skriptlang/skript/bukkit/loottables/LootContextWrapper.java

src/main/java/org/skriptlang/skript/bukkit/loottables/LootTableUtils.java

src/main/java/org/skriptlang/skript/bukkit/loottables/LootContextWrapper.java

src/main/java/org/skriptlang/skript/bukkit/loottables/LootTableUtils.java

...a/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprSecCreateLootContext.java

src/main/java/ch/njol/skript/bukkitutil/NamespacedUtils.java

src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java

src/main/java/org/skriptlang/skript/bukkit/loottables/LootContextWrapper.java

src/main/java/org/skriptlang/skript/bukkit/loottables/LootTableModule.java

src/main/java/org/skriptlang/skript/bukkit/loottables/elements/conditions/CondIsLootable.java

...java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextKiller.java

...va/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextLocation.java

...n/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextLuck.java

src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootItems.java

src/test/skript/tests/syntaxes/expressions/ExprLootTableSeed.sk

…ottable

sovdeeth · 2024-12-15T18:12:48Z

src/main/java/org/skriptlang/skript/bukkit/loottables/elements/conditions/CondIsLootable.java

+	"set block at event-location to wool block",
+	"if block at event-location is lootable:",
+		"\t# uh oh, nothing will happen because a wool is not a lootable block."
+


Suggested change

sovdeeth · 2024-12-15T18:15:37Z

src/main/java/org/skriptlang/skript/bukkit/loottables/elements/effects/EffGenerateLoot.java

+
+	static {
+		Skript.registerEffect(EffGenerateLoot.class,
+			"generate loot (of|using) [[the] loot[ ]table] %loottable% (with|using) [[the] [loot] context] %lootcontext% in [[the] inventor(y|ies)] %inventories%"


It might be nice to have an option to generate without specifying a context, and have skript just auto-fill a context at the origin of a world

src/main/java/org/skriptlang/skript/bukkit/loottables/elements/effects/EffGenerateLoot.java

sovdeeth · 2024-12-15T18:16:16Z

src/main/java/org/skriptlang/skript/bukkit/loottables/elements/effects/EffGenerateLoot.java

+@Name("Generate Loot")
+@Description({
+	"Generates the loot in the specified inventories from a loot table using a loot context. " +
+		"Some loot tables will require some of these values whereas others may not.",


Suggested change

"Some loot tables will require some of these values whereas others may not.",

"Some loot tables will require some of these values whereas others may not.",

Can you elaborate? give an example?

src/main/java/org/skriptlang/skript/bukkit/loottables/elements/effects/EffGenerateLoot.java

sovdeeth · 2024-12-15T18:21:21Z

...va/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextLocation.java

+public class ExprLootContextLocation extends SimplePropertyExpression<LootContext, Location> {
+
+	static {
+		registerDefault(ExprLootContextLocation.class, Location.class, "loot [context] location", "lootcontexts");


Suggested change

registerDefault(ExprLootContextLocation.class, Location.class, "loot [context] location", "lootcontexts");

registerDefault(ExprLootContextLocation.class, Location.class, "loot[ing] [context] location", "lootcontexts");

sovdeeth · 2024-12-15T18:21:50Z

...n/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootContextLuck.java

+public class ExprLootContextLuck extends SimplePropertyExpression<LootContext, Float> {
+
+	static {
+		registerDefault(ExprLootContextLuck.class, Float.class, "loot [context] luck [value|factor]", "lootcontexts");


Suggested change

registerDefault(ExprLootContextLuck.class, Float.class, "loot [context] luck [value|factor]", "lootcontexts");

registerDefault(ExprLootContextLuck.class, Float.class, "loot[ing] [context] luck [value|factor]", "lootcontexts");

sovdeeth · 2024-12-15T18:23:49Z

src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootItems.java

+			"[the] loot [item[s]] of [[the] loot[ ]table[s]] %loottables% (with|using) [[the] [loot] context] %lootcontext%",
+			"[the] %loottables%'[s] loot [item[s]] (with|using) [[the] [loot] context] %lootcontext%"


Suggested change

"[the] loot [item[s]] of [[the] loot[ ]table[s]] %loottables% (with|using) [[the] [loot] context] %lootcontext%",

"[the] %loottables%'[s] loot [item[s]] (with|using) [[the] [loot] context] %lootcontext%"

"[the] (loot|item[s]) of [[the] loot[ ]table[s]] %loottables% (with|using) [[the] [loot] context] %lootcontext%",

"[the] %loottables%'[s] (loot|item[s]) (with|using) [[the] [loot] context] %lootcontext%"

i think loot and items are better off not seeing each other anymore

I feel like items is too generic

Hmm
Maybe just loot then, since i don't think loot items makes much grammatical sense

src/main/java/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprLootTable.java

sovdeeth · 2024-12-15T18:28:12Z

...a/org/skriptlang/skript/bukkit/loottables/elements/expressions/ExprSecCreateLootContext.java

+		Variables.setLocalVariables(contextEvent, Variables.copyLocalVariables(event));
+		TriggerItem.walk(trigger, contextEvent);
+		Variables.setLocalVariables(event, Variables.copyLocalVariables(contextEvent));
+		Variables.removeLocals(contextEvent);


can use Variables.withLocalVariables now

Burbulinis added 2 commits December 4, 2024 12:05

Add Loot Tables

e9f97f8

Optimize Imports

7a144b7

Fusezion suggested changes Dec 4, 2024

View reviewed changes

src/main/java/ch/njol/skript/classes/data/BukkitClasses.java Outdated Show resolved Hide resolved

Fix docs and add a registry class info

11b69c1

Moderocky requested changes Dec 4, 2024

View reviewed changes

Asleeepp suggested changes Dec 4, 2024

View reviewed changes

Fusezion suggested changes Dec 4, 2024

View reviewed changes

src/main/java/ch/njol/skript/classes/data/BukkitClasses.java Outdated Show resolved Hide resolved

Fusezion suggested changes Dec 4, 2024

View reviewed changes

Burbulinis added 3 commits December 4, 2024 15:06

Changes

a6cdeea

remove license thing

ea1a3da

Add converter for LootTables - LootTable,

097e56a

Change toString for LootTable class info, Change syntax

Burbulinis requested a review from Moderocky December 4, 2024 15:46

Efnilite added the feature Pull request adding a new feature. label Dec 4, 2024

add tests ? unsure if theyre correct and add expressions to get luck/…

6294fee

…killer/entity of context

TheAbsolutionism suggested changes Dec 4, 2024

View reviewed changes

Fusezion suggested changes Dec 4, 2024

View reviewed changes

sovdeeth requested changes Dec 5, 2024

View reviewed changes

Replace current implementation to module, add NameSpacedUtils class f…

a4bdced

…rom the Recipe pull request, and changes

Burbulinis requested review from sovdeeth, Asleeepp, TheAbsolutionism and Fusezion December 5, 2024 22:04

Efnilite requested changes Dec 5, 2024

View reviewed changes

Fusezion suggested changes Dec 5, 2024

View reviewed changes

TheAbsolutionism suggested changes Dec 6, 2024

View reviewed changes

Burbulinis added 2 commits December 6, 2024 15:28

Add docs, optimize imports and changes

e261ee8

Change syntax and add some tests

458bf88

Burbulinis requested review from TheAbsolutionism and Efnilite December 6, 2024 14:25

UnderscoreTud requested changes Dec 6, 2024

View reviewed changes

Add JUnit tests, fix tests and changes

c7777df

Burbulinis requested a review from UnderscoreTud December 7, 2024 09:14

Burbulinis added 2 commits December 7, 2024 11:32

Fix JUnit test

554a705

ok junit test

4d576cb

TheAbsolutionism approved these changes Dec 7, 2024

View reviewed changes

Efnilite approved these changes Dec 7, 2024

View reviewed changes

Burbulinis added 2 commits December 7, 2024 13:22

fix tests

4f90a8e

Optimize imports and fix description of EffGenerateLoot and ExprLootI…

3bc7b69

…tems

sovdeeth requested changes Dec 8, 2024

View reviewed changes

Moderocky approved these changes Dec 8, 2024

View reviewed changes

Asleeepp approved these changes Dec 9, 2024

View reviewed changes

Burbulinis added 6 commits December 9, 2024 18:30

Clean up LootTableUtils and update docs

9acbcba

update tests

f261551

add loot table type in the default.lang file

12b47dc

Fix the seed expression not actually updating the state

01aa136

optimize imports

2da8311

change exampled for loot table seed

e14ff8d

Burbulinis requested a review from sovdeeth December 9, 2024 17:19

Add default event value for LootTable in LootGenerate event

2038063

UnderscoreTud requested changes Dec 14, 2024

View reviewed changes

Burbulinis and others added 7 commits December 15, 2024 03:00

Add escape character for colons

4dfb8d9

Merge branch 'dev/feature' into feature/loottable

70977bc

Add LootContext event value in LootGenerateEvent

cc92b1b

Make cached loot context transient

01e38a1

changes

9fc767c

tests and fix docs

d6658aa

Merge remote-tracking branch 'fork/feature/loottable' into feature/lo…

8620a07

…ottable

Burbulinis requested a review from UnderscoreTud December 15, 2024 16:51

sovdeeth requested changes Dec 15, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds Loot Tables #7242

Adds Loot Tables #7242

Burbulinis commented Dec 4, 2024

Moderocky left a comment

Asleeepp left a comment

Fusezion left a comment

Fusezion left a comment

sovdeeth left a comment

Efnilite left a comment

Fusezion left a comment

TheAbsolutionism left a comment

sovdeeth Dec 15, 2024

sovdeeth Dec 15, 2024

sovdeeth Dec 15, 2024

sovdeeth Dec 15, 2024

sovdeeth Dec 15, 2024

sovdeeth Dec 15, 2024

sovdeeth Dec 15, 2024

sovdeeth Dec 15, 2024

Burbulinis Dec 15, 2024

sovdeeth Dec 15, 2024

sovdeeth Dec 15, 2024

	"Some loot tables will require some of these values whereas others may not.",
	"Some loot tables will require some of these values whereas others may not.",

	registerDefault(ExprLootContextLocation.class, Location.class, "loot [context] location", "lootcontexts");
	registerDefault(ExprLootContextLocation.class, Location.class, "loot[ing] [context] location", "lootcontexts");

	registerDefault(ExprLootContextLuck.class, Float.class, "loot [context] luck [value\|factor]", "lootcontexts");
	registerDefault(ExprLootContextLuck.class, Float.class, "loot[ing] [context] luck [value\|factor]", "lootcontexts");

		"[the] loot [item[s]] of [[the] loot[ ]table[s]] %loottables% (with\|using) [[the] [loot] context] %lootcontext%",
		"[the] %loottables%'[s] loot [item[s]] (with\|using) [[the] [loot] context] %lootcontext%"

Adds Loot Tables #7242

Are you sure you want to change the base?

Adds Loot Tables #7242

Conversation

Burbulinis commented Dec 4, 2024

Description

Moderocky left a comment

Choose a reason for hiding this comment

Asleeepp left a comment

Choose a reason for hiding this comment

Fusezion left a comment

Choose a reason for hiding this comment

Fusezion left a comment

Choose a reason for hiding this comment

sovdeeth left a comment

Choose a reason for hiding this comment

Efnilite left a comment

Choose a reason for hiding this comment

Fusezion left a comment

Choose a reason for hiding this comment

TheAbsolutionism left a 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

Choose a reason for hiding this comment