Implemented 1.20.3/4

1.20.3/4 Implementation
MCCTeam · Mar 5, 2024 · 86fb4fe · 86fb4fe
2 parents 9a147b5 + 4383117
commit 86fb4fe
Show file tree

Hide file tree

Showing 24 changed files with 10,680 additions and 6,045 deletions.
diff --git a/MinecraftClient/ChatBots/WebSocketBot.cs b/MinecraftClient/ChatBots/WebSocketBot.cs
@@ -1221,16 +1221,16 @@ public override void OnEntityEffect(Entity entity, Effects effect, int amplifier
     }
 
     public override void OnScoreboardObjective(string objectiveName, byte mode, string objectiveValue, int type,
-        string json_)
+        string json_, int numberFormat)
     {
         SendEvent("OnScoreboardObjective",
-            new { objectiveName, mode, objectiveValue, type, rawJson = json_ });
+            new { objectiveName, mode, objectiveValue, type, rawJson = json_, numberFormat });
     }
 
-    public override void OnUpdateScore(string entityName, int action, string objectiveName, int value)
+    public override void OnUpdateScore(string entityName, int action, string objectiveName, string objectiveDisplayName, int value, int numberFormat)
     {
         SendEvent("OnUpdateScore",
-            new { entityName, action, objectiveName, type = value });
+            new { entityName, action, objectiveName, objectiveDisplayName, type = value, numberFormat });
     }
 
     public override void OnInventoryUpdate(int inventoryId)

diff --git a/MinecraftClient/Inventory/ItemPalettes/ItemPalette1204.cs b/MinecraftClient/Inventory/ItemPalettes/ItemPalette1204.cs
diff --git a/MinecraftClient/Inventory/ItemType.cs b/MinecraftClient/Inventory/ItemType.cs
@@ -154,6 +154,7 @@ public enum ItemType
         BrainCoralBlock,
         BrainCoralFan,
         Bread,
+        BreezeSpawnEgg,
         BrewerPotterySherd,
         BrewingStand,
         Brick,
@@ -228,13 +229,16 @@ public enum ItemType
         ChickenSpawnEgg,
         ChippedAnvil,
         ChiseledBookshelf,
+        ChiseledCopper,
         ChiseledDeepslate,
         ChiseledNetherBricks,
         ChiseledPolishedBlackstone,
         ChiseledQuartzBlock,
         ChiseledRedSandstone,
         ChiseledSandstone,
         ChiseledStoneBricks,
+        ChiseledTuff,
+        ChiseledTuffBricks,
         ChorusFlower,
         ChorusFruit,
         ChorusPlant,
@@ -274,15 +278,20 @@ public enum ItemType
         CookedSalmon,
         Cookie,
         CopperBlock,
+        CopperBulb,
+        CopperDoor,
+        CopperGrate,
         CopperIngot,
         CopperOre,
+        CopperTrapdoor,
         Cornflower,
         CowSpawnEgg,
         CrackedDeepslateBricks,
         CrackedDeepslateTiles,
         CrackedNetherBricks,
         CrackedPolishedBlackstoneBricks,
         CrackedStoneBricks,
+        Crafter,
         CraftingTable,
         CreeperBannerPattern,
         CreeperHead,
@@ -444,7 +453,12 @@ public enum ItemType
         EvokerSpawnEgg,
         ExperienceBottle,
         ExplorerPotterySherd,
+        ExposedChiseledCopper,
         ExposedCopper,
+        ExposedCopperBulb,
+        ExposedCopperDoor,
+        ExposedCopperGrate,
+        ExposedCopperTrapdoor,
         ExposedCutCopper,
         ExposedCutCopperSlab,
         ExposedCutCopperStairs,
@@ -511,7 +525,7 @@ public enum ItemType
         GraniteSlab,
         GraniteStairs,
         GraniteWall,
-        Grass,
+        Grass, // 1.20.3+ renamed to ShortGrass
         GrassBlock,
         Gravel,
         GrayBanner,
