-
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.
# Conflicts: # src/main/java/dev/dfonline/codeclient/mixin/render/hud/MDrawContext.java
- Loading branch information
Showing
8 changed files
with
195 additions
and
19 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
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
93 changes: 93 additions & 0 deletions
93
src/main/java/dev/dfonline/codeclient/switcher/ScopeSwitcher.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,93 @@ | ||
| package dev.dfonline.codeclient.switcher; | ||
|
|
||
| import com.google.gson.JsonObject; | ||
| import com.google.gson.JsonParser; | ||
| import dev.dfonline.codeclient.CodeClient; | ||
| import dev.dfonline.codeclient.Utility; | ||
| import dev.dfonline.codeclient.hypercube.item.Scope; | ||
| import net.minecraft.client.option.KeyBinding; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.item.Items; | ||
| import net.minecraft.nbt.NbtCompound; | ||
| import net.minecraft.nbt.NbtElement; | ||
| import net.minecraft.nbt.NbtList; | ||
| import net.minecraft.nbt.NbtString; | ||
| import net.minecraft.text.Style; | ||
| import net.minecraft.text.Text; | ||
| import net.minecraft.util.Formatting; | ||
| import net.minecraft.util.Hand; | ||
| import org.lwjgl.glfw.GLFW; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| public class ScopeSwitcher extends GenericSwitcher { | ||
| private String option; | ||
|
|
||
| public ScopeSwitcher(String option) { | ||
| super(Text.literal("Scope"), -1, GLFW.GLFW_KEY_SPACE); | ||
| this.option = option; | ||
| } | ||
|
|
||
| @Override | ||
| protected void init() { | ||
| footer = Text.literal("[ Click ]").formatted(Formatting.AQUA).append(Text.literal(" Select").formatted(Formatting.WHITE)); | ||
|
|
||
| selected = switch (option) { | ||
| case "saved" -> 1; | ||
| case "local" -> 2; | ||
| case "line" -> 3; | ||
| default -> 0; | ||
| }; | ||
|
|
||
| super.init(); | ||
| } | ||
|
|
||
| @Override | ||
| List<Option> getOptions() { | ||
| ArrayList list = new ArrayList<>(); | ||
| list.add(new Option(Text.literal(Scope.unsaved.longName).setStyle(Style.EMPTY.withColor(Scope.unsaved.color)), Items.ENDER_CHEST.getDefaultStack(), () -> run("unsaved"))); | ||
| list.add(new Option(Text.literal(Scope.saved.longName ).setStyle(Style.EMPTY.withColor(Scope.saved.color)), Items.CHEST.getDefaultStack(), () -> run("saved"))); | ||
| list.add(new Option(Text.literal(Scope.local.longName ).setStyle(Style.EMPTY.withColor(Scope.local.color)), Items.EMERALD_BLOCK.getDefaultStack(), () -> run("local"))); | ||
| list.add(new Option(Text.literal(Scope.line.longName ).setStyle(Style.EMPTY.withColor(Scope.line.color)), Items.LAPIS_BLOCK.getDefaultStack(), () -> run("line"))); | ||
| // list.remove(3); | ||
| return list; | ||
| } | ||
|
|
||
| private void run(String name) { | ||
| ItemStack stack = CodeClient.MC.player.getStackInHand(Hand.MAIN_HAND); | ||
|
|
||
| NbtCompound nbt = stack.getNbt(); | ||
| if(nbt == null) return; | ||
| NbtCompound display = nbt.getCompound("display"); | ||
| if(display != null) { | ||
| NbtList lore = display.getList("Lore", NbtElement.STRING_TYPE); | ||
| lore.set(0, Utility.nbtify(getSelected().text())); | ||
| display.put("Lore",lore); | ||
| nbt.put("display",display); | ||
| } | ||
| NbtCompound pbv = (NbtCompound) nbt.get("PublicBukkitValues"); | ||
| if(pbv == null) return; | ||
| NbtString varItem = (NbtString) pbv.get("hypercube:varitem"); | ||
| if(varItem == null) return; | ||
| JsonObject var = JsonParser.parseString(varItem.asString()).getAsJsonObject(); | ||
| if(!var.get("id").getAsString().equals("var")) return; | ||
| JsonObject data = var.get("data").getAsJsonObject(); | ||
| data.addProperty("scope",name); | ||
| pbv.put("hypercube:varitem",NbtString.of(var.toString())); | ||
| Utility.sendHandItem(stack); | ||
| CodeClient.MC.gameRenderer.firstPersonRenderer.resetEquipProgress(Hand.MAIN_HAND); | ||
| } | ||
|
|
||
| @Override | ||
| protected boolean checkFinished() { | ||
| if(hasClicked) { | ||
| Option selected = getSelected(); | ||
| if(selected != null) selected.run(); | ||
| this.client.setScreen(null); | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
| } |