update to 1.20.2

Author: GeorgeRNG

.github/README.md

@@ -12,7 +12,6 @@ A DiamondFire utility client for advanced coding.
 
 A Fabric 1.20 mod for coding more efficiently with utility features including but not limited to:
 * Automatically placing templates in inventory
-* Rendering only the plot you are currently coding in
 * Moving faster in codespace
 * A palette with all the actions
 
@@ -22,10 +21,11 @@ A Fabric 1.20 mod for coding more efficiently with utility features including bu
 3. Move the downloaded mod files into the mods folder located at .minecraft/mods.
 4. Launch the game and try it out on [DiamondFire](mcdiamondfire.com).
 
+## Useful Info
+There's a [discord](https://discord.gg/NqU6XnyVPA) for CodeClient, and a helpful [wiki](https://github.com/DFOnline/CodeClient/wiki)
+
 ## Versions
 * [1.20 (latest)](https://github.com/DFOnline/CodeClient/releases/latest)
-* [1.19.4](https://github.com/DFOnline/CodeClient/releases/tag/v71)
-* [1.19.3](https://github.com/DFOnline/CodeClient/releases/tag/v48)
 
 ## Contributing
 

gradle.properties

@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 ## Check these on https://fabricmc.net/develop/
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.9
-loader_version=0.14.21
+minecraft_version=1.20.2
+yarn_mappings=1.20.2+build.4
+loader_version=0.14.24
 
 # Mod Properties
 mod_version=1.5.7
 maven_group=dev.dfonline
 archives_base_name=CodeClient
 
 # Dependencies
-fabric_version=0.85.0+1.20.1
-modmenu_version=6.1.0-rc.4
-yacl_version=3.0.1+1.20
+fabric_version=0.90.7+1.20.2
+modmenu_version=8.0.0
+yacl_version=3.3.0-beta.1+1.20.2

src/main/java/dev/dfonline/codeclient/dev/DevInventory/DevInventoryScreen.java

@@ -72,14 +72,14 @@ public DevInventoryScreen(PlayerEntity player) {
 
     public void handledScreenTick() {
         super.handledScreenTick();
-        if (this.searchBox != null) {
-            this.searchBox.tick();
-        }
+//        if (this.searchBox != null) {
+//            this.searchBox.tick();
+//        }
     }
 
     protected void onMouseClick(@Nullable Slot slot, int slotId, int button, SlotActionType actionType) {
         if(slot == null) return;
-        this.searchBox.setCursorToEnd();
+        this.searchBox.setCursorToEnd(false);
         this.searchBox.setSelectionEnd(0);
 
         if(slot == this.deleteItemSlot) {
@@ -129,7 +129,7 @@ protected void init() {
         setSelectedTab(6);
         if(Config.getConfig().FocusSearch)
         searchBox.setFocused(true);
-        searchBox.setCursorToEnd();
+        searchBox.setCursorToEnd(false);
         searchBox.setSelectionEnd(0);
         this.client.player.playerScreenHandler.removeListener(this.listener);
         this.listener = new CreativeInventoryListener(this.client);
@@ -276,7 +276,7 @@ private void populate() {
     }
 
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
-        this.renderBackground(context);
+        this.renderBackground(context, mouseX, mouseY, delta);
         super.render(context, mouseX, mouseY, delta);
 
         Integer hoveredGroup = getGroupFromMouse(mouseX,mouseY);
@@ -348,7 +348,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
             if(CodeClient.MC.options.chatKey.matchesKey(keyCode,scanCode) || CodeClient.editBind.matchesKey(keyCode,scanCode)) {
                 if(keyCode == GLFW.GLFW_KEY_Y) setSelectedTab(SEARCH.getIndex());
                 searchBox.setFocused(true);
-                searchBox.setCursorToEnd();
+                searchBox.setCursorToEnd(false);
                 searchBox.setSelectionEnd(0);
                 ignoreNextKey = true;
                 return true;
@@ -387,7 +387,7 @@ protected void drawBackground(DrawContext context, float delta, int mouseX, int
             else context.drawTexture(TEXTURE, scrollbarX, scrollbarY + (95 * (int) (this.scrollPosition * 9) / (scrollHeight)), 232, 0, 12, 15);
         }
         else {
-            if(this.client != null && this.client.player != null) InventoryScreen.drawEntity(context, this.x + 88, this.y + 45, 20, (float)(this.x + 88 - mouseX), (float)(this.y + 45 - 30 - mouseY), this.client.player);
+            if(this.client != null && this.client.player != null) InventoryScreen.drawEntity(context, this.x + 73, this.y + 6, this.x + 105, this.y + 49, 20, 0.0625F, (float)mouseX, (float)mouseY, this.client.player);
         }
 
     }

src/main/java/dev/dfonline/codeclient/dev/overlay/ChestPeeker.java

@@ -98,7 +98,7 @@ public static <T extends PacketListener> boolean handlePacket(Packet<T> packet)
                 if(slot.getSlot() != 1) return false;
                 CodeClient.MC.getNetworkHandler().sendPacket(new CreativeInventoryActionC2SPacket(1,ItemStack.EMPTY));
                 shouldClearChest = false;
-                NbtCompound nbt = slot.getItemStack().getNbt();
+                NbtCompound nbt = slot.getStack().getNbt();
                 if(nbt == null) return false;
                 NbtCompound bet = nbt.getCompound("BlockEntityTag");
                 if(bet == null) return false;

src/main/java/dev/dfonline/codeclient/mixin/entity/MEntity.java

@@ -37,10 +37,10 @@ private void onMove(MovementType movementType, Vec3d movement, CallbackInfo ci)
         }
     }
 
-    @Inject(method = "wouldPoseNotCollide", at = @At("HEAD"), cancellable = true)
-    private void wouldPoseNotCollide(EntityPose pose, CallbackInfoReturnable<Boolean> cir) {
-        if(NoClip.isIgnoringWalls() && this.getId() == CodeClient.MC.player.getId()) {
-            cir.setReturnValue(true);
-        }
-    }
+//    @Inject(method = "wouldPoseNotCollide", at = @At("HEAD"), cancellable = true)
+//    private void wouldPoseNotCollide(EntityPose pose, CallbackInfoReturnable<Boolean> cir) {
+//        if(NoClip.isIgnoringWalls() && this.getId() == CodeClient.MC.player.getId()) {
+//            cir.setReturnValue(true);
+//        }
+//    }
 }

src/main/java/dev/dfonline/codeclient/mixin/network/MClientPlayNetworkHandler.java src/main/java/dev/dfonline/codeclient/mixin/network/MClientCommonPlayNetworkHandler.java

@@ -1,15 +1,15 @@
 package dev.dfonline.codeclient.mixin.network;
 
 import dev.dfonline.codeclient.CodeClient;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
+import net.minecraft.client.network.ClientCommonNetworkHandler;
 import net.minecraft.network.packet.Packet;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(ClientPlayNetworkHandler.class)
-public abstract class MClientPlayNetworkHandler {
+@Mixin(ClientCommonNetworkHandler.class)
+public abstract class MClientCommonPlayNetworkHandler {
     @Inject(method = "sendPacket", at = @At("HEAD"), cancellable = true)
     private void sendPacket(Packet<?> packet, CallbackInfo ci) {
         if(CodeClient.onSendPacket(packet)) ci.cancel();

src/main/java/dev/dfonline/codeclient/mixin/render/hud/MTitleScreen.java

@@ -16,7 +16,7 @@ public class MTitleScreen {
     @Inject(method = "init", at = @At("RETURN"))
     public void onInit(CallbackInfo ci) {
         if(CodeClient.autoJoin == CodeClient.AutoJoin.GAME) {
-            ServerInfo info = new ServerInfo("DiamondFire", Config.getConfig().AutoNode.prepend + "mcdiamondfire.com", false);
+            ServerInfo info = new ServerInfo("DiamondFire", Config.getConfig().AutoNode.prepend + "mcdiamondfire.com", ServerInfo.ServerType.OTHER);
             ConnectScreen.connect((TitleScreen)(Object)this, CodeClient.MC, ServerAddress.parse(info.address), info, true);
 
             CodeClient.autoJoin =Config.getConfig().AutoJoinPlot ? CodeClient.AutoJoin.PLOT : CodeClient.AutoJoin.NONE;

src/main/resources/CodeClient.mixins.json

@@ -13,7 +13,7 @@
     "entity.player.MClientPlayerInteractionManager",
     "entity.player.MPlayerEntity",
     "network.MClientConnection",
-    "network.MClientPlayNetworkHandler",
+    "network.MClientCommonPlayNetworkHandler",
     "render.MChunkRendererRegion",
     "render.MDebugRenderer",
     "render.hud.MDrawContext",