Skip to content

Add back modernize f3 screen #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add back modernize f3 screen #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/java/org/embeddedt/archaicfix/config/ArchaicConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,10 @@ public class ArchaicConfig {
@Config.DefaultBoolean(true)
public static boolean showSplashMemoryBar;

@Config.Comment("Tweak F3 screen to be closer to modern versions.")
@Config.DefaultBoolean(false)
public static boolean modernizeF3Screen;

@Config.Comment("Replace tall grass texture with modern version.")
@Config.DefaultBoolean(false)
public static boolean modernizeTextures;
Expand Down
133 changes: 124 additions & 9 deletions src/main/java/org/embeddedt/archaicfix/proxy/ClientProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
package org.embeddedt.archaicfix.proxy;

import com.google.common.base.Objects;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.EventPriority;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.GuiMainMenu;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.network.NetHandlerPlayClient;
import net.minecraft.server.integrated.IntegratedServer;
import net.minecraft.util.Direction;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraftforge.client.event.EntityViewRenderEvent;
import net.minecraftforge.client.event.GuiOpenEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.client.event.sound.SoundLoadEvent;
import net.minecraftforge.common.MinecraftForge;
import org.embeddedt.archaicfix.ArchaicLogger;
Expand All @@ -17,29 +27,32 @@
import org.embeddedt.archaicfix.helpers.SoundDeviceThread;

import java.lang.management.ManagementFactory;
import java.util.Locale;

