From 94289b9d2c7b10bf184dc363af9a421c5e77ab66 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Wed, 5 Mar 2025 01:35:59 +0500 Subject: [PATCH] Adjustments --- .../mc/otm/datagen/loot/LootTablesChests.kt | 12 ++++++++++++ .../dbotthepony/mc/otm/item/weapon/FallingSunItem.kt | 4 ++-- .../models/item/withered_steel_sword_handheld.json | 11 +++++------ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt index f0c645148..6be0eaff0 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt @@ -48,4 +48,16 @@ fun addChestLootTables(loot: LootTables) { setRolls(3) } } + + loot.builder(LootContextParamSets.CHEST, modLootTable("laboratory/supply")) { + lootPool { + item(Items.BREAD) { setCount(minimal = 2, maximal = 3) } + item(Items.HONEY_BOTTLE) { setCount(minimal = 1, maximal = 2) } + item(MItems.NUTRIENT_PASTE) { setCount(minimal = 2, maximal = 3) } + item(Items.SNOWBALL) { setCount(minimal = 1, maximal = 5) } + item(Items.PACKED_ICE) { setCount(minimal = 2, maximal = 3) } + + setRolls(3) + } + } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/FallingSunItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/FallingSunItem.kt index b9275fdff..6ba1ef311 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/FallingSunItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/FallingSunItem.kt @@ -49,14 +49,14 @@ class FallingSunItem : MatteryItem(Properties().stacksTo(1).rarity(Rarity.EPIC)) var builder = ItemAttributeModifiers.builder() builder.add(Attributes.ATTACK_DAMAGE, AttributeModifier(BASE_ATTACK_DAMAGE_ID, 13.0, AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND) - builder.add(Attributes.ATTACK_SPEED, AttributeModifier(BASE_ATTACK_SPEED_ID, -3.2, AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND) + builder.add(Attributes.ATTACK_SPEED, AttributeModifier(BASE_ATTACK_SPEED_ID, -3.4, AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND) builder.add(Attributes.SWEEPING_DAMAGE_RATIO, AttributeModifier(ResourceLocation(OverdriveThatMatters.MOD_ID, "energy_sword_sweeping_edge"), 1.0, AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND) chargedAttributes = builder.build() builder = ItemAttributeModifiers.builder() builder.add(Attributes.ATTACK_DAMAGE, AttributeModifier(BASE_ATTACK_DAMAGE_ID, 5.5, AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND) - builder.add(Attributes.ATTACK_SPEED, AttributeModifier(BASE_ATTACK_SPEED_ID, -3.2, AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND) + builder.add(Attributes.ATTACK_SPEED, AttributeModifier(BASE_ATTACK_SPEED_ID, -3.4, AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND) dischargedAttributes = builder.build() } diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/withered_steel_sword_handheld.json b/src/main/resources/assets/overdrive_that_matters/models/item/withered_steel_sword_handheld.json index 75344b0cb..a0ff5fecf 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/item/withered_steel_sword_handheld.json +++ b/src/main/resources/assets/overdrive_that_matters/models/item/withered_steel_sword_handheld.json @@ -1,5 +1,4 @@ { - "credit": "Made with Blockbench", "parent": "minecraft:item/handheld", "textures": { "layer0": "overdrive_that_matters:item/withered_steel_sword_handheld" @@ -7,18 +6,18 @@ "display": { "thirdperson_righthand": { "rotation": [0, -90, 55], - "translation": [0, 4, 0.5], - "scale": [0.85, 0.85, 0.85] + "translation": [0, 5.75, 0.5], + "scale": [1, 1, 0.85] }, "thirdperson_lefthand": { "rotation": [0, 90, -55], - "translation": [0, 4, 0.5], - "scale": [0.85, 0.85, 0.85] + "translation": [0, 5.75, 0.5], + "scale": [1, 1, 0.85] }, "firstperson_righthand": { "rotation": [0, -90, 25], "translation": [1.13, 3.2, 1.13], - "scale": [0.68, 0.68, 0.68] + "scale": [0.74, 0.74, 0.68] }, "firstperson_lefthand": { "rotation": [0, 90, -25],