Skip to content

Commit 929a081

Browse files
laz1444laz1444
authored
Merge pull request #30 from CobwebSMP/master
bump
2 parents 242a1b5 + 76c2120 commit 929a081

29 files changed

+514
-269
lines changed

‎.github/workflows/dotnet.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ jobs:
3838
file: src/MiNET/MiNET.Console/minet.zip
3939
asset_name: MiNET.zip
4040
tag: ${{ github.ref }}
41-
release_name: MiNET-CobwebSMP 1.13.0.7 (1.20.70)
41+
release_name: MiNET-CobwebSMP 1.13.0.8 (1.20.70)
4242
body: ${{ github.event.head_commit.message }}

‎src/MiNET/MiNET.Client/ClientUtils.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ public static ChunkColumn DecodeChunkColumn(int subChunkCount, byte[] buffer, Bl
182182
}
183183
stream.Position = afterPos;
184184
}
185-
return chunkColumn;
186185
}
187186

188187
if (stream.Read(chunkColumn.biomeId, 0, 256) != 256)

‎src/MiNET/MiNET.Client/ICommandExecutioner.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
using System;
2727
using System.Threading.Tasks;
2828
using log4net;
29-
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
30-
using MiNET.Blocks;
3129
using MiNET.Net;
3230
using MiNET.Utils;
3331

‎src/MiNET/MiNET.Client/schema.json‎

