Refactor item mapping to use dragonflyMapping parameter and remove deleteDebugStick references
This commit is contained in:
@@ -4,22 +4,21 @@ import (
|
|||||||
"github.com/sandertv/gophertunnel/minecraft"
|
"github.com/sandertv/gophertunnel/minecraft"
|
||||||
)
|
)
|
||||||
|
|
||||||
// All returns a slice of all legacy protocol versions that are supported. deleteDebugStick
|
// All returns a slice of all legacy protocol versions that are supported. dragonflyMapping
|
||||||
// must be set to true if you're using Dragonfly. deleteDebugStick must be set to false if you're using
|
// must be set to true if you're using Dragonfly.
|
||||||
// PocketMine, Nukkit, or other server software that includes the debug stick in the item registry.
|
func All(dragonflyMapping bool) []minecraft.Protocol {
|
||||||
func All(deleteDebugStick bool) []minecraft.Protocol {
|
|
||||||
return []minecraft.Protocol{
|
return []minecraft.Protocol{
|
||||||
New800(deleteDebugStick),
|
New800(dragonflyMapping),
|
||||||
New786(deleteDebugStick),
|
New786(dragonflyMapping),
|
||||||
New776(deleteDebugStick),
|
New776(dragonflyMapping),
|
||||||
New766(deleteDebugStick),
|
New766(dragonflyMapping),
|
||||||
New748(deleteDebugStick),
|
New748(dragonflyMapping),
|
||||||
New729(deleteDebugStick),
|
New729(dragonflyMapping),
|
||||||
New712(deleteDebugStick),
|
New712(dragonflyMapping),
|
||||||
New686(deleteDebugStick),
|
New686(dragonflyMapping),
|
||||||
New685(deleteDebugStick),
|
New685(dragonflyMapping),
|
||||||
New671(deleteDebugStick),
|
New671(dragonflyMapping),
|
||||||
New662(deleteDebugStick),
|
New662(dragonflyMapping),
|
||||||
New649(deleteDebugStick),
|
New649(dragonflyMapping),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
legacyver/data/dragonfly_latest_vanilla_items.nbt
Normal file
BIN
legacyver/data/dragonfly_latest_vanilla_items.nbt
Normal file
Binary file not shown.
@@ -22,14 +22,14 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// New649 ...
|
// New649 ...
|
||||||
func New649(deleteDebugStick bool) *Protocol {
|
func New649(dragonflyMapping bool) *Protocol {
|
||||||
itemMapping := mapping.NewItemMapping(requiredItemList649, ItemVersion649, deleteDebugStick)
|
itemMapping := mapping.NewItemMapping(requiredItemList649, ItemVersion649)
|
||||||
blockMapping := mapping.NewBlockMapping(blockStateData649)
|
blockMapping := mapping.NewBlockMapping(blockStateData649)
|
||||||
|
|
||||||
return &Protocol{
|
return &Protocol{
|
||||||
ver: "1.20.60",
|
ver: "1.20.60",
|
||||||
id: proto.ID649,
|
id: proto.ID649,
|
||||||
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion649), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion649), false),
|
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion649), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion649), false),
|
||||||
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(deleteDebugStick), blockMapping, blockMappingLatest),
|
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(dragonflyMapping), blockMapping, blockMappingLatest),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,14 +22,14 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// New662 ...
|
// New662 ...
|
||||||
func New662(deleteDebugStick bool) *Protocol {
|
func New662(dragonflyMapping bool) *Protocol {
|
||||||
itemMapping := mapping.NewItemMapping(requiredItemList662, ItemVersion662, deleteDebugStick)
|
itemMapping := mapping.NewItemMapping(requiredItemList662, ItemVersion662)
|
||||||
blockMapping := mapping.NewBlockMapping(blockStateData662)
|
blockMapping := mapping.NewBlockMapping(blockStateData662)
|
||||||
|
|
||||||
return &Protocol{
|
return &Protocol{
|
||||||
ver: "1.20.70",
|
ver: "1.20.70",
|
||||||
id: proto.ID662,
|
id: proto.ID662,
|
||||||
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion662), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion662), false),
|
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion662), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion662), false),
|
||||||
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(deleteDebugStick), blockMapping, blockMappingLatest),
|
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(dragonflyMapping), blockMapping, blockMappingLatest),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,14 +22,14 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// New671 ...
|
// New671 ...
|
||||||
func New671(deleteDebugStick bool) *Protocol {
|
func New671(dragonflyMapping bool) *Protocol {
|
||||||
itemMapping := mapping.NewItemMapping(requiredItemList671, ItemVersion671, deleteDebugStick)
|
itemMapping := mapping.NewItemMapping(requiredItemList671, ItemVersion671)
|
||||||
blockMapping := mapping.NewBlockMapping(blockStateData671)
|
blockMapping := mapping.NewBlockMapping(blockStateData671)
|
||||||
|
|
||||||
return &Protocol{
|
return &Protocol{
|
||||||
ver: "1.20.80",
|
ver: "1.20.80",
|
||||||
id: proto.ID671,
|
id: proto.ID671,
|
||||||
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion671), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion671), false),
|
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion671), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion671), false),
|
||||||
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(deleteDebugStick), blockMapping, blockMappingLatest),
|
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(dragonflyMapping), blockMapping, blockMappingLatest),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,14 +15,14 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// New685 uses same data as 686
|
// New685 uses same data as 686
|
||||||
func New685(deleteDebugStick bool) *Protocol {
|
func New685(dragonflyMapping bool) *Protocol {
|
||||||
itemMapping := mapping.NewItemMapping(requiredItemList686, ItemVersion685, deleteDebugStick)
|
itemMapping := mapping.NewItemMapping(requiredItemList686, ItemVersion685)
|
||||||
blockMapping := mapping.NewBlockMapping(blockStateData686)
|
blockMapping := mapping.NewBlockMapping(blockStateData686)
|
||||||
|
|
||||||
return &Protocol{
|
return &Protocol{
|
||||||
ver: "1.21.0",
|
ver: "1.21.0",
|
||||||
id: proto.ID685,
|
id: proto.ID685,
|
||||||
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion685), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion685), false),
|
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion685), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion685), false),
|
||||||
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(deleteDebugStick), blockMapping, blockMappingLatest),
|
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(dragonflyMapping), blockMapping, blockMappingLatest),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,14 +21,14 @@ var (
|
|||||||
blockStateData686 []byte
|
blockStateData686 []byte
|
||||||
)
|
)
|
||||||
|
|
||||||
func New686(deleteDebugStick bool) *Protocol {
|
func New686(dragonflyMapping bool) *Protocol {
|
||||||
itemMapping := mapping.NewItemMapping(requiredItemList686, ItemVersion686, deleteDebugStick)
|
itemMapping := mapping.NewItemMapping(requiredItemList686, ItemVersion686)
|
||||||
blockMapping := mapping.NewBlockMapping(blockStateData686)
|
blockMapping := mapping.NewBlockMapping(blockStateData686)
|
||||||
|
|
||||||
return &Protocol{
|
return &Protocol{
|
||||||
ver: "1.21.2",
|
ver: "1.21.2",
|
||||||
id: proto.ID686,
|
id: proto.ID686,
|
||||||
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion686), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion686), false),
|
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion686), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion686), false),
|
||||||
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(deleteDebugStick), blockMapping, blockMappingLatest),
|
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(dragonflyMapping), blockMapping, blockMappingLatest),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,14 +21,14 @@ var (
|
|||||||
blockStateData712 []byte
|
blockStateData712 []byte
|
||||||
)
|
)
|
||||||
|
|
||||||
func New712(deleteDebugStick bool) *Protocol {
|
func New712(dragonflyMapping bool) *Protocol {
|
||||||
itemMapping := mapping.NewItemMapping(requiredItemList712, ItemVersion712, deleteDebugStick)
|
itemMapping := mapping.NewItemMapping(requiredItemList712, ItemVersion712)
|
||||||
blockMapping := mapping.NewBlockMapping(blockStateData712)
|
blockMapping := mapping.NewBlockMapping(blockStateData712)
|
||||||
|
|
||||||
return &Protocol{
|
return &Protocol{
|
||||||
ver: "1.21.20",
|
ver: "1.21.20",
|
||||||
id: proto.ID712,
|
id: proto.ID712,
|
||||||
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion712), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion712), false),
|
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion712), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion712), false),
|
||||||
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(deleteDebugStick), blockMapping, blockMappingLatest),
|
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(dragonflyMapping), blockMapping, blockMappingLatest),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,14 +21,14 @@ var (
|
|||||||
blockStateData729 []byte
|
blockStateData729 []byte
|
||||||
)
|
)
|
||||||
|
|
||||||
func New729(deleteDebugStick bool) *Protocol {
|
func New729(dragonflyMapping bool) *Protocol {
|
||||||
itemMapping := mapping.NewItemMapping(requiredItemList729, ItemVersion729, deleteDebugStick)
|
itemMapping := mapping.NewItemMapping(requiredItemList729, ItemVersion729)
|
||||||
blockMapping := mapping.NewBlockMapping(blockStateData729)
|
blockMapping := mapping.NewBlockMapping(blockStateData729)
|
||||||
|
|
||||||
return &Protocol{
|
return &Protocol{
|
||||||
ver: "1.21.30",
|
ver: "1.21.30",
|
||||||
id: proto.ID729,
|
id: proto.ID729,
|
||||||
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion729), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion729), false),
|
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion729), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion729), false),
|
||||||
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(deleteDebugStick), blockMapping, blockMappingLatest),
|
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(dragonflyMapping), blockMapping, blockMappingLatest),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,14 +21,14 @@ var (
|
|||||||
blockStateData748 []byte
|
blockStateData748 []byte
|
||||||
)
|
)
|
||||||
|
|
||||||
func New748(deleteDebugStick bool) *Protocol {
|
func New748(dragonflyMapping bool) *Protocol {
|
||||||
itemMapping := mapping.NewItemMapping(requiredItemList748, ItemVersion748, deleteDebugStick)
|
itemMapping := mapping.NewItemMapping(requiredItemList748, ItemVersion748)
|
||||||
blockMapping := mapping.NewBlockMapping(blockStateData748)
|
blockMapping := mapping.NewBlockMapping(blockStateData748)
|
||||||
|
|
||||||
return &Protocol{
|
return &Protocol{
|
||||||
ver: "1.21.40",
|
ver: "1.21.40",
|
||||||
id: proto.ID748,
|
id: proto.ID748,
|
||||||
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion748), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion748), false),
|
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion748), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion748), false),
|
||||||
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(deleteDebugStick), blockMapping, blockMappingLatest),
|
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(dragonflyMapping), blockMapping, blockMappingLatest),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,13 +21,13 @@ var (
|
|||||||
blockStateData766 []byte
|
blockStateData766 []byte
|
||||||
)
|
)
|
||||||
|
|
||||||
func New766(deleteDebugStick bool) *Protocol {
|
func New766(dragonflyMapping bool) *Protocol {
|
||||||
itemMapping := mapping.NewItemMapping(requiredItemList766, ItemVersion766, deleteDebugStick)
|
itemMapping := mapping.NewItemMapping(requiredItemList766, ItemVersion766)
|
||||||
blockMapping := mapping.NewBlockMapping(blockStateData766)
|
blockMapping := mapping.NewBlockMapping(blockStateData766)
|
||||||
return &Protocol{
|
return &Protocol{
|
||||||
ver: "1.21.50",
|
ver: "1.21.50",
|
||||||
id: proto.ID766,
|
id: proto.ID766,
|
||||||
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion766), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion766), false),
|
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion766), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion766), false),
|
||||||
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(deleteDebugStick), blockMapping, blockMappingLatest),
|
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(dragonflyMapping), blockMapping, blockMappingLatest),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,14 +21,14 @@ var (
|
|||||||
blockStateData776 []byte
|
blockStateData776 []byte
|
||||||
)
|
)
|
||||||
|
|
||||||
func New776(deleteDebugStick bool) *Protocol {
|
func New776(dragonflyMapping bool) *Protocol {
|
||||||
itemMapping := mapping.NewItemMapping(requiredItemList776, ItemVersion776, deleteDebugStick)
|
itemMapping := mapping.NewItemMapping(requiredItemList776, ItemVersion776)
|
||||||
blockMapping := mapping.NewBlockMapping(blockStateData776)
|
blockMapping := mapping.NewBlockMapping(blockStateData776)
|
||||||
|
|
||||||
return &Protocol{
|
return &Protocol{
|
||||||
ver: "1.21.60",
|
ver: "1.21.60",
|
||||||
id: proto.ID776,
|
id: proto.ID776,
|
||||||
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion776), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion776), false),
|
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion776), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion776), false),
|
||||||
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(deleteDebugStick), blockMapping, blockMappingLatest),
|
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(dragonflyMapping), blockMapping, blockMappingLatest),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,13 +21,13 @@ var (
|
|||||||
blockStateData786 []byte
|
blockStateData786 []byte
|
||||||
)
|
)
|
||||||
|
|
||||||
func New786(deleteDebugStick bool) *Protocol {
|
func New786(dragonflyMapping bool) *Protocol {
|
||||||
itemMapping786 := mapping.NewItemMapping(requiredItemList786, ItemVersion786, deleteDebugStick)
|
itemMapping786 := mapping.NewItemMapping(requiredItemList786, ItemVersion786)
|
||||||
blockMapping786 := mapping.NewBlockMapping(blockStateData786)
|
blockMapping786 := mapping.NewBlockMapping(blockStateData786)
|
||||||
return &Protocol{
|
return &Protocol{
|
||||||
ver: "1.21.70",
|
ver: "1.21.70",
|
||||||
id: proto.ID786,
|
id: proto.ID786,
|
||||||
blockTranslator: NewBlockTranslator(blockMapping786, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping786, BlockVersion786), chunk.NewBlockPaletteEncoding(blockMapping786, BlockVersion786), false),
|
blockTranslator: NewBlockTranslator(blockMapping786, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping786, BlockVersion786), chunk.NewBlockPaletteEncoding(blockMapping786, BlockVersion786), false),
|
||||||
itemTranslator: NewItemTranslator(itemMapping786, itemMappingLatest(deleteDebugStick), blockMapping786, blockMappingLatest),
|
itemTranslator: NewItemTranslator(itemMapping786, itemMappingLatest(dragonflyMapping), blockMapping786, blockMappingLatest),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,13 +21,13 @@ var (
|
|||||||
blockStateData800 []byte
|
blockStateData800 []byte
|
||||||
)
|
)
|
||||||
|
|
||||||
func New800(deleteDebugStick bool) *Protocol {
|
func New800(dragonflyMapping bool) *Protocol {
|
||||||
itemMapping := mapping.NewItemMapping(requiredItemList800, ItemVersion800, deleteDebugStick)
|
itemMapping := mapping.NewItemMapping(requiredItemList800, ItemVersion800)
|
||||||
blockMapping := mapping.NewBlockMapping(blockStateData800)
|
blockMapping := mapping.NewBlockMapping(blockStateData800)
|
||||||
return &Protocol{
|
return &Protocol{
|
||||||
ver: "1.21.80",
|
ver: "1.21.80",
|
||||||
id: proto.ID800,
|
id: proto.ID800,
|
||||||
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion800), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion800), false),
|
blockTranslator: NewBlockTranslator(blockMapping, blockMappingLatest, chunk.NewNetworkPersistentEncoding(blockMapping, BlockVersion800), chunk.NewBlockPaletteEncoding(blockMapping, BlockVersion800), false),
|
||||||
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(deleteDebugStick), blockMapping, blockMappingLatest),
|
itemTranslator: NewItemTranslator(itemMapping, itemMappingLatest(dragonflyMapping), blockMapping, blockMappingLatest),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package legacyver
|
|||||||
import (
|
import (
|
||||||
_ "embed"
|
_ "embed"
|
||||||
"github.com/akmalfairuz/legacy-version/mapping"
|
"github.com/akmalfairuz/legacy-version/mapping"
|
||||||
|
"github.com/sandertv/gophertunnel/minecraft/nbt"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -17,15 +18,33 @@ var (
|
|||||||
requiredItemList818 []byte
|
requiredItemList818 []byte
|
||||||
//go:embed data/block_states_818.nbt
|
//go:embed data/block_states_818.nbt
|
||||||
blockStateData818 []byte
|
blockStateData818 []byte
|
||||||
|
//go:embed data/dragonfly_latest_vanilla_items.nbt
|
||||||
|
dragonflyLatestVanillaItemsRaw []byte
|
||||||
|
|
||||||
itemMappingLatestWithDebugStick = mapping.NewItemMapping(requiredItemList818, ItemVersion818, false)
|
itemMappingLatestPocketMine = mapping.NewItemMapping(requiredItemList818, ItemVersion818)
|
||||||
itemMappingLatestWithoutDebugStick = mapping.NewItemMapping(requiredItemList818, ItemVersion818, true)
|
itemMappingLatestDragonfly = mapping.NewItemMapping(requiredItemList818, ItemVersion818)
|
||||||
blockMappingLatest = mapping.NewBlockMapping(blockStateData818)
|
blockMappingLatest = mapping.NewBlockMapping(blockStateData818)
|
||||||
)
|
)
|
||||||
|
|
||||||
func itemMappingLatest(deleteDebugStick bool) mapping.Item {
|
func init() {
|
||||||
if deleteDebugStick {
|
var m map[string]struct {
|
||||||
return itemMappingLatestWithoutDebugStick
|
RuntimeID int32 `nbt:"runtime_id"`
|
||||||
|
ComponentBased bool `nbt:"component_based"`
|
||||||
|
Version int32 `nbt:"version"`
|
||||||
|
Data map[string]any `nbt:"data,omitempty"`
|
||||||
}
|
}
|
||||||
return itemMappingLatestWithDebugStick
|
if err := nbt.Unmarshal(dragonflyLatestVanillaItemsRaw, &m); err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for identifier, v := range m {
|
||||||
|
itemMappingLatestDragonfly.SetItemRuntimeID(identifier, v.RuntimeID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func itemMappingLatest(dragonflyMapping bool) mapping.Item {
|
||||||
|
if dragonflyMapping {
|
||||||
|
return itemMappingLatestDragonfly
|
||||||
|
}
|
||||||
|
return itemMappingLatestPocketMine
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ type Item interface {
|
|||||||
Air() int32
|
Air() int32
|
||||||
ItemVersion() uint16
|
ItemVersion() uint16
|
||||||
ItemEntries() []ItemEntry
|
ItemEntries() []ItemEntry
|
||||||
|
SetItemRuntimeID(string, int32)
|
||||||
}
|
}
|
||||||
|
|
||||||
type ItemEntry struct {
|
type ItemEntry struct {
|
||||||
@@ -48,14 +49,13 @@ type DefaultItemMapping struct {
|
|||||||
itemVersion uint16
|
itemVersion uint16
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewItemMapping(requiredItemList []byte, itemVersion uint16, deleteDebugStick bool) *DefaultItemMapping {
|
func NewItemMapping(requiredItemList []byte, itemVersion uint16) *DefaultItemMapping {
|
||||||
itemRuntimeIDsToNames := make(map[int32]string)
|
itemRuntimeIDsToNames := make(map[int32]string)
|
||||||
itemNamesToRuntimeIDs := make(map[string]int32)
|
itemNamesToRuntimeIDs := make(map[string]int32)
|
||||||
itemRuntimeIDToVersion := make(map[int32]uint8)
|
itemRuntimeIDToVersion := make(map[int32]uint8)
|
||||||
itemRuntimeIDToData := make(map[int32]map[string]any)
|
itemRuntimeIDToData := make(map[int32]map[string]any)
|
||||||
itemEntries := make([]ItemEntry, 0, 1600)
|
itemEntries := make([]ItemEntry, 0, 1600)
|
||||||
var airRID *int32
|
var airRID *int32
|
||||||
var debugStickRID *int32
|
|
||||||
|
|
||||||
var m map[string]struct {
|
var m map[string]struct {
|
||||||
RuntimeID int16 `json:"runtime_id"`
|
RuntimeID int16 `json:"runtime_id"`
|
||||||
@@ -67,21 +67,6 @@ func NewItemMapping(requiredItemList []byte, itemVersion uint16, deleteDebugStic
|
|||||||
panic(err)
|
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 {
|
for name, data := range m {
|
||||||
rid := int32(data.RuntimeID)
|
rid := int32(data.RuntimeID)
|
||||||
if name == "minecraft:air" {
|
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}
|
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) {
|
func (m *DefaultItemMapping) ItemRuntimeIDToName(runtimeID int32) (name string, found bool) {
|
||||||
defer m.mu.Unlock()
|
defer m.mu.Unlock()
|
||||||
m.mu.Lock()
|
m.mu.Lock()
|
||||||
|
|||||||
Reference in New Issue
Block a user