Skip to content

Commit 86fb4fe

Browse files
authored
Implemented 1.20.3/4
1.20.3/4 Implementation
2 parents 9a147b5 + 4383117 commit 86fb4fe

24 files changed

+10680
-6045
lines changed

MinecraftClient/ChatBots/WebSocketBot.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,16 +1221,16 @@ public override void OnEntityEffect(Entity entity, Effects effect, int amplifier
12211221
}
12221222

12231223
public override void OnScoreboardObjective(string objectiveName, byte mode, string objectiveValue, int type,
1224-
string json_)
1224+
string json_, int numberFormat)
12251225
{
12261226
SendEvent("OnScoreboardObjective",
1227-
new { objectiveName, mode, objectiveValue, type, rawJson = json_ });
1227+
new { objectiveName, mode, objectiveValue, type, rawJson = json_, numberFormat });
12281228
}
12291229

1230-
public override void OnUpdateScore(string entityName, int action, string objectiveName, int value)
1230+
public override void OnUpdateScore(string entityName, int action, string objectiveName, string objectiveDisplayName, int value, int numberFormat)
12311231
{
12321232
SendEvent("OnUpdateScore",
1233-
new { entityName, action, objectiveName, type = value });
1233+
new { entityName, action, objectiveName, objectiveDisplayName, type = value, numberFormat });
12341234
}
12351235

12361236
public override void OnInventoryUpdate(int inventoryId)

MinecraftClient/Inventory/ItemPalettes/ItemPalette1204.cs

Lines changed: 1330 additions & 0 deletions
Large diffs are not rendered by default.

