Skip to content

Commit edaf4ab

Browse files
ErrorCraftErrorCraft
committed
Port to 25w06a
1 parent 3f8225f commit edaf4ab

39 files changed

Lines changed: 592 additions & 158 deletions

‎gradle.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/develop
6-
minecraft_version=25w05a
7-
yarn_mappings=25w05a+build.5
6+
minecraft_version=25w06a
7+
yarn_mappings=25w06a+build.7
88
loader_version=0.18.4
99

1010
# Mod Properties
@@ -13,4 +13,4 @@ org.gradle.jvmargs=-Xmx1G
1313
archives_base_name = itematic
1414

1515
# Dependencies
16-
fabric_version=0.115.2+1.21.5
16+
fabric_version=0.116.0+1.21.5

‎src/datagen/java/net/errorcraft/itematic/data/server/tag/ItemTagProvider.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -930,11 +930,10 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
930930
.add(ItemKeys.WARPED_FUNGUS)
931931
.add(ItemKeys.SHORT_GRASS)
932932
.add(ItemKeys.FERN)
933+
.add(ItemKeys.SHORT_DRY_GRASS)
933934
.add(ItemKeys.BUSH)
934935
.add(ItemKeys.DEAD_BUSH)
935936
.add(ItemKeys.DANDELION)
936-
.add(ItemKeys.OPEN_EYEBLOSSOM)
937-
.add(ItemKeys.CLOSED_EYEBLOSSOM)
938937
.add(ItemKeys.POPPY)
939938
.add(ItemKeys.BLUE_ORCHID)
940939
.add(ItemKeys.ALLIUM)
@@ -947,6 +946,9 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
947946
.add(ItemKeys.CORNFLOWER)
948947
.add(ItemKeys.LILY_OF_THE_VALLEY)
949948
.add(ItemKeys.TORCHFLOWER)
949+
.add(ItemKeys.CACTUS_FLOWER)
950+
.add(ItemKeys.CLOSED_EYEBLOSSOM)
951+
.add(ItemKeys.OPEN_EYEBLOSSOM)
950952
.add(ItemKeys.WITHER_ROSE)
951953
.add(ItemKeys.PINK_PETALS)
952954
.add(ItemKeys.WILDFLOWERS)
@@ -964,6 +966,7 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
964966
.add(ItemKeys.VINE)
965967
.add(ItemKeys.TALL_GRASS)
966968
.add(ItemKeys.LARGE_FERN)
969+
.add(ItemKeys.TALL_DRY_GRASS)
967970
.add(ItemKeys.SUNFLOWER)
968971
.add(ItemKeys.LILAC)
969972
.add(ItemKeys.ROSE_BUSH)
@@ -1264,6 +1267,10 @@ protected void configure(RegistryWrapper.WrapperLookup lookup) {
12641267
.add(ItemKeys.IRON_HORSE_ARMOR)
12651268
.add(ItemKeys.GOLDEN_HORSE_ARMOR)
12661269
.add(ItemKeys.DIAMOND_HORSE_ARMOR);
1270+
this.getOrCreateTagBuilder(ItematicItemTags.EGGS)
1271+
.add(ItemKeys.EGG)
1272+
.add(ItemKeys.BROWN_EGG)
1273+
.add(ItemKeys.BLUE_EGG);
12671274
this.getOrCreateTagBuilder(ItematicItemTags.FOOD)
12681275
.add(ItemKeys.APPLE)
12691276
.add(ItemKeys.GOLDEN_APPLE)

‎src/main/generated/data/minecraft/item/blue_egg.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"behavior": {
3+
"minecraft:dispensable": {
4+
"behavior": "minecraft:shoot_projectile"
5+
},
6+
"minecraft:projectile": {
7+
"components": {
8+
"minecraft:chicken/variant": "minecraft:cold"
9+
},
10+
"entity": "minecraft:egg"
11+
},
12+
"minecraft:stackable": 16,
13+
"minecraft:throwable": {
14+
"angle_offset": 0.0,
15+
"speed": 1.5
16+
}
17+
},
18+
"display": {
19+
"model": "minecraft:blue_egg",
20+
"translation_key": "item.minecraft.blue_egg"
21+
}
22+
}

