-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
4d0d4c0
commit f8814ce
Showing
11 changed files
with
87 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
forge/src/main/java/dev/boxadactle/coordinatesdisplay/forge/ModUtilImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| package dev.boxadactle.coordinatesdisplay.forge; | ||
|
|
||
| import net.minecraft.core.registries.BuiltInRegistries; | ||
| import net.minecraft.world.level.block.Block; | ||
| import net.minecraftforge.registries.ForgeRegistries; | ||
|
|
||
| public class ModUtilImpl { | ||
|
|
||
| public static String getBlockName(Block block) { | ||
| return String.valueOf(ForgeRegistries.BLOCKS.getKey(block)); | ||
| return String.valueOf(BuiltInRegistries.BLOCK.getId(block)); | ||
| } | ||
|
|
||
| } | ||
| } |
59 changes: 59 additions & 0 deletions
59
forge/src/main/java/dev/boxadactle/coordinatesdisplay/forge/mixin/GuiMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package dev.boxadactle.coordinatesdisplay.forge.mixin; | ||
|
|
||
| import com.mojang.blaze3d.systems.RenderSystem; | ||
| import dev.boxadactle.boxlib.util.GuiUtils; | ||
| import dev.boxadactle.boxlib.util.WorldUtils; | ||
| import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; | ||
| import dev.boxadactle.coordinatesdisplay.ModConfig; | ||
| import dev.boxadactle.coordinatesdisplay.forge.CoordinatesDisplayForge; | ||
| import dev.boxadactle.coordinatesdisplay.hud.Hud; | ||
| import dev.boxadactle.coordinatesdisplay.position.Position; | ||
| import net.minecraft.client.Minecraft; | ||
| import net.minecraft.client.gui.Gui; | ||
| import net.minecraft.client.gui.LayeredDraw; | ||
| 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.callback.LocalCapture; | ||
|
|
||
| @Mixin(Gui.class) | ||
| public class GuiMixin { | ||
|
|
||
| @Inject(method = "<init>", at = @At("TAIL"), locals = LocalCapture.CAPTURE_FAILHARD) | ||
| private void init(Minecraft arg, CallbackInfo ci, LayeredDraw drawer) { | ||
| drawer.add((graphics, f) -> { | ||
| try { | ||
| if (CoordinatesDisplay.HUD.shouldRender(CoordinatesDisplay.getConfig().visibilityFilter)) { | ||
| RenderSystem.enableBlend(); | ||
|
|
||
| ModConfig config = CoordinatesDisplay.getConfig(); | ||
|
|
||
| CoordinatesDisplay.HUD.render( | ||
| graphics, | ||
| Hud.RenderType.HUD, | ||
| Position.of(WorldUtils.getPlayer()), | ||
| config.hudX, | ||
| config.hudY, | ||
| config.renderMode, | ||
| config.startCorner, | ||
| config.hudScale | ||
| ); | ||
| } | ||
| } catch (NullPointerException e) { | ||
| if (CoordinatesDisplayForge.deltaError) { | ||
| throw new RuntimeException(e); | ||
| } | ||
|
|
||
| CoordinatesDisplay.LOGGER.error("Unknown error from config file"); | ||
| CoordinatesDisplay.LOGGER.printStackTrace(e); | ||
|
|
||
| CoordinatesDisplay.LOGGER.player.warn(GuiUtils.getTranslatable("message.coordinatesdisplay.configError")); | ||
| CoordinatesDisplay.CONFIG.resetConfig(); | ||
|
|
||
| CoordinatesDisplayForge.deltaError = true; | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
forge/src/main/resources/coordinatesdisplay-forge.mixins.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "required": true, | ||
| "minVersion": "0.8", | ||
| "package": "dev.boxadactle.coordinatesdisplay.forge.mixin", | ||
| "compatibilityLevel": "JAVA_16", | ||
| "client": [ | ||
| "GuiMixin" | ||
| ], | ||
| "injectors": { | ||
| "defaultRequire": 1 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters