OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-03-19 13:38:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove old custom item options

Browse source
This commit is contained in:
Eclipse 2024-11-30 10:12:34 +00:00
parent 8bbad9ddcd
commit 7eeb5bbc90
No known key found for this signature in database
GPG key ID: 95E6998F82EC938A
4 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator.java
View file

@ -147,7 +147,7 @@ public class CustomItemRegistryPopulator {
.toolType(customItemData.toolType()) .toolType(customItemData.toolType())
.toolTier(customItemData.toolTier()) .toolTier(customItemData.toolTier())
.translationString(customItemData.translationString()) .translationString(customItemData.translationString())
.customItemOptions(Collections.emptyList()) .customItemDefinitions(Collections.emptyList())
.javaItem(item) .javaItem(item)
.build(); .build();

2
core/src/main/java/org/geysermc/geyser/registry/populator/CustomItemRegistryPopulator_v2.java
View file

@ -181,7 +181,7 @@ public class CustomItemRegistryPopulator_v2 {
} }
} }
componentBuilder.putCompound("minecraft:display_name", NbtMap.builder().putString("value", definition.displayName()).build()); // TODO componentBuilder.putCompound("minecraft:display_name", NbtMap.builder().putString("value", definition.displayName()).build());
// Add a Geyser tag to the item, allowing Molang queries // Add a Geyser tag to the item, allowing Molang queries
addItemTag(componentBuilder, "geyser:is_custom"); addItemTag(componentBuilder, "geyser:is_custom");

7
core/src/main/java/org/geysermc/geyser/registry/populator/ItemRegistryPopulator.java
View file

@ -55,7 +55,6 @@ import org.cloudburstmc.protocol.bedrock.data.definitions.ItemDefinition;
import org.cloudburstmc.protocol.bedrock.data.definitions.SimpleItemDefinition; import org.cloudburstmc.protocol.bedrock.data.definitions.SimpleItemDefinition;
import org.cloudburstmc.protocol.bedrock.data.inventory.ComponentItemData; import org.cloudburstmc.protocol.bedrock.data.inventory.ComponentItemData;
import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData; import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
import org.geysermc.geyser.Constants;
import org.geysermc.geyser.GeyserBootstrap; import org.geysermc.geyser.GeyserBootstrap;
import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.api.block.custom.CustomBlockData; import org.geysermc.geyser.api.block.custom.CustomBlockData;
@ -498,7 +497,6 @@ public class ItemRegistryPopulator {
customItemDefinitions = Collections.emptyList(); customItemDefinitions = Collections.emptyList();
} }
mappingBuilder.customItemDefinitions(customItemDefinitions); mappingBuilder.customItemDefinitions(customItemDefinitions);
mappingBuilder.customItemOptions(Collections.emptyList());
ItemMapping mapping = mappingBuilder.build(); ItemMapping mapping = mappingBuilder.build();
@ -525,7 +523,6 @@ public class ItemRegistryPopulator {
.bedrockDefinition(lightBlock) .bedrockDefinition(lightBlock)
.bedrockData(0) .bedrockData(0)
.bedrockBlockDefinition(null) .bedrockBlockDefinition(null)
.customItemOptions(Collections.emptyList())
.customItemDefinitions(Collections.emptyList()) .customItemDefinitions(Collections.emptyList())
.build(); .build();
lightBlocks.put(lightBlock.getRuntimeId(), lightBlockEntry); lightBlocks.put(lightBlock.getRuntimeId(), lightBlockEntry);
@ -543,7 +540,6 @@ public class ItemRegistryPopulator {
.bedrockDefinition(lodestoneCompass) .bedrockDefinition(lodestoneCompass)
.bedrockData(0) .bedrockData(0)
.bedrockBlockDefinition(null) .bedrockBlockDefinition(null)
.customItemOptions(Collections.emptyList())
.customItemDefinitions(Collections.emptyList()) .customItemDefinitions(Collections.emptyList())
.build(); .build();
@ -559,8 +555,7 @@ public class ItemRegistryPopulator {
.bedrockDefinition(definition) .bedrockDefinition(definition)
.bedrockData(0) .bedrockData(0)
.bedrockBlockDefinition(null) .bedrockBlockDefinition(null)
.customItemOptions(Collections.emptyList()) // TODO check for custom items with furnace minecart .customItemDefinitions(Collections.emptyList()) // TODO check for custom items with furnace minecart
.customItemDefinitions(Collections.emptyList()) // TODO do not remove the above todo
.build()); .build());
creativeItems.add(ItemData.builder() creativeItems.add(ItemData.builder()

5
core/src/main/java/org/geysermc/geyser/registry/type/ItemMapping.java
View file

@ -55,7 +55,6 @@ public class ItemMapping {
null, null,
null, null,
Collections.emptyList(), Collections.emptyList(),
Collections.emptyList(),
Items.AIR Items.AIR
); );
@ -74,10 +73,6 @@ public class ItemMapping {
String translationString; String translationString;
@Deprecated
@NonNull
List<Pair<CustomItemOptions, ItemDefinition>> customItemOptions; // TODO remove
@NonNull @NonNull
List<Pair<CustomItemDefinition, ItemDefinition>> customItemDefinitions; List<Pair<CustomItemDefinition, ItemDefinition>> customItemDefinitions;