-
Notifications
You must be signed in to change notification settings - Fork 31
Ajout du milestone des rêves #1143
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
gab4000
wants to merge
33
commits into
ServerOpenMC:master
Choose a base branch
from
gab4000:feat/dream_milestone
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
33 commits
Select commit
Hold shift + click to select a range
4ca58d8
Dream Milestone Part.1
c991f9d
Merge branch 'ServerOpenMC:master' into feat/dream_milestone
gab4000 01c6a4f
Merge branch 'master' into feat/dream_milestone
809dc11
Petites améliorations
5c790f3
Continue milestone
820c57c
Dream Milestone part. 2
0c1de21
Dream Milestone part. 3
9292644
Merge branch 'ServerOpenMC:master' into feat/dream_milestone
gab4000 75026d3
Merge branch 'master' into feat/dream_milestone
76cebd6
Merge branch 'ServerOpenMC:master' into feat/dream_milestone
gab4000 ef163ee
Merge branch 'ServerOpenMC:master' into feat/dream_milestone
gab4000 05aedca
Merge branch 'ServerOpenMC:master' into feat/dream_milestone
gab4000 4f4f7f5
Merge branch 'ServerOpenMC:master' into feat/dream_milestone
gab4000 1b7d3f7
Merge branch 'ServerOpenMC:master' into feat/dream_milestone
gab4000 9a79589
Review bibi -> changing menu
bacd464
Review bibi -> added todo
4f16389
Review bibi -> moved dream milestone dialog
e428922
Finished story
d0bcf64
Resolved build & test errors
787892b
Resolved build & test errors 2
a64b414
Merge branch 'ServerOpenMC:master' into feat/dream_milestone
gab4000 ab6282a
Merge branch 'ServerOpenMC:master' into feat/dream_milestone
gab4000 8439314
Ajout des crédits
d643354
Update credits
cabcaff
Removing milestone call before dreamdim
02afb43
Modified cube to implement in milestone
45176a2
Patch NullPointerException in cold calculation
989d783
Added admin command to show dialogs and refactor dialog logic
f160f20
Finished milestone
4771a59
Added cube GPS
88d9769
Review bibi 1
4b709e7
Review bibi 2
d022825
oubli :)
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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
28 changes: 28 additions & 0 deletions
28
src/main/java/fr/openmc/core/features/cube/events/EnterCubeZoneEvent.java
This file contains hidden or 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,28 @@ | ||
| package fr.openmc.core.features.cube.events; | ||
|
|
||
| import fr.openmc.core.features.cube.Cube; | ||
| import lombok.Getter; | ||
| import org.bukkit.entity.Player; | ||
| import org.bukkit.event.HandlerList; | ||
| import org.bukkit.event.player.PlayerEvent; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| @Getter | ||
| public class EnterCubeZoneEvent extends PlayerEvent { | ||
| private static final HandlerList HANDLERS = new HandlerList(); | ||
| private final Cube cube; | ||
|
|
||
| public EnterCubeZoneEvent(@NotNull Player player, Cube cube) { | ||
| super(player); | ||
| this.cube = cube; | ||
| } | ||
|
|
||
| public static HandlerList getHandlerList() { | ||
| return HANDLERS; | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull HandlerList getHandlers() { | ||
| return HANDLERS; | ||
| } | ||
| } |
25 changes: 25 additions & 0 deletions
25
src/main/java/fr/openmc/core/features/cube/events/ExitCubeZoneEvent.java
This file contains hidden or 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,25 @@ | ||
| package fr.openmc.core.features.cube.events; | ||
|
|
||
| import lombok.Getter; | ||
| import org.bukkit.entity.Player; | ||
| import org.bukkit.event.HandlerList; | ||
| import org.bukkit.event.player.PlayerEvent; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| @Getter | ||
| public class ExitCubeZoneEvent extends PlayerEvent { | ||
| private static final HandlerList HANDLERS = new HandlerList(); | ||
|
|
||
| public ExitCubeZoneEvent(@NotNull Player player) { | ||
| super(player); | ||
| } | ||
|
|
||
| public static HandlerList getHandlerList() { | ||
| return HANDLERS; | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull HandlerList getHandlers() { | ||
| return HANDLERS; | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
17 changes: 17 additions & 0 deletions
17
.../fr/openmc/core/features/dream/commands/autocomplete/DreamMilestoneStepsAutoComplete.java
This file contains hidden or 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,17 @@ | ||
| package fr.openmc.core.features.dream.commands.autocomplete; | ||
|
|
||
| import fr.openmc.core.features.dream.milestone.DreamSteps; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import revxrsal.commands.autocomplete.SuggestionProvider; | ||
| import revxrsal.commands.bukkit.actor.BukkitCommandActor; | ||
| import revxrsal.commands.node.ExecutionContext; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Collection; | ||
|
|
||
| public class DreamMilestoneStepsAutoComplete implements SuggestionProvider<BukkitCommandActor> { | ||
| @Override | ||
| public @NotNull Collection<String> getSuggestions(@NotNull ExecutionContext<BukkitCommandActor> context) { | ||
| return Arrays.stream(DreamSteps.values()).map(Enum::name).toList(); | ||
| } | ||
| } |
This file contains hidden or 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
34 changes: 34 additions & 0 deletions
34
src/main/java/fr/openmc/core/features/dream/events/AltarBindEvent.java
This file contains hidden or 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,34 @@ | ||
| package fr.openmc.core.features.dream.events; | ||
|
|
||
| import fr.openmc.core.features.dream.mecanism.altar.AltarRecipes; | ||
| import fr.openmc.core.features.dream.models.registry.items.DreamItem; | ||
| import lombok.Getter; | ||
| import org.bukkit.Location; | ||
| import org.bukkit.entity.Player; | ||
| import org.bukkit.event.HandlerList; | ||
| import org.bukkit.event.player.PlayerEvent; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| @Getter | ||
| public class AltarBindEvent extends PlayerEvent { | ||
| private static final HandlerList HANDLERS = new HandlerList(); | ||
| private final DreamItem item; | ||
| private final AltarRecipes recipe; | ||
| private final Location altarLocation; | ||
|
|
||
| public AltarBindEvent(Player player, DreamItem item, AltarRecipes recipe, Location altarLocation) { | ||
| super(player); | ||
| this.item = item; | ||
| this.recipe = recipe; | ||
| this.altarLocation = altarLocation; | ||
| } | ||
|
|
||
| public static HandlerList getHandlerList() { | ||
| return HANDLERS; | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull HandlerList getHandlers() { | ||
| return HANDLERS; | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.