Skip to content
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
9da4777
update: 1.21.5-1.21.7
iambibi Jul 10, 2025
77f5e53
update: librairies
iambibi Jul 10, 2025
f488374
Merge branch 'ServerOpenMC:master' into feat/1.21.7
iambibi Jul 10, 2025
d92d10f
chore: remove BlockVector2
iambibi Jul 10, 2025
a8bafc4
Merge remote-tracking branch 'origin/feat/1.21.7' into feat/1.21.7
iambibi Jul 10, 2025
76c3ae7
fix: claiming
iambibi Jul 11, 2025
19a67b9
add: DialogInput
iambibi Jul 11, 2025
3042c6d
remove SignGUI
iambibi Jul 11, 2025
9fdecec
Update src/main/java/fr/openmc/core/features/contest/menu/TradeMenu.java
iambibi Jul 11, 2025
56ff62e
Update src/main/java/fr/openmc/core/features/contest/menu/TradeMenu.java
iambibi Jul 11, 2025
17c2150
add: BACK button
iambibi Jul 12, 2025
505534e
Merge remote-tracking branch 'origin/feat/1.21.7' into feat/1.21.7
iambibi Jul 12, 2025
92a7c28
Merge branch 'master' into feat/1.21.8
iambibi Jul 23, 2025
74b3d9e
1.21.8 update
iambibi Jul 23, 2025
13b9eb2
add: increase speed of happy ghast by 1.5
iambibi Jul 23, 2025
3789d50
rewrite: speed modifier for happy ghast
iambibi Jul 25, 2025
49449fd
Merge branch 'master' into feat/1.21.8
iambibi Jul 25, 2025
4726413
change: particle in spawn
iambibi Jul 25, 2025
bf33d70
remove: debug
iambibi Jul 25, 2025
84030c9
build: fix
iambibi Jul 25, 2025
af0ef60
fix: "cityAtLoc" is null
iambibi Jul 25, 2025
1f4e13f
change: dialog.send(.., Component, ...)
iambibi Jul 27, 2025
499d33d
change: 100 to constant MAX_LENGTH
iambibi Jul 27, 2025
7966b82
change: MAX_LENGTH_PLAYERNAME use in isInputPlayer
iambibi Jul 27, 2025
3572673
change: Integer to int
iambibi Jul 27, 2025
2a14afc
change: minLocation to minHeight (idem for maxHeight)
iambibi Jul 27, 2025
5861b89
change: ChunkPos to record
iambibi Jul 27, 2025
85fe0e0
fix: identation
iambibi Jul 27, 2025
b1213bb
fix: space
iambibi Jul 27, 2025
dd909ea
fix: chunkpos record
iambibi Jul 27, 2025
74f4450
change: name of spawnIronMan
iambibi Jul 27, 2025
f21fb2d
change: util randomBetween
iambibi Jul 29, 2025
aed843b
fix: removal
iambibi Jul 29, 2025
81c0120
rename launchEvent to startEvent
iambibi Jul 29, 2025
d6b5226
remove toString
iambibi Jul 29, 2025
f59f06a
remove debug
iambibi Jul 29, 2025
494ce44
fix: forgot
iambibi Jul 29, 2025
485ebb8
addd: field for 100 * 100
iambibi Jul 30, 2025
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
10 changes: 3 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ Nouveau plugin collaboratif pour un serveur : VOTRE serveur !
3. Une fois qu'une fonctionnalité est implémentée et fonctionnelle, créez une pull request.
4. Après approbation, elle sera disponible sur le serveur de développement pour les tests.

Serveur de test : `dev.openmc.fr` (1.21.5 Java Edition)
Serveur de test : `dev.openmc.fr` (1.21.8 Java Edition)

Serveur de la beta : `beta.openmc.fr` (1.21.5 Java Edition)
Serveur de la beta : `beta.openmc.fr` (1.21.8 Java Edition)

Serveur de jeu : `play.openmc.fr` (1.21.5 Java Edition)
Serveur de jeu : `play.openmc.fr` (1.21.8 Java Edition)

