mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-04 06:44:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev

Browse source
This commit is contained in:
simibubi 2025-02-27 16:52:39 +01:00
commit 10be63ab1a
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/generated/resources/data/create/create/potato_projectile/type/carrot.json
View file

@ -2,7 +2,7 @@
"damage": 4,
"items": "minecraft:carrot",
"knockback": 0.3,
"on_entity_hit": {
"on_block_hit": {
"type": "create:plant_crop",
"block": "minecraft:carrots"
},

2
src/generated/resources/data/create/create/potato_projectile/type/melon_block.json
View file

@ -2,7 +2,7 @@
"damage": 8,
"items": "minecraft:melon",
"knockback": 2.0,
"on_entity_hit": {
"on_block_hit": {
"type": "create:place_block_on_ground",
"block": "minecraft:melon"
},

2
src/generated/resources/data/create/create/potato_projectile/type/potato.json
View file

@ -2,7 +2,7 @@
"damage": 5,
"items": "minecraft:potato",
"knockback": 1.5,
"on_entity_hit": {
"on_block_hit": {
"type": "create:plant_crop",
"block": "minecraft:potatoes"
},

2
src/generated/resources/data/create/create/potato_projectile/type/pumpkin_block.json
View file

@ -2,7 +2,7 @@
"damage": 6,
"items": "minecraft:pumpkin",
"knockback": 2.0,
"on_entity_hit": {
"on_block_hit": {
"type": "create:place_block_on_ground",
"block": "minecraft:pumpkin"
},

2
src/main/java/com/simibubi/create/api/equipment/potatoCannon/PotatoCannonProjectileType.java
View file

@ -47,7 +47,7 @@ public record PotatoCannonProjectileType(HolderSet<Item> items, int reloadTicks,
PotatoProjectileRenderMode.CODEC.optionalFieldOf("render_mode", Billboard.INSTANCE).forGetter(PotatoCannonProjectileType::renderMode),
PotatoProjectileEntityHitAction.CODEC.optionalFieldOf("pre_entity_hit").forGetter(p -> p.preEntityHit),
PotatoProjectileEntityHitAction.CODEC.optionalFieldOf("on_entity_hit").forGetter(p -> p.onEntityHit),
PotatoProjectileBlockHitAction.CODEC.optionalFieldOf("on_entity_hit").forGetter(p -> p.onBlockHit)
PotatoProjectileBlockHitAction.CODEC.optionalFieldOf("on_block_hit").forGetter(p -> p.onBlockHit)
).apply(i, PotatoCannonProjectileType::new));
public static Optional<Reference<PotatoCannonProjectileType>> getTypeForItem(RegistryAccess registryAccess, Item item) {