diff --git a/FG-Fabric/src/main/java/dev/tr7zw/exordium/ExordiumMod.java b/FG-Fabric/src/main/java/dev/tr7zw/exordium/ExordiumMod.java index 9a85978..f249a06 100644 --- a/FG-Fabric/src/main/java/dev/tr7zw/exordium/ExordiumMod.java +++ b/FG-Fabric/src/main/java/dev/tr7zw/exordium/ExordiumMod.java @@ -3,7 +3,7 @@ import net.fabricmc.api.ClientModInitializer; public class ExordiumMod extends ExordiumModBase implements ClientModInitializer { - + @Override public void onInitializeClient() { super.onInitialize(); diff --git a/FG-Fabric/src/main/java/dev/tr7zw/exordium/ExordiumModMenu.java b/FG-Fabric/src/main/java/dev/tr7zw/exordium/ExordiumModMenu.java index 47d2a68..6523e2a 100644 --- a/FG-Fabric/src/main/java/dev/tr7zw/exordium/ExordiumModMenu.java +++ b/FG-Fabric/src/main/java/dev/tr7zw/exordium/ExordiumModMenu.java @@ -10,6 +10,6 @@ public ConfigScreenFactory getModConfigScreenFactory() { return parent -> { return ExordiumModBase.instance.createConfigScreen(parent); }; - } - + } + } diff --git a/FG-Fabric/src/main/resources/fabric.mod.json b/FG-Fabric/src/main/resources/fabric.mod.json index 70a798c..be2a130 100644 --- a/FG-Fabric/src/main/resources/fabric.mod.json +++ b/FG-Fabric/src/main/resources/fabric.mod.json @@ -1,40 +1,37 @@ { - "schemaVersion": 1, - "id": "exordium", - "version": "${version}", - - "name": "Exordium", - "description": "Render the ingame gui on its own FPS limiter", - "authors": [ - "tr7zw" - ], - "contact": { - "homepage": "https://github.com/tr7zw", - "sources": "https://github.com/tr7zw", - "issues": "https://github.com/tr7zw" - }, - - "license": "tr7zw Protective License", - "icon": "assets/exordium/icon.png", - - "environment": "client", - "entrypoints": { - "client": [ - "dev.tr7zw.exordium.ExordiumMod" + "schemaVersion": 1, + "id": "exordium", + "version": "${version}", + "name": "Exordium", + "description": "Render the ingame gui on its own FPS limiter", + "authors": [ + "tr7zw" ], - "modmenu": [ - "dev.tr7zw.exordium.ExordiumModMenu" + "contact": { + "homepage": "https://github.com/tr7zw", + "sources": "https://github.com/tr7zw", + "issues": "https://github.com/tr7zw" + }, + "license": "tr7zw Protective License", + "icon": "assets/exordium/icon.png", + "environment": "client", + "entrypoints": { + "client": [ + "dev.tr7zw.exordium.ExordiumMod" + ], + "modmenu": [ + "dev.tr7zw.exordium.ExordiumModMenu" + ], + "preLaunch": [ + "dev.tr7zw.exordium.ExordiumPreLaunch" + ] + }, + "mixins": [ + "exordium.mixins.json" ], - "preLaunch" : [ - "dev.tr7zw.exordium.ExordiumPreLaunch" - ] - }, - "mixins": [ - "exordium.mixins.json" - ], - "accessWidener" : "exordium.accesswidener", - "depends": { - "fabric": "*", - "minecraft": ">=1.20.2" - } + "accessWidener": "exordium.accesswidener", + "depends": { + "fabric": "*", + "minecraft": ">=1.20.2" + } } diff --git a/FG-Fabric/src/test/java/dev/tr7zw/tests/MixinTests.java b/FG-Fabric/src/test/java/dev/tr7zw/tests/MixinTests.java index c1ad3c8..0bc7747 100644 --- a/FG-Fabric/src/test/java/dev/tr7zw/tests/MixinTests.java +++ b/FG-Fabric/src/test/java/dev/tr7zw/tests/MixinTests.java @@ -55,7 +55,7 @@ public void testMixins() { objenesis.newInstance(SignBlockEntity.class); objenesis.newInstance(SignRenderer.class); } - + @Test public void langTests() throws Throwable { Language lang = TestUtil.loadDefault("/assets/exordium/lang/en_us.json"); @@ -64,9 +64,9 @@ public void langTests() throws Throwable { CustomConfigScreen screen = (CustomConfigScreen) ExordiumModBase.instance.createConfigScreen(null); List> options = TestUtil.bootStrapCustomConfigScreen(screen); assertNotEquals(screen.getTitle().getString(), lang.getOrDefault(screen.getTitle().getString())); - for(OptionInstance option : options) { + for (OptionInstance option : options) { Set keys = TestUtil.getKeys(option, true); - for(String key : keys) { + for (String key : keys) { System.out.println(key + " " + lang.getOrDefault(key)); assertNotEquals(key, lang.getOrDefault(key)); } diff --git a/FG-Fabric/src/test/java/dev/tr7zw/tests/TestUtil.java b/FG-Fabric/src/test/java/dev/tr7zw/tests/TestUtil.java index 82547ed..ee84086 100644 --- a/FG-Fabric/src/test/java/dev/tr7zw/tests/TestUtil.java +++ b/FG-Fabric/src/test/java/dev/tr7zw/tests/TestUtil.java @@ -97,16 +97,16 @@ public String getOrDefault(String paramString1, String paramString2) { } }; } - + public static Set getKeys(OptionInstance optionsInstance, boolean tooltips) { Set keys = new HashSet<>(); keys.add(optionsInstance.toString()); - if(tooltips) { + if (tooltips) { keys.add(optionsInstance.toString() + ".tooltip"); } return keys; } - + public static List> bootStrapCustomConfigScreen(CustomConfigScreen screen) throws Exception { Field optionsField = CustomConfigScreen.class.getDeclaredField("list"); optionsField.setAccessible(true); @@ -117,13 +117,13 @@ public static List> bootStrapCustomConfigScreen(CustomConfigSc init.invoke(screen); return list.options; } - + private static class CustomOptionsList extends OptionsList { public List> options = new ArrayList<>(); - + public CustomOptionsList() { - super(null, 0, 0, 0, 0, 0); + super(null, 0, 0, 0, 0); } @Override @@ -136,7 +136,7 @@ public int addBig(OptionInstance optionInstance) { public void addSmall(OptionInstance optionInstance, OptionInstance optionInstance2) { options.add(optionInstance); } - + } } diff --git a/FG-Forge/src/main/java/dev/tr7zw/exordium/ExordiumMod.java b/FG-Forge/src/main/java/dev/tr7zw/exordium/ExordiumMod.java index 5ff44dc..1fba4e3 100644 --- a/FG-Forge/src/main/java/dev/tr7zw/exordium/ExordiumMod.java +++ b/FG-Forge/src/main/java/dev/tr7zw/exordium/ExordiumMod.java @@ -42,9 +42,10 @@ public void initModloader() { () -> new IExtensionPoint.DisplayTest( () -> ModLoadingContext.get().getActiveContainer().getModInfo().getVersion().toString(), (remote, isServer) -> true)); - ModLoadingContext.get().registerExtensionPoint(ConfigScreenFactory.class, () -> new ConfigScreenFactory((mc, screen) -> { - return createConfigScreen(screen); - })); + ModLoadingContext.get().registerExtensionPoint(ConfigScreenFactory.class, + () -> new ConfigScreenFactory((mc, screen) -> { + return createConfigScreen(screen); + })); MinecraftForge.EVENT_BUS.addListener(this::preOverlayRender); MinecraftForge.EVENT_BUS.addListener(this::postOverlayRender); MinecraftForge.EVENT_BUS.addListener(this::postRenderGuiEvent); diff --git a/FG-Forge/src/main/resources/exordium.init.mixins.json b/FG-Forge/src/main/resources/exordium.init.mixins.json index 431fed6..9f0c837 100644 --- a/FG-Forge/src/main/resources/exordium.init.mixins.json +++ b/FG-Forge/src/main/resources/exordium.init.mixins.json @@ -1,4 +1,4 @@ { "minVersion": "0.8", "plugin": "cdev.tr7zw.exordium.MixinExtrasConfigPlugin" - } \ No newline at end of file +} diff --git a/Shared/src/main/java/dev/tr7zw/exordium/BufferManager.java b/Shared/src/main/java/dev/tr7zw/exordium/BufferManager.java index 8d91947..9bd2bce 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/BufferManager.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/BufferManager.java @@ -40,11 +40,11 @@ public void initialize() { vanillaBuffers.put(new ResourceLocation("scoreboard"), gui -> ((ScoreBoardOverlayAccess) gui).getScoreBoardOverlayBuffer()); vanillaBuffers.put(new ResourceLocation("hotbar"), gui -> ((HotbarOverlayAccess) gui).getHotbarOverlayBuffer()); - registerCustomHandler(new ResourceLocation("vignette"), data -> { + registerCustomHandler(new ResourceLocation("vignette"), data -> { VignetteOverlayAccess vignette = (VignetteOverlayAccess) minecraft.gui; if (ExordiumModBase.instance.config.vignetteSettings.enabled) { - if(!vignette.getVignetteOverlayBuffer().render()) { - vignette.renderCustomVignette(data.gui()); + if (!vignette.getVignetteOverlayBuffer().render()) { + vignette.renderCustomVignette(data.gui()); } data.cancel().set(true); } @@ -90,23 +90,24 @@ public BufferedComponent getBufferedComponent(ResourceLocation resourceLocation, } return null; } - + public Consumer getCustomHandler(ResourceLocation resourceLocation) { return customHandlers.get(resourceLocation); } - + public Runnable getCustomEndHandler(ResourceLocation resourceLocation) { return customEndHandlers.get(resourceLocation); } - + public void registerCustomHandler(ResourceLocation resourceLocation, Consumer handler) { customHandlers.put(resourceLocation, handler); } - + public void registerCustomEndHandler(ResourceLocation resourceLocation, Runnable handler) { customEndHandlers.put(resourceLocation, handler); } - - public record HandlerData(GuiGraphics gui, AtomicBoolean cancel) {} + + public record HandlerData(GuiGraphics gui, AtomicBoolean cancel) { + } } diff --git a/Shared/src/main/java/dev/tr7zw/exordium/ExordiumModBase.java b/Shared/src/main/java/dev/tr7zw/exordium/ExordiumModBase.java index 8d880dd..15a1197 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/ExordiumModBase.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/ExordiumModBase.java @@ -59,9 +59,9 @@ public void onInitialize() { } } bufferManager.initialize(); - initModloader(); - } - + initModloader(); + } + public void writeConfig() { if (settingsFile.exists()) settingsFile.delete(); @@ -115,7 +115,7 @@ public void setTemporaryScreenOverwrite(RenderTarget temporaryScreenOverwrite) { public CustomShaderManager getCustomShaderManager() { return customShaderManager; } - + public BufferManager getBufferManager() { return bufferManager; } diff --git a/Shared/src/main/java/dev/tr7zw/exordium/PreLoadedMod.java b/Shared/src/main/java/dev/tr7zw/exordium/PreLoadedMod.java index cbbea68..8c2d1fd 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/PreLoadedMod.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/PreLoadedMod.java @@ -3,7 +3,8 @@ import dev.tr7zw.exordium.config.Config; /** - * Dirty workaround cause Forge calls ui render methods of mixins before the mod is loaded?!? + * Dirty workaround cause Forge calls ui render methods of mixins before the mod + * is loaded?!? * * @author tr7zw * @@ -13,7 +14,7 @@ public class PreLoadedMod extends ExordiumModBase { public PreLoadedMod() { this.config = new Config(); } - + @Override public void initModloader() { diff --git a/Shared/src/main/java/dev/tr7zw/exordium/access/GuiAccess.java b/Shared/src/main/java/dev/tr7zw/exordium/access/GuiAccess.java index b876b1a..5246e7e 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/access/GuiAccess.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/access/GuiAccess.java @@ -6,9 +6,9 @@ public interface GuiAccess { public ChatComponent getChatComponent(); - + public PlayerTabOverlay getPlayerTabOverlay(); - + public int getTickCount(); - + } diff --git a/Shared/src/main/java/dev/tr7zw/exordium/access/VanillaBufferAccess.java b/Shared/src/main/java/dev/tr7zw/exordium/access/VanillaBufferAccess.java index d97a188..3149b4f 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/access/VanillaBufferAccess.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/access/VanillaBufferAccess.java @@ -6,47 +6,47 @@ public interface VanillaBufferAccess { public interface DebugOverlayAccess extends VanillaBufferAccess { - + public BufferedComponent getDebugOverlayBuffer(); - + } - + public interface ChatOverlayAccess extends VanillaBufferAccess { - + public BufferedComponent getChatOverlayBuffer(); - + } - + public interface CrosshairOverlayAccess extends VanillaBufferAccess { - + public BufferedComponent getCrosshairOverlayBuffer(); } - + public interface ExperienceBarOverlayAccess extends VanillaBufferAccess { - + public BufferedComponent getExperienceBarOverlayBuffer(); } - + public interface PlayerListOverlayAccess extends VanillaBufferAccess { public BufferedComponent getPlayerListOverlayBuffer(); } - + public interface ScoreBoardOverlayAccess extends VanillaBufferAccess { - + public BufferedComponent getScoreBoardOverlayBuffer(); } - + public interface VignetteOverlayAccess extends VanillaBufferAccess { - + public BufferedComponent getVignetteOverlayBuffer(); - + public void renderCustomVignette(GuiGraphics guiGraphics); } - + public interface HotbarOverlayAccess extends VanillaBufferAccess { - + public BufferedComponent getHotbarOverlayBuffer(); } - + } diff --git a/Shared/src/main/java/dev/tr7zw/exordium/config/ExordiumConfigScreen.java b/Shared/src/main/java/dev/tr7zw/exordium/config/ExordiumConfigScreen.java index 01b3cda..6fb1e21 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/config/ExordiumConfigScreen.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/config/ExordiumConfigScreen.java @@ -23,9 +23,8 @@ public void initialize() { options.add(getOnOffOption("text.exordium.enableSignBuffering", () -> config.enableSignBuffering, (b) -> config.enableSignBuffering = b)); - options.add( - getOnOffOption("text.exordium.enableNametagScreenBuffering", () -> config.enableNametagScreenBuffering, - (b) -> config.enableNametagScreenBuffering = b)); + options.add(getOnOffOption("text.exordium.enableNametagScreenBuffering", + () -> config.enableNametagScreenBuffering, (b) -> config.enableNametagScreenBuffering = b)); options.add(getIntOption("text.exordium.targetFPSNameTags", 30, 80, () -> config.targetFPSNameTags, (v) -> config.targetFPSNameTags = v)); options.add(getIntOption("text.exordium.pollRate", 20, 240, () -> config.pollRate, (v) -> config.pollRate = v)); diff --git a/Shared/src/main/java/dev/tr7zw/exordium/mixin/CrosshairMixin.java b/Shared/src/main/java/dev/tr7zw/exordium/mixin/CrosshairMixin.java index ee744d3..1ffbf2c 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/mixin/CrosshairMixin.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/mixin/CrosshairMixin.java @@ -41,7 +41,8 @@ public boolean needsRender() { if (wasRenderingF3 != debugOverlay.showDebugScreen()) { return true; } - if(lastHidden != ((minecraft.options.getCameraType() != CameraType.FIRST_PERSON) || minecraft.player.isSpectator())) { + if (lastHidden != ((minecraft.options.getCameraType() != CameraType.FIRST_PERSON) + || minecraft.player.isSpectator())) { return true; } if (wasRenderingF3) { @@ -50,12 +51,12 @@ public boolean needsRender() { } if (minecraft.options.attackIndicator().get() == AttackIndicatorStatus.CROSSHAIR) { float cooldown = minecraft.player.getAttackStrengthScale(0.0F); - if(lastCooldown != cooldown) { + if (lastCooldown != cooldown) { return true; } boolean flag = false; - if (minecraft.crosshairPickEntity != null - && minecraft.crosshairPickEntity instanceof LivingEntity && cooldown >= 1.0F) { + if (minecraft.crosshairPickEntity != null && minecraft.crosshairPickEntity instanceof LivingEntity + && cooldown >= 1.0F) { flag = minecraft.player.getCurrentItemAttackStrengthDelay() > 5.0F; flag &= minecraft.crosshairPickEntity.isAlive(); } @@ -72,8 +73,8 @@ public void captureState() { lastYaw = minecraft.getCameraEntity().getYRot(); lastCooldown = minecraft.player.getAttackStrengthScale(0.0F); boolean flag = false; - if (minecraft.crosshairPickEntity != null - && minecraft.crosshairPickEntity instanceof LivingEntity && lastCooldown >= 1.0F) { + if (minecraft.crosshairPickEntity != null && minecraft.crosshairPickEntity instanceof LivingEntity + && lastCooldown >= 1.0F) { flag = minecraft.player.getCurrentItemAttackStrengthDelay() > 5.0F; flag &= minecraft.crosshairPickEntity.isAlive(); } @@ -82,8 +83,7 @@ public void captureState() { }; @WrapOperation(method = "render", at = { - @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;renderCrosshair(Lnet/minecraft/client/gui/GuiGraphics;)V"), - }) + @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;renderCrosshair(Lnet/minecraft/client/gui/GuiGraphics;)V"), }) private void renderCrosshairWrapper(Gui gui, GuiGraphics guiGraphics, final Operation operation) { if (!crosshairBufferedComponent.render()) { operation.call(gui, guiGraphics); diff --git a/Shared/src/main/java/dev/tr7zw/exordium/mixin/GameRendererMixin.java b/Shared/src/main/java/dev/tr7zw/exordium/mixin/GameRendererMixin.java index 11f0a63..dc126f4 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/mixin/GameRendererMixin.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/mixin/GameRendererMixin.java @@ -1,7 +1,11 @@ package dev.tr7zw.exordium.mixin; -import java.io.IOException; - +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import com.mojang.blaze3d.vertex.PoseStack; +import dev.tr7zw.exordium.ExordiumModBase; +import net.minecraft.client.renderer.GameRenderer; +import net.minecraft.client.renderer.ShaderInstance; +import net.minecraft.server.packs.resources.ResourceProvider; import org.joml.Matrix4f; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -11,14 +15,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.mojang.blaze3d.vertex.DefaultVertexFormat; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexFormat; - -import dev.tr7zw.exordium.ExordiumModBase; -import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.client.renderer.ShaderInstance; -import net.minecraft.server.packs.resources.ResourceProvider; +import java.io.IOException; @Mixin(value = GameRenderer.class, priority = 500) // needs to be lower to cancel Architectury for REI public abstract class GameRendererMixin { @@ -47,7 +44,4 @@ public void reloadShaders(ResourceProvider resourceProvider, CallbackInfo ci) { } } - @Shadow - public abstract ShaderInstance preloadShader(ResourceProvider resourceProvider, String name, VertexFormat format); - } \ No newline at end of file diff --git a/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiDebugOverlayMixin.java b/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiDebugOverlayMixin.java index d23c20c..f05ce65 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiDebugOverlayMixin.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiDebugOverlayMixin.java @@ -28,11 +28,11 @@ public boolean needsRender() { public void captureState() { } }; - + @WrapOperation(method = "render", at = { - @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/DebugScreenOverlay;render(Lnet/minecraft/client/gui/GuiGraphics;)V"), - }) - private void renderExperienceBarWrapper(DebugScreenOverlay overlay, GuiGraphics guiGraphics, final Operation operation) { + @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/DebugScreenOverlay;render(Lnet/minecraft/client/gui/GuiGraphics;)V"), }) + private void renderExperienceBarWrapper(DebugScreenOverlay overlay, GuiGraphics guiGraphics, + final Operation operation) { if (!debugBufferedComponent.render()) { operation.call(overlay, guiGraphics); } diff --git a/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiExperienceMixin.java b/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiExperienceMixin.java index e342f94..57de43b 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiExperienceMixin.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiExperienceMixin.java @@ -38,8 +38,7 @@ public void captureState() { }; @WrapOperation(method = "render", at = { - @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;renderExperienceBar(Lnet/minecraft/client/gui/GuiGraphics;I)V"), - }) + @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;renderExperienceBar(Lnet/minecraft/client/gui/GuiGraphics;I)V"), }) private void renderExperienceBarWrapper(Gui gui, GuiGraphics guiGraphics, int i, final Operation operation) { if (!experienceBuffer.render()) { operation.call(gui, guiGraphics, i); diff --git a/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiHealthMixin.java b/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiHealthMixin.java index 0011e0f..2212af5 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiHealthMixin.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiHealthMixin.java @@ -57,19 +57,16 @@ public boolean needsRender() { || minecraft.player.hasEffect(MobEffects.REGENERATION); boolean blinking = (healthBlinkTime > tickCount && (healthBlinkTime - tickCount) / 3L % 2L == 1L); LivingEntity vehicle = getPlayerVehicleWithHealth(); - return healthBlinking != blinking || - lastRenderedHealth != lastHealth || - lastDisplayHealth != displayHealth || - lastArmorValue != minecraft.player.getArmorValue() || - lastMaxVehicleHearts != getVehicleMaxHearts(vehicle) || - lastVehicleHearts != (vehicle == null ? -1 : vehicle.getHealth()) || - lastAirSupply != minecraft.player.getAirSupply() || - lastSaturation != minecraft.player.getFoodData().getSaturationLevel() || - (hasVisualEffects || (hasVisualEffects != hadVisualEffects && lastRenderedTick != tickCount)) || - lastFoodLevel != minecraft.player.getFoodData().getFoodLevel() || - lastExhaustionLevel != minecraft.player.getFoodData().getExhaustionLevel() || - lastPlayerHealth != minecraft.player.getHealth() || - Mth.ceil(lastPlayerHealth) <= 4; + return healthBlinking != blinking || lastRenderedHealth != lastHealth || lastDisplayHealth != displayHealth + || lastArmorValue != minecraft.player.getArmorValue() + || lastMaxVehicleHearts != getVehicleMaxHearts(vehicle) + || lastVehicleHearts != (vehicle == null ? -1 : vehicle.getHealth()) + || lastAirSupply != minecraft.player.getAirSupply() + || lastSaturation != minecraft.player.getFoodData().getSaturationLevel() + || (hasVisualEffects || (hasVisualEffects != hadVisualEffects && lastRenderedTick != tickCount)) + || lastFoodLevel != minecraft.player.getFoodData().getFoodLevel() + || lastExhaustionLevel != minecraft.player.getFoodData().getExhaustionLevel() + || lastPlayerHealth != minecraft.player.getHealth() || Mth.ceil(lastPlayerHealth) <= 4; } @Override @@ -93,8 +90,7 @@ public void captureState() { }; @WrapOperation(method = "render", at = { - @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;renderPlayerHealth(Lnet/minecraft/client/gui/GuiGraphics;)V"), - }) + @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;renderPlayerHealth(Lnet/minecraft/client/gui/GuiGraphics;)V"), }) private void renderPlayerHealthWrapper(Gui gui, GuiGraphics guiGraphics, final Operation operation) { if (!healthBuffer.render()) { operation.call(gui, guiGraphics); diff --git a/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiHotbarMixin.java b/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiHotbarMixin.java index 661f88d..bf8de8a 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiHotbarMixin.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiHotbarMixin.java @@ -127,8 +127,7 @@ public boolean hasChanged() { } @WrapOperation(method = "render", at = { - @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;renderHotbar(FLnet/minecraft/client/gui/GuiGraphics;)V"), - }) + @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;renderHotbar(FLnet/minecraft/client/gui/GuiGraphics;)V"), }) private void renderHotbarWrapper(Gui gui, float f, GuiGraphics guiGraphics, final Operation operation) { outdated = hasChanged(); if (!hotbarBufferedComponent.render()) { diff --git a/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiMixin.java b/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiMixin.java index 3759f6c..0596b05 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiMixin.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/mixin/GuiMixin.java @@ -32,8 +32,7 @@ public class GuiMixin implements GuiAccess { protected int tickCount; @WrapOperation(method = "render", at = { - @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/ChatComponent;render(Lnet/minecraft/client/gui/GuiGraphics;III)V"), - }) + @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/ChatComponent;render(Lnet/minecraft/client/gui/GuiGraphics;III)V"), }) private void renderChatWrapper(ChatComponent instance, GuiGraphics guiGraphics, int tickCount, int j, int k, final Operation operation) { ChatAccess chatAccess = (ChatAccess) chat; @@ -46,8 +45,7 @@ private void renderChatWrapper(ChatComponent instance, GuiGraphics guiGraphics, } @WrapOperation(method = "render", at = { - @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/PlayerTabOverlay;render(Lnet/minecraft/client/gui/GuiGraphics;ILnet/minecraft/world/scores/Scoreboard;Lnet/minecraft/world/scores/Objective;)V"), - }) + @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/PlayerTabOverlay;render(Lnet/minecraft/client/gui/GuiGraphics;ILnet/minecraft/world/scores/Scoreboard;Lnet/minecraft/world/scores/Objective;)V"), }) private void renderTablistWrapper(PlayerTabOverlay instance, GuiGraphics guiGraphics, int screenWidth, Scoreboard scoreboard, Objective objective2, final Operation operation) { TablistAccess tablistAccess = (TablistAccess) tabList; diff --git a/Shared/src/main/java/dev/tr7zw/exordium/mixin/PlayerTabOverlayMixin.java b/Shared/src/main/java/dev/tr7zw/exordium/mixin/PlayerTabOverlayMixin.java index f6af618..39a69bc 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/mixin/PlayerTabOverlayMixin.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/mixin/PlayerTabOverlayMixin.java @@ -2,8 +2,9 @@ import java.util.*; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.GameType; -import net.minecraft.world.scores.PlayerTeam; +import net.minecraft.world.scores.*; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -15,9 +16,6 @@ import net.minecraft.client.gui.components.PlayerTabOverlay; import net.minecraft.client.multiplayer.PlayerInfo; import net.minecraft.network.chat.Component; -import net.minecraft.world.scores.Objective; -import net.minecraft.world.scores.Score; -import net.minecraft.world.scores.Scoreboard; import net.minecraft.world.scores.criteria.ObjectiveCriteria; @Mixin(PlayerTabOverlay.class) @@ -61,8 +59,8 @@ public void updateState(Scoreboard scoreboard, Objective objective) { int newHeaderHash = header == null ? 0 : header.getString().hashCode(); int newFooterHash = footer == null ? 0 : footer.getString().hashCode(); boolean plaverInfoOutdated = !playerInfoHashes.equals(fastGetPlayerInfoListHashCode(getPlayerInfos())); - outdated = plaverInfoOutdated || headerHash != newHeaderHash - || footerHash != newFooterHash || scoreboardOrObjectiveChange; + outdated = plaverInfoOutdated || headerHash != newHeaderHash || footerHash != newFooterHash + || scoreboardOrObjectiveChange; } public boolean scoreboardOrObjectiveChanged(Scoreboard scoreboard, Objective objective) { @@ -70,8 +68,8 @@ public boolean scoreboardOrObjectiveChanged(Scoreboard scoreboard, Objective obj return false; int scoreboardHashCode = 1; - for (Score score : scoreboard.getPlayerScores(objective)) - scoreboardHashCode = 31 * scoreboardHashCode + (score == null ? 0 : score.getScore()); + for (PlayerScoreEntry score : scoreboard.listPlayerScores(objective)) + scoreboardHashCode = 31 * scoreboardHashCode + (score == null ? 0 : score.value()); int newObjectiveHashCode = objective == null ? 0 : objective.getName().hashCode(); if (scoreboardHashCode == scoreboardHash && newObjectiveHashCode == objectiveHash) @@ -89,16 +87,18 @@ public ArrayList fastGetPlayerInfoListHashCode(List playerI continue; int playerHash = playerInfo.getProfile().getId().hashCode(); - playerHash += playerInfo.getProfile().getName().hashCode(); + playerHash += playerInfo.getProfile().getName().hashCode(); if (playerInfo.getTabListDisplayName() != null) { playerHash += playerInfo.getTabListDisplayName().getString().hashCode(); playerHash += playerInfo.getTabListDisplayName().getStyle().hashCode(); } else { PlayerTeam playerTeam = playerInfo.getTeam(); - if(playerTeam == null) continue; + if (playerTeam == null) + continue; Component prefix = playerTeam.getPlayerPrefix(); Component suffix = playerTeam.getPlayerSuffix(); - playerHash += Objects.hash(playerTeam.getColor(), prefix.getStyle(), prefix.getString(), suffix.getStyle(), suffix.getString()); + playerHash += Objects.hash(playerTeam.getColor(), prefix.getStyle(), prefix.getString(), + suffix.getStyle(), suffix.getString()); } playerHash += playerInfo.getGameMode() == GameType.SPECTATOR ? 31 : 0; playerHash += playerInfo.getSkin().texture().hashCode(); @@ -106,12 +106,15 @@ public ArrayList fastGetPlayerInfoListHashCode(List playerI if (lastTrackedObjective != null && lastTrackedObjective.getRenderType() == ObjectiveCriteria.RenderType.HEARTS) { - PlayerTabOverlay.HealthState healthState = this.healthStates.computeIfAbsent( - playerInfo.getProfile().getId(), - (uUID) -> new PlayerTabOverlay.HealthState(lastTrackedObjective.getScoreboard() - .getOrCreatePlayerScore(playerInfo.getProfile().getName(), lastTrackedObjective) - .getScore())); - playerHash += healthState.isBlinking(this.gui.getGuiTicks()) ? 63 : 127; + Player player = minecraft.level.getPlayerByUUID(playerInfo.getProfile().getId()); + + if (player != null) { + PlayerTabOverlay.HealthState healthState = this.healthStates.computeIfAbsent( + playerInfo.getProfile().getId(), + (_uuid) -> new PlayerTabOverlay.HealthState(lastTrackedObjective.getScoreboard() + .getOrCreatePlayerScore(player, lastTrackedObjective).get())); + playerHash += healthState.isBlinking(this.gui.getGuiTicks()) ? 63 : 127; + } } hashCodes.add(playerHash); } @@ -125,5 +128,5 @@ public ArrayList fastGetPlayerInfoListHashCode(List playerI public BufferedComponent getPlayerListOverlayBuffer() { return playerlistBufferedComponent; } - + } diff --git a/Shared/src/main/java/dev/tr7zw/exordium/mixin/ScoreboardMixin.java b/Shared/src/main/java/dev/tr7zw/exordium/mixin/ScoreboardMixin.java index de62d90..c54746c 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/mixin/ScoreboardMixin.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/mixin/ScoreboardMixin.java @@ -42,8 +42,7 @@ public void captureState() { }; @WrapOperation(method = "render", at = { - @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;displayScoreboardSidebar(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/world/scores/Objective;)V"), - }) + @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;displayScoreboardSidebar(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/world/scores/Objective;)V"), }) private void displayScoreboardSidebarWrapper(Gui gui, GuiGraphics guiGraphics, Objective objective, final Operation operation) { if (!scoreboardBuffer.render()) { diff --git a/Shared/src/main/java/dev/tr7zw/exordium/mixin/VignetteMixin.java b/Shared/src/main/java/dev/tr7zw/exordium/mixin/VignetteMixin.java index 468a9bc..97962d4 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/mixin/VignetteMixin.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/mixin/VignetteMixin.java @@ -74,8 +74,7 @@ public void captureState() { }; @WrapOperation(method = "render", at = { - @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;renderVignette(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/world/entity/Entity;)V"), - }) + @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;renderVignette(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/world/entity/Entity;)V"), }) private void renderVignetteWrapper(Gui gui, GuiGraphics guiGraphics, Entity entity, final Operation operation) { if (!vignetteBuffer.render()) { diff --git a/Shared/src/main/java/dev/tr7zw/exordium/util/BufferRenderer.java b/Shared/src/main/java/dev/tr7zw/exordium/util/BufferRenderer.java index c41135b..b0f857c 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/util/BufferRenderer.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/util/BufferRenderer.java @@ -35,18 +35,11 @@ private static void refreshModel(int screenWidth, int screenHeight) { model.close(); } - Vector3f[] modelData = new Vector3f[] { - new Vector3f(0.0f, screenHeight, -90.0f), - new Vector3f(screenWidth, screenHeight, -90.0F), - new Vector3f(screenWidth, 0.0F, -90.0F), - new Vector3f(0.0F, 0.0F, -90.0F), - }; - Vector2f[] uvData = new Vector2f[] { - new Vector2f(0.0f, 0.0f), - new Vector2f(1.0f, 0.0f), - new Vector2f(1.0f, 1.0f), - new Vector2f(0.0f, 1.0f), - }; + Vector3f[] modelData = new Vector3f[] { new Vector3f(0.0f, screenHeight, -90.0f), + new Vector3f(screenWidth, screenHeight, -90.0F), new Vector3f(screenWidth, 0.0F, -90.0F), + new Vector3f(0.0F, 0.0F, -90.0F), }; + Vector2f[] uvData = new Vector2f[] { new Vector2f(0.0f, 0.0f), new Vector2f(1.0f, 0.0f), + new Vector2f(1.0f, 1.0f), new Vector2f(0.0f, 1.0f), }; model = new Model(modelData, uvData); } @@ -54,8 +47,7 @@ public boolean render() { int screenWidth = minecraft.getWindow().getGuiScaledWidth(); int screenHeight = minecraft.getWindow().getGuiScaledHeight(); boolean forceRender = false; - if (guiTarget.width != minecraft.getWindow().getWidth() - || guiTarget.height != minecraft.getWindow().getHeight() + if (guiTarget.width != minecraft.getWindow().getWidth() || guiTarget.height != minecraft.getWindow().getHeight() || minecraft.options.guiScale().get() != guiScale) { guiTarget.resize(minecraft.getWindow().getWidth(), minecraft.getWindow().getHeight(), true); refreshModel(screenWidth, screenHeight); diff --git a/Shared/src/main/java/dev/tr7zw/exordium/util/BufferedComponent.java b/Shared/src/main/java/dev/tr7zw/exordium/util/BufferedComponent.java index 83e2e84..63b689a 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/util/BufferedComponent.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/util/BufferedComponent.java @@ -45,18 +45,11 @@ private static void refreshModel(int screenWidth, int screenHeight) { model.close(); } - Vector3f[] modelData = new Vector3f[] { - new Vector3f(0.0f, screenHeight, -90.0f), - new Vector3f(screenWidth, screenHeight, -90.0F), - new Vector3f(screenWidth, 0.0F, -90.0F), - new Vector3f(0.0F, 0.0F, -90.0F), - }; - Vector2f[] uvData = new Vector2f[] { - new Vector2f(0.0f, 0.0f), - new Vector2f(1.0f, 0.0f), - new Vector2f(1.0f, 1.0f), - new Vector2f(0.0f, 1.0f), - }; + Vector3f[] modelData = new Vector3f[] { new Vector3f(0.0f, screenHeight, -90.0f), + new Vector3f(screenWidth, screenHeight, -90.0F), new Vector3f(screenWidth, 0.0F, -90.0F), + new Vector3f(0.0F, 0.0F, -90.0F), }; + Vector2f[] uvData = new Vector2f[] { new Vector2f(0.0f, 0.0f), new Vector2f(1.0f, 0.0f), + new Vector2f(1.0f, 1.0f), new Vector2f(0.0f, 1.0f), }; model = new Model(modelData, uvData); } @@ -74,8 +67,7 @@ public boolean render() { int screenWidth = minecraft.getWindow().getGuiScaledWidth(); int screenHeight = minecraft.getWindow().getGuiScaledHeight(); boolean forceRender = false; - if (guiTarget.width != minecraft.getWindow().getWidth() - || guiTarget.height != minecraft.getWindow().getHeight() + if (guiTarget.width != minecraft.getWindow().getWidth() || guiTarget.height != minecraft.getWindow().getHeight() || minecraft.options.guiScale().get() != guiScale) { guiTarget.resize(minecraft.getWindow().getWidth(), minecraft.getWindow().getHeight(), true); refreshModel(screenWidth, screenHeight); diff --git a/Shared/src/main/java/dev/tr7zw/exordium/util/Model.java b/Shared/src/main/java/dev/tr7zw/exordium/util/Model.java index 0ffca3f..e80c02b 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/util/Model.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/util/Model.java @@ -16,8 +16,8 @@ public class Model { int vertexCount; public Model(Vector3f[] modelData, Vector2f[] uvData) { - - BufferBuilder bufferbuilder = new BufferBuilder(modelData.length); + // 4 bytes per float, 5 floats per entry + BufferBuilder bufferbuilder = new BufferBuilder(modelData.length * 4 * 5); bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX); for (int i = 0; i < modelData.length; i++) { diff --git a/Shared/src/main/java/dev/tr7zw/exordium/util/ScoreboardHelper.java b/Shared/src/main/java/dev/tr7zw/exordium/util/ScoreboardHelper.java index 16d9b76..a9b28ca 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/util/ScoreboardHelper.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/util/ScoreboardHelper.java @@ -10,11 +10,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.network.chat.Component; -import net.minecraft.world.scores.DisplaySlot; -import net.minecraft.world.scores.Objective; -import net.minecraft.world.scores.PlayerTeam; -import net.minecraft.world.scores.Score; -import net.minecraft.world.scores.Scoreboard; +import net.minecraft.world.scores.*; public class ScoreboardHelper { @@ -35,10 +31,11 @@ public static ScoreboardState getScoreboardData() { if (objective == null) { return null; } - Collection collection = scoreboard.getPlayerScores(objective); - List list = (List) collection.stream() - .filter(score -> (score.getOwner() != null && !score.getOwner().startsWith("#"))) + + Collection collection = scoreboard.listPlayerScores(objective); + List list = collection.stream().filter(score -> !score.owner().startsWith("#")) .collect(Collectors.toList()); + if (list.size() > 15) { collection = Lists.newArrayList(Iterables.skip(list, collection.size() - 15)); } else { @@ -46,10 +43,10 @@ public static ScoreboardState getScoreboardData() { } List> list2 = Lists.newArrayListWithCapacity(collection.size()); Component title = objective.getDisplayName(); - for (Score score : collection) { - PlayerTeam playerTeam2 = scoreboard.getPlayersTeam(score.getOwner()); - Component component2 = PlayerTeam.formatNameForTeam(playerTeam2, Component.literal(score.getOwner())); - list2.add(Pair.of(score.getScore(), component2)); + for (PlayerScoreEntry score : collection) { + PlayerTeam playerTeam2 = scoreboard.getPlayersTeam(score.owner()); + Component component2 = PlayerTeam.formatNameForTeam(playerTeam2, score.ownerName()); + list2.add(Pair.of(score.value(), component2)); } return new ScoreboardState(title, list2); } diff --git a/Shared/src/main/java/dev/tr7zw/exordium/util/SignBufferRenderer.java b/Shared/src/main/java/dev/tr7zw/exordium/util/SignBufferRenderer.java index 8e2c496..7e6a51e 100644 --- a/Shared/src/main/java/dev/tr7zw/exordium/util/SignBufferRenderer.java +++ b/Shared/src/main/java/dev/tr7zw/exordium/util/SignBufferRenderer.java @@ -70,18 +70,10 @@ private static void initializeModel() { float height = (int) ExordiumModBase.signSettings.renderHeight; float width = (int) ExordiumModBase.signSettings.renderWidth; - Vector3f[] modelData = new Vector3f[] { - new Vector3f(0.0f, height, 0.01F), - new Vector3f(width, height, 0.01F), - new Vector3f(width, 0.0f, 0.01F), - new Vector3f(0.0f, 0.0f, 0.01F), - }; - Vector2f[] uvData = new Vector2f[] { - new Vector2f(0.0f, 0.0f), - new Vector2f(1.0f, 0.0f), - new Vector2f(1.0f, 1.0f), - new Vector2f(0.0f, 1.0f), - }; + Vector3f[] modelData = new Vector3f[] { new Vector3f(0.0f, height, 0.01F), new Vector3f(width, height, 0.01F), + new Vector3f(width, 0.0f, 0.01F), new Vector3f(0.0f, 0.0f, 0.01F), }; + Vector2f[] uvData = new Vector2f[] { new Vector2f(0.0f, 0.0f), new Vector2f(1.0f, 0.0f), + new Vector2f(1.0f, 1.0f), new Vector2f(0.0f, 1.0f), }; model = new Model(modelData, uvData); } @@ -151,12 +143,10 @@ private void renderSignToBuffer(SignText text, RenderTarget texture, int light) float q = (-minecraft.font.width(formattedCharSequence) / 2); if (bl) { minecraft.font.drawInBatch8xOutline(formattedCharSequence, -28 + q, (p * 10 - 20), n, l, matrix4f, - bufferSource, - o); + bufferSource, o); } else { minecraft.font.drawInBatch(formattedCharSequence, (-28 + q), (p * 10 - 20), n, false, matrix4f, - bufferSource, - Font.DisplayMode.NORMAL, 0, o); + bufferSource, Font.DisplayMode.NORMAL, 0, o); } } bufferSource.endBatch(); // force clear the vertex consumer diff --git a/Shared/src/main/resources/assets/exordium/lang/en_us.json b/Shared/src/main/resources/assets/exordium/lang/en_us.json index 92fea88..bbe5e95 100644 --- a/Shared/src/main/resources/assets/exordium/lang/en_us.json +++ b/Shared/src/main/resources/assets/exordium/lang/en_us.json @@ -74,4 +74,4 @@ "text.exordium.setting.crosshair.fps.tooltip": "The maximum framerate for the crosshair(used during F3 mode)", "text.exordium.setting.crosshair.forceupdates": "Force Crosshair Updates", "text.exordium.setting.crosshair.forceupdates.tooltip": "Force the crosshair to update every possible update frame(keeping in mind the fps limit). Might fix some issues with other mods." - } \ No newline at end of file +} diff --git a/Shared/src/main/resources/assets/exordium/lang/it_it.json b/Shared/src/main/resources/assets/exordium/lang/it_it.json index 961de05..15b9483 100644 --- a/Shared/src/main/resources/assets/exordium/lang/it_it.json +++ b/Shared/src/main/resources/assets/exordium/lang/it_it.json @@ -14,4 +14,4 @@ "text.exordium.enabledGuiAnimationSpeedup.tooltip": "Abilita/Disabilita accelerazione durente animazioni della Gui", "text.exordium.targetFPSIngameGuiAnimated": "Framerate animazioni della Gui", "text.exordium.targetFPSIngameGuiAnimated.tooltip": "L'obbiettivo di framerate per le animazioni della Gui" - } \ No newline at end of file +} diff --git a/Shared/src/main/resources/assets/exordium/lang/pt_br.json b/Shared/src/main/resources/assets/exordium/lang/pt_br.json index a3fcfe7..08c260b 100644 --- a/Shared/src/main/resources/assets/exordium/lang/pt_br.json +++ b/Shared/src/main/resources/assets/exordium/lang/pt_br.json @@ -9,4 +9,4 @@ "text.exordium.targetFPSNameTags": "FPS das Nametags", "text.exordium.enabledGuiAnimationSpeedup": "Animações do GUI Mais Rápidas", "text.exordium.targetFPSIngameGuiAnimated": "FPS das Animações do Gui" - } \ No newline at end of file +} diff --git a/Shared/src/main/resources/assets/exordium/lang/pt_pt.json b/Shared/src/main/resources/assets/exordium/lang/pt_pt.json index a3fcfe7..08c260b 100644 --- a/Shared/src/main/resources/assets/exordium/lang/pt_pt.json +++ b/Shared/src/main/resources/assets/exordium/lang/pt_pt.json @@ -9,4 +9,4 @@ "text.exordium.targetFPSNameTags": "FPS das Nametags", "text.exordium.enabledGuiAnimationSpeedup": "Animações do GUI Mais Rápidas", "text.exordium.targetFPSIngameGuiAnimated": "FPS das Animações do Gui" - } \ No newline at end of file +} diff --git a/Shared/src/main/resources/assets/minecraft/shaders/core/position_multi_tex.json b/Shared/src/main/resources/assets/minecraft/shaders/core/position_multi_tex.json index 88da678..db71fa8 100644 --- a/Shared/src/main/resources/assets/minecraft/shaders/core/position_multi_tex.json +++ b/Shared/src/main/resources/assets/minecraft/shaders/core/position_multi_tex.json @@ -11,19 +11,96 @@ "UV0" ], "samplers": [ - { "name": "Sampler0" }, - { "name": "Sampler1" }, - { "name": "Sampler2" }, - { "name": "Sampler3" }, - { "name": "Sampler4" }, - { "name": "Sampler5" }, - { "name": "Sampler6" }, - { "name": "Sampler7" } + { + "name": "Sampler0" + }, + { + "name": "Sampler1" + }, + { + "name": "Sampler2" + }, + { + "name": "Sampler3" + }, + { + "name": "Sampler4" + }, + { + "name": "Sampler5" + }, + { + "name": "Sampler6" + }, + { + "name": "Sampler7" + } ], "uniforms": [ - { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, - { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] }, - { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] }, - { "name": "texcount", "type": "int", "count": 1, "values": [ 1 ] } + { + "name": "ModelViewMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ProjMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ColorModulator", + "type": "float", + "count": 4, + "values": [ + 1.0, + 1.0, + 1.0, + 1.0 + ] + }, + { + "name": "texcount", + "type": "int", + "count": 1, + "values": [ + 1 + ] + } ] } diff --git a/Shared/src/main/resources/exordium.mixins.json b/Shared/src/main/resources/exordium.mixins.json index 2b23569..67246cc 100644 --- a/Shared/src/main/resources/exordium.mixins.json +++ b/Shared/src/main/resources/exordium.mixins.json @@ -1,30 +1,30 @@ { - "required": true, - "minVersion": "0.8", - "package": "dev.tr7zw.exordium.mixin", - "compatibilityLevel": "JAVA_16", - "refmap": "exordium.refmap.mixins.json", - "mixins": [ - ], - "client": [ - "GlStateManagerMixin", - "SignRendererMixin", - "SignBlockEntityMixin", - "EntityRendererMixin", - "MinecraftMixin", - "GuiDebugOverlayMixin", - "ChatComponentMixin", - "GuiHotbarMixin", - "GuiExperienceMixin", - "GuiHealthMixin", - "ScoreboardMixin", - "GuiMixin", - "GameRendererMixin", - "PlayerTabOverlayMixin", - "VignetteMixin", - "CrosshairMixin" - ], - "injectors": { - "defaultRequire": 1 - } + "required": true, + "minVersion": "0.8", + "package": "dev.tr7zw.exordium.mixin", + "compatibilityLevel": "JAVA_16", + "refmap": "exordium.refmap.mixins.json", + "mixins": [ + ], + "client": [ + "GlStateManagerMixin", + "SignRendererMixin", + "SignBlockEntityMixin", + "EntityRendererMixin", + "MinecraftMixin", + "GuiDebugOverlayMixin", + "ChatComponentMixin", + "GuiHotbarMixin", + "GuiExperienceMixin", + "GuiHealthMixin", + "ScoreboardMixin", + "GuiMixin", + "GameRendererMixin", + "PlayerTabOverlayMixin", + "VignetteMixin", + "CrosshairMixin" + ], + "injectors": { + "defaultRequire": 1 + } } diff --git a/gradle-compose.yml b/gradle-compose.yml index 6c2bd96..6672a67 100644 --- a/gradle-compose.yml +++ b/gradle-compose.yml @@ -1,5 +1,5 @@ version: '0.0.2' -source: "https://github.com/tr7zw/ModComposeTemplate/tree/1.20.2" +source: "https://github.com/tr7zw/ModComposeTemplate/tree/1.20.4" replacements: group: "dev.tr7zw" name: "Exordium" @@ -24,19 +24,17 @@ subProjects: template: "Fabric" replacements: dependencies: ' - modImplementation "maven.modrinth:immediatelyfast:1.2.5+1.20.2" - - modImplementation "maven.modrinth:spark:XGW2fviP" - - modImplementation "maven.modrinth:sodium:mc1.20.2-0.5.3" - - include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:0.2.0-rc.2"))) + modImplementation "maven.modrinth:immediatelyfast:1.2.10+1.20.4-fabric" + + modImplementation "maven.modrinth:spark:1.10.58-fabric" + + //modImplementation "maven.modrinth:sodium:mc1.20.4-0.5.8" ' FG-Forge: template: "Forge" replacements: dependencies: ' - implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:0.2.0-rc.2")) - - implementation(include("io.github.llamalad7:mixinextras-forge:0.2.0-rc.2")) + compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.3.5")) + + implementation(include("io.github.llamalad7:mixinextras-forge:0.3.5")) ' \ No newline at end of file