Compare commits
8 Commits
1.21.3
...
testing/Qu
| Author | SHA1 | Date | |
|---|---|---|---|
|
b4eb3884a5
|
|||
|
4f6bf01581
|
|||
|
ea3cd92c33
|
|||
|
|
2c88f99140 | ||
|
4b2a150a30
|
|||
|
bd205b5ae6
|
|||
|
192735d352
|
|||
|
216a498d72
|
@@ -1,6 +1,6 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id "architectury-plugin" version "3.4-SNAPSHOT"
|
id "architectury-plugin" version "3.4-SNAPSHOT"
|
||||||
id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
|
id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
|
||||||
}
|
}
|
||||||
|
|
||||||
architectury {
|
architectury {
|
||||||
|
|||||||
@@ -63,11 +63,10 @@ public class Client {
|
|||||||
Component
|
Component
|
||||||
.translatable("speedometer.error.missing_cloth")
|
.translatable("speedometer.error.missing_cloth")
|
||||||
.withColor(new Color(190, 0, 0).getRGB())
|
.withColor(new Color(190, 0, 0).getRGB())
|
||||||
.append(" ")
|
|
||||||
.append(Component
|
.append(Component
|
||||||
.literal("Open Config")
|
.translatable("speedometer.error.missing_cloth.open_config")
|
||||||
.withStyle(ChatFormatting.UNDERLINE)
|
.withStyle(ChatFormatting.UNDERLINE)
|
||||||
.withStyle((style) -> style.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_FILE, Config.getConfigPath())))
|
.withStyle((style) -> style.withClickEvent(new ClickEvent.OpenFile(Config.getConfigPath())))
|
||||||
), false);
|
), false);
|
||||||
LOGGER.warn(Component.translatable("speedometer.error.missing_cloth").getString());
|
LOGGER.warn(Component.translatable("speedometer.error.missing_cloth").getString());
|
||||||
}
|
}
|
||||||
@@ -145,8 +144,8 @@ public class Client {
|
|||||||
default -> 0;
|
default -> 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
int yPos = getPos(graphics, width, Config.getYPosition(), false);
|
int yPos = getPosImp(graphics, width, Config.getYPosition(), false);
|
||||||
int xPos = getPos(graphics, width, Config.getXPosition(), true);
|
int xPos = getPosImp(graphics, width, Config.getXPosition(), true);
|
||||||
|
|
||||||
int lineHeight = Minecraft.getInstance().font.lineHeight;
|
int lineHeight = Minecraft.getInstance().font.lineHeight;
|
||||||
|
|
||||||
@@ -223,6 +222,22 @@ public class Client {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static int getPosImp(GuiGraphics event, int width, String input, boolean isXPosition){
|
||||||
|
input = input.trim();
|
||||||
|
input = input
|
||||||
|
.replaceAll("(W+)|(H+)", String.valueOf(isXPosition?event.guiWidth():event.guiHeight()))
|
||||||
|
.replaceAll("(w+)|(h+)", String.valueOf(isXPosition?event.guiWidth()/2:event.guiHeight()/2))
|
||||||
|
.replaceAll("(S+)|(s+)", String.valueOf(width));
|
||||||
|
if((Config.isDebug()) && Config.getCounter() < 2) {
|
||||||
|
//String speedDisplayType = SpeedTypes.getName(Config.getSpeedType()).getString();
|
||||||
|
//String splitRawSpeedPosition = Arrays.toString(passerPose.toArray());
|
||||||
|
//String rawSpeedPosition = isXPosition ? Config.getXPosition() : Config.getYPosition();
|
||||||
|
LOGGER.info("Selected speed type(DEBUG): {}\n{}\n\n\n", isXPosition, input);
|
||||||
|
Config.addCounter();
|
||||||
|
}
|
||||||
|
return getPos(event, width, input, isXPosition);
|
||||||
|
}
|
||||||
|
|
||||||
private static int getPos(GuiGraphics event, int width, String input, boolean isXPosition) {
|
private static int getPos(GuiGraphics event, int width, String input, boolean isXPosition) {
|
||||||
ArrayList<String> passerPose = new ArrayList<>();
|
ArrayList<String> passerPose = new ArrayList<>();
|
||||||
final char[] s = input.toCharArray();
|
final char[] s = input.toCharArray();
|
||||||
|
|||||||
@@ -68,7 +68,8 @@
|
|||||||
|
|
||||||
"speedometer.config.error.size_outofbounds": "The size is out of bounds 10<=size<=300",
|
"speedometer.config.error.size_outofbounds": "The size is out of bounds 10<=size<=300",
|
||||||
|
|
||||||
"speedometer.error.missing_cloth": "Missing Cloth Config API for Config Screen",
|
"speedometer.error.missing_cloth": "Missing Cloth Config API for Config Screen, ",
|
||||||
|
"speedometer.error.missing_cloth.open_config": "Open Config",
|
||||||
|
|
||||||
"resourcepack.speedometer.quarter_circle_speedometer": "Quarter circle Speedometer"
|
"resourcepack.speedometer.quarter_circle_speedometer": "Quarter circle Speedometer"
|
||||||
}
|
}
|
||||||
@@ -68,7 +68,8 @@
|
|||||||
|
|
||||||
"speedometer.config.error.size_outofbounds": "Stolekten är felakting 10<=stolek<=300",
|
"speedometer.config.error.size_outofbounds": "Stolekten är felakting 10<=stolek<=300",
|
||||||
|
|
||||||
"speedometer.error.missing_cloth": "Saknar Cloth Config API för konfigurationsskärmen",
|
"speedometer.error.missing_cloth": "Saknar Cloth Config API för konfigurationsskärmen, ",
|
||||||
|
"speedometer.error.missing_cloth.open_config": "Öppna Config",
|
||||||
|
|
||||||
"resourcepack.speedometer.quarter_circle_speedometer": "Quarter circle Speedometer"
|
"resourcepack.speedometer.quarter_circle_speedometer": "Quarter circle Speedometer"
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,8 @@
|
|||||||
{
|
{
|
||||||
"homepage": "https://modrinth.com/mod/speedometer/versions",
|
"homepage": "https://modrinth.com/mod/speedometer/versions",
|
||||||
|
"1.17.1": {
|
||||||
|
"6.2.4": "Backport by request from issue #3"
|
||||||
|
},
|
||||||
"1.20.6": {
|
"1.20.6": {
|
||||||
"1.0": "First version",
|
"1.0": "First version",
|
||||||
"2.0": "Made the speedometer text movable, added debug data display, added visual speedometer",
|
"2.0": "Made the speedometer text movable, added debug data display, added visual speedometer",
|
||||||
@@ -104,6 +107,9 @@
|
|||||||
"1.20.1-recommended": "5.2",
|
"1.20.1-recommended": "5.2",
|
||||||
|
|
||||||
"1.20-latest": "5.2",
|
"1.20-latest": "5.2",
|
||||||
"1.20-recommended": "5.2"
|
"1.20-recommended": "5.2",
|
||||||
|
|
||||||
|
"1.17.1-latest": "6.2.4",
|
||||||
|
"1.17.1-recommended": "6.2.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,29 +1,29 @@
|
|||||||
org.gradle.jvmargs=-Xmx8G
|
org.gradle.jvmargs=-Xmx8G
|
||||||
|
|
||||||
minecraft_version=1.21.4
|
minecraft_version=1.21.5
|
||||||
|
|
||||||
archives_base_name=speedometer
|
archives_base_name=speedometer
|
||||||
mod_version=6.2.2
|
mod_version=6.2.4
|
||||||
maven_group=me.zacharias
|
maven_group=me.zacharias
|
||||||
|
|
||||||
# https://modrinth.com/mod/architectury-api/versions
|
# https://modrinth.com/mod/architectury-api/versions
|
||||||
architectury_version=15.0.1
|
architectury_version=16.0.3
|
||||||
|
|
||||||
# https://modrinth.com/mod/cloth-config/versions
|
# https://modrinth.com/mod/cloth-config/versions
|
||||||
cloth_config_version = 17.0.144
|
cloth_config_version = 18.0.145
|
||||||
|
|
||||||
# NeoForged Only
|
# NeoForged Only
|
||||||
# https://neoforged.net/
|
# https://neoforged.net/
|
||||||
neoforge_version = 21.4.30-beta
|
neoforge_version = 21.5.14-beta
|
||||||
|
|
||||||
# Fabric Only
|
# Fabric Only
|
||||||
# https://fabricmc.net/develop/
|
# https://fabricmc.net/develop/
|
||||||
fabric_loader_version=0.16.9
|
fabric_loader_version=0.16.10
|
||||||
fabric_api_version=0.112.1
|
fabric_api_version=0.119.6
|
||||||
|
|
||||||
# Fabric Only
|
# Fabric Only
|
||||||
# https://modrinth.com/mod/modmenu/versions
|
# https://modrinth.com/mod/modmenu/versions
|
||||||
modmenu_version = 13.0.0-beta.1
|
modmenu_version = 14.0.0-rc.2
|
||||||
|
|
||||||
# Version of the org.json json library
|
# Version of the org.json json library
|
||||||
json_version = 20240303
|
json_version = 20240303
|
||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
|||||||
#Fri Jun 21 10:45:53 CEST 2024
|
#Fri Jun 21 10:45:53 CEST 2024
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package me.zacharias.speedometer.forge;
|
|||||||
|
|
||||||
import com.mojang.datafixers.util.Unit;
|
import com.mojang.datafixers.util.Unit;
|
||||||
import me.zacharias.speedometer.Speedometer;
|
import me.zacharias.speedometer.Speedometer;
|
||||||
|
import net.minecraft.resources.ResourceLocation;
|
||||||
import net.minecraft.server.packs.resources.ResourceManager;
|
import net.minecraft.server.packs.resources.ResourceManager;
|
||||||
import net.minecraft.server.packs.resources.SimplePreparableReloadListener;
|
import net.minecraft.server.packs.resources.SimplePreparableReloadListener;
|
||||||
import net.minecraft.util.profiling.ProfilerFiller;
|
import net.minecraft.util.profiling.ProfilerFiller;
|
||||||
@@ -11,10 +12,12 @@ import net.neoforged.bus.api.SubscribeEvent;
|
|||||||
import net.neoforged.fml.common.EventBusSubscriber;
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
import net.neoforged.fml.common.Mod;
|
import net.neoforged.fml.common.Mod;
|
||||||
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
|
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
|
||||||
import net.neoforged.neoforge.client.event.RegisterClientReloadListenersEvent;
|
import net.neoforged.neoforge.client.event.AddClientReloadListenersEvent;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
@Mod(Speedometer.MOD_ID)
|
import static me.zacharias.speedometer.Speedometer.MOD_ID;
|
||||||
|
|
||||||
|
@Mod(MOD_ID)
|
||||||
public class SpeedometerNeoForge {
|
public class SpeedometerNeoForge {
|
||||||
public SpeedometerNeoForge(IEventBus eventBus) {
|
public SpeedometerNeoForge(IEventBus eventBus) {
|
||||||
// Submit our event bus to let architectury register our content on the right time
|
// Submit our event bus to let architectury register our content on the right time
|
||||||
@@ -24,7 +27,7 @@ public class SpeedometerNeoForge {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventBusSubscriber(modid = Speedometer.MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
|
@EventBusSubscriber(modid = MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
|
||||||
class EventHandler
|
class EventHandler
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
@@ -34,8 +37,8 @@ class EventHandler
|
|||||||
* @param event The event that is fired when the client reloads resources
|
* @param event The event that is fired when the client reloads resources
|
||||||
*/
|
*/
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
private static void onResourceReload(RegisterClientReloadListenersEvent event) {
|
private static void onResourceReload(AddClientReloadListenersEvent event) {
|
||||||
event.registerReloadListener(new SimplePreparableReloadListener<Unit>() {
|
event.addListener(ResourceLocation.fromNamespaceAndPath(MOD_ID, "reload_listener"), new SimplePreparableReloadListener<Unit>() {
|
||||||
@Override
|
@Override
|
||||||
protected @NotNull Unit prepare(@NotNull ResourceManager arg, @NotNull ProfilerFiller arg2) {
|
protected @NotNull Unit prepare(@NotNull ResourceManager arg, @NotNull ProfilerFiller arg2) {
|
||||||
return Unit.INSTANCE;
|
return Unit.INSTANCE;
|
||||||
|
|||||||
@@ -5,10 +5,19 @@
|
|||||||
"6.0.1": "Small bug fix in Parser",
|
"6.0.1": "Small bug fix in Parser",
|
||||||
"6.1": "Small bug fix in Parser",
|
"6.1": "Small bug fix in Parser",
|
||||||
"6.2": "Making speedometer and pointer resource pack based",
|
"6.2": "Making speedometer and pointer resource pack based",
|
||||||
"6.2.1": "Fixed issue #3"
|
"6.2.1": "Fixed issue #3",
|
||||||
|
"6.2.2": "Fixed issue with multi digit position in the parser",
|
||||||
|
"6.2.3": "Fixed crash issue from 6.2.2 when playing in 1.21.4",
|
||||||
|
"6.2.4": "updated to 1.21.5"
|
||||||
},
|
},
|
||||||
"promos": {
|
"promos": {
|
||||||
"1.21-latest": "6.2.1",
|
"1.21-latest": "6.2.2",
|
||||||
"1.21-recommended": "6.2.1"
|
"1.21-recommended": "6.2.2",
|
||||||
|
|
||||||
|
"1.21.4-latest": "6.2.3",
|
||||||
|
"1.21.4-recommended": "6.2.3",
|
||||||
|
|
||||||
|
"1.21.5-latest": "6.2.4",
|
||||||
|
"1.21.5-recommended": "6.2.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
1
quilt/gradle.properties
Normal file
1
quilt/gradle.properties
Normal file
@@ -0,0 +1 @@
|
|||||||
|
loom.platform=quilt
|
||||||
@@ -10,3 +10,4 @@ pluginManagement {
|
|||||||
include("common")
|
include("common")
|
||||||
include("fabric")
|
include("fabric")
|
||||||
include("neoforge")
|
include("neoforge")
|
||||||
|
include("quilt")
|
||||||
Reference in New Issue
Block a user