From 37a5c9f5b09d80ee03c4917dcdf24d186cb1ab65 Mon Sep 17 00:00:00 2001 From: Snowiiii Date: Sun, 8 Sep 2024 17:02:46 +0200 Subject: [PATCH 1/5] Change license --- LICENSE | 54 +++++++++++++++++++++++++++------------------ README.md | 10 +++++++++ pumpkin/src/main.rs | 1 + 3 files changed, 44 insertions(+), 21 deletions(-) diff --git a/LICENSE b/LICENSE index 05e35e0c7..20a80547f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,33 @@ -MIT License - -Copyright (c) 2024 Aleksander Medvedev - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +PUMKIN LICENSE + +Copyright © 2024 Aleksandr Medvedev. All rights reserved. + +1. Grant of License + +a. This License applies to the Pumpkin software and its associated source code ("Software"). +b. You (the recipient) are granted a non-exclusive, worldwide, royalty-free, irrevocable copyright license, to: +- Use, modify, and distribute copies of the Software, in source and binary forms. +- Create derivative works based on the Software. + +2. Permitted Use and Restrictions + +a. You may use, modify, and distribute copies of the Software, in source and binary forms. +b. You may create derivative works based on the Software. +c. If you are a hosting company providing services that utilize the Software, you are required to pay a 5% royalty fee on the revenue generated from those services. A hosting company is defined as any entity that provides hosting services for websites, applications, or other online content. +d. If you are not a hosting company generating over €500 in monthly revenue directly attributable to the use of the Software, you are required to pay a 5% royalty fee on that revenue + +a. If you distribute the Software or a derivative work, you must: +- Clearly identify the origin of the Software by including a prominent notice in the user documentation and/or about screen. +- Provide a link to the official Pumpkin repository (if applicable). + +4. Disclaimer of Warranty + +The Software is provided "as is," without warranty of any kind, express or implied. The author(s) disclaim all warranties, including but not limited to warranties of merchantability, fitness for a particular purpose, and non-infringement. In no event shall the author(s) be liable for any direct, indirect, incidental, special, exemplary, or consequential damages arising out of or in any way connected with the use of this Software, even if advised of the possibility of such damages. + +5. Termination + +This License will terminate automatically if you fail to comply with any of its terms. Upon termination, you must cease all use and distribution of the Software. + +6. Severability + +If any provision of this License is held to be invalid or unenforceable, such provision shall be struck and the remaining provisions shall remain in full force and effect. diff --git a/README.md b/README.md index e45ccd31e..872dacaed 100644 --- a/README.md +++ b/README.md @@ -122,6 +122,16 @@ Contributions are welcome! See [CONTRIBUTING.md](CONTRIBUTING.md) Consider joining our [discord](https://discord.gg/wT8XjrjKkf) to stay up-to-date on events, updates, and connect with other members. +## License +Pumpkin is licensed under the [Pumpkin License](LICENSE). By using Pumpkin, you agree to the terms of this license. + +Key Provisions: +- You must give credit to the original author(s) of Pumpkin and provide a link to the project's repository. +- You may create derivative works based on Pumpkin, but they must also be distributed under the Pumpkin License. +- You may distribute Pumpkin or derivative works, either for free or commercially. +- If you a hosting company. you are required to pay a 5% royalty fee on that revenue. +- If you are not a hosting company which generating over €500. you are required to pay a 5% royalty fee on that revenue. + ## Thanks A big thanks to [wiki.vg](https://wiki.vg/) for providing valuable information used in the development of this project. diff --git a/pumpkin/src/main.rs b/pumpkin/src/main.rs index 3f88fd85d..01844a0aa 100644 --- a/pumpkin/src/main.rs +++ b/pumpkin/src/main.rs @@ -82,6 +82,7 @@ fn main() -> io::Result<()> { let mut players: HashMap>> = HashMap::new(); let server = Arc::new(tokio::sync::Mutex::new(Server::new())); + log::warn!("By using Pumpkin, you agree to the terms of our license. You can find the license here: https://github.com/Snowiiii/Pumpkin/blob/master/LICENSE"); log::info!("Started Server took {}ms", time.elapsed().as_millis()); log::info!("You now can connect to the server, Listening on {}", addr); From 8e087f68f38eaf7e1f889c5da96d3c99b6c90454 Mon Sep 17 00:00:00 2001 From: Snowiiii Date: Sun, 8 Sep 2024 17:42:50 +0200 Subject: [PATCH 2/5] Be more explicted --- LICENSE | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 20a80547f..8d0bdaf0f 100644 --- a/LICENSE +++ b/LICENSE @@ -13,8 +13,8 @@ b. You (the recipient) are granted a non-exclusive, worldwide, royalty-free, irr a. You may use, modify, and distribute copies of the Software, in source and binary forms. b. You may create derivative works based on the Software. -c. If you are a hosting company providing services that utilize the Software, you are required to pay a 5% royalty fee on the revenue generated from those services. A hosting company is defined as any entity that provides hosting services for websites, applications, or other online content. -d. If you are not a hosting company generating over €500 in monthly revenue directly attributable to the use of the Software, you are required to pay a 5% royalty fee on that revenue +c. If you are a hosting company providing services that utilize the Software, you are required to pay a 5% royalty fee on the net income generated from those services. A hosting company is defined as any entity that provides hosting services for websites, applications, or other online content. +d. If you are not a hosting company, but generating over €500 in monthly net income directly attributable to the use of the Software, you are required to pay a 5% royalty fee on that net income a. If you distribute the Software or a derivative work, you must: - Clearly identify the origin of the Software by including a prominent notice in the user documentation and/or about screen. diff --git a/README.md b/README.md index 872dacaed..74dbabc85 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,7 @@ Key Provisions: - You may create derivative works based on Pumpkin, but they must also be distributed under the Pumpkin License. - You may distribute Pumpkin or derivative works, either for free or commercially. - If you a hosting company. you are required to pay a 5% royalty fee on that revenue. -- If you are not a hosting company which generating over €500. you are required to pay a 5% royalty fee on that revenue. +- If you are not a hosting company, but generating over €500 in monthly net income, you are required to pay a 5% royalty fee on that net income ## Thanks From be2025e1753953d5adbbd2211850638d072a9464 Mon Sep 17 00:00:00 2001 From: Snowiiii Date: Sun, 8 Sep 2024 21:44:18 +0200 Subject: [PATCH 3/5] Updated things --- LICENSE | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 8d0bdaf0f..639f8ac0e 100644 --- a/LICENSE +++ b/LICENSE @@ -13,8 +13,8 @@ b. You (the recipient) are granted a non-exclusive, worldwide, royalty-free, irr a. You may use, modify, and distribute copies of the Software, in source and binary forms. b. You may create derivative works based on the Software. -c. If you are a hosting company providing services that utilize the Software, you are required to pay a 5% royalty fee on the net income generated from those services. A hosting company is defined as any entity that provides hosting services for websites, applications, or other online content. -d. If you are not a hosting company, but generating over €500 in monthly net income directly attributable to the use of the Software, you are required to pay a 5% royalty fee on that net income +c. If you are a hosting company or service provider that directly distributes the Software as a packaged product, solution, or service, you are required to pay a 5% royalty fee on the net profit generated from those services. +d. If you are not a hosting company, generating over €2000 in monthly net income directly attributable to the use of the Software, you are required to pay a 3% royalty fee on that net income. a. If you distribute the Software or a derivative work, you must: - Clearly identify the origin of the Software by including a prominent notice in the user documentation and/or about screen. diff --git a/README.md b/README.md index 74dbabc85..b2a3b98ae 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,7 @@ Key Provisions: - You may create derivative works based on Pumpkin, but they must also be distributed under the Pumpkin License. - You may distribute Pumpkin or derivative works, either for free or commercially. - If you a hosting company. you are required to pay a 5% royalty fee on that revenue. -- If you are not a hosting company, but generating over €500 in monthly net income, you are required to pay a 5% royalty fee on that net income +- If you are not a hosting company, but generating over €2000 in monthly net income, you are required to pay a 3% royalty fee on that net income ## Thanks From 03a122cbd3d0ed9b2e9cb97fdbf79150165f42ac Mon Sep 17 00:00:00 2001 From: Snowiiii Date: Sun, 8 Sep 2024 21:58:14 +0200 Subject: [PATCH 4/5] Fix typo --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 639f8ac0e..0a91ecf97 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -PUMKIN LICENSE +PUMPKIN LICENSE Copyright © 2024 Aleksandr Medvedev. All rights reserved. From 8bc20ed55bf064b8afea51a1ae10974858c79330 Mon Sep 17 00:00:00 2001 From: Snowiiii Date: Sun, 8 Sep 2024 22:27:42 +0200 Subject: [PATCH 5/5] Don't charge server owners --- LICENSE | 1 - README.md | 1 - 2 files changed, 2 deletions(-) diff --git a/LICENSE b/LICENSE index 0a91ecf97..a0222cbf6 100644 --- a/LICENSE +++ b/LICENSE @@ -14,7 +14,6 @@ b. You (the recipient) are granted a non-exclusive, worldwide, royalty-free, irr a. You may use, modify, and distribute copies of the Software, in source and binary forms. b. You may create derivative works based on the Software. c. If you are a hosting company or service provider that directly distributes the Software as a packaged product, solution, or service, you are required to pay a 5% royalty fee on the net profit generated from those services. -d. If you are not a hosting company, generating over €2000 in monthly net income directly attributable to the use of the Software, you are required to pay a 3% royalty fee on that net income. a. If you distribute the Software or a derivative work, you must: - Clearly identify the origin of the Software by including a prominent notice in the user documentation and/or about screen. diff --git a/README.md b/README.md index b2a3b98ae..2f7edb20a 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,6 @@ Key Provisions: - You may create derivative works based on Pumpkin, but they must also be distributed under the Pumpkin License. - You may distribute Pumpkin or derivative works, either for free or commercially. - If you a hosting company. you are required to pay a 5% royalty fee on that revenue. -- If you are not a hosting company, but generating over €2000 in monthly net income, you are required to pay a 3% royalty fee on that net income ## Thanks