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

Commit 9bac5ae

Browse files
KamesutaKamesuta
committed
Merge remote-tracking branch 'origin/1.9.4' into 1.10.2
Conflicts: gradle.properties
2 parents cc78fa0 + 35a967b commit 9bac5ae

File tree

11 files changed

+108
-64
lines changed

11 files changed

+108
-64
lines changed

‎TASK.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ _If you have any idea for this project, please make an issue and post to this pr
55
- [x] Auto Sign Create GUI
66
- [ ] Auto Image Upload to online such as Gyazo
77
- [ ] 短縮URL bitly, goo.gl...
8-
- [ ] Config
8+
- [x] Config
99
- [x] Blend func problem (transparent png, playernames...)
1010
- [x] Thread Pool
1111
- [x] Load Faster
@@ -14,4 +14,9 @@ _If you have any idea for this project, please make an issue and post to this pr
1414
- [x] テキストボックスメタ情報優先化
1515
- [x] 回転構文
1616
- [x] PlaceModeリフレクションエラーの時のPlaceモード使用不可表示
17-
- [ ] Waila
17+
- [ ] Waila
18+
- [ ] ロードリトライ
19+
- [ ] 制限プラグイン
20+
- [ ] 曲
21+
- [ ] チャット画像
22+
- [ ] アイテム画像変更

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ modid=signpic
33
modname=SignPicture
44
version_major=2
55
version_minor=3
6-
version_micro=0
6+
version_micro=1
77
version_minecraft=1.10.2
88
version_forge=12.18.1.2011
99
version_minforge=12.18.1.2011

‎info/info.json

+17-15
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,34 @@
1010
}
1111
},
1212
"1.8.9": {
13-
"version": "2.2.2",
14-
"remote": "https://github.com/Team-Fruit/SignPicture/releases/download/1.8.9-2.2.2/SignPicture-1.8.9-2.2.2-universal.jar",
15-
"local": "SignPicture-1.8.9-2.2.2-universal.jar",
16-
"message": "Offset And Rotations! More freely images! SignPicture 2.2.2 Released!",
13+
"version": "2.3.0",
14+
"remote": "https://github.com/Team-Fruit/SignPicture/releases/download/1.8.9-2.3.0/SignPicture-1.8.9-2.3.0-universal.jar",
15+
"local": "SignPicture-1.8.9-2.3.0-universal.jar",
16+
"message": "Config & Prevent Anti-AutoSign Mode added. SignPicture 2.3.0 Released.",
1717
"message_local": {
18-
"ja_JP": "オフセットと回転機能実装! さらに自由自在に画像を貼ろう! SignPicture 2.2.2 リリース!"
18+
"ja_JP": "Anti-AutoSign回避モードとコンフィグの追加 SignPicture 2.3.0 リリース!"
1919
}
2020
},
2121
"1.9.4": {
22-
"version": "2.1.5",
23-
"remote": "https://github.com/Team-Fruit/SignPicture/releases/download/1.9.4-2.1.5/SignPicture-1.9.4-2.1.5-universal.jar",
24-
"local": "SignPicture-1.9.4-2.1.5-universal.jar",
25-
"message": "GUI Update! SignPicture 2.1.5 Released!",
22+
"version": "2.3.0",
23+
"remote": "https://github.com/Team-Fruit/SignPicture/releases/download/1.9.4-2.3.0/SignPicture-1.9.4-2.3.0-universal.jar",
24+
"local": "SignPicture-1.9.4-2.3.0-universal.jar",
25+
"message": "Config & Prevent Anti-AutoSign Mode added. SignPicture 2.3.0 Released.",
2626
"message_local": {
27-
"ja_JP": "遂にSignPictureにGUIが! SignPicture 2.1.5リリース!!"
27+
"ja_JP": "Anti-AutoSign回避モードとコンフィグの追加 SignPicture 2.3.0 リリース!"
2828
}
2929
},
3030
"1.10.2": {
31-
"version": "2.1.5",
32-
"remote": "https://github.com/Team-Fruit/SignPicture/releases/download/1.10.2-2.1.5/SignPicture-1.10.2-2.1.5-universal.jar",
33-
"local": "SignPicture-1.10.2-2.1.5-universal.jar",
34-
"message": "GUI Update! SignPicture 2.1.5 Released!",
31+
"version": "2.3.0",
32+
"remote": "https://github.com/Team-Fruit/SignPicture/releases/download/1.10.2-2.3.0/SignPicture-1.10.2-2.3.0-universal.jar",
33+
"local": "SignPicture-1.10.2-2.3.0-universal.jar",
34+
"message": "Config & Prevent Anti-AutoSign Mode added. SignPicture 2.3.0 Released.",
3535
"message_local": {
36-
"ja_JP": "遂にSignPictureにGUIが! SignPicture 2.1.5リリース!!"
36+
"ja_JP": "Anti-AutoSign回避モードとコンフィグの追加 SignPicture 2.3.0 リリース!"
3737
}
3838
}
3939
},
40+
"website": "https://github.com/Kamesuta/SignPicture/",
41+
"changelog": "https://github.com/Kamesuta/SignPicture/releases",
4042
"private_msg": "http://fruit.bebehp.com/signpic.php/msg?id=%id%&name=%name%&vmod=%modversion%&vmodmc=%modmcversion%&vmodforge=%modforgeversion%&vmc=%mcversion%&vforge=%forgeversion%"
4143
}

