DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Compare commits

base: DBot:e8222216e0ae4dd0a8988dd42f5121b492d639e8
Branches Tags
DBot:1.21
DBot:item-pipes
DBot:world-structures
DBot:worldgen-placement-providers
DBot:1.20.1
DBot:1.19.2
DBot:1.19.3
DBot:1.19.4
DBot:1.20.2
DBot:1.20
...
compare: DBot:825cbb67319f0c271dc5be33ca97d018b2b75c8d
Branches Tags
DBot:item-pipes
DBot:world-structures
DBot:1.21
DBot:worldgen-placement-providers
DBot:1.20.1
DBot:1.19.2
DBot:1.19.3
DBot:1.19.4
DBot:1.20.2
DBot:1.20

2 Commits
e8222216e0 ... 825cbb6731

Author SHA1 Message Date
GearShocky
825cbb6731 Merge remote-tracking branch 'origin/1.21' into 1.21 2025-03-05 01:36:11 +05:00
GearShocky
94289b9d2c Adjustments 2025-03-05 01:35:59 +05:00
3 changed files with 19 additions and 8 deletions
Show Stats Expand all files Collapse all files

12
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt
View File

@ -48,4 +48,16 @@ fun addChestLootTables(loot: LootTables) {
setRolls(3) 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)
}
}
} }

4
src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/FallingSunItem.kt
View File

@ -49,14 +49,14 @@ class FallingSunItem : MatteryItem(Properties().stacksTo(1).rarity(Rarity.EPIC))
var builder = ItemAttributeModifiers.builder() 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_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) 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() chargedAttributes = builder.build()
builder = ItemAttributeModifiers.builder() 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_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() dischargedAttributes = builder.build()
} }

11
src/main/resources/assets/overdrive_that_matters/models/item/withered_steel_sword_handheld.json
View File

@ -1,5 +1,4 @@
{ {
"credit": "Made with Blockbench",
"parent": "minecraft:item/handheld", "parent": "minecraft:item/handheld",
"textures": { "textures": {
"layer0": "overdrive_that_matters:item/withered_steel_sword_handheld" "layer0": "overdrive_that_matters:item/withered_steel_sword_handheld"
@ -7,18 +6,18 @@
"display": { "display": {
"thirdperson_righthand": { "thirdperson_righthand": {
"rotation": [0, -90, 55], "rotation": [0, -90, 55],
"translation": [0, 4, 0.5], "translation": [0, 5.75, 0.5],
"scale": [0.85, 0.85, 0.85] "scale": [1, 1, 0.85]
}, },
"thirdperson_lefthand": { "thirdperson_lefthand": {
"rotation": [0, 90, -55], "rotation": [0, 90, -55],
"translation": [0, 4, 0.5], "translation": [0, 5.75, 0.5],
"scale": [0.85, 0.85, 0.85] "scale": [1, 1, 0.85]
}, },
"firstperson_righthand": { "firstperson_righthand": {
"rotation": [0, -90, 25], "rotation": [0, -90, 25],
"translation": [1.13, 3.2, 1.13], "translation": [1.13, 3.2, 1.13],
"scale": [0.68, 0.68, 0.68] "scale": [0.74, 0.74, 0.68]
}, },
"firstperson_lefthand": { "firstperson_lefthand": {
"rotation": [0, 90, -25], "rotation": [0, 90, -25],