Skip to content

Commit e7c2cf7

Browse files
FlashyReeseFlashyReese
committed
new: Port to Minecrafrt 1.21.9 & Sodium 0.7.0
1 parent ee4974c commit e7c2cf7

23 files changed

Lines changed: 125 additions & 104 deletions

‎.github/workflows/publish.yml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -25,34 +25,34 @@ jobs:
2525
env:
2626
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
2727
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
28-
- name: Publish NeoForge to Modrinth, CurseForge & GitHub
29-
uses: Kir-Antipov/mc-publish@v3.3.0
30-
with:
31-
modrinth-id: PtjYWJkn
32-
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
33-
34-
curseforge-id: 447673
35-
curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
36-
37-
github-token: ${{ secrets.GITHUB_TOKEN }}
38-
39-
name: '[NeoForge] ${{ github.event.release.name }}'
40-
version: '${{ github.event.release.tag_name }}+neoforge'
41-
version-type: release
42-
43-
game-versions: '1.21.5'
44-
45-
loaders: neoforge
46-
47-
dependencies: |
48-
sodium
49-
reeses-sodium-options(optional)
50-
irisshaders(optional)
51-
iris(optional)
52-
53-
files: |
54-
neoforge/build/libs/!(*-@(dev|sources|javadoc|dev-shadow)).jar
55-
neoforge/build/libs/*-@(dev|sources|javadoc|dev-shadow).jar
28+
# - name: Publish NeoForge to Modrinth, CurseForge & GitHub
29+
# uses: Kir-Antipov/mc-publish@v3.3.0
30+
# with:
31+
# modrinth-id: PtjYWJkn
32+
# modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
33+
#
34+
# curseforge-id: 447673
35+
# curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
36+
#
37+
# github-token: ${{ secrets.GITHUB_TOKEN }}
38+
#
39+
# name: '[NeoForge] ${{ github.event.release.name }}'
40+
# version: '${{ github.event.release.tag_name }}+neoforge'
41+
# version-type: release
42+
#
43+
# game-versions: '1.21.5'
44+
#
45+
# loaders: neoforge
46+
#
47+
# dependencies: |
48+
# sodium
49+
# reeses-sodium-options(optional)
50+
# irisshaders(optional)
51+
# iris(optional)
52+
#
53+
# files: |
54+
# neoforge/build/libs/!(*-@(dev|sources|javadoc|dev-shadow)).jar
55+
# neoforge/build/libs/*-@(dev|sources|javadoc|dev-shadow).jar
5656
- name: Publish Fabric to Modrinth, CurseForge & GitHub
5757
uses: Kir-Antipov/mc-publish@v3.3.0
5858
with:

‎build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ plugins {
33
id("fabric-loom") version ("1.11-SNAPSHOT") apply (false)
44
}
55

6-
val MINECRAFT_VERSION by extra { "1.21.8" }
7-
val NEOFORGE_VERSION by extra { "21.8.47" }
6+
val MINECRAFT_VERSION by extra { "1.21.9" }
7+
val NEOFORGE_VERSION by extra { "21.9.11-beta" }
88
val FABRIC_LOADER_VERSION by extra { "0.17.2" }
9-
val FABRIC_API_VERSION by extra { "0.133.4+1.21.8" }
9+
val FABRIC_API_VERSION by extra { "0.134.0+1.21.9" }
1010

1111
// This value can be set to null to disable Parchment.
1212
val PARCHMENT_VERSION by extra { null }
@@ -15,7 +15,7 @@ val PARCHMENT_VERSION by extra { null }
1515
val MAVEN_GROUP by extra { "me.flashyreese.mods" }
1616
val ARCHIVE_NAME by extra { "sodium-extra" }
1717
val MOD_VERSION by extra { "0.7.0" }
18-
val SODIUM_VERSION by extra { "mc1.21.8-0.7.0" }
18+
val SODIUM_VERSION by extra { "mc1.21.9-0.7.0" }
1919

2020
allprojects {
2121
apply(plugin = "java")

‎common/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/SodiumExtraGameOptionPages.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,10 +493,10 @@ public static OptionPage extra() {
493493
List<OptionGroup> groups = new ArrayList<>();
494494
groups.add(OptionGroup.createBuilder()
495495
.add(OptionImpl.createBuilder(boolean.class, sodiumExtraOpts)
496-
.setEnabled(() -> SodiumExtraClientMod.mixinConfig().getOptions().get("mixin.reduce_resolution_on_mac").isEnabled() && Minecraft.ON_OSX)
496+
.setEnabled(() -> SodiumExtraClientMod.mixinConfig().getOptions().get("mixin.reduce_resolution_on_mac").isEnabled() && System.getProperty("os.name").toLowerCase().contains("mac"))
497497
.setName(Component.translatable("sodium-extra.option.reduce_resolution_on_mac"))
498498
.setTooltip(Component.translatable("sodium-extra.option.reduce_resolution_on_mac.tooltip"))
499-
.setEnabled(() -> Minecraft.ON_OSX)
499+
.setEnabled(() -> System.getProperty("os.name").toLowerCase().contains("mac"))
500500
.setImpact(OptionImpact.HIGH)
501501
.setControl(TickBoxControl::new)
502502
.setBinding((opts, value) -> opts.extraSettings.reduceResolutionOnMac = value, opts -> opts.extraSettings.reduceResolutionOnMac)

‎common/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/options/control/SliderControlExtended.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66
import net.caffeinemc.mods.sodium.client.gui.options.control.ControlValueFormatter;
77
import net.caffeinemc.mods.sodium.client.util.Dim2i;
88
import net.minecraft.client.gui.GuiGraphics;
9+
import net.minecraft.client.input.MouseButtonEvent;
910
import net.minecraft.network.chat.Component;
1011
import net.minecraft.util.Mth;
1112
import org.apache.commons.lang3.Validate;
13+
import org.jetbrains.annotations.NotNull;
1214

1315
public class SliderControlExtended implements Control<Integer> {
1416
private final Option<Integer> option;
@@ -134,9 +136,9 @@ public double getThumbPositionForValue(int value) {
134136
}
135137

136138
@Override
137-
public boolean mouseClicked(double mouseX, double mouseY, int button) {
138-
if (this.option.isAvailable() && button == 0 && this.getSliderBounds().containsCursor(mouseX, mouseY)) {
139-
this.setValueFromMouse(mouseX);
139+
public boolean mouseClicked(@NotNull MouseButtonEvent mouseButtonEvent, boolean bl) {
140+
if (this.option.isAvailable() && mouseButtonEvent.button() == 0 && this.getSliderBounds().containsCursor(mouseButtonEvent.x(), mouseButtonEvent.y())) {
141+
this.setValueFromMouse(mouseButtonEvent.x());
140142

141143
return true;
142144
}
@@ -159,9 +161,9 @@ private void setValue(double d) {
159161
}
160162

161163
@Override
162-
public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
163-
if (this.option.isAvailable() && button == 0) {
164-
this.setValueFromMouse(mouseX);
164+
public boolean mouseDragged(MouseButtonEvent mouseButtonEvent, double d, double e) {
165+
if (this.option.isAvailable() && mouseButtonEvent.button() == 0) {
166+
this.setValueFromMouse(mouseButtonEvent.x());
165167

166168
return true;
167169
}

‎common/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/scrollable_page/OptionPageScrollFrame.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import net.minecraft.ChatFormatting;
1111
import net.minecraft.client.Minecraft;
1212
import net.minecraft.client.gui.GuiGraphics;
13+
import net.minecraft.client.input.MouseButtonEvent;
1314
import net.minecraft.locale.Language;
1415
import net.minecraft.network.chat.Component;
1516
import net.minecraft.util.FormattedCharSequence;
@@ -141,34 +142,34 @@ private void renderOptionTooltip(GuiGraphics guiGraphics, ControlElement<?> elem
141142
}
142143

143144
@Override
144-
public boolean mouseClicked(double mouseX, double mouseY, int button) {
145-
if (this.dim.containsCursor(mouseX, mouseY) && super.mouseClicked(mouseX, mouseY, button)) {
145+
public boolean mouseClicked(MouseButtonEvent mouseButtonEvent, boolean bl) {
146+
if (this.dim.containsCursor(mouseButtonEvent.x(), mouseButtonEvent.y()) && super.mouseClicked(mouseButtonEvent, bl)) {
146147
return true;
147148
}
148149
if (this.canScroll) {
149-
return this.scrollBar.mouseClicked(mouseX, mouseY, button);
150+
return this.scrollBar.mouseClicked(mouseButtonEvent, bl);
150151
}
151152
return false;
152153
}
153154

154155
@Override
155-
public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
156-
if (super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY)) {
156+
public boolean mouseDragged(MouseButtonEvent mouseButtonEvent, double d, double e) {
157+
if (super.mouseDragged(mouseButtonEvent, d, e)) {
157158
return true;
158159
}
159160
if (this.canScroll) {
160-
return this.scrollBar.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
161+
return this.scrollBar.mouseDragged(mouseButtonEvent, d, e);
161162
}
162163
return false;
163164
}
164165

165166
@Override
166-
public boolean mouseReleased(double mouseX, double mouseY, int button) {
167-
if (super.mouseReleased(mouseX, mouseY, button)) {
167+
public boolean mouseReleased(MouseButtonEvent mouseButtonEvent) {
168+
if (super.mouseReleased(mouseButtonEvent)) {
168169
return true;
169170
}
170171
if (this.canScroll) {
171-
return this.scrollBar.mouseReleased(mouseX, mouseY, button);
172+
return this.scrollBar.mouseReleased(mouseButtonEvent);
172173
}
173174
return false;
174175
}

‎common/src/main/java/me/flashyreese/mods/sodiumextra/client/gui/scrollable_page/ScrollBarComponent.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import net.caffeinemc.mods.sodium.client.gui.widgets.AbstractWidget;
44
import net.caffeinemc.mods.sodium.client.util.Dim2i;
55
import net.minecraft.client.gui.GuiGraphics;
6+
import net.minecraft.client.input.MouseButtonEvent;
67
import net.minecraft.util.Mth;
78

89
public class ScrollBarComponent extends AbstractWidget {
@@ -48,7 +49,9 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float delta)
4849
}
4950

5051
@Override
51-
public boolean mouseClicked(double mouseX, double mouseY, int button) {
52+
public boolean mouseClicked(MouseButtonEvent mouseButtonEvent, boolean bl) {
53+
double mouseX = mouseButtonEvent.x();
54+
double mouseY = mouseButtonEvent.y();
5255
if (this.dim.containsCursor(mouseX, mouseY)) {
5356
if (this.scrollThumb.containsCursor(mouseX, mouseY)) {
5457
this.scrollThumbClickOffset = (int) (mouseY - (this.scrollThumb.y() + this.scrollThumb.height() / 2));
@@ -65,9 +68,9 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
6568
}
6669

6770
@Override
68-
public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
71+
public boolean mouseDragged(MouseButtonEvent mouseButtonEvent, double d, double e) {
6972
if (this.isDragging) {
70-
int value = (int) ((mouseY - this.scrollThumbClickOffset - this.dim.y() - (this.scrollThumb.height() / 2)) / (this.dim.height() - this.scrollThumb.height()) * this.maxScrollBarOffset);
73+
int value = (int) ((mouseButtonEvent.y() - this.scrollThumbClickOffset - this.dim.y() - (this.scrollThumb.height() / 2)) / (this.dim.height() - this.scrollThumb.height()) * this.maxScrollBarOffset);
7174
this.setOffset(value);
7275
return true;
7376
}

‎common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/optimizations/beacon_beam_rendering/LevelRendererAccessor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77

88
@Mixin(LevelRenderer.class)
99
public interface LevelRendererAccessor {
10-
@Accessor
11-
Frustum getCullingFrustum();
10+
/*@Accessor
11+
Frustum getCullingFrustum();*/
1212
}

