-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Removed Take Button functionality, refactored classes and methods, ad…
…ded ServerPlayerEntity mixin and bumped version
- Loading branch information
Showing
9 changed files
with
135 additions
and
91 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 was deleted.
Oops, something went wrong.
5 changes: 4 additions & 1 deletion
5
...ain/java/me/libreh/rulebook/Commands.java → ...me/libreh/rulebook/commands/Commands.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
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
2 changes: 1 addition & 1 deletion
2
...n/java/me/libreh/rulebook/PlayerData.java → ...me/libreh/rulebook/config/PlayerData.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
105 changes: 105 additions & 0 deletions
105
src/main/java/me/libreh/rulebook/mixin/ServerPlayerEntityMixin.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,105 @@ | ||
| package me.libreh.rulebook.mixin; | ||
|
|
||
| import com.mojang.authlib.GameProfile; | ||
| import eu.pb4.placeholders.api.TextParserUtils; | ||
| import eu.pb4.sgui.api.elements.BookElementBuilder; | ||
| import eu.pb4.sgui.api.gui.BookGui; | ||
| import eu.pb4.sgui.virtual.book.BookScreenHandler; | ||
| import me.libreh.rulebook.config.Config; | ||
| import me.libreh.rulebook.config.PlayerData; | ||
| import net.minecraft.entity.player.PlayerEntity; | ||
| import net.minecraft.server.network.ServerPlayerEntity; | ||
| import net.minecraft.text.ClickEvent; | ||
| import net.minecraft.text.Text; | ||
| import net.minecraft.util.math.BlockPos; | ||
| import net.minecraft.world.World; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Unique; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.UUID; | ||
|
|
||
| import static me.libreh.rulebook.Rulebook.*; | ||
|
|
||
| @Mixin(ServerPlayerEntity.class) | ||
| public abstract class ServerPlayerEntityMixin extends PlayerEntity { | ||
| @Unique | ||
| private final ServerPlayerEntity player = ((ServerPlayerEntity) (Object) this); | ||
|
|
||
| @Unique | ||
| private final UUID playerUuid = this.getUuid(); | ||
|
|
||
| @Unique | ||
| private int rulebookTick; | ||
|
|
||
| public ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile gameProfile) { | ||
| super(world, pos, yaw, gameProfile); | ||
| } | ||
|
|
||
| @Inject(method = "tick", at = @At("HEAD")) | ||
| private void tick(CallbackInfo ci) { | ||
| rulebookTick++; | ||
| if (rulebookTick == 4) { | ||
| if (JOIN_LIST.contains(playerUuid)) { | ||
| if (!PlayerData.get(player).hasAccepted) { | ||
| if (!RULEBOOK_LIST.contains(playerUuid)) { | ||
| if (!(player.currentScreenHandler instanceof BookScreenHandler)) { | ||
| RULEBOOK_LIST.add(playerUuid); | ||
| openBookGui(player); | ||
| } | ||
| } else { | ||
| if (!(player.currentScreenHandler instanceof BookScreenHandler)) { | ||
| JOIN_LIST.remove(playerUuid); | ||
| RULEBOOK_LIST.remove(playerUuid); | ||
| player.networkHandler.disconnect(TextParserUtils.formatText(Config.getConfig().kickMessages.didntAccept)); | ||
| } | ||
| } | ||
| } else { | ||
| JOIN_LIST.remove(playerUuid); | ||
| RULEBOOK_LIST.remove(playerUuid); | ||
| player.closeHandledScreen(); | ||
| } | ||
| } | ||
|
|
||
| rulebookTick = 0; | ||
| } | ||
| } | ||
|
|
||
| @Unique | ||
| private static void openBookGui(ServerPlayerEntity player) { | ||
| var rulesArray = generateBookPages(); | ||
| var bookBuilder = new BookElementBuilder(); | ||
| for (var rule : rulesArray) { | ||
| bookBuilder.addPage(rule); | ||
| } | ||
| bookBuilder.addPage(TextParserUtils.formatText(Config.getConfig().acceptConfirmation).copy().append(TextParserUtils.formatText(Config.getConfig().acceptButton)).styled(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/rulebook accept")))); | ||
| new BookGui(player, bookBuilder).open(); | ||
| } | ||
|
|
||
|
|
||
| @Unique | ||
| private static List<Text> generateBookPages() { | ||
| List<Text> rulesList = new ArrayList<>(); | ||
|
|
||
| String header = Config.getConfig().rulesHeader; | ||
| String schema = Config.getConfig().ruleSchema; | ||
|
|
||
| var rules = Config.getConfig().rules; | ||
|
|
||
| for (int index = 0; index < rules.size(); index++) { | ||
| var rule = rules.get(index); | ||
| String ruleTitle = rule.title; | ||
| String ruleDescription = rule.description; | ||
|
|
||
| String ruleBuilder = header + "\n" + parseRule(schema, index + 1, ruleTitle, ruleDescription); | ||
|
|
||
| rulesList.add(TextParserUtils.formatText(ruleBuilder)); | ||
| } | ||
|
|
||
| return rulesList; | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "required": true, | ||
| "package": "me.libreh.rulebook.mixin", | ||
| "compatibilityLevel": "JAVA_21", | ||
| "mixins": [ | ||
| "ServerPlayerEntityMixin" | ||
| ], | ||
| "injectors": { | ||
| "defaultRequire": 1 | ||
| } | ||
| } |