diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt b/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt index 93ef3d4940..d817448ef6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt @@ -15,9 +15,9 @@ import com.cobblemon.mod.common.block.LecternBlock import com.cobblemon.mod.common.block.MintBlock.MintType import com.cobblemon.mod.common.block.campfirepot.CampfirePotBlock import com.cobblemon.mod.common.block.chest.GildedChestBlock -import com.cobblemon.mod.common.block.decor.CraspediaFlowerBlock -import com.cobblemon.mod.common.block.decor.HydrangeaFlowerBlock -import com.cobblemon.mod.common.block.decor.LobeliaFlowerBlock +import com.cobblemon.mod.common.block.decor.PomohanaFlowerBlock +import com.cobblemon.mod.common.block.decor.PauvillaFlowerBlock +import com.cobblemon.mod.common.block.decor.LobaliaFlowerBlock import com.cobblemon.mod.common.block.general.BaleBlock import com.cobblemon.mod.common.block.grower.SaccharineTreeGrower import com.cobblemon.mod.common.block.sign.CobblemonHangingSignBlock @@ -44,7 +44,6 @@ import net.minecraft.world.level.block.* import net.minecraft.world.level.block.state.BlockBehaviour import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.block.state.properties.BlockSetType -import net.minecraft.world.level.block.state.properties.BlockStateProperties import net.minecraft.world.level.block.state.properties.BlockStateProperties.LIT import net.minecraft.world.level.block.state.properties.NoteBlockInstrument import net.minecraft.world.level.block.state.properties.WoodType @@ -574,11 +573,11 @@ object CobblemonBlocks : PlatformRegistry, ResourceKey, ResourceKey = - simpleCodec({ properties: Properties? -> HydrangeaFlowerBlock(properties) }) - override fun codec(): MapCodec { +class PauvillaFlowerBlock(properties: Properties?) : MultifaceBlock(properties), BonemealableBlock { + val CODEC: MapCodec = + simpleCodec({ properties: Properties? -> PauvillaFlowerBlock(properties) }) + override fun codec(): MapCodec { return CODEC } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/block/decor/CraspediaFlowerBlock.kt b/common/src/main/kotlin/com/cobblemon/mod/common/block/decor/PomohanaFlowerBlock.kt similarity index 91% rename from common/src/main/kotlin/com/cobblemon/mod/common/block/decor/CraspediaFlowerBlock.kt rename to common/src/main/kotlin/com/cobblemon/mod/common/block/decor/PomohanaFlowerBlock.kt index 8fd3d82bc1..cc314e5d82 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/block/decor/CraspediaFlowerBlock.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/block/decor/PomohanaFlowerBlock.kt @@ -18,7 +18,7 @@ import net.minecraft.world.phys.shapes.Shapes import net.minecraft.world.phys.shapes.VoxelShape -class CraspediaFlowerBlock(properties: Properties?) : PinkPetalsBlock(properties) { +class PomohanaFlowerBlock(properties: Properties?) : PinkPetalsBlock(properties) { override fun getShape(state: BlockState, world: BlockGetter, pos: BlockPos, context: CollisionContext): VoxelShape = AABB diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt index 8bd7c7549d..715bf4de5c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/CobblemonClient.kt @@ -334,9 +334,10 @@ object CobblemonClient { CobblemonBlocks.WHITE_MINT_LEAF_LITTER, CobblemonBlocks.POTTED_WHITE_MINT, - CobblemonBlocks.LOBELIA, - CobblemonBlocks.CRASPEDIA, - CobblemonBlocks.HYDRANGEA + CobblemonBlocks.LOBALIA, + CobblemonBlocks.POMOHANA, + CobblemonBlocks.PAUVILLA + //,CobblemonBlocks.SENSERIA ) this.createBoatModelLayers() diff --git a/common/src/main/resources/assets/cobblemon/blockstates/lobalia.json b/common/src/main/resources/assets/cobblemon/blockstates/lobalia.json new file mode 100644 index 0000000000..74d280e3ee --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/lobalia.json @@ -0,0 +1,10 @@ +{ + "variants": { + "half=lower": { + "model": "cobblemon:block/lobalia_bottom" + }, + "half=upper": { + "model": "cobblemon:block/lobalia_top" + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/lobelia.json b/common/src/main/resources/assets/cobblemon/blockstates/lobelia.json deleted file mode 100644 index f959a5bab8..0000000000 --- a/common/src/main/resources/assets/cobblemon/blockstates/lobelia.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "half=lower": { - "model": "cobblemon:block/lobelia_bottom" - }, - "half=upper": { - "model": "cobblemon:block/lobelia_top" - } - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/hydrangea.json b/common/src/main/resources/assets/cobblemon/blockstates/pauvilla.json similarity index 80% rename from common/src/main/resources/assets/cobblemon/blockstates/hydrangea.json rename to common/src/main/resources/assets/cobblemon/blockstates/pauvilla.json index c97acfa265..afaa76fccf 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/hydrangea.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/pauvilla.json @@ -2,7 +2,7 @@ "multipart": [ { "apply": { - "model": "cobblemon:block/hydrangea" + "model": "cobblemon:block/pauvilla" }, "when": { "north": "true" @@ -10,7 +10,7 @@ }, { "apply": { - "model": "cobblemon:block/hydrangea" + "model": "cobblemon:block/pauvilla" }, "when": { "down": "false", @@ -23,7 +23,7 @@ }, { "apply": { - "model": "cobblemon:block/hydrangea", + "model": "cobblemon:block/pauvilla", "uvlock": true, "y": 90 }, @@ -33,7 +33,7 @@ }, { "apply": { - "model": "cobblemon:block/hydrangea", + "model": "cobblemon:block/pauvilla", "uvlock": true, "y": 90 }, @@ -48,7 +48,7 @@ }, { "apply": { - "model": "cobblemon:block/hydrangea", + "model": "cobblemon:block/pauvilla", "uvlock": true, "y": 180 }, @@ -58,7 +58,7 @@ }, { "apply": { - "model": "cobblemon:block/hydrangea", + "model": "cobblemon:block/pauvilla", "uvlock": true, "y": 180 }, @@ -73,7 +73,7 @@ }, { "apply": { - "model": "cobblemon:block/hydrangea", + "model": "cobblemon:block/pauvilla", "uvlock": true, "y": 270 }, @@ -83,7 +83,7 @@ }, { "apply": { - "model": "cobblemon:block/hydrangea", + "model": "cobblemon:block/pauvilla", "uvlock": true, "y": 270 }, @@ -98,7 +98,7 @@ }, { "apply": { - "model": "cobblemon:block/hydrangea", + "model": "cobblemon:block/pauvilla", "uvlock": true, "x": 270 }, @@ -108,7 +108,7 @@ }, { "apply": { - "model": "cobblemon:block/hydrangea", + "model": "cobblemon:block/pauvilla", "uvlock": true, "x": 270 }, @@ -123,7 +123,7 @@ }, { "apply": { - "model": "cobblemon:block/hydrangea", + "model": "cobblemon:block/pauvilla", "uvlock": true, "x": 90 }, @@ -133,7 +133,7 @@ }, { "apply": { - "model": "cobblemon:block/hydrangea", + "model": "cobblemon:block/pauvilla", "uvlock": true, "x": 90 }, diff --git a/common/src/main/resources/assets/cobblemon/blockstates/craspedia.json b/common/src/main/resources/assets/cobblemon/blockstates/pomohana.json similarity index 73% rename from common/src/main/resources/assets/cobblemon/blockstates/craspedia.json rename to common/src/main/resources/assets/cobblemon/blockstates/pomohana.json index 701b15175e..1e24efc71b 100644 --- a/common/src/main/resources/assets/cobblemon/blockstates/craspedia.json +++ b/common/src/main/resources/assets/cobblemon/blockstates/pomohana.json @@ -2,7 +2,7 @@ "multipart": [ { "apply": { - "model": "cobblemon:block/craspedia_1" + "model": "cobblemon:block/pomohana_1" }, "when": { "facing": "north", @@ -11,7 +11,7 @@ }, { "apply": { - "model": "cobblemon:block/craspedia_1", + "model": "cobblemon:block/pomohana_1", "y": 90 }, "when": { @@ -21,7 +21,7 @@ }, { "apply": { - "model": "cobblemon:block/craspedia_1", + "model": "cobblemon:block/pomohana_1", "y": 180 }, "when": { @@ -31,7 +31,7 @@ }, { "apply": { - "model": "cobblemon:block/craspedia_1", + "model": "cobblemon:block/pomohana_1", "y": 270 }, "when": { @@ -41,7 +41,7 @@ }, { "apply": { - "model": "cobblemon:block/craspedia_2" + "model": "cobblemon:block/pomohana_2" }, "when": { "facing": "north", @@ -50,7 +50,7 @@ }, { "apply": { - "model": "cobblemon:block/craspedia_2", + "model": "cobblemon:block/pomohana_2", "y": 90 }, "when": { @@ -60,7 +60,7 @@ }, { "apply": { - "model": "cobblemon:block/craspedia_2", + "model": "cobblemon:block/pomohana_2", "y": 180 }, "when": { @@ -70,7 +70,7 @@ }, { "apply": { - "model": "cobblemon:block/craspedia_2", + "model": "cobblemon:block/pomohana_2", "y": 270 }, "when": { @@ -80,7 +80,7 @@ }, { "apply": { - "model": "cobblemon:block/craspedia_3" + "model": "cobblemon:block/pomohana_3" }, "when": { "facing": "north", @@ -89,7 +89,7 @@ }, { "apply": { - "model": "cobblemon:block/craspedia_3", + "model": "cobblemon:block/pomohana_3", "y": 90 }, "when": { @@ -99,7 +99,7 @@ }, { "apply": { - "model": "cobblemon:block/craspedia_3", + "model": "cobblemon:block/pomohana_3", "y": 180 }, "when": { @@ -109,7 +109,7 @@ }, { "apply": { - "model": "cobblemon:block/craspedia_3", + "model": "cobblemon:block/pomohana_3", "y": 270 }, "when": { @@ -119,7 +119,7 @@ }, { "apply": { - "model": "cobblemon:block/craspedia_4" + "model": "cobblemon:block/pomohana_4" }, "when": { "facing": "north", @@ -128,7 +128,7 @@ }, { "apply": { - "model": "cobblemon:block/craspedia_4", + "model": "cobblemon:block/pomohana_4", "y": 90 }, "when": { @@ -138,7 +138,7 @@ }, { "apply": { - "model": "cobblemon:block/craspedia_4", + "model": "cobblemon:block/pomohana_4", "y": 180 }, "when": { @@ -148,7 +148,7 @@ }, { "apply": { - "model": "cobblemon:block/craspedia_4", + "model": "cobblemon:block/pomohana_4", "y": 270 }, "when": { diff --git a/common/src/main/resources/assets/cobblemon/lang/en_us.json b/common/src/main/resources/assets/cobblemon/lang/en_us.json index d05a290dfb..df2f64737b 100644 --- a/common/src/main/resources/assets/cobblemon/lang/en_us.json +++ b/common/src/main/resources/assets/cobblemon/lang/en_us.json @@ -925,6 +925,9 @@ "block.cobblemon.galarica_nut_bush": "Galarica Nut Bush", "block.cobblemon.pep_up_flower": "Pep-Up Flower", "block.cobblemon.potted_pep_up_flower": "Potted Pep-Up Flower", + "block.cobblemon.lobalia": "Lobalia", + "block.cobblemon.pomohana": "Pomohana", + "block.cobblemon.pauvilla": "Pa'uvilla", "block.cobblemon.gilded_chest": "Gilded Chest", "block.cobblemon.gimmighoul_chest": "Gimmighoul Chest", "block.cobblemon.blue_gilded_chest": "Blue Gilded Chest", diff --git a/common/src/main/resources/assets/cobblemon/models/block/lobelia_bottom.json b/common/src/main/resources/assets/cobblemon/models/block/lobalia_bottom.json similarity index 97% rename from common/src/main/resources/assets/cobblemon/models/block/lobelia_bottom.json rename to common/src/main/resources/assets/cobblemon/models/block/lobalia_bottom.json index af3e9c5259..12cb9f8635 100644 --- a/common/src/main/resources/assets/cobblemon/models/block/lobelia_bottom.json +++ b/common/src/main/resources/assets/cobblemon/models/block/lobalia_bottom.json @@ -3,9 +3,9 @@ "credit": "Made with Blockbench", "ambientocclusion": false, "textures": { - "particle": "cobblemon:block/flowers/lobelia_top", - "stem": "cobblemon:block/flowers/lobelia_bottom", - "detail": "cobblemon:block/flowers/lobelia_details" + "particle": "cobblemon:block/flowers/lobalia_top", + "stem": "cobblemon:block/flowers/lobalia_bottom", + "detail": "cobblemon:block/flowers/lobalia_details" }, "elements": [ { diff --git a/common/src/main/resources/assets/cobblemon/models/block/lobelia_top.json b/common/src/main/resources/assets/cobblemon/models/block/lobalia_top.json similarity index 94% rename from common/src/main/resources/assets/cobblemon/models/block/lobelia_top.json rename to common/src/main/resources/assets/cobblemon/models/block/lobalia_top.json index 2cf4cd8505..c825e63009 100644 --- a/common/src/main/resources/assets/cobblemon/models/block/lobelia_top.json +++ b/common/src/main/resources/assets/cobblemon/models/block/lobalia_top.json @@ -4,7 +4,7 @@ "ambientocclusion": false, "textures": { "particle": "#flower", - "flower": "cobblemon:block/flowers/lobelia_top" + "flower": "cobblemon:block/flowers/lobalia_top" }, "elements": [ { diff --git a/common/src/main/resources/assets/cobblemon/models/block/hydrangea.json b/common/src/main/resources/assets/cobblemon/models/block/pauvilla.json similarity index 77% rename from common/src/main/resources/assets/cobblemon/models/block/hydrangea.json rename to common/src/main/resources/assets/cobblemon/models/block/pauvilla.json index 4c2bbee5fb..ab600dcc63 100644 --- a/common/src/main/resources/assets/cobblemon/models/block/hydrangea.json +++ b/common/src/main/resources/assets/cobblemon/models/block/pauvilla.json @@ -1,9 +1,9 @@ { "ambientocclusion": false, "textures": { - "particle": "cobblemon:block/flowers/hydrangea_vine", - "vine": "cobblemon:block/flowers/hydrangea_vine", - "flowers": "cobblemon:block/flowers/hydrangea_flowers" + "particle": "cobblemon:block/flowers/pauvilla_vine", + "vine": "cobblemon:block/flowers/pauvilla_vine", + "flowers": "cobblemon:block/flowers/pauvilla_flowers" }, "elements": [ { diff --git a/common/src/main/resources/assets/cobblemon/models/block/craspedia_1.json b/common/src/main/resources/assets/cobblemon/models/block/pomohana_1.json similarity index 96% rename from common/src/main/resources/assets/cobblemon/models/block/craspedia_1.json rename to common/src/main/resources/assets/cobblemon/models/block/pomohana_1.json index 2a566e3967..a6bbb53034 100644 --- a/common/src/main/resources/assets/cobblemon/models/block/craspedia_1.json +++ b/common/src/main/resources/assets/cobblemon/models/block/pomohana_1.json @@ -2,8 +2,8 @@ "ambientocclusion": false, "texture_size": [32, 32], "textures": { - "particle": "cobblemon:block/flowers/craspedia", - "flower": "cobblemon:block/flowers/craspedia" + "particle": "cobblemon:block/flowers/pomohana", + "flower": "cobblemon:block/flowers/pomohana" }, "elements": [ { diff --git a/common/src/main/resources/assets/cobblemon/models/block/craspedia_2.json b/common/src/main/resources/assets/cobblemon/models/block/pomohana_2.json similarity index 94% rename from common/src/main/resources/assets/cobblemon/models/block/craspedia_2.json rename to common/src/main/resources/assets/cobblemon/models/block/pomohana_2.json index dcea27e5cb..5db3096021 100644 --- a/common/src/main/resources/assets/cobblemon/models/block/craspedia_2.json +++ b/common/src/main/resources/assets/cobblemon/models/block/pomohana_2.json @@ -2,8 +2,8 @@ "ambientocclusion": false, "texture_size": [32, 32], "textures": { - "particle": "cobblemon:block/flowers/craspedia", - "flower": "cobblemon:block/flowers/craspedia" + "particle": "cobblemon:block/flowers/pomohana", + "flower": "cobblemon:block/flowers/pomohana" }, "elements": [ { diff --git a/common/src/main/resources/assets/cobblemon/models/block/craspedia_3.json b/common/src/main/resources/assets/cobblemon/models/block/pomohana_3.json similarity index 94% rename from common/src/main/resources/assets/cobblemon/models/block/craspedia_3.json rename to common/src/main/resources/assets/cobblemon/models/block/pomohana_3.json index c29acf2c6e..e25539b1b6 100644 --- a/common/src/main/resources/assets/cobblemon/models/block/craspedia_3.json +++ b/common/src/main/resources/assets/cobblemon/models/block/pomohana_3.json @@ -2,8 +2,8 @@ "ambientocclusion": false, "texture_size": [32, 32], "textures": { - "particle": "cobblemon:block/flowers/craspedia", - "flower": "cobblemon:block/flowers/craspedia" + "particle": "cobblemon:block/flowers/pomohana", + "flower": "cobblemon:block/flowers/pomohana" }, "elements": [ { diff --git a/common/src/main/resources/assets/cobblemon/models/block/craspedia_4.json b/common/src/main/resources/assets/cobblemon/models/block/pomohana_4.json similarity index 94% rename from common/src/main/resources/assets/cobblemon/models/block/craspedia_4.json rename to common/src/main/resources/assets/cobblemon/models/block/pomohana_4.json index f9303312db..2b6252113c 100644 --- a/common/src/main/resources/assets/cobblemon/models/block/craspedia_4.json +++ b/common/src/main/resources/assets/cobblemon/models/block/pomohana_4.json @@ -2,8 +2,8 @@ "ambientocclusion": false, "texture_size": [32, 32], "textures": { - "particle": "cobblemon:block/flowers/craspedia", - "flower": "cobblemon:block/flowers/craspedia" + "particle": "cobblemon:block/flowers/pomohana", + "flower": "cobblemon:block/flowers/pomohana" }, "elements": [ { diff --git a/common/src/main/resources/assets/cobblemon/models/item/lobelia.json b/common/src/main/resources/assets/cobblemon/models/item/lobalia.json similarity index 57% rename from common/src/main/resources/assets/cobblemon/models/item/lobelia.json rename to common/src/main/resources/assets/cobblemon/models/item/lobalia.json index 31c5489b76..da88499a7f 100644 --- a/common/src/main/resources/assets/cobblemon/models/item/lobelia.json +++ b/common/src/main/resources/assets/cobblemon/models/item/lobalia.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "cobblemon:item/flowers/lobelia" + "layer0": "cobblemon:item/flowers/lobalia" } } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/craspedia.json b/common/src/main/resources/assets/cobblemon/models/item/pauvilla.json similarity index 56% rename from common/src/main/resources/assets/cobblemon/models/item/craspedia.json rename to common/src/main/resources/assets/cobblemon/models/item/pauvilla.json index d92a2de219..d5af22e921 100644 --- a/common/src/main/resources/assets/cobblemon/models/item/craspedia.json +++ b/common/src/main/resources/assets/cobblemon/models/item/pauvilla.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "cobblemon:item/flowers/craspedia" + "layer0": "cobblemon:item/flowers/pauvilla" } } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/hydrangea.json b/common/src/main/resources/assets/cobblemon/models/item/pomohana.json similarity index 56% rename from common/src/main/resources/assets/cobblemon/models/item/hydrangea.json rename to common/src/main/resources/assets/cobblemon/models/item/pomohana.json index 904363b2c2..2ef5265708 100644 --- a/common/src/main/resources/assets/cobblemon/models/item/hydrangea.json +++ b/common/src/main/resources/assets/cobblemon/models/item/pomohana.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "cobblemon:item/flowers/hydrangea" + "layer0": "cobblemon:item/flowers/pomohana" } } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/textures/block/flowers/lobelia_bottom.png b/common/src/main/resources/assets/cobblemon/textures/block/flowers/lobalia_bottom.png similarity index 100% rename from common/src/main/resources/assets/cobblemon/textures/block/flowers/lobelia_bottom.png rename to common/src/main/resources/assets/cobblemon/textures/block/flowers/lobalia_bottom.png diff --git a/common/src/main/resources/assets/cobblemon/textures/block/flowers/lobelia_details.png b/common/src/main/resources/assets/cobblemon/textures/block/flowers/lobalia_details.png similarity index 100% rename from common/src/main/resources/assets/cobblemon/textures/block/flowers/lobelia_details.png rename to common/src/main/resources/assets/cobblemon/textures/block/flowers/lobalia_details.png diff --git a/common/src/main/resources/assets/cobblemon/textures/block/flowers/lobelia_top.png b/common/src/main/resources/assets/cobblemon/textures/block/flowers/lobalia_top.png similarity index 100% rename from common/src/main/resources/assets/cobblemon/textures/block/flowers/lobelia_top.png rename to common/src/main/resources/assets/cobblemon/textures/block/flowers/lobalia_top.png diff --git a/common/src/main/resources/assets/cobblemon/textures/block/flowers/hydrangea_flowers.png b/common/src/main/resources/assets/cobblemon/textures/block/flowers/pauvilla_flowers.png similarity index 100% rename from common/src/main/resources/assets/cobblemon/textures/block/flowers/hydrangea_flowers.png rename to common/src/main/resources/assets/cobblemon/textures/block/flowers/pauvilla_flowers.png diff --git a/common/src/main/resources/assets/cobblemon/textures/block/flowers/hydrangea_vine.png b/common/src/main/resources/assets/cobblemon/textures/block/flowers/pauvilla_vine.png similarity index 100% rename from common/src/main/resources/assets/cobblemon/textures/block/flowers/hydrangea_vine.png rename to common/src/main/resources/assets/cobblemon/textures/block/flowers/pauvilla_vine.png diff --git a/common/src/main/resources/assets/cobblemon/textures/block/flowers/craspedia.png b/common/src/main/resources/assets/cobblemon/textures/block/flowers/pomohana.png similarity index 100% rename from common/src/main/resources/assets/cobblemon/textures/block/flowers/craspedia.png rename to common/src/main/resources/assets/cobblemon/textures/block/flowers/pomohana.png diff --git a/common/src/main/resources/assets/cobblemon/textures/item/flowers/lobelia.png b/common/src/main/resources/assets/cobblemon/textures/item/flowers/lobalia.png similarity index 100% rename from common/src/main/resources/assets/cobblemon/textures/item/flowers/lobelia.png rename to common/src/main/resources/assets/cobblemon/textures/item/flowers/lobalia.png diff --git a/common/src/main/resources/assets/cobblemon/textures/item/flowers/hydrangea.png b/common/src/main/resources/assets/cobblemon/textures/item/flowers/pauvilla.png similarity index 100% rename from common/src/main/resources/assets/cobblemon/textures/item/flowers/hydrangea.png rename to common/src/main/resources/assets/cobblemon/textures/item/flowers/pauvilla.png diff --git a/common/src/main/resources/assets/cobblemon/textures/item/flowers/craspedia.png b/common/src/main/resources/assets/cobblemon/textures/item/flowers/pomohana.png similarity index 100% rename from common/src/main/resources/assets/cobblemon/textures/item/flowers/craspedia.png rename to common/src/main/resources/assets/cobblemon/textures/item/flowers/pomohana.png diff --git a/common/src/main/resources/assets/cobblemon/textures/item/flowers/wisteria.png b/common/src/main/resources/assets/cobblemon/textures/item/flowers/senseria.png similarity index 100% rename from common/src/main/resources/assets/cobblemon/textures/item/flowers/wisteria.png rename to common/src/main/resources/assets/cobblemon/textures/item/flowers/senseria.png diff --git a/common/src/main/resources/data/cobblemon/loot_table/blocks/lobelia.json b/common/src/main/resources/data/cobblemon/loot_table/blocks/lobalia.json similarity index 79% rename from common/src/main/resources/data/cobblemon/loot_table/blocks/lobelia.json rename to common/src/main/resources/data/cobblemon/loot_table/blocks/lobalia.json index c1dcf6d6f2..27dfd86691 100644 --- a/common/src/main/resources/data/cobblemon/loot_table/blocks/lobelia.json +++ b/common/src/main/resources/data/cobblemon/loot_table/blocks/lobalia.json @@ -13,18 +13,18 @@ "type": "minecraft:item", "conditions": [ { - "block": "cobblemon:lobelia", + "block": "cobblemon:lobalia", "condition": "minecraft:block_state_property", "properties": { "half": "lower" } } ], - "name": "cobblemon:lobelia" + "name": "cobblemon:lobalia" } ], "rolls": 1.0 } ], - "random_sequence": "cobblemon:blocks/lobelia" + "random_sequence": "cobblemon:blocks/lobalia" } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_table/blocks/hydrangea.json b/common/src/main/resources/data/cobblemon/loot_table/blocks/pauvilla.json similarity index 87% rename from common/src/main/resources/data/cobblemon/loot_table/blocks/hydrangea.json rename to common/src/main/resources/data/cobblemon/loot_table/blocks/pauvilla.json index 4a977fcbcf..5d786099c0 100644 --- a/common/src/main/resources/data/cobblemon/loot_table/blocks/hydrangea.json +++ b/common/src/main/resources/data/cobblemon/loot_table/blocks/pauvilla.json @@ -12,7 +12,7 @@ "add": true, "conditions": [ { - "block": "cobblemon:hydrangea", + "block": "cobblemon:pauvilla", "condition": "minecraft:block_state_property", "properties": { "down": "true" @@ -26,7 +26,7 @@ "add": true, "conditions": [ { - "block": "cobblemon:hydrangea", + "block": "cobblemon:pauvilla", "condition": "minecraft:block_state_property", "properties": { "up": "true" @@ -40,7 +40,7 @@ "add": true, "conditions": [ { - "block": "cobblemon:hydrangea", + "block": "cobblemon:pauvilla", "condition": "minecraft:block_state_property", "properties": { "north": "true" @@ -54,7 +54,7 @@ "add": true, "conditions": [ { - "block": "cobblemon:hydrangea", + "block": "cobblemon:pauvilla", "condition": "minecraft:block_state_property", "properties": { "south": "true" @@ -68,7 +68,7 @@ "add": true, "conditions": [ { - "block": "cobblemon:hydrangea", + "block": "cobblemon:pauvilla", "condition": "minecraft:block_state_property", "properties": { "west": "true" @@ -82,7 +82,7 @@ "add": true, "conditions": [ { - "block": "cobblemon:hydrangea", + "block": "cobblemon:pauvilla", "condition": "minecraft:block_state_property", "properties": { "east": "true" @@ -101,11 +101,11 @@ "function": "minecraft:explosion_decay" } ], - "name": "cobblemon:hydrangea" + "name": "cobblemon:pauvilla" } ], "rolls": 1 } ], - "random_sequence": "cobblemon:blocks/hydrangea" + "random_sequence": "cobblemon:blocks/pauvilla" } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_table/blocks/craspedia.json b/common/src/main/resources/data/cobblemon/loot_table/blocks/pomohana.json similarity index 85% rename from common/src/main/resources/data/cobblemon/loot_table/blocks/craspedia.json rename to common/src/main/resources/data/cobblemon/loot_table/blocks/pomohana.json index 9f81a71026..4b7a2870c5 100644 --- a/common/src/main/resources/data/cobblemon/loot_table/blocks/craspedia.json +++ b/common/src/main/resources/data/cobblemon/loot_table/blocks/pomohana.json @@ -11,7 +11,7 @@ "add": false, "conditions": [ { - "block": "cobblemon:craspedia", + "block": "cobblemon:pomohana", "condition": "minecraft:block_state_property", "properties": { "flower_amount": "2" @@ -25,7 +25,7 @@ "add": false, "conditions": [ { - "block": "cobblemon:craspedia", + "block": "cobblemon:pomohana", "condition": "minecraft:block_state_property", "properties": { "flower_amount": "3" @@ -39,7 +39,7 @@ "add": false, "conditions": [ { - "block": "cobblemon:craspedia", + "block": "cobblemon:pomohana", "condition": "minecraft:block_state_property", "properties": { "flower_amount": "4" @@ -53,11 +53,11 @@ "function": "minecraft:explosion_decay" } ], - "name": "cobblemon:craspedia" + "name": "cobblemon:pomohana" } ], "rolls": 1.0 } ], - "random_sequence": "cobblemon:blocks/craspedia" + "random_sequence": "cobblemon:blocks/pomohana" } diff --git a/common/src/main/resources/data/cobblemon/tags/block/oricorio_flowers.json b/common/src/main/resources/data/cobblemon/tags/block/oricorio_flowers.json index 2c1ff94d8b..a19ad46f74 100644 --- a/common/src/main/resources/data/cobblemon/tags/block/oricorio_flowers.json +++ b/common/src/main/resources/data/cobblemon/tags/block/oricorio_flowers.json @@ -1,7 +1,7 @@ { "values": [ - "cobblemon:lobelia", - "cobblemon:craspedia", - "cobblemon:hydrangea" + "cobblemon:lobalia", + "cobblemon:pomohana", + "cobblemon:pauvilla" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/tags/block/pink_flowers.json b/common/src/main/resources/data/cobblemon/tags/block/pink_flowers.json index e052d89d47..98c2e34f4b 100644 --- a/common/src/main/resources/data/cobblemon/tags/block/pink_flowers.json +++ b/common/src/main/resources/data/cobblemon/tags/block/pink_flowers.json @@ -5,7 +5,7 @@ "minecraft:lilac", "minecraft:peony", "minecraft:pink_tulip", - "cobblemon:hydrangea", + "cobblemon:pauvilla", { "id": "aether_redux:iridia", "required": false diff --git a/common/src/main/resources/data/cobblemon/tags/block/red_flowers.json b/common/src/main/resources/data/cobblemon/tags/block/red_flowers.json index f3912fd226..12989d3a56 100644 --- a/common/src/main/resources/data/cobblemon/tags/block/red_flowers.json +++ b/common/src/main/resources/data/cobblemon/tags/block/red_flowers.json @@ -4,7 +4,7 @@ "minecraft:poppy", "minecraft:red_tulip", "minecraft:rose_bush", - "cobblemon:lobelia", + "cobblemon:lobalia", { "id": "ancient_aether:sakura_blossoms", "required": false diff --git a/common/src/main/resources/data/cobblemon/tags/block/yellow_flowers.json b/common/src/main/resources/data/cobblemon/tags/block/yellow_flowers.json index 6ceeae5e27..6f549e93ae 100644 --- a/common/src/main/resources/data/cobblemon/tags/block/yellow_flowers.json +++ b/common/src/main/resources/data/cobblemon/tags/block/yellow_flowers.json @@ -3,7 +3,7 @@ "values": [ "minecraft:dandelion", "minecraft:sunflower", - "cobblemon:craspedia", + "cobblemon:pomohana", { "id": "biomesoplenty:goldenrod", "required": false diff --git a/common/src/main/resources/data/cobblemon/tags/item/oricorio_flowers.json b/common/src/main/resources/data/cobblemon/tags/item/oricorio_flowers.json index 2c1ff94d8b..a19ad46f74 100644 --- a/common/src/main/resources/data/cobblemon/tags/item/oricorio_flowers.json +++ b/common/src/main/resources/data/cobblemon/tags/item/oricorio_flowers.json @@ -1,7 +1,7 @@ { "values": [ - "cobblemon:lobelia", - "cobblemon:craspedia", - "cobblemon:hydrangea" + "cobblemon:lobalia", + "cobblemon:pomohana", + "cobblemon:pauvilla" ] } \ No newline at end of file