refactor dog models location I

DashieDev · DashieDev · commit 96ba36dfcb9c · 2026-01-03T14:41:29.000+07:00
diff --git a/src/main/java/doggytalents/client/ClientSetup.java b/src/main/java/doggytalents/client/ClientSetup.java
@@ -81,15 +81,28 @@
 import doggytalents.client.entity.model.dog.VariantDogModel;
 import doggytalents.client.entity.model.dog.WolfLinkModel;
 import doggytalents.client.entity.model.dog.ZeroModel;
-import doggytalents.client.entity.model.dog.kusa.ChiModel;
-import doggytalents.client.entity.model.dog.kusa.HayabusaModel;
-import doggytalents.client.entity.model.dog.kusa.KoModel;
-import doggytalents.client.entity.model.dog.kusa.ReiModel;
-import doggytalents.client.entity.model.dog.kusa.ShinModel;
-import doggytalents.client.entity.model.dog.kusa.TakeModel;
-import doggytalents.client.entity.model.dog.kusa.TeiModel;
-import doggytalents.client.entity.model.dog.kusa.UmeModel;
-import doggytalents.client.entity.model.dog.oina.*;
+import doggytalents.client.entity.model.dog.dogs.kusa.ChiModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.HayabusaModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.KoModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.ReiModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.ShinModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.TakeModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.TeiModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.UmeModel;
+import doggytalents.client.entity.model.dog.dogs.oina.HopeModel;
+import doggytalents.client.entity.model.dog.dogs.oina.KaipokuModel;
+import doggytalents.client.entity.model.dog.dogs.oina.KawausoModel;
+import doggytalents.client.entity.model.dog.dogs.oina.KemushiriModel;
+import doggytalents.client.entity.model.dog.dogs.oina.OinaMerchant1Model;
+import doggytalents.client.entity.model.dog.dogs.oina.OinaMerchant2Model;
+import doggytalents.client.entity.model.dog.dogs.oina.OkikurumiModel;
+import doggytalents.client.entity.model.dog.dogs.oina.PirikoModel;
+import doggytalents.client.entity.model.dog.dogs.oina.RisuModel;
+import doggytalents.client.entity.model.dog.dogs.oina.ShamikuruModel;
+import doggytalents.client.entity.model.dog.dogs.oina.TodoModel;
+import doggytalents.client.entity.model.dog.dogs.oina.TusukuruModel;
+import doggytalents.client.entity.model.dog.dogs.oina.WariModel;
+import doggytalents.client.entity.model.dog.dogs.oina.*;
 import doggytalents.client.entity.model.misc.DogPlushieModel;
 import doggytalents.client.entity.model.misc.GrandPianoModel;
 import doggytalents.client.entity.model.misc.SamoyedPlushieModel;
diff --git a/src/main/java/doggytalents/client/entity/model/DogModelRegistry.java b/src/main/java/doggytalents/client/entity/model/DogModelRegistry.java
@@ -78,15 +78,28 @@
 import doggytalents.client.entity.model.dog.WolfLinkModel;
 import doggytalents.client.entity.model.dog.ZeroModel;
 import doggytalents.client.entity.model.dog.DogModel.AccessoryState;
-import doggytalents.client.entity.model.dog.kusa.ChiModel;
-import doggytalents.client.entity.model.dog.kusa.HayabusaModel;
-import doggytalents.client.entity.model.dog.kusa.KoModel;
-import doggytalents.client.entity.model.dog.kusa.ReiModel;
-import doggytalents.client.entity.model.dog.kusa.ShinModel;
-import doggytalents.client.entity.model.dog.kusa.TakeModel;
-import doggytalents.client.entity.model.dog.kusa.TeiModel;
-import doggytalents.client.entity.model.dog.kusa.UmeModel;
-import doggytalents.client.entity.model.dog.oina.*;
+import doggytalents.client.entity.model.dog.dogs.kusa.ChiModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.HayabusaModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.KoModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.ReiModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.ShinModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.TakeModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.TeiModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.UmeModel;
+import doggytalents.client.entity.model.dog.dogs.oina.HopeModel;
+import doggytalents.client.entity.model.dog.dogs.oina.KaipokuModel;
+import doggytalents.client.entity.model.dog.dogs.oina.KawausoModel;
+import doggytalents.client.entity.model.dog.dogs.oina.KemushiriModel;
+import doggytalents.client.entity.model.dog.dogs.oina.OinaMerchant1Model;
+import doggytalents.client.entity.model.dog.dogs.oina.OinaMerchant2Model;
+import doggytalents.client.entity.model.dog.dogs.oina.OkikurumiModel;
+import doggytalents.client.entity.model.dog.dogs.oina.PirikoModel;
+import doggytalents.client.entity.model.dog.dogs.oina.RisuModel;
+import doggytalents.client.entity.model.dog.dogs.oina.ShamikuruModel;
+import doggytalents.client.entity.model.dog.dogs.oina.TodoModel;
+import doggytalents.client.entity.model.dog.dogs.oina.TusukuruModel;
+import doggytalents.client.entity.model.dog.dogs.oina.WariModel;
+import doggytalents.client.entity.model.dog.dogs.oina.*;
 import doggytalents.common.entity.Dog;
 import doggytalents.common.util.Util;
 import net.minecraft.client.renderer.entity.EntityRendererProvider;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/ChiModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/ChiModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.kusa;