‎src/main/generated/data/minecraft/item/brown_egg.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"behavior": {
3+
"minecraft:dispensable": {
4+
"behavior": "minecraft:shoot_projectile"
5+
},
6+
"minecraft:projectile": {
7+
"components": {
8+
"minecraft:chicken/variant": "minecraft:warm"
9+
},
10+
"entity": "minecraft:egg"
11+
},
12+
"minecraft:stackable": 16,
13+
"minecraft:throwable": {
14+
"angle_offset": 0.0,
15+
"speed": 1.5
16+
}
17+
},
18+
"display": {
19+
"model": "minecraft:brown_egg",
20+
"translation_key": "item.minecraft.brown_egg"
21+
}
22+
}

‎src/main/generated/data/minecraft/item/cactus_flower.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"behavior": {
3+
"minecraft:block": {
4+
"block": "minecraft:cactus_flower"
5+
},
6+
"minecraft:compostable": {
7+
"level_increase_chance": 0.3
8+
},
9+
"minecraft:stackable": 64
10+
},
11+
"display": {
12+
"model": "minecraft:cactus_flower",
13+
"translation_key": "block.minecraft.cactus_flower"
14+
}
15+
}

‎src/main/generated/data/minecraft/item/compass.json‎

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
"behavior": {
3-
"minecraft:pointable": {
4-
"lodestone_translation_key": "item.minecraft.lodestone_compass"
5-
},
63
"minecraft:stackable": 64
74
},
85
"display": {
@@ -15,10 +12,44 @@
1512
"type": "minecraft:sequence",
1613
"handler": "minecraft:passing",
1714
"entries": [
15+
{
16+
"action": {
17+
"type": "minecraft:modify_item",
18+
"item_modifier": {
19+
"count": 1.0,
20+
"function": "minecraft:split"
21+
}
22+
}
23+
},
1824
{
1925
"action": {
2026
"type": "minecraft:set_item_pointer_location",
21-
"position": "interacted"
27+
"position": "interacted",
28+
"stack": "result"
29+
}
30+
},
31+
{
32+
"action": {
33+
"type": "minecraft:modify_item",
34+
"item_modifier": {
35+
"function": "minecraft:sequence",
36+
"functions": [
37+
{
38+
"function": "minecraft:set_name",
39+
"name": {
40+
"translate": "item.minecraft.lodestone_compass"
41+
},
42+
"target": "item_name"
43+
},
44+
{
45+
"components": {
46+
"minecraft:enchantment_glint_override": true
47+
},
48+
"function": "minecraft:set_components"
49+
}
50+
]
51+
},
52+
"stack": "result"
2253
}
2354
},
2455
{

‎src/main/generated/data/minecraft/item/egg.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
"behavior": "minecraft:shoot_projectile"
55
},
66
"minecraft:projectile": {
7+
"components": {
8+
"minecraft:chicken/variant": "minecraft:temperate"
9+
},
710
"entity": "minecraft:egg"
811
},
912
"minecraft:stackable": 16,

‎src/main/generated/data/minecraft/item/short_dry_grass.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"behavior": {
3+
"minecraft:block": {
4+
"block": "minecraft:short_dry_grass"
5+
},
6+
"minecraft:compostable": {
7+
"level_increase_chance": 0.3
8+
},
9+
"minecraft:fuel": {
10+
"ticks": 100
11+
},
12+
"minecraft:stackable": 64
13+
},
14+
"display": {
15+
"model": "minecraft:short_dry_grass",
16+
"translation_key": "block.minecraft.short_dry_grass"
17+
}
18+
}

‎src/main/generated/data/minecraft/item/tall_dry_grass.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"behavior": {
3+
"minecraft:block": {
4+
"block": "minecraft:tall_dry_grass"
5+
},
6+
"minecraft:compostable": {
7+
"level_increase_chance": 0.3
8+
},
9+
"minecraft:fuel": {
10+
"ticks": 100
11+
},
12+
"minecraft:stackable": 64
13+
},
14+
"display": {
15+
"model": "minecraft:tall_dry_grass",
16+
"translation_key": "block.minecraft.tall_dry_grass"
17+
}
18+
}

‎src/main/generated/data/minecraft/item_group_entry_provider/combat.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@
2424
"minecraft:tnt",
2525
"minecraft:end_crystal",
2626
"minecraft:snowball",
27-
"minecraft:egg",
27+
{
28+
"type": "tag",
29+
"tag": "minecraft:item_group/eggs"
30+
},
2831
"minecraft:wind_charge",
2932
"minecraft:bow",
3033
"minecraft:crossbow",

0 commit comments

Comments
 (0)