Skip to content

Commit

Permalink
feat: add Flower Head Band Outfit
Browse files Browse the repository at this point in the history
  • Loading branch information
iGoodie committed Jan 13, 2025
1 parent a7b8af3 commit 8561154
Show file tree
Hide file tree
Showing 9 changed files with 106 additions and 80 deletions.
1 change: 1 addition & 0 deletions bbmodel/outfit/flower_head_band.bbmodel
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"meta":{"format_version":"4.10","model_format":"modded_entity","box_uv":true},"name":"flower_head_band","model_identifier":"","modded_entity_entity_class":"","modded_entity_version":"1.17_yarn","modded_entity_flip_y":true,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"timeline_setups":[],"unhandled_root_fields":{},"resolution":{"width":32,"height":32},"elements":[{"name":"Helmet","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[-4,24,-4],"to":[4,32,4],"autouv":0,"color":0,"inflate":0.75,"origin":[0,0,0],"faces":{"north":{"uv":[8,8,16,16],"texture":0},"east":{"uv":[0,8,8,16],"texture":0},"south":{"uv":[24,8,32,16],"texture":0},"west":{"uv":[16,8,24,16],"texture":0},"up":{"uv":[16,8,8,0],"texture":0},"down":{"uv":[24,0,16,8],"texture":0}},"type":"cube","uuid":"869c915b-2d66-c57b-ce53-b8ab2da713b5"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[3,33,-1],"to":[5,34,1],"autouv":0,"color":0,"rotation":[0,0,-35],"origin":[4,32,0],"uv_offset":[0,24],"faces":{"north":{"uv":[2,26,4,27],"texture":0},"east":{"uv":[0,26,2,27],"texture":0},"south":{"uv":[6,26,8,27],"texture":0},"west":{"uv":[4,26,6,27],"texture":0},"up":{"uv":[4,26,2,24],"texture":0},"down":{"uv":[6,24,4,26],"texture":0}},"type":"cube","uuid":"d095a07a-b8fc-6a72-1c98-c0f85d1637a5"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[4,32,-2],"to":[8,33,2],"autouv":0,"color":0,"rotation":[0,0,-35],"origin":[4,32,0],"uv_offset":[0,16],"faces":{"north":{"uv":[4,20,8,21],"texture":0},"east":{"uv":[0,20,4,21],"texture":0},"south":{"uv":[12,20,16,21],"texture":0},"west":{"uv":[8,20,12,21],"texture":0},"up":{"uv":[8,20,4,16],"texture":0},"down":{"uv":[12,16,8,20],"texture":0}},"type":"cube","uuid":"93840a9f-0735-8817-2c0b-2858af92d9ed"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[0,32,-2],"to":[4,33,2],"autouv":0,"color":0,"rotation":[0,0,-35],"origin":[4,32,0],"uv_offset":[16,16],"faces":{"north":{"uv":[20,20,24,21],"texture":0},"east":{"uv":[16,20,20,21],"texture":0},"south":{"uv":[28,20,32,21],"texture":0},"west":{"uv":[24,20,28,21],"texture":0},"up":{"uv":[24,20,20,16],"texture":0},"down":{"uv":[28,16,24,20],"texture":0}},"type":"cube","uuid":"e3963615-902a-ad7d-8f51-0e1ad19e59ed"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[2,32,2],"to":[6,33,4],"autouv":0,"color":0,"rotation":[0,0,-35],"origin":[4,32,0],"uv_offset":[0,21],"faces":{"north":{"uv":[2,23,6,24],"texture":0},"east":{"uv":[0,23,2,24],"texture":0},"south":{"uv":[8,23,12,24],"texture":0},"west":{"uv":[6,23,8,24],"texture":0},"up":{"uv":[6,23,2,21],"texture":0},"down":{"uv":[10,21,6,23],"texture":0}},"type":"cube","uuid":"0fa4cf41-ce63-2654-b375-9861350f82da"},{"name":"cube","box_uv":true,"rescale":false,"locked":false,"light_emission":0,"render_order":"default","allow_mirror_modeling":true,"from":[2,32,-4],"to":[6,33,-2],"autouv":0,"color":0,"rotation":[0,0,-35],"origin":[4,32,0],"uv_offset":[12,21],"faces":{"north":{"uv":[14,23,18,24],"texture":0},"east":{"uv":[12,23,14,24],"texture":0},"south":{"uv":[20,23,24,24],"texture":0},"west":{"uv":[18,23,20,24],"texture":0},"up":{"uv":[18,23,14,21],"texture":0},"down":{"uv":[22,21,18,23],"texture":0}},"type":"cube","uuid":"0d5edee9-c738-23ed-98ec-c45769deb025"}],"outliner":[{"name":"head","origin":[0,24,0],"color":0,"uuid":"535d6cbf-24af-cc58-6b1e-ba836ee0eb87","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["869c915b-2d66-c57b-ce53-b8ab2da713b5","d095a07a-b8fc-6a72-1c98-c0f85d1637a5","93840a9f-0735-8817-2c0b-2858af92d9ed","e3963615-902a-ad7d-8f51-0e1ad19e59ed","0fa4cf41-ce63-2654-b375-9861350f82da","0d5edee9-c738-23ed-98ec-c45769deb025"]}],"textures":[{"path":"E:\\IntelliJ IDEA Workspace\\@AbesHutt\\StarAcademyMod\\common\\src\\main\\resources\\assets\\academy\\textures\\entity\\outfit\\flower_head_band.png","name":"flower_head_band.png","folder":"block","namespace":"","id":"0","group":"","width":32,"height":32,"uv_width":32,"uv_height":32,"particle":false,"use_as_default":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"386feb9f-8175-bc2c-e641-aa43314d3330","relative_path":"../../common/src/main/resources/assets/academy/textures/entity/outfit/flower_head_band.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAVxJREFUWEdjZBhgwEjI/l9Xcv+z6UwmqI6QObjkCRq8u8Xuv2vNIYLqaOYAcg0mVh9RPkvZ4v1fTlmW4dHdx2BzQWwYqNOcQZQZZEcBSCPIAegWg/ggB83x2UpbBwx4IiQ2LslVBw8+SlO7bZPmf3UjJZKjBCP+YPFNatyC9N08d4/hcN11ktIEVgeQYxDVHEBuUIL0gdIBxSFArkHk6sOIAnINojgXkGsApfpISrGUWoZNP4YD/pyw+f+Px5CB6ct5hv17mBgcXf6h6GOxOILX0aDyBKQHZga6pej6MQwDFb24LAcZRsgBIA/AHI7NEYPfAXSPApCFtEhcxJoJTwMwn4M0gtIAocQDSysgdcTENcEGCakGkupgnA6gdRQQyjXwKHCyVPz/6OlbuEPvPPpEl0IKbomKHN9/OWlhBpgj6OYAkMX4UiytHcI44A4gNr/SSh1dEho+x486AAA1pNYg/xYV2wAAAABJRU5ErkJggg=="}]}
12 changes: 6 additions & 6 deletions common/src/main/java/abeshutt/staracademy/init/ModOutfits.java
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ public class ModOutfits {
public static SweaterOutfit.Top SWEATER_TOP;
public static SweaterOutfit.Boots SWEATER_BOOTS;

public static CarrotHeadBandOutfit CARROT_HEAD_BAND;

public static CatEarsOutfit CAT_EARS;
public static HeadBandOutfit.Carrot CARROT_HEAD_BAND;
public static HeadBandOutfit.Flower FLOWER_HEAD_BAND;
public static HeadBandOutfit.CatEars CAT_EARS;

public static void register() {
CLASSY1_HAT = register(new Classy1Outfit.Hat("classy1_hat"));
Expand Down Expand Up @@ -115,9 +115,9 @@ public static void register() {
SWEATER_TOP = register(new SweaterOutfit.Top("sweater_top"));
SWEATER_BOOTS = register(new SweaterOutfit.Boots("sweater_boots"));

CARROT_HEAD_BAND = register(new CarrotHeadBandOutfit("carrot_head_band"));

CAT_EARS = register(new CatEarsOutfit("cat_ears"));
CARROT_HEAD_BAND = register(new HeadBandOutfit.Carrot("carrot_head_band"));
FLOWER_HEAD_BAND = register(new HeadBandOutfit.Flower("flower_head_band"));
CAT_EARS = register(new HeadBandOutfit.CatEars("cat_ears"));
}

private static int order;
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
package abeshutt.staracademy.outfit.models;

import abeshutt.staracademy.StarAcademyMod;
import abeshutt.staracademy.outfit.core.OutfitPiece;
import abeshutt.staracademy.outfit.core.OutfitTexture;
import net.minecraft.client.model.Dilation;
import net.minecraft.client.model.ModelPartBuilder;
import net.minecraft.client.model.ModelPartData;
import net.minecraft.client.model.ModelTransform;

public class HeadBandOutfit {

public static class Carrot extends OutfitPiece {

public Carrot(String id) {
super(id);
}

@Override
protected void buildMesh(ModelPartData modelPartData) {
ModelPartData head = modelPartData.addChild("head", ModelPartBuilder.create().uv(0, 0).cuboid(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new Dilation(0.75F)), ModelTransform.pivot(0.0F, 0.0F, 0.0F));

ModelPartData cube_r1 = head.addChild("cube_r1", ModelPartBuilder.create().uv(0, 24).cuboid(-4.0F, 0.0F, -4.0F, 8.0F, 0.0F, 8.0F, new Dilation(0.0F)), ModelTransform.of(4.391F, -12.5615F, -1.25F, -1.5708F, 0.0F, -0.3927F));

ModelPartData cube_r2 = head.addChild("cube_r2", ModelPartBuilder.create().uv(0, 16).cuboid(4.0F, 0.0F, -4.0F, 8.0F, 0.0F, 8.0F, new Dilation(0.0F))
.uv(32, 0).cuboid(-6.0F, -0.5F, -0.5F, 2.0F, 1.0F, 1.0F, new Dilation(0.0F))
.uv(0, 32).cuboid(-4.0F, -1.0F, -1.0F, 8.0F, 2.0F, 2.0F, new Dilation(0.0F)), ModelTransform.of(-3.0F, -9.5F, -1.25F, 0.0F, 0.0F, -0.3927F));
}

@Override
protected OutfitTexture buildTexture() {
return new OutfitTexture(64, 64,
StarAcademyMod.id("textures/entity/outfit/carrot_head_band.png"),
StarAcademyMod.mid("outfit/carrot_head_band", "inventory")
);
}

}

public static class CatEars extends OutfitPiece {

public CatEars(String id) {
super(id);
}

@Override
protected void buildMesh(ModelPartData modelPartData) {
ModelPartData head = modelPartData.addChild("head", ModelPartBuilder.create().uv(0, 0).cuboid(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new Dilation(0.75F))
.uv(0, 16).cuboid(-3.0F, -11.75F, -3.0F, 2.0F, 3.0F, 1.0F, new Dilation(0.0F))
.uv(6, 16).cuboid(1.0F, -11.75F, -3.0F, 2.0F, 3.0F, 1.0F, new Dilation(0.0F))
.uv(16, 16).cuboid(3.0F, -10.75F, -3.0F, 1.0F, 2.0F, 1.0F, new Dilation(0.0F))
.uv(12, 16).cuboid(-4.0F, -10.75F, -3.0F, 1.0F, 2.0F, 1.0F, new Dilation(0.0F)), ModelTransform.pivot(0.0F, 0.0F, 0.0F));
}

@Override
protected OutfitTexture buildTexture() {
return new OutfitTexture(32, 32,
StarAcademyMod.id("textures/entity/outfit/cat_ears.png"),
StarAcademyMod.mid("outfit/cat_ears", "inventory")
);
}

}

public static class Flower extends OutfitPiece {

public Flower(String id) {
super(id);
}

@Override
protected void buildMesh(ModelPartData modelPartData) {
ModelPartData head = modelPartData.addChild("head", ModelPartBuilder.create().uv(0, 0).cuboid(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new Dilation(0.75F)), ModelTransform.pivot(0.0F, 0.0F, 0.0F));

ModelPartData cube_r1 = head.addChild("cube_r1", ModelPartBuilder.create().uv(12, 21).cuboid(-2.0F, -1.0F, -4.0F, 4.0F, 1.0F, 2.0F, new Dilation(0.0F))
.uv(0, 21).cuboid(-2.0F, -1.0F, 2.0F, 4.0F, 1.0F, 2.0F, new Dilation(0.0F))
.uv(16, 16).cuboid(0.0F, -1.0F, -2.0F, 4.0F, 1.0F, 4.0F, new Dilation(0.0F))
.uv(0, 16).cuboid(-4.0F, -1.0F, -2.0F, 4.0F, 1.0F, 4.0F, new Dilation(0.0F))
.uv(0, 24).cuboid(-1.0F, -2.0F, -1.0F, 2.0F, 1.0F, 2.0F, new Dilation(0.0F)), ModelTransform.of(-4.0F, -8.0F, 0.0F, 0.0F, 0.0F, -0.6109F));
}

@Override
protected OutfitTexture buildTexture() {
return new OutfitTexture(32, 32,
StarAcademyMod.id("textures/entity/outfit/flower_head_band.png"),
StarAcademyMod.mid("outfit/flower_head_band", "inventory")
);
}

}

}
1 change: 1 addition & 0 deletions common/src/main/resources/assets/academy/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"item.academy.outfit.sweater_top": "Sweater Top",
"item.academy.outfit.sweater_boots": "Sweater Boots",
"item.academy.outfit.carrot_head_band": "Carrot Head Band",
"item.academy.outfit.flower_head_band": "Flower Head Band",
"item.academy.outfit.cat_ears": "Cat Ears",
"cobblemon.ui.starter.choosebutton.same": "I don't choose you!",
"entity.academy.partner_npc": "Partner NPC",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "academy:item/outfit/flower_head_band"
}
}
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 8561154

Please sign in to comment.