diff --git a/common/src/main/java/com/cobblemon/mod/common/mixin/client/ItemRendererMixin.java b/common/src/main/java/com/cobblemon/mod/common/mixin/client/ItemRendererMixin.java index 0fe62149c7..a4350c6054 100644 --- a/common/src/main/java/com/cobblemon/mod/common/mixin/client/ItemRendererMixin.java +++ b/common/src/main/java/com/cobblemon/mod/common/mixin/client/ItemRendererMixin.java @@ -9,10 +9,13 @@ package com.cobblemon.mod.common.mixin.client; import com.cobblemon.mod.common.Cobblemon; +import com.cobblemon.mod.common.CobblemonItemComponents; +import com.cobblemon.mod.common.CobblemonItems; import com.cobblemon.mod.common.ModAPI; import com.cobblemon.mod.common.item.PokeBallItem; import com.cobblemon.mod.common.item.PokedexItem; import com.cobblemon.mod.common.item.WearableItem; +import com.cobblemon.mod.common.item.components.TMMoveComponent; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.ItemModelShaper; @@ -54,11 +57,17 @@ public abstract class ItemRendererMixin { cancellable = true ) private void cobblemon$overrideItemModel(ItemStack stack, ItemDisplayContext renderMode, boolean leftHanded, PoseStack matrices, MultiBufferSource multiBufferSource, int light, int overlay, BakedModel model, CallbackInfo ci) { - boolean shouldBe2d = renderMode == ItemDisplayContext.GUI || renderMode == ItemDisplayContext.FIXED; + boolean shouldBe2d = renderMode == ItemDisplayContext.GUI || renderMode == ItemDisplayContext.FIXED || stack.getItem() == CobblemonItems.TECHNICAL_MACHINE; ResourceLocation resourceLocation = null; if (shouldBe2d) { if (stack.getItem() instanceof PokeBallItem pokeBallItem) resourceLocation = pokeBallItem.getPokeBall().getModel2d(); else if (stack.getItem() instanceof PokedexItem pokedexItem) resourceLocation = pokedexItem.getType().getItemSpritePath(); + else if (stack.getItem() == CobblemonItems.TECHNICAL_MACHINE) { + TMMoveComponent component = stack.get(CobblemonItemComponents.TM_MOVE); + if (component != null) { + resourceLocation = new ResourceLocation(Cobblemon.MODID, "tm/" + component.getMove().getElementalType().showdownId() + "_tm"); + } + } } if (renderMode != ItemDisplayContext.HEAD && stack.getItem() instanceof WearableItem wearableItem) resourceLocation = wearableItem.getModel2d(); diff --git a/common/src/main/java/com/cobblemon/mod/common/mixin/client/ModelLoaderMixin.java b/common/src/main/java/com/cobblemon/mod/common/mixin/client/ModelLoaderMixin.java index 563862b896..b11e5a3bc1 100644 --- a/common/src/main/java/com/cobblemon/mod/common/mixin/client/ModelLoaderMixin.java +++ b/common/src/main/java/com/cobblemon/mod/common/mixin/client/ModelLoaderMixin.java @@ -9,8 +9,7 @@ package com.cobblemon.mod.common.mixin.client; import com.cobblemon.mod.common.client.CobblemonBakingOverrides; -import java.util.List; -import java.util.Map; +import net.minecraft.client.Minecraft; import net.minecraft.client.color.block.BlockColors; import net.minecraft.client.renderer.block.model.BlockModel; import net.minecraft.client.resources.model.BlockStateModelLoader; @@ -18,29 +17,76 @@ import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.client.resources.model.UnbakedModel; import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.packs.resources.Resource; import net.minecraft.util.profiling.ProfilerFiller; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + @Mixin(ModelBakery.class) public abstract class ModelLoaderMixin { - @Shadow abstract UnbakedModel getModel(ResourceLocation resourceLocation); @Shadow protected abstract void registerModel(ModelResourceLocation modelId, UnbakedModel unbakedModel); + @Shadow protected abstract void loadItemModelAndDependencies(ResourceLocation resourceLocation); + + @Unique + List dynamicFolders = Arrays.asList("egg", "tm"); + @Inject( - method = "", - at = @At("TAIL") + method = "", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/util/profiling/ProfilerFiller;popPush(Ljava/lang/String;)V", + ordinal = 1 + ) + ) + public void loadCustomItemModels(BlockColors blockColors, + ProfilerFiller profiler, + Map jsonUnbakedModels, + Map> blockStates, + CallbackInfo ci + ) { + /* + * The models/item/*.json's only get loaded if there's an item in the registry that actually asks for it. It + * naively looks for things in the root with an item ID and calls upon it, and some of those JSONs reference + * other model JSONs and so it cascades a little bit. Used for block models but more importantly here, sprites. + * + * The thing about the eggs (and TMs) is, we really want the eggs to be addon-compatible in a way that doesn't restrict + * the species that can have eggs, so we can't pre-plan all of them. This mixin looks for the things inside the + * egg subfolder (which won't get loaded automagically) and manually inserts them into the unbaked model list so + * Minecraft loads them for us. We'll then dynamically call these models from the ItemRendererMixin; so it's + * hacky at the init stage and hacky at the render stage. Pretty cool in the gameplay stage though. + * + * - Hiro + */ + + dynamicFolders.forEach(folder -> { + Map map = Minecraft.getInstance().getResourceManager().listResources("models/item/" + folder, (t) -> true); + map.forEach((key, value) -> { + ResourceLocation resourceLocation = new ResourceLocation(key.getNamespace(), key.getPath().replace("models/item/", "").replace(".json", "")); + this.loadItemModelAndDependencies(resourceLocation); + }); + }); + } + + @Inject( + method = "", + at = @At("TAIL") ) public void init(BlockColors blockColors, - ProfilerFiller profiler, - Map jsonUnbakedModels, - Map> blockStates, - CallbackInfo ci) { + ProfilerFiller profiler, + Map jsonUnbakedModels, + Map> blockStates, + CallbackInfo ci) { CobblemonBakingOverrides.INSTANCE.getModels().forEach(bakingOverride -> { var unbakedModel = this.getModel(bakingOverride.getModelLocation()); this.registerModel(bakingOverride.getModelIdentifier(), unbakedModel); 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 069316f33e..8ddc98eb85 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 @@ -40,7 +40,6 @@ import com.cobblemon.mod.common.client.render.color.PokeBaitItemColorProvider import com.cobblemon.mod.common.client.render.color.PokeSnackItemColorProvider import com.cobblemon.mod.common.client.render.color.PonigiriItemColorProvider import com.cobblemon.mod.common.client.render.color.SinisterTeaItemColorProvider -import com.cobblemon.mod.common.client.render.color.TechnicalMachineItemColorProvider import com.cobblemon.mod.common.client.render.entity.PokeBobberEntityRenderer import com.cobblemon.mod.common.client.render.generic.GenericBedrockRenderer import com.cobblemon.mod.common.client.render.item.CobblemonBuiltinItemRendererRegistry @@ -470,7 +469,6 @@ object CobblemonClient { implementation.registerItemColors(PokeBaitItemColorProvider, CobblemonItems.POKE_BAIT) implementation.registerItemColors(PonigiriItemColorProvider, CobblemonItems.PONIGIRI) implementation.registerItemColors(SinisterTeaItemColorProvider, CobblemonItems.SINISTER_TEA) - implementation.registerItemColors(TechnicalMachineItemColorProvider, CobblemonItems.TECHNICAL_MACHINE) } fun reloadCodedAssets(resourceManager: ResourceManager) { diff --git a/common/src/main/resources/assets/cobblemon/models/item/technical_machine.json b/common/src/main/resources/assets/cobblemon/models/item/technical_machine.json index 7ec809270d..afb6b41a8b 100644 --- a/common/src/main/resources/assets/cobblemon/models/item/technical_machine.json +++ b/common/src/main/resources/assets/cobblemon/models/item/technical_machine.json @@ -1,8 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "cobblemon:item/tms/tm", - "layer1": "cobblemon:item/tms/tm_overlay", - "layer2": "cobblemon:item/tms/tm_overlay_center" + "layer0": "cobblemon:item/tms/normal_tm" } } \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/bug_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/bug_tm.json new file mode 100644 index 0000000000..f6acffe228 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/bug_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/bug_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/dark_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/dark_tm.json new file mode 100644 index 0000000000..9c4e409744 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/dark_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/dark_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/dragon_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/dragon_tm.json new file mode 100644 index 0000000000..2a506b521f --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/dragon_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/dragon_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/electric_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/electric_tm.json new file mode 100644 index 0000000000..aadaba0b47 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/electric_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/electric_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/fairy_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/fairy_tm.json new file mode 100644 index 0000000000..5a9fdd79b7 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/fairy_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/fairy_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/fighting_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/fighting_tm.json new file mode 100644 index 0000000000..89d3633ab4 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/fighting_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/fighting_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/fire_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/fire_tm.json new file mode 100644 index 0000000000..4a52649635 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/fire_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/fire_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/flying_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/flying_tm.json new file mode 100644 index 0000000000..551fe66bb0 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/flying_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/flying_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/ghost_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/ghost_tm.json new file mode 100644 index 0000000000..fbaf90adcb --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/ghost_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/ghost_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/grass_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/grass_tm.json new file mode 100644 index 0000000000..9f136df788 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/grass_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/grass_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/ground_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/ground_tm.json new file mode 100644 index 0000000000..d1f970638a --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/ground_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/ground_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/ice_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/ice_tm.json new file mode 100644 index 0000000000..1cb0628896 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/ice_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/ice_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/normal_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/normal_tm.json new file mode 100644 index 0000000000..afb6b41a8b --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/normal_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/normal_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/poison_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/poison_tm.json new file mode 100644 index 0000000000..eaed8585f3 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/poison_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/poison_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/psychic_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/psychic_tm.json new file mode 100644 index 0000000000..10c126ce7d --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/psychic_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/psychic_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/rock_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/rock_tm.json new file mode 100644 index 0000000000..f42272673f --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/rock_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/rock_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/steel_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/steel_tm.json new file mode 100644 index 0000000000..3d3324ba8d --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/steel_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/steel_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/models/item/tm/water_tm.json b/common/src/main/resources/assets/cobblemon/models/item/tm/water_tm.json new file mode 100644 index 0000000000..2005ba39dc --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/models/item/tm/water_tm.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "cobblemon:item/tms/water_tm" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/bug_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/bug_tm.png new file mode 100644 index 0000000000..5192129f8e Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/bug_tm.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/dark_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/dark_tm.png new file mode 100644 index 0000000000..950bd06979 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/dark_tm.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/dragon_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/dragon_tm.png new file mode 100644 index 0000000000..f6665b69d9 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/dragon_tm.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/electric_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/electric_tm.png new file mode 100644 index 0000000000..c7051ef23f Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/electric_tm.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/fairy_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/fairy_tm.png new file mode 100644 index 0000000000..390d03650b Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/fairy_tm.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/fighting_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/fighting_tm.png new file mode 100644 index 0000000000..e359e070fd Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/fighting_tm.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/fire_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/fire_tm.png new file mode 100644 index 0000000000..4cf4e9ea6a Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/fire_tm.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/flying_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/flying_tm.png new file mode 100644 index 0000000000..f703fdd930 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/flying_tm.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/ghost_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/ghost_tm.png new file mode 100644 index 0000000000..85c4653a01 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/ghost_tm.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/grass_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/grass_tm.png new file mode 100644 index 0000000000..8d22c2ca1a Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/grass_tm.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/ground_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/ground_tm.png new file mode 100644 index 0000000000..9eb0b1e000 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/ground_tm.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/ice_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/ice_tm.png new file mode 100644 index 0000000000..7642db3186 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/ice_tm.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/normal_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/normal_tm.png new file mode 100644 index 0000000000..8e478627d5 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/normal_tm.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/poison_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/poison_tm.png new file mode 100644 index 0000000000..fab8054110 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/poison_tm.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/psychic_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/psychic_tm.png new file mode 100644 index 0000000000..98838f73f7 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/psychic_tm.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/rock_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/rock_tm.png new file mode 100644 index 0000000000..20463a95da Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/rock_tm.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/steel_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/steel_tm.png new file mode 100644 index 0000000000..8c907e3405 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/steel_tm.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/tm.png deleted file mode 100644 index 3a3044a710..0000000000 Binary files a/common/src/main/resources/assets/cobblemon/textures/item/tms/tm.png and /dev/null differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/tm_overlay.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/tm_overlay.png deleted file mode 100644 index 5c77543607..0000000000 Binary files a/common/src/main/resources/assets/cobblemon/textures/item/tms/tm_overlay.png and /dev/null differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/tm_overlay_center.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/tm_overlay_center.png deleted file mode 100644 index 9c8405524e..0000000000 Binary files a/common/src/main/resources/assets/cobblemon/textures/item/tms/tm_overlay_center.png and /dev/null differ diff --git a/common/src/main/resources/assets/cobblemon/textures/item/tms/water_tm.png b/common/src/main/resources/assets/cobblemon/textures/item/tms/water_tm.png new file mode 100644 index 0000000000..551dc43aad Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/item/tms/water_tm.png differ