fix: Some blocks dont use 'default' as the default blockstate

Author: bbfh-dev

bubblellaneous/unit/block.go

@@ -30,6 +30,13 @@ type Block struct {
 	hidden        bool
 }
 
+func (block Block) DefaultBlockstate() string {
+	if len(block.states.States) > 0 {
+		return block.states.States[0].Name
+	}
+	return "default"
+}
+
 func (block Block) WithBlockstates(match string, states ...field.BlockState) Block {
 	block.states = field.States{
 		Match:  match,

bubblellaneous/unit/interface.go

@@ -19,6 +19,7 @@ type Unit interface {
 	MinecraftBase() string
 	SetVariant(id string, material field.Material, count int, index int) Unit
 	Type() string
+	DefaultBlockstate() string
 	Compile(*lib.Tree, int) (int, bool)
 	Recipe() []field.RecipeEntry
 	SetRecipe([]field.RecipeEntry) Unit
@@ -87,16 +88,18 @@ func Compile(unit Unit, template code.Template, tree *lib.Tree, customModelData
 	if overwritten {
 		if unit.Material() != nil {
 			tree.MkItem(unit.Id(), fmt.Sprintf(
-				"bubblellaneous:%s/%s/%s/default",
+				"bubblellaneous:%s/%s/%s/%s",
 				unit.Type(),
 				unit.UnitId(),
 				unit.Material().Name,
+				unit.DefaultBlockstate(),
 			))
 		} else {
 			tree.MkItem(unit.Id(), fmt.Sprintf(
-				"bubblellaneous:%s/%s/default",
+				"bubblellaneous:%s/%s/%s",
 				unit.Type(),
 				unit.Id(),
+				unit.DefaultBlockstate(),
 			))
 		}
 

bubblellaneous/unit/item.go

@@ -25,6 +25,10 @@ type Item struct {
 	nbtCallback   func(nbt.TreeNBT) nbt.TreeNBT
 }
 
+func (item Item) DefaultBlockstate() string {
+	return "default"
+}
+
 func (item Item) WithFood(nutrition, saturation int, always bool, time float64, animation string) Item {
 	item.food = &field.Food{
 		Nutrition:    nutrition,