Skip to content
This repository was archived by the owner on Apr 7, 2023. It is now read-only.

Commit 2004a4f

Browse files
BlackoutburstBlackoutburst
committed
Finished gun saves
1 parent f0760f8 commit 2004a4f

File tree

6 files changed

+37
-33
lines changed

6 files changed

+37
-33
lines changed

‎src/blackout/menu/ColorMenu.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,22 @@ public static void getValue(int slot, Player p, boolean open) {
4747
QuakePlayer qp = QuakePlayer.getFromPlayer(p);
4848

4949
switch (slot) {
50-
case 11: qp.getGunProfile().setColor(Color.BLACK); if (open) CustomMenu.open(p); break;
51-
case 12: qp.getGunProfile().setColor(Color.RED); if (open) CustomMenu.open(p); break;
52-
case 13: qp.getGunProfile().setColor(Color.GREEN); if (open) CustomMenu.open(p); break;
53-
case 14: qp.getGunProfile().setColor(Color.MAROON); if (open) CustomMenu.open(p); break;
54-
case 15: qp.getGunProfile().setColor(Color.NAVY); if (open) CustomMenu.open(p); break;
55-
case 20: qp.getGunProfile().setColor(Color.PURPLE); if (open) CustomMenu.open(p); break;
56-
case 21: qp.getGunProfile().setColor(Color.BLUE); if (open) CustomMenu.open(p); break;
57-
case 22: qp.getGunProfile().setColor(Color.SILVER); if (open) CustomMenu.open(p); break;
58-
case 23: qp.getGunProfile().setColor(Color.GRAY); if (open) CustomMenu.open(p); break;
59-
case 24: qp.getGunProfile().setColor(Color.fromRGB(255, 130, 197)); if (open) CustomMenu.open(p); break;
60-
case 29: qp.getGunProfile().setColor(Color.LIME); if (open) CustomMenu.open(p); break;
61-
case 30: qp.getGunProfile().setColor(Color.YELLOW); if (open) CustomMenu.open(p); break;
62-
case 31: qp.getGunProfile().setColor(Color.AQUA); if (open) CustomMenu.open(p); break;
63-
case 32: qp.getGunProfile().setColor(Color.FUCHSIA); if (open) CustomMenu.open(p); break;
64-
case 33: qp.getGunProfile().setColor(Color.ORANGE); if (open) CustomMenu.open(p); break;
65-
case 40: qp.getGunProfile().setColor(Color.WHITE); if (open) CustomMenu.open(p); break;
50+
case 11: qp.getGunProfile().setColor(Color.BLACK); qp.savePlayerData("color", slot); if (open) CustomMenu.open(p); break;
51+
case 12: qp.getGunProfile().setColor(Color.RED); qp.savePlayerData("color", slot); if (open) CustomMenu.open(p); break;
52+
case 13: qp.getGunProfile().setColor(Color.GREEN); qp.savePlayerData("color", slot); if (open) CustomMenu.open(p); break;
53+
case 14: qp.getGunProfile().setColor(Color.fromRGB(89, 69, 13)); qp.savePlayerData("color", slot); if (open) CustomMenu.open(p); break;
54+
case 15: qp.getGunProfile().setColor(Color.NAVY); qp.savePlayerData("color", slot); if (open) CustomMenu.open(p); break;
55+
case 20: qp.getGunProfile().setColor(Color.PURPLE); qp.savePlayerData("color", slot); if (open) CustomMenu.open(p); break;
56+
case 21: qp.getGunProfile().setColor(Color.fromRGB(66, 135, 245)); qp.savePlayerData("color", slot); if (open) CustomMenu.open(p); break;
57+
case 22: qp.getGunProfile().setColor(Color.SILVER); qp.savePlayerData("color", slot); if (open) CustomMenu.open(p); break;
58+
case 23: qp.getGunProfile().setColor(Color.GRAY); qp.savePlayerData("color", slot); if (open) CustomMenu.open(p); break;
59+
case 24: qp.getGunProfile().setColor(Color.fromRGB(255, 130, 197)); qp.savePlayerData("color", slot); if (open) CustomMenu.open(p); break;
60+
case 29: qp.getGunProfile().setColor(Color.LIME); qp.savePlayerData("color", slot); if (open) CustomMenu.open(p); break;
61+
case 30: qp.getGunProfile().setColor(Color.YELLOW); qp.savePlayerData("color", slot); if (open) CustomMenu.open(p); break;
62+
case 31: qp.getGunProfile().setColor(Color.AQUA); qp.savePlayerData("color", slot); if (open) CustomMenu.open(p); break;
63+
case 32: qp.getGunProfile().setColor(Color.FUCHSIA); qp.savePlayerData("color", slot); if (open) CustomMenu.open(p); break;
64+
case 33: qp.getGunProfile().setColor(Color.ORANGE); qp.savePlayerData("color", slot); if (open) CustomMenu.open(p); break;
65+
case 40: qp.getGunProfile().setColor(Color.WHITE); qp.savePlayerData("color", slot); if (open) CustomMenu.open(p); break;
6666
default: return;
6767
}
6868
}

