Skip to content

Commit

Permalink
Merge pull request #52 from zsawyer/releases/1.17.1
Browse files Browse the repository at this point in the history
compatibility upgrade to JDK 16 and Forge for MC 1.17.1
  • Loading branch information
zsawyer authored Aug 23, 2021
2 parents d020dd7 + 3b397e3 commit 9e2a8db
Show file tree
Hide file tree
Showing 23 changed files with 465 additions and 11,873 deletions.
5 changes: 5 additions & 0 deletions mod/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Disable autocrlf on generated files, they always generate with LF
# Add any extra files or paths here to make git stop saying they
# are changed when only line endings change.
src/generated/**/.cache/cache text eol=lf
src/generated/**/*.json text eol=lf
3 changes: 3 additions & 0 deletions mod/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@ build
# other
eclipse
run

# Files from Forge MDK
forge*changelog.txt
18 changes: 0 additions & 18 deletions mod/.nb-gradle-properties

This file was deleted.

28 changes: 0 additions & 28 deletions mod/CREDITS-fml.txt

This file was deleted.

65 changes: 65 additions & 0 deletions mod/CREDITS.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
Minecraft Forge: Credits/Thank You

Forge is a set of tools and modifications to the Minecraft base game code to assist
mod developers in creating new and exciting content. It has been in development for
several years now, but I would like to take this time thank a few people who have
helped it along it's way.

First, the people who originally created the Forge projects way back in Minecraft
alpha. Eloraam of RedPower, and SpaceToad of Buildcraft, without their acceptiance
of me taking over the project, who knows what Minecraft modding would be today.

Secondly, someone who has worked with me, and developed some of the core features
that allow modding to be as functional, and as simple as it is, cpw. For developing
FML, which stabelized the client and server modding ecosystem. As well as the base
loading system that allows us to modify Minecraft's code as elegently as possible.

Mezz, who has stepped up as the issue and pull request manager. Helping to keep me
sane as well as guiding the community into creating better additions to Forge.

Searge, Bspks, Fesh0r, ProfMobious, and all the rest over on the MCP team {of which
I am a part}. For creating some of the core tools needed to make Minecraft modding
both possible, and as stable as can be.
On that note, here is some specific information of the MCP data we use:
* Minecraft Coder Pack (MCP) *
Forge Mod Loader and Minecraft Forge have permission to distribute and automatically
download components of MCP and distribute MCP data files. This permission is not
transitive and others wishing to redistribute the Minecraft Forge source independently
should seek permission of MCP or remove the MCP data files and request their users
to download MCP separately.

And lastly, the countless community members who have spent time submitting bug reports,
pull requests, and just helping out the community in general. Thank you.

--LexManos

=========================================================================

This is Forge Mod Loader.

You can find the source code at all times at https://github.com/MinecraftForge/MinecraftForge/tree/1.12.x/src/main/java/net/minecraftforge/fml

This minecraft mod is a clean open source implementation of a mod loader for minecraft servers
and minecraft clients.

The code is authored by cpw.

It began by partially implementing an API defined by the client side ModLoader, authored by Risugami.
http://www.minecraftforum.net/topic/75440-
This support has been dropped as of Minecraft release 1.7, as Risugami no longer maintains ModLoader.

It also contains suggestions and hints and generous helpings of code from LexManos, author of MinecraftForge.
http://www.minecraftforge.net/

Additionally, it contains an implementation of topological sort based on that
published at http://keithschwarz.com/interesting/code/?dir=topological-sort

It also contains code from the Maven project for performing versioned dependency
resolution. http://maven.apache.org/

It also contains a partial repackaging of the javaxdelta library from http://sourceforge.net/projects/javaxdelta/
with credit to it's authors.

Forge Mod Loader downloads components from the Minecraft Coder Pack
(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team.

43 changes: 40 additions & 3 deletions mod/LICENSE-new.txt → mod/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Minecraft Forge is licensed under the terms of the LGPL 2.1 found
here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and copied
below.
Unless noted below, Minecraft Forge, Forge Mod Loader, and all
parts herein are licensed under the terms of the LGPL 2.1 found
here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and
copied below.

Homepage: http://minecraftforge.net/
https://github.com/MinecraftForge/MinecraftForge


A note on authorship:
All source artifacts are property of their original author, with
Expand All @@ -23,6 +28,38 @@ Java mechanics for referencing libraries are specifically not bound
by Forge's license for the Mod code.


=== MCP Data ===
This software includes data from the Minecraft Coder Pack (MCP), with kind permission
from them. The license to MCP data is not transitive - distribution of this data by
third parties requires independent licensing from the MCP team. This data is not
redistributable without permission from the MCP team.

=== Sharing ===
I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of
the minecraft modding community. All contributions to these parts should be licensed under the same additional grant.

-- Runtime patcher --
License is granted to redistribute the runtime patcher code (src/main/java/net/minecraftforge/fml/common/patcher
and subdirectories) under any alternative open source license as classified by the OSI (http://opensource.org/licenses)

-- ASM transformers --
License is granted to redistribute the ASM transformer code (src/main/java/net/minecraftforge/common/asm/ and subdirectories)
under any alternative open source license as classified by the OSI (http://opensource.org/licenses)

=========================================================================
This software includes portions from the Apache Maven project at
http://maven.apache.org/ specifically the ComparableVersion.java code. It is
included based on guidelines at
http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html
with notices intact. The only change is a non-functional change of package name.

This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating
binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/
authored by genman, heikok, pivot.
The only changes are to replace some Trove collection types with standard Java collections, and repackaged.
=========================================================================


GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999

Expand Down
26 changes: 0 additions & 26 deletions mod/MinecraftForge-Credits.txt

This file was deleted.

70 changes: 0 additions & 70 deletions mod/MinecraftForge-License.txt

This file was deleted.

10 changes: 0 additions & 10 deletions mod/Paulscode IBXM Library License.txt

This file was deleted.

40 changes: 0 additions & 40 deletions mod/Paulscode SoundSystem CodecIBXM License.txt

This file was deleted.

Loading

0 comments on commit 9e2a8db

Please sign in to comment.