Skip to content
This repository has been archived by the owner on Aug 19, 2024. It is now read-only.

Commit

Permalink
major fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
LeoLezury committed Jul 23, 2024
1 parent 311bc50 commit 0634395
Show file tree
Hide file tree
Showing 77 changed files with 750 additions and 174 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ neoForge {
mappingsVersion = project.parchment_mappings_version
minecraftVersion = project.parchment_minecraft_version
}

runs {
client {
client()
Expand Down
4 changes: 0 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,18 @@ org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.caching=true
org.gradle.configuration-cache=true

# Mappings
parchment_minecraft_version=1.21
parchment_mappings_version=2024.07.07

# Dependencies
minecraft_version=1.21
neo_version=21.0.114-beta

# neoforge.mods.toml
minecraft_version_range=[1.21,1.21.1)
neo_version_range=[21.0.0-beta,)
mod_name=Farm Away
loader_version_range=[4,)
mod_license=MIT License

## Mod Properties
mod_id=farm_away
mod_version=1.0.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// 1.21 2024-07-23T11:52:30.383586 Tags for minecraft:item mod id farm_away
// 1.21 2024-07-24T00:13:55.4829086 Tags for minecraft:item mod id farm_away
5e3f64321ddade1ae8829fe943feba3b9f76ec11 data/farm_away/tags/item/seeds/flame.json
fdd34af9f633905bed8dc3c5b61a7a971d6a65db data/farm_away/tags/item/seeds/shadow.json
f2c6401609ba18572083a8acd9c36df9c6f2d8b3 data/minecraft/tags/item/hoes.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// 1.21 2024-07-23T11:49:14.7311475 Loot Tables
// 1.21 2024-07-24T00:13:55.4829086 Loot Tables
d78dcb4ca293f403f71e600751afa26501965a0c data/farm_away/loot_table/blocks/andesite_farmland.json
32b259d41e082e5e39b80ff3046948f98782d239 data/farm_away/loot_table/blocks/blue_carrot.json
768f6f4fb8eecc9ebdea01000bf4dbe215e26e3b data/farm_away/loot_table/blocks/blues_carrot.json
62d20d426d2170f4a5ca07f5c0a9180217af781d data/farm_away/loot_table/blocks/diorite_farmland.json
90ebf4242c670220ff4184c48e674608f7062a1b data/farm_away/loot_table/blocks/end_stone_farmland.json
4c39f9b7eb18a1a902fe3f98d8a80b8619402ff6 data/farm_away/loot_table/blocks/explosion_potato.json
5c50eec0b83b6070069ec7d28a6c03d0bc0c8ad1 data/farm_away/loot_table/blocks/explosion_potato.json
e78742fc14d00a1b606b94ae5979096ab83624b0 data/farm_away/loot_table/blocks/granite_farmland.json
e27dbf3d23b7817854c5c7bb6a0113ae898ee82a data/farm_away/loot_table/blocks/netherrack_farmland.json
f4284ce151049f900f54197d3240eed097981bcb data/farm_away/loot_table/blocks/stone_farmland.json
ad9b79b77e4e5f6b00a2578f31bd0f9169fe90f4 data/farm_away/loot_table/blocks/strong_carrot.json
ae35bb5251d1e5395d25d9de14e1eae94164fadb data/farm_away/loot_table/blocks/strong_carrot.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21 2024-07-22T16:02:38.5372123 Languages: zh_cn for mod: farm_away
f5745c89358b8036e77de38fbe482d5b0a4c5ed7 assets/farm_away/lang/zh_cn.json
// 1.21 2024-07-24T00:41:26.4764153 Languages: zh_cn for mod: farm_away
483189cccc38db73980dee8e16da5e43d4d83e8c assets/farm_away/lang/zh_cn.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// 1.21 2024-07-23T11:48:41.5884329 Tags for minecraft:block mod id farm_away
// 1.21 2024-07-24T00:13:55.4829086 Tags for minecraft:block mod id farm_away
e8d9c8ae63868fdfe355432e839d26e1ba3519d3 data/farm_away/tags/block/crops/flame.json
f39287f63cbd57684f58b087e6b63eaeea15cef0 data/farm_away/tags/block/crops/shadow.json
fdd34af9f633905bed8dc3c5b61a7a971d6a65db data/farm_away/tags/block/crops/shadow.json
c1826168e18fa3a5776d3046d94c9036e7cc55fe data/farm_away/tags/block/farmlands.json
700b82f15080a74788f4041b7c6cf7a16f5b4827 data/farm_away/tags/block/farmlands/flame.json
bc237eb5c22e64aa55de6752af397805b6441585 data/farm_away/tags/block/farmlands/ray.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,34 @@
// 1.21 2024-07-22T15:52:14.7438012 Block States: farm_away
// 1.21 2024-07-24T00:17:51.59297 Block States: farm_away
e5e4f9b94baac710e56868dff157813854dd0f61 assets/farm_away/blockstates/andesite_farmland.json
3abdc98d6838fb40c94a5206279b5c7624b99d1d assets/farm_away/blockstates/blues_carrot.json
fea064d02cce89c98e187ac02dbc4ddd075ce22f assets/farm_away/blockstates/diorite_farmland.json
8fa8370a85668a281fd15c58a51eb3326b161cee assets/farm_away/blockstates/end_stone_farmland.json
93fa9891972b527b0e9400cf4768b194f3d38f3a assets/farm_away/blockstates/explosion_potato.json
f319b0a817f66fb75ead2055f3125df706fcb814 assets/farm_away/blockstates/granite_farmland.json
d022067839ebb9d009ffd79a1bcfbd036ef6a4da assets/farm_away/blockstates/netherrack_farmland.json
989811828abde6241583bb1f9ae65541956fff08 assets/farm_away/blockstates/stone_farmland.json
c8c033ef098c39c358fee8be9d034f03b167e209 assets/farm_away/blockstates/strong_carrot.json
a1351853de09e07f9cb08197a4e358104ed14351 assets/farm_away/models/block/andesite_farmland.json
1fecfcc6f87baed6d1a7fe903412a9b00ab06dfa assets/farm_away/models/block/andesite_farmland_moist.json
05290c1ecb802834416098305fc7f7d222a4b8ee assets/farm_away/models/block/blues_carrot_stage0.json
988f9bb0e6fe64f2fef5a64fb11a4459cee30437 assets/farm_away/models/block/blues_carrot_stage1.json
dc194cacc42b1319648d7768e4c0b9344e2e0703 assets/farm_away/models/block/blues_carrot_stage2.json
90806b39a1502f288b41c56130d62e74d625f2f1 assets/farm_away/models/block/blues_carrot_stage3.json
d7f2e57877b42bb5396d3d6cb17ea75e7dae219b assets/farm_away/models/block/diorite_farmland.json
3e961f728fdb54834b4e1465014b403958d9119d assets/farm_away/models/block/diorite_farmland_moist.json
d8823362ec97e152028dff7234b40bdfe4989606 assets/farm_away/models/block/end_stone_farmland.json
5b8baad2bf1010174171a016b2f4650aae99f5dc assets/farm_away/models/block/end_stone_farmland_moist.json
0b81106278081874266b46f225e457d3330968cc assets/farm_away/models/block/explosion_potato_stage0.json
3eede16e1cf68d9e80385178bb95eeaa99a9efef assets/farm_away/models/block/explosion_potato_stage1.json
f28779d76bfd6cbd7dce69355259ef969d3f7ef6 assets/farm_away/models/block/explosion_potato_stage2.json
363e400a28a5e3357f21a85504243a15e61a019b assets/farm_away/models/block/explosion_potato_stage3.json
27a6d0a8372b1ccee875dd58959c09b1482a1249 assets/farm_away/models/block/granite_farmland.json
ef89b2e2026f221f60ab0000c8b0a5afae35c6ae assets/farm_away/models/block/granite_farmland_moist.json
d3ba84d483e70dd028af566464decab5f66f526d assets/farm_away/models/block/netherrack_farmland.json
a8e0e260be8b6ad2cbb33732324ba7fde4a1ddc0 assets/farm_away/models/block/netherrack_farmland_moist.json
c2e38ec902d3e2173af3f89cc06d0465662c16a1 assets/farm_away/models/block/stone_farmland.json
0fe30ebcfab5bc4e7d7bb6263cd7cabcc454a51f assets/farm_away/models/block/stone_farmland_moist.json
8f39111520f347d346a52307a644b7c50ab6ac8a assets/farm_away/models/block/strong_carrot_stage0.json
494dd5f406451458a185bc73eb25abd04a0ee161 assets/farm_away/models/block/strong_carrot_stage1.json
e299cb6370ea1f4cf1cf9d73792bd36984b14baa assets/farm_away/models/block/strong_carrot_stage2.json
c77084c22b640ed604d2f2c5800ac8674d28e5da assets/farm_away/models/block/strong_carrot_stage3.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// 1.21 2024-07-23T11:48:41.5704317 Item Models: farm_away
// 1.21 2024-07-24T00:13:55.4829086 Item Models: farm_away
2ad32db58c0fa499a74244b0a93d24376c839f8f assets/farm_away/models/item/andesite_farmland.json
b2a7e655df68a186d639dec88988ceae42600755 assets/farm_away/models/item/blues_carrot.json
eedd987f394f89efed262824833a3b809aa1d980 assets/farm_away/models/item/diorite_farmland.json
dd2330312c0b5631c30a18741f3413c1a362a5e1 assets/farm_away/models/item/end_stone_farmland.json
809e861231db4be33286777bc534063313376088 assets/farm_away/models/item/enhanced_hoe.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21 2024-07-22T16:02:38.535697 Languages: en_us for mod: farm_away
e4cafbf8f653033724c05828e9e0fdfbbae8cd41 assets/farm_away/lang/en_us.json
// 1.21 2024-07-24T00:41:26.4764153 Languages: en_us for mod: farm_away
a089602bc83e0efc2cff81deb9c6606ac9f68b5f assets/farm_away/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"variants": {
"age=0": {
"model": "farm_away:block/blues_carrot_stage0"
},
"age=1": {
"model": "farm_away:block/blues_carrot_stage0"
},
"age=10": {
"model": "farm_away:block/blues_carrot_stage2"
},
"age=11": {
"model": "farm_away:block/blues_carrot_stage2"
},
"age=12": {
"model": "farm_away:block/blues_carrot_stage2"
},
"age=13": {
"model": "farm_away:block/blues_carrot_stage2"
},
"age=14": {
"model": "farm_away:block/blues_carrot_stage2"
},
"age=15": {
"model": "farm_away:block/blues_carrot_stage3"
},
"age=2": {
"model": "farm_away:block/blues_carrot_stage0"
},
"age=3": {
"model": "farm_away:block/blues_carrot_stage0"
},
"age=4": {
"model": "farm_away:block/blues_carrot_stage0"
},
"age=5": {
"model": "farm_away:block/blues_carrot_stage1"
},
"age=6": {
"model": "farm_away:block/blues_carrot_stage1"
},
"age=7": {
"model": "farm_away:block/blues_carrot_stage1"
},
"age=8": {
"model": "farm_away:block/blues_carrot_stage1"
},
"age=9": {
"model": "farm_away:block/blues_carrot_stage1"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"variants": {
"age=0": {
"model": "farm_away:block/explosion_potato_stage0"
},
"age=1": {
"model": "farm_away:block/explosion_potato_stage0"
},
"age=2": {
"model": "farm_away:block/explosion_potato_stage1"
},
"age=3": {
"model": "farm_away:block/explosion_potato_stage1"
},
"age=4": {
"model": "farm_away:block/explosion_potato_stage2"
},
"age=5": {
"model": "farm_away:block/explosion_potato_stage2"
},
"age=6": {
"model": "farm_away:block/explosion_potato_stage2"
},
"age=7": {
"model": "farm_away:block/explosion_potato_stage3"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"age=0": {
"model": "farm_away:block/strong_carrot_stage0"
},
"age=1": {
"model": "farm_away:block/strong_carrot_stage1"
},
"age=2": {
"model": "farm_away:block/strong_carrot_stage2"
},
"age=3": {
"model": "farm_away:block/strong_carrot_stage3"
}
}
}
5 changes: 5 additions & 0 deletions src/generated/resources/assets/farm_away/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
{
"block.farm_away.andesite_farmland": "Andesite Farmland",
"block.farm_away.blues_carrot": "Blues Carrot",
"block.farm_away.diorite_farmland": "Diorite Farmland",
"block.farm_away.end_stone_farmland": "End Stone Farmland",
"block.farm_away.explosion_potato": "Explosion Potato",
"block.farm_away.granite_farmland": "Granite Farmland",
"block.farm_away.netherrack_farmland": "Netherrack Farmland",
"block.farm_away.stone_farmland": "Stone Farmland",
"block.farm_away.strong_carrot": "Strong Carrot",
"effect.farm_away.blues": "Blues",
"entity.farm_away.explosion_potato": "Explosion Potato",
"item.farm_away.enhanced_hoe": "Enhanced Hoe",
"itemGroup.farm_away.main": "Farm Away"
}
5 changes: 5 additions & 0 deletions src/generated/resources/assets/farm_away/lang/zh_cn.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
{
"block.farm_away.andesite_farmland": "安山岩耕地",
"block.farm_away.blues_carrot": "蓝胡萝卜",
"block.farm_away.diorite_farmland": "闪长岩耕地",
"block.farm_away.end_stone_farmland": "末地石耕地",
"block.farm_away.explosion_potato": "爆炎土豆",
"block.farm_away.granite_farmland": "花岗岩耕地",
"block.farm_away.netherrack_farmland": "下界岩耕地",
"block.farm_away.stone_farmland": "石耕地",
"block.farm_away.strong_carrot": "强力胡萝卜",
"effect.farm_away.blues": "",
"entity.farm_away.explosion_potato": "爆炎土豆",
"item.farm_away.enhanced_hoe": "强化锄",
"itemGroup.farm_away.main": "田园巫术"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/crop",
"render_type": "minecraft:cutout",
"textures": {
"crop": "farm_away:block/blues_carrot_stage0"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/crop",
"render_type": "minecraft:cutout",
"textures": {
"crop": "farm_away:block/blues_carrot_stage1"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/crop",
"render_type": "minecraft:cutout",
"textures": {
"crop": "farm_away:block/blues_carrot_stage2"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/crop",
"render_type": "minecraft:cutout",
"textures": {
"crop": "farm_away:block/blues_carrot_stage3"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/crop",
"render_type": "minecraft:cutout",
"textures": {
"crop": "farm_away:block/explosion_potato_stage0"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/crop",
"render_type": "minecraft:cutout",
"textures": {
"crop": "farm_away:block/explosion_potato_stage1"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/crop",
"render_type": "minecraft:cutout",
"textures": {
"crop": "farm_away:block/explosion_potato_stage2"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/crop",
"render_type": "minecraft:cutout",
"textures": {
"crop": "farm_away:block/explosion_potato_stage3"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/crop",
"render_type": "minecraft:cutout",
"textures": {
"crop": "farm_away:block/strong_carrot_stage0"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/crop",
"render_type": "minecraft:cutout",
"textures": {
"crop": "farm_away:block/strong_carrot_stage1"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/crop",
"render_type": "minecraft:cutout",
"textures": {
"crop": "farm_away:block/strong_carrot_stage2"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:block/crop",
"render_type": "minecraft:cutout",
"textures": {
"crop": "farm_away:block/strong_carrot_stage3"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "farm_away:item/blues_carrot"
}
}

This file was deleted.

Loading

0 comments on commit 0634395

Please sign in to comment.