From dd76a16e081c0f565b4165eea135dcae6d170da3 Mon Sep 17 00:00:00 2001 From: FrankTheFarmer Date: Fri, 25 Apr 2025 11:08:27 +1000 Subject: [PATCH] =?UTF-8?q?Magnemite=20remodel=20=F0=9F=A7=B2=E2=9A=AA?= =?UTF-8?q?=F0=9F=A7=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blockbench/pokemon/gen1/MagnemiteModel.kt | 65 ---------- .../repository/VaryingModelRepository.kt | 2 - .../models/0081_magnemite/magnemite.geo.json | 116 +++++++++++++++++- .../posers/0081_magnemite/magnemite.json | 55 +++++++++ .../pokemon/0081_magnemite/magnemite.png | Bin 1380 -> 1517 bytes .../0081_magnemite/magnemite_shiny.png | Bin 1254 -> 1415 bytes 6 files changed, 168 insertions(+), 70 deletions(-) delete mode 100644 common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnemiteModel.kt create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0081_magnemite/magnemite.json diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnemiteModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnemiteModel.kt deleted file mode 100644 index 623b80b581..0000000000 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnemiteModel.kt +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2023 Cobblemon Contributors - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 - -import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel -import com.cobblemon.mod.common.client.render.models.blockbench.PosableState -import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider -import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose -import com.cobblemon.mod.common.entity.PoseType -import net.minecraft.client.model.geom.ModelPart -import net.minecraft.world.phys.Vec3 - -class MagnemiteModel(root: ModelPart) : PokemonPosableModel(root) { - override val rootPart = root.registerChildWithAllChildren("magnemite") - - override var portraitScale = 2.2F - override var portraitTranslation = Vec3(-0.1, -1.5, 0.0) - - override var profileScale = 1.0F - override var profileTranslation = Vec3(0.0, 0.18, 0.0) - - lateinit var standing: Pose - lateinit var walk: Pose - lateinit var sleep: Pose - - override val cryAnimation = CryProvider { bedrockStateful("magnemite", "cry") } - - - override fun registerPoses() { - val blink = quirk { bedrockStateful("magnemite", "blink") } - sleep = registerPose( - poseType = PoseType.SLEEP, - animations = arrayOf(bedrock("magnemite", "sleep")) - ) - - registerPose( - poseName = "hover", - poseTypes = PoseType.ALL_POSES - PoseType.FLY - PoseType.SLEEP - PoseType.SWIM, - transformTicks = 10, - quirks = arrayOf(blink), - animations = arrayOf( - bedrock("magnemite", "air_idle") - ) - ) - - registerPose( - poseName = "fly", - poseTypes = setOf(PoseType.FLY, PoseType.SWIM), - transformTicks = 10, - quirks = arrayOf(blink), - animations = arrayOf( - bedrock("magnemite", "air_fly") - ) - ) - - } - - override fun getFaintAnimation(state: PosableState) = bedrockStateful("magnemite", "faint") -} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/VaryingModelRepository.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/VaryingModelRepository.kt index 18a4887463..51b59614cb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/VaryingModelRepository.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/VaryingModelRepository.kt @@ -290,8 +290,6 @@ object VaryingModelRepository { inbuilt("koffing", ::KoffingModel) inbuilt("krabby", ::KrabbyModel) inbuilt("lickitung", ::LickitungModel) - inbuilt("magnemite", ::MagnemiteModel) - inbuilt("magneton", ::MagnetonModel) inbuilt("marowak", ::MarowakModel) inbuilt("meowth", ::MeowthModel) inbuilt("mew", ::MewModel) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0081_magnemite/magnemite.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0081_magnemite/magnemite.geo.json index 577b7285e5..bfd1af5644 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0081_magnemite/magnemite.geo.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0081_magnemite/magnemite.geo.json @@ -15,6 +15,22 @@ "name": "magnemite", "pivot": [0, 0, 0] }, + { + "name": "locator_root", + "parent": "magnemite", + "pivot": [0, 0, 0], + "locators": { + "root": [0, 0, 0] + } + }, + { + "name": "locator_top", + "parent": "magnemite", + "pivot": [0, 13.5, 0], + "locators": { + "top": [0, 13.5, 0] + } + }, { "name": "body", "parent": "magnemite", @@ -23,6 +39,55 @@ {"origin": [-4, 1, -4], "size": [8, 8, 8], "uv": [0, 0]} ] }, + { + "name": "locator_target", + "parent": "body", + "pivot": [0, 5, -6], + "locators": { + "target": [0, 5, -6] + } + }, + { + "name": "locator_middle", + "parent": "body", + "pivot": [0, 5, 0], + "locators": { + "middle": [0, 5, 0] + } + }, + { + "name": "locator_item_hat", + "parent": "body", + "pivot": [0, 9, 0], + "locators": { + "item_hat": [0, 9, 0] + } + }, + { + "name": "locator_head", + "parent": "body", + "pivot": [0, 9, -3], + "locators": { + "head": [0, 9, -3] + } + }, + { + "name": "locator_face", + "parent": "body", + "pivot": [0, 5, -4], + "locators": { + "face": [0, 5, -4], + "physical": [0, 5, -4] + } + }, + { + "name": "locator_item_face", + "parent": "body", + "pivot": [0, 5, -4], + "locators": { + "item_face": [0, 5, -4] + } + }, { "name": "eye", "parent": "body", @@ -31,6 +96,22 @@ {"origin": [-2, 3, -4.01], "size": [4, 4, 0], "uv": [32, 8]} ] }, + { + "name": "eye_angry", + "parent": "eye", + "pivot": [0, 6, -3.92], + "cubes": [ + {"origin": [-2, 5, -3.92], "size": [4, 2, 0], "inflate": 0.01, "uv": [0, 16]} + ] + }, + { + "name": "eye_sad", + "parent": "eye", + "pivot": [0, 6, -3.92], + "cubes": [ + {"origin": [-2, 6, -3.92], "size": [4, 1, 0], "inflate": 0.01, "uv": [8, 16]} + ] + }, { "name": "pupil", "parent": "eye", @@ -39,6 +120,15 @@ {"origin": [-0.5, 4.5, -4.02], "size": [1, 1, 0], "uv": [40, 8]} ] }, + { + "name": "locator_eye", + "parent": "pupil", + "pivot": [0, 5, -4], + "locators": { + "eye": [0, 5, -4], + "special": [0, 5, -4] + } + }, { "name": "pupil_closed", "parent": "eye", @@ -47,6 +137,23 @@ {"origin": [-1.5, 4.5, -3.92], "size": [3, 1, 0], "uv": [32, 15]} ] }, + { + "name": "pupil_happy", + "parent": "eye", + "pivot": [0, 5, -3.92], + "cubes": [ + {"origin": [-1.5, 4, -3.92], "size": [3, 2, 0], "uv": [58, 13]} + ] + }, + { + "name": "pupil_recoil", + "parent": "eye", + "pivot": [0, 5, -3.92], + "rotation": [0, 0, 45], + "cubes": [ + {"origin": [-1.5, 3.5, -3.92], "size": [3, 3, 0], "uv": [0, 18]} + ] + }, { "name": "nail_head", "parent": "body", @@ -113,9 +220,12 @@ ] }, { - "name": "nails", - "parent": "body", - "pivot": [0, 4.5, 0] + "name": "locator_item", + "parent": "magnet_right", + "pivot": [-11, 5, 0], + "locators": { + "item": [-11, 5, 0] + } } ] } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0081_magnemite/magnemite.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0081_magnemite/magnemite.json new file mode 100644 index 0000000000..070dee692b --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0081_magnemite/magnemite.json @@ -0,0 +1,55 @@ +{ + "portraitScale": 2.2, + "portraitTranslation": [ -0.1, -1.5, 0], + "profileScale": 1, + "profileTranslation": [ 0, 0.18, 0], + "rootBone": "magnemite", + "animations": { + "faint": "q.bedrock_primary('magnemite', 'faint', q.curve('one'))", + "cry": "q.bedrock_stateful('magnemite', 'cry')" + }, + "poses": { + "sleep": { + "poseName": "sleep", + "poseTypes": [ + "SLEEP" + ], + "animations": [ + "q.bedrock('magnemite', 'sleep')" + ] + }, + "hover": { + "poseName": "hover", + "poseTypes": [ + "STAND", + "FLOAT", + "HOVER", + "PORTRAIT", + "PROFILE", + "NONE" + ], + "animations": [ + "q.bedrock('magnemite', 'air_idle')" + ], + "transformTicks": 10, + "quirks": [ + "q.bedrock_quirk('magnemite', 'blink')" + ] + }, + "fly": { + "poseName": "fly", + "poseTypes": [ + "FLY", + "WALK", + "SWIM" + ], + "animations": [ + "q.bedrock('magnemite', 'air_fly')" + ], + "transformTicks": 10, + "quirks": [ + "q.bedrock_quirk('magnemite', 'blink')" + ] + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0081_magnemite/magnemite.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0081_magnemite/magnemite.png index 3dd2b25388876059fc707f136890e1926298ad87..5ddded847d6fe1fc2931621488a4df38c9030f65 100644 GIT binary patch delta 1500 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 Ubf{8s$p8QV07*qoM6N<$f=SS^qyPW_ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0081_magnemite/magnemite_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0081_magnemite/magnemite_shiny.png index 96d7b5811aefd6b5e0f001cf334ed1539c4dc032..57c51fcd33d3b3b5cbd8090076a0ca1ddb5f563a 100644 GIT binary patch delta 1397 zcmV-*1&aFS35N@iBYyw^b5ch_0Itp)=>Px)K}keGRA_AZ_^dw+I8}0 z0-&{P9x{`Ur+=_AIRLCo4l9#m^6`{h_mdBrYi1w7G)+v?5Fy0e)#Z_qpsgrxm1=B@kc)1+bx|TqE9{Ieg{~Y92?me zoY6>MeZFBDgvB95>MSh$As>QL>ucn@aF!N5^HwG& z$piH7OMhZza>RSP(b|`q+84cG;M5sci$?T9DqpXWiUJ*vP(G^J))J>lb+G9?(eN-vdJ8 zo=2%~8bn@&pS-FkWbbeP8sjrQ+w{Wqoa)7ALl}PSk`_vn{@%M zUVpoep=+EQJR7<(a?_3X!~wA8Ev9E{H;AEY6pCe!K0sJa-&%945fHM#%;bGZqE_o` zYmLZ@{o<-rA(~|JeSOU-y6)Ly>N<;yi=jFh*U;CpXKZ4^1$Z$2kWW56gf(xWl20ZQ z08Gz5L)G&mEM9EHRp%wJ*pP_7?*04yq<@3n6s=4Sr&w&70XIf&x^~{?<3k4-y?sZH zt$B;F`{R01lzVHX;pTL zMQq!~&fAp%dY4ZsvHE51A<_7wv+ncr02f@bu8rnG;Uov@7}s{-fc8~<*}w9rBeEws?WD~rDYc}0-@Ac3c600000NkvXXu0mjf D;ZUn> delta 1235 zcmV;^1T6c93+4%sBYy;~Nkl1vLK%H}YC?l(>|7wmx}%xdxxjz4chGEZv?mBU@%qC? z=k`Bq5H|ucmg1lL8~k;r8y>pV;^2X!LMjkaHhJ5=-8Jn2l1?%JtpWg=o7-wE7b~YLh|!>y0h*&>D&6&Nl6CmrkoicYl`zK)c!A{jI1BN1>m+?n4Ej zxw(y#N#Wivs|`sf$@tXM)G7}EjIqqQ+d+`EzyH{X)Cm#FVgCDR zfZo5r|JHy(_PUS6`lWM$5YRJg6CMWLMp{F!41d4TQo2x>9#`x8UwQ|Cy6+qQ^4V;- zw@?6Jd3l+Om#=WP^r`Coa=9D;eEa>6WYP|&Pn}FGEG`AbsnEu)RJpTp4}eVCVRNf# z*n_md?m_i_*M(2!^6JaxMvVa3njk)P;-VAs`{ym!&<-JN!}GkvE}0;ccGUXn>S_RR z^?%wLZ@m5*Zl#J&zE}(|KzBCoq1)LQ(GO=6tW_Qu*)++SZv#6(fRS+--@b9zcum%Q zUy+w8(B}(_OM&Nk9Dnr{&RzB?2dKE+oT2ugr?G>NZa;@+8LVhC0%)6yTR4?m<&RteRLx*FKxc&0QT$Xp*sVMIUJi!UEg#Qa7}m3dTI+vN3+ zq}w;{8btdcKauO(%afCnMpj+dRl(3j&8<|8`I*vukV!k7Da{8EW_eH$65oCPabO=* zN;j$+1a{W#yZ^AyWWi_OEaPNTG)(>QmMG)*-v3DL5rR^>00&=q-p~iBkkhA5CcgOc xt3cXFAIFFhBSwrEF=E7s5hF&77%^f1{0jx?Q3r&gY`_2j002ovPDHLkV1kM7aoqp_