House keeping

2020-08-06 16:02:30 -05:00 · 2020-08-06 16:02:30 -05:00 · 0f357b6d4b
parent 0dfc64bcbe
commit 0f357b6d4b
15 changed files with 21 additions and 19 deletions
--- a/Licensing/LICENSE.md
+++ b/Licensing/LICENSE.md
@ -0,0 +1,7 @@
+The project (Everything that is not a .patch file) is licensed under the MIT license found here: 
+
+All patches marked with lithium- are licenced under LGPL3 found here: https://github.com/jellysquid3/lithium-fabric/blob/1.16.x/dev/LICENSE.txt
+
+All other patches (Everything that is a .patch file) included in this repo are licensed under the MIT license found here:
+
+See EMC, Lithium, Akarin, Purpur, Rainforest, Origami, and Tuinity for the license of patches automaticly pulled when built.
--- a/Licensing/MIT.md
+++ b/Licensing/MIT.md
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 2a9f9291df1953d16b21cdac79d24f99a7c895f9
+Subproject commit f5d6cd6942b0700d4a4cece187b26b769516cc52
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 9659c3a4e5394194ec52a1d969087ab7bc7ee08e
+Subproject commit 60ce52a46b4881dc4665e22f11551d421233abb5
--- a/README.md
+++ b/README.md
@ -45,9 +45,4 @@ git submodule update --init --recursive --force

 ## LICENSE

-Everything is licensed under the MIT license and is free to be used in your own fork.
-
-See [EMC](https://github.com/starlis/empirecraft), [Lithium](https://github.com/jellysquid3/lithium-fabric), [Akarin](https://github.com/Akarin-project/Akarin), [Purpur](https://github.com/pl3xgaming/Purpur), [Rainforest](https://github.com/Proximyst/Rainforest), [Origami](https://github.com/Minebench/Origami), and [Tuinity](https://github.com/Spottedleaf/Tuinity)
-for the license of material used/modified by this project.
-
-**To use this project you'll have to accept the Mojang EULA!**
+Can be found here: 
--- a/patches/server/0001-Yatopia-Server-Fixes.patch
+++ b/patches/server/0001-Yatopia-Server-Fixes.patch
@ -123,7 +123,7 @@ index c9fa39c5b4b013b56720e339463ffcb5fd3c13f9..00000000000000000000000000000000
 - 
 -         for (final NextTickListEntry<T> toTick : this.toTickThisTick) {
 diff --git a/src/main/java/de/minebench/origami/OrigamiConfig.java b/src/main/java/de/minebench/origami/OrigamiConfig.java
-index fe7330fabe386966c2d203a190a00a785ea21be0..bd107a376eaf660ba1ad61c035f8ed2d9d04749c 100644
+index fe7330fabe386966c2d203a190a00a785ea21be0..2cedf4d7aaefc064f5730015c41c1f5102bc747d 100644
 --- a/src/main/java/de/minebench/origami/OrigamiConfig.java
 +++ b/src/main/java/de/minebench/origami/OrigamiConfig.java
@@ -112,6 +112,19 @@ public final class OrigamiConfig {
@ -131,7 +131,7 @@ index fe7330fabe386966c2d203a190a00a785ea21be0..bd107a376eaf660ba1ad61c035f8ed2d
             return config.getDouble("worlds." + worldName + "." + path, config.getDouble("worlds.default." + path, dfl));
         }
 +
-+        public boolean tickEmptyHoppers = false;
+        public boolean tickEmptyHoppers = true;
 +        public int fullHopperCooldown = 128;
 +        private void hopperOptimizations() {
 +            tickEmptyHoppers = getBoolean("tick-empty-hoppers", tickEmptyHoppers);
--- a/patches/server/0012-lithium-MixinDirection.patch
+++ b/patches/server/0012-lithium-MixinDirection.patch
@ -4,7 +4,7 @@ Date: Mon, 11 May 2020 21:00:44 +0200
 Subject: [PATCH] lithium MixinDirection

 Original code by JellySquid, licensed under GNU Lesser General Public License v3.0
-you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.15.x/fabric (Yarn mappings)
+you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings)

 diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
 index 5a04654657fa47cfce0709ee75c5ff0dbe07ec8c..1aa9d9fd074c186b209696ee46e0dda181372f4b 100644
--- a/patches/server/0013-lithium-MixinBox.patch
+++ b/patches/server/0013-lithium-MixinBox.patch
@ -4,7 +4,7 @@ Date: Mon, 11 May 2020 21:02:57 +0200
 Subject: [PATCH] lithium MixinBox

 Original code by JellySquid, licensed under GNU Lesser General Public License v3.0
-you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.15.x/fabric (Yarn mappings)
+you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings)

 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 index d54bf71409fe299671aa3f72315f18a188b0db9d..661331bc005ba1c6ba6c6a4df22e0205bfd2b660 100644
--- a/patches/server/0014-lithium-enum_values.patch
+++ b/patches/server/0014-lithium-enum_values.patch
@ -4,7 +4,7 @@ Date: Fri, 31 Jul 2020 21:44:22 -0500
 Subject: [PATCH] lithium enum_values

 Original code by JellySquid, licensed under GNU Lesser General Public License v3.0
-you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.15.x/fabric (Yarn mappings)
+you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings)

 diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
 index 4f10ca5ada741b4f5ef941bb9d92a2fa6a7c44ff..3d6f8d948d293ca57bf158bcd1f58e289d937fb5 100644