## 📘 En apprendre plus.
Vous voulez en savoir plus ? Vous voulez avoir des tutoriels à propos d'OpenMC ?
Expand All @@ -24,9 +24,5 @@ Cliquez [ici](https://github.com/ServerOpenMC/PluginV2/wiki) afin d'accéder au
## 📃 License
Projet sous [GPL-3.0 license](https://choosealicense.com/licenses/gpl-3.0/).

## Crédits
Ce projet intègre du code provenant de la repo [SignGUI](https://github.com/Rapha149/SignGUI), spécifiquement de la [Pull Request #30](https://github.com/Rapha149/SignGUI/pull/30) pour la mise à jour de compatibilité avec Minecraft 1.21.5.
La repo originale est sous licence [MIT](https://github.com/Rapha149/SignGUI/blob/main/LICENSE).

---
Merci à @MathiasDPX pour la nouvelle configuration du repo.
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,17 @@ repositories {
}

dependencies {
paperweight.paperDevBundle '1.21.5-R0.1-SNAPSHOT'
paperweight.paperDevBundle '1.21.8-R0.1-SNAPSHOT'

compileOnly 'com.github.LoneDev6:API-ItemsAdder:3.6.3-beta-14'
compileOnly 'net.luckperms:api:5.4'
compileOnly 'net.luckperms:api:5.5'
compileOnly 'me.clip:placeholderapi:2.11.6'
compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.9'
compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.2.9'
compileOnly 'com.github.dmulloy2:ProtocolLib:5.3.0'
compileOnly 'de.oliver:FancyNpcs:2.5.0'

compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.14'
compileOnly 'com.github.dmulloy2:ProtocolLib:-SNAPSHOT'
compileOnly 'de.oliver:FancyNpcs:2.6.0'
compileOnly 'com.github.dmulloy2:ProtocolLib:5.3.0'

implementation 'org.jetbrains:annotations:24.1.0'
implementation 'com.github.Revxrsal.Lamp:common:3.2.1'
implementation 'com.github.Revxrsal.Lamp:bukkit:3.2.1'
Expand All @@ -72,7 +73,6 @@ dependencies {
testCompileOnly 'org.projectlombok:lombok:1.18.34'
testAnnotationProcessor 'org.projectlombok:lombok:1.18.34'

testImplementation 'com.sk89q.worldedit:worldedit-bukkit:7.2.9'
testImplementation 'org.slf4j:slf4j-simple:2.0.16'
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
Expand Down
58 changes: 58 additions & 0 deletions src/main/java/fr/openmc/api/input/DialogInput.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package fr.openmc.api.input;

import fr.openmc.core.utils.dialog.ButtonType;
import io.papermc.paper.dialog.Dialog;
import io.papermc.paper.registry.data.dialog.ActionButton;
import io.papermc.paper.registry.data.dialog.DialogBase;
import io.papermc.paper.registry.data.dialog.action.DialogAction;
import io.papermc.paper.registry.data.dialog.body.DialogBody;
import io.papermc.paper.registry.data.dialog.type.DialogType;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.event.ClickCallback;
import org.bukkit.entity.Player;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.function.Consumer;

public class DialogInput {

public static void send(Player player, String lore, int maxLength, Consumer<String> callback) {
Comment thread
iambibi marked this conversation as resolved.
Outdated

List<DialogBody> body = new ArrayList<>();

body.add(DialogBody.plainMessage(Component.text(lore)));

Dialog inputDialog = Dialog.create(builder -> builder.empty()
.base(DialogBase.builder(Component.text("Rentrer du Texte"))
.body(body)
.inputs(Arrays.asList(
io.papermc.paper.registry.data.dialog.input.DialogInput
.text("inputtextomc",
Component.text("Rentrer du texte ici")
)
.maxLength(maxLength)
.build()
)
)
.canCloseWithEscape(true)
.build()
)
.type(DialogType.confirmation(
ActionButton.builder(Component.text(ButtonType.CONFIRM.getLabel()))
.action(DialogAction.customClick((response, audience) -> {
callback.accept(response.getText("inputtextomc"));
}, ClickCallback.Options.builder().build()))
.build(), ActionButton.builder(Component.text(ButtonType.CANCEL.getLabel()))
.action(DialogAction.customClick((response, audience) -> {
callback.accept(null);
}, ClickCallback.Options.builder().build()))
.build()
)
)
);

player.showDialog(inputDialog);
}
}
37 changes: 0 additions & 37 deletions src/main/java/fr/openmc/api/input/signgui/SignEditor.java

This file was deleted.

142 changes: 0 additions & 142 deletions src/main/java/fr/openmc/api/input/signgui/SignGUI.java

This file was deleted.

Loading