Skip to content

Commit

Permalink
Update branch
Browse files Browse the repository at this point in the history
Signed-off-by: Awakened-Redstone <[email protected]>
  • Loading branch information
Awakened-Redstone committed Apr 15, 2024
1 parent df6c329 commit 78deaf4
Show file tree
Hide file tree
Showing 216 changed files with 4,381 additions and 1,706 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ charset = utf-8
end_of_line = lf
insert_final_newline = true
tab_width = 4
indent_size = 4
ij_continuation_indent_size = 2

trim_trailing_whitespace = true

[*.json]
Expand Down
130 changes: 110 additions & 20 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,34 +1,124 @@
# gradle
# User-specific stuff
.idea/

.gradle/
build/
*.iml
*.ipr
*.iws

# IntelliJ
out/
classes/
# mpeltonen/sbt-idea plugin
.idea_modules/

# eclipse
# JIRA plugin
atlassian-ide-plugin.xml

*.launch
# Compiled class file
*.class

# idea
# Log file
*.log

.idea/
*.iml
*.ipr
*.iws
# BlueJ files
*.ctxt

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

*~

# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*

# KDE directory preferences
.directory

# vscode
# Linux trash folder which might appear on any partition or disk
.Trash-*

.settings/
.vscode/
bin/
.classpath
.project
# .nfs files are created when an open file is removed but is still being accessed
.nfs*

# macos
# General
.DS_Store
.AppleDouble
.LSOverride

*.DS_Store
# Icon must end with two \r
Icon

# fabric
# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk

.gradle
build/

# Ignore Gradle GUI config
gradle-app.setting

# Cache of project
.gradletasknamecache

**/build/

# Common working directory
run/

# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar
/config.json
/users.db
/auto-whitelist.json
/remappedSrc/
/CHANGELOG.md
/.run/
56 changes: 29 additions & 27 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,40 +1,42 @@
## This costom version is still in development!

## About
<!-- modrinth_exclude.start -->
<img align="right" width="128" src="src/main/resources/assets/skylands/icon.png">
<!-- modrinth_exclude.end -->

Skylands is a Minecraft mod/plugin for fabric loader. Simple skyblock islands generator and manager allowing your
server's players create and visit islands. The mod can be used server-side only, however it's compatible with singleplayer
and modpacks. This mod is not complete and still in active development.
NeoSkies is a skyblock Minecraft mod, with island settings, teams, island upgrades, dedicated worlds for each island, economy integration (with Common Economy API) and more!
This is a server-side mod, fully compatible with **vanilla** clients

