Skip to content

Commit 5099607

Browse files
isXanderisXander
committed
port to 1.21.10 complete
1 parent 5488173 commit 5099607

24 files changed

+119
-180
lines changed

‎PATCHED.md‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
| Basic | [MC-12062](https://bugs.mojang.com/browse/MC-12062) | Hotbar selection resets to the far left when exiting the end |
99
| Basic | [MC-22882](https://bugs.mojang.com/browse/MC-22882) | Ctrl + Q won't work on Mac (disabled by default) |
1010
| Basic | [MC-35361](https://bugs.mojang.com/browse/MC-35361) | Inventory opening is detected while in Nether Portal |
11-
| Basic | [MC-46503](https://bugs.mojang.com/browse/MC-46503) | You can retain a mob's shader in spectator mode by running /kill |
1211
| Basic | [MC-46737](https://bugs.mojang.com/browse/MC-46737) | Entities' shaders are applied when beginning to spectate them in third person |
1312
| Basic | [MC-46766](https://bugs.mojang.com/browse/MC-46766) | Mining a block in Survival, then changing to Spectator creates a breaking animation and sound |
1413
| Basic | [MC-57057](https://bugs.mojang.com/browse/MC-57057) | Guardian laser attack sound ignores distance |
@@ -32,7 +31,6 @@
3231
| Basic | [MC-165381](https://bugs.mojang.com/browse/MC-165381) | Block breaking can be delayed by dropping/throwing the tool while breaking a block | |
3332
| Basic | [MC-168573](https://bugs.mojang.com/browse/MC-168573) | After breaking a shield, the player's off-hand can't finish using some items |
3433
| Basic | [MC-176559](https://bugs.mojang.com/browse/MC-176559) | Breaking process resets when a pickaxe enchanted with Mending mends by XP / Mending slows down breaking blocks again |
35-
| Basic | [MC-183776](https://bugs.mojang.com/browse/MC-183776) | After switching gamemodes using F3+F4, you need to press F3 twice to toggle the debug screen |
3634
| Basic | [MC-188359](https://bugs.mojang.com/browse/MC-188359) | Burp sound does not play after drinking or after eating cake |
3735
| Basic | [MC-197260](https://bugs.mojang.com/browse/MC-197260) | Armor Stand renders itself and armor dark if its head is in a solid block |
3836
| Basic | [MC-201723](https://bugs.mojang.com/browse/MC-201723) | Statistics sprites don't look pressed when clicked |
@@ -46,7 +44,6 @@
4644
| Basic | [MC-242809](https://bugs.mojang.com/browse/MC-242809) | IP field in the multiplayer menu will not detect the IP if a space is put at the beginning/end of it |
4745
| Basic | [MC-259512](https://bugs.mojang.com/browse/MC-259512) | Horizontal camera rotation lags when riding |
4846
| Basic | [MC-267376](https://bugs.mojang.com/browse/MC-267376) | You can view through blocks on small scales (near plane clipping) |
49-
| Basic | [MC-267469](https://bugs.mojang.com/browse/MC-267469) | GUI List Entry highlight border not always aligned properly |
5047
| Basic | [MC-268420](https://bugs.mojang.com/browse/MC-268420) | Cooldown indicator flashes when switching items with high attack speed attribute |
5148
| Basic | [MC-280220](https://bugs.mojang.com/browse/MC-280220) | When a Dolphin holds an item, it is rendered upside-down |
5249
| Basic | [MC-298225](https://bugs.mojang.com/browse/MC-298225) | Shapes appear in the end sky with certain distance settings |
@@ -59,7 +56,6 @@
5956
| Basic | [MC-7569](https://bugs.mojang.com/browse/MC-7569) | RCON output has newlines removed |
6057
| Gameplay | [MC-8187](https://bugs.mojang.com/browse/MC-8187) | Two-by-two arrangements of jungle or spruce saplings cannot grow when there are adjacent blocks located north or west of the sapling formation |
6158
| Basic | [MC-30391](https://bugs.mojang.com/browse/MC-30391) | Chickens, blazes and the wither emit particles when landing from a height, despite falling slowly |
62-
| Basic | [MC-69216](https://bugs.mojang.com/browse/MC-69216) | Switching to spectator mode while fishing keeps rod cast |
6359
| Basic | [MC-81773](https://bugs.mojang.com/browse/MC-81773) | Bows and tridents drawn in survival/creative/adventure mode can be released in spectator mode |
6460
| Basic | [MC-82263](https://bugs.mojang.com/browse/MC-82263) | Ender dragon produces regular hurt sound on final hit |
6561
| Basic | [MC-84661](https://bugs.mojang.com/browse/MC-84661) | Glowing is considered a positive effect in potion item tooltips |
@@ -68,7 +64,6 @@
6864
| Basic | [MC-93018](https://bugs.mojang.com/browse/MC-93018) | Wild wolves show breeding hearts but do not breed |
6965
| Basic | [MC-94054](https://bugs.mojang.com/browse/MC-94054) | Cave spiders spin around when walking |
7066
| Basic | [MC-100991](https://bugs.mojang.com/browse/MC-100991) | Killing entities with a fishing rod doesn't count as a kill |
71-
| Basic | [MC-119417](https://bugs.mojang.com/browse/MC-119417) | A spectator can occupy a bed if they enter it and then are switched to spectator mode |
7267
| Basic | [MC-119754](https://bugs.mojang.com/browse/MC-119754) | Firework boosting on elytra continues in spectator mode |
7368
| Basic | [MC-121706](https://bugs.mojang.com/browse/MC-121706) | Skeletons and illusioners aren't looking up / down at their target while strafing |
7469
| Basic | [MC-121903](https://bugs.mojang.com/browse/MC-121903) | Command block minecarts do not save execution cooldown to NBT |
@@ -80,7 +75,6 @@
8075
| Basic | [MC-136249](https://bugs.mojang.com/browse/MC-136249) | Wearing boots enchanted with depth strider decreases the strength of the riptide enchantment |
8176
| Basic | [MC-139041](https://bugs.mojang.com/browse/MC-139041) | The sounds of fishing bobbers aren't controlled by the "Players" sound slider |
8277
| Basic | [MC-147659](https://bugs.mojang.com/browse/MC-147659) | Some witch huts spawn the incorrect cat |
83-
| Basic | [MC-147784](https://bugs.mojang.com/browse/MC-147784) | Fletching table flashes crafting table's GUI for about a second upon right-clicking it in spectator mode |
8478
| Basic | [MC-155509](https://bugs.mojang.com/browse/MC-155509) | Puffed pufferfish can hurt the player while dying |
8579
| Basic | [MC-159283](https://bugs.mojang.com/browse/MC-159283) | The End terrain does not generate in multiple rings centered around the world center |
8680
| Basic | [MC-160095](https://bugs.mojang.com/browse/MC-160095) | End Rods only break Cactus when moved by pistons |
@@ -114,14 +108,13 @@
114108
| Basic | [MC-271899](https://bugs.mojang.com/browse/MC-271899) | StructureTemplate Palette's caches are not thread safe |
115109
| Basic | [MC-272431](https://bugs.mojang.com/browse/MC-272431) | Ender Dragon incorrect vertical velocity causes erratic behavior |
116110
| Basic | [MC-298066](https://bugs.mojang.com/browse/MC-298066) | Directly entering a bed from a mount places the player in the wrong place |
117-
| Basic | [MC-299115](https://bugs.mojang.com/browse/MC-299115) | Arrow losing owner tag when deflected whilst owner being offline |
118-
|
119111

120112
## Previously patched
121113
Bugs that this mod has patched but has been superseded by a vanilla update.
122114

123115
| Bug ID | Name | Fixed in |
124116
|-------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------|-------------|
117+
| [MC-2025](https://bugs.mojang.com/browse/MC-2025) | Mobs going out of fenced areas/suffocate in blocks when loading chunks | 17w47a |
125118
| [MC-53312](https://bugs.mojang.com/browse/MC-53312) | Illager/(zombie) villager/witch robes don't render the last two rows of pixels | 22w17a |
126119
| [MC-72687](https://bugs.mojang.com/browse/MC-145929) | There are no shadows on text displayed within the action bar | 22w24a |
127120
| [MC-148149](https://bugs.mojang.com/browse/MC-148149) | Linux game crash when opening links | 1.19.1-pre6 |
@@ -151,5 +144,10 @@ Bugs that this mod has patched but has been superseded by a vanilla update.
151144
| [MC-55347](https://bugs.mojang.com/browse/MC-55347) | Title with long duration shows in other world | 24w44a |
152145
| [MC-111516](https://bugs.mojang.com/browse/MC-111516) | Player flickers/turns invisible when flying at high speeds | 24w44a |
153146
| [MC-112730](https://bugs.mojang.com/browse/MC-112730) | Beacon beam and structure block render twice per frame | 25w21a |
154-
155-
147+
| [MC-183776](https://bugs.mojang.com/browse/MC-183776) | After switching gamemodes using F3+F4, you need to press F3 twice to toggle the debug screen | 25w31a |
148+
| [MC-46503](https://bugs.mojang.com/browse/MC-46503) | You can retain a mob's shader in spectator mode by running /kill | 25w33a |
149+
| [MC-69216](https://bugs.mojang.com/browse/MC-69216) | Switching to spectator mode while fishing keeps rod cast | 25w33a |
150+
| [MC-119417](https://bugs.mojang.com/browse/MC-119417) | A spectator can occupy a bed if they enter it and then are switched to spectator mode | 25w33a |
151+
| [MC-147784](https://bugs.mojang.com/browse/MC-147784) | Fletching table flashes crafting table's GUI for about a second upon right-clicking it in spectator mode | 25w34a |
152+
| [MC-299115](https://bugs.mojang.com/browse/MC-299115) | Arrow losing owner tag when deflected whilst owner being offline | 25w34a |
153+
| [MC-267469](https://bugs.mojang.com/browse/MC-267469) | GUI List Entry highlight border not always aligned properly | 1.21.9 |

‎build.gradle.kts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ plugins {
66
}
77

88
modstitch {
9-
minecraftVersion = "1.21.9"
10-
modLoaderVersion = "0.17.2"
9+
minecraftVersion = "1.21.10"
10+
modLoaderVersion = "0.18.0"
1111

1212
parchment {
13-
mappingsVersion = "2025.09.14"
14-
minecraftVersion = "1.21.8"
13+
mappingsVersion = "2025.10.12"
1514
}
1615

1716
metadata {

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ curseforgeId=596224
99
githubProject=isXander/Debugify
1010

1111
# Libraries
12-
fabricApiVersion=0.133.14+1.21.9
12+
fabricApiVersion=0.138.3+1.21.10
1313
yaclVersion=3.8.0+1.21.9-fabric
14-
modMenuVersion=15.0.0-beta.3
14+
modMenuVersion=16.0.0-rc.1

‎src/client/java/dev/isxander/debugify/client/gui/NoYACLScreen.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import net.minecraft.client.gui.GuiGraphics;
66
import net.minecraft.client.gui.components.Button;
77
import net.minecraft.client.gui.screens.Screen;
8+
import net.minecraft.client.input.MouseButtonEvent;
89
import net.minecraft.network.chat.ClickEvent;
910
import net.minecraft.network.chat.CommonComponents;
1011
import net.minecraft.network.chat.Component;
@@ -61,13 +62,14 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
6162
}
6263
}
6364

65+
6466
@Override
65-
public boolean mouseClicked(double mouseX, double mouseY, int button) {
66-
if (super.mouseClicked(mouseX, mouseY, button)) {
67+
public boolean mouseClicked(MouseButtonEvent mouseButtonEvent, boolean bl) {
68+
if (super.mouseClicked(mouseButtonEvent, bl)) {
6769
return true;
6870
}
6971

70-
Style style = getStyle((int) mouseX, (int) mouseY);
72+
Style style = getStyle((int) mouseButtonEvent.x(), (int) mouseButtonEvent.y());
7173
return handleComponentClicked(style);
7274
}
7375

‎src/client/java/dev/isxander/debugify/client/helpers/mc197260/DebugifyLightProvider.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package dev.isxander.debugify.client.helpers.mc197260;
22

3-
import com.mojang.blaze3d.vertex.PoseStack;
4-
import net.minecraft.client.renderer.MultiBufferSource;
53
import net.minecraft.client.renderer.entity.state.LivingEntityRenderState;
64

75
public interface DebugifyLightProvider<S extends LivingEntityRenderState> {
8-
default int modifyLightLevel(int lightLevel, S livingEntity, PoseStack matrixStack, MultiBufferSource vertexConsumerProvider) {
9-
return lightLevel;
6+
default void debugify$modifyLightCoords(S livingEntityState) {
7+
108
}
119
}

‎src/client/java/dev/isxander/debugify/client/mixins/basic/mc118740/LocalPlayerMixin.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1717

1818
/**
19-
* Taken from MoulberrysTweaks
20-
* https://github.com/Moulberry/MoulberrysTweaks
19+
* Taken from <a href="https://github.com/Moulberry/MoulberrysTweaks">MoulberrysTweaks</a>
2120
* under MIT license
2221
*
2322
* @author Moulberry

‎src/client/java/dev/isxander/debugify/client/mixins/basic/mc118740/PlayerMixin.java‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1111

1212
/**
13-
* Taken from MoulberrysTweaks
14-
* https://github.com/Moulberry/MoulberrysTweaks
13+
* Taken from <a href="https://github.com/Moulberry/MoulberrysTweaks">MoulberrysTweaks</a>
1514
* under MIT license
1615
*
1716
* @author Moulberry
@@ -26,7 +25,15 @@ public void resetAttackStrengthTicker(CallbackInfo ci) {
2625
}
2726
}
2827

29-
@Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;moveCloak()V"))
28+
@Inject(
29+
method = "tick",
30+
at = @At(
31+
value = "INVOKE",
32+
// no specific reason to inject here, just an easy injection point before doing anything with attack indicator
33+
target = "Lnet/minecraft/world/entity/player/Player;getMainHandItem()Lnet/minecraft/world/item/ItemStack;",
34+
ordinal = 0
35+
)
36+
)
3037
public void tick(CallbackInfo ci) {
3138
if (this instanceof LocalPlayerDuck localPlayerExt) {
3239
localPlayerExt.debugify$incrementVisualAttackStrengthScale();

‎src/client/java/dev/isxander/debugify/client/mixins/basic/mc143474/ClientPacketListenerMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ protected ClientPacketListenerMixin(Minecraft client, Connection connection, Com
2121
super(client, connection, commonListenerCookie);
2222
}
2323

24-
@Inject(method = "handleRespawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientPacketListener;startWaitingForNewLevel(Lnet/minecraft/client/player/LocalPlayer;Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/client/gui/screens/ReceivingLevelScreen$Reason;)V"))
24+
@Inject(method = "handleRespawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientPacketListener;startWaitingForNewLevel(Lnet/minecraft/client/player/LocalPlayer;Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/client/gui/screens/LevelLoadingScreen$Reason;)V"))
2525
private void persistInventorySlot2(CallbackInfo ci, @Local(ordinal = 0) LocalPlayer oldPlayer, @Local(ordinal = 1) LocalPlayer newPlayer) {
2626
newPlayer.getInventory().setSelectedSlot(oldPlayer.getInventory().getSelectedSlot());
2727
}

‎src/client/java/dev/isxander/debugify/client/mixins/basic/mc197260/ArmorStandRendererMixin.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.isxander.debugify.client.mixins.basic.mc197260;
22

3-
import com.mojang.blaze3d.vertex.PoseStack;
3+
import com.mojang.datafixers.util.Pair;
44
import dev.isxander.debugify.fixes.BugFix;
55
import dev.isxander.debugify.fixes.FixCategory;
66
import net.minecraft.client.Minecraft;
@@ -9,10 +9,10 @@
99
import net.minecraft.client.renderer.entity.state.ArmorStandRenderState;
1010
import org.spongepowered.asm.mixin.Mixin;
1111

12+
import java.util.Comparator;
1213
import java.util.stream.IntStream;
1314
import net.minecraft.client.model.ArmorStandArmorModel;
1415
import net.minecraft.client.renderer.LightTexture;
15-
import net.minecraft.client.renderer.MultiBufferSource;
1616
import net.minecraft.client.renderer.entity.ArmorStandRenderer;
1717
import net.minecraft.core.BlockPos;
1818
import net.minecraft.world.entity.decoration.ArmorStand;
@@ -35,16 +35,17 @@ protected ArmorStandRendererMixin(EntityRendererProvider.Context context) {
3535
* </ul>
3636
*/
3737
@Override
38-
public int modifyLightLevel(int providedLightLevel, ArmorStandRenderState livingEntity, PoseStack matrixStack, MultiBufferSource vertexConsumerProvider) {
38+
public void debugify$modifyLightCoords(ArmorStandRenderState livingEntity) {
3939
BlockPos mainPos = BlockPos.containing(livingEntity.x, livingEntity.y, livingEntity.z);
4040
ClientLevel level = Minecraft.getInstance().level;
4141

42-
return Math.max(providedLightLevel, IntStream.of(-1, 2, 3)
43-
.map(operand -> {
42+
livingEntity.lightCoords = IntStream.of(-1, 0, 2, 3)
43+
.mapToObj(operand -> {
4444
BlockPos pos = mainPos.offset(0, operand, 0);
45-
return LightTexture.pack(level.getBrightness(LightLayer.BLOCK, pos), level.getBrightness(LightLayer.SKY, pos));
45+
return Pair.of(level.getBrightness(LightLayer.BLOCK, pos), pos);
4646
})
47-
.max().orElse(providedLightLevel)
48-
);
47+
.max(Comparator.comparingInt(Pair::getFirst))
48+
.map(p -> LightTexture.pack(p.getFirst(), level.getBrightness(LightLayer.SKY, p.getSecond())))
49+
.orElse(livingEntity.lightCoords);
4950
}
5051
}

0 commit comments

Comments
 (0)