Lines changed: 66 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@
216216
]
217217
},
218218
{
219-
"Command": "sapling [\"age_bit\" = false, \"sapling_type\" = \"oak\"]",
219+
"Command": "oak_sapling [\"age_bit\" = false]",
220220
"Name": "minecraft:sapling",
221221
"Id": 6,
222222
"Data": 0,
@@ -234,7 +234,7 @@
234234
]
235235
},
236236
{
237-
"Command": "sapling [\"age_bit\" = false, \"sapling_type\" = \"spruce\"]",
237+
"Command": "spruce_sapling [\"age_bit\" = false]",
238238
"Name": "minecraft:sapling",
239239
"Id": 6,
240240
"Data": 1,
@@ -252,7 +252,7 @@
252252
]
253253
},
254254
{
255-
"Command": "sapling [\"age_bit\" = false, \"sapling_type\" = \"birch\"]",
255+
"Command": "birch_sapling [\"age_bit\" = false]",
256256
"Name": "minecraft:sapling",
257257
"Id": 6,
258258
"Data": 2,
@@ -270,7 +270,7 @@
270270
]
271271
},
272272
{
273-
"Command": "sapling [\"age_bit\" = false, \"sapling_type\" = \"jungle\"]",
273+
"Command": "jungle_sapling [\"age_bit\" = false]",
274274
"Name": "minecraft:sapling",
275275
"Id": 6,
276276
"Data": 3,
@@ -288,7 +288,7 @@
288288
]
289289
},
290290
{
291-
"Command": "sapling [\"age_bit\" = false, \"sapling_type\" = \"acacia\"]",
291+
"Command": "acacia_sapling [\"age_bit\" = false]",
292292
"Name": "minecraft:sapling",
293293
"Id": 6,
294294
"Data": 4,
@@ -306,7 +306,7 @@
306306
]
307307
},
308308
{
309-
"Command": "sapling [\"age_bit\" = false, \"sapling_type\" = \"dark_oak\"]",
309+
"Command": "dark_oak_sapling [\"age_bit\" = false]",
310310
"Name": "minecraft:sapling",
311311
"Id": 6,
312312
"Data": 5,
@@ -322,9 +322,27 @@
322322
"Value": "dark_oak"
323323
}
324324
]
325+
},
326+
{
327+
"Command": "oak_sapling [\"age_bit\" = true]",
328+
"Name": "minecraft:sapling",
329+
"Id": 6,
330+
"Data": 8,
331+
"States": [
332+
{
333+
"Type": "1",
334+
"Name": "age_bit",
335+
"Value": "1"
336+
},
337+
{
338+
"Type": "8",
339+
"Name": "sapling_type",
340+
"Value": "oak"
341+
}
342+
]
325343
},
326344
{
327-
"Command": "sapling [\"age_bit\" = true, \"sapling_type\" = \"spruce\"]",
345+
"Command": "spruce_sapling [\"age_bit\" = true]",
328346
"Name": "minecraft:sapling",
329347
"Id": 6,
330348
"Data": 9,
@@ -342,7 +360,7 @@
342360
]
343361
},
344362
{
345-
"Command": "sapling [\"age_bit\" = true, \"sapling_type\" = \"birch\"]",
363+
"Command": "birch_sapling [\"age_bit\" = true]",
346364
"Name": "minecraft:sapling",
347365
"Id": 6,
348366
"Data": 10,
@@ -360,7 +378,7 @@
360378
]
361379
},
362380
{
363-
"Command": "sapling [\"age_bit\" = true, \"sapling_type\" = \"jungle\"]",
381+
"Command": "jungle_sapling [\"age_bit\" = true]",
364382
"Name": "minecraft:sapling",
365383
"Id": 6,
366384
"Data": 11,
@@ -378,7 +396,7 @@
378396
]
379397
},
380398
{
381-
"Command": "sapling [\"age_bit\" = true, \"sapling_type\" = \"acacia\"]",
399+
"Command": "acacia_sapling [\"age_bit\" = true]",
382400
"Name": "minecraft:sapling",
383401
"Id": 6,
384402
"Data": 12,
@@ -396,7 +414,7 @@
396414
]
397415
},
398416
{
399-
"Command": "sapling [\"age_bit\" = true, \"sapling_type\" = \"dark_oak\"]",
417+
"Command": "dark_oak_sapling [\"age_bit\" = true]",
400418
"Name": "minecraft:sapling",
401419
"Id": 6,
402420
"Data": 13,
@@ -31077,7 +31095,7 @@
3107731095
]
3107831096
},
3107931097
{
31080-
"Command": "coral_fan [\"coral_color\" = \"blue\", \"coral_fan_direction\" = 0]",
31098+
"Command": "tube_coral_fan [\"coral_fan_direction\" = 0]",
3108131099
"Name": "minecraft:coral_fan",
3108231100
"Id": 388,
3108331101
"Data": 0,
@@ -31095,7 +31113,7 @@
3109531113
]
3109631114
},
3109731115
{
31098-
"Command": "coral_fan [\"coral_color\" = \"pink\", \"coral_fan_direction\" = 0]",
31116+
"Command": "brain_coral_fan [\"coral_fan_direction\" = 0]",
3109931117
"Name": "minecraft:coral_fan",
3110031118
"Id": 388,
3110131119
"Data": 1,
@@ -31113,7 +31131,7 @@
3111331131
]
3111431132
},
3111531133
{
31116-
"Command": "coral_fan [\"coral_color\" = \"purple\", \"coral_fan_direction\" = 0]",
31134+
"Command": "bubble_coral_fan [\"coral_fan_direction\" = 0]",
3111731135
"Name": "minecraft:coral_fan",
3111831136
"Id": 388,
3111931137
"Data": 2,
@@ -31131,7 +31149,7 @@
3113131149
]
3113231150
},
3113331151
{
31134-
"Command": "coral_fan [\"coral_color\" = \"red\", \"coral_fan_direction\" = 0]",
31152+
"Command": "fire_coral_fan [\"coral_fan_direction\" = 0]",
3113531153
"Name": "minecraft:coral_fan",
3113631154
"Id": 388,
3113731155
"Data": 3,
@@ -31149,7 +31167,7 @@
3114931167
]
3115031168
},
3115131169
{
31152-
"Command": "coral_fan [\"coral_color\" = \"yellow\", \"coral_fan_direction\" = 0]",
31170+
"Command": "horn_coral_fan [\"coral_fan_direction\" = 0]",
3115331171
"Name": "minecraft:coral_fan",
3115431172
"Id": 388,
3115531173
"Data": 4,
@@ -31167,7 +31185,7 @@
3116731185
]
3116831186
},
3116931187
{
31170-
"Command": "coral_fan [\"coral_color\" = \"blue\", \"coral_fan_direction\" = 1]",
31188+
"Command": "tube_coral_fan [\"coral_fan_direction\" = 1]",
3117131189
"Name": "minecraft:coral_fan",
3117231190
"Id": 388,
3117331191
"Data": 5,
@@ -31185,7 +31203,7 @@
3118531203
]
3118631204
},
3118731205
{
31188-
"Command": "coral_fan [\"coral_color\" = \"pink\", \"coral_fan_direction\" = 1]",
31206+
"Command": "brain_coral_fan [\"coral_fan_direction\" = 1]",
3118931207
"Name": "minecraft:coral_fan",
3119031208
"Id": 388,
3119131209
"Data": 9,
@@ -31203,7 +31221,7 @@
3120331221
]
3120431222
},
3120531223
{
31206-
"Command": "coral_fan [\"coral_color\" = \"purple\", \"coral_fan_direction\" = 1]",
31224+
"Command": "bubble_coral_fan [\"coral_fan_direction\" = 1]",
3120731225
"Name": "minecraft:coral_fan",
3120831226
"Id": 388,
3120931227
"Data": 10,
@@ -31221,7 +31239,7 @@
3122131239
]
3122231240
},
3122331241
{
31224-
"Command": "coral_fan [\"coral_color\" = \"red\", \"coral_fan_direction\" = 1]",
31242+
"Command": "fire_coral_fan [\"coral_fan_direction\" = 1]",
3122531243
"Name": "minecraft:coral_fan",
3122631244
"Id": 388,
3122731245
"Data": 11,
@@ -31239,7 +31257,7 @@
3123931257
]
3124031258
},
3124131259
{
31242-
"Command": "coral_fan [\"coral_color\" = \"yellow\", \"coral_fan_direction\" = 1]",
31260+
"Command": "horn_coral_fan [\"coral_fan_direction\" = 1]",
3124331261
"Name": "minecraft:coral_fan",
3124431262
"Id": 388,
3124531263
"Data": 12,
@@ -31257,7 +31275,7 @@
3125731275
]
3125831276
},
3125931277
{
31260-
"Command": "coral_fan_dead [\"coral_color\" = \"blue\", \"coral_fan_direction\" = 0]",
31278+
"Command": "dead_tube_coral_fan [\"coral_fan_direction\" = 0]",
3126131279
"Name": "minecraft:coral_fan_dead",
3126231280
"Id": 389,
3126331281
"Data": 0,
@@ -31275,7 +31293,7 @@
3127531293
]
3127631294
},
3127731295
{
31278-
"Command": "coral_fan_dead [\"coral_color\" = \"pink\", \"coral_fan_direction\" = 0]",
31296+
"Command": "dead_brain_coral_fan [\"coral_fan_direction\" = 0]",
3127931297
"Name": "minecraft:coral_fan_dead",
3128031298
"Id": 389,
3128131299
"Data": 1,
@@ -31293,7 +31311,7 @@
3129331311
]
3129431312
},
3129531313
{
31296-
"Command": "coral_fan_dead [\"coral_color\" = \"purple\", \"coral_fan_direction\" = 0]",
31314+
"Command": "dead_bubble_coral_fan [\"coral_fan_direction\" = 0]",
3129731315
"Name": "minecraft:coral_fan_dead",
3129831316
"Id": 389,
3129931317
"Data": 2,
@@ -31311,7 +31329,7 @@
3131131329
]
3131231330
},
3131331331
{
31314-
"Command": "coral_fan_dead [\"coral_color\" = \"red\", \"coral_fan_direction\" = 0]",
31332+
"Command": "dead_fire_coral_fan [\"coral_fan_direction\" = 0]",
3131531333
"Name": "minecraft:coral_fan_dead",
3131631334
"Id": 389,
3131731335
"Data": 3,
@@ -31329,7 +31347,7 @@
3132931347
]
3133031348
},
3133131349
{
31332-
"Command": "coral_fan_dead [\"coral_color\" = \"yellow\", \"coral_fan_direction\" = 0]",
31350+
"Command": "dead_horn_coral_fan [\"coral_fan_direction\" = 0]",
3133331351
"Name": "minecraft:coral_fan_dead",
3133431352
"Id": 389,
3133531353
"Data": 4,
@@ -31345,9 +31363,27 @@
3134531363
"Value": "0"
3134631364
}
3134731365
]
31366+
},
31367+
{
31368+
"Command": "dead_tube_coral_fan [\"coral_fan_direction\" = 1]",
31369+
"Name": "minecraft:coral_fan_dead",
31370+
"Id": 389,
31371+
"Data": 8,
31372+
"States": [
31373+
{
31374+
"Type": "8",
31375+
"Name": "coral_color",
31376+
"Value": "blue"
31377+
},
31378+
{
31379+
"Type": "3",
31380+
"Name": "coral_fan_direction",
31381+
"Value": "1"
31382+
}
31383+
]
3134831384
},
3134931385
{
31350-
"Command": "coral_fan_dead [\"coral_color\" = \"pink\", \"coral_fan_direction\" = 1]",
31386+
"Command": "dead_brain_coral_fan [\"coral_fan_direction\" = 1]",
3135131387
"Name": "minecraft:coral_fan_dead",
3135231388
"Id": 389,
3135331389
"Data": 9,
@@ -31365,7 +31401,7 @@
3136531401
]
3136631402
},
3136731403
{
31368-
"Command": "coral_fan_dead [\"coral_color\" = \"purple\", \"coral_fan_direction\" = 1]",
31404+
"Command": "dead_bubble_coral_fan [\"coral_fan_direction\" = 1]",
3136931405
"Name": "minecraft:coral_fan_dead",
3137031406
"Id": 389,
3137131407
"Data": 10,
@@ -31383,7 +31419,7 @@
3138331419
]
3138431420
},
3138531421
{
31386-
"Command": "coral_fan_dead [\"coral_color\" = \"red\", \"coral_fan_direction\" = 1]",
31422+
"Command": "dead_fire_coral_fan [\"coral_fan_direction\" = 1]",
3138731423
"Name": "minecraft:coral_fan_dead",
3138831424
"Id": 389,
3138931425
"Data": 11,
@@ -31401,7 +31437,7 @@
3140131437
]
3140231438
},
3140331439
{
31404-
"Command": "coral_fan_dead [\"coral_color\" = \"yellow\", \"coral_fan_direction\" = 1]",
31440+
"Command": "dead_horn_coral_fan [\"coral_fan_direction\" = 1]",
3140531441
"Name": "minecraft:coral_fan_dead",
3140631442
"Id": 389,
3140731443
"Data": 12,

‎src/MiNET/MiNET.Console/minet.zip‎

13.1 KB
Binary file not shown.

‎src/MiNET/MiNET.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Other", "Other", "{DFC6A100
77
ProjectSection(SolutionItems) = preProject
88
..\..\.editorconfig = ..\..\.editorconfig
99
..\..\README.md = ..\..\README.md
10+
Redstone.md = Redstone.md
1011
EndProjectSection
1112
EndProject
1213
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MiNET", "MiNET\MiNET.csproj", "{A40D7181-E216-4C45-AEF8-AB66B42B1D2D}"

0 commit comments

Comments
 (0)