Zacharias/Speedometer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 12 Wiki Activity

Updated to 1.21

Browse Source 
Removed support for Forge
Added support for NeoForge

Added a new location for Visual Speed Type (WIP) slight bug

Made Cloth Config an optional dependency (as of version 6.2)
This commit is contained in:
Zacharias
2024-07-09 08:40:43 +02:00
parent 965a3ea62d
commit 481993b2e2
22 changed files with 174 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/build.gradle
View File

@@ -9,7 +9,7 @@ dependencies {
}
architectury {
common()
common("fabric", "neoforge")
}
publishing {

84
common/src/main/java/me/zacharias/speedometer/Client.java
View File

@@ -5,15 +5,19 @@ import dev.architectury.event.events.client.ClientGuiEvent;
import dev.architectury.event.events.client.ClientTickEvent;
import dev.architectury.platform.Platform;
import dev.architectury.registry.client.keymappings.KeyMappingRegistry;
import net.minecraft.ChatFormatting;
import net.minecraft.client.DeltaTracker;
import net.minecraft.client.KeyMapping;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.network.chat.ClickEvent;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.animal.Pig;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.vehicle.Boat;
import net.minecraft.world.entity.vehicle.Minecart;
import net.minecraft.world.phys.Vec3;
import net.minecraft.network.chat.Component;
import java.awt.*;
import java.awt.image.BufferedImage;
@@ -43,13 +47,41 @@ public class Client {
public static BufferedImage img = null;
public static void init(){
Platform.getMod(MOD_ID).registerConfigurationScreen(parent -> ConfigMenu.getConfig(parent).build());
final boolean isClothLoaded = false;//Platform.isModLoaded("cloth_config") || Platform.isModLoaded("cloth-config");
if(isClothLoaded) {
Platform.getMod(MOD_ID).registerConfigurationScreen(parent -> ConfigMenu.getConfig(parent).build());
}
else
{
LOGGER.warn("Missing Cloth Config API, In game config menu will not be available");
}
KeyMappingRegistry.register(CONFIG_KEY);
ClientTickEvent.CLIENT_POST.register(minecraft -> {
if(CONFIG_KEY.consumeClick()){
Minecraft.getInstance().setScreen(ConfigMenu.getConfig(Minecraft.getInstance().screen).build());
if(isClothLoaded) {
Minecraft.getInstance().setScreen(ConfigMenu.getConfig(Minecraft.getInstance().screen).build());
}
else if(Minecraft.getInstance().player != null)
{
Minecraft.getInstance().player.sendSystemMessage(
Component
.translatable("speedometer.error.missing_cloth")
.withColor(new Color(190, 0, 0).getRGB())
.append(" ")
.append(Component
.literal("Open Config")
.withStyle(ChatFormatting.UNDERLINE)
.withStyle((style) -> style.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, Config.getConfigPath())))
));
LOGGER.warn(Component.translatable("speedometer.error.missing_cloth").getString());
}
else
{
LOGGER.warn(Component.translatable("speedometer.error.missing_cloth").getString());
}
}
});
@@ -73,7 +105,7 @@ public class Client {
LOGGER.info("Finished loading speedometer");
}
private static void render(GuiGraphics graphics, float tick) {
private static void render(GuiGraphics graphics, DeltaTracker deltaTracker) {
if(Minecraft.getInstance().player == null) return;
Entity entity = Minecraft.getInstance().player.getRootVehicle();
@@ -129,10 +161,19 @@ public class Client {
case MPH -> speedTypeSpeed;
case KNOT -> Math.pow(speedTypeSpeed,1.05);
}/100;
double i = (v *(316-45))+45;
String speedString = format + " " + SpeedTypes.getName(speedType).getString();
int width = switch ((Config.getVisualSpeedometer() && !speedometerVisualDisplayFailed) ? 1 : 0){
case 1 -> Config.getImageSize();
case 0 -> Minecraft.getInstance().font.width(speedString);
default -> 0;
};
int yPos = getPos(graphics, Config.getYPosition(), 1);
int xPos = getPos(graphics, Config.getXPosition(), 0);
int yPos = getPos(graphics, width, Config.getYPosition(), 1);
int xPos = getPos(graphics, width, Config.getXPosition(), 0);
int lineHeight = Minecraft.getInstance().font.lineHeight;
@@ -147,13 +188,9 @@ public class Client {
g2d.setColor(new Color(138, 0, 0));
g2d.setFont(new Font(g2d.getFont().getName(), Font.PLAIN, 15));
if(Config.getShowVisualSpeedType()) {
g2d.drawString(SpeedTypes.getName(speedType).getString(), img.getWidth() / 2 - 27, img.getHeight() / 2 + 25);
}
if(Config.getShowSpeedType()){
String speedString = SpeedTypes.getName(speedType).getString();
int width = Minecraft.getInstance().font.width(speedString);
drawString(graphics, xPos - width, yPos - Config.getImageSize() - lineHeight - 1, speedString, Config.getColor().getColor());
speedString = SpeedTypes.getName(speedType).getString();
drawString(graphics, xPos - width, yPos - Config.getImageSize() - lineHeight - 1, speedString, Config.getColor().getRGB());
}
BufferedImage img = ImageHandler.scale(Client.img, Config.getImageSize(), Config.getImageSize());
@@ -199,14 +236,12 @@ public class Client {
// i -> x
// j -> y
// k -> color RGB int
String speedString = format + " " + SpeedTypes.getName(speedType).getString();
int width = Minecraft.getInstance().font.width(speedString);
graphics.drawString(
Minecraft.getInstance().font,
speedString,
xPos - width,
yPos - lineHeight,
Config.getColor().getColor()
Config.getColor().getRGB()
);
}
@@ -228,7 +263,7 @@ public class Client {
"Velocity total average: " + speed + "\n" +
"Velocity total in " + speedType.name() + ": " + speedTypeSpeed + "\n" +
"Percentage point of visual speedometer: " + v + "\n" +
"Degree end point: " + (i+45) +"\n" +
"Degree end point: " + i +"\n" +
(Config.getVisualSpeedometer()?"Visual Size: ":"Textual display") + Config.getImageSize();
Color color = new Color(255, 255, 255);
@@ -251,7 +286,7 @@ public class Client {
);
}
private static int getPos(GuiGraphics event, String input, int type) {
private static int getPos(GuiGraphics event, int width, String input, int type) {
ArrayList<String> passerPose = new ArrayList<>();
final char[] s = input.toCharArray();
try{
@@ -262,6 +297,9 @@ public class Client {
}else if(s[i] == 'h' || s[i] == 'w'){
if(type == 0) passerPose.add(String.valueOf(event.guiWidth() / 2));
else if(type == 1) passerPose.add(String.valueOf(event.guiHeight() / 2));
}else if(s[i] == 'S' || s[i] == 's'){
if(type == 0) passerPose.add(String.valueOf(width));
else if(type == 1) passerPose.add(String.valueOf(width));
}else if(s[i] == '+'){
passerPose.add("+");
}else if(s[i] == '-'){
@@ -272,8 +310,14 @@ public class Client {
passerPose.add("/");
}else if(Character.isDigit(s[i])){
try{
Integer.parseInt(passerPose.get(i-1));
passerPose.add(i-1,passerPose.get(i-1)+s[i]);
if(i-1 > 0) {
Integer.parseInt(passerPose.get(i - 1));
passerPose.add(i - 1, passerPose.get(i - 1) + s[i]);
}
else
{
passerPose.add(Character.toString(s[i]));
}
}catch (NumberFormatException e){
passerPose.add(Character.toString(s[i]));
}

37
common/src/main/java/me/zacharias/speedometer/Config.java
View File

@@ -3,9 +3,9 @@ package me.zacharias.speedometer;
import dev.architectury.platform.Platform;
import org.json.JSONObject;
import java.awt.*;
import java.io.*;
import me.shedaniel.math.Color;
import static me.zacharias.speedometer.Speedometer.MOD_ID;
@@ -13,10 +13,12 @@ public class Config {
private static JSONObject config;
public static final float configVersion = 3f;
private static int counter = 0;
private static String configPath;
public static void initialize(){
if(config != null) throw new RuntimeException("Already Initialized");
File configFile = new File(Platform.getConfigFolder().toString()+"/"+MOD_ID+"/config.json");
configPath = Platform.getConfigFolder().toString()+"/"+MOD_ID+"/config.json";
File configFile = new File(configPath);
if(!configFile.exists()){
try {
configFile.getParentFile().mkdir();
@@ -107,7 +109,7 @@ public class Config {
}
public static void save(){
File config = new File(Platform.getConfigFolder().toString()+"/"+MOD_ID+"/config.json");
File config = new File(configPath);
if(!config.exists()){
try {
config.getParentFile().mkdir();
@@ -146,13 +148,13 @@ public class Config {
public static Color getColor(){
if(config.has("color")){
JSONObject color = config.getJSONObject("color");
return Color.ofRGB(
return new Color(
color.getInt("r"),
color.getInt("g"),
color.getInt("b")
);
}else{
return Color.ofRGB(16, 146, 158);
return new Color(16, 146, 158);
}
}
@@ -203,14 +205,6 @@ public class Config {
}
}
public static boolean getShowVisualSpeedType() {
if(config.has("showVisualSpeedType")){
return config.getBoolean("showVisualSpeedType");
}else{
return false;
}
}
public static boolean getShowSpeedType(){
if(config.has("getShowSpeedType")){
return config.getBoolean("showSpeedType");
@@ -219,11 +213,11 @@ public class Config {
}
}
public static void setColor(Color color){
public static void setColor(int r, int g, int b){
config.put("color", new JSONObject()
.put("r", color.getRed())
.put("g", color.getGreen())
.put("b", color.getBlue())
.put("r", r)
.put("g", g)
.put("b", b)
);
}
@@ -255,11 +249,12 @@ public class Config {
config.put("imageSize", imageSize);
}
public static void setShowVisualSpeedType(boolean showVisualSpeedType){
config.put("showVisualSpeedType", showVisualSpeedType);
}
public static void setShowSpeedType(boolean showSpeedType){
config.put("showSpeedType", showSpeedType);
}
public static String getConfigPath()
{
return configPath;
}
}

20
common/src/main/java/me/zacharias/speedometer/ConfigMenu.java
View File

@@ -25,8 +25,10 @@ public class ConfigMenu {
.build()
);
category.addEntry(entryBuilder.startColorField(Component.translatable("speedometer.config.color"), me.zacharias.speedometer.Config.getColor())
.setSaveConsumer2(me.zacharias.speedometer.Config::setColor)
category.addEntry(entryBuilder.startColorField(Component.translatable("speedometer.config.color"), me.zacharias.speedometer.Config.getColor().getRGB())
.setSaveConsumer2(color -> {
me.zacharias.speedometer.Config.setColor(color.getRed(), color.getGreen(), color.getBlue());
})
.build()
);
@@ -58,7 +60,8 @@ public class ConfigMenu {
})
.setTooltip(
Component.translatable("speedometer.config.tooltip.xPosition.line1"),
Component.translatable("speedometer.config.tooltip.xPosition.line2")
Component.translatable("speedometer.config.tooltip.xPosition.line2"),
Component.translatable("speedometer.config.tooltip.xPosition.line3")
)
.build()
);
@@ -75,7 +78,8 @@ public class ConfigMenu {
})
.setTooltip(
Component.translatable("speedometer.config.tooltip.yPosition.line1"),
Component.translatable("speedometer.config.tooltip.yPosition.line2")
Component.translatable("speedometer.config.tooltip.yPosition.line2"),
Component.translatable("speedometer.config.tooltip.yPosition.line3")
)
.build()
);
@@ -97,14 +101,6 @@ public class ConfigMenu {
.build()
);
category.addEntry(entryBuilder.startBooleanToggle(Component.translatable("speedometer.config.showVisualSpeedType"), Config.getShowVisualSpeedType())
.setSaveConsumer(Config::setShowVisualSpeedType)
.setYesNoTextSupplier(showVisualSpeedType -> Component.translatable("speedometer."+(showVisualSpeedType?"show":"hide")).withStyle(ChatFormatting.DARK_RED))
.setTooltip(Component.translatable("speedometer.config.tooltip.showVisualSpeedType.line1"),
Component.translatable("speedometer.config.tooltip.showVisualSpeedType.line2"))
.build()
);
category.addEntry(entryBuilder.startBooleanToggle(Component.translatable("speedometer.config.debug"),Config.isDebug())

4
common/src/main/resources/assets/speedometer/lang/en_us.json
View File

@@ -60,5 +60,7 @@
"speedometer.config.tooltip.showSpeedType.line1": "This setting shows the speed type above the visual meter which is better then within the visual meter",
"speedometer.invalid": "Invalid String"
"speedometer.invalid": "Invalid String",
"speedometer.error.missing_cloth": "Missing Cloth Config API for Config Screen"
}