Skip to content

Commit c307fb9

Browse files
committed
chat View
1 parent b12d1e7 commit c307fb9

File tree

8 files changed

+63
-4
lines changed

8 files changed

+63
-4
lines changed

coffee/client/module/index.coffee

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ init = ()->
7575
inv_bar.setHp(points)
7676
socket.on "food",(points)->
7777
inv_bar.setFood(points)
78+
socket.on "msg",(msg)->
79+
$(".chat").append(msg+"<br>")
7880
socket.on "xp",(xp)->
7981
$(".player_xp").text(xp.level)
8082
$(".progress-bar").css("width",xp.progress*100+"%")

coffee/server.coffee

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ module.exports=(config)->
88
mineflayer = require 'mineflayer'
99
Chunk = require("prismarine-chunk")("1.16.1")
1010
vec3=require "vec3"
11+
Convert = require 'ansi-to-html'
12+
convert = new Convert()
1113

1214
sf={}
1315
port=config["express-port"]
@@ -48,7 +50,6 @@ module.exports=(config)->
4850
socketInfo[socket.id].bot.on 'chat',(username, message)->
4951
if username is socketInfo[socket.id].bot.username
5052
return
51-
socketInfo[socket.id].bot.chat message
5253
return
5354

5455
socketInfo[socket.id].bot.on 'move',()->
@@ -60,6 +61,10 @@ module.exports=(config)->
6061
io.to(socket.id).emit "hp",socketInfo[socket.id].bot.health
6162
io.to(socket.id).emit "food",socketInfo[socket.id].bot.food
6263
return
64+
socketInfo[socket.id].bot.on 'message',(msg)->
65+
try
66+
io.to(socket.id).emit "msg",convert.toHtml(msg.toAnsi());
67+
return
6368
socketInfo[socket.id].bot.on 'experience',()->
6469
try
6570
io.to(socket.id).emit "xp",socketInfo[socket.id].bot.experience

package-lock.json

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"atlas": "node src/atlas.js"
88
},
99
"dependencies": {
10+
"ansi-to-html": "^0.6.14",
1011
"canvas": "^2.6.1",
1112
"child_process": "^1.0.2",
1213
"express": "^4.17.1",

src/client/cdn/css/main.css

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,25 @@ canvas {
111111
font-size:20px;
112112
font-weight:bold;
113113
}
114+
.console{
115+
overflow:auto;
116+
display:flex; flex-direction:column-reverse;
117+
position:fixed;
118+
bottom:110px;
119+
left:0px;
120+
width:60%;
121+
-webkit-text-stroke: 1px black;
122+
color: white;
123+
text-shadow:
124+
1px 1px 0 #000,
125+
-1px -1px 0 #000,
126+
1px -1px 0 #000,
127+
-1px 1px 0 #000,
128+
1px 1px 0 #000;
129+
height:30%;
130+
font-weight:bold;
131+
font-size:20px;
132+
}
133+
.console::-webkit-scrollbar {
134+
display: none;
135+
}

src/client/index.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ <h1 class="loadingText">Ładowanie zasobów...</h1>
3838
<img src="assets/images/loadingx.gif">
3939
</div>
4040
</div>
41+
<!-- CONSOLE -->
42+
<div class="console">
43+
44+
<!-- CHAT -->
45+
<div class="chat"></div>
46+
47+
</div>
4148

4249
<!-- GUI -->
4350
<div class="gui">
@@ -64,7 +71,7 @@ <h1 class="loadingText">Ładowanie zasobów...</h1>
6471

6572
<!-- PLAYER XP -->
6673
<span class="player_xp">
67-
1
74+
Łączenie...
6875
</span>
6976

7077
<!-- PLAYER FOOD -->

src/client/module/index.js

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/server.js

Lines changed: 8 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)