mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-10-12 03:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,906 Commits 93 Branches 16 Tags
42f3c56b7104223a63cd8f1dbc99530f5f0836bd
Commit Graph
64 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
solo 1d658bd52d Remove Allay Mappings Submodules (#493) 
* Download allay mappings from github instead of using git submodules

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Remove allay gitignore

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Use the same dependency notation as the rest of the project

---------

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2025-03-25 15:14:51 -06:00
solonovamax 72649d5cf7 Merge remote-tracking branch 'upstream/ver/6.4.0' into ver/6.4.0 2023-11-08 22:42:23 -05:00
solonovamax 7cf87de463 Add TODO to replace FoliaLib when we drop support for 1.18 and 1.19 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2023-11-08 22:42:14 -05:00
solonovamax 3f9f2bdce4 Use kotlin's Path extensions rather than Files.whatever 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2023-11-08 20:38:25 -05:00
solonovamax e8fa5514cc Clean up language in code of conduct's license & attribution section 2022-09-06 10:42:05 -04:00
solonovamax f1290b36d8 Fix more weird list formatting in code of conduct 2022-09-06 10:40:43 -04:00
solonovamax befc0c6636 Fix an oopsie in the code of conduct with weird list formatting 2022-09-06 10:15:01 -04:00
solo 963e070f92 Merge pull request #313 from duplexsystem/patch-2 
fix new lines in PULL_REQUEST_TEMPLATE.md so that check boxes render …
 2022-06-06 12:53:05 -04:00
solonovamax 39160f9ff8 use #getFormatted to print the string when loading addons 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-12-14 17:17:06 -05:00
solonovamax 711451a4b3 Minor code refactors, clean up logging significantly, and close resources 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-11-23 17:13:04 -05:00
solonovamax 2d4e46a43f Fix logging in a dev environment 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-11-23 16:30:32 -05:00
solonovamax 2b2255a590 Optimize logging statements to avoid string concatenation 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-11-23 15:13:50 -05:00
solonovamax 92046fe345 Update purpur url 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-11-23 15:09:50 -05:00
solonovamax 7a53175a5f fix: slf4j not working properly when used in prod 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-11-23 14:54:37 -05:00
solonovamax 5a35d8b40e fix: shadedImplementation configuration not actually being shaded 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-11-23 14:54:37 -05:00
solonovamax 8ffa931a2f Sort repositories by what should be resolved first. 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-11-22 14:05:05 -05:00
solonovamax 8bfb69baee Update dependencies so that logging *actually* works this time 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-11-22 14:04:45 -05:00
solonovamax dc07b60688 Use latest fancy gradle features to not do that dumb string bullshit from before 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-11-21 23:58:24 -05:00
solonovamax 22eae6d515 Fix compile error with bukkit platform impl 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-11-21 23:29:42 -05:00
solonovamax e60dfe0242 Remove debug logging config value 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-11-21 20:13:06 -05:00
solonovamax dd259c4d8f Make logging actually work 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-11-21 19:18:00 -05:00
solonovamax 9d30130f85 Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging 2021-11-21 17:57:56 -05:00
solo dfcf8c6185 Update gitignore file to ignore a few things that annoyed me (#278) 
* Update gitignore file to ignore a few things that annoyed me

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Remove .conf because hocon uses it.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-11-21 13:47:44 -07:00
solonovamax d2d96813ad Have your newline back 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-11-21 01:25:06 -05:00
solonovamax 7fee2b9718 Actually include git submodules this time 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-11-21 01:23:43 -05:00
solonovamax 1c97ec10e1 Don't remove all the addons, thanks 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-11-21 01:14:54 -05:00
solonovamax 28eed33e40 Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-11-21 00:52:05 -05:00
solo e3df44e16f Add String#strip to AddonRegistry to remove trialing newline 2021-09-27 10:57:06 -04:00
solo 764f93f40f Add String#strip invocations to SpigotListener to remove trailing newline 2021-09-27 10:56:10 -04:00
solonovamax ca55f06853 Forgot to invoke doVersionCheck lol 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-09-25 01:25:28 -04:00
solonovamax 33276f1cf3 Forgot space lol 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-09-25 01:19:08 -04:00
solonovamax 53296b2367 Remap log4j-slf4j-impl 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-09-25 01:12:35 -04:00
solonovamax 9eef2599b9 Finish up merge into ver/6.0.0, as there were still some errors. 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-09-25 01:12:06 -04:00
solonovamax 4c1ac827ad Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging 
# Conflicts:
#	common/api/util/src/main/java/com/dfsek/terra/api/util/Logger.java
#	common/implementation/src/main/java/com/dfsek/terra/AbstractTerraPlugin.java
#	common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java
#	common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java
#	common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java
#	common/implementation/src/main/java/com/dfsek/terra/util/logging/DebugLogger.java
#	common/implementation/src/main/java/com/dfsek/terra/util/logging/JavaLogger.java
#	platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraPluginImpl.java
#	platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraPluginImpl.java
#	platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraPluginImpl.java
 2021-09-25 00:42:09 -04:00
solonovamax b03c8b4a11 Merge remote-tracking branch 'upstream/ver/6.0.0' into architecture/slf4j-logging 
# Conflicts:
#	common/api/core/src/main/java/com/dfsek/terra/api/Logger.java
 2021-09-24 13:50:21 -04:00
solonovamax b6c40302b6 Improve logging 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-08-30 22:04:17 -04:00
solonovamax 7b9c88f8a6 Improve bukkit logging 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-08-30 20:35:18 -04:00
solonovamax a776ecfc2b Migrate logging to SLF4J 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-08-30 19:53:35 -04:00
solonovamax c445a0434d Reformat all code 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-08-30 17:34:44 -04:00
solonovamax 1655381413 Style: update editor config 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-08-30 16:29:18 -04:00
solo c1c2ab6df8 General repository maintenance. (#94) 
* Fixes #93

Add pull request and issue templates.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Add CODEOWNERS file

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Fix yaml issues

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

fix yaml??

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

Fix name of issue template.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Testing if I can do this with prs too

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

Can I do this with pr templates too??

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

Can I do this with pr templates too??

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

Can I do this with pr templates too??

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Move PULL_REQUEST_TEMPLATE/PULL_REQUEST.md to PULL_REQUEST_TEMPLATE.md, because github :poob:

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* I don't think I can... oof.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Oops, forgot to add this link.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Perform requested changes

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Forgot one

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Server software -> Platform & Merge platform + platform version

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Inclusion of "addon" in language

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* compat with other terrain gen mods

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* inclusion of "addon" in FEATURE_REQUEST.md

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Update CODEOWNERS

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* add discord link to config.yml

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* update PULL_REQUEST_TEMPLATE.md to no longer use "plugin"

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Reintroduce stacktrace section

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* be more specific about compat issues

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* modify CODEOWNERS

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Add CODE_OF_CONDUCT.md

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Repo: add CONTRIBUTING.md file

Add CONTRIBUTING.md file with some basic guidelines on how to get started contributing.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Repo: Update git commit types

Update git commit types in CONTRIBUTING.md and sort them.

Add new entries under "types of changes" for PULL_REQUEST_TEMPLATE.md.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Repo: Performed requested changes

forgot some stuff lol

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-05-31 17:57:55 -07:00
solonovamax 2d41dd8f08 Don't use all cores processors for tests 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-05-01 16:53:45 -04:00
solonovamax aa9e33af1d Remove old and deprecated compile configuration + some minor refactoring 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-05-01 16:53:45 -04:00
solonovamax 4c1e1bb7d5 Improve gradle performance significantly 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2021-04-28 20:43:53 -04:00
solonovamax a614d7dddd Completely redo how gradle works (#40) 
* make getWorldEdit() never null.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Locate commands work like vanilla

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Completely rework all the gradle stuff for the subprojects

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Update gradle version

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* make :common an api in the bukkit build.gradle

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Move git clone function to CommonConfig.kt + make processResources depend on downloadDefaultPacks

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* clean up common build.gradle.kts

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* remove sponge

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* rename fabric group from com.dfsek.terra.bukkit to com.dfsek.terra.fabric

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* idk why this was removed some how?

It shows it's still in the main repo, but it was removed for me /shrug

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Fix shading issues.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Fix issues with fabric-loom being stupid and requiring the plugin on the root project.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2020-12-15 02:37:38 -07:00
solonovamax 31361286b5 Slight change to how world edit is loaded + make locate commands like vanilla (#38) 
* make getWorldEdit() never null.

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Locate commands work like vanilla

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2020-12-10 14:57:05 -07:00
solonovamax 2ae2801058 Remove editor specific files (#34) 
* removed Terra.iml

* removed .idea directory
 2020-12-06 16:58:24 -07:00
solonovamax fe676db0ce Vanilla ore (#28) 
* Vanilla ore

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Fast math

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2020-11-27 14:17:01 -07:00
solonovamax 70ec483581 Action (should work) (#25) 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2020-11-24 17:03:04 -07:00
solonovamax a21452b53f Include gradle wrapper 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2020-11-14 14:37:58 -05:00
solonovamax edaf2d48fb Merge branch 'master' into auto-version 2020-11-13 15:20:46 -05:00
solonovamax 16e871ff50 Automatically update the Terra version on build. 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2020-11-13 15:13:14 -05:00
solonovamax 816365cffc Fix issues 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2020-11-12 19:08:18 -05:00
solonovamax e7185482f2 Download configs from online 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2020-11-12 12:37:50 -05:00
solonovamax dc46e4596d Add linting + fix warnings 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2020-11-07 18:27:39 -05:00
solonovamax de4eb8cb73 Fix formatting issues 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2020-11-07 17:48:25 -05:00
solonovamax 56671ac6a1 Fix formatting issues 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2020-11-07 11:14:06 -05:00
solonovamax c0e0dad100 Merge remote-tracking branch 'source/master' 
# Conflicts:
#	build.gradle.kts
 2020-11-06 22:29:43 -05:00
solonovamax 0c8c0723ef Fix up issues with code 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2020-11-06 22:26:57 -05:00
solonovamax 6efac08d26 Update README to reflect new changes with build system. 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2020-11-02 12:20:52 -05:00
solonovamax dc6b619899 Remove legacy maven. 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2020-11-02 12:20:38 -05:00
solonovamax 9332567d81 Remove test from build task. 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2020-11-02 12:16:57 -05:00
solonovamax d7af43047d Translate test.sh into a gradle task. 
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
 2020-11-02 12:15:15 -05:00
solonovamax d08dd0f91f Added Gradle + removed IDEA files. 
Please enter the commit message for your changes. Lines starting
 2020-10-27 12:56:31 -04:00