1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-20 16:37:39 +00:00

Compare commits

...

2 Commits

Author SHA1 Message Date
Jonathan Coates
4cccf1817c Update to Minecraft 1.21.8 2025-07-18 17:04:28 +01:00
Jonathan Coates
b8d9499027 Fix terminals not receiving scroll events
Minecraft 1.21.2 added a mouseScroll override to
AbstractContainerScreen, which means that child widgets no longer
receive scroll events. We reimplement that logic in our computer screen.

Fixes #2245.
2025-07-17 09:11:26 +01:00
5 changed files with 14 additions and 5 deletions

View File

@@ -15,4 +15,4 @@ isUnstable=true
modVersion=1.116.1 modVersion=1.116.1
# Minecraft properties: We want to configure this here so we can read it in settings.gradle # Minecraft properties: We want to configure this here so we can read it in settings.gradle
mcVersion=1.21.7 mcVersion=1.21.8

View File

@@ -7,9 +7,9 @@
# Minecraft # Minecraft
# MC version is specified in gradle.properties, as we need that in settings.gradle. # MC version is specified in gradle.properties, as we need that in settings.gradle.
# Remember to update corresponding versions in fabric.mod.json/neoforge.mods.toml # Remember to update corresponding versions in fabric.mod.json/neoforge.mods.toml
fabric-api = "0.128.0+1.21.7" fabric-api = "0.129.0+1.21.8"
fabric-loader = "0.16.14" fabric-loader = "0.16.14"
neoForge = "21.7.19-beta" neoForge = "21.8.0-beta"
neoMergeTool = "2.0.0" neoMergeTool = "2.0.0"
mixin = "0.8.5" mixin = "0.8.5"
parchment = "2025.06.29" parchment = "2025.06.29"

View File

@@ -125,6 +125,15 @@ public abstract class AbstractComputerScreen<T extends AbstractComputerMenu> ext
return super.mouseReleased(x, y, button); return super.mouseReleased(x, y, button);
} }
@Override
public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) {
// Reimplement ContainerEventHandler.mouseScrolled, as AbstractContainerScreen overrides it.
var child = getChildAt(mouseX, mouseY);
if (child.isPresent() && child.get().mouseScrolled(mouseX, mouseY, scrollX, scrollY)) return true;
return super.mouseScrolled(mouseX, mouseY, scrollX, scrollY);
}
@Override @Override
public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
super.render(graphics, mouseX, mouseY, partialTicks); super.render(graphics, mouseX, mouseY, partialTicks);

View File

@@ -51,7 +51,7 @@
"depends": { "depends": {
"fabricloader": ">=0.16.14", "fabricloader": ">=0.16.14",
"fabric-api": ">=0.128.0", "fabric-api": ">=0.128.0",
"minecraft": "=1.21.7" "minecraft": "=1.21.8"
}, },
"accessWidener": "computercraft.accesswidener" "accessWidener": "computercraft.accesswidener"
} }

View File

@@ -26,7 +26,7 @@ CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles a
[[dependencies.computercraft]] [[dependencies.computercraft]]
modId="neoforge" modId="neoforge"
type="required" type="required"
versionRange="[${neoVersion},21.8)" versionRange="[${neoVersion},21.9)"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"