Skip to content
This repository has been archived by the owner on Dec 16, 2023. It is now read-only.

Commit

Permalink
Add guard suit clothing item (#198)
Browse files Browse the repository at this point in the history
  • Loading branch information
percivalalb committed Sep 26, 2020
1 parent fd7b195 commit 1fad851
Show file tree
Hide file tree
Showing 10 changed files with 65 additions and 52 deletions.
103 changes: 52 additions & 51 deletions src/generated/resources/.cache/cache
Original file line number Diff line number Diff line change
@@ -1,51 +1,52 @@
0eaa7a804d0d12effb75af38f52c20ac575d3083 assets\doggytalents\blockstates\dog_bath.json
0fe61d5b8a98c90d5c5363b1c96bb8e82c484e9a assets\doggytalents\blockstates\dog_bed.json
9f490c6b2075c0fcd27846db42c15efaafff1d90 assets\doggytalents\blockstates\food_bowl.json
7ee5e3b59a0d6a06182322bdf516b2478a377608 assets\doggytalents\models\block\dog_bath.json
2b1acdc320da6e43d808fd64e61d58e105783803 assets\doggytalents\models\block\dog_bed.json
165980b709f5d94e35db38961832447640ffc7fe assets\doggytalents\models\block\food_bowl.json
fc69f6b35f39b012bfbe88fa490c655b20b148c8 assets\doggytalents\models\item\big_bone.json
0a58aae547c91bee49a6bd36d27ba9584eadf821 assets\doggytalents\models\item\breeding_bone.json
018b646809a5e501bfa6e1b1f0f62eea0f5b828f assets\doggytalents\models\item\cape.json
1f2e5d3048b0dd7878034eb32930685234093735 assets\doggytalents\models\item\cape_coloured.json
b766741e9c75dc6e474e7a2e8400a36ef100e12f assets\doggytalents\models\item\chew_stick.json
d674dd1665f163e11635b95c4b96fdc465e4522a assets\doggytalents\models\item\collar_shears.json
6d1bed3c56e26e007a17f491158ab8d54b1a9a4d assets\doggytalents\models\item\creative_collar.json
78a2c10dc53646a41595edf71c96cd84b1945f6a assets\doggytalents\models\item\creative_radar.json
46d6cecde288d96dae2398296197dc037cd0e71a assets\doggytalents\models\item\dire_treat.json
4869ee1d6452c5379c0ac871e68fb9ad8ce90d2d assets\doggytalents\models\item\doggy_charm.json
56b2235add68f6d0dcbaefc2ea67c5c7acd9caaa assets\doggytalents\models\item\dog_bath.json
bcf5190151de45f029f45d03c16f2731d754de0a assets\doggytalents\models\item\dog_bed.json
ddb98e37fb61c50ec0b46b671914b77d4fa86b40 assets\doggytalents\models\item\food_bowl.json
e45ed660c6adba48c1bda55ed826d4b0d2c957e1 assets\doggytalents\models\item\leather_jacket.json
3e182ad3cb2fff55bea80f4d43157d37fe86abae assets\doggytalents\models\item\master_treat.json
54fb2b4dc5c306b728d7fbd3d090f1523a9ca7f0 assets\doggytalents\models\item\multicoloured_collar.json
cc483c2c84dd127270008584d4074cb9f3af0050 assets\doggytalents\models\item\owner_change.json
9af8146e4c2915b2e0c56b2f5b059524d12319d4 assets\doggytalents\models\item\radar.json
0481650457d58ee93ee78e4c18af3a33b2a4eb0a assets\doggytalents\models\item\radio_collar.json
819da368f818f4eb1ecbbdd5063e1a76d9f41ac9 assets\doggytalents\models\item\spotted_collar.json
7a9a4a80092899f9211dd43f16d0bfc0daf207de assets\doggytalents\models\item\sunglasses.json
7300af085385713262515a59fe9806031635113d assets\doggytalents\models\item\super_treat.json
940724d8d5d748cfa781d5c25c8637976910dca9 assets\doggytalents\models\item\throw_bone.json
8a4b5f42ab8a25c2d9b74e31c05365166e10426f assets\doggytalents\models\item\throw_bone_wet.json
7653669397af5f091b3bb4f3a8c199d11c94a9d1 assets\doggytalents\models\item\throw_stick.json
057c7b1964a7b4e4e3b2f7b228c20f1c6ff75d3b assets\doggytalents\models\item\throw_stick_wet.json
b9814d210bcd38c20f166b0cec92957e366fac46 assets\doggytalents\models\item\tiny_bone.json
22dc3c95e2cfd75a302dd280ba8c1fba8016452d assets\doggytalents\models\item\training_treat.json
20bd051452ca9e0b3662ec5afa3422a9169b8b26 assets\doggytalents\models\item\treat_bag.json
39ecd626641f704f14695bb75d202145848f84b8 assets\doggytalents\models\item\whistle.json
e68ec1ce9e2f07d89b1fecf88933d0d5bb9e086a assets\doggytalents\models\item\wool_collar.json
ff383cd79328169881909be19962c6bc2948e23b data\doggytalents\advancements\default\accessorise.json
151b3261a6669c1c99f3c70572d5cedcee1a3b04 data\doggytalents\advancements\default\level_talent.json
3049dc0d57e5f78fa7552b68470cfe31574b78fa data\doggytalents\advancements\default\radio_collar.json
3a8e5b45ad536ddac0478b708fd247915b7d8722 data\doggytalents\advancements\default\tame_dog.json
3afa3463b8fba440dab9577c225184bb4499099d data\doggytalents\loot_tables\blocks\dog_bath.json
fda55a16b3f7dcd01b4bad31ea3c9b1b950ef098 data\doggytalents\loot_tables\blocks\dog_bed.json
8ad0a5107df219fc895d8f53c051084064711a55 data\doggytalents\loot_tables\blocks\food_bowl.json
f0266b86d509baafb030ddb9915394ea06d372cd data\doggytalents\loot_tables\entities\dog.json
e7b62eb7caf5abf92ae5d16ae245791a07159528 data\doggytalents\recipes\dog_bed.json
d1d24a612db9117f220d380a49102132950c88ab data\doggytalents\tags\items\beg_items_tamed.json
77136aef4cf4e56b0437d2a1a06b4a69bb67e897 data\doggytalents\tags\items\beg_items_untamed.json
f1cec25821677b79a1df362e849acdbd421913e1 data\doggytalents\tags\items\breeding_items.json
5bf2d6a32c698c6fed10a638ce14a2a9a57efded data\doggytalents\tags\items\pack_puppy_blacklist.json
bf51c683c6592d6f19c8dce3522235eaad1abfcd data\doggytalents\tags\items\treats.json
0eaa7a804d0d12effb75af38f52c20ac575d3083 assets/doggytalents/blockstates/dog_bath.json
0fe61d5b8a98c90d5c5363b1c96bb8e82c484e9a assets/doggytalents/blockstates/dog_bed.json
9f490c6b2075c0fcd27846db42c15efaafff1d90 assets/doggytalents/blockstates/food_bowl.json
7ee5e3b59a0d6a06182322bdf516b2478a377608 assets/doggytalents/models/block/dog_bath.json
2b1acdc320da6e43d808fd64e61d58e105783803 assets/doggytalents/models/block/dog_bed.json
165980b709f5d94e35db38961832447640ffc7fe assets/doggytalents/models/block/food_bowl.json
fc69f6b35f39b012bfbe88fa490c655b20b148c8 assets/doggytalents/models/item/big_bone.json
0a58aae547c91bee49a6bd36d27ba9584eadf821 assets/doggytalents/models/item/breeding_bone.json
018b646809a5e501bfa6e1b1f0f62eea0f5b828f assets/doggytalents/models/item/cape.json
1f2e5d3048b0dd7878034eb32930685234093735 assets/doggytalents/models/item/cape_coloured.json
b766741e9c75dc6e474e7a2e8400a36ef100e12f assets/doggytalents/models/item/chew_stick.json
d674dd1665f163e11635b95c4b96fdc465e4522a assets/doggytalents/models/item/collar_shears.json
6d1bed3c56e26e007a17f491158ab8d54b1a9a4d assets/doggytalents/models/item/creative_collar.json
78a2c10dc53646a41595edf71c96cd84b1945f6a assets/doggytalents/models/item/creative_radar.json
46d6cecde288d96dae2398296197dc037cd0e71a assets/doggytalents/models/item/dire_treat.json
56b2235add68f6d0dcbaefc2ea67c5c7acd9caaa assets/doggytalents/models/item/dog_bath.json
bcf5190151de45f029f45d03c16f2731d754de0a assets/doggytalents/models/item/dog_bed.json
4869ee1d6452c5379c0ac871e68fb9ad8ce90d2d assets/doggytalents/models/item/doggy_charm.json
ddb98e37fb61c50ec0b46b671914b77d4fa86b40 assets/doggytalents/models/item/food_bowl.json
895aa096a4765db956cf452af750e6f999b680b8 assets/doggytalents/models/item/guard_suit.json
e45ed660c6adba48c1bda55ed826d4b0d2c957e1 assets/doggytalents/models/item/leather_jacket.json
3e182ad3cb2fff55bea80f4d43157d37fe86abae assets/doggytalents/models/item/master_treat.json
54fb2b4dc5c306b728d7fbd3d090f1523a9ca7f0 assets/doggytalents/models/item/multicoloured_collar.json
cc483c2c84dd127270008584d4074cb9f3af0050 assets/doggytalents/models/item/owner_change.json
9af8146e4c2915b2e0c56b2f5b059524d12319d4 assets/doggytalents/models/item/radar.json
0481650457d58ee93ee78e4c18af3a33b2a4eb0a assets/doggytalents/models/item/radio_collar.json
819da368f818f4eb1ecbbdd5063e1a76d9f41ac9 assets/doggytalents/models/item/spotted_collar.json
7a9a4a80092899f9211dd43f16d0bfc0daf207de assets/doggytalents/models/item/sunglasses.json
7300af085385713262515a59fe9806031635113d assets/doggytalents/models/item/super_treat.json
940724d8d5d748cfa781d5c25c8637976910dca9 assets/doggytalents/models/item/throw_bone.json
8a4b5f42ab8a25c2d9b74e31c05365166e10426f assets/doggytalents/models/item/throw_bone_wet.json
7653669397af5f091b3bb4f3a8c199d11c94a9d1 assets/doggytalents/models/item/throw_stick.json
057c7b1964a7b4e4e3b2f7b228c20f1c6ff75d3b assets/doggytalents/models/item/throw_stick_wet.json
b9814d210bcd38c20f166b0cec92957e366fac46 assets/doggytalents/models/item/tiny_bone.json
22dc3c95e2cfd75a302dd280ba8c1fba8016452d assets/doggytalents/models/item/training_treat.json
20bd051452ca9e0b3662ec5afa3422a9169b8b26 assets/doggytalents/models/item/treat_bag.json
39ecd626641f704f14695bb75d202145848f84b8 assets/doggytalents/models/item/whistle.json
e68ec1ce9e2f07d89b1fecf88933d0d5bb9e086a assets/doggytalents/models/item/wool_collar.json
ff383cd79328169881909be19962c6bc2948e23b data/doggytalents/advancements/default/accessorise.json
151b3261a6669c1c99f3c70572d5cedcee1a3b04 data/doggytalents/advancements/default/level_talent.json
3049dc0d57e5f78fa7552b68470cfe31574b78fa data/doggytalents/advancements/default/radio_collar.json
3a8e5b45ad536ddac0478b708fd247915b7d8722 data/doggytalents/advancements/default/tame_dog.json
3afa3463b8fba440dab9577c225184bb4499099d data/doggytalents/loot_tables/blocks/dog_bath.json
fda55a16b3f7dcd01b4bad31ea3c9b1b950ef098 data/doggytalents/loot_tables/blocks/dog_bed.json
8ad0a5107df219fc895d8f53c051084064711a55 data/doggytalents/loot_tables/blocks/food_bowl.json
f0266b86d509baafb030ddb9915394ea06d372cd data/doggytalents/loot_tables/entities/dog.json
e7b62eb7caf5abf92ae5d16ae245791a07159528 data/doggytalents/recipes/dog_bed.json
d1d24a612db9117f220d380a49102132950c88ab data/doggytalents/tags/items/beg_items_tamed.json
77136aef4cf4e56b0437d2a1a06b4a69bb67e897 data/doggytalents/tags/items/beg_items_untamed.json
f1cec25821677b79a1df362e849acdbd421913e1 data/doggytalents/tags/items/breeding_items.json
5bf2d6a32c698c6fed10a638ce14a2a9a57efded data/doggytalents/tags/items/pack_puppy_blacklist.json
bf51c683c6592d6f19c8dce3522235eaad1abfcd data/doggytalents/tags/items/treats.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "doggytalents:item/guard_suit"
}
}
1 change: 1 addition & 0 deletions src/main/java/doggytalents/DoggyAccessories.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public class DoggyAccessories {
public static final RegistryObject<Collar> SPOTTED_COLLAR = register("spotted_collar", () -> new Collar(DoggyItems.SPOTTED_COLLAR));
public static final RegistryObject<Collar> MULTICOLORED_COLLAR = register("multicolored_collar", () -> new Collar(DoggyItems.MULTICOLOURED_COLLAR));

public static final RegistryObject<Clothing> GUARD_SUIT = register("guard_suit", () -> new Clothing(DoggyItems.GUARD_SUIT));
public static final RegistryObject<Clothing> LEATHER_JACKET_CLOTHING = register("leather_jacket_clothing", () -> new Clothing(DoggyItems.LEATHER_JACKET));
public static final RegistryObject<Glasses> SUNGLASSES = register("sunglasses", () -> new Glasses(DoggyItems.SUNGLASSES));
public static final RegistryObject<Clothing> CAPE = register("cape", () -> new Clothing(DoggyItems.CAPE));
Expand Down
1 change: 1 addition & 0 deletions src/main/java/doggytalents/DoggyItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public class DoggyItems {
public static final RegistryObject<AccessoryItem> CAPE = registerAccessory("cape", DoggyAccessories.CAPE);
public static final RegistryObject<DyeableAccessoryItem> CAPE_COLOURED = registerAccessoryDyed("cape_coloured", DoggyAccessories.DYEABLE_CAPE);
public static final RegistryObject<AccessoryItem> SUNGLASSES = registerAccessory("sunglasses", DoggyAccessories.SUNGLASSES);
public static final RegistryObject<AccessoryItem> GUARD_SUIT = registerAccessory("guard_suit", DoggyAccessories.GUARD_SUIT);
public static final RegistryObject<AccessoryItem> LEATHER_JACKET = registerAccessory("leather_jacket", DoggyAccessories.LEATHER_JACKET_CLOTHING);
public static final RegistryObject<Item> TINY_BONE = registerSizeBone("tiny_bone", SizeBoneItem.Type.TINY);
public static final RegistryObject<Item> BIG_BONE = registerSizeBone("big_bone", SizeBoneItem.Type.BIG);
Expand Down
1 change: 1 addition & 0 deletions src/main/java/doggytalents/client/ClientSetup.java
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public static void setupCollarRenderers(final FMLClientSetupEvent event) {
CollarRenderManager.registerRenderer(DoggyAccessories.CAPE.get(), new DefaultAccessoryRenderer(Resources.CAPE));
CollarRenderManager.registerRenderer(DoggyAccessories.DYEABLE_CAPE.get(), new DyeableAccessoryRenderer(Resources.DYEABLE_CAPE));
CollarRenderManager.registerRenderer(DoggyAccessories.LEATHER_JACKET_CLOTHING.get(), new DefaultAccessoryRenderer(Resources.CLOTHING_LEATHER_JACKET));
CollarRenderManager.registerRenderer(DoggyAccessories.GUARD_SUIT.get(), new DefaultAccessoryRenderer(Resources.GUARD_SUIT));

CollarRenderManager.registerRenderer(DoggyAccessories.SUNGLASSES.get(), new DefaultAccessoryRenderer(Resources.GLASSES_SUNGLASSES));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ protected void registerModels() {
generated(DoggyItems.COLLAR_SHEARS);
generated(DoggyItems.CREATIVE_COLLAR);
generated(DoggyItems.DOGGY_CHARM);
generated(DoggyItems.GUARD_SUIT);
generated(DoggyItems.LEATHER_JACKET);
generated(DoggyItems.MULTICOLOURED_COLLAR);
generated(DoggyItems.OWNER_CHANGE);
Expand Down
1 change: 1 addition & 0 deletions src/main/java/doggytalents/common/lib/Resources.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public class Resources {
public static final ResourceLocation COLLAR_SPOTTED = getEntity("dog", "doggy_collar_1");
public static final ResourceLocation COLLAR_MULTICOLORED = getEntity("dog", "doggy_collar_2");
public static final ResourceLocation CLOTHING_LEATHER_JACKET = getEntity("dog", "doggy_leather_jacket");
public static final ResourceLocation GUARD_SUIT = getEntity("dog", "doggy_guard_suit");
public static final ResourceLocation GLASSES_SUNGLASSES = getEntity("dog", "doggy_sunglasses");
public static final ResourceLocation BOW_TIE = getEntity("dog", "doggy_bowtie");
public static final ResourceLocation CAPE = getEntity("dog", "doggy_cape");
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/doggytalents/lang/en_gb.json
Original file line number Diff line number Diff line change
Expand Up @@ -357,5 +357,6 @@
"dogbed.casing.natura:overworld_planks.8": "Redwood Plank Casing",
"dogbed.casing.autumnity.maple_planks": "Maple Plank Casing",
"container.doggytalents.dog_inventories.link" : "Dog Inventories",
"container.doggytalents.dog_inventories" : "Dog Inventories"
"container.doggytalents.dog_inventories" : "Dog Inventories",
"item.doggytalents.guard_suit" : "Guard Suit"
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1fad851

Please sign in to comment.