+package doggytalents.client.entity.model.dog.dogs.kusa;
 
 import doggytalents.DoggyAccessoryTypes;
 import doggytalents.api.registry.Accessory;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/DeerAntlersModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/DeerAntlersModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.kusa;
+package doggytalents.client.entity.model.dog.dogs.kusa;
 
 import java.util.Optional;
 
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/DragonCostumeHeadModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/DragonCostumeHeadModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.kusa;
+package doggytalents.client.entity.model.dog.dogs.kusa;
 
 import java.util.Optional;
 
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/DragonCostumeSuitModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/DragonCostumeSuitModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.kusa;
+package doggytalents.client.entity.model.dog.dogs.kusa;
 
 import java.util.Optional;
 
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/HayabusaModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/HayabusaModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.kusa;
+package doggytalents.client.entity.model.dog.dogs.kusa;
 
 import doggytalents.client.entity.model.dog.DogModel;
 import doggytalents.common.entity.Dog;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/KoModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/KoModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.kusa;
+package doggytalents.client.entity.model.dog.dogs.kusa;
 
 import doggytalents.DoggyAccessoryTypes;
 import doggytalents.api.registry.Accessory;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/LocatorOrbModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/LocatorOrbModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.kusa;
+package doggytalents.client.entity.model.dog.dogs.kusa;
 
 import java.util.Optional;
 
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/ReiModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/ReiModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.kusa;
+package doggytalents.client.entity.model.dog.dogs.kusa;
 
 import doggytalents.client.entity.model.dog.DogModel;
 import doggytalents.common.entity.Dog;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/ShinModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/ShinModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.kusa;
+package doggytalents.client.entity.model.dog.dogs.kusa;
 
 import doggytalents.client.entity.model.dog.DogModel;
 import doggytalents.common.entity.Dog;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/TakeModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/TakeModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.kusa;
+package doggytalents.client.entity.model.dog.dogs.kusa;
 
 import doggytalents.client.entity.model.dog.DogModel;
 import doggytalents.common.entity.Dog;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/TeiModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/TeiModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.kusa;
+package doggytalents.client.entity.model.dog.dogs.kusa;
 
 import doggytalents.api.anim.AltDogAnimationSequences;
 import doggytalents.api.anim.DogAnimation;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/UmeModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/kusa/UmeModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.kusa;
+package doggytalents.client.entity.model.dog.dogs.kusa;
 
 import doggytalents.client.entity.model.dog.DogModel;
 import doggytalents.common.entity.Dog;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/HopeModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/HopeModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.oina;
+package doggytalents.client.entity.model.dog.dogs.oina;
 
 import doggytalents.client.entity.model.dog.DogModel;
 import net.minecraft.client.model.geom.ModelPart;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/KaipokuModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/KaipokuModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.oina;
+package doggytalents.client.entity.model.dog.dogs.oina;
 
 import doggytalents.DoggyAccessoryTypes;
 import doggytalents.api.registry.Accessory;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/KawausoModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/KawausoModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.oina;
+package doggytalents.client.entity.model.dog.dogs.oina;
 
 import doggytalents.DoggyAccessoryTypes;
 import doggytalents.api.registry.Accessory;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/KemushiriModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/KemushiriModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.oina;
+package doggytalents.client.entity.model.dog.dogs.oina;
 
 import doggytalents.DoggyAccessoryTypes;
 import doggytalents.api.registry.Accessory;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/OinaMerchant1Model.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/OinaMerchant1Model.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.oina;