public class ClientProxy extends CommonProxy {
SoundDeviceThread soundThread = null;
public static volatile boolean soundSystemReloadLock = false;

@Override
public void preinit() {
super.preinit();
Minecraft.memoryReserve = new byte[0];
MinecraftForge.EVENT_BUS.register(this);
FMLCommonHandler.instance().bus().register(this);
if(ArchaicConfig.modernizeTextures) {
if (ArchaicConfig.modernizeTextures) {
BuiltInResourcePack.register("vanilla_overrides");
}
}

float lastIntegratedTickTime;

@SubscribeEvent
public void onTick(TickEvent.ServerTickEvent event) {
if(FMLCommonHandler.instance().getSide().isClient() && event.phase == TickEvent.Phase.END) {
if (FMLCommonHandler.instance().getSide().isClient() && event.phase == TickEvent.Phase.END) {
IntegratedServer srv = Minecraft.getMinecraft().getIntegratedServer();
if(srv != null) {
if (srv != null) {
long currentTickTime = srv.tickTimeArray[srv.getTickCounter() % 100];
lastIntegratedTickTime = lastIntegratedTickTime * 0.8F + (float)currentTickTime / 1000000.0F * 0.2F;
lastIntegratedTickTime = lastIntegratedTickTime * 0.8F + (float) currentTickTime / 1000000.0F * 0.2F;
} else
lastIntegratedTickTime = 0;
}
Expand All @@ -49,7 +62,7 @@ public void onTick(TickEvent.ServerTickEvent event) {

@SubscribeEvent(priority = EventPriority.LOWEST)
public void onGuiOpen(GuiOpenEvent event) {
if(!event.isCanceled() && event.gui instanceof GuiMainMenu && gameStartTime == -1) {
if (!event.isCanceled() && event.gui instanceof GuiMainMenu && gameStartTime == -1) {
gameStartTime = ManagementFactory.getRuntimeMXBean().getUptime() / 1000f;
ArchaicLogger.LOGGER.info("The game loaded in " + gameStartTime + " seconds.");
}
Expand All @@ -58,7 +71,7 @@ public void onGuiOpen(GuiOpenEvent event) {
@SubscribeEvent
public void onSoundSetup(SoundLoadEvent event) {
soundSystemReloadLock = false;
if(soundThread == null) {
if (soundThread == null) {
ArchaicLogger.LOGGER.info("Starting sound device thread");
soundThread = new SoundDeviceThread();
soundThread.start();
Expand All @@ -68,11 +81,113 @@ public void onSoundSetup(SoundLoadEvent event) {
/* coerce NaN fog values back to 0 (https://bugs.mojang.com/browse/MC-10480) */
@SubscribeEvent(priority = EventPriority.LOWEST)
public void onFogColor(EntityViewRenderEvent.FogColors event) {
if(Float.isNaN(event.red))
if (Float.isNaN(event.red))
event.red = 0f;
if(Float.isNaN(event.green))
if (Float.isNaN(event.green))
event.green = 0f;
if(Float.isNaN(event.blue))
if (Float.isNaN(event.blue))
event.blue = 0f;
}

@SubscribeEvent(priority = EventPriority.LOWEST)
public void onRenderOverlay(RenderGameOverlayEvent.Text event) {
Minecraft mc = Minecraft.getMinecraft();
if (event.isCanceled() || !mc.gameSettings.showDebugInfo || event.left.size() < 1)
return;
NetHandlerPlayClient cl = mc.getNetHandler();
if (cl != null) {
IntegratedServer srv = mc.getIntegratedServer();

if (srv != null) {
String s = String.format("Integrated server @ %.0f ms ticks", lastIntegratedTickTime);
event.left.add(1, s);
}
}
if (ArchaicConfig.showBlockDebugInfo && mc.objectMouseOver != null
&& mc.objectMouseOver.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
if (!event.right.isEmpty()
&& Objects.firstNonNull(event.right.get(event.right.size() - 1), "").length() > 0)
event.right.add("");
Block block = mc.theWorld.getBlock(mc.objectMouseOver.blockX, mc.objectMouseOver.blockY,
mc.objectMouseOver.blockZ);
int meta = mc.theWorld.getBlockMetadata(mc.objectMouseOver.blockX, mc.objectMouseOver.blockY,
mc.objectMouseOver.blockZ);
event.right.add(Block.blockRegistry.getNameForObject(block));
event.right.add("meta: " + meta);
}
if (ArchaicConfig.modernizeF3Screen) {
boolean hasReplacedXYZ = false;
for (int i = 0; i < event.left.size() - 3; i++) {
/*
* These checks should not be inefficient as most of the time the first one will
* already fail
*/
if (!hasReplacedXYZ && Objects.firstNonNull(event.left.get(i), "").startsWith("x:")
&& Objects.firstNonNull(event.left.get(i + 1), "").startsWith("y:")
&& Objects.firstNonNull(event.left.get(i + 2), "").startsWith("z:")
&& Objects.firstNonNull(event.left.get(i + 3), "").startsWith("f:")) {
hasReplacedXYZ = true;
int heading = MathHelper.floor_double((double) (mc.thePlayer.rotationYaw * 4.0F / 360.0F) + 0.5D)
& 3;
String heading_str;
switch (heading) {
case 0:
heading_str = "Towards positive Z";
break;
case 1:
heading_str = "Towards negative X";
break;
case 2:
heading_str = "Towards negative Z";
break;
case 3:
heading_str = "Towards positive X";
break;
default:
throw new RuntimeException();
}
event.left.set(i, String.format("XYZ: %.3f / %.5f / %.3f", mc.thePlayer.posX,
mc.thePlayer.boundingBox.minY, mc.thePlayer.posZ));
int blockX = MathHelper.floor_double(mc.thePlayer.posX);
int blockY = MathHelper.floor_double(mc.thePlayer.boundingBox.minY);
int blockZ = MathHelper.floor_double(mc.thePlayer.posZ);
event.left.set(i + 1, String.format("Block: %d %d %d [%d %d %d]", blockX, blockY, blockZ,
blockX & 15, blockY & 15, blockZ & 15));
event.left.set(i + 2, String.format("Chunk: %d %d %d", blockX >> 4, blockY >> 4, blockZ >> 4));
event.left.set(i + 3,
String.format("Facing: %s (%s) (%.1f / %.1f)",
Direction.directions[heading].toLowerCase(Locale.ROOT), heading_str,
MathHelper.wrapAngleTo180_float(mc.thePlayer.rotationYaw),
MathHelper.wrapAngleTo180_float(mc.thePlayer.rotationPitch)));
}
}
event.setCanceled(true);
/* render ourselves */
FontRenderer fontrenderer = mc.fontRenderer;
int fontColor = 0xe0e0e0;
int rectColor = 0x90505050;
for (int x = 0; x < event.left.size(); x++) {
String msg = event.left.get(x);
if (msg == null)
continue;
int strX = 2;
int strY = 2 + x * fontrenderer.FONT_HEIGHT;
Gui.drawRect(1, strY - 1, strX + fontrenderer.getStringWidth(msg) + 1,
strY + fontrenderer.FONT_HEIGHT - 1, rectColor);
fontrenderer.drawString(msg, strX, strY, fontColor);
}
int width = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight).getScaledWidth();
for (int x = 0; x < event.right.size(); x++) {
String msg = event.right.get(x);
if (msg == null)
continue;
int w = fontrenderer.getStringWidth(msg);
int strX = width - w - 2;
int strY = 2 + x * fontrenderer.FONT_HEIGHT;
Gui.drawRect(strX - 1, strY - 1, strX + w + 1, strY + fontrenderer.FONT_HEIGHT - 1, rectColor);
fontrenderer.drawString(msg, strX, strY, fontColor);
}
}

}
}