diff --git a/src/main/java/superlord/wildlands/common/CommonEvents.java b/src/main/java/superlord/wildlands/common/CommonEvents.java index 466960b..1eeac87 100644 --- a/src/main/java/superlord/wildlands/common/CommonEvents.java +++ b/src/main/java/superlord/wildlands/common/CommonEvents.java @@ -31,7 +31,7 @@ public static void init(final FMLCommonSetupEvent event) { } private static void compostibleBlockss() { - compostibleBlocks(0.3F, WLBlocks.COCONUT_LEAVES.get()); + compostibleBlocks(0.3F, WLBlocks.COCONUT_LEAVES.get()); compostibleBlocks(0.3F, WLBlocks.CYPRESS_LEAVES.get()); compostibleBlocks(0.3F, WLBlocks.COCONUT_SAPLING.get()); compostibleBlocks(0.3F, WLBlocks.CYPRESS_SAPLING.get()); diff --git a/src/main/java/superlord/wildlands/common/block/OlivinePressurePlateBlock.java b/src/main/java/superlord/wildlands/common/block/OlivinePressurePlateBlock.java index 8dcbf8f..47874d1 100644 --- a/src/main/java/superlord/wildlands/common/block/OlivinePressurePlateBlock.java +++ b/src/main/java/superlord/wildlands/common/block/OlivinePressurePlateBlock.java @@ -70,6 +70,7 @@ protected int getSignalStrength(Level worldIn, BlockPos pos) { int i = player.experienceLevel; if (i > 15) i = 15; this.i = i; + if (i >= 15) i = 15; return i; } } diff --git a/src/main/resources/assets/wildlands/lang/zh_cn.json b/src/main/resources/assets/wildlands/lang/zh_cn.json new file mode 100644 index 0000000..7bef651 --- /dev/null +++ b/src/main/resources/assets/wildlands/lang/zh_cn.json @@ -0,0 +1,215 @@ +{ + "itemGroup.wildlands_block_item_group": "野趣之地：方块", + "itemGroup.wildlands_item_item_group": "野趣之地：物品", + "itemGroup.wildlands_spawn_item_group": "野趣之地：刷怪蛋", + + "block.wildlands.mud": "棕色泥巴", + "block.wildlands.cypress_log": "秃柏原木", + "block.wildlands.stripped_cypress_log": "去皮秃柏原木", + "block.wildlands.cypress_planks": "秃柏木板", + "block.wildlands.cypress_wood": "秃柏木", + "block.wildlands.stripped_cypress_wood": "去皮秃柏木", + "block.wildlands.cypress_door": "秃柏木门", + "block.wildlands.cypress_leaves": "秃柏树叶", + "block.wildlands.cypress_stairs": "秃柏木楼梯", + "block.wildlands.cypress_pressure_plate": "秃柏木压力板", + "block.wildlands.cypress_fence": "秃柏木栅栏", + "block.wildlands.cypress_trapdoor": "秃柏木活版门", + "block.wildlands.cypress_fence_gate": "秃柏木栅栏门", + "block.wildlands.cypress_button": "秃柏木按钮", + "block.wildlands.cypress_slab": "秃柏木台阶", + "block.wildlands.cypress_sapling": "秃柏树苗", + "block.wildlands.coconut_log": "椰木原木", + "block.wildlands.stripped_coconut_log": "去皮椰木原木", + "block.wildlands.coconut_planks": "椰木木板", + "block.wildlands.coconut_wood": "椰木", + "block.wildlands.stripped_coconut_wood": "去皮椰木", + "block.wildlands.coconut_door": "椰木门", + "block.wildlands.coconut_leaves": "椰子树叶", + "block.wildlands.coconut_stairs": "椰木楼梯", + "block.wildlands.coconut_pressure_plate": "椰木压力板", + "block.wildlands.coconut_fence": "椰木栅栏", + "block.wildlands.coconut_trapdoor": "椰木活板门", + "block.wildlands.coconut_fence_gate": "椰木栅栏", + "block.wildlands.coconut_button": "椰木按钮", + "block.wildlands.coconut_slab": "椰木台阶", + "block.wildlands.coconut_sapling": "椰树树苗", + "block.wildlands.potted_coconut_sapling": "椰树树苗盆栽", + "block.wildlands.potted_cypress_sapling": "秃柏树苗盆栽", + "block.wildlands.potted_charred_bush": "焦黑灌木盆栽", + "block.wildlands.potted_cattail": "香蒲盆栽", + "block.wildlands.potted_palmetto": "棕榈盆栽", + "block.wildlands.charred_log": "焦黑原木", + "block.wildlands.charred_bush": "焦黑灌木", + "block.wildlands.charred_wood": "焦黑木", + "block.wildlands.stripped_charred_log": "去皮焦黑原木", + "block.wildlands.stripped_charred_wood": "去皮焦黑木", + "block.wildlands.charred_planks": "焦黑木板", + "block.wildlands.charred_button": "焦黑木按钮", + "block.wildlands.charred_door": "焦黑木门", + "block.wildlands.charred_fence": "焦黑木栅栏", + "block.wildlands.charred_fence_gate": "焦黑木栅栏门", + "block.wildlands.charred_pressure_plate": "焦黑木压力板", + "block.wildlands.charred_stairs": "焦黑木楼梯", + "block.wildlands.charred_slab": "焦黑木台阶", + "block.wildlands.charred_trapdoor": "焦黑木活板门", + "block.wildlands.smoldering_log": "阴燃原木", + "block.wildlands.charred_grass": "焦黑草方块", + "block.wildlands.charred_tall_grass": "焦黑草", + "block.wildlands.palmetto": "棕榈", + "block.wildlands.cattail": "香蒲", + "block.wildlands.duckweed": "浮萍", + "block.wildlands.beard_moss_top": "须松罗", + "block.wildlands.conglomerate": "砾岩", + "block.wildlands.conglomerate_slab": "砾岩台阶", + "block.wildlands.conglomerate_stairs": "砾岩楼梯", + "block.wildlands.conglomerate_bricks": "砾岩砖块", + "block.wildlands.conglomerate_brick_slab": "砾岩砖台阶", + "block.wildlands.conglomerate_brick_stairs": "砾岩砖楼梯", + "block.wildlands.conglomerate_brick_wall": "砾岩砖墙", + "block.wildlands.gabbro": "辉长岩", + "block.wildlands.olivine_gabbro": "橄榄辉长岩", + "block.wildlands.gabbro_slab": "辉长岩台阶", + "block.wildlands.gabbro_stairs": "辉长岩楼梯", + "block.wildlands.gabbro_wall": "辉长岩墙", + "block.wildlands.polished_gabbro": "磨制辉长岩", + "block.wildlands.polished_gabbro_slab": "磨制辉长岩台阶", + "block.wildlands.polished_gabbro_stairs": "磨制辉长岩楼梯", + "block.wildlands.dolerite": "粗玄岩", + "block.wildlands.dolerite_slab": "粗玄岩台阶", + "block.wildlands.dolerite_stairs": "粗玄岩楼梯", + "block.wildlands.dolerite_wall": "粗玄岩墙", + "block.wildlands.polished_dolerite": "磨制粗玄岩", + "block.wildlands.polished_dolerite_slab": "磨制粗玄岩台阶", + "block.wildlands.polished_dolerite_stairs": "磨制粗玄岩楼梯", + "block.wildlands.fine_sand": "细沙", + "block.wildlands.fine_sandstone": "细砂岩", + "block.wildlands.fine_sandstone_slab": "细砂岩台阶", + "block.wildlands.fine_sandstone_stairs": "细砂岩楼梯", + "block.wildlands.fine_sandstone_wall": "细砂岩墙", + "block.wildlands.smooth_fine_sandstone": "平滑细砂岩", + "block.wildlands.smooth_fine_sandstone_slab": "平滑细砂岩台阶", + "block.wildlands.smooth_fine_sandstone_stairs": "平滑细砂岩楼梯", + "block.wildlands.cut_fine_sandstone": "切制细砂岩", + "block.wildlands.cut_fine_sandstone_slab": "切制细砂岩台阶", + "block.wildlands.olivine_block": "橄榄石块", + "block.wildlands.olivine_pressure_plate": "橄榄石压力板", + "block.wildlands.cut_olivine_block": "切制橄榄石块", + "block.wildlands.blue_starfish": "蓝色海星", + "block.wildlands.magenta_starfish": "品红色海星", + "block.wildlands.orange_starfish": "橙色海星", + "block.wildlands.pink_starfish": "粉红色海星", + "block.wildlands.red_starfish": "红色海星", + "item.wildlands.jelly_ball": "水母黏液球", + "entity.wildlands.jelly_ball": "水母黏液球", + "block.wildlands.coconut": "椰子", + "block.wildlands.coconut_wall": "椰子", + "entity.wildlands.coconut": "椰子", + "item.wildlands.cracked_coconut": "半个椰子", + "item.wildlands.olivine": "橄榄石", + "item.wildlands.anchovy": "凤尾鱼", + "item.wildlands.crab_claw": "蟹钳", + "item.wildlands.cooked_crab_claw": "熟蟹钳", + "item.wildlands.cooked_anchovy": "熟凤尾鱼", + "item.wildlands.anchovy_bucket": "凤尾鱼桶", + "item.wildlands.catfish_spawn_egg": "鲇鱼刷怪蛋", + "item.wildlands.crab_spawn_egg": "螃蟹刷怪蛋", + "item.wildlands.frog_spawn_egg": "青蛙刷怪蛋", + "item.wildlands.anchovy_spawn_egg": "凤尾鱼刷怪蛋", + "item.wildlands.jellyfish_spawn_egg": "水母刷怪蛋", + "item.wildlands.sea_lion_spawn_egg": "海狮刷怪蛋", + "item.wildlands.hammerhead_spawn_egg": "锤头鲨刷怪蛋", + "item.wildlands.octopus_spawn_egg": "章鱼刷怪蛋", + "item.wildlands.grizzly_bear_spawn_egg": "棕熊刷怪蛋", + "item.wildlands.catfish_bucket": "鲇鱼桶", + "item.wildlands.frog_bucket": "青蛙桶", + "item.wildlands.raw_catfish": "生鲇鱼", + "item.wildlands.cooked_catfish": "熟鲇鱼", + "item.wildlands.alligator_spawn_egg": "短吻鳄刷怪蛋", + "item.wildlands.alligator_bucket": "短吻鳄桶", + "block.wildlands.coconut_sign": "椰木告示牌", + "block.wildlands.coconut_wall_sign": "椰木告示牌", + "block.wildlands.coconut_hanging_sign": "椰木挂牌", + "block.wildlands.coconut_hanging_wall_sign": "椰木挂牌", + "block.wildlands.cypress_sign": "秃柏木告示牌", + "block.wildlands.cypress_wall_sign": "秃柏木告示牌", + "block.wildlands.cypress_hanging_sign": "秃柏木挂牌", + "block.wildlands.cypress_hanging_wall_sign": "秃柏木挂牌", + "entity.wildlands.alligator.0": "绿色短吻鳄", + "entity.wildlands.alligator.1": "浅绿色短吻鳄", + "entity.wildlands.alligator.2": "深绿色短吻鳄", + "entity.wildlands.alligator.3": "白化短吻鳄", + "entity.wildlands.grizzly_bear": "棕熊", + "block.wildlands.seaweed_block": "海草块", + "block.wildlands.olivine_lamp": "橄榄石灯笼", + "block.wildlands.urchin": "海胆", + "effect.wildlands.sting": "刺蛰", + "block.wildlands.jelly_block": "水母黏液块", + "block.wildlands.charred_wall_sign": "焦黑告示牌", + "block.wildlands.charred_sign": "焦黑告示牌", + "block.wildlands.charred_hanging_sign": "焦黑挂牌", + "block.wildlands.charred_hanging_wall_sign": "焦黑挂牌", + "item.wildlands.charred_boat": "焦黑木船", + "item.wildlands.charred_chest_boat": "焦黑木运输船", + "item.wildlands.coconut_chest_boat": "椰木运输船", + "item.wildlands.bald_cypress_chest_boat": "秃柏木运输船", + "entity.wildlands.chest_boat": "运输船", + + "entity.wildlands.frog": "青蛙", + "entity.wildlands.octopus": "章鱼", + "entity.wildlands.sea_lion": "海狮", + + "death.attack.clam.0": "%s被蛤蜊夹断了手指", + "death.attack.clam.1": "%s被蛤蜊夹死了", + "death.attack.clam.2": "%s试图偷取蛤蜊的珍珠", + + "death.attack.sting.0": "%s被水母蛰死了", + "death.attack.sting.1": "%s食用过多水母黏液", + + "entity.wildlands.catfish": "鲇鱼", + "entity.wildlands.alligator": "短吻鳄", + "item.wildlands.bald_cypress_boat": "秃柏木船", + "item.wildlands.coconut_boat": "椰木船", + "entity.wildlands.boat": "船", + "entity.wildlands.crab": "螃蟹", + "entity.wildlands.hammerhead": "锤头鲨", + "entity.wildlands.anchovy": "凤尾鱼", + "entity.wildlands.jellyfish": "水母", + + "biome.wildlands.bayou": "河沼", + "biome.wildlands.burnt_forest": "烧焦森林", + + "wildlands.subtitle.crabIdle": "螃蟹：咔哒声", + "wildlands.subtitle.crabHurt": "螃蟹：受伤", + "wildlands.subtitle.crabDeath": "螃蟹：死亡", + "wildlands.subtitle.alligatorIdle": "短吻鳄：嘶嘶声", + "wildlands.subtitle.alligatorHurt": "短吻鳄：受伤", + "wildlands.subtitle.alligatorDeath": "短吻鳄：死亡", + "wildlands.subtitle.frogIdle": "青蛙：呱呱叫", + "wildlands.subtitle.frogHurt": "青蛙：受伤", + "wildlands.subtitle.frogDeath": "青蛙：死亡", + "wildlands.subtitle.catfishIdle": "鲇鱼：游动", + "wildlands.subtitle.catfishFlop": "鲇鱼：扑腾", + "wildlands.subtitle.catfishHurt": "鲇鱼：受伤", + "wildlands.subtitle.catfishDeath": "鲇鱼：死亡", + "wildlands.subtitle.anchovyIdle": "凤尾鱼：游动", + "wildlands.subtitle.anchovyFlop": "凤尾鱼：扑腾", + "wildlands.subtitle.anchovyHurt": "凤尾鱼：受伤", + "wildlands.subtitle.anchovyDeath": "凤尾鱼：死亡", + "wildlands.subtitle.hammerheadIdle": "锤头鲨：游动", + "wildlands.subtitle.hammerheadHurt": "锤头鲨：受伤", + "wildlands.subtitle.hammerheadDeath": "锤头鲨：死亡", + "wildlands.subtitle.jellyfishHurt": "水母：受伤", + "wildlands.subtitle.jellyfishDeath": "水母：死亡", + "wildlands.subtitle.octopusIdle": "章鱼：游动", + "wildlands.subtitle.octopusHurt": "章鱼：受伤", + "wildlands.subtitle.octopusDeath": "章鱼：死亡", + "wildlands.subtitle.grizzlyIdle": "棕熊：低吼", + "wildlands.subtitle.grizzlyHurt": "棕熊：受伤", + "wildlands.subtitle.grizzlyDeath": "棕熊：死亡", + "wildlands.subtitle.grizzlyWarning": "棕熊：咆哮", + "wildlands.subtitle.grizzlyEating": "棕熊：进食", + "wildlands.subtitle.seaLionIdle": "海狮：吠叫", + "wildlands.subtitle.seaLionHurt": "海狮：受伤", + "wildlands.subtitle.seaLionDeath": "海狮：死亡" +} diff --git a/src/main/resources/assets/wildlands/textures/block/mud.png b/src/main/resources/assets/wildlands/textures/block/mud.png deleted file mode 100644 index e2db6d4..0000000 Binary files a/src/main/resources/assets/wildlands/textures/block/mud.png and /dev/null differ