‎common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/optimizations/beacon_beam_rendering/MixinBeaconRenderer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public abstract class MixinBeaconRenderer<T extends BlockEntity & BeaconBeamOwne
3737
* @author FlashyReese
3838
* @reason Use optimized vertex writer, also avoids unnecessary allocations
3939
*/
40-
@Inject(method = "renderBeaconBeam(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/resources/ResourceLocation;FFJIIIFF)V", at = @At(value = "HEAD"), cancellable = true)
40+
/*@Inject(method = "renderBeaconBeam(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/resources/ResourceLocation;FFJIIIFF)V", at = @At(value = "HEAD"), cancellable = true)
4141
private static void optimizeRenderBeam(PoseStack poseStack, MultiBufferSource multiBufferSource, ResourceLocation resourceLocation, float tickDelta, float heightScale, long worldTime, int yOffset, int maxY, int color, float innerRadius, float outerRadius, CallbackInfo ci) {
4242
ci.cancel();
4343
if (IrisCompat.isIrisPresent()) {
@@ -138,5 +138,5 @@ public void render(T blockEntity, float f, PoseStack poseStack, MultiBufferSourc
138138
if (!frustum.isVisible(box)) {
139139
ci.cancel();
140140
}
141-
}
141+
}*/
142142
}

‎common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/particle/MixinFireworkParticle.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,4 @@ public void addExplosionParticle(double x, double y, double z, double velocityX,
2323
ci.cancel();
2424
}
2525
}
26-
27-
@Redirect(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/Particle;setColor(FFF)V"))
28-
public void tick(Particle instance, float red, float green, float blue) {
29-
if (instance != null) {
30-
instance.setColor(red, green, blue);
31-
}
32-
}
3326
}

‎common/src/main/java/me/flashyreese/mods/sodiumextra/mixin/particle/MixinLevelRenderer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public void tickRainSplashing(ClientLevel clientLevel, Camera camera, int i, Par
2020
}
2121
}
2222

23-
@Inject(method = "render(Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/world/phys/Vec3;IFLjava/util/List;Ljava/util/List;)V", at = @At(value = "HEAD"), cancellable = true, locals = LocalCapture.NO_CAPTURE)
23+
@Inject(method = "render", at = @At(value = "HEAD"), cancellable = true, locals = LocalCapture.NO_CAPTURE)
2424
private void renderWeather(CallbackInfo ci) {
2525
if (!(SodiumExtraClientMod.options().detailSettings.rainSnow)) {
2626
ci.cancel();

0 commit comments

Comments
 (0)