.save-skin, better .give, interactionMenu, cate...
This commit is contained in:
Cloudburst
336
src/main/java/cloudburst/rejects/screens/InteractionScreen.java
Normal file
336
src/main/java/cloudburst/rejects/screens/InteractionScreen.java
Normal file
@@ -0,0 +1,336 @@
|
||||
package cloudburst.rejects.screens;
|
||||
|
||||
import java.awt.Point;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.function.Function;
|
||||
|
||||
import cloudburst.rejects.modules.InteractionMenu;
|
||||
import minegame159.meteorclient.MeteorClient;
|
||||
import minegame159.meteorclient.systems.commands.commands.PeekCommand;
|
||||
import minegame159.meteorclient.systems.modules.Modules;
|
||||
import minegame159.meteorclient.utils.player.ChatUtils;
|
||||
import minegame159.meteorclient.utils.player.InvUtils;
|
||||
import net.minecraft.client.gui.screen.ChatScreen;
|
||||
import net.minecraft.client.gui.screen.ingame.InventoryScreen;
|
||||
import net.minecraft.client.options.KeyBinding;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.Saddleable;
|
||||
import net.minecraft.entity.passive.HorseBaseEntity;
|
||||
import net.minecraft.entity.passive.HorseEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.entity.vehicle.ChestMinecartEntity;
|
||||
import net.minecraft.entity.vehicle.StorageMinecartEntity;
|
||||
import net.minecraft.inventory.Inventory;
|
||||
import net.minecraft.inventory.SimpleInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.network.packet.c2s.play.PlayerInputC2SPacket;
|
||||
import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket;
|
||||
import net.minecraft.screen.ShulkerBoxScreenHandler;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
import com.mojang.blaze3d.platform.GlStateManager;
|
||||
import com.mojang.blaze3d.systems.RenderSystem;
|
||||
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.render.GameRenderer;
|
||||
import net.minecraft.client.util.InputUtil;
|
||||
import net.minecraft.client.util.math.MatrixStack;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.text.LiteralText;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
|
||||
public class InteractionScreen extends Screen {
|
||||
|
||||
private final Entity entity;
|
||||
private String focusedString = null;
|
||||
private int crosshairX, crosshairY, focusedDot = -1;
|
||||
private float yaw, pitch;
|
||||
private final HashMap<String, Consumer<Entity>> functions;
|
||||
private final HashMap<String, String> msgs;
|
||||
|
||||
public InteractionScreen(Entity entity) {
|
||||
super(new LiteralText("Menu Screen"));
|
||||
this.entity = entity;
|
||||
functions = new HashMap<>();
|
||||
functions.put("Stats", (Entity e) -> {
|
||||
closeScreen();
|
||||
//Modules.get().get(InteractionMenu.class).isOpen = true;
|
||||
client.openScreen(new StatsScreen(e));
|
||||
});
|
||||
if (entity instanceof PlayerEntity) {
|
||||
functions.put("Open Inventory", (Entity e) -> {
|
||||
closeScreen();
|
||||
client.openScreen(new InventoryScreen((PlayerEntity) e));
|
||||
});
|
||||
functions.put("Message", (Entity e) -> {
|
||||
this.cursorMode(GLFW.GLFW_CURSOR);
|
||||
closeScreen();
|
||||
client.openScreen(new ChatScreen(String.format("/msg %s ", ((PlayerEntity)e).getGameProfile().getName())));
|
||||
});
|
||||
}
|
||||
else if (entity instanceof HorseBaseEntity) {
|
||||
functions.put("Open Inventory", (Entity e) -> {
|
||||
closeScreen();
|
||||
if (client.player.isRiding()) {
|
||||
client.player.networkHandler.sendPacket(new PlayerInputC2SPacket(0, 0, false, true));
|
||||
}
|
||||
client.player.networkHandler.sendPacket(new PlayerInteractEntityC2SPacket(entity, Hand.MAIN_HAND, false));
|
||||
client.player.openRidingInventory();
|
||||
client.player.networkHandler.sendPacket(new PlayerInputC2SPacket(0, 0, false, true));
|
||||
});
|
||||
functions.put("Ride", (Entity e) -> {
|
||||
closeScreen();
|
||||
client.player.networkHandler.sendPacket(new PlayerInteractEntityC2SPacket(entity, Hand.MAIN_HAND, false));
|
||||
});
|
||||
}
|
||||
else if (entity instanceof StorageMinecartEntity) {
|
||||
functions.put("Open Inventory", (Entity e) -> {
|
||||
closeScreen();
|
||||
client.player.networkHandler.sendPacket(new PlayerInteractEntityC2SPacket(entity, Hand.MAIN_HAND, false));
|
||||
});
|
||||
}
|
||||
else {
|
||||
functions.put("Open Inventory", (Entity e) -> {
|
||||
ItemStack[] stack = new ItemStack[27];
|
||||
final int[] index = {0};
|
||||
e.getItemsHand().forEach(itemStack -> {
|
||||
if (itemStack!=null) {
|
||||
stack[index[0]] = itemStack;
|
||||
index[0]++;
|
||||
}
|
||||
});
|
||||
e.getArmorItems().forEach(itemStack -> {
|
||||
if (itemStack!=null) {
|
||||
stack[index[0]] = itemStack;
|
||||
index[0]++;
|
||||
}
|
||||
});
|
||||
for (int i = index[0]; i < 27; i++) stack[i] = Items.AIR.getDefaultStack();
|
||||
closeScreen();
|
||||
client.openScreen(new PeekCommand.PeekShulkerBoxScreen(new ShulkerBoxScreenHandler(0, client.player.inventory, new SimpleInventory(stack)), client.player.inventory, entity.getName()));
|
||||
});
|
||||
}
|
||||
if (entity.isGlowing()) {
|
||||
functions.put("Remove highlight", (Entity e) -> {
|
||||
entity.setGlowing(false);
|
||||
closeScreen();
|
||||
});
|
||||
} else {
|
||||
functions.put("Highlight", (Entity e) -> {
|
||||
entity.setGlowing(true);
|
||||
closeScreen();
|
||||
});
|
||||
}
|
||||
msgs = Modules.get().get(InteractionMenu.class).messages;
|
||||
msgs.keySet().forEach((key) -> {
|
||||
functions.put(key, (Entity e) -> {
|
||||
closeScreen();
|
||||
client.openScreen(new ChatScreen(replacePlaceholders(msgs.get(key), e)));
|
||||
});
|
||||
});
|
||||
functions.put("Cancel", (Entity e) -> {closeScreen();});
|
||||
}
|
||||
|
||||
public void init() {
|
||||
super.init();
|
||||
this.cursorMode(GLFW.GLFW_CURSOR_HIDDEN);
|
||||
yaw = client.player.yaw;
|
||||
pitch = client.player.pitch;
|
||||
}
|
||||
|
||||
private void cursorMode(int mode) {
|
||||
KeyBinding.unpressAll();
|
||||
double x = (double)(this.client.getWindow().getWidth() / 2);
|
||||
double y = (double)(this.client.getWindow().getHeight() / 2);
|
||||
InputUtil.setCursorParameters(this.client.getWindow().getHandle(), mode, x, y);
|
||||
}
|
||||
|
||||
public void tick() {
|
||||
if (Modules.get().get(InteractionMenu.class).keybind.get().isPressed())
|
||||
onClose();
|
||||
}
|
||||
|
||||
private void closeScreen() {
|
||||
client.openScreen((Screen) null);
|
||||
//Modules.get().get(InteractionMenu.class).isOpen = false;
|
||||
}
|
||||
|
||||
public void onClose() {
|
||||
cursorMode(GLFW.GLFW_CURSOR_NORMAL);
|
||||
// This makes the magic
|
||||
if (focusedString != null) {
|
||||
functions.get(focusedString).accept(this.entity);
|
||||
} else
|
||||
client.openScreen((Screen) null);
|
||||
}
|
||||
|
||||
public boolean isPauseScreen() {
|
||||
return false;
|
||||
}
|
||||
|
||||
public void render(MatrixStack matrix, int mouseX, int mouseY, float delta) {
|
||||
// Fake crosshair stuff
|
||||
/*
|
||||
RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
RenderSystem.setShader(GameRenderer::getPositionTexShader);
|
||||
RenderSystem.setShaderTexture(0, GUI_ICONS_TEXTURE);
|
||||
*/
|
||||
client.getTextureManager().bindTexture(GUI_ICONS_TEXTURE);
|
||||
RenderSystem.enableBlend();
|
||||
RenderSystem.blendFuncSeparate(GlStateManager.SrcFactor.ONE_MINUS_DST_COLOR,
|
||||
GlStateManager.DstFactor.ONE_MINUS_SRC_COLOR, GlStateManager.SrcFactor.ONE,
|
||||
GlStateManager.DstFactor.ZERO);
|
||||
drawTexture(matrix, crosshairX - 8, crosshairY - 8, 0, 0, 15, 15);
|
||||
|
||||
drawDots(matrix, (int) (Math.min(height, width) / 2 * 0.75), mouseX, mouseY);
|
||||
matrix.scale (2f, 2f, 1f);
|
||||
drawCenteredText(matrix, textRenderer, entity.getName(), width / 4, 6, 0xFFFFFFFF);
|
||||
|
||||
int scale = client.options.guiScale;
|
||||
Vector2 mouse = new Vector2(mouseX, mouseY);
|
||||
Vector2 center = new Vector2(width / 2, height / 2);
|
||||
mouse.subtract(center);
|
||||
mouse.normalize();
|
||||
Vector2 cross = mouse;
|
||||
|
||||
if (scale == 0)
|
||||
scale = 4;
|
||||
|
||||
// Move crossHair based on distance between mouse and center. But with limit
|
||||
if (Math.hypot(width / 2 - mouseX, height / 2 - mouseY) < 1f / scale * 200f)
|
||||
mouse.multiply((float) Math.hypot(width / 2 - mouseX, height / 2 - mouseY));
|
||||
else
|
||||
mouse.multiply(1f / scale * 200f);
|
||||
|
||||
this.crosshairX = (int) mouse.x + width / 2;
|
||||
this.crosshairY = (int) mouse.y + height / 2;
|
||||
|
||||
client.player.yaw = yaw + cross.x / 3;
|
||||
client.player.pitch = MathHelper.clamp(pitch + cross.y / 3, -90f, 90f);
|
||||
super.render(matrix, mouseX, mouseY, delta);
|
||||
}
|
||||
|
||||
|
||||
|
||||
private void drawDots(MatrixStack matrix, int radius, int mouseX, int mouseY) {
|
||||
ArrayList<Point> pointList = new ArrayList<Point>();
|
||||
String cache[] = new String[functions.size()];
|
||||
double lowestDistance = Double.MAX_VALUE;
|
||||
int i = 0;
|
||||
|
||||
for (String string: functions.keySet()) {
|
||||
// Just some fancy calculations to get the positions of the dots
|
||||
double s = (double) i / functions.size() * 2 * Math.PI;
|
||||
int x = (int) Math.round(radius * Math.cos(s) + width / 2);
|
||||
int y = (int) Math.round(radius * Math.sin(s) + height / 2);
|
||||
drawTextField(matrix, x, y, string);
|
||||
|
||||
// Calculate lowest distance between mouse and dot
|
||||
if (Math.hypot(x - mouseX, y - mouseY) < lowestDistance) {
|
||||
lowestDistance = Math.hypot(x - mouseX, y - mouseY);
|
||||
focusedDot = i;
|
||||
}
|
||||
|
||||
cache[i] = string;
|
||||
pointList.add(new Point(x, y));
|
||||
i++;
|
||||
}
|
||||
|
||||
// Go through all point and if it is focused -> drawing different color, changing closest string value
|
||||
for (int j = 0; j < functions.size(); j++) {
|
||||
Point point = pointList.get(j);
|
||||
if (pointList.get(focusedDot) == point) {
|
||||
drawDot(matrix, point.x - 4, point.y - 4, 0xFF4CFF00);
|
||||
this.focusedString = cache[focusedDot];
|
||||
}
|
||||
else
|
||||
drawDot(matrix, point.x - 4, point.y - 4, 0xFF0094FF);
|
||||
}
|
||||
}
|
||||
|
||||
private void drawRect(MatrixStack matrix, int startX, int startY, int width, int height, int colorInner,int colorOuter) {
|
||||
drawHorizontalLine(matrix, startX, startX + width, startY, colorOuter);
|
||||
drawHorizontalLine(matrix, startX, startX + width, startY + height, colorOuter);
|
||||
drawVerticalLine(matrix, startX, startY, startY + height, colorOuter);
|
||||
drawVerticalLine(matrix, startX + width, startY, startY + height, colorOuter);
|
||||
fill(matrix, startX + 1, startY + 1, startX + width, startY + height, colorInner);
|
||||
}
|
||||
|
||||
private void drawTextField(MatrixStack matrix, int x, int y, String key) {
|
||||
if (x >= width / 2) {
|
||||
drawRect(matrix, x + 10, y - 8, textRenderer.getWidth(key) + 3, 15, 0x80808080, 0xFF000000);
|
||||
drawStringWithShadow(matrix, textRenderer, key, x + 12, y - 4, 0xFFFFFFFF);
|
||||
} else {
|
||||
drawRect(matrix, x - 14 - textRenderer.getWidth(key), y - 8, textRenderer.getWidth(key) + 3, 15, 0x80808080, 0xFF000000);
|
||||
drawStringWithShadow(matrix, textRenderer, key, x - 12 - textRenderer.getWidth(key), y - 4, 0xFFFFFFFF);
|
||||
}
|
||||
}
|
||||
|
||||
// Literally drawing it in code
|
||||
private void drawDot(MatrixStack matrix, int startX, int startY, int colorInner) {
|
||||
// Draw dot itself
|
||||
drawHorizontalLine(matrix, startX + 2, startX + 5, startY, 0xFF000000);
|
||||
drawHorizontalLine(matrix, startX + 1, startX + 6, startY + 1, 0xFF000000);
|
||||
drawHorizontalLine(matrix, startX + 2, startX + 5, startY + 1, colorInner);
|
||||
fill(matrix, startX, startY + 2, startX + 8, startY + 6, 0xFF000000);
|
||||
fill(matrix, startX + 1, startY + 2, startX + 7, startY + 6, colorInner);
|
||||
drawHorizontalLine(matrix, startX + 1, startX + 6, startY + 6, 0xFF000000);
|
||||
drawHorizontalLine(matrix, startX + 2, startX + 5, startY + 6, colorInner);
|
||||
drawHorizontalLine(matrix, startX + 2, startX + 5, startY + 7, 0xFF000000);
|
||||
|
||||
// Draw light overlay
|
||||
drawHorizontalLine(matrix, startX + 2, startX + 3, startY + 1, 0x80FFFFFF);
|
||||
drawHorizontalLine(matrix, startX + 1, startX + 1, startY + 2, 0x80FFFFFF);
|
||||
}
|
||||
|
||||
private String replacePlaceholders(String in, Entity e) {
|
||||
in = in.replace("{uuid}", e.getUuidAsString());
|
||||
in = in.replace("{name}", e.getName().getString());
|
||||
in = in.replace("{pos}", String.format("%.2f %.2f %.2f", e.getX(), e.getY(), e.getZ()));
|
||||
if (e instanceof PlayerEntity) {
|
||||
in = in.replace("{username}", ((PlayerEntity)e).getGameProfile().getName());
|
||||
}
|
||||
return in;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Creating my own Vector class beacause I couldn´t find a good one in minecrafts code
|
||||
class Vector2 {
|
||||
float x, y;
|
||||
|
||||
Vector2 (float x, float y) {
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
}
|
||||
|
||||
void normalize() {
|
||||
float mag = getMag();
|
||||
if (mag != 0 && mag != 1)
|
||||
divide(mag);
|
||||
}
|
||||
|
||||
void subtract (Vector2 vec) {
|
||||
this.x -= vec.x;
|
||||
this.y -= vec.y;
|
||||
}
|
||||
|
||||
void divide(float n) {
|
||||
x /= n;
|
||||
y /= n;
|
||||
}
|
||||
|
||||
void multiply(float n) {
|
||||
x *= n;
|
||||
y *= n;
|
||||
}
|
||||
|
||||
private float getMag() {
|
||||
return (float) Math.sqrt(x * x + y * y);
|
||||
}
|
||||
}
|
||||
62
src/main/java/cloudburst/rejects/screens/StatsScreen.java
Normal file
62
src/main/java/cloudburst/rejects/screens/StatsScreen.java
Normal file
@@ -0,0 +1,62 @@
|
||||
package cloudburst.rejects.screens;
|
||||
|
||||
import cloudburst.rejects.modules.InteractionMenu;
|
||||
import minegame159.meteorclient.systems.modules.Modules;
|
||||
import net.minecraft.client.resource.language.TranslationStorage;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.effect.StatusEffectInstance;
|
||||
import net.minecraft.entity.effect.StatusEffectUtil;
|
||||
import net.minecraft.util.Language;
|
||||
import net.minecraft.util.math.Box;
|
||||
|
||||
import minegame159.meteorclient.gui.GuiTheme;
|
||||
import minegame159.meteorclient.gui.GuiThemes;
|
||||
import minegame159.meteorclient.gui.WindowScreen;
|
||||
import minegame159.meteorclient.gui.widgets.containers.WSection;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
public class StatsScreen extends WindowScreen {
|
||||
public final Entity entity;
|
||||
public StatsScreen(Entity e) {
|
||||
super(GuiThemes.get(),e.getName().getString());
|
||||
this.entity = e;
|
||||
GuiTheme theme = GuiThemes.get();
|
||||
add(theme.label(String.format("Age: %d", entity.age)));
|
||||
if (entity instanceof LivingEntity) {
|
||||
LivingEntity liv = (LivingEntity) entity;
|
||||
add(theme.label(String.format("Health: %.2f/%.2f", liv.getHealth(), liv.getMaxHealth())));
|
||||
|
||||
Collection<StatusEffectInstance> statusEff = liv.getStatusEffects();
|
||||
if (!statusEff.isEmpty()) {
|
||||
WSection effectList = add(theme.section("Status Effects", true)).expandCellX().widget();
|
||||
Language lang = TranslationStorage.getInstance();
|
||||
statusEff.forEach((effect) -> {
|
||||
String status = lang.get(effect.getTranslationKey());
|
||||
if (effect.getAmplifier() != 0) {
|
||||
status += (String.format(" %d (%s)", effect.getAmplifier()+1, StatusEffectUtil.durationToString(effect, 1)));
|
||||
} else {
|
||||
status += (String.format(" (%s)", StatusEffectUtil.durationToString(effect, 1)));
|
||||
}
|
||||
effectList.add(theme.label(status)).expandCellX();
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
WSection dimension = add(theme.section("Dimensions", false)).expandCellX().widget();
|
||||
dimension.add(theme.label(String.format("Position: %.2f, %.2f, %.2f", entity.getX(), entity.getY(), entity.getZ()))).expandCellX();
|
||||
dimension.add(theme.label(String.format("Yaw: %.2f, Pitch: %.2f", entity.yaw, entity.pitch))).expandCellX();
|
||||
Box box = entity.getBoundingBox();
|
||||
dimension.add(theme.label(String.format("Bounding Box: [%.2f, %.2f, %.2f] -> [%.2f, %.2f, %.2f]",
|
||||
box.minX, box.minY, box.minZ,
|
||||
box.maxX, box.maxY, box.maxZ
|
||||
))).expandCellX();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onClosed() {
|
||||
super.onClosed();
|
||||
//Modules.get().get(InteractionMenu.class).isOpen = false;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user