GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Merge branch 'server-inventory' of https://github.com/GeyserMC/Geyser into server-inventory

Browse source
This commit is contained in:
Camotoy 2021-01-04 20:30:19 -05:00
commit 1d47dc3f18
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
4 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
connector/src/main/java/org/geysermc/connector/network/translators/item/ItemEntry.java
View file

@ -34,7 +34,7 @@ import lombok.ToString;
@ToString @ToString
public class ItemEntry { public class ItemEntry {
public static ItemEntry AIR = new ItemEntry("minecraft:air", "minecraft:air", 0, 0, 0, false); public static ItemEntry AIR = new ItemEntry("minecraft:air", "minecraft:air", 0, 0, 0, false, 64);
private final String javaIdentifier; private final String javaIdentifier;
private final String bedrockIdentifier; private final String bedrockIdentifier;
@ -43,6 +43,7 @@ public class ItemEntry {
private final int bedrockData; private final int bedrockData;
private final boolean block; private final boolean block;
private final int stackSize;
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {

13
connector/src/main/java/org/geysermc/connector/network/translators/item/ItemRegistry.java
View file

@ -147,6 +147,8 @@ public class ItemRegistry {
if (bedrockIdentifier == null) { if (bedrockIdentifier == null) {
throw new RuntimeException("Missing Bedrock ID in mappings!: " + bedrockId); throw new RuntimeException("Missing Bedrock ID in mappings!: " + bedrockId);
} }
JsonNode stackSizeNode = entry.getValue().get("stack_size");
int stackSize = stackSizeNode == null ? 64 : stackSizeNode.intValue();
if (entry.getValue().has("tool_type")) { if (entry.getValue().has("tool_type")) {
if (entry.getValue().has("tool_tier")) { if (entry.getValue().has("tool_tier")) {
ITEM_ENTRIES.put(itemIndex, new ToolItemEntry( ITEM_ENTRIES.put(itemIndex, new ToolItemEntry(
@ -154,19 +156,22 @@ public class ItemRegistry {
entry.getValue().get("bedrock_data").intValue(), entry.getValue().get("bedrock_data").intValue(),
entry.getValue().get("tool_type").textValue(), entry.getValue().get("tool_type").textValue(),
entry.getValue().get("tool_tier").textValue(), entry.getValue().get("tool_tier").textValue(),
entry.getValue().get("is_block") != null && entry.getValue().get("is_block").booleanValue())); entry.getValue().get("is_block").booleanValue(),
stackSize));
} else { } else {
ITEM_ENTRIES.put(itemIndex, new ToolItemEntry( ITEM_ENTRIES.put(itemIndex, new ToolItemEntry(
entry.getKey(), bedrockIdentifier, itemIndex, bedrockId, entry.getKey(), bedrockIdentifier, itemIndex, bedrockId,
entry.getValue().get("bedrock_data").intValue(), entry.getValue().get("bedrock_data").intValue(),
entry.getValue().get("tool_type").textValue(), entry.getValue().get("tool_type").textValue(),
"", entry.getValue().get("is_block").booleanValue())); "", entry.getValue().get("is_block").booleanValue(),
stackSize));
} }
} else { } else {
ITEM_ENTRIES.put(itemIndex, new ItemEntry( ITEM_ENTRIES.put(itemIndex, new ItemEntry(
entry.getKey(), bedrockIdentifier, itemIndex, bedrockId, entry.getKey(), bedrockIdentifier, itemIndex, bedrockId,
entry.getValue().get("bedrock_data").intValue(), entry.getValue().get("bedrock_data").intValue(),
entry.getValue().get("is_block") != null && entry.getValue().get("is_block").booleanValue())); entry.getValue().get("is_block").booleanValue(),
stackSize));
} }
switch (entry.getKey()) { switch (entry.getKey()) {
case "minecraft:barrier": case "minecraft:barrier":
@ -209,7 +214,7 @@ public class ItemRegistry {
// Add the loadstone compass since it doesn't exist on java but we need it for item conversion // Add the loadstone compass since it doesn't exist on java but we need it for item conversion
ITEM_ENTRIES.put(itemIndex, new ItemEntry("minecraft:lodestone_compass", "minecraft:lodestone_compass", itemIndex, ITEM_ENTRIES.put(itemIndex, new ItemEntry("minecraft:lodestone_compass", "minecraft:lodestone_compass", itemIndex,
lodestoneCompassId, 0, false)); lodestoneCompassId, 0, false, 1));
/* Load creative items */ /* Load creative items */
stream = FileUtils.getResource("bedrock/creative_items.json"); stream = FileUtils.getResource("bedrock/creative_items.json");

4
connector/src/main/java/org/geysermc/connector/network/translators/item/ToolItemEntry.java
View file

@ -32,8 +32,8 @@ public class ToolItemEntry extends ItemEntry {
private final String toolType; private final String toolType;
private final String toolTier; private final String toolTier;
public ToolItemEntry(String javaIdentifier, String bedrockIdentifier, int javaId, int bedrockId, int bedrockData, String toolType, String toolTier, boolean isBlock) { public ToolItemEntry(String javaIdentifier, String bedrockIdentifier, int javaId, int bedrockId, int bedrockData, String toolType, String toolTier, boolean isBlock, int stackSize) {
super(javaIdentifier, bedrockIdentifier, javaId, bedrockId, bedrockData, isBlock); super(javaIdentifier, bedrockIdentifier, javaId, bedrockId, bedrockData, isBlock, stackSize);
this.toolType = toolType; this.toolType = toolType;
this.toolTier = toolTier; this.toolTier = toolTier;
} }

2
connector/src/main/resources/mappings

@ -1 +1 @@
Subproject commit 143285afb4bdf4d5ef40ef7a7959477dabf4d34c Subproject commit 62e39acaf3859da86189a76fff57b30c2403ef3d