Merge pull request #800 from Scrumplex/refactor-newlaunch-package

Rename NewLaunch package
This commit is contained in:
flow 2022-07-01 10:05:07 -03:00 committed by GitHub
commit bf9888099c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 140 additions and 51 deletions

View File

@ -1,6 +1,6 @@
# PolyMC
Copyright (C) 2012-2021 MultiMC Contributors
PolyMC - Minecraft Launcher
Copyright (C) 2021-2022 PolyMC Contributors
This program is free software: you can redistribute it and/or modify
@ -15,8 +15,11 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
# Launcher (https://github.com/MultiMC/Launcher)
Copyright 2012-2021 MultiMC Contributors
This file incorporates work covered by the following copyright and
permission notice:
Copyright 2013-2021 MultiMC Contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
@ -213,6 +216,57 @@
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# launcher (`libraries/launcher`)
PolyMC - Minecraft Launcher
Copyright (C) 2021-2022 PolyMC Contributors
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, version 3.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.
As a special exception, the copyright holders of this library give
you permission to link this library with independent modules to
produce an executable, regardless of the license terms of these
independent modules, and to copy and distribute the resulting
executable under terms of your choice, provided that you also meet,
for each linked independent module, the terms and conditions of the
license of that module. An independent module is a module which is
not derived from or based on this library. If you modify this
library, you may extend this exception to your version of the
library, but you are not obliged to do so. If you do not wish to do
so, delete this exception statement from your version.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
This file incorporates work covered by the following copyright and
permission notice:
Copyright 2013-2021 MultiMC Contributors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
# lionshead
Code has been taken from https://github.com/natefoo/lionshead and loosely

View File

@ -125,7 +125,7 @@ cp /home/peterix/minecraft/FTB/versions/1.7.10/1.7.10.jar
launcher onesix
```
Available under the Apache 2.0 license.
Available under `GPL-3.0-only` (with classpath exception), sublicensed from its original `Apache-2.0` codebase
## libnbtplusplus
libnbt++ is a free C++ library for Minecraft's file format Named Binary Tag (NBT). It can read and write compressed and uncompressed NBT files and provides a code interface for working with NBT data.

View File

@ -3,19 +3,19 @@ project(launcher Java)
find_package(Java 1.7 REQUIRED COMPONENTS Development)
include(UseJava)
set(CMAKE_JAVA_JAR_ENTRY_POINT org.multimc.EntryPoint)
set(CMAKE_JAVA_JAR_ENTRY_POINT org.polymc.EntryPoint)
set(CMAKE_JAVA_COMPILE_FLAGS -target 7 -source 7 -Xlint:deprecation -Xlint:unchecked)
set(SRC
org/multimc/EntryPoint.java
org/multimc/Launcher.java
org/multimc/LauncherFactory.java
org/multimc/impl/OneSixLauncher.java
org/multimc/applet/LegacyFrame.java
org/multimc/exception/ParameterNotFoundException.java
org/multimc/exception/ParseException.java
org/multimc/utils/Parameters.java
org/multimc/utils/Utils.java
org/polymc/EntryPoint.java
org/polymc/Launcher.java
org/polymc/LauncherFactory.java
org/polymc/impl/OneSixLauncher.java
org/polymc/applet/LegacyFrame.java
org/polymc/exception/ParameterNotFoundException.java
org/polymc/exception/ParseException.java
org/polymc/utils/Parameters.java
org/polymc/utils/Utils.java
net/minecraft/Launcher.java
)
add_jar(NewLaunch ${SRC})

1
libraries/launcher/LICENSE Symbolic link
View File

@ -0,0 +1 @@
../../LICENSE

View File

@ -12,6 +12,23 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Linking this library statically or dynamically with other modules is
* making a combined work based on this library. Thus, the terms and
* conditions of the GNU General Public License cover the whole
* combination.
*
* As a special exception, the copyright holders of this library give
* you permission to link this library with independent modules to
* produce an executable, regardless of the license terms of these
* independent modules, and to copy and distribute the resulting
* executable under terms of your choice, provided that you also meet,
* for each linked independent module, the terms and conditions of the
* license of that module. An independent module is a module which is
* not derived from or based on this library. If you modify this
* library, you may extend this exception to your version of the
* library, but you are not obliged to do so. If you do not wish to do
* so, delete this exception statement from your version.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
@ -33,10 +50,10 @@
* limitations under the License.
*/
package org.multimc;
package org.polymc;
import org.multimc.exception.ParseException;
import org.multimc.utils.Parameters;
import org.polymc.exception.ParseException;
import org.polymc.utils.Parameters;
import java.io.BufferedReader;
import java.io.IOException;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.multimc;
package org.polymc;
public interface Launcher {

View File

@ -12,14 +12,31 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* Linking this library statically or dynamically with other modules is
* making a combined work based on this library. Thus, the terms and
* conditions of the GNU General Public License cover the whole
* combination.
*
* As a special exception, the copyright holders of this library give
* you permission to link this library with independent modules to
* produce an executable, regardless of the license terms of these
* independent modules, and to copy and distribute the resulting
* executable under terms of your choice, provided that you also meet,
* for each linked independent module, the terms and conditions of the
* license of that module. An independent module is a module which is
* not derived from or based on this library. If you modify this
* library, you may extend this exception to your version of the
* library, but you are not obliged to do so. If you do not wish to do
* so, delete this exception statement from your version.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package org.multimc;
package org.polymc;
import org.multimc.impl.OneSixLauncher;
import org.multimc.utils.Parameters;
import org.polymc.impl.OneSixLauncher;
import org.polymc.utils.Parameters;
import java.util.HashMap;
import java.util.Map;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.multimc.applet;
package org.polymc.applet;
import net.minecraft.Launcher;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.multimc.exception;
package org.polymc.exception;
public final class ParameterNotFoundException extends IllegalArgumentException {

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.multimc.exception;
package org.polymc.exception;
public final class ParseException extends IllegalArgumentException {

View File

@ -13,12 +13,12 @@
* limitations under the License.
*/
package org.multimc.impl;
package org.polymc.impl;
import org.multimc.Launcher;
import org.multimc.applet.LegacyFrame;
import org.multimc.utils.Parameters;
import org.multimc.utils.Utils;
import org.polymc.Launcher;
import org.polymc.applet.LegacyFrame;
import org.polymc.utils.Parameters;
import org.polymc.utils.Utils;
import java.applet.Applet;
import java.io.File;

View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
package org.multimc.utils;
package org.polymc.utils;
import org.multimc.exception.ParameterNotFoundException;
import org.polymc.exception.ParameterNotFoundException;
import java.util.ArrayList;
import java.util.HashMap;

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.multimc.utils;
package org.polymc.utils;
import java.io.File;
import java.lang.reflect.Field;