+package doggytalents.client.entity.model.dog.dogs.oina;
 
 import doggytalents.DoggyAccessoryTypes;
 import doggytalents.api.registry.Accessory;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/OinaMerchant2Model.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/OinaMerchant2Model.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.oina;
+package doggytalents.client.entity.model.dog.dogs.oina;
 
 import doggytalents.DoggyAccessoryTypes;
 import doggytalents.api.registry.Accessory;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/OkikurumiModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/OkikurumiModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.oina;
+package doggytalents.client.entity.model.dog.dogs.oina;
 
 import doggytalents.client.entity.model.dog.DogModel;
 import net.minecraft.client.model.geom.ModelPart;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/PirikoModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/PirikoModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.oina;
+package doggytalents.client.entity.model.dog.dogs.oina;
 
 import doggytalents.client.entity.model.dog.DogModel;
 import net.minecraft.client.model.geom.ModelPart;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/RisuModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/RisuModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.oina;
+package doggytalents.client.entity.model.dog.dogs.oina;
 
 import doggytalents.client.entity.model.dog.DogModel;
 import net.minecraft.client.model.geom.ModelPart;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/ShamikuruModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/ShamikuruModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.oina;
+package doggytalents.client.entity.model.dog.dogs.oina;
 
 import doggytalents.client.entity.model.dog.DogModel;
 import net.minecraft.client.model.geom.ModelPart;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/TodoModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/TodoModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.oina;
+package doggytalents.client.entity.model.dog.dogs.oina;
 
 import doggytalents.client.entity.model.dog.DogModel;
 import net.minecraft.client.model.geom.ModelPart;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/TusukuruModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/TusukuruModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.oina;
+package doggytalents.client.entity.model.dog.dogs.oina;
 
 import doggytalents.client.entity.model.dog.DogModel;
 import net.minecraft.client.model.geom.ModelPart;
diff --git a/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/WariModel.java b/src/main/java/doggytalents/client/entity/model/dog/dogs/oina/WariModel.java
@@ -1,4 +1,4 @@
-package doggytalents.client.entity.model.dog.oina;
+package doggytalents.client.entity.model.dog.dogs.oina;
 
 import doggytalents.client.entity.model.dog.DogModel;
 import net.minecraft.client.model.geom.ModelPart;
diff --git a/src/main/java/doggytalents/client/entity/render/layer/accessory/modelrenderentry/BunnyEarsRenderEntry.java b/src/main/java/doggytalents/client/entity/render/layer/accessory/modelrenderentry/BunnyEarsRenderEntry.java
@@ -3,7 +3,7 @@
 import doggytalents.api.registry.AccessoryInstance;
 import doggytalents.client.entity.model.BunnyEarsModel;
 import doggytalents.client.entity.model.SyncedAccessoryModel;
-import doggytalents.client.entity.model.dog.kusa.DeerAntlersModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.DeerAntlersModel;
 import doggytalents.client.entity.render.AccessoryModelManager.Entry;
 import doggytalents.common.lib.Resources;
 import doggytalents.common.util.Util;
diff --git a/src/main/java/doggytalents/client/entity/render/layer/accessory/modelrenderentry/DeerAntlersRenderEntry.java b/src/main/java/doggytalents/client/entity/render/layer/accessory/modelrenderentry/DeerAntlersRenderEntry.java
@@ -3,8 +3,8 @@
 import doggytalents.api.registry.AccessoryInstance;
 import doggytalents.client.entity.model.SyncedAccessoryModel;
 import doggytalents.client.entity.model.WigModel;
-import doggytalents.client.entity.model.dog.kusa.DeerAntlersModel;
-import doggytalents.client.entity.model.dog.kusa.LocatorOrbModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.DeerAntlersModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.LocatorOrbModel;
 import doggytalents.client.entity.render.AccessoryModelManager.Entry;
 import doggytalents.common.lib.Constants;
 import doggytalents.common.lib.Resources;
diff --git a/src/main/java/doggytalents/client/entity/render/layer/accessory/modelrenderentry/DragonCostumeHeadRenderEntry.java b/src/main/java/doggytalents/client/entity/render/layer/accessory/modelrenderentry/DragonCostumeHeadRenderEntry.java
@@ -2,8 +2,8 @@
 
 import doggytalents.api.registry.AccessoryInstance;
 import doggytalents.client.entity.model.SyncedAccessoryModel;
