diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f74c8de68..22953f4028 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,8 @@ ### Additions - The following items can now be placed on the ground as blocks: - - King's Rock, Galarica Cuff, Unremarkable Teacup, Masterpiece Teacup, Chipped Pot, Cracked Pot, Sachet, Metal Powder, Quick Powder, Bright Powder, Icy Rock, Heat Rock, Smooth Rock, Damp Rock, Destiny Knot, Luminous Moss, Never-Melt Ice, Wide Lens, Scope Lens, and Zoom Lens. - - Iron Ball, Metal Coat, Throat Spray, HP Up, Protein, Iron, Carbos, Calcium, Zinc, PP Up, PP Max, Upgrade, Dubious Disc, and Loaded Dice. + - King's Rock, Galarica Cuff, Unremarkable Teacup, Masterpiece Teacup, Chipped Pot, Cracked Pot, Sachet, Metal Powder, Quick Powder, Bright Powder, Soft Sand, Electirizer, Magmarizer, Icy Rock, Heat Rock, Smooth Rock, Damp Rock, Destiny Knot, Luminous Moss, Never-Melt Ice, Wide Lens, Scope Lens, and Zoom Lens. + - Iron Ball, Metal Coat, Throat Spray, Terrain Extender, Medicinal Brew, Moomoo Milk, HP Up, Protein, Iron, Carbos, Calcium, Zinc, PP Up, PP Max, Upgrade, Dubious Disc, and Loaded Dice. - The following items can now be placed on various surfaces: - Galarica Wreath, Magnet, Flame Orb, Life Orb, Toxic Orb, Light Ball, and Smoke Ball. - The following items can now be placed as blocks and have additional functionality: @@ -91,8 +91,10 @@ - Bright Powder can be used on Signs and Hanging Signs to make text glow, as an alternative to Glow Ink Sacs - Updated various recipes to display in Recipe Groups within the Recipe Book - Updated most recipes to display more logically/consistently within the Recipe Book's categories +- Updated the following recipes + - Never-Melt Ice, Focus Sash, Blunder Policy, Weakness Policy, Blank TM - Make ride rotations less jittery in multiplayer. -- Changes tm shelf discs to use textures instead of tinting and overlays to line up with item display +- Changes Disc Shelf TMs to use textures instead of tinting and overlays to line up with item display - Blank TM can now be inserted into the Disc Shelf - Added TM creative tab - Recall animation now renders ball in hand with the player arm raised. 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 49c65b68ad..69792c4a48 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonBlocks.kt @@ -653,6 +653,10 @@ object CobblemonBlocks : PlatformRegistry, ResourceKey, ResourceKey, ResourceKey, ResourceKey, ResourceKey, ResourceKey, ResourceKey, ResourceKey SCOPE_HITBOX DecorativeItemBlockType.WIDE -> WIDE_HITBOX DecorativeItemBlockType.ZOOM -> ZOOM_HITBOX + DecorativeItemBlockType.IZER -> IZER_HITBOX DecorativeItemBlockType.FLATTENED_10x4 -> SMOOSHED4_HITBOX DecorativeItemBlockType.FLATTENED_8x4 -> FLAT4_HITBOX DecorativeItemBlockType.FLATTENED_8x6 -> FLAT6_HITBOX diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/block/StackableItemBlock.kt b/common/src/main/kotlin/com/cobblemon/mod/common/block/StackableItemBlock.kt index 87eb107d61..6c59a0309c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/block/StackableItemBlock.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/block/StackableItemBlock.kt @@ -45,7 +45,9 @@ class StackableItemBlock(settings: Properties, val type: StackableItemBlockType) IRON_BALL, THROAT_SPRAY, UPGRADE, - DICE; + DICE, + GLASS_BOTTLE, + EXTENDER; override fun getSerializedName(): String = this.name.lowercase() @@ -133,6 +135,18 @@ class StackableItemBlock(settings: Properties, val type: StackableItemBlockType) Shapes.box(0.125, 0.0, 0.625, 0.5625, 0.1875, 0.875), Shapes.box(0.125, 0.0, 0.4375, 0.5625, 0.1875, 0.875), Shapes.box(0.125, 0.0, 0.4375, 0.5625, 0.375, 0.875) + ), + StackableItemBlockType.GLASS_BOTTLE to listOf( + Shapes.box(0.375, 0.0, 0.375, 0.625, 0.375, 0.625), + Shapes.box(0.1875, 0.0, 0.1875, 0.8125, 0.375, 0.6875), + Shapes.box(0.125, 0.0, 0.125, 0.8125, 0.375, 0.875), + Shapes.box(0.125, 0.0, 0.125, 0.875, 0.375, 0.875) + ), + StackableItemBlockType.EXTENDER to listOf( + Shapes.box(0.25, 0.0, 0.375, 0.625, 0.5625, 0.625), + Shapes.box(0.125, 0.0, 0.25, 0.875, 0.5625, 0.75), + Shapes.box(0.0625, 0.0, 0.0625, 0.875, 0.5625, 0.875), + Shapes.box(0.0625, 0.0, 0.0625, 0.9375, 0.5625, 0.9375) ) ) 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 42ae7efa4b..f9e32da3e4 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 @@ -416,6 +416,9 @@ object CobblemonClient { CobblemonBlocks.WIDE_LENS, CobblemonBlocks.ZOOM_LENS, CobblemonBlocks.SCOPE_LENS, + CobblemonBlocks.MOOMOO_MILK, + CobblemonBlocks.MEDICINAL_BREW, + CobblemonBlocks.TERRAIN_EXTENDER, CobblemonBlocks.RED_MINT_LEAF_LITTER, CobblemonBlocks.POTTED_RED_MINT, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/item/MoomooMilk.kt b/common/src/main/kotlin/com/cobblemon/mod/common/item/MoomooMilk.kt index e1795b8a43..b75976ec16 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/item/MoomooMilk.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/item/MoomooMilk.kt @@ -13,10 +13,12 @@ import com.cobblemon.mod.common.api.battles.model.actor.BattleActor import com.cobblemon.mod.common.battles.pokemon.BattlePokemon import com.cobblemon.mod.common.item.battle.BagItem import com.cobblemon.mod.common.item.battle.SimpleBagItemLike +import net.minecraft.world.item.ItemNameBlockItem import net.minecraft.world.item.ItemStack import net.minecraft.world.item.Items +import net.minecraft.world.level.block.Block -class MoomooMilk(properties: Properties) : CobblemonItem(properties), SimpleBagItemLike { +class MoomooMilk(properties: Properties, block: Block) : ItemNameBlockItem(block, properties), SimpleBagItemLike { override val bagItem = object : BagItem { override val itemName = "item.cobblemon.moomoo_milk" override val returnItem = Items.GLASS_BOTTLE diff --git a/common/src/main/resources/assets/cobblemon/blockstates/electirizer.json b/common/src/main/resources/assets/cobblemon/blockstates/electirizer.json new file mode 100644 index 0000000000..e2276ae76d --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/electirizer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=south": { + "model": "cobblemon:block/electirizer", + "y": 180 + }, + "facing=west": { + "model": "cobblemon:block/electirizer", + "y": 270 + }, + "facing=north": { + "model": "cobblemon:block/electirizer" + }, + "facing=east": { + "model": "cobblemon:block/electirizer", + "y": 90 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/magmarizer.json b/common/src/main/resources/assets/cobblemon/blockstates/magmarizer.json new file mode 100644 index 0000000000..255e7c98bf --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/magmarizer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=south": { + "model": "cobblemon:block/magmarizer", + "y": 180 + }, + "facing=west": { + "model": "cobblemon:block/magmarizer", + "y": 270 + }, + "facing=north": { + "model": "cobblemon:block/magmarizer" + }, + "facing=east": { + "model": "cobblemon:block/magmarizer", + "y": 90 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/medicinal_brew.json b/common/src/main/resources/assets/cobblemon/blockstates/medicinal_brew.json new file mode 100644 index 0000000000..7be42851a3 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/medicinal_brew.json @@ -0,0 +1,64 @@ +{ + "variants": { + "facing=north,amount=1": { + "model": "cobblemon:block/medicinal_brew_1" + }, + "facing=east,amount=1": { + "model": "cobblemon:block/medicinal_brew_1", + "y": 90 + }, + "facing=south,amount=1": { + "model": "cobblemon:block/medicinal_brew_1", + "y": 180 + }, + "facing=west,amount=1": { + "model": "cobblemon:block/medicinal_brew_1", + "y": 270 + }, + "facing=north,amount=2": { + "model": "cobblemon:block/medicinal_brew_2" + }, + "facing=east,amount=2": { + "model": "cobblemon:block/medicinal_brew_2", + "y": 90 + }, + "facing=south,amount=2": { + "model": "cobblemon:block/medicinal_brew_2", + "y": 180 + }, + "facing=west,amount=2": { + "model": "cobblemon:block/medicinal_brew_2", + "y": 270 + }, + "facing=north,amount=3": { + "model": "cobblemon:block/medicinal_brew_3" + }, + "facing=east,amount=3": { + "model": "cobblemon:block/medicinal_brew_3", + "y": 90 + }, + "facing=south,amount=3": { + "model": "cobblemon:block/medicinal_brew_3", + "y": 180 + }, + "facing=west,amount=3": { + "model": "cobblemon:block/medicinal_brew_3", + "y": 270 + }, + "facing=north,amount=4": { + "model": "cobblemon:block/medicinal_brew_4" + }, + "facing=east,amount=4": { + "model": "cobblemon:block/medicinal_brew_4", + "y": 90 + }, + "facing=south,amount=4": { + "model": "cobblemon:block/medicinal_brew_4", + "y": 180 + }, + "facing=west,amount=4": { + "model": "cobblemon:block/medicinal_brew_4", + "y": 270 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/moomoo_milk.json b/common/src/main/resources/assets/cobblemon/blockstates/moomoo_milk.json new file mode 100644 index 0000000000..a0ce03c30f --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/moomoo_milk.json @@ -0,0 +1,64 @@ +{ + "variants": { + "facing=north,amount=1": { + "model": "cobblemon:block/moomoo_milk_1" + }, + "facing=east,amount=1": { + "model": "cobblemon:block/moomoo_milk_1", + "y": 90 + }, + "facing=south,amount=1": { + "model": "cobblemon:block/moomoo_milk_1", + "y": 180 + }, + "facing=west,amount=1": { + "model": "cobblemon:block/moomoo_milk_1", + "y": 270 + }, + "facing=north,amount=2": { + "model": "cobblemon:block/moomoo_milk_2" + }, + "facing=east,amount=2": { + "model": "cobblemon:block/moomoo_milk_2", + "y": 90 + }, + "facing=south,amount=2": { + "model": "cobblemon:block/moomoo_milk_2", + "y": 180 + }, + "facing=west,amount=2": { + "model": "cobblemon:block/moomoo_milk_2", + "y": 270 + }, + "facing=north,amount=3": { + "model": "cobblemon:block/moomoo_milk_3" + }, + "facing=east,amount=3": { + "model": "cobblemon:block/moomoo_milk_3", + "y": 90 + }, + "facing=south,amount=3": { + "model": "cobblemon:block/moomoo_milk_3", + "y": 180 + }, + "facing=west,amount=3": { + "model": "cobblemon:block/moomoo_milk_3", + "y": 270 + }, + "facing=north,amount=4": { + "model": "cobblemon:block/moomoo_milk_4" + }, + "facing=east,amount=4": { + "model": "cobblemon:block/moomoo_milk_4", + "y": 90 + }, + "facing=south,amount=4": { + "model": "cobblemon:block/moomoo_milk_4", + "y": 180 + }, + "facing=west,amount=4": { + "model": "cobblemon:block/moomoo_milk_4", + "y": 270 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/soft_sand.json b/common/src/main/resources/assets/cobblemon/blockstates/soft_sand.json new file mode 100644 index 0000000000..ada5a7477e --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/soft_sand.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=south": { + "model": "cobblemon:block/soft_sand", + "y": 180 + }, + "facing=west": { + "model": "cobblemon:block/soft_sand", + "y": 270 + }, + "facing=north": { + "model": "cobblemon:block/soft_sand" + }, + "facing=east": { + "model": "cobblemon:block/soft_sand", + "y": 90 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/blockstates/terrain_extender.json b/common/src/main/resources/assets/cobblemon/blockstates/terrain_extender.json new file mode 100644 index 0000000000..65db096545 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/blockstates/terrain_extender.json @@ -0,0 +1,64 @@ +{ + "variants": { + "facing=north,amount=1": { + "model": "cobblemon:block/terrain_extender_1" + }, + "facing=east,amount=1": { + "model": "cobblemon:block/terrain_extender_1", + "y": 90 + }, + "facing=south,amount=1": { + "model": "cobblemon:block/terrain_extender_1", + "y": 180 + }, + "facing=west,amount=1": { + "model": "cobblemon:block/terrain_extender_1", + "y": 270 + }, + "facing=north,amount=2": { + "model": "cobblemon:block/terrain_extender_2" + }, + "facing=east,amount=2": { + "model": "cobblemon:block/terrain_extender_2", + "y": 90 + }, + "facing=south,amount=2": { + "model": "cobblemon:block/terrain_extender_2", + "y": 180 + }, + "facing=west,amount=2": { + "model": "cobblemon:block/terrain_extender_2", + "y": 270 + }, + "facing=north,amount=3": { + "model": "cobblemon:block/terrain_extender_3" + }, + "facing=east,amount=3": { + "model": "cobblemon:block/terrain_extender_3", + "y": 90 + }, + "facing=south,amount=3": { + "model": "cobblemon:block/terrain_extender_3", + "y": 180 + }, + "facing=west,amount=3": { + "model": "cobblemon:block/terrain_extender_3", + "y": 270 + }, + "facing=north,amount=4": { + "model": "cobblemon:block/terrain_extender_4" + }, + "facing=east,amount=4": { + "model": "cobblemon:block/terrain_extender_4", + "y": 90 + }, + "facing=south,amount=4": { + "model": "cobblemon:block/terrain_extender_4", + "y": 180 + }, + "facing=west,amount=4": { + "model": "cobblemon:block/terrain_extender_4", + "y": 270 + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/electirizer.json b/common/src/main/resources/assets/cobblemon/models/block/electirizer.json new file mode 100644 index 0000000000..d50083d18c --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/electirizer.json @@ -0,0 +1,63 @@ +{ + "format_version": "1.9.0", + "credit": "Made with Blockbench", + "texture_size": [32, 16], + "textures": { + "0": "cobblemon:block/decorative/electirizer", + "particle": "cobblemon:block/decorative/electirizer" + }, + "elements": [ + { + "from": [4, 0, 4], + "to": [12, 6, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 4]}, + "faces": { + "north": {"uv": [6, 9, 10, 15], "texture": "#0"}, + "east": {"uv": [2, 9, 6, 15], "texture": "#0"}, + "south": {"uv": [2, 2, 6, 8], "texture": "#0"}, + "west": {"uv": [10, 9, 14, 15], "texture": "#0"}, + "up": {"uv": [6, 1, 10, 9], "rotation": 180, "texture": "#0"}, + "down": {"uv": [10, 1, 14, 9], "texture": "#0", "cullface": "down"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 1.5], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 1.5], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "translation": [0, 1.5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, -135, 0], + "translation": [0, 1.5, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 135, 0], + "translation": [0, 4.25, 0] + }, + "head": { + "translation": [0, 14.25, 0] + }, + "fixed": { + "translation": [0, 4, 0] + }, + "on_shelf": { + "rotation": [0, -180, 0] + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/magmarizer.json b/common/src/main/resources/assets/cobblemon/models/block/magmarizer.json new file mode 100644 index 0000000000..b94af8e466 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/magmarizer.json @@ -0,0 +1,7 @@ +{ + "parent": "cobblemon:block/electirizer", + "textures": { + "0": "cobblemon:block/decorative/magmarizer", + "particle": "cobblemon:block/decorative/magmarizer" + } +} diff --git a/common/src/main/resources/assets/cobblemon/models/block/medicinal_brew_1.json b/common/src/main/resources/assets/cobblemon/models/block/medicinal_brew_1.json new file mode 100644 index 0000000000..603d000136 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/medicinal_brew_1.json @@ -0,0 +1,88 @@ +{ + "textures": { + "0": "cobblemon:block/decorative/medicinal_brew", + "particle": "cobblemon:block/decorative/medicinal_brew" + }, + "elements": [ + { + "name": "bottle", + "from": [6, 0, 6], + "to": [10, 5, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 8]}, + "faces": { + "north": {"uv": [4, 4, 8, 9], "texture": "#0"}, + "east": {"uv": [0, 4, 4, 9], "texture": "#0"}, + "south": {"uv": [12, 4, 16, 9], "texture": "#0"}, + "west": {"uv": [8, 4, 12, 9], "texture": "#0"}, + "up": {"uv": [8, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [8, 0, 12, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [10, 5, 10], + "to": [6, 4, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, + "faces": { + "north": {"uv": [12, 4, 16, 5], "texture": "#0"}, + "east": {"uv": [8, 4, 12, 5], "texture": "#0"}, + "south": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 8, 5], "texture": "#0"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "cork", + "from": [6.5, 5, 6.5], + "to": [9.5, 6, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 5, 7]}, + "faces": { + "north": {"uv": [3, 12, 6, 13], "texture": "#0"}, + "east": {"uv": [0, 12, 3, 13], "texture": "#0"}, + "south": {"uv": [9, 12, 12, 13], "texture": "#0"}, + "west": {"uv": [6, 12, 9, 13], "texture": "#0"}, + "up": {"uv": [6, 12, 3, 9], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 3, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "translation": [0, 3, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "translation": [0, 3, 0] + }, + "firstperson_lefthand": { + "translation": [0, 3, 0] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 135, 0], + "translation": [0, 3, 0] + }, + "head": { + "translation": [0, 14.5, 0] + }, + "fixed": { + "translation": [0, 4, 0] + } + }, + "groups": [ + { + "name": "medicine_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [0, 1, 2] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/medicinal_brew_2.json b/common/src/main/resources/assets/cobblemon/models/block/medicinal_brew_2.json new file mode 100644 index 0000000000..179fe26dfe --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/medicinal_brew_2.json @@ -0,0 +1,136 @@ +{ + "textures": { + "0": "cobblemon:block/decorative/medicinal_brew", + "particle": "cobblemon:block/decorative/medicinal_brew" + }, + "elements": [ + { + "name": "bottle", + "from": [9, 0, 7], + "to": [13, 5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 3.5, 9]}, + "faces": { + "north": {"uv": [4, 4, 8, 9], "texture": "#0"}, + "east": {"uv": [0, 4, 4, 9], "texture": "#0"}, + "south": {"uv": [12, 4, 16, 9], "texture": "#0"}, + "west": {"uv": [8, 4, 12, 9], "texture": "#0"}, + "up": {"uv": [8, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [8, 0, 12, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [13, 5, 11], + "to": [9, 4, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 5, 9]}, + "faces": { + "north": {"uv": [12, 4, 16, 5], "texture": "#0"}, + "east": {"uv": [8, 4, 12, 5], "texture": "#0"}, + "south": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 8, 5], "texture": "#0"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "cork", + "from": [9.5, 5, 7.5], + "to": [12.5, 6, 10.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 5, 8]}, + "faces": { + "north": {"uv": [3, 12, 6, 13], "texture": "#0"}, + "east": {"uv": [0, 12, 3, 13], "texture": "#0"}, + "south": {"uv": [9, 12, 12, 13], "texture": "#0"}, + "west": {"uv": [6, 12, 9, 13], "texture": "#0"}, + "up": {"uv": [6, 12, 3, 9], "texture": "#0"} + } + }, + { + "name": "bottle", + "from": [3, 0, 5], + "to": [7, 5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 3.5, 7]}, + "faces": { + "north": {"uv": [4, 4, 8, 9], "texture": "#0"}, + "east": {"uv": [0, 4, 4, 9], "texture": "#0"}, + "south": {"uv": [12, 4, 16, 9], "texture": "#0"}, + "west": {"uv": [8, 4, 12, 9], "texture": "#0"}, + "up": {"uv": [8, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [8, 0, 12, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [7, 5, 9], + "to": [3, 4, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 5, 7]}, + "faces": { + "north": {"uv": [12, 4, 16, 5], "texture": "#0"}, + "east": {"uv": [8, 4, 12, 5], "texture": "#0"}, + "south": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 8, 5], "texture": "#0"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "cork", + "from": [3.5, 5, 5.5], + "to": [6.5, 6, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 5, 6]}, + "faces": { + "north": {"uv": [3, 12, 6, 13], "texture": "#0"}, + "east": {"uv": [0, 12, 3, 13], "texture": "#0"}, + "south": {"uv": [9, 12, 12, 13], "texture": "#0"}, + "west": {"uv": [6, 12, 9, 13], "texture": "#0"}, + "up": {"uv": [6, 12, 3, 9], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 3, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "translation": [0, 3, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "translation": [0, 3, 0] + }, + "firstperson_lefthand": { + "translation": [0, 3, 0] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 135, 0], + "translation": [0, 3, 0] + }, + "head": { + "translation": [0, 14.5, 0] + }, + "fixed": { + "translation": [0, 4, 0] + } + }, + "groups": [ + { + "name": "medicine_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [0, 1, 2] + }, + { + "name": "medicine_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [3, 4, 5] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/medicinal_brew_3.json b/common/src/main/resources/assets/cobblemon/models/block/medicinal_brew_3.json new file mode 100644 index 0000000000..2cb9468259 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/medicinal_brew_3.json @@ -0,0 +1,184 @@ +{ + "textures": { + "0": "cobblemon:block/decorative/medicinal_brew", + "particle": "cobblemon:block/decorative/medicinal_brew" + }, + "elements": [ + { + "name": "bottle", + "from": [9, 0, 10], + "to": [13, 5, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 3.5, 12]}, + "faces": { + "north": {"uv": [4, 4, 8, 9], "texture": "#0"}, + "east": {"uv": [0, 4, 4, 9], "texture": "#0"}, + "south": {"uv": [12, 4, 16, 9], "texture": "#0"}, + "west": {"uv": [8, 4, 12, 9], "texture": "#0"}, + "up": {"uv": [8, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [8, 0, 12, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [13, 5, 14], + "to": [9, 4, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 5, 12]}, + "faces": { + "north": {"uv": [12, 4, 16, 5], "texture": "#0"}, + "east": {"uv": [8, 4, 12, 5], "texture": "#0"}, + "south": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 8, 5], "texture": "#0"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "cork", + "from": [9.5, 5, 10.5], + "to": [12.5, 6, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 5, 11]}, + "faces": { + "north": {"uv": [3, 12, 6, 13], "texture": "#0"}, + "east": {"uv": [0, 12, 3, 13], "texture": "#0"}, + "south": {"uv": [9, 12, 12, 13], "texture": "#0"}, + "west": {"uv": [6, 12, 9, 13], "texture": "#0"}, + "up": {"uv": [6, 12, 3, 9], "texture": "#0"} + } + }, + { + "name": "bottle", + "from": [3, 0, 8], + "to": [7, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 3.5, 10]}, + "faces": { + "north": {"uv": [4, 4, 8, 9], "texture": "#0"}, + "east": {"uv": [0, 4, 4, 9], "texture": "#0"}, + "south": {"uv": [12, 4, 16, 9], "texture": "#0"}, + "west": {"uv": [8, 4, 12, 9], "texture": "#0"}, + "up": {"uv": [8, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [8, 0, 12, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [7, 5, 12], + "to": [3, 4, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 5, 10]}, + "faces": { + "north": {"uv": [12, 4, 16, 5], "texture": "#0"}, + "east": {"uv": [8, 4, 12, 5], "texture": "#0"}, + "south": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 8, 5], "texture": "#0"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "cork", + "from": [3.5, 5, 8.5], + "to": [6.5, 6, 11.5], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 5, 9]}, + "faces": { + "north": {"uv": [3, 12, 6, 13], "texture": "#0"}, + "east": {"uv": [0, 12, 3, 13], "texture": "#0"}, + "south": {"uv": [9, 12, 12, 13], "texture": "#0"}, + "west": {"uv": [6, 12, 9, 13], "texture": "#0"}, + "up": {"uv": [6, 12, 3, 9], "texture": "#0"} + } + }, + { + "name": "bottle", + "from": [7, 0, 3], + "to": [11, 5, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 3.5, 5]}, + "faces": { + "north": {"uv": [4, 4, 8, 9], "texture": "#0"}, + "east": {"uv": [0, 4, 4, 9], "texture": "#0"}, + "south": {"uv": [12, 4, 16, 9], "texture": "#0"}, + "west": {"uv": [8, 4, 12, 9], "texture": "#0"}, + "up": {"uv": [8, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [8, 0, 12, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [11, 5, 7], + "to": [7, 4, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 5, 5]}, + "faces": { + "north": {"uv": [12, 4, 16, 5], "texture": "#0"}, + "east": {"uv": [8, 4, 12, 5], "texture": "#0"}, + "south": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 8, 5], "texture": "#0"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "cork", + "from": [7.5, 5, 3.5], + "to": [10.5, 6, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 4]}, + "faces": { + "north": {"uv": [3, 12, 6, 13], "texture": "#0"}, + "east": {"uv": [0, 12, 3, 13], "texture": "#0"}, + "south": {"uv": [9, 12, 12, 13], "texture": "#0"}, + "west": {"uv": [6, 12, 9, 13], "texture": "#0"}, + "up": {"uv": [6, 12, 3, 9], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 3, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "translation": [0, 3, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "translation": [0, 3, 0] + }, + "firstperson_lefthand": { + "translation": [0, 3, 0] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 135, 0], + "translation": [0, 3, 0] + }, + "head": { + "translation": [0, 14.5, 0] + }, + "fixed": { + "translation": [0, 4, 0] + } + }, + "groups": [ + { + "name": "medicine_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [0, 1, 2] + }, + { + "name": "medicine_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [3, 4, 5] + }, + { + "name": "medicine_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [6, 7, 8] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/medicinal_brew_4.json b/common/src/main/resources/assets/cobblemon/models/block/medicinal_brew_4.json new file mode 100644 index 0000000000..f8256be95e --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/medicinal_brew_4.json @@ -0,0 +1,232 @@ +{ + "textures": { + "0": "cobblemon:block/decorative/medicinal_brew", + "particle": "cobblemon:block/decorative/medicinal_brew" + }, + "elements": [ + { + "name": "bottle", + "from": [9, 0, 10], + "to": [13, 5, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 3.5, 12]}, + "faces": { + "north": {"uv": [4, 4, 8, 9], "texture": "#0"}, + "east": {"uv": [0, 4, 4, 9], "texture": "#0"}, + "south": {"uv": [12, 4, 16, 9], "texture": "#0"}, + "west": {"uv": [8, 4, 12, 9], "texture": "#0"}, + "up": {"uv": [8, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [8, 0, 12, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [13, 5, 14], + "to": [9, 4, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 5, 12]}, + "faces": { + "north": {"uv": [12, 4, 16, 5], "texture": "#0"}, + "east": {"uv": [8, 4, 12, 5], "texture": "#0"}, + "south": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 8, 5], "texture": "#0"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "cork", + "from": [9.5, 5, 10.5], + "to": [12.5, 6, 13.5], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 5, 11]}, + "faces": { + "north": {"uv": [3, 12, 6, 13], "texture": "#0"}, + "east": {"uv": [0, 12, 3, 13], "texture": "#0"}, + "south": {"uv": [9, 12, 12, 13], "texture": "#0"}, + "west": {"uv": [6, 12, 9, 13], "texture": "#0"}, + "up": {"uv": [6, 12, 3, 9], "texture": "#0"} + } + }, + { + "name": "bottle", + "from": [3, 0, 9], + "to": [7, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 3.5, 11]}, + "faces": { + "north": {"uv": [4, 4, 8, 9], "texture": "#0"}, + "east": {"uv": [0, 4, 4, 9], "texture": "#0"}, + "south": {"uv": [12, 4, 16, 9], "texture": "#0"}, + "west": {"uv": [8, 4, 12, 9], "texture": "#0"}, + "up": {"uv": [8, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [8, 0, 12, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [7, 5, 13], + "to": [3, 4, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 5, 11]}, + "faces": { + "north": {"uv": [12, 4, 16, 5], "texture": "#0"}, + "east": {"uv": [8, 4, 12, 5], "texture": "#0"}, + "south": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 8, 5], "texture": "#0"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "cork", + "from": [3.5, 5, 9.5], + "to": [6.5, 6, 12.5], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 5, 10]}, + "faces": { + "north": {"uv": [3, 12, 6, 13], "texture": "#0"}, + "east": {"uv": [0, 12, 3, 13], "texture": "#0"}, + "south": {"uv": [9, 12, 12, 13], "texture": "#0"}, + "west": {"uv": [6, 12, 9, 13], "texture": "#0"}, + "up": {"uv": [6, 12, 3, 9], "texture": "#0"} + } + }, + { + "name": "bottle", + "from": [8, 0, 4], + "to": [12, 5, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 3.5, 6]}, + "faces": { + "north": {"uv": [4, 4, 8, 9], "texture": "#0"}, + "east": {"uv": [0, 4, 4, 9], "texture": "#0"}, + "south": {"uv": [12, 4, 16, 9], "texture": "#0"}, + "west": {"uv": [8, 4, 12, 9], "texture": "#0"}, + "up": {"uv": [8, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [8, 0, 12, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [12, 5, 8], + "to": [8, 4, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 5, 6]}, + "faces": { + "north": {"uv": [12, 4, 16, 5], "texture": "#0"}, + "east": {"uv": [8, 4, 12, 5], "texture": "#0"}, + "south": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 8, 5], "texture": "#0"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "cork", + "from": [8.5, 5, 4.5], + "to": [11.5, 6, 7.5], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 5, 5]}, + "faces": { + "north": {"uv": [3, 12, 6, 13], "texture": "#0"}, + "east": {"uv": [0, 12, 3, 13], "texture": "#0"}, + "south": {"uv": [9, 12, 12, 13], "texture": "#0"}, + "west": {"uv": [6, 12, 9, 13], "texture": "#0"}, + "up": {"uv": [6, 12, 3, 9], "texture": "#0"} + } + }, + { + "name": "bottle", + "from": [2, 0, 3], + "to": [6, 5, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 3.5, 5]}, + "faces": { + "north": {"uv": [4, 4, 8, 9], "texture": "#0"}, + "east": {"uv": [0, 4, 4, 9], "texture": "#0"}, + "south": {"uv": [12, 4, 16, 9], "texture": "#0"}, + "west": {"uv": [8, 4, 12, 9], "texture": "#0"}, + "up": {"uv": [8, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [8, 0, 12, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [6, 5, 7], + "to": [2, 4, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 5, 5]}, + "faces": { + "north": {"uv": [12, 4, 16, 5], "texture": "#0"}, + "east": {"uv": [8, 4, 12, 5], "texture": "#0"}, + "south": {"uv": [0, 4, 4, 5], "texture": "#0"}, + "west": {"uv": [4, 4, 8, 5], "texture": "#0"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "cork", + "from": [2.5, 5, 3.5], + "to": [5.5, 6, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 5, 4]}, + "faces": { + "north": {"uv": [3, 12, 6, 13], "texture": "#0"}, + "east": {"uv": [0, 12, 3, 13], "texture": "#0"}, + "south": {"uv": [9, 12, 12, 13], "texture": "#0"}, + "west": {"uv": [6, 12, 9, 13], "texture": "#0"}, + "up": {"uv": [6, 12, 3, 9], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 3, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "translation": [0, 3, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "translation": [0, 3, 0] + }, + "firstperson_lefthand": { + "translation": [0, 3, 0] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 135, 0], + "translation": [0, 3, 0] + }, + "head": { + "translation": [0, 14.5, 0] + }, + "fixed": { + "translation": [0, 4, 0] + } + }, + "groups": [ + { + "name": "medicine_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [0, 1, 2] + }, + { + "name": "medicine_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [3, 4, 5] + }, + { + "name": "medicine_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [6, 7, 8] + }, + { + "name": "medicine_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [9, 10, 11] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/moomoo_milk_1.json b/common/src/main/resources/assets/cobblemon/models/block/moomoo_milk_1.json new file mode 100644 index 0000000000..de36c62ed3 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/moomoo_milk_1.json @@ -0,0 +1,115 @@ +{ + "textures": { + "0": "cobblemon:block/decorative/moomoo_milk", + "particle": "cobblemon:block/decorative/moomoo_milk" + }, + "elements": [ + { + "name": "bottle", + "from": [6, 0, 6], + "to": [10, 6, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 8]}, + "faces": { + "north": {"uv": [0, 0, 4, 6], "texture": "#0"}, + "east": {"uv": [4, 0, 8, 6], "texture": "#0"}, + "south": {"uv": [0, 6, 4, 12], "texture": "#0"}, + "west": {"uv": [4, 6, 8, 12], "texture": "#0"}, + "up": {"uv": [8, 0, 12, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [10, 5, 10], + "to": [6, 4, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, + "faces": { + "north": {"uv": [0, 7, 4, 8], "texture": "#0"}, + "east": {"uv": [4, 7, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 1, 4, 2], "texture": "#0"}, + "west": {"uv": [4, 1, 8, 2], "texture": "#0"}, + "up": {"uv": [8, 7, 12, 11], "texture": "#0"}, + "down": {"uv": [12, 7, 16, 11], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "flap", + "from": [6, 4.25, 6], + "to": [10, 5.25, 6], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 5, 6]}, + "faces": { + "north": {"uv": [10, 6, 14, 6.75], "texture": "#0"}, + "south": {"uv": [10, 6, 14, 6.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [6, 4.25, 10], + "to": [10, 5.25, 10], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 5, 10]}, + "faces": { + "north": {"uv": [10, 4, 14, 4.75], "texture": "#0"}, + "south": {"uv": [10, 4, 14, 4.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [10, 4.25, 6], + "to": [10, 5.25, 10], + "rotation": {"angle": 22.5, "axis": "z", "origin": [10, 5, 8]}, + "faces": { + "east": {"uv": [8, 5, 12, 5.75], "texture": "#0"}, + "west": {"uv": [8, 5, 12, 5.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [6, 4.25, 6], + "to": [6, 5.25, 10], + "rotation": {"angle": -22.5, "axis": "z", "origin": [6, 5, 8]}, + "faces": { + "east": {"uv": [12, 5, 16, 5.75], "texture": "#0"}, + "west": {"uv": [12, 5, 16, 5.75], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 3, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "translation": [0, 3, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "translation": [0, 3, 0] + }, + "firstperson_lefthand": { + "translation": [0, 3, 0] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 135, 0], + "translation": [0, 3, 0] + }, + "head": { + "translation": [0, 14.5, 0] + }, + "fixed": { + "translation": [0, 4, 0] + } + }, + "groups": [ + { + "name": "moomoo_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [0, 1, 2, 3, 4, 5] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/moomoo_milk_2.json b/common/src/main/resources/assets/cobblemon/models/block/moomoo_milk_2.json new file mode 100644 index 0000000000..26a1120df9 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/moomoo_milk_2.json @@ -0,0 +1,190 @@ +{ + "textures": { + "0": "cobblemon:block/decorative/moomoo_milk", + "particle": "cobblemon:block/decorative/moomoo_milk" + }, + "elements": [ + { + "name": "bottle", + "from": [3, 0, 3], + "to": [7, 6, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 3.5, 5]}, + "faces": { + "north": {"uv": [0, 0, 4, 6], "texture": "#0"}, + "east": {"uv": [4, 0, 8, 6], "texture": "#0"}, + "south": {"uv": [0, 6, 4, 12], "texture": "#0"}, + "west": {"uv": [4, 6, 8, 12], "texture": "#0"}, + "up": {"uv": [8, 0, 12, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [7, 5, 7], + "to": [3, 4, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 5, 5]}, + "faces": { + "north": {"uv": [0, 7, 4, 8], "texture": "#0"}, + "east": {"uv": [4, 7, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 1, 4, 2], "texture": "#0"}, + "west": {"uv": [4, 1, 8, 2], "texture": "#0"}, + "up": {"uv": [8, 7, 12, 11], "texture": "#0"}, + "down": {"uv": [12, 7, 16, 11], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "flap", + "from": [3, 4.25, 3], + "to": [7, 5.25, 3], + "rotation": {"angle": 22.5, "axis": "x", "origin": [5, 5, 3]}, + "faces": { + "north": {"uv": [10, 6, 14, 6.75], "texture": "#0"}, + "south": {"uv": [10, 6, 14, 6.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [3, 4.25, 7], + "to": [7, 5.25, 7], + "rotation": {"angle": -22.5, "axis": "x", "origin": [5, 5, 7]}, + "faces": { + "north": {"uv": [10, 4, 14, 4.75], "texture": "#0"}, + "south": {"uv": [10, 4, 14, 4.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [7, 4.25, 3], + "to": [7, 5.25, 7], + "rotation": {"angle": 22.5, "axis": "z", "origin": [7, 5, 5]}, + "faces": { + "east": {"uv": [8, 5, 12, 5.75], "texture": "#0"}, + "west": {"uv": [8, 5, 12, 5.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [3, 4.25, 3], + "to": [3, 5.25, 7], + "rotation": {"angle": -22.5, "axis": "z", "origin": [3, 5, 5]}, + "faces": { + "east": {"uv": [12, 5, 16, 5.75], "texture": "#0"}, + "west": {"uv": [12, 5, 16, 5.75], "texture": "#0"} + } + }, + { + "name": "bottle", + "from": [9, 0, 9], + "to": [13, 6, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 3.5, 11]}, + "faces": { + "north": {"uv": [0, 0, 4, 6], "texture": "#0"}, + "east": {"uv": [4, 0, 8, 6], "texture": "#0"}, + "south": {"uv": [0, 6, 4, 12], "texture": "#0"}, + "west": {"uv": [4, 6, 8, 12], "texture": "#0"}, + "up": {"uv": [8, 0, 12, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [13, 5, 13], + "to": [9, 4, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 5, 11]}, + "faces": { + "north": {"uv": [0, 7, 4, 8], "texture": "#0"}, + "east": {"uv": [4, 7, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 1, 4, 2], "texture": "#0"}, + "west": {"uv": [4, 1, 8, 2], "texture": "#0"}, + "up": {"uv": [8, 7, 12, 11], "texture": "#0"}, + "down": {"uv": [12, 7, 16, 11], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "flap", + "from": [9, 4.25, 9], + "to": [13, 5.25, 9], + "rotation": {"angle": 22.5, "axis": "x", "origin": [11, 5, 9]}, + "faces": { + "north": {"uv": [10, 6, 14, 6.75], "texture": "#0"}, + "south": {"uv": [10, 6, 14, 6.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [9, 4.25, 13], + "to": [13, 5.25, 13], + "rotation": {"angle": -22.5, "axis": "x", "origin": [11, 5, 13]}, + "faces": { + "north": {"uv": [10, 4, 14, 4.75], "texture": "#0"}, + "south": {"uv": [10, 4, 14, 4.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [13, 4.25, 9], + "to": [13, 5.25, 13], + "rotation": {"angle": 22.5, "axis": "z", "origin": [13, 5, 11]}, + "faces": { + "east": {"uv": [8, 5, 12, 5.75], "texture": "#0"}, + "west": {"uv": [8, 5, 12, 5.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [9, 4.25, 9], + "to": [9, 5.25, 13], + "rotation": {"angle": -22.5, "axis": "z", "origin": [9, 5, 11]}, + "faces": { + "east": {"uv": [12, 5, 16, 5.75], "texture": "#0"}, + "west": {"uv": [12, 5, 16, 5.75], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 3, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "translation": [0, 3, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "translation": [0, 3, 0] + }, + "firstperson_lefthand": { + "translation": [0, 3, 0] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 135, 0], + "translation": [0, 3, 0] + }, + "head": { + "translation": [0, 14.5, 0] + }, + "fixed": { + "translation": [0, 4, 0] + } + }, + "groups": [ + { + "name": "moomoo_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [0, 1, 2, 3, 4, 5] + }, + { + "name": "moomoo_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [6, 7, 8, 9, 10, 11] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/moomoo_milk_3.json b/common/src/main/resources/assets/cobblemon/models/block/moomoo_milk_3.json new file mode 100644 index 0000000000..3bbea881ef --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/moomoo_milk_3.json @@ -0,0 +1,265 @@ +{ + "textures": { + "0": "cobblemon:block/decorative/moomoo_milk", + "particle": "cobblemon:block/decorative/moomoo_milk" + }, + "elements": [ + { + "name": "bottle", + "from": [6, 0, 3], + "to": [10, 6, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.5, 5]}, + "faces": { + "north": {"uv": [0, 0, 4, 6], "texture": "#0"}, + "east": {"uv": [4, 0, 8, 6], "texture": "#0"}, + "south": {"uv": [0, 6, 4, 12], "texture": "#0"}, + "west": {"uv": [4, 6, 8, 12], "texture": "#0"}, + "up": {"uv": [8, 0, 12, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [10, 5, 7], + "to": [6, 4, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 5]}, + "faces": { + "north": {"uv": [0, 7, 4, 8], "texture": "#0"}, + "east": {"uv": [4, 7, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 1, 4, 2], "texture": "#0"}, + "west": {"uv": [4, 1, 8, 2], "texture": "#0"}, + "up": {"uv": [8, 7, 12, 11], "texture": "#0"}, + "down": {"uv": [12, 7, 16, 11], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "flap", + "from": [6, 4.25, 3], + "to": [10, 5.25, 3], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 5, 3]}, + "faces": { + "north": {"uv": [10, 6, 14, 6.75], "texture": "#0"}, + "south": {"uv": [10, 6, 14, 6.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [6, 4.25, 7], + "to": [10, 5.25, 7], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 5, 7]}, + "faces": { + "north": {"uv": [10, 4, 14, 4.75], "texture": "#0"}, + "south": {"uv": [10, 4, 14, 4.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [10, 4.25, 3], + "to": [10, 5.25, 7], + "rotation": {"angle": 22.5, "axis": "z", "origin": [10, 5, 5]}, + "faces": { + "east": {"uv": [8, 5, 12, 5.75], "texture": "#0"}, + "west": {"uv": [8, 5, 12, 5.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [6, 4.25, 3], + "to": [6, 5.25, 7], + "rotation": {"angle": -22.5, "axis": "z", "origin": [6, 5, 5]}, + "faces": { + "east": {"uv": [12, 5, 16, 5.75], "texture": "#0"}, + "west": {"uv": [12, 5, 16, 5.75], "texture": "#0"} + } + }, + { + "name": "bottle", + "from": [2, 0, 8], + "to": [6, 6, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 3.5, 10]}, + "faces": { + "north": {"uv": [0, 0, 4, 6], "texture": "#0"}, + "east": {"uv": [4, 0, 8, 6], "texture": "#0"}, + "south": {"uv": [0, 6, 4, 12], "texture": "#0"}, + "west": {"uv": [4, 6, 8, 12], "texture": "#0"}, + "up": {"uv": [8, 0, 12, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [6, 5, 12], + "to": [2, 4, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 5, 10]}, + "faces": { + "north": {"uv": [0, 7, 4, 8], "texture": "#0"}, + "east": {"uv": [4, 7, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 1, 4, 2], "texture": "#0"}, + "west": {"uv": [4, 1, 8, 2], "texture": "#0"}, + "up": {"uv": [8, 7, 12, 11], "texture": "#0"}, + "down": {"uv": [12, 7, 16, 11], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "flap", + "from": [2, 4.25, 8], + "to": [6, 5.25, 8], + "rotation": {"angle": 22.5, "axis": "x", "origin": [4, 5, 8]}, + "faces": { + "north": {"uv": [10, 6, 14, 6.75], "texture": "#0"}, + "south": {"uv": [10, 6, 14, 6.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [2, 4.25, 12], + "to": [6, 5.25, 12], + "rotation": {"angle": -22.5, "axis": "x", "origin": [4, 5, 12]}, + "faces": { + "north": {"uv": [10, 4, 14, 4.75], "texture": "#0"}, + "south": {"uv": [10, 4, 14, 4.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [6, 4.25, 8], + "to": [6, 5.25, 12], + "rotation": {"angle": 22.5, "axis": "z", "origin": [6, 5, 10]}, + "faces": { + "east": {"uv": [8, 5, 12, 5.75], "texture": "#0"}, + "west": {"uv": [8, 5, 12, 5.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [2, 4.25, 8], + "to": [2, 5.25, 12], + "rotation": {"angle": -22.5, "axis": "z", "origin": [2, 5, 10]}, + "faces": { + "east": {"uv": [12, 5, 16, 5.75], "texture": "#0"}, + "west": {"uv": [12, 5, 16, 5.75], "texture": "#0"} + } + }, + { + "name": "bottle", + "from": [9, 0, 9], + "to": [13, 6, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 3.5, 11]}, + "faces": { + "north": {"uv": [0, 0, 4, 6], "texture": "#0"}, + "east": {"uv": [4, 0, 8, 6], "texture": "#0"}, + "south": {"uv": [0, 6, 4, 12], "texture": "#0"}, + "west": {"uv": [4, 6, 8, 12], "texture": "#0"}, + "up": {"uv": [8, 0, 12, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [13, 5, 13], + "to": [9, 4, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 5, 11]}, + "faces": { + "north": {"uv": [0, 7, 4, 8], "texture": "#0"}, + "east": {"uv": [4, 7, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 1, 4, 2], "texture": "#0"}, + "west": {"uv": [4, 1, 8, 2], "texture": "#0"}, + "up": {"uv": [8, 7, 12, 11], "texture": "#0"}, + "down": {"uv": [12, 7, 16, 11], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "flap", + "from": [9, 4.25, 9], + "to": [13, 5.25, 9], + "rotation": {"angle": 22.5, "axis": "x", "origin": [11, 5, 9]}, + "faces": { + "north": {"uv": [10, 6, 14, 6.75], "texture": "#0"}, + "south": {"uv": [10, 6, 14, 6.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [9, 4.25, 13], + "to": [13, 5.25, 13], + "rotation": {"angle": -22.5, "axis": "x", "origin": [11, 5, 13]}, + "faces": { + "north": {"uv": [10, 4, 14, 4.75], "texture": "#0"}, + "south": {"uv": [10, 4, 14, 4.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [13, 4.25, 9], + "to": [13, 5.25, 13], + "rotation": {"angle": 22.5, "axis": "z", "origin": [13, 5, 11]}, + "faces": { + "east": {"uv": [8, 5, 12, 5.75], "texture": "#0"}, + "west": {"uv": [8, 5, 12, 5.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [9, 4.25, 9], + "to": [9, 5.25, 13], + "rotation": {"angle": -22.5, "axis": "z", "origin": [9, 5, 11]}, + "faces": { + "east": {"uv": [12, 5, 16, 5.75], "texture": "#0"}, + "west": {"uv": [12, 5, 16, 5.75], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 3, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "translation": [0, 3, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "translation": [0, 3, 0] + }, + "firstperson_lefthand": { + "translation": [0, 3, 0] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 135, 0], + "translation": [0, 3, 0] + }, + "head": { + "translation": [0, 14.5, 0] + }, + "fixed": { + "translation": [0, 4, 0] + } + }, + "groups": [ + { + "name": "moomoo_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [0, 1, 2, 3, 4, 5] + }, + { + "name": "moomoo_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [6, 7, 8, 9, 10, 11] + }, + { + "name": "moomoo_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [12, 13, 14, 15, 16, 17] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/moomoo_milk_4.json b/common/src/main/resources/assets/cobblemon/models/block/moomoo_milk_4.json new file mode 100644 index 0000000000..a6123a68c4 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/moomoo_milk_4.json @@ -0,0 +1,340 @@ +{ + "textures": { + "0": "cobblemon:block/decorative/moomoo_milk", + "particle": "cobblemon:block/decorative/moomoo_milk" + }, + "elements": [ + { + "name": "bottle", + "from": [9, 0, 3], + "to": [13, 6, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 3.5, 5]}, + "faces": { + "north": {"uv": [0, 0, 4, 6], "texture": "#0"}, + "east": {"uv": [4, 0, 8, 6], "texture": "#0"}, + "south": {"uv": [0, 6, 4, 12], "texture": "#0"}, + "west": {"uv": [4, 6, 8, 12], "texture": "#0"}, + "up": {"uv": [8, 0, 12, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [13, 5, 7], + "to": [9, 4, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 5, 5]}, + "faces": { + "north": {"uv": [0, 7, 4, 8], "texture": "#0"}, + "east": {"uv": [4, 7, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 1, 4, 2], "texture": "#0"}, + "west": {"uv": [4, 1, 8, 2], "texture": "#0"}, + "up": {"uv": [8, 7, 12, 11], "texture": "#0"}, + "down": {"uv": [12, 7, 16, 11], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "flap", + "from": [9, 4.25, 3], + "to": [13, 5.25, 3], + "rotation": {"angle": 22.5, "axis": "x", "origin": [11, 5, 3]}, + "faces": { + "north": {"uv": [10, 6, 14, 6.75], "texture": "#0"}, + "south": {"uv": [10, 6, 14, 6.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [9, 4.25, 7], + "to": [13, 5.25, 7], + "rotation": {"angle": -22.5, "axis": "x", "origin": [11, 5, 7]}, + "faces": { + "north": {"uv": [10, 4, 14, 4.75], "texture": "#0"}, + "south": {"uv": [10, 4, 14, 4.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [13, 4.25, 3], + "to": [13, 5.25, 7], + "rotation": {"angle": 22.5, "axis": "z", "origin": [13, 5, 5]}, + "faces": { + "east": {"uv": [8, 5, 12, 5.75], "texture": "#0"}, + "west": {"uv": [8, 5, 12, 5.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [9, 4.25, 3], + "to": [9, 5.25, 7], + "rotation": {"angle": -22.5, "axis": "z", "origin": [9, 5, 5]}, + "faces": { + "east": {"uv": [12, 5, 16, 5.75], "texture": "#0"}, + "west": {"uv": [12, 5, 16, 5.75], "texture": "#0"} + } + }, + { + "name": "bottle", + "from": [2, 0, 2], + "to": [6, 6, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 3.5, 4]}, + "faces": { + "north": {"uv": [0, 0, 4, 6], "texture": "#0"}, + "east": {"uv": [4, 0, 8, 6], "texture": "#0"}, + "south": {"uv": [0, 6, 4, 12], "texture": "#0"}, + "west": {"uv": [4, 6, 8, 12], "texture": "#0"}, + "up": {"uv": [8, 0, 12, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [6, 5, 6], + "to": [2, 4, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 5, 4]}, + "faces": { + "north": {"uv": [0, 7, 4, 8], "texture": "#0"}, + "east": {"uv": [4, 7, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 1, 4, 2], "texture": "#0"}, + "west": {"uv": [4, 1, 8, 2], "texture": "#0"}, + "up": {"uv": [8, 7, 12, 11], "texture": "#0"}, + "down": {"uv": [12, 7, 16, 11], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "flap", + "from": [2, 4.25, 2], + "to": [6, 5.25, 2], + "rotation": {"angle": 22.5, "axis": "x", "origin": [4, 5, 2]}, + "faces": { + "north": {"uv": [10, 6, 14, 6.75], "texture": "#0"}, + "south": {"uv": [10, 6, 14, 6.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [2, 4.25, 6], + "to": [6, 5.25, 6], + "rotation": {"angle": -22.5, "axis": "x", "origin": [4, 5, 6]}, + "faces": { + "north": {"uv": [10, 4, 14, 4.75], "texture": "#0"}, + "south": {"uv": [10, 4, 14, 4.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [6, 4.25, 2], + "to": [6, 5.25, 6], + "rotation": {"angle": 22.5, "axis": "z", "origin": [6, 5, 4]}, + "faces": { + "east": {"uv": [8, 5, 12, 5.75], "texture": "#0"}, + "west": {"uv": [8, 5, 12, 5.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [2, 4.25, 2], + "to": [2, 5.25, 6], + "rotation": {"angle": -22.5, "axis": "z", "origin": [2, 5, 4]}, + "faces": { + "east": {"uv": [12, 5, 16, 5.75], "texture": "#0"}, + "west": {"uv": [12, 5, 16, 5.75], "texture": "#0"} + } + }, + { + "name": "bottle", + "from": [2, 0, 10], + "to": [6, 6, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 3.5, 12]}, + "faces": { + "north": {"uv": [0, 0, 4, 6], "texture": "#0"}, + "east": {"uv": [4, 0, 8, 6], "texture": "#0"}, + "south": {"uv": [0, 6, 4, 12], "texture": "#0"}, + "west": {"uv": [4, 6, 8, 12], "texture": "#0"}, + "up": {"uv": [8, 0, 12, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [6, 5, 14], + "to": [2, 4, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 5, 12]}, + "faces": { + "north": {"uv": [0, 7, 4, 8], "texture": "#0"}, + "east": {"uv": [4, 7, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 1, 4, 2], "texture": "#0"}, + "west": {"uv": [4, 1, 8, 2], "texture": "#0"}, + "up": {"uv": [8, 7, 12, 11], "texture": "#0"}, + "down": {"uv": [12, 7, 16, 11], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "flap", + "from": [2, 4.25, 10], + "to": [6, 5.25, 10], + "rotation": {"angle": 22.5, "axis": "x", "origin": [4, 5, 10]}, + "faces": { + "north": {"uv": [10, 6, 14, 6.75], "texture": "#0"}, + "south": {"uv": [10, 6, 14, 6.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [2, 4.25, 14], + "to": [6, 5.25, 14], + "rotation": {"angle": -22.5, "axis": "x", "origin": [4, 5, 14]}, + "faces": { + "north": {"uv": [10, 4, 14, 4.75], "texture": "#0"}, + "south": {"uv": [10, 4, 14, 4.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [6, 4.25, 10], + "to": [6, 5.25, 14], + "rotation": {"angle": 22.5, "axis": "z", "origin": [6, 5, 12]}, + "faces": { + "east": {"uv": [8, 5, 12, 5.75], "texture": "#0"}, + "west": {"uv": [8, 5, 12, 5.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [2, 4.25, 10], + "to": [2, 5.25, 14], + "rotation": {"angle": -22.5, "axis": "z", "origin": [2, 5, 12]}, + "faces": { + "east": {"uv": [12, 5, 16, 5.75], "texture": "#0"}, + "west": {"uv": [12, 5, 16, 5.75], "texture": "#0"} + } + }, + { + "name": "bottle", + "from": [9, 0, 9], + "to": [13, 6, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 3.5, 11]}, + "faces": { + "north": {"uv": [0, 0, 4, 6], "texture": "#0"}, + "east": {"uv": [4, 0, 8, 6], "texture": "#0"}, + "south": {"uv": [0, 6, 4, 12], "texture": "#0"}, + "west": {"uv": [4, 6, 8, 12], "texture": "#0"}, + "up": {"uv": [8, 0, 12, 4], "texture": "#0"}, + "down": {"uv": [12, 0, 16, 4], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "internalfaces", + "from": [13, 5, 13], + "to": [9, 4, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 5, 11]}, + "faces": { + "north": {"uv": [0, 7, 4, 8], "texture": "#0"}, + "east": {"uv": [4, 7, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 1, 4, 2], "texture": "#0"}, + "west": {"uv": [4, 1, 8, 2], "texture": "#0"}, + "up": {"uv": [8, 7, 12, 11], "texture": "#0"}, + "down": {"uv": [12, 7, 16, 11], "texture": "#0", "cullface": "down"} + } + }, + { + "name": "flap", + "from": [9, 4.25, 9], + "to": [13, 5.25, 9], + "rotation": {"angle": 22.5, "axis": "x", "origin": [11, 5, 9]}, + "faces": { + "north": {"uv": [10, 6, 14, 6.75], "texture": "#0"}, + "south": {"uv": [10, 6, 14, 6.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [9, 4.25, 13], + "to": [13, 5.25, 13], + "rotation": {"angle": -22.5, "axis": "x", "origin": [11, 5, 13]}, + "faces": { + "north": {"uv": [10, 4, 14, 4.75], "texture": "#0"}, + "south": {"uv": [10, 4, 14, 4.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [13, 4.25, 9], + "to": [13, 5.25, 13], + "rotation": {"angle": 22.5, "axis": "z", "origin": [13, 5, 11]}, + "faces": { + "east": {"uv": [8, 5, 12, 5.75], "texture": "#0"}, + "west": {"uv": [8, 5, 12, 5.75], "texture": "#0"} + } + }, + { + "name": "flap", + "from": [9, 4.25, 9], + "to": [9, 5.25, 13], + "rotation": {"angle": -22.5, "axis": "z", "origin": [9, 5, 11]}, + "faces": { + "east": {"uv": [12, 5, 16, 5.75], "texture": "#0"}, + "west": {"uv": [12, 5, 16, 5.75], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 3, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "translation": [0, 3, 0.75], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "translation": [0, 3, 0] + }, + "firstperson_lefthand": { + "translation": [0, 3, 0] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 135, 0], + "translation": [0, 3, 0] + }, + "head": { + "translation": [0, 14.5, 0] + }, + "fixed": { + "translation": [0, 4, 0] + } + }, + "groups": [ + { + "name": "moomoo_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [0, 1, 2, 3, 4, 5] + }, + { + "name": "moomoo_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [6, 7, 8, 9, 10, 11] + }, + { + "name": "moomoo_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [12, 13, 14, 15, 16, 17] + }, + { + "name": "moomoo_bottle", + "origin": [4, 0, 4], + "scope": 0, + "color": 0, + "children": [18, 19, 20, 21, 22, 23] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/relic_coin_pouch.json b/common/src/main/resources/assets/cobblemon/models/block/relic_coin_pouch.json index e8ec8fcdf5..af724a4dad 100644 --- a/common/src/main/resources/assets/cobblemon/models/block/relic_coin_pouch.json +++ b/common/src/main/resources/assets/cobblemon/models/block/relic_coin_pouch.json @@ -1,4 +1,5 @@ { + "format_version": "26.3", "credit": "Made with Blockbench", "textures": { "3": "cobblemon:block/decorative/relic_coin_pouch", @@ -23,12 +24,10 @@ "from": [6, 5, 6], "to": [10, 6, 10], "faces": { - "north": {"uv": [12, 10, 16, 11], "texture": "#3"}, + "north": {"uv": [12, 9, 16, 10], "texture": "#3"}, "east": {"uv": [12, 10, 16, 11], "texture": "#3"}, "south": {"uv": [12, 10, 16, 11], "texture": "#3"}, - "west": {"uv": [12, 10, 16, 11], "texture": "#3"}, - "up": {"uv": [16, 6, 12, 2], "texture": "#3"}, - "down": {"uv": [16, 6, 12, 10], "texture": "#3"} + "west": {"uv": [12, 10, 16, 11], "texture": "#3"} } }, { @@ -49,6 +48,7 @@ { "name": "relic_coin_pouch", "origin": [0, 0, 0], + "scope": 0, "color": 0, "children": [0, 1, 2] } diff --git a/common/src/main/resources/assets/cobblemon/models/block/soft_sand.json b/common/src/main/resources/assets/cobblemon/models/block/soft_sand.json new file mode 100644 index 0000000000..f0e6a2980c --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/soft_sand.json @@ -0,0 +1,7 @@ +{ + "parent": "cobblemon:block/relic_coin_pouch", + "textures": { + "3": "cobblemon:block/decorative/soft_sand", + "particle": "cobblemon:block/decorative/soft_sand" + } +} diff --git a/common/src/main/resources/assets/cobblemon/models/block/terrain_extender_1.json b/common/src/main/resources/assets/cobblemon/models/block/terrain_extender_1.json new file mode 100644 index 0000000000..70d47a6eeb --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/terrain_extender_1.json @@ -0,0 +1,81 @@ +{ + "textures": { + "0": "cobblemon:block/decorative/terrain_extender", + "particle": "cobblemon:block/decorative/terrain_extender" + }, + "elements": [ + { + "from": [6, 0, 6], + "to": [10, 7, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 6]}, + "faces": { + "north": {"uv": [4, 9, 8, 16], "texture": "#0"}, + "east": {"uv": [0, 9, 4, 16], "texture": "#0"}, + "south": {"uv": [12, 9, 16, 16], "texture": "#0"}, + "west": {"uv": [8, 9, 12, 16], "texture": "#0"}, + "up": {"uv": [8, 9, 4, 5], "texture": "#0"}, + "down": {"uv": [8, 5, 12, 9], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [7, 7, 7], + "to": [9, 9, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 7, 7]}, + "faces": { + "north": {"uv": [0, 5, 4, 9], "texture": "#0"}, + "east": {"uv": [4, 2, 6, 4], "texture": "#0"}, + "south": {"uv": [2, 2, 4, 4], "texture": "#0"}, + "west": {"uv": [0, 2, 2, 4], "texture": "#0"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#0"} + } + }, + { + "from": [3, 1.5, 8], + "to": [7, 8.5, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 6.5, 7]}, + "faces": { + "north": {"uv": [12, 2, 16, 9], "texture": "#0"}, + "south": {"uv": [16, 2, 12, 9], "texture": "#0"} + } + }, + { + "from": [4, 0.5, 7], + "to": [6, 2.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5.5, 6.5]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#0"}, + "east": {"uv": [6, 0, 8, 2], "texture": "#0"}, + "south": {"uv": [12, 0, 14, 2], "texture": "#0"}, + "west": {"uv": [10, 0, 12, 2], "texture": "#0"}, + "up": {"uv": [10, 4, 8, 2], "texture": "#0"}, + "down": {"uv": [12, 2, 10, 4], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 3, 1], + "scale": [0.5, 0.5, 0.5] + }, + "thirdperson_lefthand": { + "translation": [0, 3, 1], + "scale": [0.5, 0.5, 0.5] + }, + "firstperson_righthand": { + "translation": [0, 3, 0] + }, + "firstperson_lefthand": { + "translation": [0, 3, 0] + }, + "gui": { + "rotation": [30, 135, 0], + "translation": [0, 3, 0] + }, + "head": { + "translation": [0, 14.5, 0] + }, + "fixed": { + "translation": [0, 4, 0] + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/terrain_extender_2.json b/common/src/main/resources/assets/cobblemon/models/block/terrain_extender_2.json new file mode 100644 index 0000000000..34a4d20971 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/terrain_extender_2.json @@ -0,0 +1,118 @@ +{ + "textures": { + "0": "cobblemon:block/decorative/terrain_extender", + "particle": "cobblemon:block/decorative/terrain_extender" + }, + "elements": [ + { + "from": [10, 0, 8], + "to": [14, 7, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 8]}, + "faces": { + "north": {"uv": [4, 9, 8, 16], "texture": "#0"}, + "east": {"uv": [0, 9, 4, 16], "texture": "#0"}, + "south": {"uv": [12, 9, 16, 16], "texture": "#0"}, + "west": {"uv": [8, 9, 12, 16], "texture": "#0"}, + "up": {"uv": [8, 9, 4, 5], "texture": "#0"}, + "down": {"uv": [8, 5, 12, 9], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [11, 7, 9], + "to": [13, 9, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 7, 9]}, + "faces": { + "north": {"uv": [0, 5, 4, 9], "texture": "#0"}, + "east": {"uv": [4, 2, 6, 4], "texture": "#0"}, + "south": {"uv": [2, 2, 4, 4], "texture": "#0"}, + "west": {"uv": [0, 2, 2, 4], "texture": "#0"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#0"} + } + }, + { + "from": [7, 1.5, 10], + "to": [11, 8.5, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 6.5, 9]}, + "faces": { + "north": {"uv": [12, 2, 16, 9], "texture": "#0"}, + "south": {"uv": [16, 2, 12, 9], "texture": "#0"} + } + }, + { + "from": [8, 0.5, 9], + "to": [10, 2.5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 5.5, 8.5]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#0"}, + "east": {"uv": [6, 0, 8, 2], "texture": "#0"}, + "south": {"uv": [12, 0, 14, 2], "texture": "#0"}, + "west": {"uv": [10, 0, 12, 2], "texture": "#0"}, + "up": {"uv": [10, 4, 8, 2], "texture": "#0"}, + "down": {"uv": [12, 2, 10, 4], "texture": "#0"} + } + }, + { + "from": [4, 0, 4], + "to": [8, 7, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 4]}, + "faces": { + "north": {"uv": [4, 9, 8, 16], "texture": "#0"}, + "east": {"uv": [0, 9, 4, 16], "texture": "#0"}, + "south": {"uv": [12, 9, 16, 16], "texture": "#0"}, + "west": {"uv": [8, 9, 12, 16], "texture": "#0"}, + "up": {"uv": [8, 9, 4, 5], "texture": "#0"}, + "down": {"uv": [8, 5, 12, 9], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [5, 7, 5], + "to": [7, 9, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 7, 5]}, + "faces": { + "north": {"uv": [0, 5, 4, 9], "texture": "#0"}, + "east": {"uv": [4, 2, 6, 4], "texture": "#0"}, + "south": {"uv": [2, 2, 4, 4], "texture": "#0"}, + "west": {"uv": [0, 2, 2, 4], "texture": "#0"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#0"} + } + }, + { + "from": [1, 1.5, 6], + "to": [5, 8.5, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 6.5, 5]}, + "faces": { + "north": {"uv": [12, 2, 16, 9], "texture": "#0"}, + "south": {"uv": [16, 2, 12, 9], "texture": "#0"} + } + }, + { + "from": [2, 0.5, 5], + "to": [4, 2.5, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 5.5, 4.5]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#0"}, + "east": {"uv": [6, 0, 8, 2], "texture": "#0"}, + "south": {"uv": [12, 0, 14, 2], "texture": "#0"}, + "west": {"uv": [10, 0, 12, 2], "texture": "#0"}, + "up": {"uv": [10, 4, 8, 2], "texture": "#0"}, + "down": {"uv": [12, 2, 10, 4], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [6, 0, 6], + "scope": 0, + "color": 0, + "children": [0, 1, 2, 3] + }, + { + "name": "group", + "origin": [6, 0, 6], + "scope": 0, + "color": 0, + "children": [4, 5, 6, 7] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/terrain_extender_3.json b/common/src/main/resources/assets/cobblemon/models/block/terrain_extender_3.json new file mode 100644 index 0000000000..6642df08c4 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/terrain_extender_3.json @@ -0,0 +1,172 @@ +{ + "textures": { + "0": "cobblemon:block/decorative/terrain_extender", + "particle": "cobblemon:block/decorative/terrain_extender" + }, + "elements": [ + { + "from": [10, 0, 10], + "to": [14, 7, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 10]}, + "faces": { + "north": {"uv": [4, 9, 8, 16], "texture": "#0"}, + "east": {"uv": [0, 9, 4, 16], "texture": "#0"}, + "south": {"uv": [12, 9, 16, 16], "texture": "#0"}, + "west": {"uv": [8, 9, 12, 16], "texture": "#0"}, + "up": {"uv": [8, 9, 4, 5], "texture": "#0"}, + "down": {"uv": [8, 5, 12, 9], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [11, 7, 11], + "to": [13, 9, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 7, 11]}, + "faces": { + "north": {"uv": [0, 5, 4, 9], "texture": "#0"}, + "east": {"uv": [4, 2, 6, 4], "texture": "#0"}, + "south": {"uv": [2, 2, 4, 4], "texture": "#0"}, + "west": {"uv": [0, 2, 2, 4], "texture": "#0"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#0"} + } + }, + { + "from": [7, 1.5, 12], + "to": [11, 8.5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 6.5, 11]}, + "faces": { + "north": {"uv": [12, 2, 16, 9], "texture": "#0"}, + "south": {"uv": [16, 2, 12, 9], "texture": "#0"} + } + }, + { + "from": [8, 0.5, 11], + "to": [10, 2.5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 5.5, 10.5]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#0"}, + "east": {"uv": [6, 0, 8, 2], "texture": "#0"}, + "south": {"uv": [12, 0, 14, 2], "texture": "#0"}, + "west": {"uv": [10, 0, 12, 2], "texture": "#0"}, + "up": {"uv": [10, 4, 8, 2], "texture": "#0"}, + "down": {"uv": [12, 2, 10, 4], "texture": "#0"} + } + }, + { + "from": [3, 0, 6], + "to": [7, 7, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 6]}, + "faces": { + "north": {"uv": [4, 9, 8, 16], "texture": "#0"}, + "east": {"uv": [0, 9, 4, 16], "texture": "#0"}, + "south": {"uv": [12, 9, 16, 16], "texture": "#0"}, + "west": {"uv": [8, 9, 12, 16], "texture": "#0"}, + "up": {"uv": [8, 9, 4, 5], "texture": "#0"}, + "down": {"uv": [8, 5, 12, 9], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [4, 7, 7], + "to": [6, 9, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 7, 7]}, + "faces": { + "north": {"uv": [0, 5, 4, 9], "texture": "#0"}, + "east": {"uv": [4, 2, 6, 4], "texture": "#0"}, + "south": {"uv": [2, 2, 4, 4], "texture": "#0"}, + "west": {"uv": [0, 2, 2, 4], "texture": "#0"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#0"} + } + }, + { + "from": [0, 1.5, 8], + "to": [4, 8.5, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 6.5, 7]}, + "faces": { + "north": {"uv": [12, 2, 16, 9], "texture": "#0"}, + "south": {"uv": [16, 2, 12, 9], "texture": "#0"} + } + }, + { + "from": [1, 0.5, 7], + "to": [3, 2.5, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 5.5, 6.5]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#0"}, + "east": {"uv": [6, 0, 8, 2], "texture": "#0"}, + "south": {"uv": [12, 0, 14, 2], "texture": "#0"}, + "west": {"uv": [10, 0, 12, 2], "texture": "#0"}, + "up": {"uv": [10, 4, 8, 2], "texture": "#0"}, + "down": {"uv": [12, 2, 10, 4], "texture": "#0"} + } + }, + { + "from": [8, 0, 1], + "to": [12, 7, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 1]}, + "faces": { + "north": {"uv": [4, 9, 8, 16], "texture": "#0"}, + "east": {"uv": [0, 9, 4, 16], "texture": "#0"}, + "south": {"uv": [12, 9, 16, 16], "texture": "#0"}, + "west": {"uv": [8, 9, 12, 16], "texture": "#0"}, + "up": {"uv": [8, 9, 4, 5], "texture": "#0"}, + "down": {"uv": [8, 5, 12, 9], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [9, 7, 2], + "to": [11, 9, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 7, 2]}, + "faces": { + "north": {"uv": [0, 5, 4, 9], "texture": "#0"}, + "east": {"uv": [4, 2, 6, 4], "texture": "#0"}, + "south": {"uv": [2, 2, 4, 4], "texture": "#0"}, + "west": {"uv": [0, 2, 2, 4], "texture": "#0"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#0"} + } + }, + { + "from": [5, 1.5, 3], + "to": [9, 8.5, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 6.5, 2]}, + "faces": { + "north": {"uv": [12, 2, 16, 9], "texture": "#0"}, + "south": {"uv": [16, 2, 12, 9], "texture": "#0"} + } + }, + { + "from": [6, 0.5, 2], + "to": [8, 2.5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 5.5, 1.5]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#0"}, + "east": {"uv": [6, 0, 8, 2], "texture": "#0"}, + "south": {"uv": [12, 0, 14, 2], "texture": "#0"}, + "west": {"uv": [10, 0, 12, 2], "texture": "#0"}, + "up": {"uv": [10, 4, 8, 2], "texture": "#0"}, + "down": {"uv": [12, 2, 10, 4], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [6, 0, 6], + "scope": 0, + "color": 0, + "children": [0, 1, 2, 3] + }, + { + "name": "group", + "origin": [6, 0, 6], + "scope": 0, + "color": 0, + "children": [4, 5, 6, 7] + }, + { + "name": "group", + "origin": [6, 0, 6], + "scope": 0, + "color": 0, + "children": [8, 9, 10, 11] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/block/terrain_extender_4.json b/common/src/main/resources/assets/cobblemon/models/block/terrain_extender_4.json new file mode 100644 index 0000000000..5872d400c8 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/block/terrain_extender_4.json @@ -0,0 +1,226 @@ +{ + "textures": { + "0": "cobblemon:block/decorative/terrain_extender", + "particle": "cobblemon:block/decorative/terrain_extender" + }, + "elements": [ + { + "from": [11, 0, 11], + "to": [15, 7, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [4, 9, 8, 16], "texture": "#0"}, + "east": {"uv": [0, 9, 4, 16], "texture": "#0"}, + "south": {"uv": [12, 9, 16, 16], "texture": "#0"}, + "west": {"uv": [8, 9, 12, 16], "texture": "#0"}, + "up": {"uv": [8, 9, 4, 5], "texture": "#0"}, + "down": {"uv": [8, 5, 12, 9], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [12, 7, 12], + "to": [14, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 7, 12]}, + "faces": { + "north": {"uv": [0, 5, 4, 9], "texture": "#0"}, + "east": {"uv": [4, 2, 6, 4], "texture": "#0"}, + "south": {"uv": [2, 2, 4, 4], "texture": "#0"}, + "west": {"uv": [0, 2, 2, 4], "texture": "#0"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#0"} + } + }, + { + "from": [8, 1.5, 13], + "to": [12, 8.5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 6.5, 12]}, + "faces": { + "north": {"uv": [12, 2, 16, 9], "texture": "#0"}, + "south": {"uv": [16, 2, 12, 9], "texture": "#0"} + } + }, + { + "from": [9, 0.5, 12], + "to": [11, 2.5, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [13, 5.5, 11.5]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#0"}, + "east": {"uv": [6, 0, 8, 2], "texture": "#0"}, + "south": {"uv": [12, 0, 14, 2], "texture": "#0"}, + "west": {"uv": [10, 0, 12, 2], "texture": "#0"}, + "up": {"uv": [10, 4, 8, 2], "texture": "#0"}, + "down": {"uv": [12, 2, 10, 4], "texture": "#0"} + } + }, + { + "from": [3, 0, 8], + "to": [7, 7, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [3, 0, 8]}, + "faces": { + "north": {"uv": [4, 9, 8, 16], "texture": "#0"}, + "east": {"uv": [0, 9, 4, 16], "texture": "#0"}, + "south": {"uv": [12, 9, 16, 16], "texture": "#0"}, + "west": {"uv": [8, 9, 12, 16], "texture": "#0"}, + "up": {"uv": [8, 9, 4, 5], "texture": "#0"}, + "down": {"uv": [8, 5, 12, 9], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [4, 7, 9], + "to": [6, 9, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 7, 9]}, + "faces": { + "north": {"uv": [0, 5, 4, 9], "texture": "#0"}, + "east": {"uv": [4, 2, 6, 4], "texture": "#0"}, + "south": {"uv": [2, 2, 4, 4], "texture": "#0"}, + "west": {"uv": [0, 2, 2, 4], "texture": "#0"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#0"} + } + }, + { + "from": [0, 1.5, 10], + "to": [4, 8.5, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 6.5, 9]}, + "faces": { + "north": {"uv": [12, 2, 16, 9], "texture": "#0"}, + "south": {"uv": [16, 2, 12, 9], "texture": "#0"} + } + }, + { + "from": [1, 0.5, 9], + "to": [3, 2.5, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 5.5, 8.5]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#0"}, + "east": {"uv": [6, 0, 8, 2], "texture": "#0"}, + "south": {"uv": [12, 0, 14, 2], "texture": "#0"}, + "west": {"uv": [10, 0, 12, 2], "texture": "#0"}, + "up": {"uv": [10, 4, 8, 2], "texture": "#0"}, + "down": {"uv": [12, 2, 10, 4], "texture": "#0"} + } + }, + { + "from": [10, 0, 4], + "to": [14, 7, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [10, 0, 4]}, + "faces": { + "north": {"uv": [4, 9, 8, 16], "texture": "#0"}, + "east": {"uv": [0, 9, 4, 16], "texture": "#0"}, + "south": {"uv": [12, 9, 16, 16], "texture": "#0"}, + "west": {"uv": [8, 9, 12, 16], "texture": "#0"}, + "up": {"uv": [8, 9, 4, 5], "texture": "#0"}, + "down": {"uv": [8, 5, 12, 9], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [11, 7, 5], + "to": [13, 9, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 7, 5]}, + "faces": { + "north": {"uv": [0, 5, 4, 9], "texture": "#0"}, + "east": {"uv": [4, 2, 6, 4], "texture": "#0"}, + "south": {"uv": [2, 2, 4, 4], "texture": "#0"}, + "west": {"uv": [0, 2, 2, 4], "texture": "#0"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#0"} + } + }, + { + "from": [7, 1.5, 6], + "to": [11, 8.5, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 6.5, 5]}, + "faces": { + "north": {"uv": [12, 2, 16, 9], "texture": "#0"}, + "south": {"uv": [16, 2, 12, 9], "texture": "#0"} + } + }, + { + "from": [8, 0.5, 5], + "to": [10, 2.5, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 5.5, 4.5]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#0"}, + "east": {"uv": [6, 0, 8, 2], "texture": "#0"}, + "south": {"uv": [12, 0, 14, 2], "texture": "#0"}, + "west": {"uv": [10, 0, 12, 2], "texture": "#0"}, + "up": {"uv": [10, 4, 8, 2], "texture": "#0"}, + "down": {"uv": [12, 2, 10, 4], "texture": "#0"} + } + }, + { + "from": [4, 0, 1], + "to": [8, 7, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [4, 0, 1]}, + "faces": { + "north": {"uv": [4, 9, 8, 16], "texture": "#0"}, + "east": {"uv": [0, 9, 4, 16], "texture": "#0"}, + "south": {"uv": [12, 9, 16, 16], "texture": "#0"}, + "west": {"uv": [8, 9, 12, 16], "texture": "#0"}, + "up": {"uv": [8, 9, 4, 5], "texture": "#0"}, + "down": {"uv": [8, 5, 12, 9], "texture": "#0", "cullface": "down"} + } + }, + { + "from": [5, 7, 2], + "to": [7, 9, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 7, 2]}, + "faces": { + "north": {"uv": [0, 5, 4, 9], "texture": "#0"}, + "east": {"uv": [4, 2, 6, 4], "texture": "#0"}, + "south": {"uv": [2, 2, 4, 4], "texture": "#0"}, + "west": {"uv": [0, 2, 2, 4], "texture": "#0"}, + "up": {"uv": [4, 2, 2, 0], "texture": "#0"} + } + }, + { + "from": [1, 1.5, 3], + "to": [5, 8.5, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 6.5, 2]}, + "faces": { + "north": {"uv": [12, 2, 16, 9], "texture": "#0"}, + "south": {"uv": [16, 2, 12, 9], "texture": "#0"} + } + }, + { + "from": [2, 0.5, 2], + "to": [4, 2.5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 5.5, 1.5]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#0"}, + "east": {"uv": [6, 0, 8, 2], "texture": "#0"}, + "south": {"uv": [12, 0, 14, 2], "texture": "#0"}, + "west": {"uv": [10, 0, 12, 2], "texture": "#0"}, + "up": {"uv": [10, 4, 8, 2], "texture": "#0"}, + "down": {"uv": [12, 2, 10, 4], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [6, 0, 6], + "scope": 0, + "color": 0, + "children": [0, 1, 2, 3] + }, + { + "name": "group", + "origin": [6, 0, 6], + "scope": 0, + "color": 0, + "children": [4, 5, 6, 7] + }, + { + "name": "group", + "origin": [6, 0, 6], + "scope": 0, + "color": 0, + "children": [8, 9, 10, 11] + }, + { + "name": "group", + "origin": [6, 0, 6], + "scope": 0, + "color": 0, + "children": [12, 13, 14, 15] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/textures/block/decorative/bright_powder.png b/common/src/main/resources/assets/cobblemon/textures/block/decorative/bright_powder.png index 443e40fefc..5f9d90eb21 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/decorative/bright_powder.png and b/common/src/main/resources/assets/cobblemon/textures/block/decorative/bright_powder.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/decorative/cleanse_tag.png b/common/src/main/resources/assets/cobblemon/textures/block/decorative/cleanse_tag.png index 2333653901..83cfe40cc3 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/decorative/cleanse_tag.png and b/common/src/main/resources/assets/cobblemon/textures/block/decorative/cleanse_tag.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/decorative/electirizer.png b/common/src/main/resources/assets/cobblemon/textures/block/decorative/electirizer.png new file mode 100644 index 0000000000..1fc9e56cd5 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/decorative/electirizer.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/decorative/magmarizer.png b/common/src/main/resources/assets/cobblemon/textures/block/decorative/magmarizer.png new file mode 100644 index 0000000000..0c1fe1116e Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/decorative/magmarizer.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/decorative/magmarizer.png.mcmeta b/common/src/main/resources/assets/cobblemon/textures/block/decorative/magmarizer.png.mcmeta new file mode 100644 index 0000000000..3e1d46621c --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/textures/block/decorative/magmarizer.png.mcmeta @@ -0,0 +1,8 @@ +{ + "animation": { + "frametime": 8, + "width": 32, + "height": 16, + "interpolate": true + } +} diff --git a/common/src/main/resources/assets/cobblemon/textures/block/decorative/medicinal_brew.png b/common/src/main/resources/assets/cobblemon/textures/block/decorative/medicinal_brew.png new file mode 100644 index 0000000000..3d7253593a Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/decorative/medicinal_brew.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/decorative/metal_powder.png b/common/src/main/resources/assets/cobblemon/textures/block/decorative/metal_powder.png index 0fc6b2b4d1..bdbe8d0842 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/decorative/metal_powder.png and b/common/src/main/resources/assets/cobblemon/textures/block/decorative/metal_powder.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/decorative/moomoo_milk.png b/common/src/main/resources/assets/cobblemon/textures/block/decorative/moomoo_milk.png new file mode 100644 index 0000000000..6aa4db4cb7 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/decorative/moomoo_milk.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/decorative/quick_powder.png b/common/src/main/resources/assets/cobblemon/textures/block/decorative/quick_powder.png index f6e017de78..8049d1ccfb 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/decorative/quick_powder.png and b/common/src/main/resources/assets/cobblemon/textures/block/decorative/quick_powder.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/decorative/relic_coin_pouch.png b/common/src/main/resources/assets/cobblemon/textures/block/decorative/relic_coin_pouch.png index 438e9d47da..fe00520bd5 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/decorative/relic_coin_pouch.png and b/common/src/main/resources/assets/cobblemon/textures/block/decorative/relic_coin_pouch.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/decorative/sachet.png b/common/src/main/resources/assets/cobblemon/textures/block/decorative/sachet.png index 1156a2d9d0..56036b7773 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/decorative/sachet.png and b/common/src/main/resources/assets/cobblemon/textures/block/decorative/sachet.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/decorative/soft_sand.png b/common/src/main/resources/assets/cobblemon/textures/block/decorative/soft_sand.png new file mode 100644 index 0000000000..a619aa7203 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/decorative/soft_sand.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/decorative/spell_tag.png b/common/src/main/resources/assets/cobblemon/textures/block/decorative/spell_tag.png index 1d771bd8a5..2a91e5e422 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/block/decorative/spell_tag.png and b/common/src/main/resources/assets/cobblemon/textures/block/decorative/spell_tag.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/block/decorative/terrain_extender.png b/common/src/main/resources/assets/cobblemon/textures/block/decorative/terrain_extender.png new file mode 100644 index 0000000000..2d3bdb5d22 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/block/decorative/terrain_extender.png differ diff --git a/common/src/main/resources/data/cobblemon/loot_table/blocks/electirizer.json b/common/src/main/resources/data/cobblemon/loot_table/blocks/electirizer.json new file mode 100644 index 0000000000..01917e3dff --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_table/blocks/electirizer.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "cobblemon:electirizer" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_table/blocks/magmarizer.json b/common/src/main/resources/data/cobblemon/loot_table/blocks/magmarizer.json new file mode 100644 index 0000000000..4ee88f5d74 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_table/blocks/magmarizer.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "cobblemon:magmarizer" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_table/blocks/medicinal_brew.json b/common/src/main/resources/data/cobblemon/loot_table/blocks/medicinal_brew.json new file mode 100644 index 0000000000..1f126ebdd4 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_table/blocks/medicinal_brew.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "cobblemon:medicinal_brew", + "condition": "minecraft:block_state_property", + "properties": { + "amount": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "cobblemon:medicinal_brew", + "condition": "minecraft:block_state_property", + "properties": { + "amount": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "cobblemon:medicinal_brew", + "condition": "minecraft:block_state_property", + "properties": { + "amount": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "cobblemon:medicinal_brew" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "cobblemon:blocks/medicinal_brew" +} diff --git a/common/src/main/resources/data/cobblemon/loot_table/blocks/moomoo_milk.json b/common/src/main/resources/data/cobblemon/loot_table/blocks/moomoo_milk.json new file mode 100644 index 0000000000..5e035723cf --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_table/blocks/moomoo_milk.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "cobblemon:moomoo_milk", + "condition": "minecraft:block_state_property", + "properties": { + "amount": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "cobblemon:moomoo_milk", + "condition": "minecraft:block_state_property", + "properties": { + "amount": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "cobblemon:moomoo_milk", + "condition": "minecraft:block_state_property", + "properties": { + "amount": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "cobblemon:moomoo_milk" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "cobblemon:blocks/moomoo_milk" +} diff --git a/common/src/main/resources/data/cobblemon/loot_table/blocks/soft_sand.json b/common/src/main/resources/data/cobblemon/loot_table/blocks/soft_sand.json new file mode 100644 index 0000000000..4d725c91c6 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_table/blocks/soft_sand.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "cobblemon:soft_sand" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/loot_table/blocks/terrain_extender.json b/common/src/main/resources/data/cobblemon/loot_table/blocks/terrain_extender.json new file mode 100644 index 0000000000..6ca707a59f --- /dev/null +++ b/common/src/main/resources/data/cobblemon/loot_table/blocks/terrain_extender.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "cobblemon:terrain_extender", + "condition": "minecraft:block_state_property", + "properties": { + "amount": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "cobblemon:terrain_extender", + "condition": "minecraft:block_state_property", + "properties": { + "amount": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "cobblemon:terrain_extender", + "condition": "minecraft:block_state_property", + "properties": { + "amount": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "cobblemon:terrain_extender" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "cobblemon:blocks/terrain_extender" +} diff --git a/common/src/main/resources/data/cobblemon/recipe/blank_tm.json b/common/src/main/resources/data/cobblemon/recipe/blank_tm.json index 937fde4edc..c4bc13cab6 100644 --- a/common/src/main/resources/data/cobblemon/recipe/blank_tm.json +++ b/common/src/main/resources/data/cobblemon/recipe/blank_tm.json @@ -7,7 +7,7 @@ ], "key": { "G": { - "item": "minecraft:glass" + "item": "minecraft:glass_pane" }, "A": { "item": "minecraft:amethyst_shard" diff --git a/common/src/main/resources/data/cobblemon/recipe/blunder_policy.json b/common/src/main/resources/data/cobblemon/recipe/blunder_policy.json index 1d285f7f33..16c6417234 100644 --- a/common/src/main/resources/data/cobblemon/recipe/blunder_policy.json +++ b/common/src/main/resources/data/cobblemon/recipe/blunder_policy.json @@ -2,9 +2,9 @@ "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ - " R ", - "SPF", - " I " + "PGP", + "SRF", + "PIP" ], "key": { "R": { @@ -17,10 +17,13 @@ "item": "minecraft:ink_sac" }, "F": { - "item": "minecraft:feather" + "tag": "c:feathers" }, "P": { "item": "minecraft:paper" + }, + "G": { + "tag": "c:dusts/glowstone" } }, "result": { diff --git a/common/src/main/resources/data/cobblemon/recipe/focus_sash.json b/common/src/main/resources/data/cobblemon/recipe/focus_sash.json index b117b81934..b211767624 100644 --- a/common/src/main/resources/data/cobblemon/recipe/focus_sash.json +++ b/common/src/main/resources/data/cobblemon/recipe/focus_sash.json @@ -4,7 +4,7 @@ "group": "focus_items", "pattern": [ "D ", - "LIL", + "LTL", " D" ], "key": { @@ -14,8 +14,8 @@ "D": { "item": "minecraft:blaze_powder" }, - "I": { - "tag": "c:ingots/copper" + "T": { + "item": "minecraft:ghast_tear" } }, "result": { diff --git a/common/src/main/resources/data/cobblemon/recipe/never_melt_ice.json b/common/src/main/resources/data/cobblemon/recipe/never_melt_ice.json index 7593caca2f..cdcbdbd9e7 100644 --- a/common/src/main/resources/data/cobblemon/recipe/never_melt_ice.json +++ b/common/src/main/resources/data/cobblemon/recipe/never_melt_ice.json @@ -1,21 +1,29 @@ { - "type": "minecraft:crafting_shaped", - "category": "misc", - "group": "never_melt_ice", - "pattern": [ - " S ", - "SSS", - "SGS" + "type": "minecraft:crafting_shaped", + "category": "misc", + "group": "never_melt_ice", + "pattern": [ + " I ", + "III", + "IGI" + ], + "key": { + "I": [ + { + "item": "minecraft:blue_ice" + }, + { + "item": "minecraft:packed_ice" + }, + { + "item": "minecraft:ice" + } ], - "key": { - "S": { - "item": "minecraft:snowball" - }, - "G": { - "item": "cobblemon:ice_gem" - } - }, - "result": { - "id": "cobblemon:never_melt_ice" + "G": { + "item": "cobblemon:ice_gem" } + }, + "result": { + "id": "cobblemon:never_melt_ice" + } } \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/recipe/weakness_policy.json b/common/src/main/resources/data/cobblemon/recipe/weakness_policy.json index 60ee4f4f02..7dc03e6c30 100644 --- a/common/src/main/resources/data/cobblemon/recipe/weakness_policy.json +++ b/common/src/main/resources/data/cobblemon/recipe/weakness_policy.json @@ -2,25 +2,28 @@ "type": "minecraft:crafting_shaped", "category": "misc", "pattern": [ - " S ", - "GPF", - " I " + "PSP", + "GEF", + "PIP" ], "key": { "G": { - "item": "minecraft:gunpowder" + "tag": "c:gunpowders" }, - "S": { + "E": { "item": "minecraft:fermented_spider_eye" }, "I": { "item": "minecraft:ink_sac" }, "F": { - "item": "minecraft:feather" + "tag": "c:feathers" }, "P": { "item": "minecraft:paper" + }, + "S": { + "item": "minecraft:glow_ink_sac" } }, "result": { diff --git a/common/src/main/resources/data/cobblemon/tags/item/item_blocks.json b/common/src/main/resources/data/cobblemon/tags/item/item_blocks.json index 652a0793fe..00ba4584d7 100644 --- a/common/src/main/resources/data/cobblemon/tags/item/item_blocks.json +++ b/common/src/main/resources/data/cobblemon/tags/item/item_blocks.json @@ -6,6 +6,7 @@ "cobblemon:bright_powder", "cobblemon:quick_powder", "cobblemon:metal_powder", + "cobblemon:soft_sand", "cobblemon:blunder_policy", "cobblemon:weakness_policy", @@ -47,6 +48,9 @@ "cobblemon:pp_up", "cobblemon:pp_max", "cobblemon:throat_spray", + "cobblemon:medicinal_brew", + "cobblemon:moomoo_milk", + "cobblemon:terrain_extender", "cobblemon:metal_coat", "cobblemon:luminous_moss", @@ -63,6 +67,8 @@ "cobblemon:destiny_knot", "cobblemon:kings_rock", "cobblemon:iron_ball", + "cobblemon:electirizer", + "cobblemon:magmarizer", "cobblemon:flame_orb", "cobblemon:toxic_orb",