Skip to content

Commit 1890a11

Browse files
committed
<redacted> once again. Dipple evolves now.
1 parent e93292b commit 1890a11

2 files changed

Lines changed: 3 additions & 7 deletions

File tree

  • common/src/main

common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,12 +1517,8 @@ object GenerationsItems {
15171517
private fun registerMail(name: String, type: MailType): RegistrySupplier<MailItem> = register(name, type::createMailItem, POKEMAIL)
15181518

15191519
private fun registerPlate(name: String, type: ElementalType): RegistrySupplier<FormChangingItem> = register(name, { createFormChangingItem(it, "type", type.name, cobblemonResource("arceus")).also { CobblemonHeldItemManager.registerRemap(it, name.replace("_", "")) } }, FORM_ITEMS)
1520-
private fun registerDrive(name: String, type: String): RegistrySupplier<FormChangingItem> = register(name, { createFormChangingItem(it, "drive", type, cobblemonResource("genesect")).also {
1521-
CobblemonHeldItemManager.registerRemap(it, name.replace("_", ""))
1522-
} }, FORM_ITEMS)
1523-
private fun registerMemory(name: String, type: ElementalType): RegistrySupplier<FormChangingItem> = register(name, { createFormChangingItem(it, "type", type.name, cobblemonResource("silvally")).also {
1524-
CobblemonHeldItemManager.registerRemap(it, name.replace("_", "").replace("drive", ""))
1525-
} }, FORM_ITEMS)
1520+
private fun registerDrive(name: String, type: String): RegistrySupplier<FormChangingItem> = register(name, { createFormChangingItem(it, "drive", type, cobblemonResource("genesect")).also { CobblemonHeldItemManager.registerRemap(it, name.replace("_", "")) } }, FORM_ITEMS)
1521+
private fun registerMemory(name: String, type: ElementalType): RegistrySupplier<FormChangingItem> = register(name, { createFormChangingItem(it, "type", type.name, cobblemonResource("silvally")).also { CobblemonHeldItemManager.registerRemap(it, name.replace("_", "").replace("drive", "")) } }, FORM_ITEMS)
15261522

15271523
private fun registerCap(name: String): RegistrySupplier<FormChangingItem> = register("${name}_cap", { createFormChangingItem(it, "pikachu_cap", name) }, FORM_ITEMS)
15281524

common/src/main/resources/data/cobblemon/species/generation9/dipplin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
"requirements": [
102102
{
103103
"variant": "has_move",
104-
"type": "dragoncheer"
104+
"move": "dragoncheer"
105105
}
106106
]
107107
}

0 commit comments

Comments
 (0)