Add easter egg collar

Author: Ampflower

xplat/src/datagen/java/gay/ampflower/mod/pet/data/generators/PetworksItemTagGenerator.java

@@ -53,6 +53,7 @@
 import static gay.ampflower.mod.pet.registry.PetworksItems.TAMED_CAT_GUISE;
 import static gay.ampflower.mod.pet.registry.PetworksItems.TRANS_COLLAR;
 import static gay.ampflower.mod.pet.registry.PetworksItems.WOLF_GUISE;
+import static gay.ampflower.mod.pet.registry.PetworksItems.WORLDWIDEPIXEL_COLLAR;
 import static gay.ampflower.mod.pet.registry.tag.PetworksItemTags.ARMOR_COLLARS;
 import static gay.ampflower.mod.pet.registry.tag.PetworksItemTags.BRACELETS;
 import static gay.ampflower.mod.pet.registry.tag.PetworksItemTags.COLLARS;
@@ -101,6 +102,7 @@ protected void configure(final RegistryWrapper.WrapperLookup arg) {
 		getOrCreateTagBuilder(SHEARABLE_COLLARS).add(
 			MAID_COLLAR,
 			COLLAR,
+			WORLDWIDEPIXEL_COLLAR,
 			MISSING_COLLAR,
 			PRIDE_COLLAR,
 			TRANS_COLLAR,
@@ -133,6 +135,7 @@ protected void configure(final RegistryWrapper.WrapperLookup arg) {
 
 		getOrCreateTagBuilder(BRACELETS).add(
 			MAID_COLLAR,
+			WORLDWIDEPIXEL_COLLAR,
 			MISSING_COLLAR,
 			COLLAR,
 			PRIDE_COLLAR,

xplat/src/datagen/java/gay/ampflower/mod/pet/data/generators/PetworksModelGenerator.java

@@ -47,6 +47,7 @@ public PetworksModelGenerator(final FabricDataOutput output) {
 	public void generateBlockStateModels(final BlockStateModelGenerator generator) {
 		collarBlock(generator, PetworksBlocks.MAID_COLLAR, PetworksBlocks.MAID_COLLAR_WALL);
 		collarBlock(generator, PetworksBlocks.COLLAR, PetworksBlocks.COLLAR_WALL);
+		collarBlock(generator, PetworksBlocks.WORLDWIDEPIXEL_COLLAR, PetworksBlocks.WORLDWIDEPIXEL_COLLAR_WALL);
 		collarBlock(generator, PetworksBlocks.MISSING_COLLAR, PetworksBlocks.MISSING_COLLAR_WALL);
 		collarBlock(generator, PetworksBlocks.PRIDE_COLLAR, PetworksBlocks.PRIDE_COLLAR_WALL);
 		collarBlock(generator, PetworksBlocks.TRANS_COLLAR, PetworksBlocks.TRANS_COLLAR_WALL);
@@ -85,6 +86,7 @@ public void generateBlockStateModels(final BlockStateModelGenerator generator) {
 
 		proxyCollar(generator,
 			PetworksBlocks.COLLAR,
+			PetworksBlocks.WORLDWIDEPIXEL_COLLAR,
 			PetworksBlocks.MISSING_COLLAR,
 			PetworksBlocks.PRIDE_COLLAR,
 			PetworksBlocks.TRANS_COLLAR,
@@ -143,6 +145,7 @@ public void generateBlockStateModels(final BlockStateModelGenerator generator) {
 	public void generateItemModels(final ItemModelGenerator itemModelGenerator) {
 		maidCollarItem(itemModelGenerator, PetworksItems.MAID_COLLAR, false);
 		genericCollarItem(itemModelGenerator, PetworksItems.COLLAR, false);
+		genericCollarItem(itemModelGenerator, PetworksItems.WORLDWIDEPIXEL_COLLAR, false);
 		genericCollarItem(itemModelGenerator, PetworksItems.MISSING_COLLAR, false);
 		genericCollarItem(itemModelGenerator, PetworksItems.PRIDE_COLLAR, false);
 		genericCollarItem(itemModelGenerator, PetworksItems.TRANS_COLLAR, false);

xplat/src/main/java/gay/ampflower/mod/pet/registry/PetworksBlockEntities.java

@@ -80,6 +80,8 @@
 import static gay.ampflower.mod.pet.registry.PetworksBlocks.QUARTZ_COLLAR_WALL;
 import static gay.ampflower.mod.pet.registry.PetworksBlocks.TRANS_COLLAR;
 import static gay.ampflower.mod.pet.registry.PetworksBlocks.TRANS_COLLAR_WALL;
+import static gay.ampflower.mod.pet.registry.PetworksBlocks.WORLDWIDEPIXEL_COLLAR;
+import static gay.ampflower.mod.pet.registry.PetworksBlocks.WORLDWIDEPIXEL_COLLAR_WALL;
 
 /**
  * @author Ampflower
@@ -90,6 +92,7 @@ public final class PetworksBlockEntities {
 		COLLAR = register("collar", CollarBlockEntity::new,
 		MAID_COLLAR, MAID_COLLAR_WALL,
 		PetworksBlocks.COLLAR, COLLAR_WALL,
+		WORLDWIDEPIXEL_COLLAR, WORLDWIDEPIXEL_COLLAR_WALL,
 		MISSING_COLLAR, MISSING_COLLAR_WALL,
 		PRIDE_COLLAR, PRIDE_COLLAR_WALL,
 		TRANS_COLLAR, TRANS_COLLAR_WALL,

xplat/src/main/java/gay/ampflower/mod/pet/registry/PetworksBlocks.java

@@ -20,6 +20,9 @@ public final class PetworksBlocks {
 	COLLAR = register("collar", new CollarBlock(CollarMaterials.CLOTH)),
 		COLLAR_WALL = register("collar_wall", new WallCollarBlock(CollarMaterials.CLOTH)),
 
+	WORLDWIDEPIXEL_COLLAR = register("worldwidepixel_collar", new CollarBlock(CollarMaterials.CLOTH)),
+		WORLDWIDEPIXEL_COLLAR_WALL = register("worldwidepixel_collar_wall", new WallCollarBlock(CollarMaterials.CLOTH)),
+
 	MISSING_COLLAR = register("missing_collar", new CollarBlock(CollarMaterials.CLOTH)),
 		MISSING_COLLAR_WALL = register("missing_collar_wall", new WallCollarBlock(CollarMaterials.CLOTH)),
 

xplat/src/main/java/gay/ampflower/mod/pet/registry/PetworksItems.java

@@ -35,6 +35,8 @@ public final class PetworksItems {
 		PetworksBlocks.MAID_COLLAR, PetworksBlocks.MAID_COLLAR_WALL),
 		COLLAR = registerDyeableCollar("collar", CollarMaterials.CLOTH,
 			PetworksBlocks.COLLAR, PetworksBlocks.COLLAR_WALL),
+		WORLDWIDEPIXEL_COLLAR = registerCollar("worldwidepixel_collar", CollarMaterials.CLOTH,
+			PetworksBlocks.WORLDWIDEPIXEL_COLLAR, PetworksBlocks.WORLDWIDEPIXEL_COLLAR_WALL),
 		MISSING_COLLAR = registerCollar("missing_collar", CollarMaterials.CLOTH,
 			PetworksBlocks.MISSING_COLLAR, PetworksBlocks.MISSING_COLLAR_WALL),
 		PRIDE_COLLAR = registerCollar("pride_collar", CollarMaterials.CLOTH,

xplat/src/main/java/gay/ampflower/mod/pet/util/Pivot.java

@@ -60,6 +60,7 @@
 import static gay.ampflower.mod.pet.registry.PetworksItems.TAMED_CAT_GUISE;
 import static gay.ampflower.mod.pet.registry.PetworksItems.TRANS_COLLAR;
 import static gay.ampflower.mod.pet.registry.PetworksItems.WOLF_GUISE;
+import static gay.ampflower.mod.pet.registry.PetworksItems.WORLDWIDEPIXEL_COLLAR;
 
 /**
  * @author Ampflower
@@ -75,6 +76,7 @@ public interface Pivot {
 	static <A> void registerCollars(BiConsumer<Item, A> collarConsumer, A cosmetic, A armor, A gimick) {
 		collarConsumer.accept(MAID_COLLAR, cosmetic);
 		collarConsumer.accept(COLLAR, cosmetic);
+		collarConsumer.accept(WORLDWIDEPIXEL_COLLAR, cosmetic);
 		collarConsumer.accept(MISSING_COLLAR, cosmetic);
 		collarConsumer.accept(PRIDE_COLLAR, cosmetic);
 		collarConsumer.accept(TRANS_COLLAR, cosmetic);
@@ -115,6 +117,7 @@ static <A> void registerCollars(BiConsumer<Item, A> collarConsumer, A cosmetic,
 	static void registerCollars(Consumer<ItemConvertible> collarConsumer) {
 		collarConsumer.accept(MAID_COLLAR);
 		collarConsumer.accept(COLLAR);
+		collarConsumer.accept(WORLDWIDEPIXEL_COLLAR);
 		collarConsumer.accept(MISSING_COLLAR);
 		collarConsumer.accept(PRIDE_COLLAR);
 		collarConsumer.accept(TRANS_COLLAR);

xplat/src/main/resources/assets/petworks/lang/en_us.json

@@ -4,6 +4,8 @@
 	"block.petworks.cloth_collar": "Cloth Collar",
 	"block.petworks.collar": "Collar",
 
+	"block.petworks.worldwidepixel_collar": "WorldWideCollar",
+
 	"block.petworks.pride_collar": "Pride Collar",
 	"block.petworks.trans_collar": "Trans Collar",
 	"block.petworks.lesbian_collar": "Lesbian Collar",