Skip to content

Commit 04936ec

Browse files
5HT25HT2
committed
Rename version variables to make more sense
1 parent a7aace7 commit 04936ec

7 files changed

Lines changed: 17 additions & 19 deletions

File tree

‎scripts/ver.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ CUR_BETA="$(cat ./scripts/curBeta)"
88
CUR_RELEASE="$(cat ./scripts/curRelease)"
99

1010
sed -i "s/modVersion=.*/modVersion=${CUR_VER:1}$CUR_BETA/" gradle.properties
11-
sed -i "s/MODVER = \".*\";/MODVER = \"$CUR_VER$CUR_BETA\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
12-
sed -i "s/MODVERSMALL = \".*\";/MODVERSMALL = \"$CUR_VER$CUR_BETA\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
13-
sed -i "s/MODVERBROAD = \".*\";/MODVERBROAD = \"$CUR_RELEASE\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
11+
sed -i "s/VER_FULL_BETA = \".*\";/VER_FULL_BETA = \"$CUR_VER$CUR_BETA\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
12+
sed -i "s/VER_SMALL = \".*\";/VER_SMALL = \"$CUR_VER$CUR_BETA\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
13+
sed -i "s/VER_STABLE = \".*\";/VER_STABLE = \"$CUR_RELEASE\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
1414
sed -i "s/\"version\": \".*\",/\"version\": \"${CUR_VER:1}$CUR_BETA\",/" src/main/resources/mcmod.info
1515

