JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Shaun Bennett 2015-11-29 17:59:39 -05:00
commit 1c71efbff7
1 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/map/ItemMapRenderer.java
View File

@ -86,7 +86,8 @@ public class ItemMapRenderer extends MapRenderer
{
boolean colorAll = scale > 0;
Color clanColor = null;
Color clanColor2 = null;
if (owningClan == clan)
{
clanColor = Color.CYAN;
@ -94,18 +95,30 @@ public class ItemMapRenderer extends MapRenderer
else
{
ClansUtility.ClanRelation relation = _manager.getClansUtility().rel(clan, owningClan);
if (owningClan.isAdmin())
{
colorAll = false;
if (owningClan.getName().equals("Shops") || owningClan.getName().equals("Spawn"))
if (owningClan.getName().equals("Shops"))
{
clanColor = Color.WHITE;
if (relation == ClansUtility.ClanRelation.SAFE)
clanColor2 = Color.CYAN;
}
else if (owningClan.getName().equals("Spawn"))
{
clanColor = Color.WHITE;
}
if (owningClan.getName().equals("Fields"))
{
clanColor = Color.WHITE;
clanColor2 = Color.ORANGE;
}
else
{
clanColor = Color.GRAY;
clanColor = Color.LIGHT_GRAY;
}
}
else if (relation == ClansUtility.ClanRelation.WAR_LOSING)
@ -138,34 +151,42 @@ public class ItemMapRenderer extends MapRenderer
int chunkX1 = (int) Math.floor(blockX / 16D);
int chunkZ1 = (int) Math.floor(blockZ / 16D);
//Checkin'
boolean checker = (mapX + (mapZ % 3)) % 3 == 0;
Color drawColor = clanColor;
if (checker && clanColor2 == null)
drawColor = clanColor2;
//Inside
if (colorAll ||
((chunkBX == 0 || zoom == 13) &&
owningClan != _manager.getClansUtility().getOwner("world," + (chunkX1 - 1) + "," + chunkZ1))
|| ((chunkBZ == 0 || zoom == 13) &&
owningClan != _manager.getClansUtility().getOwner("world," + chunkX1 + "," + (chunkZ1 - 1)))
|| ((chunkBX + zoom > 15 || zoom == 13) &&
owningClan != _manager.getClansUtility().getOwner("world," + (chunkX1 + 1) + "," + chunkZ1))
|| ((chunkBZ + zoom > 15 || zoom == 13) &&
owningClan != _manager.getClansUtility().getOwner("world," + chunkX1 + "," + (chunkZ1 + 1))))
((chunkBX == 0 || zoom == 13) &&
owningClan != _manager.getClansUtility().getOwner("world," + (chunkX1 - 1) + "," + chunkZ1))
|| ((chunkBZ == 0 || zoom == 13) &&
owningClan != _manager.getClansUtility().getOwner("world," + chunkX1 + "," + (chunkZ1 - 1)))
|| ((chunkBX + zoom > 15 || zoom == 13) &&
owningClan != _manager.getClansUtility().getOwner("world," + (chunkX1 + 1) + "," + chunkZ1))
|| ((chunkBZ + zoom > 15 || zoom == 13) &&
owningClan != _manager.getClansUtility().getOwner("world," + chunkX1 + "," + (chunkZ1 + 1))))
{
Color cColor = MapPalette.getColor(color);
double clans = colorAll ? 1 : 0.8;// 0.65;
double base = 1 - clans;
int r = (int) ((cColor.getRed() * base) + (clanColor.getRed() * clans));
int b = (int) ((cColor.getBlue() * base) + (clanColor.getBlue() * clans));
int g = (int) ((cColor.getGreen() * base) + (clanColor.getGreen() * clans));
int r = (int) ((cColor.getRed() * base) + (drawColor.getRed() * clans));
int b = (int) ((cColor.getBlue() * base) + (drawColor.getBlue() * clans));
int g = (int) ((cColor.getGreen() * base) + (drawColor.getGreen() * clans));
color = MapPalette.matchColor(r, g, b);
}
//Border
else
{
Color cColor = MapPalette.getColor(color);
@ -173,9 +194,9 @@ public class ItemMapRenderer extends MapRenderer
double clans = 0.65;// 0.4;
double base = 1 - clans;
int r = (int) ((cColor.getRed() * base) + (clanColor.getRed() * clans));
int b = (int) ((cColor.getBlue() * base) + (clanColor.getBlue() * clans));
int g = (int) ((cColor.getGreen() * base) + (clanColor.getGreen() * clans));
int r = (int) ((cColor.getRed() * base) + (drawColor.getRed() * clans));
int b = (int) ((cColor.getBlue() * base) + (drawColor.getBlue() * clans));
int g = (int) ((cColor.getGreen() * base) + (drawColor.getGreen() * clans));
color = MapPalette.matchColor(r, g, b);
}