--- a/patches/server/0015-lithium-MixinGoalSelector.patch
+++ b/patches/server/0015-lithium-MixinGoalSelector.patch
@ -6,7 +6,7 @@ Subject: [PATCH] lithium MixinGoalSelector
 Only replaces the set type, might want to also port the logic rewrite in the future

 Original code by JellySquid, licensed under GNU Lesser General Public License v3.0
-you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.15.x/fabric (Yarn mappings)
+you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings)

 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 index b783028e5526df722d98e4760ffb214d5d2f83dd..2378a833cd31d703db462dd6f55a5cb858796b8d 100644
--- a/patches/server/0016-lithium-MixinLandPathNodeMaker.patch
+++ b/patches/server/0016-lithium-MixinLandPathNodeMaker.patch
@ -4,7 +4,7 @@ Date: Mon, 11 May 2020 22:56:27 +0200
 Subject: [PATCH] lithium MixinLandPathNodeMaker

 Original code by JellySquid, licensed under GNU Lesser General Public License v3.0
-you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.15.x/fabric (Yarn mappings)
+you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings)

 diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
 index 29c978aaa2b9f50f5dba70943653af7658d98fc7..595fb84f280bb10997992cc41ebc512ceaf2d696 100644
--- a/patches/server/0017-lithium-MixinBiome.patch
+++ b/patches/server/0017-lithium-MixinBiome.patch
@ -4,7 +4,7 @@ Date: Fri, 31 Jul 2020 21:46:32 -0500
 Subject: [PATCH] lithium MixinBiome

 Original code by JellySquid, licensed under GNU Lesser General Public License v3.0
-you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.15.x/fabric (Yarn mappings)
+you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings)

 diff --git a/src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedList.java b/src/main/java/me/jellysquid/mods/lithium/common/util/collections/HashedList.java
 new file mode 100644
--- a/patches/server/0024-Redirect-Configs.patch
+++ b/patches/server/0024-Redirect-Configs.patch
@ -75,7 +75,7 @@ index 0d854bda9611b45d78815f9fe9cafb8901de210f..04f5751f7972ed04f97c3f911277a30f
 
   protected static void logError(String s) {
 diff --git a/src/main/java/de/minebench/origami/OrigamiConfig.java b/src/main/java/de/minebench/origami/OrigamiConfig.java
-index bd107a376eaf660ba1ad61c035f8ed2d9d04749c..157a5c1be65b6b39787e5be11d1a8d5ea4aeb2b8 100644
+index 2cedf4d7aaefc064f5730015c41c1f5102bc747d..1c1d624065162ef5b97ed5ff3d0a24b73975ed2e 100644
 --- a/src/main/java/de/minebench/origami/OrigamiConfig.java
 +++ b/src/main/java/de/minebench/origami/OrigamiConfig.java
@@ -3,6 +3,8 @@ package de.minebench.origami;
--- a/patches/server/0026-lithium-MixinChunkGeneratorAbstract.patch
+++ b/patches/server/0026-lithium-MixinChunkGeneratorAbstract.patch
@ -4,7 +4,7 @@ Date: Tue, 4 Aug 2020 21:06:02 +0200
 Subject: [PATCH] lithium-MixinChunkGeneratorAbstract

 Original code by JellySquid, licensed under GNU Lesser General Public License v3.0
-you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.15.x/fabric (Yarn mappings)
+you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings)

 Co-authored-by: tr7zw <tr7zw@live.de>

--- a/patches/server/0027-lithium-MixinDataWatcher.patch
+++ b/patches/server/0027-lithium-MixinDataWatcher.patch
@ -4,7 +4,7 @@ Date: Tue, 4 Aug 2020 21:46:05 +0200
 Subject: [PATCH] lithium-MixinDataWatcher

 Original code by JellySquid, licensed under GNU Lesser General Public License v3.0
-you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.15.x/fabric (Yarn mappings)
+you can find the original code on https://github.com/jellysquid3/lithium-fabric/tree/1.16.x/fabric (Yarn mappings)

 Co-authored-by: tr7zw <tr7zw@live.de>