Skip to content

Commit

Permalink
1.21.2
Browse files Browse the repository at this point in the history
  • Loading branch information
gliscowo committed Nov 8, 2024
1 parent 5f429ee commit d067379
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 24 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//file:noinspection GradlePackageVersionRange
plugins {
id 'fabric-loom' version '1.6-SNAPSHOT'
id 'fabric-loom' version '1.8-SNAPSHOT'
id 'maven-publish'
}

Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://fabricmc.net/develop/
minecraft_base_version=1.21
minecraft_version=1.21
yarn_mappings=1.21+build.2
loader_version=0.15.11
minecraft_base_version=1.21.2
minecraft_version=1.21.3
yarn_mappings=1.21.3+build.2
loader_version=0.16.9
# Mod Properties
mod_version=0.1.4
maven_group=io.wispforest
archives_base_name=ok-boomer
# Dependencies
# check this on https://fabricmc.net/develop/
fabric_version=0.100.1+1.21
fabric_version=0.107.3+1.21.3

# https://maven.wispforest.io/io/wispforest/owo-lib/
owo_version=0.12.10+1.21
owo_version=0.12.18+1.21.2

# https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu/
modmenu_version=11.0.0-rc.2
modmenu_version=12.0.0-beta.1
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
19 changes: 8 additions & 11 deletions src/main/java/io/wispforest/okboomer/mixin/GameRendererMixin.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,22 @@ public abstract class GameRendererMixin {
@Unique
private final Vector4f boom$mouseVec = new Vector4f();

@ModifyVariable(method = "getFov", at = @At(value = "RETURN", shift = At.Shift.BEFORE), ordinal = 0)
private double injectBoomer(double fov) {
@ModifyVariable(method = "getFov", at = @At(value = "RETURN", shift = At.Shift.BEFORE), ordinal = 1)
private float injectBoomer(float fov) {
if (OkBoomer.CONFIG.boomTransition()) {
this.boom$lastBoomDivisor += .45 * (OkBoomer.boomDivisor - this.boom$lastBoomDivisor) * boom$interpolator();
} else {
this.boom$lastBoomDivisor = OkBoomer.boomDivisor;
}

return fov / this.boom$lastBoomDivisor;
return (float) (fov / this.boom$lastBoomDivisor);
}

@Inject(
method = "render",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/render/RenderTickCounter;getLastDuration()F",
target = "Lnet/minecraft/client/render/RenderTickCounter;getLastFrameDuration()F",
ordinal = 1
)
)
Expand Down Expand Up @@ -86,8 +86,6 @@ private void injectScreenBoomer(RenderTickCounter tickCounter, boolean tick, Cal
this.boom$rotat.peek().getPositionMatrix().invert();
OkBoomer.mouseTransform = this.boom$rotat.peek().getPositionMatrix();

RenderSystem.applyModelViewMatrix();

if (OkBoomer.CONFIG.boomTransition()) {
this.boom$lastScreenBoom += .45 * (OkBoomer.screenBoom - this.boom$lastScreenBoom) * boom$interpolator();
this.boom$lastMouseX += .65 * (mouseX - this.boom$lastMouseX) * tickCounter.getLastFrameDuration();
Expand Down Expand Up @@ -121,7 +119,7 @@ private void bottomText(RenderTickCounter tickCounter, boolean tick, CallbackInf
var window = client.getWindow();
var textRenderer = client.textRenderer;

drawContext.getMatrices().push();
drawContext.push();
drawContext.getMatrices().loadIdentity();

drawContext.fill(
Expand Down Expand Up @@ -153,9 +151,10 @@ private void bottomText(RenderTickCounter tickCounter, boolean tick, CallbackInf
if (oneRotat > 22.5 + 315) bottom_text = "Bottom Text";

float factor = window.getScaledWidth() / (textRenderer.getWidth(bottom_text) + 2f);
drawContext.getMatrices().scale(factor, 3, 1);
drawContext.scale(factor, 3, 1);
drawContext.drawText(textRenderer, bottom_text, 1, (int) ((window.getScaledHeight() + 6) / 3f), Color.WHITE.argb(), false);
drawContext.getMatrices().pop();
drawContext.draw();
drawContext.pop();
}

@ModifyArgs(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;renderWithTooltip(Lnet/minecraft/client/gui/DrawContext;IIF)V"))
Expand All @@ -177,7 +176,6 @@ private void transformMouse(Args args) {
)
private void uninjectScreenBoomer(RenderTickCounter tickCounter, boolean tick, CallbackInfo ci) {
RenderSystem.getModelViewStack().popMatrix();
RenderSystem.applyModelViewMatrix();
}

private static float boom$nudge(float value, float to) {
Expand All @@ -187,5 +185,4 @@ private void uninjectScreenBoomer(RenderTickCounter tickCounter, boolean tick, C
private static float boom$interpolator() {
return MinecraftClient.getInstance().getRenderTickCounter().getLastFrameDuration() * OkBoomer.CONFIG.boomTransitionSpeed();
}

}
8 changes: 4 additions & 4 deletions src/main/java/io/wispforest/okboomer/mixin/MouseMixin.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ public class MouseMixin {

@Unique private static final Vector4f boom$mouseVec = new Vector4f();

@ModifyArgs(method = "method_1611", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;mouseClicked(DDI)Z"))
private static void transformMouseDownCoordinates(Args args) {
@ModifyArgs(method = "onMouseButton", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;mouseClicked(DDI)Z"))
private void transformMouseDownCoordinates(Args args) {
boom$mouseVec.set(args.<Number>get(0).floatValue(), args.<Number>get(1).floatValue(), 0, 1);
boom$mouseVec.mul(OkBoomer.mouseTransform);

args.set(0, ((Number) boom$mouseVec.x).doubleValue());
args.set(1, ((Number) boom$mouseVec.y).doubleValue());
}

@ModifyArgs(method = "method_1605", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;mouseReleased(DDI)Z"))
private static void transformMouseUpCoordinates(Args args) {
@ModifyArgs(method = "onMouseButton", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;mouseReleased(DDI)Z"))
private void transformMouseUpCoordinates(Args args) {
boom$mouseVec.set(args.<Number>get(0).floatValue(), args.<Number>get(1).floatValue(), 0, 1);
boom$mouseVec.mul(OkBoomer.mouseTransform);

Expand Down

0 comments on commit d067379

Please sign in to comment.