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 18:16:13 -05:00
commit 06706da4cf
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,18 +103,17 @@ public class ItemMapRenderer extends MapRenderer
if (owningClan.getName().equals("Shops")) if (owningClan.getName().equals("Shops"))
{ {
clanColor = Color.WHITE; clanColor = Color.WHITE;
if (relation == ClansUtility.ClanRelation.SAFE)
clanColor2 = Color.CYAN; clanColor2 = Color.CYAN;
} }
else if (owningClan.getName().equals("Spawn")) else if (owningClan.getName().equals("Spawn"))
{ {
clanColor = Color.WHITE; clanColor = Color.WHITE;
clanColor2 = Color.GREEN;
} }
if (owningClan.getName().equals("Fields")) if (owningClan.getName().equals("Fields"))
{ {
clanColor = Color.WHITE; clanColor = Color.WHITE;
clanColor2 = Color.ORANGE; clanColor2 = Color.RED;
} }
else else
{ {
@ -151,11 +150,6 @@ public class ItemMapRenderer extends MapRenderer
int chunkX1 = (int) Math.floor(blockX / 16D); int chunkX1 = (int) Math.floor(blockX / 16D);
int chunkZ1 = (int) Math.floor(blockZ / 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 //Inside
if (colorAll || if (colorAll ||
@ -178,6 +172,16 @@ public class ItemMapRenderer extends MapRenderer
{ {
Color cColor = MapPalette.getColor(color); Color cColor = MapPalette.getColor(color);
double clans = colorAll ? 1 : 0.8;// 0.65; double clans = colorAll ? 1 : 0.8;// 0.65;
//Stripes
boolean checker = (mapX + (mapZ % 3)) % 3 == 0;
Color drawColor = clanColor;
if (checker && clanColor2 != null)
{
drawColor = clanColor2;
clans = 0.65;
}
double base = 1 - clans; double base = 1 - clans;
int r = (int) ((cColor.getRed() * base) + (drawColor.getRed() * clans)); int r = (int) ((cColor.getRed() * base) + (drawColor.getRed() * clans));
@ -192,6 +196,14 @@ public class ItemMapRenderer extends MapRenderer
Color cColor = MapPalette.getColor(color); Color cColor = MapPalette.getColor(color);
double clans = 0.65;// 0.4; double clans = 0.65;// 0.4;
//Use clanColor2 no matter what for admins
Color drawColor = clanColor;
if (owningClan.isAdmin() && clanColor2 != null)
{
drawColor = clanColor2;
}
double base = 1 - clans; double base = 1 - clans;
int r = (int) ((cColor.getRed() * base) + (drawColor.getRed() * clans)); int r = (int) ((cColor.getRed() * base) + (drawColor.getRed() * clans));