[![Discord Server](https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/cozy/social/discord-plural_64h.png)](https://discord.gg/DcemWeskeZ)
[![Modrinth Page](https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/cozy/available/modrinth_64h.png)](https://modrinth.com/mod/skylands)
[//]: # ([![Modrinth Page]&#40;https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/cozy/available/modrinth_64h.png&#41;]&#40;https://modrinth.com/mod/neoskies&#41;)

### User Commands

- **/sl hub** -> Teleport to the Hub.
- **/sl create** -> Creates an Island.
- **/sl home** -> Teleport to your Island.
- **/sl visit <player>** -> Visit someone's Island.
- **/sl home <player>** -> Teleport to an Island you are member of.
- **/sl members invite <player>** -> Invite player to your Island.
- **/sl members remove <player>** -> Remove player from your Island.
- **/sl accept <player>** -> Accept Island join invite request.
- **/sl kick <player>** -> Kick player from your Island.
- **/sl ban <player>** -> Ban player from visiting your Island.
- **/sl unban <player>** -> Unban player to allow visiting your Island.
- **/sl delete** -> Deletes your Island.
- **/sl settings set-spawn-pos** -> Changes home position.
- **/sl settings set-visits-pos** -> Changes visits position.
- **/sl settings toggle-visits** -> Enables/disables ability to visit your Island.
- **/sl help** -> Sends this list.
- **/is home** -> Open the mod GUI
- **/is hub** -> Teleport to the Hub.
- **/is create** -> Creates an Island.
- **/is home** -> Teleport to your Island.
- **/is visit <player>** -> Visit someone's Island.
- **/is home <player>** -> Teleport to an Island you are member of.
- **/is members invite <player>** -> Invite player to your Island.
- **/is members remove <player>** -> Remove player from your Island.
- **/is accept <player>** -> Accept Island join invite request.
- **/is kick <player>** -> Kick player from your Island.
- **/is ban <player>** -> Ban player from visiting your Island.
- **/is unban <player>** -> Unban player to allow visiting your Island.
- **/is delete** -> Deletes your Island.
- **/is settings set-spawn-pos** -> Changes home position.
- **/is settings set-visits-pos** -> Changes visits position.
- **/is settings toggle-visits** -> Enables/disables ability to visit your Island.
- **/is help** -> Sends this list.

### Admin Commands

- **/force-sl set-hub-pos** -> Changes position of the hub.
- **/force-sl delete-island <player>** -> Deletes player's Island.
- **/force-sl toggle-hub-protection** -> Enables/disables hub protection.
- **/force-sl toggle-hub-music** -> Enables/disables hub background music.
- **/sba hub \(pos|protection)** -> Modify the hub settings.
- **/sba delete-island \<player>** -> Delete a player's island
- **/sba settings** -> Change the mod settings (WIP)
- **/sba balance <island> \(get|set|add|remove)** -> Modify an island's balance
- **/sba island-data \(find|get)** -> Get the data of an island
- **/sba modify <island> \(size|gamerule)** -> Modify an island property
- **/sba reload** -> Reload the mod data


This mod is a fork of [Skylands](https://modrinth.com/mod/skylands), made to have more feature parity with skyblock plugins like [bSkyblock](https://modrinth.com/plugin/bskyblock) and [ASkyblock](https://www.spigotmc.org/resources/askyblock.1220/)
87 changes: 55 additions & 32 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,58 +1,81 @@
plugins {
id "fabric-loom" version "1.1-SNAPSHOT"
id 'io.freefair.lombok' version '6.6.2'
id "fabric-loom" version "1.6-SNAPSHOT"
}

sourceSets {
main {
resources {
srcDirs += [
'src/main/generated'
]
}
}
}

loom {
accessWidenerPath = file("src/main/resources/skylands.accesswidener")
accessWidenerPath = file("src/main/resources/neoskies.accesswidener")

runs {
datagenServer {
server()
name "Data Generation"
vmArg "-Dfabric-api.datagen"
vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}"
vmArg "-Dfabric-api.datagen.modid=neoskies"

ideConfigGenerated = true
runDir "build/datagen"
}
}
}

archivesBaseName = project.archives_base_name
version = project.mod_version
group = project.maven_group

repositories {
//mavenLocal()
maven {
url "https://api.modrinth.com/maven"
content { includeGroup "maven.modrinth" }
}
maven { url "https://maven.nucleoid.xyz" }
maven { url "https://maven.awakenedredstone.com" }
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
maven { url "https://ladysnake.jfrog.io/artifactory/mods" }
maven { url = "https://jitpack.io" }

maven { url "https://maven.wispforest.io" } //Temporary
maven { url "https://maven.ladysnake.org/releases" }
maven { url "https://maven.isxander.dev/releases" }
maven { url "https://jitpack.io" }
}

dependencies {
//region Fabric
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"

modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api}"
modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-api:${project.cca}"
include "dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cca}"
include "dev.onyxstudios.cardinal-components-api:cardinal-components-world:${project.cca}"
include "dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${project.cca}"

modImplementation include("eu.pb4:sgui:${project.sgui}")
modImplementation include("xyz.nucleoid:fantasy:${project.fantasy}")
modImplementation include("maven.modrinth:nota:${project.nota}")
modImplementation include("eu.pb4:placeholder-api:${project.papi}")
modImplementation include("xyz.nucleoid:server-translations-api:${project.sta}")
//endregion
// region Cardinal Components
modImplementation "dev.onyxstudios.cardinal-components-api:cardinal-components-api:${project.cardinal_components_api}"
include "dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cardinal_components_api}"
include "dev.onyxstudios.cardinal-components-api:cardinal-components-world:${project.cardinal_components_api}"
// endregion
// region Nucleoid
modImplementation include("xyz.nucleoid:fantasy:${project.fantasy}")
modImplementation include("xyz.nucleoid:stimuli:${project.stimuli}")
modImplementation include("me.lucko:fabric-permissions-api:${project.fpa}")
modImplementation include("eu.pb4:common-protection-api:${project.cpa}")
modImplementation include("eu.pb4:common-economy-api:${project.cea}")

modImplementation include("xyz.nucleoid:server-translations-api:${project.server_translations_api}")
//endregion
// region Patbox
modImplementation include("eu.pb4:sgui:${project.server_gui}")
modImplementation include("eu.pb4:placeholder-api:${project.placeholder_api}")
modImplementation include("eu.pb4:common-economy-api:${project.common_economy_api}")
modImplementation include("eu.pb4:common-protection-api:${project.common_protection_api}")
//region Polymer
modImplementation include("eu.pb4:polymer-core:${project.polymer}")
modImplementation include("eu.pb4:polymer-resource-pack:${project.polymer}")
modImplementation include("eu.pb4:polymer-virtual-entity:${project.polymer}")

modImplementation "com.awakenedredstone:cbserverconfig:${project.cbsc}"
annotationProcessor(modCompileOnly "io.wispforest:owo-lib:0.10.3+1.19.4") //Temporary

include(implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras}")))
//endregion
//endregion
// region Others
modImplementation include("me.lucko:fabric-permissions-api:${project.fabric_permission_api}")
//endregion
// region Non mod dependencies
include api("blue.endless:jankson:${project.jankson_version}")
//endregion
}

processResources {
Expand Down
42 changes: 23 additions & 19 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,29 @@
org.gradle.jvmargs = -Xmx2G

# Mod Properties
maven_group = ru.pinkgoosik
archives_base_name = skylands-custom
maven_group = com.awakenedredstone
archives_base_name = neoskies
mod_version = 1.0.0-alpha.1

# Dependencies | Check these on https://fabricmc.net/develop
minecraft_version = 1.19.4
yarn_mappings = 1.19.4+build.1
fabric_loader = 0.14.18
fabric_api = 0.76.0+1.19.4
cca = 5.1.0
sgui = 1.2.1+1.19.3
fantasy = 0.4.9+1.19.4-rc2
nota = 0.1.0+1.19
papi = 2.0.0-rc.1+1.19.3
sta = 2.0.0-beta.2+1.19.4-pre2
fpa = 0.2-SNAPSHOT
stimuli = 0.4.4+1.19.4-rc2
cbsc = 0.1.0-alpha.5
cpa = 1.0.0
cea = 1.0.0
polymer = 0.4.9+1.19.4
mixin_extras = 0.2.0-beta.8
minecraft_version = 1.20.4
yarn_mappings = 1.20.4+build.3
fabric_loader = 0.15.7

fabric_api = 0.96.11+1.20.4

cardinal_components_api = 5.4.0

server_gui = 1.4.2+1.20.4
placeholder_api = 2.3.0+1.20.3
common_protection_api = 1.0.0
common_economy_api = 1.1.1
polymer = 0.7.7+1.20.4

fantasy = 0.5.0+1.20.4
server_translations_api = 2.2.0+1.20.3-rc1
stimuli = 0.4.10+1.20.4

fabric_permission_api = 0.2-SNAPSHOT

jankson_version=1.2.2
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 78deaf4

Please sign in to comment.