Skip to content
This repository has been archived by the owner on Jun 3, 2020. It is now read-only.

Commit

Permalink
Hide placeholder entity marker types from filter
Browse files Browse the repository at this point in the history
  • Loading branch information
protolambda committed Dec 13, 2016
1 parent 239a5a9 commit 84fdfdc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public enum Entity implements NamedBitmapProviderHandle, NamedBitmapProvider {
SKELETON_WITHER(48, "Wither Skeleton", new String[]{ "Skeleton", "WitherSkeleton" }, "wither", 61),
GUARDIAN(49, "Guardian", new String[]{ "Guardian" }, "guardian", 87),
ELDER_GAURDIAN(50, "Elder Gaurdian", new String[]{ "ElderGaurdian" }, "elder-gaurdian", 88),
NPC(51, "Npc", new String[]{ "Npc" }, "npc", 100),
NPC(51, "NPC", new String[]{ "Npc" }, "npc", 100),
WITHER_BOSS(52, "Wither Boss", new String[]{ "WitherBoss" }, "blue-wither-skull", 72),
ENDER_DRAGON(53, "Ender Dragon", new String[]{ "EnderDragon" }, "ender-dragon", 29),
SHULKER(54, "Shulker", new String[]{ "Shulker" }, "shulker", 30),
Expand Down Expand Up @@ -111,6 +111,7 @@ public enum Entity implements NamedBitmapProviderHandle, NamedBitmapProvider {
MINECART_CHEST(98, "Storage Minecart", new String[]{ "MinecartChest" }, "minecart-chest", 35),
LINGERING_POTION(101, "Lingering potion", new String[]{ "LingeringPotion" }, "lingering-potion", 144),

//id 900+ is ignored for functions like map-filtering, these are placeholders for when the game adds more expected features.
MINECART_SPAWNER(900, "Minecart with Spawner", new String[]{ "MinecartSpawner" }, "minecart-with-spawner", 71),//99 ; MinecartSpawner is not yet in the game
MINECART_COMMAND_BLOCK(901, "Minecart with Command Block", new String[]{ "MinecartCommandBlock" }, "minecart-with-command-block", 78),//100 ; MinecartCommandBlock is not yet in the game
MINECART_FURNACE(902, "Powered Minecart", new String[]{ "MinecartFurnace" }, "minecart-furnace", 36),//101 ; MinecartFurnace is not yet in the game
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1437,7 +1437,9 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
static {
//entities are enabled by default
for (Entity v : Entity.values()) {
if(v.sheetPos < 0) continue;//skip things without a bitmap (dropped items etc.)
//skip things without a bitmap (dropped items etc.)
//skip entities with placeholder ids (900+)
if(v.sheetPos < 0 || v.id >= 900) continue;
markerFilter.put(v.getNamedBitmapProvider(),
new BitmapChoiceListAdapter.NamedBitmapChoice(v, true));
}
Expand Down

0 comments on commit 84fdfdc

Please sign in to comment.