diff --git a/gradle.properties b/gradle.properties index 257d637..80d35a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,7 +34,7 @@ mod_name=Lzxnone Terraria # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=All Rights Reserved # The mod version. See https://semver.org/ -mod_version=1.6.1 +mod_version=1.7.0 ## The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Possession.java b/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Possession.java index ffd8a1a..cb1f224 100644 --- a/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Possession.java +++ b/src/main/java/com/lzxnone/terraria/item/weapon/summon/whip/Possession.java @@ -42,11 +42,11 @@ import java.util.Locale; public class Possession extends Whip { private static final ConfigDouble RANGE = new ConfigDouble("weapon.possession.range", "possession_range", 32.0D, 1.0D, 256.0D); - private static final ConfigFloat DAMAGE = new ConfigFloat("weapon.possession.damage", "possession_damage", 5.0F, 0.0F, 8388600.0F); + private static final ConfigFloat DAMAGE = new ConfigFloat("weapon.possession.damage", "possession_damage", 10.0F, 0.0F, 8388600.0F); private static final ConfigInt ROTATE = new ConfigInt("weapon.possession.rotate", "possession_rotate", 60, 0, 360); private static final ConfigDouble BEAM_SPEED = new ConfigDouble("weapon.possession.beam_speed", "possession_beam_speed", 1.5D, 0.01D, 32.0D); private static final double BEAM_HEIGHT = 4.0D; - private static final ConfigFloat BEAM_DAMAGE = new ConfigFloat("weapon.possession.beam_damage", "possession_beam_damage", 5.0F, 0.0F, 8388600.0F); + private static final ConfigFloat BEAM_DAMAGE = new ConfigFloat("weapon.possession.beam_damage", "possession_beam_damage", 10.0F, 0.0F, 8388600.0F); private static final ConfigInt PROPHETIC_MARK_DURATION = new ConfigInt("weapon.possession.prophetic_mark_duration", "possession_prophetic_mark_duration", 80, 1, 72000); public static final ConfigInt MAX_PROPHETIC_MARK_STACKS = new ConfigInt("weapon.possession.max_prophetic_mark_stacks", "possession_max_prophetic_mark_stacks", 3, 0, 1024); diff --git a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json index 61aa2d6..073eb1d 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/en_us.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/en_us.json @@ -135,7 +135,7 @@ "tooltip.lzxnoneterraria.minion_weapon_minion_count": "Minion Count: %s", "jei.lzxnoneterraria.info.fallen_star": "Has a chance to fall from the sky at night. Fallen Stars spawn in open areas near players and can be picked up after landing.", - "jei.lzxnoneterraria.info.natures_gift": "Can be found in dungeon chests.", + "jei.lzxnoneterraria.info.natures_gift": "Can be found in ordinary loot chests from various structures.", "entity.lzxnoneterraria.static_projectile": "Projectile", "entity.lzxnoneterraria.static_summon": "Summon", diff --git a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json index 54c944b..0c7a6e2 100644 --- a/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json +++ b/src/main/resources/assets/lzxnoneterraria/lang/zh_cn.json @@ -135,7 +135,7 @@ "tooltip.lzxnoneterraria.minion_weapon_minion_count": "仆从数量: %s", "jei.lzxnoneterraria.info.fallen_star": "夜晚时有概率从天空坠落。坠落之星会在玩家附近的露天区域生成,落地后可以拾取。", - "jei.lzxnoneterraria.info.natures_gift": "可在地牢箱子中找到。", + "jei.lzxnoneterraria.info.natures_gift": "可在各类普通结构战利品箱中找到。", "entity.lzxnoneterraria.static_projectile": "弹射物", "entity.lzxnoneterraria.static_summon": "召唤物", diff --git a/src/main/resources/assets/lzxnoneterraria/models/block/stardust_dragon_body_a.json b/src/main/resources/assets/lzxnoneterraria/models/block/stardust_dragon_body_a.json index c1ad861..44d5d41 100644 --- a/src/main/resources/assets/lzxnoneterraria/models/block/stardust_dragon_body_a.json +++ b/src/main/resources/assets/lzxnoneterraria/models/block/stardust_dragon_body_a.json @@ -1,6 +1,6 @@ { "format_version": "1.21.11", - "credit": "Made with Codex", + "credit": "Lzxnone", "ambientocclusion": false, "texture_size": [64, 64], "textures": { diff --git a/src/main/resources/assets/lzxnoneterraria/models/block/stardust_dragon_body_b.json b/src/main/resources/assets/lzxnoneterraria/models/block/stardust_dragon_body_b.json index d82e976..b916385 100644 --- a/src/main/resources/assets/lzxnoneterraria/models/block/stardust_dragon_body_b.json +++ b/src/main/resources/assets/lzxnoneterraria/models/block/stardust_dragon_body_b.json @@ -1,6 +1,6 @@ { "format_version": "1.21.11", - "credit": "Made with Codex", + "credit": "Lzxnone", "ambientocclusion": false, "texture_size": [64, 64], "textures": { diff --git a/src/main/resources/assets/lzxnoneterraria/models/block/stardust_dragon_head.json b/src/main/resources/assets/lzxnoneterraria/models/block/stardust_dragon_head.json index 38dbb3f..97ed7b5 100644 --- a/src/main/resources/assets/lzxnoneterraria/models/block/stardust_dragon_head.json +++ b/src/main/resources/assets/lzxnoneterraria/models/block/stardust_dragon_head.json @@ -1,6 +1,6 @@ { "format_version": "1.21.11", - "credit": "Made with Codex; dinosaur jaw layering informed by Jurassic Reborn references", + "credit": "Lzxnone", "ambientocclusion": false, "texture_size": [64, 64], "textures": { diff --git a/src/main/resources/assets/lzxnoneterraria/models/block/stardust_dragon_tail.json b/src/main/resources/assets/lzxnoneterraria/models/block/stardust_dragon_tail.json index 94f919a..91a6347 100644 --- a/src/main/resources/assets/lzxnoneterraria/models/block/stardust_dragon_tail.json +++ b/src/main/resources/assets/lzxnoneterraria/models/block/stardust_dragon_tail.json @@ -1,6 +1,6 @@ { "format_version": "1.21.11", - "credit": "Made with Codex", + "credit": "Lzxnone", "ambientocclusion": false, "texture_size": [64, 64], "textures": { diff --git a/src/main/resources/assets/lzxnoneterraria/models/block/vision.json b/src/main/resources/assets/lzxnoneterraria/models/block/vision.json index 70d85b2..1cff3bf 100644 --- a/src/main/resources/assets/lzxnoneterraria/models/block/vision.json +++ b/src/main/resources/assets/lzxnoneterraria/models/block/vision.json @@ -1,6 +1,6 @@ { "format_version": "1.21.11", - "credit": "Made with Codex", + "credit": "Lzxnone", "ambientocclusion": false, "texture_size": [64, 64], "textures": { diff --git a/src/main/resources/data/lzxnoneterraria/loot_modifiers/common_structure_chests.json b/src/main/resources/data/lzxnoneterraria/loot_modifiers/common_structure_chests.json new file mode 100644 index 0000000..1671f7b --- /dev/null +++ b/src/main/resources/data/lzxnoneterraria/loot_modifiers/common_structure_chests.json @@ -0,0 +1,195 @@ +{ + "type": "neoforge:add_table", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/abandoned_mineshaft" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/ancient_city" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/ancient_city_ice_box" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/bastion_bridge" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/bastion_hoglin_stable" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/bastion_other" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/bastion_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/buried_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/desert_pyramid" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/end_city_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/igloo_chest" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/jungle_temple" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/nether_bridge" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/pillager_outpost" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/ruined_portal" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/shipwreck_map" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/shipwreck_supply" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/shipwreck_treasure" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/simple_dungeon" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/stronghold_corridor" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/stronghold_crossing" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/stronghold_library" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/trial_chambers/corridor" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/trial_chambers/entrance" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/trial_chambers/intersection" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/trial_chambers/intersection_barrel" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/trial_chambers/supply" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/underwater_ruin_big" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/underwater_ruin_small" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/village/village_armorer" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/village/village_butcher" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/village/village_cartographer" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/village/village_desert_house" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/village/village_fisher" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/village/village_fletcher" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/village/village_mason" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/village/village_plains_house" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/village/village_savanna_house" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/village/village_shepherd" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/village/village_snowy_house" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/village/village_taiga_house" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/village/village_tannery" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/village/village_temple" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/village/village_toolsmith" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/village/village_weaponsmith" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/woodland_mansion" + } + ] + } + ], + "table": "lzxnoneterraria:chests/common" +} diff --git a/src/main/resources/data/lzxnoneterraria/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/lzxnoneterraria/loot_modifiers/global_loot_modifiers.json index d301f77..42b612b 100644 --- a/src/main/resources/data/lzxnoneterraria/loot_modifiers/global_loot_modifiers.json +++ b/src/main/resources/data/lzxnoneterraria/loot_modifiers/global_loot_modifiers.json @@ -1,7 +1,6 @@ { "replace": false, "entries": [ - "lzxnoneterraria:natures_gift_simple_dungeon", - "lzxnoneterraria:mana_potions_simple_dungeon" + "lzxnoneterraria:common_structure_chests" ] } diff --git a/src/main/resources/data/lzxnoneterraria/loot_modifiers/mana_potions_simple_dungeon.json b/src/main/resources/data/lzxnoneterraria/loot_modifiers/mana_potions_simple_dungeon.json deleted file mode 100644 index b081062..0000000 --- a/src/main/resources/data/lzxnoneterraria/loot_modifiers/mana_potions_simple_dungeon.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "neoforge:add_table", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/simple_dungeon" - } - ], - "table": "lzxnoneterraria:chests/mana_potions" -} diff --git a/src/main/resources/data/lzxnoneterraria/loot_modifiers/natures_gift_simple_dungeon.json b/src/main/resources/data/lzxnoneterraria/loot_modifiers/natures_gift_simple_dungeon.json deleted file mode 100644 index eee0605..0000000 --- a/src/main/resources/data/lzxnoneterraria/loot_modifiers/natures_gift_simple_dungeon.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "type": "neoforge:add_table", - "conditions": [ - { - "condition": "neoforge:loot_table_id", - "loot_table_id": "minecraft:chests/simple_dungeon" - } - ], - "table": "lzxnoneterraria:chests/natures_gift" -} diff --git a/src/main/resources/data/lzxnoneterraria/loot_table/chests/mana_potions.json b/src/main/resources/data/lzxnoneterraria/loot_table/chests/common.json similarity index 77% rename from src/main/resources/data/lzxnoneterraria/loot_table/chests/mana_potions.json rename to src/main/resources/data/lzxnoneterraria/loot_table/chests/common.json index 9001ddc..4c3f5bd 100644 --- a/src/main/resources/data/lzxnoneterraria/loot_table/chests/mana_potions.json +++ b/src/main/resources/data/lzxnoneterraria/loot_table/chests/common.json @@ -44,6 +44,22 @@ } ], "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:random_chance", + "chance": 0.12 + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "lzxnoneterraria:natures_gift" + } + ], + "rolls": 1.0 } ] } diff --git a/src/main/resources/data/lzxnoneterraria/loot_table/chests/natures_gift.json b/src/main/resources/data/lzxnoneterraria/loot_table/chests/natures_gift.json deleted file mode 100644 index 4b47428..0000000 --- a/src/main/resources/data/lzxnoneterraria/loot_table/chests/natures_gift.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:chest", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.12 - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "lzxnoneterraria:natures_gift" - } - ], - "rolls": 1.0 - } - ] -}