Skip to content

Commit

Permalink
change version stuff around
Browse files Browse the repository at this point in the history
  • Loading branch information
DaMatrix committed May 5, 2019
1 parent 340c65c commit 77215b8
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 15 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ minecraft {
coreMod = "net.daporkchop.pepsimod.PepsimodMixinLoader"
}

version = project.minecraft.version
version = "v11.1-" + project.minecraft.version

repositories {
mavenLocal()
Expand Down Expand Up @@ -120,7 +120,7 @@ shadowJar {
}
exclude 'dummyThing'
exclude 'LICENSE.txt'
classifier = 'full'
classifier = null
}

build.dependsOn(shadowJar)
Expand Down
21 changes: 16 additions & 5 deletions src/main/java/net/daporkchop/pepsimod/Pepsimod.java
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,24 @@

@Mod(
modid = "pepsimod",
name = "pepsimod",
version = "11.1"
version = "v11.1",
useMetadata = true
)
public class Pepsimod extends PepsiConstants {
public static final String VERSION = "11.1";
public static final String chatPrefix = PepsiUtils.COLOR_ESCAPE + "0" + PepsiUtils.COLOR_ESCAPE + "l[" + PepsiUtils.COLOR_ESCAPE + "c" + PepsiUtils.COLOR_ESCAPE + "lpepsi" + PepsiUtils.COLOR_ESCAPE + "9" + PepsiUtils.COLOR_ESCAPE + "lmod" + PepsiUtils.COLOR_ESCAPE + "0" + PepsiUtils.COLOR_ESCAPE + "l]" + PepsiUtils.COLOR_ESCAPE + "r ";
public static final String NAME_VERSION = String.format("pepsimod v%s", VERSION);
public static final String VERSION;
public static final String CHAT_PREFIX = "\u00A70\u00A7l[\u00A7c\u00A7lpepsi\u00A79\u00A7lmod\u00A70\u00A7l]\u00A7r";
public static final String NAME_VERSION;

static {
{
String version = Pepsimod.class.getAnnotation(Mod.class).version();
if (version.indexOf('-') == -1) {
version += String.format("-%s", MinecraftForge.MC_VERSION);
}
VERSION = version;
}
NAME_VERSION = String.format("pepsimod %s", VERSION);
}

public DataLoader data;
public boolean isMcLeaksAccount = false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public static void runCommand(String command) {
}
}

mc.player.sendMessage(new TextComponentString(Pepsimod.chatPrefix + PepsiUtils.COLOR_ESCAPE + "cUnknown command! Use .help for a list of commands!"));
mc.player.sendMessage(new TextComponentString(Pepsimod.CHAT_PREFIX + PepsiUtils.COLOR_ESCAPE + "cUnknown command! Use .help for a list of commands!"));
} catch (ArrayIndexOutOfBoundsException | StringIndexOutOfBoundsException e) {
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

public abstract class Command extends PepsiConstants {
public static void clientMessage(String toSend) {
mc.player.sendMessage(new TextComponentString(Pepsimod.chatPrefix + toSend));
mc.player.sendMessage(new TextComponentString(Pepsimod.CHAT_PREFIX + toSend));
}
public String name;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import net.daporkchop.pepsimod.module.api.Module;
import net.daporkchop.pepsimod.module.impl.render.UnfocusedCPUMod;
import net.daporkchop.pepsimod.module.impl.render.ZoomMod;
import net.daporkchop.pepsimod.util.PepsiUtils;
import net.daporkchop.pepsimod.util.config.impl.CpuLimitTranslator;
import net.daporkchop.pepsimod.util.config.impl.FriendsTranslator;
import net.minecraft.client.Minecraft;
Expand Down Expand Up @@ -108,10 +107,10 @@ public void onMouseClick(CallbackInfo ci) {
RayTraceResult result = Minecraft.getMinecraft().objectMouseOver;
if (result.typeOfHit == RayTraceResult.Type.ENTITY && result.entityHit instanceof EntityPlayer) {
if (FriendsTranslator.INSTANCE.isFriend(result.entityHit)) {
this.player.sendMessage(new TextComponentString(Pepsimod.chatPrefix + "Removed \u00A7c" + result.entityHit.getName() + "\u00A7r as a friend"));
this.player.sendMessage(new TextComponentString(Pepsimod.CHAT_PREFIX + "Removed \u00A7c" + result.entityHit.getName() + "\u00A7r as a friend"));
FriendsTranslator.INSTANCE.friends.remove(result.entityHit.getUniqueID());
} else {
this.player.sendMessage(new TextComponentString(Pepsimod.chatPrefix + "Added \u00A79" + result.entityHit.getName() + "\u00A7r as a friend"));
this.player.sendMessage(new TextComponentString(Pepsimod.CHAT_PREFIX + "Added \u00A79" + result.entityHit.getName() + "\u00A7r as a friend"));
FriendsTranslator.INSTANCE.friends.add(result.entityHit.getUniqueID());
}
}
Expand All @@ -132,7 +131,7 @@ public void onMouseClick(CallbackInfo ci) {
target = "Lorg/lwjgl/opengl/Display;setTitle(Ljava/lang/String;)V"
))
public void changeWindowTitle(String title) {
Display.setTitle(PepsimodMixinLoader.isObfuscatedEnvironment ? "pepsimod 11.1" : "pepsimod 11.1 (dev environment)");
Display.setTitle(Pepsimod.NAME_VERSION + (PepsimodMixinLoader.isObfuscatedEnvironment ? "" : " (dev environment)"));
}

@Inject(
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/mcmod.info
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"modid": "pepsimod",
"name": "pepsimod",
"description": "A hacked client for Forge\nMade by DaPorkchop_, for Team Pepsi",
"version": "11.1",
"mcversion": "1.12.2",
"version": "${version}",
"mcversion": "${mcversion}",
"url": "https://github.com/Team-Pepsi/pepsimod",
"updateUrl": "https://raw.githubusercontent.com/Team-Pepsi/pepsimod/master/update.json",
"authorList": [
Expand Down

0 comments on commit 77215b8

Please sign in to comment.