Skip to content

Commit c70dcae

Browse files
committed
Fix builders for some conditions.
1 parent 6fd575d commit c70dcae

File tree

5 files changed

+14
-6
lines changed

5 files changed

+14
-6
lines changed

src/main/java/com/provismet/CombatPlusCore/enchantment/loot/condition/item/IsDualWeaponCondition.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import net.minecraft.loot.context.LootContext;
1111
import net.minecraft.loot.context.LootContextParameters;
1212

13-
public record IsDualWeaponCondition() implements ItemCondition {
13+
public record IsDualWeaponCondition () implements ItemCondition {
1414
public static final MapCodec<IsDualWeaponCondition> CODEC = MapCodec.unit(IsDualWeaponCondition::new);
1515

1616
@Override
@@ -23,4 +23,8 @@ public boolean test (LootContext lootContext) {
2323
ItemStack item = lootContext.get(LootContextParameters.TOOL);
2424
return item.isIn(CPCItemTags.DUAL_WEAPON) || item.getItem() instanceof DualWeapon;
2525
}
26+
27+
public static ItemCondition.Builder builder () {
28+
return IsDualWeaponCondition::new;
29+
}
2630
}

src/main/java/com/provismet/CombatPlusCore/enchantment/loot/condition/item/IsMeleeWeaponCondition.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import net.minecraft.loot.context.LootContext;
1111
import net.minecraft.loot.context.LootContextParameters;
1212

13-
public record IsMeleeWeaponCondition() implements ItemCondition {
13+
public record IsMeleeWeaponCondition () implements ItemCondition {
1414
public static final MapCodec<IsMeleeWeaponCondition> CODEC = MapCodec.unit(IsMeleeWeaponCondition::new);
1515

1616
@Override

src/main/java/com/provismet/CombatPlusCore/enchantment/loot/condition/item/ItemLambdaCondition.java

+4
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,8 @@ public boolean test (LootContext lootContext) {
2828
if (predicate.isPresent()) return predicate.get().test(lootContext.get(LootContextParameters.TOOL));
2929
return false;
3030
}
31+
32+
public static ItemCondition.Builder builder (Identifier function) {
33+
return () -> new ItemLambdaCondition(function);
34+
}
3135
}

src/main/java/com/provismet/CombatPlusCore/enchantment/loot/condition/singleEntity/ApplyToItem.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ public Set<LootContextParameter<?>> getRequiredParameters() {
3838
return SingleEntityCondition.getExtendedRequiredParameters();
3939
}
4040

41-
public SingleEntityCondition.Builder builder (ItemCondition condition) {
41+
public static SingleEntityCondition.Builder builder (ItemCondition condition) {
4242
return () -> new ApplyToItem(condition);
4343
}
4444

45-
public SingleEntityCondition.Builder builder (ItemCondition.Builder condition) {
45+
public static SingleEntityCondition.Builder builder (ItemCondition.Builder condition) {
4646
return () -> new ApplyToItem(condition.build());
4747
}
4848

49-
public SingleEntityCondition.Builder builder (MatchToolLootCondition condition) {
49+
public static SingleEntityCondition.Builder builder (MatchToolLootCondition condition) {
5050
return () -> new ApplyToItem((condition));
5151
}
5252
}

src/main/java/com/provismet/CombatPlusCore/enchantment/loot/condition/singleEntity/SingleEntityLambdaCondition.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public boolean test (LootContext lootContext) {
3535
else return predicate.get().test(entity);
3636
}
3737

38-
SingleEntityCondition.Builder builder (Identifier function) {
38+
public static SingleEntityCondition.Builder builder (Identifier function) {
3939
return () -> new SingleEntityLambdaCondition(function);
4040
}
4141
}

0 commit comments

Comments
 (0)