Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add fishing #7137

Merged
merged 132 commits into from
Dec 18, 2024
Merged

Add fishing #7137

merged 132 commits into from
Dec 18, 2024

Conversation

Efnilite
Copy link
Member

@Efnilite Efnilite commented Oct 8, 2024 •
edited
Loading

Description

Continues #4284.

  • Updated events to be a lot more specific. Removes current on fish event.
  • Added fishing hook
  • Added hooked entity
  • Added dropped XP of fishing event
  • Added condition hook is in open water
  • Added pull hooked entity effect
  • Added bucket entity event + expression
  • Added fishing lure effect
  • Added hooked entity expr
  • Added fish waiting time
  • Added fish approach angle
  • Added tests!

Thanks @AyhamAl-Ali!

Target Minecraft Versions: any
Requirements: none
Related Issues: none

fednelpat and others added 30 commits August 2, 2020 19:42
@fednelpat
Updated the fish event to support getting the player, the hook and th…
534c80f 
…e state
@fednelpat
Fixed english.lang, updated ExprFishingState and ExprFishingHook
d0222d4
@fednelpat
Added an annotation
06e9cd1
@fednelpat
Merge branch 'master' into EvtFishing
470c3b3
@fednelpat
Merge branch 'master' into EvtFishing
d87a5fd
@fednelpat
Added an empty newline to the end of english.lang
ab2ce54
@fednelpat @APickledWalrus
Update src/main/java/ch/njol/skript/events/EvtFish.java
ed6867b 
Co-authored-by: APickledWalrus <apickledwalrus@gmail.com>
@fednelpat
Merge branch 'dev-2.5' into EvtFishing
772aae6
@fednelpat
Added empty lines
36fec8a
@fednelpat
Merge remote-tracking branch 'origin/EvtFishing' into EvtFishing
20d092a
@ShaneBeee
Merge branch 'dev-2.5' into EvtFishing
525f13c
@fednelpat
Merge branch 'dev-2.5' into EvtFishing
f562db7
@fednelpat
Merge branch 'dev-2.5' into EvtFishing
52e32ef
@ShaneBeee
Merge branch 'dev-2.5' into EvtFishing
ce8b161
@fednelpat
Merge branch 'dev-2.5' into EvtFishing
5a22a9e
@fednelpat @APickledWalrus
Update src/main/java/ch/njol/skript/classes/data/BukkitClasses.java
5f57930 
Co-authored-by: APickledWalrus <apickledwalrus@gmail.com>
@fednelpat
Merge branch 'dev-2.5' into EvtFishing
6988593
@fednelpat
Merge branch 'dev-2.5' into EvtFishing
cb7d4e0
@fednelpat
Fixed a broken event value
6f6088d
@fednelpat
Fixed all license header issues
a8f03a9
@fednelpat @APickledWalrus
Update src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java
09a77c6 
Co-authored-by: APickledWalrus <apickledwalrus@gmail.com>
@fednelpat
Merge branch 'dev-2.5' into EvtFishing
08bc281
@fednelpat
Merge branch 'dev-2.5' into EvtFishing
aeb9a81
@fednelpat
Merge branch 'SkriptLang:master' into EvtFishing
6795df0
@fednelpat
Made the description end with a period
2a05635
@fednelpat
Removed an useless condition
bfa8282
@fednelpat
Converted to an enumset as Pikachu asked, and removed useless code
8e5b9c2
@fednelpat
Merge branch 'EvtFishing' of https://github.com/DeltaRays/Skript into…
69c5ac3 
… EvtFishing
@fednelpat
A commit with whitespace changes to retrigger the java ci checks
8c35192
@fednelpat
A commit with whitespace changes to retrigger the java ci checks
29b8af2
sovdeeth
sovdeeth requested changes Nov 15, 2024
View reviewed changes
src/main/java/ch/njol/skript/expressions/ExprExperience.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/fishing/elements/CondFishingLure.java Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/fishing/elements/CondFishingLure.java Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/fishing/elements/EffPullHookedEntity.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprEntityBucket.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprFishingApproachAngle.java Outdated Show resolved Hide resolved
src/main/java/org/skriptlang/skript/bukkit/fishing/elements/ExprFishingWaitTime.java Outdated Show resolved Hide resolved
src/test/skript/junit/EvtFish.sk Outdated Show resolved Hide resolved
src/test/skript/junit/EvtFish.sk Outdated Show resolved Hide resolved
@Efnilite Efnilite added the feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version. label Dec 16, 2024
@sovdeeth sovdeeth added the 2.10 Targeting a 2.10.X version release label Dec 17, 2024
@Moderocky Moderocky merged commit 8308300 into SkriptLang:dev/feature Dec 18, 2024
5 checks passed
@Efnilite Efnilite deleted the fishing branch December 18, 2024 12:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Moderocky Moderocky Moderocky approved these changes

@sovdeeth sovdeeth sovdeeth approved these changes

@erenkarakal erenkarakal Awaiting requested review from erenkarakal

@UnderscoreTud UnderscoreTud Awaiting requested review from UnderscoreTud

Assignees
No one assigned
Labels
2.10 Targeting a 2.10.X version release breaking changes Pull or feature requests that contain breaking changes (API, syntax, etc.) feature Pull request adding a new feature. feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@Efnilite @sovdeeth @Moderocky @erenkarakal @fednelpat @ShaneBeee @FranKusmiruk @AyhamAl-Ali @APickledWalrus