Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
mod.name=Additional
mod.id=additional
mod.version=3.0.3
mod.version=3.0.4

minecraft.version=1.8.9
loom.platform=forge
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/me/waffles/additional/Additional.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import me.waffles.additional.mixin.EntityLivingBaseAccessor;
import me.waffles.additional.util.Bedwars;
import me.waffles.additional.util.Duels;
import me.waffles.additional.playerData.Bedwars;
import me.waffles.additional.playerData.Duels;
import me.waffles.additional.util.EldestRemovalMap;
import me.waffles.additional.util.PlayerProfile;
import me.waffles.additional.playerData.PlayerProfile;

@Mod(modid = Additional.MODID, name = Additional.NAME, version = Additional.VERSION)
public class Additional {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import cc.polyfrost.oneconfig.utils.commands.annotations.Main;
import com.mojang.authlib.GameProfile;
import me.waffles.additional.Additional;
import me.waffles.additional.util.Bedwars;
import me.waffles.additional.playerData.Bedwars;
import me.waffles.additional.util.HypixelAPIUtils;
import me.waffles.additional.util.PlayerProfile;
import me.waffles.additional.playerData.PlayerProfile;
import net.minecraft.client.Minecraft;

import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import com.mojang.authlib.GameProfile;
import me.waffles.additional.Additional;
import me.waffles.additional.util.HypixelAPIUtils;
import me.waffles.additional.util.Duels;
import me.waffles.additional.util.PlayerProfile;
import me.waffles.additional.playerData.Duels;
import me.waffles.additional.playerData.PlayerProfile;
import net.minecraft.client.Minecraft;

import java.util.NavigableMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.waffles.additional.util;
package me.waffles.additional.playerData;

public class Bedwars {
private final int Bedwarsstar;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.waffles.additional.util;
package me.waffles.additional.playerData;

public class Duels {
private final int Duelswins;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.waffles.additional.util;
package me.waffles.additional.playerData;

public class PlayerProfile {
private final String displayName, rank, guildTag;
Expand Down
19 changes: 11 additions & 8 deletions src/main/java/me/waffles/additional/util/HypixelAPIUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import me.waffles.additional.command.DuelsStatsCommand;
import me.waffles.additional.playerData.Bedwars;
import me.waffles.additional.playerData.Duels;
import me.waffles.additional.playerData.PlayerProfile;

import java.io.BufferedReader;
import java.io.InputStreamReader;
Expand Down Expand Up @@ -91,14 +94,14 @@ public static PlayerProfile parsePlayerProfilePlayerData(String json, String gui
: null;

if(tag != null) {
if(tag.contains("✧")) tag = tag.replaceAll("✧", "✧");
if(tag.contains("Î")) tag = tag.replaceAll("Î", "Θ");
if(tag.contains("✌")) tag = tag.replaceAll("✌", "✌");
if(tag.contains("â?¤")) tag = tag.replaceAll("â?¤", "❤");
if(tag.contains("✿")) tag = tag.replaceAll("✿", "✿");
if(tag.contains("✪")) tag = tag.replaceAll("✪", "✪");
if(tag.contains("➊")) tag = tag.replaceAll("➊", "➊");
if(tag.contains("✖")) tag = tag.replaceAll("✖", "✖");
tag = tag.replaceAll("✧", "✧")
.replaceAll("Θ", "Θ")
.replaceAll("✌", "✌")
.replaceAll("â?¤", "❤")
.replaceAll("✿", "✿")
.replaceAll("✪", "✪")
.replaceAll("➊", "➊")
.replaceAll("✖", "✖");
}

String tagColor = guildObject.has("tagColor")
Expand Down