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.

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

Generators #11

Merged
merged 102 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from 101 commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
711c86a
Merge pull request #22 from webhead1104/master
Foxikle Jan 13, 2024
973d127
New location storage format && checking for asp
Foxikle Jan 14, 2024
acbc904
Tweaked world loading
Foxikle Jan 14, 2024
8105cf6
Intellij Files
Foxikle Jan 14, 2024
63c62f8
Added asp as a dependency
Foxikle Jan 14, 2024
e686ce7
Properly asyncified world loading & new locations
Foxikle Jan 14, 2024
76f45b8
new location storage (Thanks Bukkit!)
Foxikle Jan 14, 2024
c9dbc08
Merge pull request #23 from Foxikle/alpha2
Foxikle Jan 14, 2024
2fa9f6c
Fix location parsing
Foxikle Jan 14, 2024
6ad4c93
Remove debug messages
Foxikle Jan 14, 2024
3a1de7a
Merge pull request #24 from Foxikle/alpha2
Foxikle Jan 14, 2024
e94b4a2
Create method to make popup tower
Foxikle Jan 14, 2024
14c451c
idea files
Foxikle Jan 14, 2024
4d0228a
Add popuptower to ability dispatcher
Foxikle Jan 14, 2024
41c55be
Prevent dying mutliple times to the void
Foxikle Jan 14, 2024
910af29
New listener to stop wierd behaviour with explosions
Foxikle Jan 14, 2024
8e40a26
Added popup to debug | fix incorrect command recommendations when the…
Foxikle Jan 14, 2024
647cb1f
create method to get world manager
Foxikle Jan 14, 2024
a111217
Prevent players from breaking their own bed
Foxikle Jan 14, 2024
c07c614
Fix bug with water flowing
Foxikle Jan 14, 2024
f32ee7a
Fix physics related to glass
Foxikle Jan 14, 2024
c2ceb0d
Remove sponge on placement
Foxikle Jan 14, 2024
6982af8
Water Bucket and sponge
Foxikle Jan 14, 2024
d6b9f1f
New Itemshop changes
Foxikle Jan 14, 2024
9e46c58
Merge pull request #25 from Foxikle/alpha2
Foxikle Jan 14, 2024
933ee13
Working on the Generators
webhead1104 Jan 14, 2024
75917db
Fixing the build dir
webhead1104 Jan 14, 2024
94f0a8b
Merge pull request #26 from webhead1104/alpha3
Foxikle Jan 14, 2024
6367620
Removing extra lines
webhead1104 Jan 14, 2024
94b30a8
Adding the .idea to the .gitignore
webhead1104 Jan 14, 2024
eaf6a75
Fix spawn platform location
Foxikle Jan 14, 2024
e7968c2
Add default item generator positions
Foxikle Jan 14, 2024
7af6685
Update .gitignore to ignore intellij directory
Foxikle Jan 14, 2024
6644a61
Delete .idea directory
Foxikle Jan 14, 2024
ac5abbc
Delete .idea directory
webhead1104 Jan 14, 2024
bb61853
Merge pull request #2 from WebNetMC/alpha3
Foxikle Jan 14, 2024
b7459cb
Merge pull request #27 from Foxikle/alpha2
webhead1104 Jan 14, 2024
18256ba
Fix spawn platform pasting issues
Foxikle Jan 14, 2024
360dd16
New bridge egg
Foxikle Jan 14, 2024
5714a0c
Fix mobs like chickens and endermites from spawning
Foxikle Jan 14, 2024
467aa47
New bridge egg
Foxikle Jan 14, 2024
db59a3c
make changes to join
Foxikle Jan 14, 2024
c10a9a5
Fix error if player logs off while spectator menu is open
Foxikle Jan 14, 2024
2de06f1
Add items on game start
Foxikle Jan 14, 2024
4866103
Add emerald and diamond generator locations (defaulting to LushRush)
Foxikle Jan 15, 2024
c1b55bb
register generators
Foxikle Jan 15, 2024
006d5ea
Clear inventory again on start
Foxikle Jan 15, 2024
4299085
Create object to handle a generator
Foxikle Jan 15, 2024
2a496fa
Create a goofy class to handle the items a generator produces
Foxikle Jan 15, 2024
1ef3d6d
Add diamond & emerald generators | migrate old gens to new system
Foxikle Jan 15, 2024
584b804
Create types for generators
Foxikle Jan 15, 2024
bec31fb
Create a runnable to handle the visual element of a generator (Armor …
Foxikle Jan 15, 2024
4020095
Create listeners to handle generators and items
Foxikle Jan 15, 2024
231d744
Create a Pair of data values
Foxikle Jan 15, 2024
5da58e9
Register new listeners
Foxikle Jan 15, 2024
b951e71
Merge pull request #37 from Foxikle/alpha2
Foxikle Jan 15, 2024
9f45c26
Merge remote-tracking branch 'origin/alpha3' into alpha3
webhead1104 Jan 15, 2024
56842a8
Prevent spectators from damaging players, picking up items and spliti…
Foxikle Jan 15, 2024
5750fbc
first test of the itemshop and teamchests
webhead1104 Jan 15, 2024
b351da7
updating the .gitignore
webhead1104 Jan 15, 2024
57075c1
Making the emerald generators slower
webhead1104 Jan 15, 2024
737d995
Making the emerald generators slower
webhead1104 Jan 15, 2024
49cde65
Finishing the item shop
webhead1104 Jan 15, 2024
01d7316
Fixing some stuff
webhead1104 Jan 15, 2024
5fda437
Fixing some more stuff
webhead1104 Jan 15, 2024
2d3d2f7
Merge pull request #43 from webhead1104/alpha3
webhead1104 Jan 15, 2024
e271520
Neatened code
Foxikle Jan 15, 2024
d408675
Fixed beds not breaking properly
Foxikle Jan 15, 2024
9335c95
Fix spectators damaging players
Foxikle Jan 15, 2024
fcaffd7
Prevent spectators from dying; final kill effects; check for ending game
Foxikle Jan 15, 2024
9a48f77
Merge pull request #47 from Foxikle/alpha2
Foxikle Jan 15, 2024
3d4c2f6
Added no hunger and always day
webhead1104 Jan 15, 2024
ef77219
Added no hunger and always day
webhead1104 Jan 15, 2024
49f146d
Merge pull request #48 from webhead1104/alpha3
webhead1104 Jan 15, 2024
0055fff
Game stages and stuff
Foxikle Jan 15, 2024
8e1d7d1
Update game states
Foxikle Jan 15, 2024
5945fcd
Update scoreboard too
Foxikle Jan 15, 2024
87dd242
Merge pull request #3 from WebNetMC/alpha3
Foxikle Jan 15, 2024
07cfe59
Allow extinquishing fire
Foxikle Jan 15, 2024
7a8b334
Trident stuff
Foxikle Jan 15, 2024
b215aa1
Max health on spawn
Foxikle Jan 15, 2024
c85fc30
Prevent fire spread
Foxikle Jan 15, 2024
15e150e
Make players spectators who were playing.
Foxikle Jan 15, 2024
143d762
Custom Join/Leave messages
Foxikle Jan 15, 2024
13fc86e
Revamp invis potions
Foxikle Jan 15, 2024
daa6614
Fix wierd death messages?
Foxikle Jan 15, 2024
dbe194f
Fix gen spliting with non team mates
Foxikle Jan 15, 2024
a2ae892
Remove crafting
Foxikle Jan 15, 2024
bd11c24
Fix being able to set spawn at beds
Foxikle Jan 16, 2024
1d27925
Award a players currencies to the player who killed them
Foxikle Jan 16, 2024
d790556
Create permissions
Foxikle Jan 16, 2024
57a240e
Fix default sword not being removed when buying a better sword
Foxikle Jan 16, 2024
c9c0cd5
Fix freezing the game actually freezing the game timer
Foxikle Jan 16, 2024
17b725b
Add limitations on placing blocks
Foxikle Jan 16, 2024
6ff73ab
Fix destroying the map
Foxikle Jan 16, 2024
1fc975c
Fix placing blocks near generators
Foxikle Jan 16, 2024
758c4e5
Working on stuff not done
webhead1104 Oct 13, 2024
6f5be22
not done yet
webhead1104 Oct 17, 2024
f082aab
Use @Getter
webhead1104 Oct 17, 2024
bf5b998
Generators (this took so long)
webhead1104 Oct 18, 2024
c922b7b
fix the build path
webhead1104 Oct 18, 2024
8d30b8e
use the published build
webhead1104 Oct 18, 2024
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ hs_err_pid*
.DS_Store
.AppleDouble
.LSOverride
.idea
gradlew

# Icon must end with two \r
Icon
Expand Down Expand Up @@ -96,6 +98,7 @@ $RECYCLE.BIN/
target/
.gradle/
build/
.idea/

pom.xml.tag
pom.xml.releaseBackup
Expand Down
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions .idea/discord.xml

This file was deleted.

124 changes: 0 additions & 124 deletions .idea/uiDesigner.xml

This file was deleted.

2 changes: 1 addition & 1 deletion .settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
arguments=--init-script /var/folders/lv/vkl4g2wx05vcxyhmg201gzhm0000gn/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle
auto.sync=false
build.scans.enabled=false
connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.4.2))
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.project.dir=
eclipse.preferences.version=1
gradle.user.home=
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# CytonicBedwars
Cytoni's bedwars minigame!
Cytonic's bedwars minigame!
> [!CAUTION]
> You won't get support if you try to use this.
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ version = "1.0-SNAPSHOT"

repositories {
mavenCentral()
maven("https://repo.foxikle.dev/cytonic")
//maven("https://repo.foxikle.dev/cytonic")
mavenLocal()
}

dependencies {
Expand All @@ -35,7 +36,6 @@ tasks {
mergeServiceFiles()
archiveFileName.set("CytonicBedwars-${project.version}.jar")
archiveClassifier.set("")
destinationDirectory.set(File(providers.gradleProperty("server_dir")
.orElse(destinationDirectory.get().toString()).toString() + "/plugins"))
//destinationDirectory.set(File(providers.gradleProperty("server_dir").get() + "/plugins"))
}
}
Loading
Loading