VexoraDevelopment/legacy-version
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor item mapping to use dragonflyMapping parameter and remove deleteDebugStick references

Browse Source
This commit is contained in:
AkmalFairuz
2025-07-02 21:53:13 +07:00
parent 0abc5c3694
commit 9b6ddc51fd
16 changed files with 86 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mapping/item.go
View File

@@ -21,6 +21,7 @@ type Item interface {
Air() int32
ItemVersion() uint16
ItemEntries() []ItemEntry
SetItemRuntimeID(string, int32)
}
type ItemEntry struct {
@@ -48,14 +49,13 @@ type DefaultItemMapping struct {
itemVersion uint16
}
func NewItemMapping(requiredItemList []byte, itemVersion uint16, deleteDebugStick bool) *DefaultItemMapping {
func NewItemMapping(requiredItemList []byte, itemVersion uint16) *DefaultItemMapping {
itemRuntimeIDsToNames := make(map[int32]string)
itemNamesToRuntimeIDs := make(map[string]int32)
itemRuntimeIDToVersion := make(map[int32]uint8)
itemRuntimeIDToData := make(map[int32]map[string]any)
itemEntries := make([]ItemEntry, 0, 1600)
var airRID *int32
var debugStickRID *int32
var m map[string]struct {
RuntimeID int16 `json:"runtime_id"`
@@ -67,21 +67,6 @@ func NewItemMapping(requiredItemList []byte, itemVersion uint16, deleteDebugStic
panic(err)
}
if v, ok := m["minecraft:debug_stick"]; ok {
rid := int32(v.RuntimeID)
debugStickRID = &rid
}
if deleteDebugStick && debugStickRID != nil {
delete(m, "minecraft:debug_stick")
for name, data := range m {
if int32(data.RuntimeID) > *debugStickRID {
data.RuntimeID-- // Shift all runtime IDs down by 1
}
m[name] = data
}
}
for name, data := range m {
rid := int32(data.RuntimeID)
if name == "minecraft:air" {
@@ -121,6 +106,13 @@ func NewItemMapping(requiredItemList []byte, itemVersion uint16, deleteDebugStic
return &DefaultItemMapping{itemRuntimeIDsToNames: itemRuntimeIDsToNames, itemNamesToRuntimeIDs: itemNamesToRuntimeIDs, itemRuntimeIDToVersion: itemRuntimeIDToVersion, airRID: *airRID, itemVersion: itemVersion, itemRuntimeIDToData: itemRuntimeIDToData, itemEntries: itemEntries}
}
func (m *DefaultItemMapping) SetItemRuntimeID(name string, runtimeID int32) {
m.mu.Lock()
defer m.mu.Unlock()
m.itemNamesToRuntimeIDs[name] = runtimeID
m.itemRuntimeIDsToNames[runtimeID] = name
}
func (m *DefaultItemMapping) ItemRuntimeIDToName(runtimeID int32) (name string, found bool) {
defer m.mu.Unlock()
m.mu.Lock()