@@ -826,7 +840,12 @@ public enum ItemType
         OrangeTulip,
         OrangeWool,
         OxeyeDaisy,
+        OxidizedChiseledCopper,
         OxidizedCopper,
+        OxidizedCopperBulb,
+        OxidizedCopperDoor,
+        OxidizedCopperGrate,
+        OxidizedCopperTrapdoor,
         OxidizedCutCopper,
         OxidizedCutCopperSlab,
         OxidizedCutCopperStairs,
@@ -895,6 +914,10 @@ public enum ItemType
         PolishedGranite,
         PolishedGraniteSlab,
         PolishedGraniteStairs,
+        PolishedTuff,
+        PolishedTuffSlab,
+        PolishedTuffStairs,
+        PolishedTuffWall,
         PoppedChorusFruit,
         Poppy,
         Porkchop,
@@ -1020,6 +1043,7 @@ public enum ItemType
         SheepSpawnEgg,
         ShelterPotterySherd,
         Shield,
+        ShortGrass,
         Shroomlight,
         ShulkerBox,
         ShulkerShell,
@@ -1156,6 +1180,8 @@ public enum ItemType
         TotemOfUndying,
         TraderLlamaSpawnEgg,
         TrappedChest,
+        TrialKey,
+        TrialSpawner,
         Trident,
         TripwireHook,
         TropicalFish,
@@ -1165,6 +1191,13 @@ public enum ItemType
         TubeCoralBlock,
         TubeCoralFan,
         Tuff,
+        TuffBrickSlab,
+        TuffBrickStairs,
+        TuffBrickWall,
+        TuffBricks,
+        TuffSlab,
+        TuffStairs,
+        TuffWall,
         TurtleEgg,
         TurtleHelmet,
         TurtleSpawnEgg,
@@ -1197,24 +1230,49 @@ public enum ItemType
         WarpedTrapdoor,
         WarpedWartBlock,
         WaterBucket,
+        WaxedChiseledCopper,
         WaxedCopperBlock,
+        WaxedCopperBulb,
+        WaxedCopperDoor,
+        WaxedCopperGrate,
+        WaxedCopperTrapdoor,
         WaxedCutCopper,
         WaxedCutCopperSlab,
         WaxedCutCopperStairs,
+        WaxedExposedChiseledCopper,
         WaxedExposedCopper,
+        WaxedExposedCopperBulb,
+        WaxedExposedCopperDoor,
+        WaxedExposedCopperGrate,
+        WaxedExposedCopperTrapdoor,
         WaxedExposedCutCopper,
         WaxedExposedCutCopperSlab,
         WaxedExposedCutCopperStairs,
+        WaxedOxidizedChiseledCopper,
         WaxedOxidizedCopper,
+        WaxedOxidizedCopperBulb,
+        WaxedOxidizedCopperDoor,
+        WaxedOxidizedCopperGrate,
+        WaxedOxidizedCopperTrapdoor,
         WaxedOxidizedCutCopper,
         WaxedOxidizedCutCopperSlab,
         WaxedOxidizedCutCopperStairs,
+        WaxedWeatheredChiseledCopper,
         WaxedWeatheredCopper,
+        WaxedWeatheredCopperBulb,
+        WaxedWeatheredCopperDoor,
+        WaxedWeatheredCopperGrate,
+        WaxedWeatheredCopperTrapdoor,
         WaxedWeatheredCutCopper,
         WaxedWeatheredCutCopperSlab,
         WaxedWeatheredCutCopperStairs,
         WayfinderArmorTrimSmithingTemplate,
+        WeatheredChiseledCopper,
         WeatheredCopper,
+        WeatheredCopperBulb,
+        WeatheredCopperDoor,
+        WeatheredCopperGrate,
+        WeatheredCopperTrapdoor,
         WeatheredCutCopper,
         WeatheredCutCopperSlab,
         WeatheredCutCopperStairs,