From fecf1b5c060da55429ec421d95940ec5a3f097a1 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 16 Sep 2019 18:56:57 +0100 Subject: [PATCH 01/34] Update contributors.properties --- contributors.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/contributors.properties b/contributors.properties index 55bec48b7..23239c2c8 100644 --- a/contributors.properties +++ b/contributors.properties @@ -222,3 +222,10 @@ scruffylookingmr=13 perls=hopperhock unitedmel=1 lynnbruh=6 +electronicru=munchdew +papertriangle=0 +neofreak89=6 +xenolicious=15 +cellmembrane=3 +mr_hacks101=shulk_me_not +nerevardzn=9 From dca3c28cca232dd3e475e28e07ae0e6c5703d92e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 17 Sep 2019 21:03:04 -0500 Subject: [PATCH 02/34] Diva charm no longer brainwashes boss mobs. Closes #2921 --- .../botania/common/item/equipment/bauble/ItemDivaCharm.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index 9f2e9b20b..0a56f22bc 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -56,7 +56,11 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble @SubscribeEvent public void onEntityDamaged(LivingHurtEvent event) { - if (event.getSource().getImmediateSource() instanceof EntityPlayer && event.getEntityLiving() instanceof EntityLiving && !event.getEntityLiving().world.isRemote && Math.random() < 0.6F) { + if (event.getSource().getImmediateSource() instanceof EntityPlayer + && event.getEntityLiving() instanceof EntityLiving + && !event.getEntityLiving().world.isRemote + && event.getEntityLiving().isNonBoss() + && Math.random() < 0.6F) { Runnable lambda = () -> { EntityLiving target = (EntityLiving) event.getEntityLiving(); EntityPlayer player = (EntityPlayer) event.getSource().getImmediateSource(); From e776471525cabce999bc7fcfe177b3469506ca43 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 17 Sep 2019 21:03:57 -0500 Subject: [PATCH 03/34] End of an era (closes #2973) --- .../block/subtile/functional/SubTileOrechid.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java index bc58e9a12..31ba5bb11 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java @@ -84,17 +84,7 @@ public class SubTileOrechid extends SubTileFunctional { for(ItemStack stack : ores) { Item item = stack.getItem(); - String clname = item.getClass().getName(); - - // This poem is dedicated to Greg - // - // Greg. - // I get what you do when - // others say it's a grind. - // But take your TE ores - // and stick them in your behind. - if(clname.startsWith("gregtech") || clname.startsWith("gregapi")) - continue; + if(!(item instanceof ItemBlock)) continue; From 800f47b41cff1d62f8074395238553f4ac35ca45 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 18 Sep 2019 07:30:55 +0100 Subject: [PATCH 04/34] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index 23239c2c8..3f24e8b1e 100644 --- a/contributors.properties +++ b/contributors.properties @@ -229,3 +229,4 @@ xenolicious=15 cellmembrane=3 mr_hacks101=shulk_me_not nerevardzn=9 +cosmicparticl=15 From 6237a4f428baa3d5b3fa80851085fef46f0424e6 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 21 Sep 2019 17:15:26 +0100 Subject: [PATCH 05/34] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index 3f24e8b1e..242275694 100644 --- a/contributors.properties +++ b/contributors.properties @@ -230,3 +230,4 @@ cellmembrane=3 mr_hacks101=shulk_me_not nerevardzn=9 cosmicparticl=15 +HypnoticHarry=2 From 62f8a850808b5bbdac5453c4c980ffea7c7a5d7b Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 21 Sep 2019 17:15:41 +0100 Subject: [PATCH 06/34] Update contributors.properties --- contributors.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributors.properties b/contributors.properties index 242275694..f42a5b1ce 100644 --- a/contributors.properties +++ b/contributors.properties @@ -230,4 +230,4 @@ cellmembrane=3 mr_hacks101=shulk_me_not nerevardzn=9 cosmicparticl=15 -HypnoticHarry=2 +hypnoticharry=2 From c5b63041182a3e77da3981cdb41ffcda65ad900f Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 24 Sep 2019 00:09:40 +0100 Subject: [PATCH 07/34] Update contributors.properties --- contributors.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contributors.properties b/contributors.properties index f42a5b1ce..d7ab7574c 100644 --- a/contributors.properties +++ b/contributors.properties @@ -231,3 +231,6 @@ mr_hacks101=shulk_me_not nerevardzn=9 cosmicparticl=15 hypnoticharry=2 +shawndaddy=4 +quaternary=6 +nohobo1im=arcanerose From f87e3c5c17de4d97d93f367d633aac2546de776c Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 1 Oct 2019 05:38:33 +0100 Subject: [PATCH 08/34] Update contributors.properties --- contributors.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contributors.properties b/contributors.properties index d7ab7574c..79efcd6c5 100644 --- a/contributors.properties +++ b/contributors.properties @@ -234,3 +234,7 @@ hypnoticharry=2 shawndaddy=4 quaternary=6 nohobo1im=arcanerose +granitial=0 +khryseniox=vinculotus +scp_0049=15 +aero48=13 From d588ca4909141e6708c7d6fdd75972d434851ffa Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 5 Oct 2019 12:18:23 +0100 Subject: [PATCH 09/34] Update contributors.properties --- contributors.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contributors.properties b/contributors.properties index 79efcd6c5..8c2791b19 100644 --- a/contributors.properties +++ b/contributors.properties @@ -238,3 +238,5 @@ granitial=0 khryseniox=vinculotus scp_0049=15 aero48=13 +melanx=11 +aimbait=0 From 7a254a1e34ba0c4b5af51cec2db3435b2860b603 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 9 Oct 2019 22:01:46 +0100 Subject: [PATCH 10/34] Update contributors.properties --- contributors.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contributors.properties b/contributors.properties index 8c2791b19..eda0dbce6 100644 --- a/contributors.properties +++ b/contributors.properties @@ -240,3 +240,5 @@ scp_0049=15 aero48=13 melanx=11 aimbait=0 +iskall85=5 +xxfinleyjxx=spectrolus From 5324a08d59c41c4a36cb8ed39c7787580fb689f4 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 11 Oct 2019 20:43:25 +0100 Subject: [PATCH 11/34] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index eda0dbce6..e4d711381 100644 --- a/contributors.properties +++ b/contributors.properties @@ -242,3 +242,4 @@ melanx=11 aimbait=0 iskall85=5 xxfinleyjxx=spectrolus +tehrevenge=10 From 63ecac9d567af87e173232c44c87402ef9b43ede Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 18 Oct 2019 16:46:59 +0100 Subject: [PATCH 12/34] Update contributors.properties --- contributors.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contributors.properties b/contributors.properties index e4d711381..50ade32a9 100644 --- a/contributors.properties +++ b/contributors.properties @@ -243,3 +243,6 @@ aimbait=0 iskall85=5 xxfinleyjxx=spectrolus tehrevenge=10 +spiderach=1 +corey2thousand=2 +khrami=3 From 8d2dfeb887d71dcdcefc0464391c6e65510676bf Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 21 Oct 2019 23:33:37 +0100 Subject: [PATCH 13/34] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index 50ade32a9..00d96867c 100644 --- a/contributors.properties +++ b/contributors.properties @@ -246,3 +246,4 @@ tehrevenge=10 spiderach=1 corey2thousand=2 khrami=3 +asmidus=11 From b855abbd43c5f9088da67e57520b0c7ce9448cec Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 22 Oct 2019 20:07:33 +0100 Subject: [PATCH 14/34] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index 00d96867c..760a5cc65 100644 --- a/contributors.properties +++ b/contributors.properties @@ -247,3 +247,4 @@ spiderach=1 corey2thousand=2 khrami=3 asmidus=11 +namsan=14 From 751b2853715fe6169de2631ee40ffb9ba38979ab Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 25 Oct 2019 23:43:53 +0100 Subject: [PATCH 15/34] Update contributors.properties --- contributors.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contributors.properties b/contributors.properties index 760a5cc65..2680f12cd 100644 --- a/contributors.properties +++ b/contributors.properties @@ -248,3 +248,6 @@ corey2thousand=2 khrami=3 asmidus=11 namsan=14 +_shaey_=9 +stillg0ld=9 +witherlord00=14 From c63a2b8281c1038df1dccca373b0fb66b6abeac7 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 29 Oct 2019 19:39:50 +0000 Subject: [PATCH 16/34] Update contributors.properties --- contributors.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contributors.properties b/contributors.properties index 2680f12cd..5160f081e 100644 --- a/contributors.properties +++ b/contributors.properties @@ -251,3 +251,5 @@ namsan=14 _shaey_=9 stillg0ld=9 witherlord00=14 +profboxleitner=dreadthorne +papapuff=10 From c732587fe281b008f658294fa9f59687eadbcaf5 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 1 Nov 2019 23:06:10 +0000 Subject: [PATCH 17/34] Update contributors.properties --- contributors.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contributors.properties b/contributors.properties index 5160f081e..4534096f0 100644 --- a/contributors.properties +++ b/contributors.properties @@ -253,3 +253,5 @@ stillg0ld=9 witherlord00=14 profboxleitner=dreadthorne papapuff=10 +levicc00123=4 +teaton=fallen_kanade From d4e74d0ae7cfebb84d56566f28565830d362c41c Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 2 Nov 2019 02:12:36 +0000 Subject: [PATCH 18/34] Update contributors.properties --- contributors.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributors.properties b/contributors.properties index 4534096f0..3e94ca947 100644 --- a/contributors.properties +++ b/contributors.properties @@ -254,4 +254,4 @@ witherlord00=14 profboxleitner=dreadthorne papapuff=10 levicc00123=4 -teaton=fallen_kanade +teaton=fallenkanade From 78d77571b80a64cb0957c61f81bcc38c9a768e67 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 2 Nov 2019 21:27:37 +0000 Subject: [PATCH 19/34] h --- contributors.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributors.properties b/contributors.properties index 3e94ca947..6f19ea9c3 100644 --- a/contributors.properties +++ b/contributors.properties @@ -254,4 +254,4 @@ witherlord00=14 profboxleitner=dreadthorne papapuff=10 levicc00123=4 -teaton=fallenkanade +teaton=fallenKanade From 3fe6291655b2ccc32fbb6974a51b4f112b4abed7 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 4 Nov 2019 08:43:22 +0000 Subject: [PATCH 20/34] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index 6f19ea9c3..c71bba757 100644 --- a/contributors.properties +++ b/contributors.properties @@ -255,3 +255,4 @@ profboxleitner=dreadthorne papapuff=10 levicc00123=4 teaton=fallenKanade +xaanit=9 From df9e4a94a842c5007b94e4fbb3aedfd84a61d647 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 8 Nov 2019 04:39:08 +0000 Subject: [PATCH 21/34] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index c71bba757..2a08277eb 100644 --- a/contributors.properties +++ b/contributors.properties @@ -256,3 +256,4 @@ papapuff=10 levicc00123=4 teaton=fallenKanade xaanit=9 +harmonicns=11 From dbd2236cd9157265ea24495814a4a81d5055bc6c Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 15 Nov 2019 10:13:52 +0000 Subject: [PATCH 22/34] Update contributors.properties --- contributors.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contributors.properties b/contributors.properties index 2a08277eb..e112a6da6 100644 --- a/contributors.properties +++ b/contributors.properties @@ -257,3 +257,5 @@ levicc00123=4 teaton=fallenKanade xaanit=9 harmonicns=11 +dr_memerino=entropinnyum +vtcobaltblood=manastar From 6666cf1e23a21e721a20aa1be6b61ab516d58a20 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 19 Nov 2019 13:42:36 +0000 Subject: [PATCH 23/34] Update contributors.properties --- contributors.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contributors.properties b/contributors.properties index e112a6da6..01e5cf9bd 100644 --- a/contributors.properties +++ b/contributors.properties @@ -259,3 +259,5 @@ xaanit=9 harmonicns=11 dr_memerino=entropinnyum vtcobaltblood=manastar +swampy4321=13 +xquicscopex=15 From 050d11a5472da7344e3cc3e77c0709a8ccb4bc41 Mon Sep 17 00:00:00 2001 From: Hubry Date: Sun, 8 Dec 2019 16:58:12 +0100 Subject: [PATCH 24/34] Migrate Albedo compat to caps, fixing NPEs on null lights on new Albedo Fixes #2920, fixes #3040 --- build.gradle | 1 + .../albedo/lighting/ILightProvider.java | 36 ----- .../java/elucent/albedo/lighting/Light.java | 136 ------------------ .../client/core/proxy/ClientProxy.java | 6 + .../integration/albedo/AlbedoCompat.java | 97 +++++++++++++ .../common/block/tile/TileLightRelay.java | 14 +- .../common/core/handler/ConfigHandler.java | 4 + .../common/entity/EntityBabylonWeapon.java | 9 +- .../common/entity/EntityFallingStar.java | 9 +- .../common/entity/EntityFlameRing.java | 9 +- .../common/entity/EntityMagicLandmine.java | 9 +- .../common/entity/EntityManaBurst.java | 10 +- .../botania/common/entity/EntityPixie.java | 13 +- .../vazkii/botania/common/lib/LibMisc.java | 2 +- .../resources/assets/botania/lang/en_us.lang | 1 + 15 files changed, 117 insertions(+), 239 deletions(-) delete mode 100644 src/api/java/elucent/albedo/lighting/ILightProvider.java delete mode 100644 src/api/java/elucent/albedo/lighting/Light.java create mode 100644 src/main/java/vazkii/botania/client/integration/albedo/AlbedoCompat.java diff --git a/build.gradle b/build.gradle index 187c072fe..a3e4b3b6a 100644 --- a/build.gradle +++ b/build.gradle @@ -92,6 +92,7 @@ dependencies { deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2" deobfCompile "mezz.jei:jei_1.12.2:4.13.1.220" deobfCompile "thaumcraft:Thaumcraft:1.12.2:6.1.BETA26" + compileOnly "albedo:albedo:1.12.2:1.1.0" //and a bit more for SCP sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" diff --git a/src/api/java/elucent/albedo/lighting/ILightProvider.java b/src/api/java/elucent/albedo/lighting/ILightProvider.java deleted file mode 100644 index 3d57592d5..000000000 --- a/src/api/java/elucent/albedo/lighting/ILightProvider.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2017 Elucent, William Thompson (unascribed), and contributors - * - * 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. - */ - -package elucent.albedo.lighting; - -import javax.annotation.Nullable; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public interface ILightProvider { - @SideOnly(Side.CLIENT) - @Nullable - public Light provideLight(); -} \ No newline at end of file diff --git a/src/api/java/elucent/albedo/lighting/Light.java b/src/api/java/elucent/albedo/lighting/Light.java deleted file mode 100644 index 116da7396..000000000 --- a/src/api/java/elucent/albedo/lighting/Light.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2017 Elucent, William Thompson (unascribed), and contributors - * - * 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. - */ - -package elucent.albedo.lighting; - -import net.minecraft.entity.Entity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; - -public class Light { - - public float x; - public float y; - public float z; - - public float r; - public float g; - public float b; - public float a; - - public float radius; - - @Deprecated - public Light(float x, float y, float z, float r, float g, float b, float a, float radius) { - this.x = x; - this.y = y; - this.z = z; - this.r = r; - this.g = g; - this.b = b; - this.a = a; - this.radius = radius; - } - - public static Builder builder() { - return new Builder(); - } - - public static final class Builder { - private float x = Float.NaN; - private float y = Float.NaN; - private float z = Float.NaN; - - private float r = Float.NaN; - private float g = Float.NaN; - private float b = Float.NaN; - private float a = Float.NaN; - - private float radius = Float.NaN; - - - public Builder pos(BlockPos pos) { - return pos(pos.getX()+0.5f, pos.getY()+0.5f, pos.getZ()+0.5f); - } - - public Builder pos(Vec3d pos) { - return pos(pos.x, pos.y, pos.z); - } - - public Builder pos(Entity e) { - return pos(e.posX, e.posY, e.posZ); - } - - public Builder pos(double x, double y, double z) { - return pos((float)x, (float)y, (float)z); - } - - public Builder pos(float x, float y, float z) { - this.x = x; - this.y = y; - this.z = z; - return this; - } - - - public Builder color(int c, boolean hasAlpha) { - return color(extract(c, 2), extract(c, 1), extract(c, 0), hasAlpha ? extract(c, 3) : 1); - } - - private float extract(int i, int idx) { - return ((i >> (idx*8)) & 0xFF)/255f; - } - - public Builder color(float r, float g, float b) { - return color(r, g, b, 1); - } - - public Builder color(float r, float g, float b, float a) { - this.r = r; - this.g = g; - this.b = b; - this.a = a; - return this; - } - - - public Builder radius(float radius) { - this.radius = radius; - return this; - } - - - public Light build() { - if (Float.isFinite(x) && Float.isFinite(y) && Float.isFinite(z) && - Float.isFinite(r) && Float.isFinite(g) && Float.isFinite(b) && Float.isFinite(a) && - Float.isFinite(radius)) { - return new Light(x, y, z, r, g, b, a, radius); - } else { - throw new IllegalArgumentException("Position, color, and radius must be set, and cannot be infinite"); - } - } - - } - -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 204aa03f1..c89825414 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -32,6 +32,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; @@ -63,6 +64,7 @@ import vazkii.botania.client.fx.FXWisp; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; +import vazkii.botania.client.integration.albedo.AlbedoCompat; import vazkii.botania.client.render.entity.LayerGaiaHead; import vazkii.botania.client.render.entity.RenderBabylonWeapon; import vazkii.botania.client.render.entity.RenderCorporeaSpark; @@ -175,6 +177,10 @@ public class ClientProxy implements IProxy { dootDoot = true; } + if (Loader.isModLoaded("albedo") && ConfigHandler.enableAlbedo) { + MinecraftForge.EVENT_BUS.register(AlbedoCompat.class); + } + TileEntityItemStackRenderer.instance = new RenderTilePylon.ForwardingTEISR(TileEntityItemStackRenderer.instance); ClientRegistry.registerKeyBinding(ClientProxy.CORPOREA_REQUEST); diff --git a/src/main/java/vazkii/botania/client/integration/albedo/AlbedoCompat.java b/src/main/java/vazkii/botania/client/integration/albedo/AlbedoCompat.java new file mode 100644 index 000000000..b2a5907f1 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/albedo/AlbedoCompat.java @@ -0,0 +1,97 @@ +package vazkii.botania.client.integration.albedo; + +import elucent.albedo.event.GatherLightsEvent; +import elucent.albedo.lighting.ILightProvider; +import elucent.albedo.lighting.Light; +import net.minecraft.entity.Entity; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.CapabilityInject; +import net.minecraftforge.common.capabilities.ICapabilityProvider; +import net.minecraftforge.event.AttachCapabilitiesEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.block.tile.TileLightRelay; +import vazkii.botania.common.entity.EntityBabylonWeapon; +import vazkii.botania.common.entity.EntityFallingStar; +import vazkii.botania.common.entity.EntityFlameRing; +import vazkii.botania.common.entity.EntityMagicLandmine; +import vazkii.botania.common.entity.EntityManaBurst; +import vazkii.botania.common.entity.EntityPixie; +import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.awt.Color; +import java.util.function.Function; + +public class AlbedoCompat { + private static ResourceLocation CAP_NAME = new ResourceLocation(LibMisc.MOD_ID, "albedo_light"); + + @CapabilityInject(ILightProvider.class) + private static final Capability LIGHT_CAPABILITY = null; + + @SubscribeEvent + public static void attachLights(AttachCapabilitiesEvent event) { + Entity e = event.getObject(); + if (e instanceof EntityFlameRing) { + addLight(event, (entity) -> Light.builder().pos(entity).color(1F, 0.5F, 0F).radius(20).build()); + } else if (e instanceof EntityPixie) { + addLight(event, (EntityPixie pixie) -> pixie.getType() == 1 ? null : Light.builder().pos(pixie).color(1F, 0F, 0.5F).radius(8).build()); + } else if (e instanceof EntityManaBurst) { + addLight(event, (EntityManaBurst burst) -> { + int color = burst.getColor(); + return Light.builder() + .pos(burst.posX - burst.motionX, burst.posY - burst.motionY, burst.posZ - burst.motionZ) + .color(color, false) + .radius(burst.getParticleSize() * 8) + .build(); + }); + } else if (e instanceof TileLightRelay.EntityPlayerMover) { + addLight(event, (TileLightRelay.EntityPlayerMover mover) -> { + if (mover.getPassengers().isEmpty()) + return null; + Entity passenger = mover.getPassengers().get(0); + Color color = Color.getHSBColor(passenger.ticksExisted / 36F, 1F, 1F); + return Light.builder().pos(mover).color(color.getRGB(), false).radius(5).build(); + }); + } else if (e instanceof EntityFallingStar) { + addLight(event, entity -> Light.builder().pos(entity).color(1F, 0F, 1F).radius(12).build()); + } else if (e instanceof EntityBabylonWeapon) { + addLight(event, entity -> Light.builder().pos(entity).color(1F, 1F, 0F).radius(8).build()); + } else if (e instanceof EntityMagicLandmine) { + addLight(event, entity -> Light.builder().pos(entity).color(0.6F, 0F, 1F).radius(15).build()); + } + } + + private static void addLight(AttachCapabilitiesEvent event, Function lightFunction) { + event.addCapability(CAP_NAME, new BotaniaLightProvider<>(lightFunction)); + } + + private static class BotaniaLightProvider implements ILightProvider, ICapabilityProvider { + private Function lightFunction; + + BotaniaLightProvider(Function light) { + this.lightFunction = light; + } + + @Override + public void gatherLights(GatherLightsEvent event, Entity context) { + @SuppressWarnings("unchecked") + Light light = lightFunction.apply((E) context); + if(light != null) + event.add(light); + } + + @Override + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + return capability == LIGHT_CAPABILITY; + } + + @Nullable + @Override + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + return capability == LIGHT_CAPABILITY ? LIGHT_CAPABILITY.cast(this) : null; + } + } +} diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 15a8d0498..854d85fcb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -235,8 +235,7 @@ public class TileLightRelay extends TileMod implements ITickable, IWandBindable cmp.setInteger(TAG_BIND_Z, bindPos.getZ()); } - @Optional.Interface(iface="elucent.albedo.lighting.ILightProvider", modid="albedo") - public static class EntityPlayerMover extends Entity implements ILightProvider { + public static class EntityPlayerMover extends Entity { private static final String TAG_EXIT_X = "exitX"; private static final String TAG_EXIT_Y = "exitY"; @@ -354,17 +353,6 @@ public class TileLightRelay extends TileMod implements ITickable, IWandBindable dataManager.set(EXIT_POS, pos); } - @Override - @Optional.Method(modid="albedo") - public Light provideLight() { - if(getPassengers().isEmpty()) - return null; - - Entity passenger = getPassengers().get(0); - Color color = Color.getHSBColor(passenger.ticksExisted / 36F, 1F, 1F); - return Light.builder().pos(this).color(color.getRGB(), false).radius(5).build(); - } - } } diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index dc6acba69..1c56a5e0f 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -85,6 +85,7 @@ public final class ConfigHandler { public static boolean invertMagnetRing = false; public static boolean enableThaumcraftStablizers = true; public static boolean enableThaumcraftAspects = true; + public static boolean enableAlbedo = true; public static boolean enableShedding = false; public static int harvestLevelWeight = 2; @@ -240,6 +241,9 @@ public final class ConfigHandler { desc = "Set this to false to disable Thaumcraft aspects on Botania items"; enableThaumcraftAspects = loadPropBool("thaumcraftAspects.enabled", desc, enableThaumcraftAspects); + desc = "Set this to false to disable Albedo compat for moving colored lights on some Botania entities"; + enableAlbedo = loadPropBool("albedoLights.enabled", desc, enableAlbedo); + desc = "Set this to true to enable the Shedding feature from 1.7.10. You'll need to load the game to generate the options. No options are enabled by default. This increases load time."; enableShedding = loadPropBool("shedding.enable", desc, enableShedding); diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index ebd22d9e6..6f09192aa 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -39,8 +39,7 @@ import elucent.albedo.lighting.Light; import java.util.List; -@Optional.Interface(iface="elucent.albedo.lighting.ILightProvider", modid="albedo") -public class EntityBabylonWeapon extends EntityThrowableCopy implements ILightProvider { +public class EntityBabylonWeapon extends EntityThrowableCopy { private static final String TAG_CHARGING = "charging"; private static final String TAG_VARIETY = "variety"; @@ -202,12 +201,6 @@ public class EntityBabylonWeapon extends EntityThrowableCopy implements ILightPr setRotation(cmp.getFloat(TAG_ROTATION)); } - @Override - @Optional.Method(modid="albedo") - public Light provideLight() { - return Light.builder().pos(this).color(1F, 1F, 0F).radius(8).build(); - } - public boolean isCharging() { return dataManager.get(CHARGING); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index 9f85b0033..9651823f8 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -27,8 +27,7 @@ import java.util.List; import elucent.albedo.lighting.ILightProvider; import elucent.albedo.lighting.Light; -@Optional.Interface(iface="elucent.albedo.lighting.ILightProvider", modid="albedo") -public class EntityFallingStar extends EntityThrowableCopy implements ILightProvider { +public class EntityFallingStar extends EntityThrowableCopy { public EntityFallingStar(World world) { super(world); @@ -91,12 +90,6 @@ public class EntityFallingStar extends EntityThrowableCopy implements ILightProv setDead(); } - - @Override - @Optional.Method(modid="albedo") - public Light provideLight() { - return Light.builder().pos(this).color(1F, 0F, 1F).radius(12).build(); - } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index 5a58d5249..cd9f25be1 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -29,8 +29,7 @@ import elucent.albedo.lighting.Light; import java.util.List; -@Optional.Interface(iface="elucent.albedo.lighting.ILightProvider", modid="albedo") -public class EntityFlameRing extends Entity implements ILightProvider { +public class EntityFlameRing extends Entity { public EntityFlameRing(World world) { super(world); @@ -105,10 +104,4 @@ public class EntityFlameRing extends Entity implements ILightProvider { @Override protected void writeEntityToNBT(@Nonnull NBTTagCompound var1) {} - - @Override - @Optional.Method(modid="albedo") - public Light provideLight() { - return Light.builder().pos(this).color(1F, 0.5F, 0F).radius(20).build(); - } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index bf9b2190c..8c7e56d2b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -30,8 +30,7 @@ import elucent.albedo.lighting.Light; import java.util.List; -@Optional.Interface(iface="elucent.albedo.lighting.ILightProvider", modid="albedo") -public class EntityMagicLandmine extends Entity implements ILightProvider { +public class EntityMagicLandmine extends Entity { public EntityDoppleganger summoner; @@ -92,10 +91,4 @@ public class EntityMagicLandmine extends Entity implements ILightProvider { protected void writeEntityToNBT(@Nonnull NBTTagCompound var1) { } - @Override - @Optional.Method(modid="albedo") - public Light provideLight() { - return Light.builder().pos(this).color(0.6F, 0F, 1F).radius(15).build(); - } - } diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 5933424ad..b480e8432 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -65,8 +65,7 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; -@Optional.Interface(iface="elucent.albedo.lighting.ILightProvider", modid="albedo") -public class EntityManaBurst extends EntityThrowable implements IManaBurst, ILightProvider { +public class EntityManaBurst extends EntityThrowable implements IManaBurst { private static final String TAG_TICKS_EXISTED = "ticksExisted"; private static final String TAG_COLOR = "color"; @@ -817,13 +816,6 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst, ILig if(tile != null && tile instanceof IManaSpreader) ((IManaSpreader) tile).setLastBurstDeathTick(getTicksExisted()); } - - @Override - @Optional.Method(modid="albedo") - public Light provideLight() { - int color = getColor(); - return Light.builder().pos(new Vec3d(posX - motionX, posY - motionY, posZ - motionZ)).color(color, false).radius(getParticleSize() * 8).build(); - } public static class PositionProperties { diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index 9cd0d4b33..0d55d08ec 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -28,8 +28,7 @@ import javax.annotation.Nonnull; import elucent.albedo.lighting.ILightProvider; import elucent.albedo.lighting.Light; -@Optional.Interface(iface="elucent.albedo.lighting.ILightProvider", modid="albedo") -public class EntityPixie extends EntityFlying implements ILightProvider { +public class EntityPixie extends EntityFlying { private static final DataParameter TYPE = EntityDataManager.createKey(EntityPixie.class, DataSerializers.VARINT); @@ -145,14 +144,4 @@ public class EntityPixie extends EntityFlying implements ILightProvider { public boolean canBeLeashedTo(EntityPlayer player) { return false; } - - @Override - @Optional.Method(modid="albedo") - public Light provideLight() { - if(getType() == 1) - return null; - - return Light.builder().pos(this).color(1F, 0F, 0.5F).radius(8).build(); - } - } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index d843bbde7..fcbd61abf 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -17,7 +17,7 @@ public final class LibMisc { public static final String MOD_NAME = "Botania"; public static final String BUILD = "GRADLE:BUILD"; public static final String VERSION = "GRADLE:VERSION-" + BUILD; - public static final String DEPENDENCIES = "required-after:baubles@[1.5.2,);after:thaumcraft@[6.1.BETA21,);after:jei@[1.12.2-4.13.1.220,)"; + public static final String DEPENDENCIES = "required-after:baubles@[1.5.2,);after:thaumcraft@[6.1.BETA21,);after:jei@[1.12.2-4.13.1.220,);after:albedo@[1.0.0,)"; // Network Contants public static final String NETWORK_CHANNEL = MOD_ID; diff --git a/src/main/resources/assets/botania/lang/en_us.lang b/src/main/resources/assets/botania/lang/en_us.lang index 248ada757..1f99f2141 100644 --- a/src/main/resources/assets/botania/lang/en_us.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -381,6 +381,7 @@ seasonalFeatures.enabled=Seasonal Features shedding.enable=Natural Shedding thaumcraftAspects.enabled=TC Aspects thaumraftStabilizers.enabled=TC Infusion Stabilizers +albedoLights.enabled=Albedo Lights # VERSION CHECKING botania.versioning.flavour0=NANI SORE!? BOTANIA IS OUTDATED!? From 6ab3ec39f68d0c190ddc3bbfac78dc5af47e4ed3 Mon Sep 17 00:00:00 2001 From: Hubry Date: Sun, 8 Dec 2019 18:03:37 +0100 Subject: [PATCH 25/34] Fix shedding page NPE, fix entity render making the world fullbright --- .../botania/common/lexicon/page/PageEntity.java | 12 ++++++------ .../botania/common/lexicon/page/PageShedding.java | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java index 356aff013..06d2ea676 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -32,14 +32,14 @@ public class PageEntity extends LexiconPage{ int relativeMouseX, relativeMouseY; boolean tooltipEntity; final int size; - Constructor entityConstructor; + private Constructor entityConstructor; public PageEntity(String unlocalizedName, String entity, int size) { super(unlocalizedName); - Class EntityClass = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(entity)).getEntityClass(); + Class entityClass = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(entity)).getEntityClass(); this.size = size; try { - entityConstructor = EntityClass.getConstructor(World.class); + entityConstructor = entityClass.getConstructor(World.class); } catch (Exception e) { e.printStackTrace(); } @@ -79,7 +79,7 @@ public class PageEntity extends LexiconPage{ @SideOnly(Side.CLIENT) public void renderEntity(IGuiLexiconEntry gui, Entity entity, int x, int y, int scale, float rotation) { - dummyEntity.world = Minecraft.getMinecraft() != null ? Minecraft.getMinecraft().world : null; + dummyEntity.world = Minecraft.getMinecraft().world; GlStateManager.enableColorMaterial(); GlStateManager.pushMatrix(); @@ -93,9 +93,9 @@ public class PageEntity extends LexiconPage{ GlStateManager.popMatrix(); RenderHelper.disableStandardItemLighting(); GlStateManager.disableRescaleNormal(); - OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit); + GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit); GlStateManager.disableTexture2D(); - OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); + GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit); if(relativeMouseX >= x - dummyEntity.width * scale / 2 - 10 && relativeMouseY >= y - dummyEntity.height * scale - 20 && relativeMouseX <= x + dummyEntity.width * scale / 2 + 10 && relativeMouseY <= y + 20) tooltipEntity = true; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index 50d6e5754..662bd5cae 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -41,11 +41,11 @@ public class PageShedding extends PageEntity { private static final ResourceLocation sheddingOverlay = new ResourceLocation(LibResources.GUI_SHEDDING_OVERLAY); - final ItemStack shedStack; - ItemStack tooltipStack; - boolean tooltipEntry; + private final ItemStack shedStack; + private ItemStack tooltipStack = ItemStack.EMPTY; + private boolean tooltipEntry; - static boolean mouseDownLastTick = false; + private static boolean mouseDownLastTick = false; public PageShedding(String unlocalizedName, String entity, int size, ItemStack shedStack) { super(unlocalizedName, entity, size); @@ -103,7 +103,7 @@ public class PageShedding extends PageEntity { vazkii.botania.client.core.helper.RenderHelper.renderTooltip(mx, my, parsedTooltip); } - tooltipStack = null; + tooltipStack = ItemStack.EMPTY; tooltipEntry = tooltipEntity = false; GlStateManager.disableBlend(); mouseDownLastTick = Mouse.isButtonDown(0); From a25be332a1ed5d7da9880847934090b1d0b612ef Mon Sep 17 00:00:00 2001 From: Hubry Date: Sun, 8 Dec 2019 18:42:47 +0100 Subject: [PATCH 26/34] Fix #3026 exception on equipping Botania baubles over cap-only baubles --- .../botania/common/item/equipment/bauble/ItemBauble.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 9946f3326..0140cafaf 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -12,6 +12,7 @@ package vazkii.botania.common.item.equipment.bauble; import baubles.api.BaublesApi; import baubles.api.IBauble; +import baubles.api.cap.BaublesCapabilities; import baubles.api.cap.IBaublesItemHandler; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; @@ -99,7 +100,8 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt for(int i = 0; i < baubles.getSlots(); i++) { if(baubles.isItemValidForSlot(i, toEquip, player)) { ItemStack stackInSlot = baubles.getStackInSlot(i); - if(stackInSlot.isEmpty() || ((IBauble) stackInSlot.getItem()).canUnequip(stackInSlot, player)) { + IBauble baubleInSlot = stackInSlot.getCapability(BaublesCapabilities.CAPABILITY_ITEM_BAUBLE, null); + if(stackInSlot.isEmpty() || baubleInSlot == null || baubleInSlot.canUnequip(stackInSlot, player)) { // If toEquip and stackInSlot are stacks with equal value but not identity, ItemStackHandler.setStackInSlot actually does nothing >.> // Prevent it from trying to be overly smart by going through empty first baubles.setStackInSlot(i, ItemStack.EMPTY); @@ -112,7 +114,9 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt PlayerHelper.grantCriterion((EntityPlayerMP) player, new ResourceLocation(LibMisc.MOD_ID, "main/bauble_wear"), "code_triggered"); if(!stackInSlot.isEmpty()) { - ((IBauble) stackInSlot.getItem()).onUnequipped(stackInSlot, player); + if(baubleInSlot != null) { + baubleInSlot.onUnequipped(stackInSlot, player); + } if(stack.isEmpty()) { return ActionResult.newResult(EnumActionResult.SUCCESS, stackInSlot); From 346581e23dc00fd16c650cc1d531c21bbc8e5f8f Mon Sep 17 00:00:00 2001 From: Hubry Date: Sun, 8 Dec 2019 19:50:19 +0100 Subject: [PATCH 27/34] Fix lexicon share crashing if you don't have the lexicon in main hand --- .../java/vazkii/botania/common/item/ItemLexicon.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index fa9450594..5e81d36df 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -192,12 +192,16 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int idk, boolean something) { + public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean selected) { int ticks = getQueueTicks(stack); if(ticks > 0 && entity instanceof EntityPlayer) { skipSound = ticks < 5; - if(ticks == 1) - onItemRightClick(world, (EntityPlayer) entity, EnumHand.MAIN_HAND); + if(ticks == 1) { + if(selected) + onItemRightClick(world, (EntityPlayer) entity, EnumHand.MAIN_HAND); + else if(stack == ((EntityPlayer) entity).getHeldItemOffhand()) + onItemRightClick(world, (EntityPlayer) entity, EnumHand.OFF_HAND); + } setQueueTicks(stack, ticks - 1); } From ca767924f99a35709a1cb40b78ac632af9c3b945 Mon Sep 17 00:00:00 2001 From: nekosune Date: Sun, 8 Dec 2019 16:11:07 -0500 Subject: [PATCH 28/34] Added Quartz blocks to OreDict Added Quartz blocks to OreDict --- .../botania/common/block/ModFluffBlocks.java | 33 +++++++++++++++++++ .../vazkii/botania/common/lib/LibOreDict.java | 15 +++++++++ 2 files changed, 48 insertions(+) diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index ec9ffc95d..6cb3e2e8c 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -14,13 +14,16 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.registries.IForgeRegistry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; +import vazkii.botania.api.state.enums.QuartzVariant; import vazkii.botania.common.block.decor.BlockPavement; import vazkii.botania.common.block.decor.biomestone.BlockBiomeStoneA; import vazkii.botania.common.block.decor.biomestone.BlockBiomeStoneB; @@ -61,6 +64,7 @@ import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import vazkii.botania.common.lib.LibOreDict; import java.util.ArrayList; import java.util.List; @@ -348,6 +352,35 @@ public final class ModFluffBlocks { r.register(new ItemBlockMod(managlassPane).setRegistryName(managlassPane.getRegistryName())); r.register(new ItemBlockMod(alfglassPane).setRegistryName(alfglassPane.getRegistryName())); r.register(new ItemBlockMod(bifrostPane).setRegistryName(bifrostPane.getRegistryName())); + registerOreDictionary(); + } + + private static void registerOreDictionary() { + Block[] quartzBlocks=new Block[] { + darkQuartz, manaQuartz, blazeQuartz, lavenderQuartz, + redQuartz, elfQuartz, sunnyQuartz + }; + + for(int i = 0; i < 7; i++) { + for(int j=0;j< QuartzVariant.values().length;j++) { + OreDictionary.registerOre(LibOreDict.QUARTZ_BLOCKS[i], new ItemStack(quartzBlocks[i],1,j)); + } + } + + Block[] quartzSlabs=new Block[] { + darkQuartzSlab, manaQuartzSlab, blazeQuartzSlab, lavenderQuartzSlab, + redQuartzSlab, elfQuartzSlab, sunnyQuartzSlab, + }; + + for(int i = 0; i < 7; i++) + OreDictionary.registerOre(LibOreDict.QUARTZ_SLABS[i], quartzSlabs[i]); + + Block[] quartzStairs = new Block[] { + darkQuartzStairs, manaQuartzStairs, blazeQuartzStairs, lavenderQuartzStairs, + redQuartzStairs, elfQuartzStairs, sunnyQuartzStairs + }; + for(int i = 0; i < 7; i++) + OreDictionary.registerOre(LibOreDict.QUARTZ_STAIRS[i], quartzStairs[i]); } } diff --git a/src/main/java/vazkii/botania/common/lib/LibOreDict.java b/src/main/java/vazkii/botania/common/lib/LibOreDict.java index 0003909eb..3a86a768d 100644 --- a/src/main/java/vazkii/botania/common/lib/LibOreDict.java +++ b/src/main/java/vazkii/botania/common/lib/LibOreDict.java @@ -89,4 +89,19 @@ public final class LibOreDict { "quartzDark", "quartzMana", "quartzBlaze", "quartzLavender", "quartzRed", "quartzElven", "quartzSunny" }; + + public static final String[] QUARTZ_BLOCKS = new String[] { + "blockQuartzDark", "blockQuartzMana", "blockQuartzBlaze", + "blockQuartzLavender", "blockQuartzRed", "blockQuartzElven", "blockQuartzSunny" + }; + + public static final String[] QUARTZ_SLABS = new String[] { + "slabQuartzDark", "slabQuartzMana", "slabQuartzBlaze", + "slabQuartzLavender", "slabQuartzRed", "slabQuartzElven", "slabQuartzSunny" + }; + + public static final String[] QUARTZ_STAIRS = new String[] { + "stairQuartzDark", "stairQuartzMana", "stairQuartzBlaze", + "stairQuartzLavender", "stairQuartzRed", "stairQuartzElven", "stairQuartzSunny" + }; } From 5cd7b835bb07a5a994df15454114eb58d5e9c52b Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 17 Dec 2019 18:11:32 +0000 Subject: [PATCH 29/34] Update contributors.properties --- contributors.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contributors.properties b/contributors.properties index 01e5cf9bd..624e5be3f 100644 --- a/contributors.properties +++ b/contributors.properties @@ -261,3 +261,7 @@ dr_memerino=entropinnyum vtcobaltblood=manastar swampy4321=13 xquicscopex=15 +thisisivan=4 +sleepyember=6 +dorkydisco=10 +lyslev=11 From 4baccf84a3401498a5e8de6baea955bfdd15c1a9 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 18 Dec 2019 20:06:46 +0000 Subject: [PATCH 30/34] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index 624e5be3f..ca0e55e79 100644 --- a/contributors.properties +++ b/contributors.properties @@ -265,3 +265,4 @@ thisisivan=4 sleepyember=6 dorkydisco=10 lyslev=11 +zekiegee=2 From b0f31ec5ddb1c5b3654b7f20a4e17f4d8e062ef5 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 21 Dec 2019 18:15:27 +0000 Subject: [PATCH 31/34] Update contributors.properties --- contributors.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contributors.properties b/contributors.properties index ca0e55e79..4e51b23c9 100644 --- a/contributors.properties +++ b/contributors.properties @@ -266,3 +266,5 @@ sleepyember=6 dorkydisco=10 lyslev=11 zekiegee=2 +_inari=6 +hamelesshaliax=2 From 4a327fe3ea3d3eefed0d559a8612bf24e8eb3b8a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 22 Dec 2019 12:33:52 -0600 Subject: [PATCH 32/34] final 1.12 build --- build.properties | 4 ++-- version/1.12.2.txt | 2 +- web/changelog.txt | 9 +++++++++ web/versions.ini | 3 ++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/build.properties b/build.properties index 86f28171f..d3ba9eefd 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -#Mon Sep 09 22:18:15 CDT 2019 +#Sun Dec 22 12:32:24 CST 2019 mod_name=Botania cf_meta_version=1.12.2 forge_version=14.23.5.2768 @@ -7,5 +7,5 @@ dir_repo=./ mc_mappings=stable_39 version=r1.10 dir_output=../Build Output/Botania/ +build_number=364 mc_version=1.12.2 -build_number=363 diff --git a/version/1.12.2.txt b/version/1.12.2.txt index f59a4de95..4aaf2dc9a 100644 --- a/version/1.12.2.txt +++ b/version/1.12.2.txt @@ -1 +1 @@ -r1.10-362 \ No newline at end of file +r1.10-363 \ No newline at end of file diff --git a/web/changelog.txt b/web/changelog.txt index 62df55d5a..8fdfb3e3f 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,3 +1,12 @@ +r1.10 363 +This is the final release for Minecraft 1.12.x. Thanks for all the support! +* Diva Charm no longer brainwashes boss mobs +* Remove GregTech blacklist from Orechid since it's no longer necessary +* Fix Albedo compatibility (Hubry) +* Fix shedding page crash (Hubry) +* Fix error when equipping Botania baubles over other new Baubles (Hubry) +* Fix lexicon sharing crashing when in off hand (Hubry) +* Add Quartz blocks to Ore Dictionary (nekosune) r1.10 362 *When matching recipe tags, also match the first items of nested lists. (codewarrior0) *Fix magnet ring working in spectator mode diff --git a/web/versions.ini b/web/versions.ini index 1ad84fe7f..cda68540d 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -313,4 +313,5 @@ r1.10-358=1.12.2 r1.10-359=1.12.2 r1.10-360=1.12.2 r1.10-361=1.12.2 -r1.10-362=1.12.2 \ No newline at end of file +r1.10-362=1.12.2 +r1.10-363=1.12.2 \ No newline at end of file From 517e5139f552a81a9000a82d0af568fe7d9f1367 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 22 Dec 2019 12:40:07 -0600 Subject: [PATCH 33/34] Fix changelog --- web/changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/changelog.txt b/web/changelog.txt index 8fdfb3e3f..077ed06e8 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,5 +1,5 @@ r1.10 363 -This is the final release for Minecraft 1.12.x. Thanks for all the support! +* This is the final release for Minecraft 1.12.x. Thanks for all the support! * Diva Charm no longer brainwashes boss mobs * Remove GregTech blacklist from Orechid since it's no longer necessary * Fix Albedo compatibility (Hubry) From 7243d315673ebe21028072aab80881b1d1f4a768 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 22 Dec 2019 18:38:30 -0600 Subject: [PATCH 34/34] Create stale.yml --- .github/workflows/stale.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/stale.yml diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 000000000..25ec4dd48 --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,17 @@ +name: Mark stale issues and pull requests + +on: + schedule: + - cron: "0 0 * * *" + +jobs: + stale: + + runs-on: ubuntu-latest + + steps: + - uses: actions/stale@v1 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + stale-issue-message: 'This issue is stale because it has been open for a while with no activity. Remove stale label or comment or this will be closed soon.' + stale-pr-message: 'This PR is stale because it has been open for a while with no activity. Remove stale label or comment or this will be closed soon.'