‎src/blackout/menu/CustomMenu.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ private static byte getExplosionColor(GunProfile gp) {
4545
if (gp.getColor().equals(Color.BLACK)) return (0);
4646
if (gp.getColor().equals(Color.RED)) return (1);
4747
if (gp.getColor().equals(Color.GREEN)) return (2);
48-
if (gp.getColor().equals(Color.MAROON)) return (3);
48+
if (gp.getColor().equals(Color.fromRGB(89, 69, 13))) return (3);
4949
if (gp.getColor().equals(Color.NAVY)) return (4);
5050
if (gp.getColor().equals(Color.PURPLE)) return (5);
51-
if (gp.getColor().equals(Color.BLUE)) return (6);
51+
if (gp.getColor().equals(Color.fromRGB(66, 135, 245))) return (6);
5252
if (gp.getColor().equals(Color.SILVER)) return (7);
5353
if (gp.getColor().equals(Color.GRAY)) return (8);
5454
if (gp.getColor().equals(Color.fromRGB(255, 130, 197))) return (9);

‎src/blackout/menu/GunMenu.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,16 @@ public static void getValue(int slot, Player p, boolean open) {
126126
QuakePlayer qp = QuakePlayer.getFromPlayer(p);
127127

128128
switch (slot) {
129-
case 11: qp.getGunProfile().setGun(Material.WOOD_HOE).setSuperior(false); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
130-
case 12: qp.getGunProfile().setGun(Material.STONE_HOE).setSuperior(false); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
131-
case 13: qp.getGunProfile().setGun(Material.IRON_HOE).setSuperior(false); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
132-
case 14: qp.getGunProfile().setGun(Material.GOLD_HOE).setSuperior(false); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
133-
case 15: qp.getGunProfile().setGun(Material.DIAMOND_HOE).setSuperior(false); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
134-
case 20: qp.getGunProfile().setGun(Material.WOOD_HOE).setSuperior(true); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
135-
case 21: qp.getGunProfile().setGun(Material.STONE_HOE).setSuperior(true); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
136-
case 22: qp.getGunProfile().setGun(Material.IRON_HOE).setSuperior(true); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
137-
case 23: qp.getGunProfile().setGun(Material.GOLD_HOE).setSuperior(true); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
138-
case 24: qp.getGunProfile().setGun(Material.DIAMOND_HOE).setSuperior(true); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
129+
case 11: qp.getGunProfile().setGun(Material.WOOD_HOE).setSuperior(false).setName("§bWood gun"); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
130+
case 12: qp.getGunProfile().setGun(Material.STONE_HOE).setSuperior(false).setName("§bStone gun"); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
131+
case 13: qp.getGunProfile().setGun(Material.IRON_HOE).setSuperior(false).setName("§bIron gun"); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
132+
case 14: qp.getGunProfile().setGun(Material.GOLD_HOE).setSuperior(false).setName("§bGold gun"); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
133+
case 15: qp.getGunProfile().setGun(Material.DIAMOND_HOE).setSuperior(false).setName("§bDiamond gun"); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
134+
case 20: qp.getGunProfile().setGun(Material.WOOD_HOE).setSuperior(true).setName("§6Superior wood gun"); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
135+
case 21: qp.getGunProfile().setGun(Material.STONE_HOE).setSuperior(true).setName("§6Superior stone gun"); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
136+
case 22: qp.getGunProfile().setGun(Material.IRON_HOE).setSuperior(true).setName("§6Superior iron gun"); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
137+
case 23: qp.getGunProfile().setGun(Material.GOLD_HOE).setSuperior(true).setName("§6Superior gold gun"); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
138+
case 24: qp.getGunProfile().setGun(Material.DIAMOND_HOE).setSuperior(true).setName("§6Superior diamond gun"); qp.savePlayerData("gun", slot); if (open) CustomMenu.open(p); break;
139139
default: return;
140140
}
141141
}

‎src/blackout/quake/core/Core.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public static void startGame() {
3030

3131

3232
for (QuakePlayer p : Main.players) {
33-
ItemStack gun = new ItemStack(Material.IRON_HOE);
33+
ItemStack gun = new ItemStack(p.getGunProfile().getGun());
3434
ItemMeta gunMeta = gun.getItemMeta();
3535

3636
gunMeta.setDisplayName(p.getGunProfile().getName());

‎src/blackout/quake/core/QuakePlayer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,10 @@ public void savePlayerData(String field, int data) {
128128
}
129129

130130
public void readPlayerData() {
131-
YamlConfiguration playerData = YamlConfiguration.loadConfiguration(new File("./plugins/HitW/player data/"+this.player.getUniqueId().toString().replace("-", "")+".yml"));
131+
YamlConfiguration playerData = YamlConfiguration.loadConfiguration(new File("./plugins/Quake/player data/"+this.player.getUniqueId().toString().replace("-", "")+".yml"));
132132

133133
GunMenu.getValue(playerData.getInt("gun"), this.player, false);
134-
ColorMenu.getValue(playerData.getInt("color"), this.player, false);
135134
ShapeMenu.getValue(playerData.getInt("shape"), this.player, false);
135+
ColorMenu.getValue(playerData.getInt("color"), this.player, false);
136136
}
137137
}

‎src/blackout/quake/main/Main.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,14 @@ public void onPlayerJoin(PlayerJoinEvent event) {
7272
if (new File("./plugins/Quake/player data/"+event.getPlayer().getUniqueId().toString().replace("-", "")+".yml").exists()) {
7373
QuakePlayer qp = new QuakePlayer(event.getPlayer(), gunProfile);
7474

75-
qp.readPlayerData();
7675
players.add(qp);
76+
qp.readPlayerData();
7777
} else {
78-
players.add(new QuakePlayer(event.getPlayer(), gunProfile));
78+
QuakePlayer qp = new QuakePlayer(event.getPlayer(), gunProfile);
79+
qp.savePlayerData("gun", 11);
80+
qp.savePlayerData("shape", 11);
81+
qp.savePlayerData("color", 31);
82+
players.add(qp);
7983
}
8084

8185
ScoreboardManager.init(event.getPlayer());

0 commit comments

Comments
 (0)