Add git commit to version and add version to generated replay files

This commit is contained in:
johni0702
2015-06-02 20:33:22 +02:00
parent d96ba1f135
commit 1bc80cc257
5 changed files with 32 additions and 6 deletions

View File

@@ -97,6 +97,19 @@ jar {
} }
} }
def getGitCommitHash() {
try {
def stdout = new ByteArrayOutputStream()
exec {
commandLine 'git', 'describe', '--always', '--dirty=*'
standardOutput = stdout
}
return stdout.toString().trim()
} catch (e) {
return "unknown"
}
}
processResources processResources
{ {
// this will ensure that this task is redone when the versions change. // this will ensure that this task is redone when the versions change.
@@ -108,7 +121,7 @@ processResources
include 'mcmod.info' include 'mcmod.info'
// replace version and mcversion // replace version and mcversion
expand 'version':project.version, 'mcversion':project.minecraft.version expand 'version':project.version + '-' + getGitCommitHash(), 'mcversion':project.minecraft.version
} }
// copy everything else, thats not the mcmod.info // copy everything else, thats not the mcmod.info

View File

@@ -27,9 +27,11 @@ import net.minecraft.client.settings.GameSettings;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.Mod.Instance; import net.minecraftforge.fml.common.Mod.Instance;
import net.minecraftforge.fml.common.ModContainer;
import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -39,11 +41,14 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.Queue; import java.util.Queue;
@Mod(modid = ReplayMod.MODID, version = ReplayMod.VERSION) @Mod(modid = ReplayMod.MODID, useMetadata = true)
public class ReplayMod { public class ReplayMod {
public static ModContainer getContainer() {
return Loader.instance().getIndexedModList().get(MODID);
}
public static final String MODID = "replaymod"; public static final String MODID = "replaymod";
public static final String VERSION = "0.0.1";
public static final ApiClient apiClient = new ApiClient(); public static final ApiClient apiClient = new ApiClient();
private static final Minecraft mc = Minecraft.getMinecraft(); private static final Minecraft mc = Minecraft.getMinecraft();
public static GuiEventHandler guiEventHandler; public static GuiEventHandler guiEventHandler;

View File

@@ -165,7 +165,9 @@ public abstract class DataListener extends ChannelInboundHandlerAdapter {
String[] pl = players.toArray(new String[players.size()]); String[] pl = players.toArray(new String[players.size()]);
ReplayMetaData metaData = new ReplayMetaData(singleplayer, worldName, (int) lastSentPacket, startTime, pl, mcversion); String generator = "ReplayMod v" + ReplayMod.getContainer().getVersion();
ReplayMetaData metaData = new ReplayMetaData(singleplayer, worldName, generator, (int) lastSentPacket, startTime, pl, mcversion);
File folder = ReplayFileIO.getReplayFolder(); File folder = ReplayFileIO.getReplayFolder();

View File

@@ -4,15 +4,17 @@ public class ReplayMetaData {
private boolean singleplayer; private boolean singleplayer;
private String serverName; private String serverName;
private String generator;
private int duration; private int duration;
private long date; private long date;
private String[] players; private String[] players;
private String mcversion; private String mcversion;
public ReplayMetaData(boolean singleplayer, String serverName, public ReplayMetaData(boolean singleplayer, String serverName, String generator,
int duration, long date, String[] players, String mcversion) { int duration, long date, String[] players, String mcversion) {
this.singleplayer = singleplayer; this.singleplayer = singleplayer;
this.serverName = serverName; this.serverName = serverName;
this.generator = generator;
this.duration = duration; this.duration = duration;
this.date = date; this.date = date;
this.players = players; this.players = players;
@@ -27,6 +29,10 @@ public class ReplayMetaData {
return serverName; return serverName;
} }
public String getGenerator() {
return generator;
}
public int getDuration() { public int getDuration() {
return duration; return duration;
} }

View File

@@ -3,7 +3,7 @@
"modid": "replaymod", "modid": "replaymod",
"name": "Replay Mod", "name": "Replay Mod",
"description": "Example placeholder mod.", "description": "Example placeholder mod.",
"version": "0.0.1", "version": "${version}",
"mcversion": "${mcversion}", "mcversion": "${mcversion}",
"url": "", "url": "",
"updateUrl": "", "updateUrl": "",