Skip to content

Commit 863ee32

Browse files
committed
[PORT] Chrysalis loot tables work again.
1 parent 4aa96fa commit 863ee32

File tree

9 files changed

+16
-8
lines changed

9 files changed

+16
-8
lines changed

src/main/generate_butterfly_files.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
]
4141

4242
# File locations
43-
ACHIEVEMENTS = "resources/data/butterflies/advancements/butterfly/"
43+
ACHIEVEMENTS = "resources/data/butterflies/advancement/butterfly/"
4444
BIOME_MODIFIERS = "resources/data/butterflies/neoforge/biome_modifier/"
4545
BUTTERFLY_DATA = "resources/data/butterflies/butterfly_data/"
4646
CODE_GENERATION = "java/com/bokmcdok/butterflies/world/ButterflySpeciesList.java"
47-
FROG_FOOD = "resources/data/minecraft/tags/entity_types/frog_food.json"
47+
FROG_FOOD = "resources/data/minecraft/tags/entity_type/frog_food.json"
4848
LOCALISATION = "resources/assets/butterflies/lang/en_us.json"
4949
BUTTERFLY_ACHIEVEMENT_TEMPLATES = "resources/data/butterflies/templates/advancements/butterfly/"
5050
MALE_BUTTERFLY_ACHIEVEMENT_TEMPLATES = "resources/data/butterflies/templates/advancements/butterfly_male/"

src/main/java/com/bokmcdok/butterflies/registries/BannerPatternRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void initialise() {
3232
// Register the banner pattern itself.
3333
deferredRegister.register("banner_pattern_butterfly", () ->
3434
new BannerPattern(
35-
ResourceLocation.fromNamespaceAndPath(ButterfliesMod.MOD_ID,"banner_pattern_butterfly"),
35+
ResourceLocation.fromNamespaceAndPath(ButterfliesMod.MOD_ID, "banner_pattern_butterfly"),
3636
"block.minecraft.banner.butterflies.banner_pattern_butterfly"));
3737

3838
// Register the tag used to link everything together.

src/main/resources/assets/butterflies/blockstates/bud_allium.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"age=6": {
2222
"model": "butterflies:block/flower_buds/allium_stage6"
2323
},
24-
"age=6": {
24+
"age=7": {
2525
"model": "butterflies:block/flower_buds/allium_stage6"
2626
}
2727
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"asset_id": "butterflies:banner_pattern_butterfly",
3+
"translation_key": "block.minecraft.banner.butterflies.banner_pattern_butterfly"
4+
}

src/main/resources/data/butterflies/loot_table/entities/atlas_chrysalis.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
"max": 1.0,
2323
"min": 0.0
2424
},
25-
"function": "minecraft:looting_enchant"
25+
"enchantment": "minecraft:looting",
26+
"function": "minecraft:enchanted_count_increase"
2627
}
2728
],
2829
"name": "butterflies:silk"

src/main/resources/data/butterflies/loot_table/entities/carpet_chrysalis.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
"max": 1.0,
2323
"min": 0.0
2424
},
25-
"function": "minecraft:looting_enchant"
25+
"enchantment": "minecraft:looting",
26+
"function": "minecraft:enchanted_count_increase"
2627
}
2728
],
2829
"name": "butterflies:silk"

src/main/resources/data/butterflies/loot_table/entities/domestic_silk_chrysalis.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
"max": 1.0,
2323
"min": 0.0
2424
},
25-
"function": "minecraft:looting_enchant"
25+
"enchantment": "minecraft:looting",
26+
"function": "minecraft:enchanted_count_increase"
2627
}
2728
],
2829
"name": "butterflies:silk"

src/main/resources/data/butterflies/loot_table/entities/oak-silk_chrysalis.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
"max": 1.0,
2323
"min": 0.0
2424
},
25-
"function": "minecraft:looting_enchant"
25+
"enchantment": "minecraft:looting",
26+
"function": "minecraft:enchanted_count_increase"
2627
}
2728
],
2829
"name": "butterflies:silk"

0 commit comments

Comments
 (0)