‎src/main/java/me/zeroeightsix/kami/KamiMod.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@
6464
@Mod(
6565
modid = KamiMod.MODID,
6666
name = KamiMod.MODNAME,
67-
version = KamiMod.MODVER
67+
version = KamiMod.VER_FULL_BETA
6868
)
6969
public class KamiMod {
7070

7171
public static final String MODNAME = "KAMI Blue";
7272
public static final String MODID = "kamiblue";
73-
public static final String MODVER = "v1.1.7-beta"; // this is changed to v1.x.x-commit for debugging during travis releases
74-
public static final String MODVERSMALL = "v1.1.7-beta"; // shown to the user
75-
public static final String MODVERBROAD = "v1.1.6"; // used for update checking
73+
public static final String VER_FULL_BETA = "v1.1.7-beta"; // this is changed to v1.x.x-commit for debugging by automatic builds
74+
public static final String VER_SMALL = "v1.1.7-beta"; // shown to the user, unchanged
75+
public static final String VER_STABLE = "v1.1.6"; // used for update checking
7676

7777
public static final String APP_ID = "638403216278683661";
7878

@@ -127,13 +127,13 @@ public void preInit(FMLPreInitializationEvent event) {
127127
public void postInit(FMLPostInitializationEvent event) {
128128
setCustomIcons();
129129
if (MODULE_MANAGER.getModuleT(CommandConfig.class).customTitle.getValue()) {
130-
Display.setTitle(MODNAME + " " + KAMI_KANJI + " " + MODVERSMALL);
130+
Display.setTitle(MODNAME + " " + KAMI_KANJI + " " + VER_SMALL);
131131
}
132132
}
133133

134134
@Mod.EventHandler
135135
public void init(FMLInitializationEvent event) {
136-
log.info("\n\nInitializing " + MODNAME + " " + MODVER);
136+
log.info("\n\nInitializing " + MODNAME + " " + VER_FULL_BETA);
137137

138138
MODULE_MANAGER.register();
139139

@@ -282,16 +282,16 @@ public void updateCheck() {
282282
JsonParser parser = new JsonParser();
283283
String latestVersion = parser.parse(IOUtils.toString(new URL(UPDATE_JSON))).getAsJsonObject().getAsJsonObject("stable").get("name").getAsString();
284284

285-
isLatest = latestVersion.equals(MODVERBROAD);
285+
isLatest = latestVersion.equals(VER_STABLE);
286286
latest = latestVersion;
287287

288288
if (!isLatest) {
289-
KamiMod.log.warn("You are running an outdated version of KAMI Blue.\nCurrent: " + MODVERBROAD + "\nLatest: " + latestVersion);
289+
KamiMod.log.warn("You are running an outdated version of KAMI Blue.\nCurrent: " + VER_STABLE + "\nLatest: " + latestVersion);
290290

291291
return;
292292
}
293293

294-
KamiMod.log.info("Your KAMI Blue (" + MODVERBROAD + ") is up-to-date with the latest stable release.");
294+
KamiMod.log.info("Your KAMI Blue (" + VER_STABLE + ") is up-to-date with the latest stable release.");
295295
} catch (IOException e) {
296296
latest = null;
297297

‎src/main/java/me/zeroeightsix/kami/command/commands/HelpCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void call(String[] args) {
4747
String commandPrefix = Command.getCommandPrefix();
4848
if (args[0] == null) {
4949
sendStringChatMessage(new String[]{
50-
"KAMI Blue " + KamiMod.MODVER,
50+
"KAMI Blue " + KamiMod.VER_FULL_BETA,
5151
"&7Press &r" + MODULE_MANAGER.getModule(ClickGUI.class).getBindName() + "&7 to open GUI",
5252
"&7see &b" + WEBSITE_LINK + "&7 for a full version of the faq",
5353
commandPrefix + "commands&7 to view all available commands",

‎src/main/java/me/zeroeightsix/kami/command/commands/TroubleshootCommand.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
import net.minecraft.client.renderer.GlStateManager;
99
import net.minecraft.client.renderer.OpenGlHelper;
1010
import net.minecraft.util.text.TextFormatting;
11-
import net.minecraftforge.client.ForgeClientHandler;
12-
import net.minecraftforge.client.MinecraftForgeClient;
1311
import org.apache.commons.lang3.StringUtils;
1412
import org.lwjgl.opengl.GL11;
1513

@@ -54,7 +52,7 @@ public void call(String[] args) {
5452
enabled.set(StringUtils.chop(StringUtils.chop(String.valueOf(enabled)))); // this looks horrible but I don't know how else to do it sorry
5553
sendChatMessage("Enabled modules: " + f + "\n" + TextFormatting.GRAY + enabled);
5654
if (args.length >= 2) return;
57-
sendChatMessage(ClientBrandRetriever.getClientModName() + " " + KamiMod.MODVER);
55+
sendChatMessage(ClientBrandRetriever.getClientModName() + " " + KamiMod.VER_FULL_BETA);
5856
sendChatMessage("CPU: " + OpenGlHelper.getCpu() + " GPU: " + GlStateManager.glGetString(GL11.GL_VENDOR));
5957
sendChatMessage("Please send a screenshot of the full output to the developer or moderator who's helping you!");
6058
}

‎src/main/java/me/zeroeightsix/kami/module/modules/chat/DiscordNotifs.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ private String getTime() {
119119

120120
private void sendMessage(String content, String avatarUrl) {
121121
TemmieWebhook tm = new TemmieWebhook(url.getValue());
122-
DiscordMessage dm = new DiscordMessage(KamiMod.MODNAME + " " + KamiMod.MODVER, content, avatarUrl);
122+
DiscordMessage dm = new DiscordMessage(KamiMod.MODNAME + " " + KamiMod.VER_FULL_BETA, content, avatarUrl);
123123
tm.sendMessage(dm);
124124
}
125125

‎src/main/java/me/zeroeightsix/kami/module/modules/client/InfoOverlay.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private TextFormatting setToText(ColourTextFormatting.ColourCode colourCode) {
7272
public ArrayList<String> infoContents() {
7373
ArrayList<String> infoContents = new ArrayList<>();
7474
if (version.getValue()) {
75-
infoContents.add(getStringColour(setToText(firstColour.getValue())) + KamiMod.KAMI_KANJI + getStringColour(setToText(secondColour.getValue())) + " " + KamiMod.MODVERSMALL);
75+
infoContents.add(getStringColour(setToText(firstColour.getValue())) + KamiMod.KAMI_KANJI + getStringColour(setToText(secondColour.getValue())) + " " + KamiMod.VER_SMALL);
7676
} if (username.getValue()) {
7777
infoContents.add(getStringColour(setToText(firstColour.getValue())) + "Welcome" + getStringColour(setToText(secondColour.getValue())) + " " + mc.getSession().getUsername() + "!");
7878
} if (time.getValue()) {

‎src/main/java/me/zeroeightsix/kami/module/modules/misc/DiscordRPC.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class DiscordRPC : Module() {
3939

4040
fun getLine(line: LineInfo?): String {
4141
return when (line) {
42-
LineInfo.VERSION -> KamiMod.MODVERSMALL
42+
LineInfo.VERSION -> KamiMod.VER_SMALL
4343
LineInfo.WORLD -> if (mc.isIntegratedServerRunning) "Singleplayer" else if (mc.getCurrentServerData() != null) "Multiplayer" else "Main Menu"
4444
LineInfo.DIMENSION -> playerDimension(mc)
4545
LineInfo.USERNAME -> if (mc.player != null) mc.player.name else mc.getSession().username

0 commit comments

Comments
 (0)