CPU/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Update mappings to use new submodule

Browse source
This commit is contained in:
RednedEpic 2019-11-29 20:34:51 -06:00
parent f4a88bb4e1
commit c91e8e1958
5 changed files with 6 additions and 48598 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "connector/src/main/resources/mappings"]
path = connector/src/main/resources/mappings
url = https://github.com/GeyserMC/mappings.git

4
connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
View file

@ -71,7 +71,7 @@ public class Toolbox {
ITEMS.add(new StartGamePacket.ItemEntry((String) entry.get("name"), (short) ((int) entry.get("id")))); ITEMS.add(new StartGamePacket.ItemEntry((String) entry.get("name"), (short) ((int) entry.get("id"))));
} }
InputStream itemStream = Toolbox.class.getClassLoader().getResourceAsStream("items.json"); InputStream itemStream = Toolbox.class.getClassLoader().getResourceAsStream("mappings/items.json");
ObjectMapper itemMapper = new ObjectMapper(); ObjectMapper itemMapper = new ObjectMapper();
Map<String, Map<String, Object>> items = new HashMap<>(); Map<String, Map<String, Object>> items = new HashMap<>();
@ -87,7 +87,7 @@ public class Toolbox {
itemIndex++; itemIndex++;
} }
InputStream blockStream = Toolbox.class.getClassLoader().getResourceAsStream("blocks.json"); InputStream blockStream = Toolbox.class.getClassLoader().getResourceAsStream("mappings/blocks.json");
ObjectMapper blockMapper = new ObjectMapper(); ObjectMapper blockMapper = new ObjectMapper();
Map<String, Map<String, Object>> blocks = new HashMap<>(); Map<String, Map<String, Object>> blocks = new HashMap<>();

45086
connector/src/main/resources/blocks.json
View file

File diff suppressed because it is too large Load diff

3510
connector/src/main/resources/items.json
View file

File diff suppressed because it is too large Load diff

1
connector/src/main/resources/mappings Submodule

@ -0,0 +1 @@
Subproject commit 5ec6f1f339506129514de59d0e09e9b2c612e8be