refactor: small changes, wiki links & resource pack links

DuckySoLucky · DuckySoLucky · commit a409e9a9fb53 · 2025-09-15T13:54:58.000+02:00
diff --git a/NotEnoughUpdates-REPO b/NotEnoughUpdates-REPO
@@ -1 +1 @@
-Subproject commit 62e9b85dad69a99c2ffef31cef9f795d80f24c6e
+Subproject commit 974b327ed9d0680be67ab2cce1df498e40cf7179
diff --git a/main.go b/main.go
@@ -13,7 +13,7 @@ import (
 
 func main() {
 	app := fiber.New(fiber.Config{
-		Prefork:                   false,  // Fork processes for max CPU utilization
+		Prefork:                   true,  // Fork processes for max CPU utilization
 		ServerHeader:              "",    // Remove server header for slight perf gain
 		DisableKeepalive:          false, // Keep connections alive
 		DisableDefaultDate:        true,  // Disable date header
diff --git a/src/NotEnoughUpdates/constants.go b/src/NotEnoughUpdates/constants.go
@@ -17,9 +17,11 @@ func GetItem(name string) (models.NEUItem, error) {
 	}
 
 	itemsPath := "NotEnoughUpdates-REPO/items"
+	/*
 	if _, err := os.Stat(itemsPath); os.IsNotExist(err) {
 		return models.NEUItem{}, fmt.Errorf("items directory does not exist: %w", err)
 	}
+	*/
 
 	itemPath := fmt.Sprintf("%s/%s.json", itemsPath, name)
 	data, err := os.ReadFile(itemPath)
diff --git a/src/constants/accessories.go b/src/constants/accessories.go
@@ -271,7 +271,7 @@ func GetAllAccessories() []Accessory {
 					Name:       item.Name,
 				}
 				output = append(output, specialAccessoryItem)
-				fmt.Printf("[ACCESSORIES] Added special accessory %s with rarity %s\n", specialAccessoryItem.SkyBlockID, specialAccessoryItem.Rarity)
+				// fmt.Printf("[ACCESSORIES] Added special accessory %s with rarity %s\n", specialAccessoryItem.SkyBlockID, specialAccessoryItem.Rarity)
 			}
 		}
 	}
diff --git a/src/models/items.go b/src/models/items.go
@@ -96,6 +96,7 @@ type DecodedInventory struct {
 type ProcessedItem struct {
 	Item
 	Texture        string          `json:"texture_path,omitempty"`
+	TexturePack    string          `json:"texture_pack,omitempty"`
 	DisplayName    string          `json:"display_name,omitempty"`
 	Lore           []string        `json:"lore,omitempty"`
 	Rarity         string          `json:"rarity,omitempty"`
@@ -106,6 +107,12 @@ type ProcessedItem struct {
 	Id             string          `json:"id,omitempty"`
 	IsInactive     *bool           `json:"isInactive,omitempty"`
 	Shiny          bool            `json:"shiny,omitempty"`
+	Wiki           *WikipediaLinks `json:"wiki,omitempty"`
+}
+
+type WikipediaLinks struct {
+	Official string `json:"official,omitempty"`
+	Fandom   string `json:"fandom,omitempty"`
 }
 
 type SkillToolsResult struct {
@@ -126,14 +133,16 @@ type EquipmentResult struct {
 }
 
 type StrippedItem struct {
-	DisplayName    string         `json:"display_name,omitempty"`
-	Lore           []string       `json:"lore,omitempty"`
-	Rarity         string         `json:"rarity,omitempty"`
-	Recombobulated bool           `json:"recombobulated,omitempty"`
-	ContainsItems  []StrippedItem `json:"containsItems,omitempty"`
-	Source         string         `json:"source,omitempty"`
-	Texture        string         `json:"texture_path,omitempty"`
-	IsInactive     *bool          `json:"isInactive,omitempty"`
-	Count          *int           `json:"Count,omitempty"`
-	Shiny          bool           `json:"shiny,omitempty"`
+	DisplayName    string          `json:"display_name,omitempty"`
+	Lore           []string        `json:"lore,omitempty"`
+	Rarity         string          `json:"rarity,omitempty"`
+	Recombobulated bool            `json:"recombobulated,omitempty"`
+	ContainsItems  []StrippedItem  `json:"containsItems,omitempty"`
+	Source         string          `json:"source,omitempty"`
+	Texture        string          `json:"texture_path,omitempty"`
+	IsInactive     *bool           `json:"isInactive,omitempty"`
+	Count          *int            `json:"Count,omitempty"`
+	Shiny          bool            `json:"shiny,omitempty"`
+	Wiki           *WikipediaLinks `json:"wiki,omitempty"`
+	TexturePack    string          `json:"texture_pack,omitempty"`
 }
diff --git a/src/routes.go b/src/routes.go
@@ -8,12 +8,9 @@ import (
 	"skycrypt/src/api"
 	redis "skycrypt/src/db"
 	"skycrypt/src/routes"
-	"time"
 
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/middleware/cache"
 	"github.com/gofiber/fiber/v2/middleware/compress"
-	"github.com/gofiber/fiber/v2/middleware/etag"
 	"github.com/joho/godotenv"
 )
 
@@ -78,11 +75,14 @@ func SetupRoutes(app *fiber.App) {
 
 	if os.Getenv("DEV") != "true" {
 		fmt.Println("[ENVIROMENT] Running in production mode")
-		app.Use(etag.New())
-		app.Use("/api", cache.New(cache.Config{
-			Expiration:   5 * time.Minute,
-			CacheControl: true,
-		}))
+
+		/*
+			app.Use(etag.New())
+			app.Use("/api", cache.New(cache.Config{
+				Expiration:   5 * time.Minute,
+				CacheControl: true,
+			})
+		*/
 	}
 
 	api := app.Group("/api")
diff --git a/src/routes/networth.go b/src/routes/networth.go
@@ -1,11 +1,17 @@
 package routes
 
 import (
+	"fmt"
+	"skycrypt/src/api"
+	"skycrypt/src/stats"
+	"time"
+
+	skyhelpernetworthgo "github.com/DuckySoLucky/SkyHelper-Networth-Go"
 	"github.com/gofiber/fiber/v2"
 )
 
 func NetworthHandler(c *fiber.Ctx) error {
-	/*timeNow := time.Now()
+	timeNow := time.Now()
 
 	uuid := c.Params("uuid")
 	profileId := c.Params("profileId")
@@ -67,8 +73,6 @@ func NetworthHandler(c *fiber.Ctx) error {
 			"normal":      networth,
 			"nonCosmetic": nonCosmeticNetworth,
 		},
-	})*/
-	return c.JSON(fiber.Map{
-		"networth": nil,
 	})
+
 }
diff --git a/src/stats/items/processing.go b/src/stats/items/processing.go
@@ -2,11 +2,13 @@ package stats
 
 import (
 	"fmt"
+	notenoughupdates "skycrypt/src/NotEnoughUpdates"
 	"skycrypt/src/constants"
 	"skycrypt/src/lib"
 	"skycrypt/src/models"
 	"skycrypt/src/utility"
 	"slices"
+	"strings"
 )
 
 func ProcessItems(items *[]models.Item, source string) []models.ProcessedItem {
@@ -129,6 +131,10 @@ func ProcessItem(item *models.Item, source string) models.ProcessedItem {
 		}
 
 		processedItem.Texture = lib.ApplyTexture(TextureItem)
+		if strings.HasPrefix(processedItem.Texture, "http://localhost:8080/assets/resourcepacks/FurfSky/") {
+			processedItem.TexturePack = "FURFSKY_REBORN"
+		}
+
 		if processedItem.Texture == "" {
 			fmt.Printf("[CUSTOM_RESOURCES] Found no textures for item: %s\n", item.Tag.ExtraAttributes.ID)
 		}
@@ -138,6 +144,28 @@ func ProcessItem(item *models.Item, source string) models.ProcessedItem {
 		processedItem.ContainsItems = ProcessItems(&item.ContainsItems, source)
 	}
 
+	if item.Tag.ExtraAttributes.ID != "" {
+		NEUItem, err := notenoughupdates.GetItem(item.Tag.ExtraAttributes.ID)
+		if err == nil && len(NEUItem.Wiki) > 0 {
+			processedItem.Wiki = &models.WikipediaLinks{}
+			if len(NEUItem.Wiki) == 1 {
+				if strings.HasPrefix(NEUItem.Wiki[0], "https://wiki.hypixel.net/") {
+					processedItem.Wiki.Official = NEUItem.Wiki[0]
+				} else {
+					processedItem.Wiki.Fandom = NEUItem.Wiki[0]
+				}
+			} else {
+				if strings.HasPrefix(NEUItem.Wiki[0], "https://wiki.hypixel.net/") {
+					processedItem.Wiki.Official = NEUItem.Wiki[0]
+					processedItem.Wiki.Fandom = NEUItem.Wiki[1]
+				} else {
+					processedItem.Wiki.Fandom = NEUItem.Wiki[0]
+					processedItem.Wiki.Official = NEUItem.Wiki[1]
+				}
+			}
+		}
+	}
+
 	// TODO: add cake bag & legacy backpack support
 
 	return processedItem
diff --git a/src/stats/items/stripping.go b/src/stats/items/stripping.go
@@ -44,6 +44,14 @@ func StripItem(item *models.ProcessedItem, search ...bool) *models.StrippedItem
 		output.Count = item.Count
 	}
 
+	if item.Wiki != nil {
+		output.Wiki = item.Wiki
+	}
+
+	if item.TexturePack != "" {
+		output.TexturePack = item.TexturePack
+	}
+
 	return output
 }
 

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,11 @@ func GetItem(name string) (models.NEUItem, error) {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`itemsPath := "NotEnoughUpdates-REPO/items"`
	`20`	`+ /*`
`20`	`21`	`if _, err := os.Stat(itemsPath); os.IsNotExist(err) {`
`21`	`22`	`return models.NEUItem{}, fmt.Errorf("items directory does not exist: %w", err)`
`22`	`23`	`}`
	`24`	`+ */`
`23`	`25`
`24`	`26`	`itemPath := fmt.Sprintf("%s/%s.json", itemsPath, name)`
`25`	`27`	`data, err := os.ReadFile(itemPath)`
Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ func GetAllAccessories() []Accessory {`
`271`	`271`	`Name: item.Name,`
`272`	`272`	`}`
`273`	`273`	`output = append(output, specialAccessoryItem)`
`274`		`- fmt.Printf("[ACCESSORIES] Added special accessory %s with rarity %s\n", specialAccessoryItem.SkyBlockID, specialAccessoryItem.Rarity)`
	`274`	`+ // fmt.Printf("[ACCESSORIES] Added special accessory %s with rarity %s\n", specialAccessoryItem.SkyBlockID, specialAccessoryItem.Rarity)`
`275`	`275`	`}`
`276`	`276`	`}`
`277`	`277`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,14 @@ func StripItem(item models.ProcessedItem, search ...bool) models.StrippedItem`
`44`	`44`	`output.Count = item.Count`
`45`	`45`	`}`
`46`	`46`
	`47`	`+ if item.Wiki != nil {`
	`48`	`+ output.Wiki = item.Wiki`
	`49`	`+ }`
	`50`	`+`
	`51`	`+ if item.TexturePack != "" {`
	`52`	`+ output.TexturePack = item.TexturePack`
	`53`	`+ }`
	`54`	`+`
`47`	`55`	`return output`
`48`	`56`	`}`
`49`	`57`