time changer

moehreag · moehreag · commit a195fbfb2490 · 2022-06-19T09:46:51.000Z
and crash fixes
diff --git a/gradle.properties b/gradle.properties
@@ -5,14 +5,14 @@ org.gradle.parallel = true
 # Dependencies
 minecraft_version = 1.19
 quilt_mappings = 1
-loader_version = 0.17.1-beta.1
+loader_version = 0.17.1-beta.2
 
 # QSL
 # QSL version number is shared between all the modules.
 qsl_version = 2.0.0-beta.2
 
 # Quilted Fabric API
-quilted_fabric_api_version = 2.0.0-alpha.2+0.55.3
+quilted_fabric_api_version = 2.0.0-alpha.3+0.55.3
 
 # Mod Properties
 version = 2.0.0+1.19
diff --git a/run/options.txt b/run/options.txt
@@ -34,7 +34,7 @@ guiScale:2
 particles:1
 maxFps:260
 graphicsMode:1
-ao:2
+ao:1
 prioritizeChunkUpdates:0
 biomeBlendRadius:2
 renderClouds:"false"
diff --git a/src/main/java/io/github/axolotlclient/config/AxolotlClientConfig.java b/src/main/java/io/github/axolotlclient/config/AxolotlClientConfig.java
@@ -16,6 +16,8 @@ public class AxolotlClientConfig {
     public final BooleanOption customBadge = new BooleanOption("customBadge", false);
     public final StringOption badgeText = new StringOption("badgeText", "");
 
+	public final BooleanOption timeChangerEnabled = new BooleanOption("enabled", false);
+	public final IntegerOption customTime = new IntegerOption("time", 0, 0, 24000);
     public final BooleanOption customSky = new BooleanOption("customSky", true);
     public final BooleanOption showSunMoon = new BooleanOption("showSunMoon", true);
 	public final BooleanOption customCloudHeight = new BooleanOption("customCloudHeight", false);
@@ -49,6 +51,8 @@ public class AxolotlClientConfig {
     public final OptionCategory outlines= new OptionCategory("blockOutlines");
     public final OptionCategory motionBlur = new OptionCategory("motionBlur");
 
+	public final OptionCategory timeChanger = new OptionCategory("timeChanger");
+
     private final List<Option> options = new ArrayList<>();
     private final List<OptionCategory> categories = new ArrayList<>();
 
@@ -110,6 +114,10 @@ public void init(){
         motionBlur.add(motionBlurInGuis);
         rendering.addSubCategory(motionBlur);
 
+		timeChanger.add(timeChangerEnabled);
+		timeChanger.add(customTime);
+		rendering.addSubCategory(timeChanger);
+
         outlines.add(enableCustomOutlines);
         outlines.add(outlineColor);
         outlines.add(outlineChroma);
diff --git a/src/main/java/io/github/axolotlclient/config/screen/OptionsScreenBuilder.java b/src/main/java/io/github/axolotlclient/config/screen/OptionsScreenBuilder.java
@@ -115,4 +115,9 @@ public void renderTooltip(MatrixStack matrices, Tooltippable option, int x, int
 		for(String s:tooltip) text.add(Text.literal(s));
 		this.renderTooltip(matrices, text, x, y);
 	}
+
+	@Override
+	public boolean isPauseScreen() {
+		return false;
+	}
 }
diff --git a/src/main/java/io/github/axolotlclient/config/screen/widgets/OptionSliderWidget.java b/src/main/java/io/github/axolotlclient/config/screen/widgets/OptionSliderWidget.java
@@ -15,9 +15,7 @@
 import java.text.DecimalFormat;
 
 public class OptionSliderWidget extends ButtonWidget {
-	/*public OptionSliderWidget(int x, int y, int width, Text text, PressAction pressAction) {
-		super(x, y, width, 20, text, pressAction);
-	}*/
+
     private final DecimalFormat format = new DecimalFormat("##.#");
     private final DecimalFormat intformat = new DecimalFormat("##");
 
diff --git a/src/main/java/io/github/axolotlclient/mixin/MixinClientWorld.java b/src/main/java/io/github/axolotlclient/mixin/MixinClientWorld.java
@@ -1,5 +1,6 @@
 package io.github.axolotlclient.mixin;
 
+import io.github.axolotlclient.AxolotlClient;
 import io.github.axolotlclient.modules.hypixel.HypixelAbstractionLayer;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
@@ -9,6 +10,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ClientWorld.class)
@@ -23,4 +25,12 @@ public void onEntityRemoved(int entityId, Entity.RemovalReason removalReason, Ca
             HypixelAbstractionLayer.handleDisconnectEvents(entity.getUuid());
         }
     }
+
+	@ModifyArg(method = "setTimeOfDay", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld$Properties;setTimeOfDay(J)V"))
+	public long timeChanger(long time){
+		if(AxolotlClient.CONFIG.timeChangerEnabled.get()){
+			return AxolotlClient.CONFIG.customTime.get();
+		}
+		return time;
+	}
 }
diff --git a/src/main/java/io/github/axolotlclient/mixin/MixinCrashReport.java b/src/main/java/io/github/axolotlclient/mixin/MixinCrashReport.java
@@ -14,13 +14,13 @@ public class MixinCrashReport {
 
 	@Inject(method = "addStackTrace", at = @At(value = "TAIL"))
 	public void addAxolotlclientInfo(StringBuilder builder, CallbackInfo ci){
+		if (!Objects.equals(AxolotlClient.badmod, "")) {
 			builder.append("\n\n")
 				.append("---- Axolotlclient Information ----\n");
-			if (!Objects.equals(AxolotlClient.badmod, "")){
-				builder.append("Unsupported Mods were found!\n")
-					.append("Suspected mod: ")
-					.append(AxolotlClient.badmod);
-			}
+			builder.append("Unsupported Mods were found!\n")
+				.append("Suspected mod: ")
+				.append(AxolotlClient.badmod);
 			builder.append("\n\n");
+		}
 	}
 }
diff --git a/src/main/java/io/github/axolotlclient/mixin/MixinGameMenuScreen.java b/src/main/java/io/github/axolotlclient/mixin/MixinGameMenuScreen.java
@@ -1,48 +1,21 @@
 package io.github.axolotlclient.mixin;
 
+import io.github.axolotlclient.modules.hud.HudEditScreen;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.GameMenuScreen;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.text.Text;
 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;
+import org.spongepowered.asm.mixin.injection.ModifyArgs;
+import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
 
 @Mixin(GameMenuScreen.class)
 public abstract class MixinGameMenuScreen {
 
-    @Inject(method = "initWidgets", at = @At("RETURN"))
-    public void addConfigButton(CallbackInfo ci){
-        /*if(MinecraftClient.getInstance().isInSingleplayer() && MinecraftClient.getInstance().getServer().isDedicated()) {
-            buttons.add(new ButtonWidget(20, width / 2 - 100, height / 4 +
-                    (FabricLoader.getInstance().isModLoaded("modmenu")? 82 :80),
-                    I18n.translate("config")));
-            for (ButtonWidget button : buttons) {
-                if (button.y >= this.height / 4 - 16 + 24 * 4 - 1 && !(button.id == 20)) {
-                    button.y += 24;
-                }
-                //button.y -= 12;
-            }
-        } else {
-            for (ButtonWidget button:buttons){
-                if(!button.active && button.id==20){
-                    button.active=true;
-                }
-            }
-        }
-    }
-
-    @ModifyArgs(method = "init", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/ButtonWidget;<init>(IIIIILjava/lang/String;)V", ordinal = 1))
-    public void addOptionsButton(Args args){
-        if((MinecraftClient.getInstance().getServer()!=null && !MinecraftClient.getInstance().getServer().isDedicated())
-                || MinecraftClient.getInstance().getCurrentServerEntry() != null){
-            args.set(0, 20);
-            args.set(5, I18n.translate("title_short"));
-        }
-    }
-
-    @Inject(method = "buttonClicked", at = @At("HEAD"))
-    public void customButtons(ButtonWidget button, CallbackInfo ci){
-        if(button.id==20){
-            MinecraftClient.getInstance().openScreen(new HudEditScreen(new GameMenuScreen()));
-        }*/
-    }
+	@ModifyArgs(method = "initWidgets", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/ButtonWidget;<init>(IIIILnet/minecraft/text/Text;Lnet/minecraft/client/gui/widget/ButtonWidget$PressAction;)V", ordinal = 3))
+	public void addClientOptionsButton(Args args){
+		args.set(4, Text.translatable("title_short"));
+		args.set(5, (ButtonWidget.PressAction)(buttonWidget)-> MinecraftClient.getInstance().setScreen(new HudEditScreen(((GameMenuScreen)(Object)this) )));
+	}
 }
diff --git a/src/main/java/io/github/axolotlclient/mixin/MixinGameRenderer.java b/src/main/java/io/github/axolotlclient/mixin/MixinGameRenderer.java
@@ -1,6 +1,5 @@
 package io.github.axolotlclient.mixin;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import io.github.axolotlclient.AxolotlClient;
 import io.github.axolotlclient.modules.motionblur.MotionBlur;
 import io.github.axolotlclient.modules.zoom.Zoom;
@@ -15,7 +14,6 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.At.Shift;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -112,8 +110,7 @@ public void setZoom(Camera camera, float tickDelta, boolean changingFov, Callbac
 	    cir.setReturnValue(returnValue);
     }
 
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/framebuffer/Framebuffer;beginWrite(Z)V",
-            shift = Shift.BEFORE), remap = false)
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;getFramebuffer()Lcom/mojang/blaze3d/framebuffer/Framebuffer;"))
     public void worldMotionBlur(float tickDelta, long startTime, boolean tick, CallbackInfo ci) {
         motionBlur(tickDelta, startTime, tick, null);
     }
