Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
run/
run*/
build/
remappedSrc/
.gradle/
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Yet another skyblock.net mod for 1.19.2
| Chat Rank Removal | Hides the [Rank] part of global chat messages |
| Tool Saver | Saves your tools when they run low on durability |
| Share Button | Adds a button to chests/shulkers to share them to https://skyblock.onl/item quickly. |
| Chatcryption | RSA Encrypts private message communications. Communicates public key via plaintext once per session. **Note**: This means if a person communicates changes public keys (e.g. MITM attempted, changed computers without copying key, etc.) messages from them will be unreadable until you restart. Also, there is no downgrading to plaintext and it's either all encrypted or all plaintext. |

## Commands

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ org.gradle.parallel=true


# Mod Properties
mod_version = 1.7.0
mod_version = 1.8.0
maven_group = com.anotherpillow
archives_base_name = skyplusplus

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,12 @@ public class SkyPlusPlusClient implements ClientModInitializer {

@Override
public void onInitializeClient() {

SkyPlusPlusConfig.configInstance.load();
config = SkyPlusPlusConfig.configInstance.getConfig();
client = MinecraftClient.getInstance();
Chatcryption.generateKeysAndSave();

BetterChangeBiome.register();
BetterCrateKeys.register();
ShowEmptyShops.register();
Expand Down Expand Up @@ -144,6 +147,7 @@ else if (pos.getManhattanDistance(new BlockPos(4000, 175, 2000)) > 200
GetHeadTextureCommand.register(dispatcher);
GetNBTJsonCommand.register(dispatcher);
ShareCommand.register(dispatcher);
SinkholeCommand.register(dispatcher);
});

AttackBlockCallback.EVENT.register((PlayerEntity player, World world, Hand hand, BlockPos pos, Direction direction) -> {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.anotherpillow.skyplusplus.commands;

import com.anotherpillow.skyplusplus.config.SkyPlusPlusConfig;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.IntegerArgumentType;
import com.mojang.brigadier.arguments.StringArgumentType;
import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
import net.minecraft.client.MinecraftClient;

import java.util.Timer;
import java.util.TimerTask;

public class SinkholeCommand {
public static void register(CommandDispatcher<FabricClientCommandSource> dispatcher) {
MinecraftClient client = MinecraftClient.getInstance();

dispatcher.register(ClientCommandManager.literal("sky++_sinkhole")
.then(ClientCommandManager.argument("extra", StringArgumentType.greedyString())
.executes(context -> {
return 1;
})
)
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public class SkyPlusPlusConfig {
@ConfigEntry public boolean lowerCommandsEnabled = true;
@ConfigEntry public String joinCommandsList = "";
@ConfigEntry public boolean copyChatMessageButtonEnabled = false;
@ConfigEntry public boolean chatcryptionEnabled = false;

@ConfigEntry public boolean enableDiscordRPC = true;

Expand Down Expand Up @@ -668,6 +669,20 @@ public static Screen getConfigScreen(Screen parentScreen) {
.controller(TickBoxController::new)
//?}
.build())
.option(Option.createBuilder(boolean.class)
.name(Text.translatable("skyplusplus.config.tweaks-improvements.chatcryption"))
//? if >1.19.2 {
/*.description(OptionDescription.of(Text.translatable("skyplusplus.config.tweaks-improvements.chatcryption")))
*///?} else {
.tooltip(Text.translatable("skyplusplus.config.tweaks-improvements.chatcryption-desc"))
//?}
.binding(defaults.chatcryptionEnabled, () -> config.chatcryptionEnabled, v -> config.chatcryptionEnabled = v)
//? if >1.19.2 {
/*.controller(TickBoxControllerBuilder::create)
*///?} else {
.controller(TickBoxController::new)
//?}
.build())
.build())
.category(ConfigCategory.createBuilder()
.name(Text.translatable("skyplusplus.config.discord-rpc.title"))
Expand Down
Loading
Loading