MinecraftClient/Inventory/ItemType.cs

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ public enum ItemType
154154
BrainCoralBlock,
155155
BrainCoralFan,
156156
Bread,
157+
BreezeSpawnEgg,
157158
BrewerPotterySherd,
158159
BrewingStand,
159160
Brick,
@@ -228,13 +229,16 @@ public enum ItemType
228229
ChickenSpawnEgg,
229230
ChippedAnvil,
230231
ChiseledBookshelf,
232+
ChiseledCopper,
231233
ChiseledDeepslate,
232234
ChiseledNetherBricks,
233235
ChiseledPolishedBlackstone,
234236
ChiseledQuartzBlock,
235237
ChiseledRedSandstone,
236238
ChiseledSandstone,
237239
ChiseledStoneBricks,
240+
ChiseledTuff,
241+
ChiseledTuffBricks,
238242
ChorusFlower,
239243
ChorusFruit,
240244
ChorusPlant,
@@ -274,15 +278,20 @@ public enum ItemType
274278
CookedSalmon,
275279
Cookie,
276280
CopperBlock,
281+
CopperBulb,
282+
CopperDoor,
283+
CopperGrate,
277284
CopperIngot,
278285
CopperOre,
286+
CopperTrapdoor,
279287
Cornflower,
280288
CowSpawnEgg,
281289
CrackedDeepslateBricks,
282290
CrackedDeepslateTiles,
283291
CrackedNetherBricks,
284292
CrackedPolishedBlackstoneBricks,
285293
CrackedStoneBricks,
294+
Crafter,
286295
CraftingTable,
287296
CreeperBannerPattern,
288297
CreeperHead,
@@ -444,7 +453,12 @@ public enum ItemType
444453
EvokerSpawnEgg,
445454
ExperienceBottle,
446455
ExplorerPotterySherd,
456+
ExposedChiseledCopper,
447457
ExposedCopper,
458+
ExposedCopperBulb,
459+
ExposedCopperDoor,
460+
ExposedCopperGrate,
461+
ExposedCopperTrapdoor,
448462
ExposedCutCopper,
449463
ExposedCutCopperSlab,
450464
ExposedCutCopperStairs,
@@ -511,7 +525,7 @@ public enum ItemType
511525
GraniteSlab,
512526
GraniteStairs,
513527
GraniteWall,
514-
Grass,
528+
Grass, // 1.20.3+ renamed to ShortGrass
515529
GrassBlock,
516530
Gravel,
517531
GrayBanner,
@@ -826,7 +840,12 @@ public enum ItemType
826840
OrangeTulip,
827841
OrangeWool,
828842
OxeyeDaisy,
843+
OxidizedChiseledCopper,
829844
OxidizedCopper,
845+
OxidizedCopperBulb,
846+
OxidizedCopperDoor,
847+
OxidizedCopperGrate,
848+
OxidizedCopperTrapdoor,
830849
OxidizedCutCopper,
831850
OxidizedCutCopperSlab,
832851
OxidizedCutCopperStairs,
@@ -895,6 +914,10 @@ public enum ItemType
895914
PolishedGranite,
896915
PolishedGraniteSlab,
897916
PolishedGraniteStairs,
917+
PolishedTuff,
918+
PolishedTuffSlab,
919+
PolishedTuffStairs,
920+
PolishedTuffWall,
898921
PoppedChorusFruit,
899922
Poppy,
900923
Porkchop,
@@ -1020,6 +1043,7 @@ public enum ItemType
10201043
SheepSpawnEgg,
10211044
ShelterPotterySherd,
10221045
Shield,
1046+
ShortGrass,
10231047
Shroomlight,
10241048
ShulkerBox,
10251049
ShulkerShell,
@@ -1156,6 +1180,8 @@ public enum ItemType
11561180
TotemOfUndying,
11571181
TraderLlamaSpawnEgg,
11581182
TrappedChest,
1183+
TrialKey,
1184+
TrialSpawner,
11591185
Trident,
11601186
TripwireHook,
11611187
TropicalFish,
@@ -1165,6 +1191,13 @@ public enum ItemType
11651191
TubeCoralBlock,
11661192
TubeCoralFan,
11671193
Tuff,
1194+
TuffBrickSlab,
1195+
TuffBrickStairs,
1196+
TuffBrickWall,
1197+
TuffBricks,
1198+
TuffSlab,
1199+
TuffStairs,
1200+
TuffWall,
11681201
TurtleEgg,
11691202
TurtleHelmet,
11701203
TurtleSpawnEgg,
@@ -1197,24 +1230,49 @@ public enum ItemType
11971230
WarpedTrapdoor,
11981231
WarpedWartBlock,
11991232
WaterBucket,
1233+
WaxedChiseledCopper,
12001234
WaxedCopperBlock,
1235+
WaxedCopperBulb,
1236+
WaxedCopperDoor,
1237+
WaxedCopperGrate,
1238+
WaxedCopperTrapdoor,
12011239
WaxedCutCopper,
12021240
WaxedCutCopperSlab,
12031241
WaxedCutCopperStairs,
1242+
WaxedExposedChiseledCopper,
12041243
WaxedExposedCopper,
1244+
WaxedExposedCopperBulb,
1245+
WaxedExposedCopperDoor,
1246+
WaxedExposedCopperGrate,
1247+
WaxedExposedCopperTrapdoor,
12051248
WaxedExposedCutCopper,
12061249
WaxedExposedCutCopperSlab,
12071250
WaxedExposedCutCopperStairs,
1251+
WaxedOxidizedChiseledCopper,
12081252
WaxedOxidizedCopper,
1253+
WaxedOxidizedCopperBulb,
1254+
WaxedOxidizedCopperDoor,
1255+
WaxedOxidizedCopperGrate,
1256+
WaxedOxidizedCopperTrapdoor,
12091257
WaxedOxidizedCutCopper,
12101258
WaxedOxidizedCutCopperSlab,
12111259
WaxedOxidizedCutCopperStairs,
1260+
WaxedWeatheredChiseledCopper,
12121261
WaxedWeatheredCopper,
1262+
WaxedWeatheredCopperBulb,
1263+
WaxedWeatheredCopperDoor,
1264+
WaxedWeatheredCopperGrate,
1265+
WaxedWeatheredCopperTrapdoor,
12131266
WaxedWeatheredCutCopper,
12141267
WaxedWeatheredCutCopperSlab,
12151268
WaxedWeatheredCutCopperStairs,
12161269
WayfinderArmorTrimSmithingTemplate,
1270+
WeatheredChiseledCopper,
12171271
WeatheredCopper,
1272+
WeatheredCopperBulb,
1273+
WeatheredCopperDoor,
1274+
WeatheredCopperGrate,
1275+
WeatheredCopperTrapdoor,
12181276
WeatheredCutCopper,
12191277
WeatheredCutCopperSlab,
12201278
WeatheredCutCopperStairs,

0 commit comments

Comments
 (0)