Skip to content
This repository has been archived by the owner on Jan 18, 2024. It is now read-only.

Commit

Permalink
Merge branch '1.8'
Browse files Browse the repository at this point in the history
Conflicts:
	src/main/java/com/kamesuta/mc/bnnwidget/WGui.java
	src/main/java/com/kamesuta/mc/bnnwidget/component/MButton.java
	src/main/java/com/kamesuta/mc/bnnwidget/component/MChatTextField.java
	src/main/java/com/kamesuta/mc/bnnwidget/component/MCheckBox.java
	src/main/java/com/kamesuta/mc/bnnwidget/component/MPanel.java
	src/main/java/com/kamesuta/mc/signpic/gui/SignPicLabel.java
	src/main/java/com/kamesuta/mc/signpic/preview/SignEntity.java
  • Loading branch information
Kamesuta committed Sep 10, 2016
2 parents 8a86a12 + f3461f5 commit 3c7c031
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 13 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version_major=2
version_minor=1
version_micro=2.beta
version_micro=5
version_minecraft=1.7.10
version_forge=10.13.4.1558-1.7.10
31 changes: 20 additions & 11 deletions info/info.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,30 @@
{
"versions": {
"1.7.10": {
"version": "2.1.0",
"remote": "https://github.com/Team-Fruit/SignPicture/releases/download/2.1.0/SignPicture-1.7.10-2.1.0-universal.jar",
"local": "SignPicture-1.7.10-2.1.0-universal.jar",
"message": "GUI Update! SignPicture 2.1.0 Released!",
"version": "2.1.5",
"remote": "https://github.com/Team-Fruit/SignPicture/releases/download/2.1.5/SignPicture-1.7.10-2.1.5-universal.jar",
"local": "SignPicture-1.7.10-2.1.5-universal.jar",
"message": "GUI Update! SignPicture 2.1.5 Released!",
"message_local": {
"ja_JP": "遂にSignPictureにGUIが! SignPicture 2.1.0リリース!!"
"ja_JP": "遂にSignPictureにGUIが! SignPicture 2.1.5リリース!!"
}
},
"1.7.10-beta": {
"version": "2.1.1.beta",
"remote": "https://github.com/Team-Fruit/SignPicture/releases/download/2.1.1/SignPicture-1.7.10-2.1.1.beta-universal.jar",
"local": "SignPicture-1.7.10-2.1.1.beta-universal.jar",
"message": "Preview Implements!",
"1.8": {
"version": "2.1.5",
"remote": "https://github.com/Team-Fruit/SignPicture/releases/download/2.1.5/SignPicture-1.8-2.1.5-universal.jar",
"local": "SignPicture-1.8-2.1.5-universal.jar",
"message": "GUI Update! SignPicture 2.1.5 Released!",
"message_local": {
"ja_JP": "プレビュー機能実装! より視覚的に!"
"ja_JP": "遂にSignPictureにGUIが! SignPicture 2.1.5リリース!!"
}
},
"1.9": {
"version": "2.1.5",
"remote": "https://github.com/Team-Fruit/SignPicture/releases/download/2.1.5/SignPicture-1.9-2.1.5-universal.jar",
"local": "SignPicture-1.9-2.1.5-universal.jar",
"message": "GUI Update! SignPicture 2.1.5 Released!",
"message_local": {
"ja_JP": "遂にSignPictureにGUIが! SignPicture 2.1.5リリース!!"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public void onSign(final GuiOpenEvent event) {
ChatBuilder.create("signpic.chat.error.place").setId().useTranslation().chatClient();
}
}
}
}

@CoreEvent
public void onClick(final MouseEvent event) {
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/kamesuta/mc/signpic/util/ChatBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@
import net.minecraft.server.management.ServerConfigurationManager;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.ChatStyle;
import net.minecraft.util.IChatComponent;
import net.minecraft.util.StatCollector;

public class ChatBuilder {
public static final int DefaultId = 877;

private IChatComponent chat = null;
private ChatStyle style = null;
private String text = "";
private Object[] params = new Object[0];
private boolean useTranslation = false;
Expand Down Expand Up @@ -51,6 +53,8 @@ public IChatComponent build() {
} else {
chat = this.chat;
}
if (chat!=null && this.style!=null)
chat.setChatStyle(this.style);
return chat;
}

Expand Down

0 comments on commit 3c7c031

Please sign in to comment.