diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt index 5cd3ce59a..33279f205 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt @@ -246,8 +246,8 @@ fun addCraftingTableRecipes(consumer: Consumer) { // броня MatteryRecipe(MItems.TRITANIUM_HELMET) + .row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM) .row(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_IRON, MItemTags.PLATE_TRITANIUM) - .rowAC(MItemTags.PLATE_TRITANIUM, MItemTags.PLATE_TRITANIUM) .unlockedBy(MItemTags.PLATE_TRITANIUM) .build(consumer) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt index 4151bc1d8..e71579e4e 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt @@ -418,11 +418,11 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, INBTSerial // exosuit hasExoSuit = tag.getBoolean("hasExoSuit") + tag.map("exoSuitSlotCountModifiers", exoSuitSlotCountModifiers::deserializeNBT) + exoSuitContainer.deserializeNBT(tag["exoSuitContainer"]) isExoSuitCraftingUpgraded = tag.getBoolean("isExoSuitCraftingUpgraded") - tag.map("exoSuitSlotCountModifiers", exoSuitSlotCountModifiers::deserializeNBT) - // android isAndroid = tag.getBoolean("isAndroid") willBecomeAndroid = tag.getBoolean("willBecomeAndroid") diff --git a/src/main/resources/data/overdrive_that_matters/recipes/components/copper_wiring_alt.json b/src/main/resources/data/overdrive_that_matters/recipes/components/copper_wiring_alt.json deleted file mode 100644 index ef952e851..000000000 --- a/src/main/resources/data/overdrive_that_matters/recipes/components/copper_wiring_alt.json +++ /dev/null @@ -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 - } -} \ No newline at end of file