‎src/main/java/com/kamesuta/mc/signpic/information/Info.java

+4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@
44

55
public class Info {
66
public Map<String, Version> versions;
7+
public String website;
8+
public String changelog;
79
public String private_msg;
810
public static class Version {
911
public String version;
1012
public String remote;
1113
public String local;
1214
public String message;
1315
public Map<String, String> message_local;
16+
public String website;
17+
public String changelog;
1418
}
1519
public static class PrivateMsg {
1620
public boolean json;

‎src/main/java/com/kamesuta/mc/signpic/information/InformationChecker.java

+24-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public final class InformationChecker {
1717
public static InfoState state = new InfoState();
1818

1919
public static class InfoState {
20+
public Info info;
2021
public Info.Version onlineVersion;
2122
public Info.Version stableVersion;
2223
public Info.Version unstableVersion;
@@ -31,8 +32,13 @@ public void onTick() {
3132
final EntityPlayer player = Client.mc.thePlayer;
3233
if(this.doneChecking && player != null && !this.triedToWarnPlayer) {
3334
final String lang = Client.mc.gameSettings.language;
34-
if (Config.instance.informationNotice && !StringUtils.equals(Reference.VERSION, "${version}")) {
35+
if (this.info!=null && Config.instance.informationNotice && !StringUtils.equals(Reference.VERSION, "${version}")) {
3536
try {
37+
if (this.info.versions!=null) {
38+
this.stableVersion = this.info.versions.get(Client.mcversion);
39+
this.unstableVersion = this.info.versions.get(Client.mcversion + "-beta");
40+
}
41+
3642
final String[] client = Reference.VERSION.split("\\.");
3743
if (client.length>=3) {
3844
final int clientBuild1 = Integer.parseInt(client[0]);
@@ -72,12 +78,27 @@ public void onTick() {
7278
}
7379

7480
if(betaneedupdate || needupdate) {
81+
ChatBuilder.create("signpic.versioning.outdated").setParams(Reference.VERSION, this.onlineVersion.version).useTranslation().chatClient();
7582
if (this.onlineVersion.message_local!=null && this.onlineVersion.message_local.containsKey(lang))
7683
ChatBuilder.create(this.onlineVersion.message_local.get(lang)).chatClient();
7784
else if (!StringUtils.isEmpty(this.onlineVersion.message))
7885
ChatBuilder.create(this.onlineVersion.message).chatClient();
79-
ChatBuilder.create("signpic.versioning.outdated").setParams(Reference.VERSION, this.onlineVersion.version).useTranslation().chatClient();
80-
ChatBuilder.create("signpic.versioning.updateMessage").useTranslation().useJson().chatClient();;
86+
87+
final String website;
88+
if (this.onlineVersion.website!=null) website = this.onlineVersion.website;
89+
else if (this.info.website!=null) website = this.info.website;
90+
else website = "https://github.com/Kamesuta/SignPicture/";
91+
92+
final String changelog;
93+
if (this.onlineVersion.changelog!=null) changelog = this.onlineVersion.changelog;
94+
else if (this.info.changelog!=null) changelog = this.info.changelog;
95+
else changelog = "https://github.com/Kamesuta/SignPicture/releases";
96+
97+
ChatBuilder.create("signpic.versioning.updateMessage").useTranslation().useJson()
98+
.replace("$download$", "{\"action\":\"run_command\",\"value\":\"/signpic-download-latest\"}")
99+
.replace("$website$", "{\"action\":\"open_url\",\"value\":\"" + website + "\"}")
100+
.replace("$changelog$", "{\"action\":\"open_url\",\"value\":\"" + changelog + "\"}")
101+
.chatClient();
81102
}
82103
}
83104
}

‎src/main/java/com/kamesuta/mc/signpic/information/ThreadInformationChecker.java

+4-8
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,13 @@ public void run() {
3636
final HttpResponse response = Downloader.downloader.client.execute(req);
3737
final HttpEntity entity = response.getEntity();
3838
input = entity.getContent();
39-
final Info info = gson.fromJson(new JsonReader(new InputStreamReader(input, CharEncoding.UTF_8)), Info.class);
40-
if (info!=null) {
41-
if (info.versions!=null) {
42-
state.stableVersion = info.versions.get(Client.mcversion);
43-
state.unstableVersion = info.versions.get(Client.mcversion + "-beta");
44-
}
45-
if (!StringUtils.isEmpty(info.private_msg)) {
39+
state.info = gson.fromJson(new JsonReader(new InputStreamReader(input, CharEncoding.UTF_8)), Info.class);
40+
if (state.info!=null) {
41+
if (!StringUtils.isEmpty(state.info.private_msg)) {
4642
InputStream input1 = null;
4743
try {
4844
if (!StringUtils.isEmpty(Client.name) && !StringUtils.isEmpty(Client.id)) {
49-
final String msgurl = info.private_msg
45+
final String msgurl = state.info.private_msg
5046
.replace("%name%", Client.name)
5147
.replace("%id%", Client.id)
5248
.replace("%mcversion%", Client.mcversion)

‎src/main/java/com/kamesuta/mc/signpic/proxy/ClientProxy.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.io.File;
44
import java.io.IOException;
5-
import java.util.Map;
65

76
import com.kamesuta.mc.signpic.Client;
87
import com.kamesuta.mc.signpic.Reference;
@@ -12,13 +11,11 @@
1211
import com.kamesuta.mc.signpic.render.CustomTileEntitySignRenderer;
1312
import com.mojang.util.UUIDTypeAdapter;
1413

15-
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
16-
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
17-
import net.minecraft.tileentity.TileEntity;
1814
import net.minecraft.tileentity.TileEntitySign;
1915
import net.minecraftforge.client.ClientCommandHandler;
2016
import net.minecraftforge.common.ForgeVersion;
2117
import net.minecraftforge.common.MinecraftForge;
18+
import net.minecraftforge.fml.client.registry.ClientRegistry;
2219
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
2320
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
2421
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -108,9 +105,7 @@ public void init(final FMLInitializationEvent event) {
108105
super.init(event);
109106

110107
// Replace Sign Renderer
111-
Client.renderer.setRendererDispatcher(TileEntityRendererDispatcher.instance);
112-
final Map<Class<? extends TileEntity>, TileEntitySpecialRenderer<? extends TileEntity>> renderers = TileEntityRendererDispatcher.instance.mapSpecialRenderers;
113-
renderers.put(TileEntitySign.class, Client.renderer);
108+
ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySign.class, Client.renderer);
114109

115110
// Event Register
116111
Client.handler.init();

‎src/main/java/com/kamesuta/mc/signpic/render/CustomTileEntitySignRenderer.java

+22-22
Original file line numberDiff line numberDiff line change
@@ -104,28 +104,27 @@ public void renderSignPicture(final Entry entry, final int destroy, final float
104104
}
105105

106106
public void translateBase(final TileEntitySign tile, final double x, final double y, final double z, final float rotateratio) {
107-
// Vanilla Translate
108-
final Block block = tile.getBlockType();
109-
GlStateManager.pushMatrix();
110-
final float f1 = 0.6666667F;
111-
float f3;
112-
113-
if (block == Blocks.STANDING_SIGN) {
114-
GlStateManager.translate((float)x + 0.5F, (float)y + 0.75F * f1, (float)z + 0.5F);
115-
final float f2 = tile.getBlockMetadata() * 360 / 16.0F;
116-
GlStateManager.rotate(-f2, 0.0F, 1.0F, 0.0F);
117-
} else {
118-
final int j = tile.getBlockMetadata();
119-
f3 = 0.0F;
120-
121-
if (j == 2) f3 = 180.0F;
122-
if (j == 4) f3 = 90.0F;
123-
if (j == 5) f3 = -90.0F;
124-
125-
GlStateManager.translate((float)x + 0.5F, (float)y + 0.75F * f1, (float)z + 0.5F);
126-
GlStateManager.rotate(-f3, 0.0F, 1.0F, 0.0F);
127-
GlStateManager.translate(0.0F, 0.0F, -0.4375F);
128-
}
107+
// Vanilla Translate
108+
final Block block = tile.getBlockType();
109+
final float f1 = 0.6666667F;
110+
float f3;
111+
112+
if (block == Blocks.STANDING_SIGN) {
113+
GlStateManager.translate((float)x + 0.5F, (float)y + 0.75F * f1, (float)z + 0.5F);
114+
final float f2 = tile.getBlockMetadata() * 360 / 16.0F;
115+
GlStateManager.rotate(-f2, 0.0F, 1.0F, 0.0F);
116+
} else {
117+
final int j = tile.getBlockMetadata();
118+
f3 = 0.0F;
119+
120+
if (j == 2) f3 = 180.0F;
121+
if (j == 4) f3 = 90.0F;
122+
if (j == 5) f3 = -90.0F;
123+
124+
GlStateManager.translate((float)x + 0.5F, (float)y + 0.75F * f1, (float)z + 0.5F);
125+
GlStateManager.rotate(-f3, 0.0F, 1.0F, 0.0F);
126+
GlStateManager.translate(0.0F, 0.0F, -0.4375F);
127+
}
129128
}
130129

131130
public void renderSignPictureBase(final TileEntitySign tile, final double x, final double y, final double z, final float partialTicks, final int destroy, final float opacity) {
@@ -164,6 +163,7 @@ public void renderTileEntityAt(final TileEntitySign tile, final double x, final
164163
{
165164
Client.startSection("signpic-render");
166165
renderSignPictureBase(tile, x, y, z, partialTicks, destroy, 1f);
166+
//super.renderTileEntityAt(tile, x, y, z, partialTicks, destroy);
167167
Client.endSection();
168168
}
169169

‎src/main/java/com/kamesuta/mc/signpic/util/ChatBuilder.java

+25-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package com.kamesuta.mc.signpic.util;
22

3-
import com.google.gson.JsonSyntaxException;
3+
import java.util.Map;
4+
5+
import org.apache.commons.lang3.StringUtils;
6+
7+
import com.google.common.collect.Maps;
48
import com.kamesuta.mc.signpic.Client;
59

610
import net.minecraft.client.Minecraft;
@@ -24,6 +28,7 @@ public class ChatBuilder {
2428
private boolean useTranslation = false;
2529
private boolean useJson = false;
2630
private boolean useId = false;
31+
private final Map<String, String> replace = Maps.newHashMap();
2732
private int id = -1;
2833

2934
public ChatBuilder() {}
@@ -36,14 +41,20 @@ public ITextComponent build() {
3641
else {
3742
String s;
3843
if (this.useTranslation) {
39-
s = String.format(translateToLocal(this.text), this.params);
44+
s = translateToLocal(this.text);
4045
} else
4146
s = this.text;
4247

48+
for (final Map.Entry<String, String> entry: this.replace.entrySet())
49+
s = StringUtils.replace(s, entry.getKey(), entry.getValue());
50+
51+
if (this.params.length>0)
52+
s = String.format(s, this.params);
53+
4354
if (this.useJson)
4455
try {
4556
chat = ITextComponent.Serializer.jsonToComponent(s);
46-
} catch (final JsonSyntaxException e) {
57+
} catch (final Exception e) {
4758
chat = new TextComponentString("Invaild Json: " + this.text);
4859
}
4960
else
@@ -63,6 +74,10 @@ public static String translateToLocal(final String text) {
6374
return net.minecraft.util.text.translation.I18n.translateToLocal(text);
6475
}
6576

77+
public boolean isEmpty() {
78+
return StringUtils.isEmpty(this.text) && (this.chat==null || StringUtils.isEmpty(this.chat.getUnformattedText()));
79+
}
80+
6681
public ChatBuilder setId(final int id) {
6782
this.useId = true;
6883
this.id = id;
@@ -104,13 +119,19 @@ public ChatBuilder useJson() {
104119
return this;
105120
}
106121

122+
public ChatBuilder replace(final String from, final String to) {
123+
this.replace.put(from, to);
124+
return this;
125+
}
126+
107127
public static ChatBuilder create(final String text) {
108128
return new ChatBuilder().setText(text);
109129
}
110130

111131
@SideOnly(Side.CLIENT)
112132
public void chatClient() {
113-
chatClient(this);
133+
if (!isEmpty())
134+
chatClient(this);
114135
}
115136

116137
@SideOnly(Side.CLIENT)

‎src/main/resources/assets/signpic/lang/en_US.lang

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ signpic.advmsg.unknown=Unknown Error: §7%s
8383

8484
# Version Checking
8585
signpic.versioning.outdated=[§6SignPicture§r] You are running Sign Picture %s, the latest is %s.
86-
signpic.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to automatically download the latest version","color":"green"}},"clickEvent":{"action":"run_command","value":"/signpic-download-latest"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/Kamesuta/SignPicture/"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/Kamesuta/SignPicture/releases"}},"]"]
86+
signpic.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to automatically download the latest version","color":"green"}},"clickEvent":$download$},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":$website$},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":$changelog$},"]"]
8787
signpic.versioning.startingDownload=[{"text":"Starting download of %s. Please do not remove your hard disk. Enjoying ","color":"aqua"}]
8888
signpic.versioning.downloading=Now Downloading... %s%% (%s / %s bytes)
8989
signpic.versioning.doneDownloading=Finished downloading %s. Delete your old SignPicture .jar and reload your game to update.

‎src/main/resources/assets/signpic/lang/ja_JP.lang

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ signpic.advmsg.unknown=不明なエラー: §7%s
4848

4949
# Version Checking
5050
signpic.versioning.outdated=[§6SignPicture§r] 現在のSignPictureのバージョンは %s です。新しいバージョン %s がご利用可能です！
51-
signpic.versioning.updateMessage=["[",{"text":"ダウンロード","color":"green","hoverEvent":{"action":"show_text","value":{"text":"自動的に最新バージョンをダウンロードします","color":"green"}},"clickEvent":{"action":"run_command","value":"/signpic-download-latest"}},"] [",{"text":"ウェブサイト","color":"green","hoverEvent":{"action":"show_text","value":{"text":"ウェブサイトへ","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/Kamesuta/SignPicture/"}},"] [",{"text":"チェンジログ","color":"green","hoverEvent":{"action":"show_text","value":{"text":"更新履歴を見る","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/Kamesuta/SignPicture/releases"}},"]"]
51+
signpic.versioning.updateMessage=["[",{"text":"ダウンロード","color":"green","hoverEvent":{"action":"show_text","value":{"text":"自動的に最新バージョンをダウンロードします","color":"green"}},"clickEvent":$download$},"] [",{"text":"ウェブサイト","color":"green","hoverEvent":{"action":"show_text","value":{"text":"ウェブサイトへ","color":"green"}},"clickEvent":$website$},"] [",{"text":"チェンジログ","color":"green","hoverEvent":{"action":"show_text","value":{"text":"更新履歴を見る","color":"green"}},"clickEvent":$changelog$},"]"]
5252
signpic.versioning.startingDownload=[{"text":"ダウンロード開始 %s","color":"aqua"}]
5353
signpic.versioning.downloading=ダウンロード中... %s%% (%s / %s バイト)
5454
signpic.versioning.doneDownloading=ダウンロード完了 %s 適用するためには古いSignPictureの.jarファイルを消し、Minecraftを再起動してください

0 commit comments

Comments
 (0)