diff --git a/src/main/java/io/github/axolotlclient/mixin/MixinRenderSystem.java b/src/main/java/io/github/axolotlclient/mixin/MixinRenderSystem.java
@@ -2,7 +2,6 @@
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import io.github.axolotlclient.AxolotlClient;
-import net.minecraft.obfuscate.DontObfuscate;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -13,7 +12,7 @@
 @Mixin(RenderSystem.class)
 public abstract class MixinRenderSystem {
 
-	@Shadow @Final @DontObfuscate
+	@Shadow(remap = false) @Final
 	private static float[] shaderColor;
 
 	@Inject(method = "_setShaderColor", at = @At(value = "HEAD"), cancellable = true, remap = false)
diff --git a/src/main/java/io/github/axolotlclient/mixin/MixinTitleScreen.java b/src/main/java/io/github/axolotlclient/mixin/MixinTitleScreen.java
@@ -1,8 +1,10 @@
 package io.github.axolotlclient.mixin;
 
 
+import com.mojang.blaze3d.platform.InputUtil;
 import io.github.axolotlclient.AxolotlClient;
 import io.github.axolotlclient.modules.hud.HudEditScreen;
+import io.github.axolotlclient.modules.zoom.Zoom;
 import io.github.axolotlclient.util.DiscordRPC;
 import net.minecraft.SharedConstants;
 import net.minecraft.client.MinecraftClient;
@@ -20,6 +22,7 @@
 import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.ModifyArgs;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
 
 @Mixin(TitleScreen.class)
@@ -32,6 +35,10 @@ protected MixinTitleScreen() {
 	@Inject(method = "initWidgetsNormal", at = @At("HEAD"))
 	public void inMenu(int y, int spacingY, CallbackInfo ci){
 		DiscordRPC.startup();
+		if(MinecraftClient.getInstance().options.saveToolbarActivatorKey.keyEquals(Zoom.keyBinding)){
+			MinecraftClient.getInstance().options.saveToolbarActivatorKey.setBoundKey(InputUtil.UNKNOWN_KEY);
+			AxolotlClient.LOGGER.info("Unbound \"Save Toolbar Activator\" to resolve conflict with the zoom key!");
+		}
 	}
 
 	@ModifyArgs(method = "initWidgetsNormal", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/ButtonWidget;<init>(IIIILnet/minecraft/text/Text;Lnet/minecraft/client/gui/widget/ButtonWidget$PressAction;Lnet/minecraft/client/gui/widget/ButtonWidget$TooltipSupplier;)V", ordinal = 1))
@@ -49,6 +56,11 @@ public String setVersionText(String s){
 				QuiltLoader.getModContainer("axolotlclient").get().metadata().version().raw():"");
 	}
 
+	@Inject(method = "areRealmsNotificationsEnabled", at = @At("HEAD"), cancellable = true)
+	public void noRealmsIcons(CallbackInfoReturnable<Boolean> cir){
+		cir.setReturnValue(false);
+	}
+
 	@Inject(method = "init", at = @At("HEAD"))
 	public void showBadModsScreen(CallbackInfo ci){
 
diff --git a/src/main/java/io/github/axolotlclient/mixin/MixinWorldRenderer.java b/src/main/java/io/github/axolotlclient/mixin/MixinWorldRenderer.java
@@ -57,8 +57,8 @@ public abstract class MixinWorldRenderer {
 
 	@Shadow @Nullable private VertexBuffer lightSkyBuffer;
 
-	@Inject(method = "renderSky", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;disableTexture()V"), cancellable = true, remap = false)
-	public void renderSky(MatrixStack matrices, Matrix4f projectionMatrix, float tickDelta, Camera preStep, boolean bl, Runnable runnable, CallbackInfo ci){
+	@Inject(method = "renderSky", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;disableTexture()V", ordinal = 0), cancellable = true)
+	public void renderCustomSky(MatrixStack matrices, Matrix4f projectionMatrix, float tickDelta, Camera preStep, boolean bl, Runnable runnable, CallbackInfo ci){
 		if(AxolotlClient.CONFIG.customSky.get() && SkyboxManager.getInstance().hasSkyBoxes() && !QuiltLoader.isModLoaded("fabricskyboxes")) {
 			RenderSystem.disableTexture();
 			Vec3d vec3d = this.world.getSkyColor(this.client.gameRenderer.getCamera().getPos(), tickDelta);
diff --git a/src/main/java/io/github/axolotlclient/modules/sky/SkyResourceManager.java b/src/main/java/io/github/axolotlclient/modules/sky/SkyResourceManager.java
@@ -37,7 +37,7 @@ public static void reload(List<ResourcePack> resourcePacks) {
                                 new InputStreamReader(stream, StandardCharsets.UTF_8))
                                 .lines()
                                 .collect(Collectors.joining("\n"));
-	                    AxolotlClient.LOGGER.info("Loading FSB skies in pack "+pack.getName()+" !");
+	                    AxolotlClient.LOGGER.info("Loading FSB sky in pack "+pack.getName()+" !");
                         loadSky(text);
                     } catch (IOException e) {
                         break;
diff --git a/src/main/java/io/github/axolotlclient/modules/zoom/Zoom.java b/src/main/java/io/github/axolotlclient/modules/zoom/Zoom.java
@@ -20,7 +20,7 @@ public class Zoom extends AbstractModule {
 	public static boolean active;
 	private static Double originalSensitivity;
 	private static boolean originalSmoothCamera;
-	private static KeyBind keyBinding;
+	public static KeyBind keyBinding;
 	private static double targetFactor = 1;
 	private static double divisor;
 	private static float lastAnimatedFactor = 1;
@@ -51,6 +51,7 @@ public void init() {
 
 		keyBinding = new KeyBind("key.zoom", InputUtil.KEY_C_CODE, "category.axolotlclient");
 		KeyBindingHelper.registerKeyBinding(keyBinding);
+
 		active = false;
 	}
 
@@ -85,7 +86,7 @@ public static void setOptions() {
 
 	private static void updateSensitivity() {
 		if (decreaseSensitivity.get()) {
-			MinecraftClient.getInstance().options.getMouseSensitivity().set(originalSensitivity / (divisor*4));
+			MinecraftClient.getInstance().options.getMouseSensitivity().set(originalSensitivity / (divisor*divisor));
 		}
 	}
 
diff --git a/src/main/resources/axolotlclient.mixins.json b/src/main/resources/axolotlclient.mixins.json
@@ -15,6 +15,7 @@
 		"MixinChatHud",
 		"MixinClientBrandRetriever",
 		"MixinClientPlayerEntity",
+		"MixinClientWorld",
 		"MixinCrashReport",
 		"MixinDebugHud",
 		"MixinDownloadingTerrainScreen",
diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json
@@ -40,5 +40,5 @@
 		]
 	},
 	"mixin": "axolotlclient.mixins.json",
-	"accessWidener": "axolotlclient.accesswidener"
+	"access_widener": "axolotlclient.accesswidener"
 }

Original file line number	Diff line number	Diff line change
`@@ -115,4 +115,9 @@ public void renderTooltip(MatrixStack matrices, Tooltippable option, int x, int`
`115`	`115`	`for(String s:tooltip) text.add(Text.literal(s));`
`116`	`116`	`this.renderTooltip(matrices, text, x, y);`
`117`	`117`	`}`
	`118`	`+`
	`119`	`+ @Override`
	`120`	`+ public boolean isPauseScreen() {`
	`121`	`+ return false;`
	`122`	`+ }`
`118`	`123`	`}`