From 7e2204b7bbe483d9a9041abee0e63aedebd50d3e Mon Sep 17 00:00:00 2001 From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com> Date: Fri, 15 May 2026 13:36:50 -0700 Subject: [PATCH] Update to NeoForge 26.1.2.55-beta --- build.gradle | 6 +++--- gradle.properties | 6 +++--- .../.cache/0c3c4e37b873ca9196c7cf3a963aae6df815ddb4 | 2 +- .../.cache/221483d9edeccdc82e726e39216c875f3fc356d3 | 2 +- .../.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 2 +- .../.cache/5dcc257a984c72551805934aae700472bb3b56dd | 2 +- .../.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 | 2 +- .../.cache/735031f3addf80804addae5e3f53249900116f1e | 2 +- .../.cache/7aa54df69c09329e7fabfe3bd9efa66304777f0a | 2 +- .../.cache/93943142017732f21fbc4fa325d116c728b69767 | 2 +- .../.cache/962e88055ea3346318d91e954dd63cc7fe72cbd1 | 2 +- .../.cache/dd659b25f3b63c39e7c4bd9f09cb7a21361864b4 | 2 +- .../.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 | 2 +- .../.cache/f1f3e3a91f3dfa1ddb5216abfcdcc42a5cffc23b | 9 ++++----- .../.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd | 2 +- .../.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 | 2 +- .../exdeorum/loot_modifiers/compressed_hammer.json | 3 ++- .../resources/data/exdeorum/loot_modifiers/crook.json | 3 ++- .../resources/data/exdeorum/loot_modifiers/hammer.json | 3 ++- .../neoforge/loot_modifiers/global_loot_modifiers.json | 8 -------- .../thedarkcolour/exdeorum/data/LootModifiers.java | 5 +++-- .../exdeorum/loot/CompressedHammerLootModifier.java | 4 ++-- .../thedarkcolour/exdeorum/loot/CrookLootModifier.java | 4 ++-- .../exdeorum/loot/HammerLootModifier.java | 10 +++++----- .../java/thedarkcolour/exdeorum/loot/package-info.java | 2 +- 25 files changed, 42 insertions(+), 47 deletions(-) delete mode 100644 src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json diff --git a/build.gradle b/build.gradle index b448e120..b3bfd134 100644 --- a/build.gradle +++ b/build.gradle @@ -123,9 +123,9 @@ dependencies { //} // JADE OPTIONAL //implementation("curse.maven:jade-324717:6291517") - // JEI OPTIONAL todo change back to mc_version - compileOnly("mezz.jei:jei-${'26.1.2'}-neoforge-api:${jei_version}") - runtimeOnly("mezz.jei:jei-${'26.1.2'}-neoforge:${jei_version}") + // JEI OPTIONAL + compileOnly("mezz.jei:jei-${mc_version}-neoforge-api:${jei_version}") + runtimeOnly("mezz.jei:jei-${mc_version}-neoforge:${jei_version}") // EMI OPTIONAL //compileOnly("dev.emi:emi-neoforge:${emi_version}+${mc_version}:api") //runtimeOnly("dev.emi:emi-neoforge:${emi_version}+${mc_version}") diff --git a/gradle.properties b/gradle.properties index ac7b4571..205072bb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,9 +5,9 @@ org.gradle.daemon=true org.gradle.parallel=true org.gradle.caching=true -mc_version=26.1.1 -neo_version=26.1.1.1-beta -neo_version_range=[26.1,) +mc_version=26.1.2 +neo_version=26.1.2.55-beta +neo_version_range=[26.1.2,) loader_version_range=[4,) jei_version=29.5.0.28 diff --git a/src/generated/resources/.cache/0c3c4e37b873ca9196c7cf3a963aae6df815ddb4 b/src/generated/resources/.cache/0c3c4e37b873ca9196c7cf3a963aae6df815ddb4 index 858b5c57..cd5f865c 100644 --- a/src/generated/resources/.cache/0c3c4e37b873ca9196c7cf3a963aae6df815ddb4 +++ b/src/generated/resources/.cache/0c3c4e37b873ca9196c7cf3a963aae6df815ddb4 @@ -1,3 +1,3 @@ -// 26.1.1 2026-05-14T19:12:42.901284802 atlases generator for exdeorum +// 26.1.2 2026-05-15T13:35:45.56237275 atlases generator for exdeorum 26af1814d32fa6b215fbd918b14fe1c65d9e1eb9 assets/minecraft/atlases/blocks.json 3737d1173220d03819c78453e07b289e4c5f8881 assets/minecraft/atlases/gui.json diff --git a/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 b/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 index fb857fbb..8dc50257 100644 --- a/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 +++ b/src/generated/resources/.cache/221483d9edeccdc82e726e39216c875f3fc356d3 @@ -1,4 +1,4 @@ -// 26.1.1 2026-05-14T19:37:53.714706698 Tags for minecraft:item mod id exdeorum +// 26.1.2 2026-05-15T13:35:45.574416969 Tags for minecraft:item mod id exdeorum 6c72957356b1d59a27be736fa1da54a5a9795ef7 data/exdeorum/tags/item/barrels.json 6afa16b45f76c0defa1675d07586e2c6e6b0be69 data/exdeorum/tags/item/compressed/andesite.json 31b46613766e4cdc53196850495ab1019f61cb48 data/exdeorum/tags/item/compressed/blackstone.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 5dda069e..32ceae7d 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 26.1.1 2026-05-14T19:37:53.704965043 Loot Tables +// 26.1.2 2026-05-15T13:35:45.561245497 Loot Tables 105d8a61ea7145d7798146d385d4aad24fd1588d data/exdeorum/loot_table/blocks/acacia_barrel.json 83d50cbd5e45dfa72bf102fd4c0103a388cff9c4 data/exdeorum/loot_table/blocks/acacia_compressed_sieve.json 1e77127a82cbba0937bb02694f65cf1893aeffcb data/exdeorum/loot_table/blocks/acacia_crucible.json diff --git a/src/generated/resources/.cache/5dcc257a984c72551805934aae700472bb3b56dd b/src/generated/resources/.cache/5dcc257a984c72551805934aae700472bb3b56dd index 18547a24..dac70aa6 100644 --- a/src/generated/resources/.cache/5dcc257a984c72551805934aae700472bb3b56dd +++ b/src/generated/resources/.cache/5dcc257a984c72551805934aae700472bb3b56dd @@ -1,2 +1,2 @@ -// 26.1.1 2026-04-06T22:07:00.415116599 Tags for minecraft:fluid mod id exdeorum +// 26.1.2 2026-05-15T13:35:45.554135068 Tags for minecraft:fluid mod id exdeorum 71d650702c2830e62790c9a110dd0c62eb552cf5 data/minecraft/tags/fluid/water.json diff --git a/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 b/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 index e455bdb2..49446088 100644 --- a/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 +++ b/src/generated/resources/.cache/711e6e4ef0ec2176e93c58a9656c8098f7158439 @@ -1,4 +1,4 @@ -// 26.1.1 2026-05-14T19:37:53.7142837 Tags for minecraft:block mod id exdeorum +// 26.1.2 2026-05-15T13:35:45.573871937 Tags for minecraft:block mod id exdeorum c2f6fb7224bd1e2fdb87249751113c4d66dbc21f data/exdeorum/tags/block/mineable/hammer.json 77dfab311d3714c77bcac2df0397d23d4707f03b data/exdeorum/tags/block/watering_can_tickable.json f6a9610ebae09549baf17e27200037cd17318055 data/minecraft/tags/block/leaves.json diff --git a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e b/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e index 8ae6911d..e17e0f22 100644 --- a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e +++ b/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e @@ -1,2 +1,2 @@ -// 26.1.1 2026-04-06T22:07:00.434866163 Sound Definitions +// 26.1.2 2026-05-15T13:35:45.574948145 Sound Definitions 33424544e6cf49e7ad5d1a6a9bc815d66be63114 assets/exdeorum/sounds.json diff --git a/src/generated/resources/.cache/7aa54df69c09329e7fabfe3bd9efa66304777f0a b/src/generated/resources/.cache/7aa54df69c09329e7fabfe3bd9efa66304777f0a index 3e9391c2..1a35816f 100644 --- a/src/generated/resources/.cache/7aa54df69c09329e7fabfe3bd9efa66304777f0a +++ b/src/generated/resources/.cache/7aa54df69c09329e7fabfe3bd9efa66304777f0a @@ -1,2 +1,2 @@ -// 26.1.1 2026-04-06T22:07:00.433897938 Tags for minecraft:worldgen/world_preset mod id exdeorum +// 26.1.2 2026-05-15T13:35:45.574175731 Tags for minecraft:worldgen/world_preset mod id exdeorum fdfafeea90e535146391dd75bd9e25af8b43fe30 data/minecraft/tags/worldgen/world_preset/normal.json diff --git a/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 b/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 index 55e3a33f..bb8f8751 100644 --- a/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 +++ b/src/generated/resources/.cache/93943142017732f21fbc4fa325d116c728b69767 @@ -1,2 +1,2 @@ -// 26.1.1 2026-05-15T11:59:32.026904984 ModKit Language: en_us for mod 'exdeorum' +// 26.1.2 2026-05-15T13:35:45.55322574 ModKit Language: en_us for mod 'exdeorum' 994c3e75819f30f5398e9ddf6b3ace1e04caccfc assets/exdeorum/lang/en_us.json diff --git a/src/generated/resources/.cache/962e88055ea3346318d91e954dd63cc7fe72cbd1 b/src/generated/resources/.cache/962e88055ea3346318d91e954dd63cc7fe72cbd1 index 26c3be61..7b53d01d 100644 --- a/src/generated/resources/.cache/962e88055ea3346318d91e954dd63cc7fe72cbd1 +++ b/src/generated/resources/.cache/962e88055ea3346318d91e954dd63cc7fe72cbd1 @@ -1,4 +1,4 @@ -// 26.1.1 2026-04-06T22:07:00.432895568 Tags for minecraft:worldgen/structure_set mod id exdeorum +// 26.1.2 2026-05-15T13:35:45.57298446 Tags for minecraft:worldgen/structure_set mod id exdeorum 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/exdeorum/tags/worldgen/structure_set/overworld_void_structure_sets.json 56ffeb3beb8ca3df4a20420bc56f6139ebf57ada data/exdeorum/tags/worldgen/structure_set/the_end_void_structure_sets.json 14abefb27112e5ad3ebce0cb9618fb51c54e2f9d data/exdeorum/tags/worldgen/structure_set/the_nether_void_structure_sets.json diff --git a/src/generated/resources/.cache/dd659b25f3b63c39e7c4bd9f09cb7a21361864b4 b/src/generated/resources/.cache/dd659b25f3b63c39e7c4bd9f09cb7a21361864b4 index 7872bf14..965d2bf4 100644 --- a/src/generated/resources/.cache/dd659b25f3b63c39e7c4bd9f09cb7a21361864b4 +++ b/src/generated/resources/.cache/dd659b25f3b63c39e7c4bd9f09cb7a21361864b4 @@ -1,4 +1,4 @@ -// 26.1.1 2026-05-15T13:18:31.946487302 ModKit Recipes for mod 'exdeorum' +// 26.1.2 2026-05-15T13:35:45.564024987 ModKit Recipes for mod 'exdeorum' 0060d0e16dba2df44cc115f8ed68ef5dc52c74f1 data/exdeorum/advancement/recipes/building_blocks/andesite.json b9c5d12771d724cd646e637641da7a4d6b0a6bbf data/exdeorum/advancement/recipes/building_blocks/basalt.json d87a237248c140367dbfb748d45f532534e5b45c data/exdeorum/advancement/recipes/building_blocks/blackstone.json diff --git a/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 b/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 index c224c692..07ed3417 100644 --- a/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 +++ b/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 @@ -1,4 +1,4 @@ -// 26.1.1 2026-04-06T22:07:00.434599089 Advancements +// 26.1.2 2026-05-15T13:35:45.57472449 Advancements 5d50288336dc6d2f95c5c57ca160141b33b42922 data/exdeorum/advancement/core/barrel.json be6b186fe6fad6fbed971044630d603dde0b55c0 data/exdeorum/advancement/core/crook.json 62fcc7ce39b005c4d95926b57d98e348b4cc46f9 data/exdeorum/advancement/core/root.json diff --git a/src/generated/resources/.cache/f1f3e3a91f3dfa1ddb5216abfcdcc42a5cffc23b b/src/generated/resources/.cache/f1f3e3a91f3dfa1ddb5216abfcdcc42a5cffc23b index 89bc60bf..f622d0ad 100644 --- a/src/generated/resources/.cache/f1f3e3a91f3dfa1ddb5216abfcdcc42a5cffc23b +++ b/src/generated/resources/.cache/f1f3e3a91f3dfa1ddb5216abfcdcc42a5cffc23b @@ -1,5 +1,4 @@ -// 26.1.1 2026-04-06T22:07:00.433314948 Global Loot Modifiers : exdeorum -539ba0e881830430ae2c03f7ac8dec6f2de478a0 data/exdeorum/loot_modifiers/compressed_hammer.json -dd0417e36e03e0f51e1f1bbcff295b54128fdf8f data/exdeorum/loot_modifiers/crook.json -57991d8346a472f12c1a4b6cb94151d2c1bfa371 data/exdeorum/loot_modifiers/hammer.json -4dbec2c1b329ffcd96f4f903f59382c75e0d538c data/neoforge/loot_modifiers/global_loot_modifiers.json +// 26.1.2 2026-05-15T13:35:45.573521046 Global Loot Modifiers : exdeorum +97fb08d88e69018349a497deba2a141f95ef8edc data/exdeorum/loot_modifiers/compressed_hammer.json +f5f8a070f0533dead2702fae6edfdbad6c48311c data/exdeorum/loot_modifiers/crook.json +468f740579fc7429410bbaf9b86c6ada29c6928f data/exdeorum/loot_modifiers/hammer.json diff --git a/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd b/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd index ba98e1cb..d4897e4f 100644 --- a/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd +++ b/src/generated/resources/.cache/fc2b6ffd874afaa6f2f20b450921dbfbbc8b86bd @@ -1,4 +1,4 @@ -// 26.1.1 2026-05-15T11:59:32.028019255 ModKit Item Models for mod 'exdeorum' +// 26.1.2 2026-05-15T13:35:45.554995054 ModKit Item Models for mod 'exdeorum' 8cfb1fdb327d53288205eb62b8b7857eafa2a091 assets/exdeorum/items/acacia_barrel.json 8c5b35194de98a2325ed84334623e72596e50b0f assets/exdeorum/items/acacia_compressed_sieve.json 930e698609436fdf71a3ab0b738f7566adfe15c7 assets/exdeorum/items/acacia_crucible.json diff --git a/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 b/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 index 9298ed3e..311ebf0a 100644 --- a/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 +++ b/src/generated/resources/.cache/fc41039380e20c0de816b178c0dd0b68eb0f1d50 @@ -1,4 +1,4 @@ -// 26.1.1 2026-05-14T21:40:52.184629639 ModKit Block Models for mod 'exdeorum' +// 26.1.2 2026-05-15T13:35:45.559143335 ModKit Block Models for mod 'exdeorum' c73197f2dc770a353883c387b2b1f0b082283576 assets/exdeorum/blockstates/acacia_barrel.json e36a3d22e00c0eae2336a39f3d0c904ef1d89119 assets/exdeorum/blockstates/acacia_compressed_sieve.json a3ef4562a4c7833439d8d66ff9c210406d317995 assets/exdeorum/blockstates/acacia_crucible.json diff --git a/src/generated/resources/data/exdeorum/loot_modifiers/compressed_hammer.json b/src/generated/resources/data/exdeorum/loot_modifiers/compressed_hammer.json index 357ac142..d18de720 100644 --- a/src/generated/resources/data/exdeorum/loot_modifiers/compressed_hammer.json +++ b/src/generated/resources/data/exdeorum/loot_modifiers/compressed_hammer.json @@ -7,5 +7,6 @@ "items": "#exdeorum:compressed_hammers" } } - ] + ], + "priority": 1 } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_modifiers/crook.json b/src/generated/resources/data/exdeorum/loot_modifiers/crook.json index 65bfa325..d90559b9 100644 --- a/src/generated/resources/data/exdeorum/loot_modifiers/crook.json +++ b/src/generated/resources/data/exdeorum/loot_modifiers/crook.json @@ -7,5 +7,6 @@ "items": "#exdeorum:crooks" } } - ] + ], + "priority": 1 } \ No newline at end of file diff --git a/src/generated/resources/data/exdeorum/loot_modifiers/hammer.json b/src/generated/resources/data/exdeorum/loot_modifiers/hammer.json index 3378ec09..0d2eda87 100644 --- a/src/generated/resources/data/exdeorum/loot_modifiers/hammer.json +++ b/src/generated/resources/data/exdeorum/loot_modifiers/hammer.json @@ -7,5 +7,6 @@ "items": "#exdeorum:hammers" } } - ] + ], + "priority": 1 } \ No newline at end of file diff --git a/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json b/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json deleted file mode 100644 index ba9f3fb4..00000000 --- a/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "entries": [ - "exdeorum:hammer", - "exdeorum:compressed_hammer", - "exdeorum:crook" - ], - "replace": false -} \ No newline at end of file diff --git a/src/main/java/thedarkcolour/exdeorum/data/LootModifiers.java b/src/main/java/thedarkcolour/exdeorum/data/LootModifiers.java index aa0d912a..bde6de01 100644 --- a/src/main/java/thedarkcolour/exdeorum/data/LootModifiers.java +++ b/src/main/java/thedarkcolour/exdeorum/data/LootModifiers.java @@ -19,6 +19,7 @@ import thedarkcolour.exdeorum.tag.EItemTags; import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; +import java.util.function.BiFunction; import java.util.function.Function; class LootModifiers extends GlobalLootModifierProvider { @@ -33,7 +34,7 @@ class LootModifiers extends GlobalLootModifierProvider { add("crook", CrookLootModifier::new, EItemTags.CROOKS); } - private void add(String name, Function constructor, TagKey requiredTag) { - add(name, constructor.apply(new LootItemCondition[]{new MatchTool(Optional.of(ItemPredicate.Builder.item().of(this.registries.lookupOrThrow(Registries.ITEM), requiredTag).build()))}), List.of()); + private void add(String name, BiFunction constructor, TagKey requiredTag) { + add(name, constructor.apply(new LootItemCondition[]{new MatchTool(Optional.of(ItemPredicate.Builder.item().of(this.registries.lookupOrThrow(Registries.ITEM), requiredTag).build()))}, 1), List.of()); } } diff --git a/src/main/java/thedarkcolour/exdeorum/loot/CompressedHammerLootModifier.java b/src/main/java/thedarkcolour/exdeorum/loot/CompressedHammerLootModifier.java index 7a15f616..5494990a 100644 --- a/src/main/java/thedarkcolour/exdeorum/loot/CompressedHammerLootModifier.java +++ b/src/main/java/thedarkcolour/exdeorum/loot/CompressedHammerLootModifier.java @@ -14,8 +14,8 @@ import thedarkcolour.exdeorum.tag.EItemTags; public class CompressedHammerLootModifier extends HammerLootModifier { public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(inst -> LootModifier.codecStart(inst).apply(inst, CompressedHammerLootModifier::new)); - public CompressedHammerLootModifier(LootItemCondition[] conditionsIn) { - super(conditionsIn, EItemTags.COMPRESSED_HAMMER_FORTUNE_BLACKLIST); + public CompressedHammerLootModifier(LootItemCondition[] conditionsIn, int priority) { + super(conditionsIn, priority, EItemTags.COMPRESSED_HAMMER_FORTUNE_BLACKLIST); } @Override diff --git a/src/main/java/thedarkcolour/exdeorum/loot/CrookLootModifier.java b/src/main/java/thedarkcolour/exdeorum/loot/CrookLootModifier.java index 594a519c..5a9dba77 100644 --- a/src/main/java/thedarkcolour/exdeorum/loot/CrookLootModifier.java +++ b/src/main/java/thedarkcolour/exdeorum/loot/CrookLootModifier.java @@ -43,8 +43,8 @@ import java.util.List; public class CrookLootModifier extends LootModifier { public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(inst -> LootModifier.codecStart(inst).apply(inst, CrookLootModifier::new)); - public CrookLootModifier(LootItemCondition[] conditions) { - super(conditions); + public CrookLootModifier(LootItemCondition[] conditions, int priority) { + super(conditions, priority); } @Override diff --git a/src/main/java/thedarkcolour/exdeorum/loot/HammerLootModifier.java b/src/main/java/thedarkcolour/exdeorum/loot/HammerLootModifier.java index 5e22bab3..5597ab3e 100644 --- a/src/main/java/thedarkcolour/exdeorum/loot/HammerLootModifier.java +++ b/src/main/java/thedarkcolour/exdeorum/loot/HammerLootModifier.java @@ -44,16 +44,16 @@ public class HammerLootModifier extends LootModifier { private final TagKey fortuneBlacklistTag; - public HammerLootModifier(LootItemCondition[] conditionsIn) { - super(conditionsIn); + public HammerLootModifier(LootItemCondition[] conditionsIn, int priority) { + super(conditionsIn, priority); this.fortuneBlacklistTag = EItemTags.HAMMER_FORTUNE_BLACKLIST; } - protected HammerLootModifier(LootItemCondition[] conditionsIn, TagKey fortuneBlacklistTag) { - super(conditionsIn); + protected HammerLootModifier(LootItemCondition[] conditionsIn, int priority, TagKey fortuneBlacklistTag) { + super(conditionsIn, priority); - this.fortuneBlacklistTag = fortuneBlacklistTag; + this.fortuneBlacklistTag = fortuneBlacklistTag; } @Override diff --git a/src/main/java/thedarkcolour/exdeorum/loot/package-info.java b/src/main/java/thedarkcolour/exdeorum/loot/package-info.java index fea6ffae..4077ae62 100644 --- a/src/main/java/thedarkcolour/exdeorum/loot/package-info.java +++ b/src/main/java/thedarkcolour/exdeorum/loot/package-info.java @@ -16,5 +16,5 @@ * along with this program. If not, see . */ -@javax.annotation.ParametersAreNonnullByDefault +@org.jspecify.annotations.NullMarked package thedarkcolour.exdeorum.loot;