-import doggytalents.client.entity.model.dog.kusa.DeerAntlersModel;
-import doggytalents.client.entity.model.dog.kusa.DragonCostumeHeadModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.DeerAntlersModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.DragonCostumeHeadModel;
 import doggytalents.client.entity.render.AccessoryModelManager.Entry;
 import doggytalents.common.lib.Resources;
 import doggytalents.common.util.Util;
diff --git a/src/main/java/doggytalents/client/entity/render/layer/accessory/modelrenderentry/DragonCostumeSuitRenderEntry.java b/src/main/java/doggytalents/client/entity/render/layer/accessory/modelrenderentry/DragonCostumeSuitRenderEntry.java
@@ -2,8 +2,8 @@
 
 import doggytalents.api.registry.AccessoryInstance;
 import doggytalents.client.entity.model.SyncedAccessoryModel;
-import doggytalents.client.entity.model.dog.kusa.DeerAntlersModel;
-import doggytalents.client.entity.model.dog.kusa.DragonCostumeSuitModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.DeerAntlersModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.DragonCostumeSuitModel;
 import doggytalents.client.entity.render.AccessoryModelManager.Entry;
 import doggytalents.common.lib.Resources;
 import doggytalents.common.util.Util;
diff --git a/src/main/java/doggytalents/client/entity/render/layer/accessory/modelrenderentry/DyableLocatorOrbEntry.java b/src/main/java/doggytalents/client/entity/render/layer/accessory/modelrenderentry/DyableLocatorOrbEntry.java
@@ -2,7 +2,7 @@
 
 import doggytalents.api.registry.AccessoryInstance;
 import doggytalents.client.entity.model.SyncedAccessoryModel;
-import doggytalents.client.entity.model.dog.kusa.LocatorOrbModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.LocatorOrbModel;
 import doggytalents.common.lib.Resources;
 import net.minecraft.client.renderer.entity.EntityRendererProvider.Context;
 import net.minecraft.resources.ResourceLocation;
diff --git a/src/main/java/doggytalents/client/entity/render/layer/accessory/modelrenderentry/HeadBandRenderEntry.java b/src/main/java/doggytalents/client/entity/render/layer/accessory/modelrenderentry/HeadBandRenderEntry.java
@@ -4,7 +4,7 @@
 import doggytalents.client.entity.model.HeadBandModel;
 import doggytalents.client.entity.model.SyncedAccessoryModel;
 import doggytalents.client.entity.model.WigModel;
-import doggytalents.client.entity.model.dog.kusa.LocatorOrbModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.LocatorOrbModel;
 import doggytalents.client.entity.render.AccessoryModelManager;
 import doggytalents.common.lib.Constants;
 import doggytalents.common.util.Util;
diff --git a/src/main/java/doggytalents/client/entity/render/layer/accessory/modelrenderentry/LocatorOrbRenderEntry.java b/src/main/java/doggytalents/client/entity/render/layer/accessory/modelrenderentry/LocatorOrbRenderEntry.java
@@ -3,7 +3,7 @@
 import doggytalents.api.registry.AccessoryInstance;
 import doggytalents.client.entity.model.SyncedAccessoryModel;
 import doggytalents.client.entity.model.WigModel;
-import doggytalents.client.entity.model.dog.kusa.LocatorOrbModel;
+import doggytalents.client.entity.model.dog.dogs.kusa.LocatorOrbModel;
 import doggytalents.client.entity.render.AccessoryModelManager.Entry;
 import doggytalents.common.lib.Constants;
 import doggytalents.common.util.Util;
diff --git a/src/main/java/doggytalents/client/screen/widget/DoggySpin/DoggySpinModel.java b/src/main/java/doggytalents/client/screen/widget/DoggySpin/DoggySpinModel.java
@@ -19,7 +19,7 @@
 import doggytalents.client.entity.model.animation.DogKeyframeAnimations.AnimationContext;
 import doggytalents.client.entity.model.dog.AmaterasuModel;
 import doggytalents.client.entity.model.dog.DogModel;
-import doggytalents.client.entity.model.dog.oina.HopeModel;
+import doggytalents.client.entity.model.dog.dogs.oina.HopeModel;
 import doggytalents.common.config.ConfigHandler;
 import doggytalents.common.lib.Resources;
 import doggytalents.common.variant.DogVariant;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package doggytalents.client.entity.model.dog.kusa;`
	`1`	`+package doggytalents.client.entity.model.dog.dogs.kusa;`
`2`	`2`
`3`	`3`	`import doggytalents.DoggyAccessoryTypes;`
`4`	`4`	`import doggytalents.api.registry.Accessory;`