Skip to content

Fixed some bug and add new Feature. #103

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
ALFEECLARE wants to merge 5 commits into
base: forge-1.20
Choose a base branch
from
Open

Fixed some bug and add new Feature. #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a14580b
update ja_jp translation.(日本語の翻訳を最新化)
Sep 3, 2023
b813bdc
Add New Hud Display contents.(ディスプレイ表示項目を追加)
Sep 5, 2023
b3dfc5c
Support Rubidium.
Feb 18, 2024
e9e3dfa
Fix vanills's incompatibility of id.getNamespace()
Jun 10, 2024
7f4ad79
最新版の変更をバックポート
Aug 25, 2026
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
21 changes: 19 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ apply plugin: 'maven-publish'
apply plugin: 'org.spongepowered.mixin'

group 'fr.atesab.xray'
version '2.3.1'
version '2.3.2'
archivesBaseName = 'XrayMod'


Expand All @@ -30,7 +30,7 @@ minecraft {
mappings channel: 'official', version: '1.20'
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.

// accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')

// Default run configurations.
// These can be tweaked, removed, or duplicated as needed.
Expand Down Expand Up @@ -61,9 +61,26 @@ mixin {
config 'atianxray.mixins.json'
}

repositories {
// Put repositories for dependencies here
// ForgeGradle automatically adds the Forge maven and Maven Central for you
maven {
url "https://cursemaven.com"
content {
includeGroup "curse.maven"
}
}

// If you have mod jar dependencies in ./libs, you can declare them as a repository like so:
// flatDir {
// dir 'libs'
// }
}

dependencies {
minecraft 'net.minecraftforge:forge:1.20-46.0.13'
annotationProcessor 'org.spongepowered:mixin:0.8.4:processor'
compileOnly fg.deobf("curse.maven:rubidium-574856:4952685")
}

// Example for how to get properties into the manifest for reading by the runtime..
Expand Down
71 changes: 48 additions & 23 deletions src/main/java/fr/atesab/xray/XrayMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,21 @@
import java.util.stream.Collector;
import java.util.stream.Collectors;

import com.mojang.blaze3d.platform.InputConstants;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.*;

import net.minecraft.client.OptionInstance;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.network.chat.Component;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.chunk.ChunkAccess;
import net.minecraft.world.level.chunk.ChunkStatus;
import net.minecraftforge.client.ConfigScreenHandler;
import net.minecraftforge.client.event.*;
import net.minecraftforge.eventbus.api.IEventBus;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.joml.Vector3f;
import org.lwjgl.glfw.GLFW;
import org.lwjgl.opengl.GL11;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

import com.mojang.blaze3d.platform.InputConstants;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.BufferBuilder;
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.Tesselator;
import com.mojang.blaze3d.vertex.VertexFormat;

import fr.atesab.xray.color.ColorSupplier;
import fr.atesab.xray.color.IColorObject;
import fr.atesab.xray.color.TextHudBuffer;
Expand All @@ -51,23 +41,39 @@
import net.minecraft.client.Camera;
import net.minecraft.client.KeyMapping;
import net.minecraft.client.Minecraft;
import net.minecraft.client.OptionInstance;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.client.renderer.LevelRenderer;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.client.resources.language.I18n;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.network.chat.Component;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.chunk.ChunkAccess;
import net.minecraft.world.level.chunk.ChunkStatus;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
import net.minecraftforge.client.ConfigScreenHandler;
import net.minecraftforge.client.event.InputEvent;
import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
import net.minecraftforge.client.event.RenderGuiOverlayEvent;
import net.minecraftforge.client.event.RenderLevelStageEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.TickEvent;
import net.minecraftforge.event.TickEvent.Phase;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.fml.common.Mod;
Expand Down Expand Up @@ -97,7 +103,9 @@ public class XrayMain {

private int internalFullbrightState = 0;

private KeyMapping configKey, fullbrightKey, locationEnableKey;
private boolean blueBlueSkyEnable = false;

private KeyMapping configKey, fullbrightKey, locationEnableKey, blueBlueSkyKey;

private XrayConfig config;

Expand Down Expand Up @@ -194,7 +202,10 @@ public OptionInstance<Double> getGammaBypass() {
return gammaBypass;
}


public boolean isBlueBlueSkyEnable() {
return blueBlueSkyEnable;
}

private static void log(String message) {
log.info("[{}] {}", log.getName(), message);
}
Expand Down Expand Up @@ -303,6 +314,9 @@ public void onKeyEvent(InputEvent.Key ev) {
if (configKey.consumeClick()) {
client.setScreen(new XrayMenu(null));
}
if (blueBlueSkyKey.consumeClick()) {
blueBlueSkyEnable = !blueBlueSkyEnable;
}
}

@SubscribeEvent
Expand Down Expand Up @@ -336,6 +350,13 @@ public void onHudRender(RenderGuiOverlayEvent ev) {
.withStyle(s -> s.withColor(fullbrightMode.getColor()))
);
}
if (blueBlueSkyEnable) {
//敢えて同色
buffer.append(
Component.literal("[" + I18n.get("x13.mod.blueBlueSky") + "] ")
.withStyle(s -> s.withColor(fullbrightMode.getColor()))
);
}
}

if (config.getLocationConfig().isEnabled()) {
Expand Down Expand Up @@ -454,7 +475,8 @@ public void onRenderWorld(RenderLevelStageEvent ev) {
blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + 1
);

LevelRenderer.renderLineBox(stack, buffer, aabb, r, g, b, a);
RenderUtils.renderLineBoxVanillaStyle(stack, buffer, aabb, r, g, b, a);
//LevelRenderer.renderLineBox(stack, buffer, aabb, r, g, b, a);

if (esp.hasTracer()) {
Vec3 center = aabb.getCenter();
Expand Down Expand Up @@ -500,7 +522,8 @@ public void onRenderWorld(RenderLevelStageEvent ev) {

AABB aabb = type.getAABB(x, y, z);

LevelRenderer.renderLineBox(stack, buffer, aabb, r, g, b, a);
RenderUtils.renderLineBoxVanillaStyle(stack, buffer, aabb, r, g, b, a);
//LevelRenderer.renderLineBox(stack, buffer, aabb, r, g, b, a);

if (esp.hasTracer()) {
Vec3 center = aabb.getCenter();
Expand Down Expand Up @@ -533,10 +556,12 @@ private void registerKeyBinding(final RegisterKeyMappingsEvent ev) {
fullbrightKey = new KeyMapping("x13.mod.fullbright", GLFW.GLFW_KEY_H, "key.categories.xray");
configKey = new KeyMapping("x13.mod.config", GLFW.GLFW_KEY_N, "key.categories.xray");
locationEnableKey = new KeyMapping("x13.mod.locationEnable", GLFW.GLFW_KEY_J, "key.categories.xray");
blueBlueSkyKey = new KeyMapping("x13.mod.blueBlueSky", GLFW.GLFW_KEY_UNKNOWN, "key.categories.xray");

ev.register(fullbrightKey);
ev.register(configKey);
ev.register(locationEnableKey);
ev.register(blueBlueSkyKey);
}

private void setup(final FMLCommonSetupEvent event) {
Expand Down
Loading
Loading