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

Merge remote-tracking branch 'origin/master' into master

Browse Source 
# Conflicts:
#	src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt
This commit is contained in:
DBotThePony 2022-09-06 21:51:11 +07:00
commit c75c056790
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt
View File

@ -246,8 +246,8 @@ fun addCraftingTableRecipes(consumer: Consumer<FinishedRecipe>) {
// броня // броня
MatteryRecipe(MItems.TRITANIUM_HELMET) MatteryRecipe(MItems.TRITANIUM_HELMET)
.row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM)
.row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_IRON, MItemTags.PLATE_TRITANIUM) .row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_IRON, MItemTags.PLATE_TRITANIUM)
.rowAC(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM)
.unlockedBy(MItemTags.PLATE_TRITANIUM) .unlockedBy(MItemTags.PLATE_TRITANIUM)
.build(consumer) .build(consumer)

4
src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt
View File

@ -418,11 +418,11 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, INBTSerial
// exosuit // exosuit
hasExoSuit = tag.getBoolean("hasExoSuit") hasExoSuit = tag.getBoolean("hasExoSuit")
tag.map("exoSuitSlotCountModifiers", exoSuitSlotCountModifiers::deserializeNBT)
exoSuitContainer.deserializeNBT(tag["exoSuitContainer"]) exoSuitContainer.deserializeNBT(tag["exoSuitContainer"])
isExoSuitCraftingUpgraded = tag.getBoolean("isExoSuitCraftingUpgraded") isExoSuitCraftingUpgraded = tag.getBoolean("isExoSuitCraftingUpgraded")
tag.map("exoSuitSlotCountModifiers", exoSuitSlotCountModifiers::deserializeNBT)
// android // android
isAndroid = tag.getBoolean("isAndroid") isAndroid = tag.getBoolean("isAndroid")
willBecomeAndroid = tag.getBoolean("willBecomeAndroid") willBecomeAndroid = tag.getBoolean("willBecomeAndroid")

24
src/main/resources/data/overdrive_that_matters/recipes/components/copper_wiring_alt.json
View File

@ -1,24 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" # ",
"#@#",
" # "
],
"key": {
"#": {
"item": "minecraft:copper_ingot"
},
"@": {
"tag": "forge:rods/wooden"
}
},
"result": {
"item": "overdrive_that_matters:copper_wiring",
"count": 8
}
}