Skip to content

Commit 4d7cf0b

Browse files
michaljazmichaljaz
committed
ConnectToRealServer
1 parent f00de52 commit 4d7cf0b

File tree

17 files changed

+185
-23
lines changed

17 files changed

+185
-23
lines changed

‎build/coffee/bundle.coffee‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,15 @@ scene=null;materials=null;parameters=null;canvas=null;renderer=null;camera=null;
1414

1515
getNick=->
1616
nameList = ['Time','Past','Future','Dev','Fly','Flying','Soar','Soaring','Power','Falling','Fall','Jump','Cliff','Mountain','Rend','Red','Blue','Green','Yellow','Gold','Demon','Demonic','Panda','Cat','Kitty','Kitten','Zero','Memory','Trooper','XX','Bandit','Fear','Light','Glow','Tread','Deep','Deeper','Deepest','Mine','Your','Worst','Enemy','Hostile','Force','Video','Game','Donkey','Mule','Colt','Cult','Cultist','Magnum','Gun','Assault','Recon','Trap','Trapper','Redeem','Code','Script','Writer','Near','Close','Open','Cube','Circle','Geo','Genome','Germ','Spaz','Shot','Echo','Beta','Alpha','Gamma','Omega','Seal','Squid','Money','Cash','Lord','King','Duke','Rest','Fire','Flame','Morrow','Break','Breaker','Numb','Ice','Cold','Rotten','Sick','Sickly','Janitor','Camel','Rooster','Sand','Desert','Dessert','Hurdle','Racer','Eraser','Erase','Big','Small','Short','Tall','Sith','Bounty','Hunter','Cracked','Broken','Sad','Happy','Joy','Joyful','Crimson','Destiny','Deceit','Lies','Lie','Honest','Destined','Bloxxer','Hawk','Eagle','Hawker','Walker','Zombie','Sarge','Capt','Captain','Punch','One','Two','Uno','Slice','Slash','Melt','Melted','Melting','Fell','Wolf','Hound','Legacy','Sharp','Dead','Mew','Chuckle','Bubba','Bubble','Sandwich','Smasher','Extreme','Multi','Universe','Ultimate','Death','Ready','Monkey','Elevator','Wrench','Grease','Head','Theme','Grand','Cool','Kid','Boy','Girl','Vortex','Paradox']
17-
1817
finalName = ""
19-
20-
randName=()->
18+
nick=document.location.hash.substring(1,document.location.hash.length)
19+
if nick is ""
20+
# nick="WebmcPlayer#{Math.floor(10000+Math.random()*10000)}"
2121
finalName = nameList[Math.floor( Math.random() * nameList.length )]
2222
finalName += nameList[Math.floor( Math.random() * nameList.length )]
2323
if Math.random() > 0.5
2424
finalName += nameList[Math.floor( Math.random() * nameList.length )]
25-
return finalName
26-
nick=document.location.hash.substring(1,document.location.hash.length)
27-
if nick is ""
28-
# nick="WebmcPlayer#{Math.floor(10000+Math.random()*10000)}"
29-
nick=randName()
25+
nick=finalName
3026
document.location.href="\##{nick}"
3127
return nick
3228
class TerrainWorker
@@ -75,7 +71,7 @@ init = ()->
7571
}
7672
scene=new THREE.Scene
7773
scene.background=new THREE.Color "lightblue"
78-
camera = new THREE.PerspectiveCamera 75, 2, 0.1, 64*5
74+
camera = new THREE.PerspectiveCamera 90, 2, 0.1, 64*5
7975
camera.rotation.order = "YXZ"
8076
camera.position.set 26, 26, 26
8177

@@ -121,7 +117,7 @@ init = ()->
121117
nick=getNick()
122118
console.log "User nick: #{nick}"
123119
socket.emit "initClient", {
124-
nick
120+
nick:nick
125121
}
126122
return
127123
socket.on "blockUpdate",(block)->

‎client/bundle.js‎

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

‎logs/1601709439.log‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[INFO]: Started logging...
2+
[Warning] onItemPlace handler was registered twice for redstone_torch
3+
October 3rd 2020, 09:17:19 [Warning] onItemPlace handler was registered twice for repeater
4+
October 3rd 2020, 09:17:19 [Warning] onItemPlace handler was registered twice for oak_sign
5+
October 3rd 2020, 09:17:19 [Warning] onItemPlace handler was registered twice for spruce_sign
6+
October 3rd 2020, 09:17:19 [Warning] onItemPlace handler was registered twice for birch_sign
7+
October 3rd 2020, 09:17:19 [Warning] onItemPlace handler was registered twice for acacia_sign
8+
October 3rd 2020, 09:17:19 [Warning] onItemPlace handler was registered twice for jungle_sign
9+
October 3rd 2020, 09:17:19 [Warning] onItemPlace handler was registered twice for dark_oak_sign
10+
October 3rd 2020, 09:17:19 [INFO]: Server listening on port 25565
11+
October 3rd 2020, 09:17:19 seed: 38015920

‎logs/1601709562.log‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[INFO]: Started logging...
2+
October 3rd 2020, 09:19:23 seed: 38015920
3+
October 3rd 2020, 09:19:30 [INFO]: MJQ (127.0.0.1) connected
4+
October 3rd 2020, 09:19:30 [INFO]: position written, player spawning...
5+
October 3rd 2020, 09:20:12 [INFO]: MJQ disconnected

‎logs/1601709652.log‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[INFO]: Started logging...
2+
October 3rd 2020, 09:20:52 seed: 38015920
3+
October 3rd 2020, 09:21:02 [INFO]: MJQ (127.0.0.1) connected
4+
October 3rd 2020, 09:21:02 [INFO]: position written, player spawning...
5+
October 3rd 2020, 09:21:26 [INFO]: MJQ issued command: /help
6+
October 3rd 2020, 09:21:39 [INFO]: MJQ issued command: /help
7+
October 3rd 2020, 09:21:41 [INFO]: MJQ issued command: /help
8+
October 3rd 2020, 09:21:47 [INFO]: MJQ issued command: /gamemode
9+
October 3rd 2020, 09:21:52 [INFO]: MJQ issued command: /gamemode

‎logs/1601709731.log‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[INFO]: Started logging...
2+
October 3rd 2020, 09:22:12 seed: 38015920
3+
October 3rd 2020, 09:22:14 [INFO]: MJQ (127.0.0.1) connected
4+
October 3rd 2020, 09:22:14 [INFO]: position written, player spawning...
5+
October 3rd 2020, 09:22:32 [INFO]: MJQ issued command: /gamemode

‎package-lock.json‎

Lines changed: 112 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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"start": "node server/start.js",
77
"coffee": "coffee -o client/ -cw build/coffee/",
88
"atlas": "node build/atlas.js",
9-
"gitignore": "node build/gitignore.js"
9+
"gitignore": "node build/gitignore.js",
10+
"mcserver": "node server/mcserver.js"
1011
},
1112
"repository": {
1213
"type": "git",
@@ -22,6 +23,7 @@
2223
"canvas": "^2.6.1",
2324
"child_process": "^1.0.2",
2425
"express": "^4.17.1",
26+
"flying-squid": "^1.3.1",
2527
"http": "0.0.1-security",
2628
"mineflayer": "^2.28.1",
2729
"opn": "^6.0.0",

‎server/config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"express-port":8080,
44
"host":"localhost",
55
"realServer":{
6-
"ip":"mc.grok.eu",
6+
"ip":"localhost",
77
"port":25565
88
}
99
}

‎server/savedWorld.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)