From 8bf062cc1960669c2a598943eaff006366a7e356 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 16 Dec 2015 18:44:23 +0000 Subject: [PATCH 01/23] Fixed Resolute Ivy not working. Closes #1657 --- .../vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java index 5bd1fcfab..6b60ef83b 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java @@ -30,7 +30,7 @@ public class KeepIvyRecipe implements IRecipe { if(stack != null) { if(stack.getItem() == ModItems.keepIvy) foundIvy = true; - else if(!foundItem && !(ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, ItemKeepIvy.TAG_KEEP, false)) && stack.getItem().hasContainerItem(stack)) + else if(!foundItem && !(ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, ItemKeepIvy.TAG_KEEP, false)) && !stack.getItem().hasContainerItem(stack)) foundItem = true; else return false; } From ab1d938abe768dc84146cb7157cb5e88a6659519 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 16 Dec 2015 18:51:15 +0000 Subject: [PATCH 02/23] Added a fallback for LexiconRecipeMappings.stackToString(). Closes #1659 --- .../java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java | 3 +++ src/main/java/vazkii/botania/api/package-info.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index f755b8300..8202a40a7 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -51,6 +51,9 @@ public final class LexiconRecipeMappings { } public static String stackToString(ItemStack stack) { + if(stack == null || stack.getItem() == null) + return "NULL"; + if(stack.hasTagCompound() && stack.getItem() instanceof IRecipeKeyProvider) return ((IRecipeKeyProvider) stack.getItem()).getKey(stack); diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index e75110aa7..41ba6ab53 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "73", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "74", provides = "BotaniaAPI") package vazkii.botania.api; import cpw.mods.fml.common.API; From 46d3ffc902ddc93d9e88351e33545217ebee7a99 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 16 Dec 2015 19:00:48 +0000 Subject: [PATCH 03/23] Hopperhocks now make poof effects --- .../subtile/functional/SubTileHopperhock.java | 15 ++++++++++----- .../subtile/functional/SubTileSpectranthemum.java | 8 ++++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 81386e0c8..f64fd02a7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -53,7 +53,7 @@ public class SubTileHopperhock extends SubTileFunctional { public void onUpdate() { super.onUpdate(); - if(redstoneSignal > 0 || supertile.getWorldObj().isRemote) + if(redstoneSignal > 0) return; boolean pulledAny = false; @@ -102,10 +102,15 @@ public class SubTileHopperhock extends SubTileFunctional { } if(invToPutItemIn != null) { - InventoryHelper.insertItemIntoInventory(invToPutItemIn, stack.copy(), sideToPutItemIn, -1); - invToPutItemIn.markDirty(); - item.setDead(); - pulledAny = true; + boolean remote = supertile.getWorldObj().isRemote; + if(!item.isDead && remote) + SubTileSpectranthemum.spawnExplosionParticles(item, 1); + else { + InventoryHelper.insertItemIntoInventory(invToPutItemIn, stack.copy(), sideToPutItemIn, -1); + invToPutItemIn.markDirty(); + item.setDead(); + pulledAny = true; + } } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index 733d35b97..7bc96f133 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -66,11 +66,11 @@ public class SubTileSpectranthemum extends SubTileFunctional { int cost = stack.stackSize * COST; if(mana >= cost) { - spawnExplosionParticles(item); + spawnExplosionParticles(item, 10); item.setPosition(bindX + 0.5, bindY + 1.5, bindZ + 0.5); item.getEntityData().setBoolean(TAG_TELEPORTED, true); item.motionX = item.motionY = item.motionZ = 0; - spawnExplosionParticles(item); + spawnExplosionParticles(item, 10); if(!supertile.getWorldObj().isRemote) { mana -= cost; did = true; @@ -84,8 +84,8 @@ public class SubTileSpectranthemum extends SubTileFunctional { } } - void spawnExplosionParticles(EntityItem item) { - for(int i = 0; i < 10; i++) { + public static void spawnExplosionParticles(EntityItem item, int p) { + for(int i = 0; i < p; i++) { double m = 0.01; double d0 = item.worldObj.rand.nextGaussian() * m; double d1 = item.worldObj.rand.nextGaussian() * m; From e5d25003741702da90f9cc78532b290bdc2c5328 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 16 Dec 2015 20:18:05 +0000 Subject: [PATCH 04/23] muh polish --- .../subtile/generating/SubTileEndoflame.java | 22 +++++++++----- .../generating/SubTileGourmaryllis.java | 29 ++++++++++++------ .../subtile/generating/SubTileSpectrolus.java | 30 ++++++++++++------- .../common/block/tile/TileEnderEye.java | 13 +++++--- .../common/block/tile/mana/TilePump.java | 2 ++ .../botania/common/item/ItemOpenBucket.java | 12 ++++---- 6 files changed, 71 insertions(+), 37 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 94095a2a8..03bb46cd5 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -39,7 +39,7 @@ public class SubTileEndoflame extends SubTileGenerating { if(linkedCollector != null) { if(burnTime == 0) { - if(mana < getMaxMana() && !supertile.getWorldObj().isRemote) { + if(mana < getMaxMana()) { boolean didSomething = false; List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); @@ -53,13 +53,19 @@ public class SubTileEndoflame extends SubTileGenerating { if(burnTime > 0 && stack.stackSize > 0) { this.burnTime = Math.min(FUEL_CAP, burnTime) / 2; - stack.stackSize--; - supertile.getWorldObj().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "botania:endoflame", 0.2F, 1F); + if(!supertile.getWorldObj().isRemote) { + stack.stackSize--; + supertile.getWorldObj().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "botania:endoflame", 0.2F, 1F); - if(stack.stackSize == 0) - item.setDead(); + if(stack.stackSize == 0) + item.setDead(); + + didSomething = true; + } else { + item.worldObj.spawnParticle("largesmoke", item.posX, item.posY + 0.1, item.posZ, 0.0D, 0.0D, 0.0D); + item.worldObj.spawnParticle("flame", item.posX, item.posY, item.posZ, 0.0D, 0.0D, 0.0D); + } - didSomething = true; break; } @@ -70,8 +76,8 @@ public class SubTileEndoflame extends SubTileGenerating { sync(); } } else { - if(supertile.getWorldObj().rand.nextInt(8) == 0) - Botania.proxy.wispFX(supertile.getWorldObj(), supertile.xCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.yCoord + 0.55 + Math.random() * 0.2 - 0.1, supertile.zCoord + 0.5, 0.7F, 0.05F, 0.05F, (float) Math.random() / 6, (float) -Math.random() / 60); + if(supertile.getWorldObj().rand.nextInt(10) == 0) + supertile.getWorldObj().spawnParticle("flame", supertile.xCoord + 0.4 + Math.random() * 0.2, supertile.yCoord + 0.65, supertile.zCoord + 0.4 + Math.random() * 0.2, 0.0D, 0.0D, 0.0D); burnTime--; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index 4842c85ff..7ac01a56e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.subtile.generating; import java.util.List; import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -42,21 +43,31 @@ public class SubTileGourmaryllis extends SubTileGenerating { sync(); } - if(!supertile.getWorldObj().isRemote) { - List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); - for(EntityItem item : items) { - ItemStack stack = item.getEntityItem(); - if(stack != null && stack.getItem() instanceof ItemFood && !item.isDead) { - if(cooldown == 0) { + boolean remote = supertile.getWorldObj().isRemote; + List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + for(EntityItem item : items) { + ItemStack stack = item.getEntityItem(); + if(stack != null && stack.getItem() instanceof ItemFood && !item.isDead) { + if(cooldown == 0) { + if(!remote) { int val = ((ItemFood) stack.getItem()).func_150905_g(stack); storedMana = val * val * 64; cooldown = val * 10; supertile.getWorldObj().playSoundEffect(supertile.xCoord, supertile.yCoord, supertile.zCoord, "random.eat", 0.2F, 0.5F + (float) Math.random() * 0.5F); sync(); - } - - item.setDead(); + } else + for(int i = 0; i < 10; i++) { + float m = 0.2F; + float mx = (float) (Math.random() - 0.5) * m; + float my = (float) (Math.random() - 0.5) * m; + float mz = (float) (Math.random() - 0.5) * m; + supertile.getWorldObj().spawnParticle("iconcrack_" + Item.getIdFromItem(stack.getItem()), item.posX, item.posY, item.posZ, mx, my, mz); + } + } + + if(!remote) + item.setDead(); } } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java index 4bdda5470..d85671bda 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java @@ -43,21 +43,31 @@ public class SubTileSpectrolus extends SubTileGenerating { public void onUpdate() { super.onUpdate(); - if(!supertile.getWorldObj().isRemote) { - Item wool = Item.getItemFromBlock(Blocks.wool); - List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); - for(EntityItem item : items) { - ItemStack stack = item.getEntityItem(); - if(stack != null && stack.getItem() == wool) { - int meta = stack.getItemDamage(); - if(meta == nextColor) { + boolean remote = supertile.getWorldObj().isRemote; + Item wool = Item.getItemFromBlock(Blocks.wool); + List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE + 1, supertile.zCoord + RANGE + 1)); + for(EntityItem item : items) { + ItemStack stack = item.getEntityItem(); + if(stack != null && stack.getItem() == wool) { + int meta = stack.getItemDamage(); + if(meta == nextColor) { + if(!remote) { mana = Math.min(getMaxMana(), mana + 300); nextColor = nextColor == 15 ? 0 : nextColor + 1; - sync(); } - item.setDead(); + + for(int i = 0; i < 10; i++) { + float m = 0.2F; + float mx = (float) (Math.random() - 0.5) * m; + float my = (float) (Math.random() - 0.5) * m; + float mz = (float) (Math.random() - 0.5) * m; + supertile.getWorldObj().spawnParticle("blockcrack_" + Item.getIdFromItem(stack.getItem()) + "_" + meta, item.posX, item.posY, item.posZ, mx, my, mz); + } } + + if(!remote) + item.setDead(); } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java index ac7de35cb..99be1db8b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -24,9 +24,6 @@ public class TileEnderEye extends TileMod { @Override public void updateEntity() { - if(worldObj.isRemote) - return; - int meta = getBlockMetadata(); int range = 80; List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(xCoord - range, yCoord - range, zCoord - range, xCoord + range, yCoord + range, zCoord + range)); @@ -45,8 +42,16 @@ public class TileEnderEye extends TileMod { } int newMeta = looking ? 15 : 0; - if(newMeta != meta) + if(newMeta != meta && !worldObj.isRemote) worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, newMeta, 1 | 2); + + if(looking) { + double x = xCoord - 0.1 + Math.random() * 1.2; + double y = yCoord - 0.1 + Math.random() * 1.2; + double z = zCoord - 0.1 + Math.random() * 1.2; + + worldObj.spawnParticle("reddust", x, y, z, 1, 0, 0); + } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 0f15e6304..e5adc8b70 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -51,6 +51,8 @@ public class TilePump extends TileMod { if(innerRingPos >= max) { innerRingPos = Math.min(max, innerRingPos); moving = 0F; + for(int x = 0; x < 2; x++) + worldObj.spawnParticle("explode", xCoord + Math.random(), yCoord + Math.random(), zCoord + Math.random(), 0, 0, 0); } } else if(innerRingPos > min) { innerRingPos -= incr * 2; diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index fecf05c4d..8acc06d90 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -15,6 +15,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import vazkii.botania.common.block.subtile.functional.SubTileSpectranthemum; import vazkii.botania.common.lib.LibItemNames; public class ItemOpenBucket extends ItemMod { @@ -45,13 +46,12 @@ public class ItemOpenBucket extends ItemMod { Material material = par2World.getBlock(i, j, k).getMaterial(); int l = par2World.getBlockMetadata(i, j, k); - if(material == Material.water && l == 0) { - par2World.setBlockToAir(i, j, k); - return par1ItemStack; - } - - if(material == Material.lava && l == 0) { + if((material == Material.lava || material == Material.water) && l == 0) { par2World.setBlockToAir(i, j, k); + + for(int x = 0; x < 5; x++) + par2World.spawnParticle("explode", i + Math.random(), j + Math.random(), k + Math.random(), 0, 0, 0); + return par1ItemStack; } } From fab5e0350ebe9d59b79215fb1468a1a982adb021 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 16 Dec 2015 21:10:55 +0000 Subject: [PATCH 05/23] Added a "Preventing Decay" entry to the Miscellaneous section. Something seems a bit off with it though. --- .../handler/PersistentVariableHelper.java | 5 +++ .../client/gui/lexicon/GuiLexiconIndex.java | 12 +++++-- .../gui/lexicon/button/GuiButtonDoot.java | 2 +- .../lexicon/button/GuiButtonInvisible.java | 30 +++++++++++++++++- .../botania/client/lib/LibResources.java | 1 + .../botania/common/lexicon/DLexiconEntry.java | 27 ++++++++++++++++ .../botania/common/lexicon/LexiconData.java | 4 +++ .../vazkii/botania/common/lib/LibLexicon.java | 1 + .../resources/assets/botania/lang/en_US.lang | 5 +++ .../assets/botania/textures/gui/dog.png | Bin 0 -> 16076 bytes 10 files changed, 83 insertions(+), 4 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/lexicon/DLexiconEntry.java create mode 100644 src/main/resources/assets/botania/textures/gui/dog.png diff --git a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java index f69676e76..3cceab243 100644 --- a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java +++ b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java @@ -27,6 +27,7 @@ import vazkii.botania.common.lib.LibMisc; public final class PersistentVariableHelper { private static final String TAG_FIRST_LOAD = "firstLoad"; + private static final String TAG_DOG = "dog"; private static final String TAG_BOOKMARK_COUNT = "bookmarkCount"; private static final String TAG_BOOKMARK_PREFIX = "bookmark"; private static final String TAG_BOOKMARKS = "bookmarks"; @@ -37,6 +38,7 @@ public final class PersistentVariableHelper { private static File cacheFile; public static boolean firstLoad = true; + public static boolean dog = true; public static String lastBotaniaVersion = ""; public static void save() throws IOException { @@ -68,6 +70,7 @@ public final class PersistentVariableHelper { cmp.setTag(TAG_LEXICON_NOTES, notesCmp); cmp.setBoolean(TAG_FIRST_LOAD, firstLoad); + cmp.setBoolean(TAG_DOG, dog); cmp.setString(TAG_LAST_BOTANIA_VERSION, lastBotaniaVersion); injectNBTToFile(cmp, getCacheFile()); @@ -109,6 +112,8 @@ public final class PersistentVariableHelper { firstLoad = cmp.hasKey(TAG_FIRST_LOAD) ? cmp.getBoolean(TAG_FIRST_LOAD) : firstLoad; if(firstLoad) lastBotaniaVersion = LibMisc.VERSION; + + dog = cmp.getBoolean(TAG_DOG); } public static void saveSafe() { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java index 691ba443c..6cdb15e7e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -36,6 +36,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.gui.lexicon.button.GuiButtonBack; import vazkii.botania.client.gui.lexicon.button.GuiButtonInvisible; import vazkii.botania.client.gui.lexicon.button.GuiButtonPage; +import vazkii.botania.common.lexicon.DLexiconEntry; public class GuiLexiconIndex extends GuiLexicon implements IParented { @@ -143,6 +144,9 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { button.displayStack = entry.getIcon(); if(entry == tutEntry) tutPage = page; + + if(entry instanceof DLexiconEntry) + button.dog = true; } else button.displayString = ""; } } @@ -287,8 +291,12 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { ClientTickHandler.notifyPageChange(); break; default : - int index = par1GuiButton.id + page * 12; - openEntry(index); + if(par1GuiButton instanceof GuiButtonInvisible && ((GuiButtonInvisible) par1GuiButton).dog) + ((GuiButtonInvisible) par1GuiButton).click(); + else { + int index = par1GuiButton.id + page * 12; + openEntry(index); + } } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java index 1b2646b9e..4995b4502 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java @@ -1,5 +1,5 @@ /** - * This class was created by . It's distributed as +* This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania * diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 5029bc516..cbfb7d609 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -15,28 +15,56 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.FontHelper; import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; +import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibMisc; public class GuiButtonInvisible extends GuiButtonLexicon { + private static final ResourceLocation dogResource = new ResourceLocation(LibResources.GUI_DOG); + GuiLexiconIndex gui; public ItemStack displayStack = null; + public boolean dog = false; float timeHover = 0; + + boolean enableDog = false; + double dogPos = 0; public GuiButtonInvisible(GuiLexiconIndex gui, int par1, int par2, int par3, int par4, int par5, String par6Str) { super(par1, par2, par3, par4, par5, par6Str); this.gui = gui; } - + + public void click() { + enableDog = true; + PersistentVariableHelper.dog = true; + PersistentVariableHelper.saveSafe(); + } @Override public void drawButton(Minecraft par1Minecraft, int par2, int par3) { + if(enableDog) { + dogPos += ClientTickHandler.delta * 10; + + par1Minecraft.renderEngine.bindTexture(dogResource); + float f = 1F / 64F; + GL11.glTranslated(dogPos, 0, 0); + GL11.glColor4f(1F, 1F, 1F, 1F); + vazkii.botania.client.core.helper.RenderHelper.drawTexturedModalRect(0, yPosition, zLevel + 10, (dogPos % 100 < 50) ? 23 : 0, 0, 23, 19, f, f); + xPosition = (int) Math.max(xPosition, dogPos + 10); + + GL11.glTranslated(-dogPos, 0, 0); + } + field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(field_146123_n); boolean showStack = displayStack != null && !displayString.isEmpty(); diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index b6237a71c..2efb93c42 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -47,6 +47,7 @@ public final class LibResources { public static final String GUI_BAUBLE_BOX = PREFIX_GUI + "baubleBox.png"; public static final String GUI_HUD_ICONS = PREFIX_GUI + "hudIcons.png"; public static final String GUI_STENCIL = PREFIX_GUI + "stencil.png"; + public static final String GUI_DOG = PREFIX_GUI + "dog.png"; public static final String ENTRY_FLOWERS = PREFIX_ENTRIES + "flowers.png"; public static final String ENTRY_APOTHECARY = PREFIX_ENTRIES + "apothecary.png"; diff --git a/src/main/java/vazkii/botania/common/lexicon/DLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/DLexiconEntry.java new file mode 100644 index 000000000..00a0fc499 --- /dev/null +++ b/src/main/java/vazkii/botania/common/lexicon/DLexiconEntry.java @@ -0,0 +1,27 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [16/12/2015, 20:38:33 (GMT)] + */ +package vazkii.botania.common.lexicon; + +import vazkii.botania.api.lexicon.LexiconCategory; +import vazkii.botania.client.core.handler.PersistentVariableHelper; + +public class DLexiconEntry extends BLexiconEntry { + + public DLexiconEntry(String unlocalizedName, LexiconCategory category) { + super(unlocalizedName, category); + } + + @Override + public boolean isVisible() { + return !PersistentVariableHelper.dog; + } + +} diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 6ecb7f040..302e27625 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -287,6 +287,7 @@ public final class LexiconData { public static LexiconEntry challenges; public static LexiconEntry cacophonium; public static LexiconEntry pavement; + public static LexiconEntry preventingDecay; public static LexiconEntry tcIntegration; public static LexiconEntry bcIntegration; @@ -1081,6 +1082,9 @@ public final class LexiconData { pavement = new BLexiconEntry(LibLexicon.MISC_PAVEMENT, categoryMisc); pavement.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesPavement)); + preventingDecay = new DLexiconEntry(LibLexicon.MISC_PRENTING_DECAY, categoryMisc); + preventingDecay.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Blocks.deadbush)); + if(Botania.bcTriggersLoaded) { bcIntegration = new CLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc, "BuildCraft"); bcIntegration.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Items.redstone)); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index fc884c301..a02891387 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -258,6 +258,7 @@ public final class LibLexicon { public static final String MISC_CHALLENGES = "challenges"; public static final String MISC_CACOPHONIUM = "cacophonium"; public static final String MISC_PAVEMENT = "pavement"; + public static final String MISC_PRENTING_DECAY = "preventingDecay"; public static final String MISC_TC_INTEGRATION = "tcIntegration"; public static final String MISC_BC_INTEGRATION = "bcIntegration"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 412f39978..5ddcfc233 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3840,3 +3840,8 @@ botania.entry.banners=Banner Additions botania.tagline.banners=Lots of new banner patterns botania.page.banners0=In the presence of the &1Banners&0 from the future, &1Botania&0 adds &415&0 new icons to them, which can be mixed and matched with the original patterns and icons.
The following items can be used alongside a dye in the crafting grid to add an icon to a &1Banner&0: &1All Iron Tools&0, &1Spark Augments&0, &1Raw Fish&0, &1Livingwood and Dreamwood Twigs&0, &1Lexica Botania&0, &1Terrasteel&0 and the &1Tiny Potato&0. botania.page.banners1=Showcase of the various banners + +# -- PREVNTING DECAY +botania.entry.preventingDecay=Preventing Decay +botania.tagline.preventingDecay=Preventing passive flowers' decay +botania.entry.preventingDecay0=no diff --git a/src/main/resources/assets/botania/textures/gui/dog.png b/src/main/resources/assets/botania/textures/gui/dog.png new file mode 100644 index 0000000000000000000000000000000000000000..3d99571b6c5d150f2b543b4b077ff89991b62b7b GIT binary patch literal 16076 zcmeI3dsGuw9><554@50m1+}Xof?7+MyhG9u#6%@(6nQM5f((-hj3$|w1e0JvAxFDd zJx6U(E2UbM`ar9$$F?qu#VS2+*XOG1tLmb*ZeW*(qBgW#MSmYL3N98Av06AkJ%eUf#$5_~-4r-$pkyq@<*$ z-W`26azyxunugMk%hr^ASVkXFf+Jrx2sjPz(rq*mtqd5(7xLe!`=;S!Lqmfl`||n5 zzf_iq8#d2RN&gyjEH5iNHX-J4JWw|c2ntdcyR=FDgM#p|pdfd0>Jm>ofNn2IUMm9q zV9e0j+J#fVm>{>UG>MpFD4tqT{z*+uO*uZjG2H;pBvnegnc){RF|ualDD{zA-^=#2x4ka0jUo zHCLT*JaFaqFe3{j>k(_AZ@;~)2bqPw%PX+iAPu?N)W zG9Il;*>i4iQ*QXMb@khtwkTqVlml}!G0=I?WU-Y|d5pWk~v zX2rf$E2bAurz$V+d41RBT`$w$-gUDke9!J3Pm`LL{~TSNp7T~hQhnyLX<@@7|30!Y z^7`hJRl=&H;<~(}7xF8<53W@-&##KVKI!eurHlIF(|$KzQV@9}tf3-lhTE}XeptzfGp|QQki&+B=Y)$yOJ;xP4*pzoW5lq+hngzwq490iBNHDy3S0Bxi$h1xYBwz{KKiu0<~_~u zFXEnl9&3AAUl~<9YyaZxI;#Hrm8PnhQtIl$Kbl$x)mFDU>K@ALP-C0hEq}LkG?_TA z^qod+bK1Q#(OX^=mHutYgBjEIN9Vq9l$_C3&2zL|yp?uz*=_75esFy27UJk@F4v=? zm-C)FB2?lM;fv?@o6B385<^O>pIvx%_Ho-XWFRtF{A|PH90XAeC)2a+S-P1DoHE5> zdMclYbDAvl#zK^dP78)FBJ7-eqJT6fa9irW;&MoR0yk5l28$E@eHvqO5i5Z6LPY2DI7IrB{-5e zDG%pMWgMA2P9TxV#Ijh9kS~y+d=V<*^MoRWn6D5EIqe5m6$)BPtKOhU)l6-l4p<4? zLc86fKv9Ro5$6!aQPu)fAeYNgz7Q1(d0+(3<}%wcC(mpf>kZNoM?=_fD`~Nll$k@v z#qy~ldjgkBPtU_%w+0OX|qpR0?wrU%6gp8 zmhQ3;Xewc&imW&>WeH)nkL~Fs^mu0+OOe&+;iJbsH5&(CXUf*eTD%)jb_vL&w1m5_5^4{lg6cXlM^4%N7 zGoW|9jWXCBn3YH>0Lk$xyU-i8s|*gWMCrP0B>x9%V8fRDcPsE}8|wdk1$?=S7h>iD zLa#zQ(zc`H)fUaWlwJ2z#~$sz|CD-MVW6xg%&sC$SOI}r%mqr+*Xf&6>8m_y%1Bvt zl%7z50@G7>k1Fs_A;tSgL8YPWoM{+o26v1Y{|J6V{6f&TF$E|uAm1_1wg$6y>x0K< z(PhF|W&vxS07sUKSSw zgxO?qG4p}EEG`HLv&rIO<^y?ITo4dulf}i%2lBGGARx>pi;I~L}823j)GyvbdP}KwcIX1ccdSaWV6OyeuvV2(!uJ zV&(&RSzHhhW|PIm%m?zaxF8_RCX0)i59DQWK|q*I78f%g$jjn_fH0dZE@nQEm&FAE zVK!M@%zPj(iwgq6Y_hnR`9NM47X*aaWW*Kfd)bpPgEu@K;8o7j#;DccHBb(ooT@{R z;ur*3?naQOZQ%Du1S#Sp$o)L<2I(dQiJ;amXq<{50byEAQo8fnzcw5jbet2WzO$;W zjc7@oustd!=AFAB_zsnuN7vpP zH2)pb$bqdB`>eSbFsZ)&BfE6&kCjW;&iP_Ar+jhVk(Xy~tqfc$3%wzKRCgs;x^*B| zuROVXj4kh{doerXUPdNezVzh$`m_b{{A<(S7{6&=t|)kM%W>lk5^0S~yDTZdzNuaN zAmHNdqC@62Pp(#<+Wqx|Wtui=-(U_B&~FkF_}X%$d$Xmn0BKg(HY#pL%%k6>)lQkE K`D}7t`F{ZTauQzv literal 0 HcmV?d00001 From dd4d25f1d0ee994a61e745b688a7ba8db5e2f8d6 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 16 Dec 2015 21:25:00 +0000 Subject: [PATCH 06/23] Build 244 --- build.properties | 8 ++++---- version/1.7.10.txt | 2 +- web/changelog.txt | 8 ++++++++ web/versions.ini | 3 ++- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/build.properties b/build.properties index 58b4cd9c1..638a436d0 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Sun Dec 13 01:59:42 GMT 2015 +#Wed Dec 16 21:18:51 GMT 2015 version=r1.8 dir_output=../Build Output/Botania/ -dir_repo=./ -forge_version=10.13.2.1291 mc_version=1.7.10 -build_number=244 +forge_version=10.13.2.1291 +dir_repo=./ +build_number=245 mod_name=Botania diff --git a/version/1.7.10.txt b/version/1.7.10.txt index 77601fc9d..cbfbed75a 100644 --- a/version/1.7.10.txt +++ b/version/1.7.10.txt @@ -1 +1 @@ -r1.8-243 \ No newline at end of file +r1.8-244 \ No newline at end of file diff --git a/web/changelog.txt b/web/changelog.txt index 6ad0764c3..eba8328e8 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,3 +1,11 @@ +r1.8 244 +*Added a "Preventing Decay" entry to the Miscellaneous section. Something seems a bit off with it though. +*Fixed a crash with NEI when some mods think it's a good idea to use stacks without a valid item. +*Fixed Resolute Ivy not working. +*Fixed the Ring of Chordata stopping the player from drowning if they have no mana. (howtonotwin) +*Polished a few things all with completely inconsequential particle effects.
  • Hopperhock makes smoke
  • Extrapolated Bucket makes smoke
  • Mana Pump makes smoke
  • Endoflame makes fire and smoke
  • Gourmaryllismakes food bits go all over the place
  • Spectrolus makes wool bits go all over the place
  • Ender Overseer has redstone particles when looked at
+*[API] Added a fallback for LexiconRecipeMappings.stackToString(). +*[API] Increased version number to 74 r1.8 243 *Added NEI integration for the Lexica Botania, it sometiles also tells you which entry something is in and gives you little tidbits of info like how to make livingwood/livingrock or terrasteel. *Added recipe indicators (the items that appear when you hover shift on an entry's name) to a few entries that don't have direct recipes. (like pure daisy or ender air) diff --git a/web/versions.ini b/web/versions.ini index 5581ec57e..9c1ac7cf3 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -240,4 +240,5 @@ r1.8-239=1.7.10 r1.8-240=1.7.10 r1.8-241=1.7.10 r1.8-242=1.7.10 -r1.8-243=1.7.10 \ No newline at end of file +r1.8-243=1.7.10 +r1.8-244=1.7.10 \ No newline at end of file From 1b32fc827d7acff48427fc55dcb188f4fe2fc3f0 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 16 Dec 2015 21:25:57 +0000 Subject: [PATCH 07/23] no --- src/main/resources/assets/botania/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 5ddcfc233..a7b80078f 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3844,4 +3844,4 @@ botania.page.banners1=Showcase of the various banners # -- PREVNTING DECAY botania.entry.preventingDecay=Preventing Decay botania.tagline.preventingDecay=Preventing passive flowers' decay -botania.entry.preventingDecay0=no +botania.page.preventingDecay0=no From ac5a0815faca926f9e0c79682153c0f5c6f52f0f Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 18 Dec 2015 04:54:56 +0000 Subject: [PATCH 08/23] Skybox effect. VERY WIP --- .../client/core/proxy/ClientProxy.java | 6 +- .../botania/client/lib/LibResources.java | 2 + .../render/world/SkyblockRenderEvents.java | 30 +++ .../render/world/SkyblockSkyRenderer.java | 219 ++++++++++++++++++ .../common/core/proxy/CommonProxy.java | 4 + .../botania/common/lib/LibObfuscation.java | 5 + .../common/world/SkyblockWorldEvents.java | 7 +- .../common/world/WorldTypeSkyblock.java | 5 +- .../assets/botania/textures/gui/flowey.png | Bin 0 -> 16071 bytes .../assets/botania/textures/misc/skybox.png | Bin 0 -> 18561 bytes 10 files changed, 273 insertions(+), 5 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java create mode 100644 src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java create mode 100644 src/main/resources/assets/botania/textures/gui/flowey.png create mode 100644 src/main/resources/assets/botania/textures/misc/skybox.png 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 0372364a3..28aad3046 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -122,6 +122,8 @@ import vazkii.botania.client.render.tile.RenderTileStarfield; import vazkii.botania.client.render.tile.RenderTileTerraPlate; import vazkii.botania.client.render.tile.RenderTileTeruTeruBozu; import vazkii.botania.client.render.tile.RenderTileTinyPotato; +import vazkii.botania.client.render.world.SkyblockRenderEvents; +import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.block.tile.TileAltar; @@ -219,7 +221,9 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(new SubTileRadiusRenderHandler()); MinecraftForge.EVENT_BUS.register(new MultiblockRenderHandler()); FMLCommonHandler.instance().bus().register(new CorporeaAutoCompleteHandler()); - + + if(Botania.gardenOfGlassLoaded) + MinecraftForge.EVENT_BUS.register(new SkyblockRenderEvents()); if(ConfigHandler.useAdaptativeConfig) FMLCommonHandler.instance().bus().register(new AdaptorNotifier()); if(ConfigHandler.versionCheckEnabled) diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 2efb93c42..20ace2246 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -48,6 +48,7 @@ public final class LibResources { public static final String GUI_HUD_ICONS = PREFIX_GUI + "hudIcons.png"; public static final String GUI_STENCIL = PREFIX_GUI + "stencil.png"; public static final String GUI_DOG = PREFIX_GUI + "dog.png"; + public static final String GUI_FLOWEY = PREFIX_GUI + "flowey.png"; public static final String ENTRY_FLOWERS = PREFIX_ENTRIES + "flowers.png"; public static final String ENTRY_APOTHECARY = PREFIX_ENTRIES + "apothecary.png"; @@ -145,6 +146,7 @@ public final class LibResources { public static final String MISC_GLOW_GREEN = PREFIX_MISC + "glow0.png"; public static final String MISC_GLOW_CYAN = PREFIX_MISC + "glow1.png"; public static final String MISC_BABYLON = PREFIX_MISC + "babylon.png"; + public static final String MISC_SKYBOX = PREFIX_MISC + "skybox.png"; public static final String OBJ_MODEL_PYLON = PREFIX_OBJ_MODEL + "pylon.obj"; diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java new file mode 100644 index 000000000..93da99337 --- /dev/null +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java @@ -0,0 +1,30 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [18/12/2015, 02:19:53 (GMT)] + */ +package vazkii.botania.client.render.world; + +import net.minecraft.client.Minecraft; +import net.minecraft.world.World; +import net.minecraftforge.client.event.RenderWorldLastEvent; +import vazkii.botania.common.world.WorldTypeSkyblock; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + +public final class SkyblockRenderEvents { + + @SubscribeEvent + public void onRender(RenderWorldLastEvent event) { + World world = Minecraft.getMinecraft().theWorld; + if(world.provider.dimensionId == 0 && WorldTypeSkyblock.isWorldSkyblock(Minecraft.getMinecraft().theWorld)) { + if(!(world.provider.getSkyRenderer() instanceof SkyblockSkyRenderer)) + world.provider.setSkyRenderer(new SkyblockSkyRenderer()); + } + } + +} diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java new file mode 100644 index 000000000..8e7c7b9e4 --- /dev/null +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -0,0 +1,219 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [18/12/2015, 02:06:56 (GMT)] + */ +package vazkii.botania.client.render.world; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderGlobal; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Vec3; +import net.minecraftforge.client.IRenderHandler; + +import org.lwjgl.opengl.GL11; + +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.lib.LibObfuscation; +import cpw.mods.fml.relauncher.ReflectionHelper; + +public class SkyblockSkyRenderer extends IRenderHandler { + + private static final ResourceLocation textureFlowey = new ResourceLocation(LibResources.GUI_FLOWEY); + private static final ResourceLocation textureSkybox = new ResourceLocation(LibResources.MISC_SKYBOX); + private static final ResourceLocation locationMoonPhases = new ResourceLocation("textures/environment/moon_phases.png"); + private static final ResourceLocation locationSun = new ResourceLocation("textures/environment/sun.png"); + + @Override + public void render(float partialTicks, WorldClient world, Minecraft mc) { + int glSkyList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST); + int glSkyList2 = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST2); + + GL11.glDisable(GL11.GL_TEXTURE_2D); + Vec3 vec3 = world.getSkyColor(mc.renderViewEntity, partialTicks); + float f1 = (float)vec3.xCoord; + float f2 = (float)vec3.yCoord; + float f3 = (float)vec3.zCoord; + float f6; + + GL11.glColor3f(f1, f2, f3); + Tessellator tessellator1 = Tessellator.instance; + GL11.glDepthMask(false); + GL11.glEnable(GL11.GL_FOG); + GL11.glColor3f(f1, f2, f3); + GL11.glCallList(glSkyList); + GL11.glDisable(GL11.GL_FOG); + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_BLEND); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + RenderHelper.disableStandardItemLighting(); + float[] afloat = world.provider.calcSunriseSunsetColors(world.getCelestialAngle(partialTicks), partialTicks); + float f7; + float f8; + float f9; + float f10; + + // === Sunset + if(afloat != null) { + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glShadeModel(GL11.GL_SMOOTH); + GL11.glPushMatrix(); + GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(MathHelper.sin(world.getCelestialAngleRadians(partialTicks)) < 0.0F ? 180.0F : 0.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); + f6 = afloat[0]; + f7 = afloat[1]; + f8 = afloat[2]; + float f11; + + tessellator1.startDrawing(6); + tessellator1.setColorRGBA_F(f6, f7, f8, afloat[3]); + tessellator1.addVertex(0.0D, 100.0D, 0.0D); + byte b0 = 16; + tessellator1.setColorRGBA_F(afloat[0], afloat[1], afloat[2], 0.0F); + + for(int j = 0; j <= b0; ++j) { + f11 = (float)j * (float)Math.PI * 2.0F / (float)b0; + float f12 = MathHelper.sin(f11); + float f13 = MathHelper.cos(f11); + tessellator1.addVertex((double)(f12 * 120.0F), (double)(f13 * 120.0F), (double)(-f13 * 40.0F * afloat[3])); + } + + tessellator1.draw(); + GL11.glPopMatrix(); + GL11.glShadeModel(GL11.GL_FLAT); + } + + GL11.glEnable(GL11.GL_TEXTURE_2D); + OpenGlHelper.glBlendFunc(770, 1, 1, 0); + GL11.glPushMatrix(); + f6 = 1.0F - world.getRainStrength(partialTicks); + f7 = 0.0F; + f8 = 0.0F; + f9 = 0.0F; + + GL11.glColor4f(1.0F, 1.0F, 1.0F, f6); + GL11.glTranslatef(f7, f8, f9); + GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); + + // === Ray / Planets + mc.renderEngine.bindTexture(textureSkybox); + + // TODO: Very WIP, needs tweaking so it doesn't vanish when the sun rises + float a = Math.max(0F, world.getCelestialAngle(partialTicks) - 0.2F); + if(a > 0) { + f10 = 20F; + GL11.glPushMatrix(); + OpenGlHelper.glBlendFunc(770, 1, 1, 0); + GL11.glTranslatef(0F, -1F, 0F); + GL11.glColor4f(1F, 1F, 1F, a); + GL11.glRotatef(220F, 1F, 0F, 0F); + int angles = 1440; + float s = 3F; + float m = 1F; + float y = 2F; + float y0 = 0F; + float uPer = 1F / 360F; + float anglePer = 360F / angles; + double fuzzPer = (Math.PI * 10) / angles; + float rotSpeed = 1F; + + for(int p = 0; p < 3; p++) { + float baseAngle = rotSpeed * (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks); + GL11.glRotatef((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.25F * rotSpeed, 0F, 1F, 0F); + + tessellator1.startDrawingQuads(); + for(int i = 0; i < angles; i++) { + float ang = i * anglePer + baseAngle; + double xp = Math.cos(ang * Math.PI / 180F) * f10; + double zp = Math.sin(ang * Math.PI / 180F) * f10; + double yo = Math.sin(fuzzPer * i) * 1; + + float ut = ang * uPer; + tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); + tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); + + ang = (i + 1) * anglePer + baseAngle; + xp = Math.cos(ang * Math.PI / 180F) * f10; + zp = Math.sin(ang * Math.PI / 180F) * f10; + ut = ang * uPer; + + + tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); + tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); + } + tessellator1.draw(); + + switch(p) { + case 0: + GL11.glRotatef(20F, 1F, 0F, 0F); + GL11.glColor4f(1F, 0.4F, 0.4F, a); + fuzzPer = (Math.PI * 20) / angles; + rotSpeed = 0.2F; + break; + case 1: + GL11.glRotatef(50F, 1F, 0F, 0F); + GL11.glColor4f(0.4F, 1F, 0.4F, a); + fuzzPer = (Math.PI * 6) / angles; + rotSpeed = 2F; + break; + } + } + + GL11.glPopMatrix(); + } + + GL11.glColor4f(1F, 1F, 1F, 1F); + + // === Sun + GL11.glRotatef(world.getCelestialAngle(partialTicks) * 360.0F, 1.0F, 0.0F, 0.0F); + f10 = 60.0F; + mc.renderEngine.bindTexture(locationSun); + tessellator1.startDrawingQuads(); + tessellator1.addVertexWithUV((double)(-f10), 100.0D, (double)(-f10), 0.0D, 0.0D); + tessellator1.addVertexWithUV((double)f10, 100.0D, (double)(-f10), 1.0D, 0.0D); + tessellator1.addVertexWithUV((double)f10, 100.0D, (double)f10, 1.0D, 1.0D); + tessellator1.addVertexWithUV((double)(-f10), 100.0D, (double)f10, 0.0D, 1.0D); + tessellator1.draw(); + + // === Moon + f10 = 60.0F; + mc.renderEngine.bindTexture(locationMoonPhases); + int k = world.getMoonPhase(); + int l = k % 4; + int i1 = k / 4 % 2; + float f14 = (float)(l + 0) / 4.0F; + float f15 = (float)(i1 + 0) / 2.0F; + float f16 = (float)(l + 1) / 4.0F; + float f17 = (float)(i1 + 1) / 2.0F; + tessellator1.startDrawingQuads(); + tessellator1.addVertexWithUV((double)(-f10), -100.0D, (double)f10, (double)f16, (double)f17); + tessellator1.addVertexWithUV((double)f10, -100.0D, (double)f10, (double)f14, (double)f17); + tessellator1.addVertexWithUV((double)f10, -100.0D, (double)(-f10), (double)f14, (double)f15); + tessellator1.addVertexWithUV((double)(-f10), -100.0D, (double)(-f10), (double)f16, (double)f15); + tessellator1.draw(); + GL11.glDisable(GL11.GL_TEXTURE_2D); + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_FOG); + GL11.glPopMatrix(); + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glColor3f(0.0F, 0.0F, 0.0F); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glDepthMask(true); + } + +} diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 168c2c272..b2064e264 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -66,6 +66,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.GuiHandler; +import vazkii.botania.common.world.SkyblockWorldEvents; import vazkii.botania.common.world.WorldTypeSkyblock; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; @@ -123,6 +124,9 @@ public class CommonProxy { MinecraftForge.EVENT_BUS.register(new SpawnerChangingHandler()); MinecraftForge.EVENT_BUS.register(new SubTileNarslimmus.SpawnIntercepter()); MinecraftForge.EVENT_BUS.register(TileCorporeaIndex.getInputHandler()); + + if(Botania.gardenOfGlassLoaded) + MinecraftForge.EVENT_BUS.register(new SkyblockWorldEvents()); FMLCommonHandler.instance().bus().register(new CommonTickHandler()); diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index c1c9209fb..c10f3dd94 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -82,4 +82,9 @@ public final class LibObfuscation { // TextureAtlasSprite public static final String[] ANIMATION_METADATA = new String[] { "animationMetadata", "field_110982_k", "j" }; + + // RenderGloba + public static final String[] GL_SKY_LIST = new String[] { "glSkyList", "field_72771_w", "G" }; + public static final String[] GL_SKY_LIST2 = new String[] { "glSkyList2", "field_72781_x", "H" }; + } diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 37a91fcf6..e7e4ced9e 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -14,6 +14,7 @@ import java.awt.Color; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; @@ -23,15 +24,19 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import net.minecraftforge.client.event.RenderWorldEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; +import vazkii.botania.client.render.world.SkyblockSkyRenderer; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public final class SkyblockWorldEvents { @@ -117,7 +122,7 @@ public final class SkyblockWorldEvents { } } } - + public static void spawnPlayer(EntityPlayer player, int x, int y, int z, boolean fabricated) { NBTTagCompound data = player.getEntityData(); if(!data.hasKey(EntityPlayer.PERSISTED_NBT_TAG)) diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index 138d0602e..98d7f4ee5 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -20,7 +20,6 @@ public class WorldTypeSkyblock extends WorldType { public WorldTypeSkyblock() { super("botania-skyblock"); - MinecraftForge.EVENT_BUS.register(new SkyblockWorldEvents()); } public static boolean isWorldSkyblock(World world) { @@ -51,10 +50,10 @@ public class WorldTypeSkyblock extends WorldType { public float getCloudHeight() { return 260f; } - + @Override public IChunkProvider getChunkGenerator(World world, String generatorOptions) { return new ChunkProviderFlat(world, world.getSeed(), false, "2;1x0;"); } - + } diff --git a/src/main/resources/assets/botania/textures/gui/flowey.png b/src/main/resources/assets/botania/textures/gui/flowey.png new file mode 100644 index 0000000000000000000000000000000000000000..9f4576c70832e7dc9a4094c8fa7c92510d1f3467 GIT binary patch literal 16071 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 EADuDe)&Kwi literal 0 HcmV?d00001 From ea08199e1f5047d7a1c9dc7dddb8e4fd7b3c6a44 Mon Sep 17 00:00:00 2001 From: wiiv Date: Fri, 18 Dec 2015 18:20:18 +0000 Subject: [PATCH 09/23] ...to town. --- .../textures/items/manaweaveBootsHoliday.png | Bin 0 -> 18297 bytes .../textures/items/manaweaveChestHoliday.png | Bin 0 -> 18787 bytes .../textures/items/manaweaveHelmHoliday.png | Bin 0 -> 18654 bytes .../textures/items/manaweaveLegsHoliday.png | Bin 0 -> 18848 bytes .../textures/model/manaweaveNewHoliday.png | Bin 0 -> 48546 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/items/manaweaveBootsHoliday.png create mode 100644 src/main/resources/assets/botania/textures/items/manaweaveChestHoliday.png create mode 100644 src/main/resources/assets/botania/textures/items/manaweaveHelmHoliday.png create mode 100644 src/main/resources/assets/botania/textures/items/manaweaveLegsHoliday.png create mode 100644 src/main/resources/assets/botania/textures/model/manaweaveNewHoliday.png diff --git a/src/main/resources/assets/botania/textures/items/manaweaveBootsHoliday.png b/src/main/resources/assets/botania/textures/items/manaweaveBootsHoliday.png new file mode 100644 index 0000000000000000000000000000000000000000..2a69486cab6a0aab71c6f6ee9ad80ec80abccf0e GIT binary patch literal 18297 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/items/manaweaveChestHoliday.png b/src/main/resources/assets/botania/textures/items/manaweaveChestHoliday.png new file mode 100644 index 0000000000000000000000000000000000000000..a4a3b8bdfb32da1c889bd6c14ac0066ad4639939 GIT binary patch literal 18787 zcmeI3c{G&o`^O(8JC#&Q`ivzcV`i8cW{h>LAz@^+8nc-&Gt88&M6y+%B$X}FO12iI zM1=}1NJR>%Y^g7OLTSVAK}AnB-_PfKzvukU_net?n7QujeqZ-}zpm%Lp6CAKiCekC zMpkN}6aWCScD9x-;P90tpm4gf(<(p{M(*PeOCLr(`S>|?|C+jCszO2Aw!c7-b>XlScQ z&RQO;a^&$`=knQBR-#JPnX%LN>~X(5;6yE^_?-{GN&vS&wdtJb))imhpt(KlsXrjcOgxMH>@TCd^|rxn=5s+l8i85&&SC8KHf~TxqaeQKw97QTdFPa_KLg z*c}$?H!3ViS=$rw&`cR!=IkAv$d%KraJwXD%$@m(B9T$9 zRT?2FYF;fdhobT%R>W&3S#6KR{FJB&pp7)qvjiFVUqosQnS=oQ)sKTp$)_8!X&meN_4$jgLx=pO=|-FW~$_rA@A=+CtkW;~muI&gSiB)9BH=!w>zZxQ|n!~7FfIKySAT_e0VU|Ehl~DYgZ*#<|(7> zm>gy{hh%y@%wsrC%;UPlbtmF+=ghMk+Dj{8($ocoK{_fvvboWlA}}{J&elBMvRS(% zd04q*mvPRiBRHb|a((wgmx28ZQ}Om>{||@wDT<2Vy*H^Fwy;nPLr_LkHNSNxuDfnVJV7}?NqW8`p}3xKtik$E>zTV*m22D8+x;s2DvxQ1X{cz} zJHB%4OLcK9KDqRyk%N&#Rn6U+qcx2wm^5S5Bfajl?zBf~Z5KUP2d&mA$}YM@w>#Id z`lLr+Q7JoWHO}J%*=_Z@LhJnW{3VSg`6XGivx-+FuE@=3WL`h>w&+&Tsf!EFbT)}K z7ZmvwZKW{1<})weEV$m6cqMV`<*k1X8;i@vJeJEAoI6Wzu+m-A9@sGFGmCkV1F^f}?6=?1O)}9tvOzS6Or|IUBi z^N{=R($fmlDtfb9uS#K(R_yE$UEicT8=oG=c z(5;4`A`;y5ADy{)A~0u&@@Brtdy{~}?I!I6gQt2=JvQ7mD7#pF@s87VPR53)HsUt5 zQQBz8Xg!b>zC?sMJubpLV$HPAA40aMT-#%cZ>GOL_qf-5cV@BqT=V$t`P)0o^Hsd7 z|Ft(?WvDy3Hlda!7qv3%W#c_@N*86<^)MODsF*1CXwyC1Sn|SpR1zkzzJ-6Xk?E4PTDYHp$W5NO)p!8GYHbQkUUzw}G5aw)3@Lgwxe7z_NX>wteXxhaq2)O~kd@i&ym9YCDGP`&U9KCRqKZ{t2DV;vJf&_Le%xI<%(YGv=jkhWY6kylmU5^S$rhTQwt+YP6b5B8!N{$F31BmD00r)z%o9l8%!GNuNmAzWc2g zD33m{>-&^KOW&ja)zG}AbZFS**41V=5jV#MMg#q`-RHs~(}K91o(~5<`>o4g;pg95 zHU0kdVR1FNqDRFK8WNcx*VxGYxI?axD%FVwh}!5uwAl5Ina zW${lo?+(p-F8<(;&B{z=#72wM{#5HU*VNBzyw+THx@%J3`08oM7n|lkW*$NlJc5@G zkZ!S_^lX2S$n3A%oqiyFYnblG7SHCRMWNl)+O~}|Id3k{;y=G{HM*)@5(xAR6D z8!~Xltycy@I72sw-nGqZ4GYj5uDw(8I8d`MztpL8!=PEO`D0>hOoQo~k(Q=6E!#Gh z1!fM^x7ZAcMMc()B)p5CNt_X%5`QOJHu`mjp$QK6!ZcvG=Svo`j#j6UF@NOf$en`u z^AKSl8eTuDtxv8$lGLA+c+GFiiQ!jeuNRzduB@nBeDzk4K5G5os?WXUfh~c`Z;rLi zbn4gw+om<@{qgKO*Lzu?6Bi^Vj*3oC9{57lhc^QNA&5mH^U015cq+$FmqO!s(RG9T zxZr~*=raxCQm8(3KFo{GWU-A^-;`Wag|TSHs_qy^q$8I|_h#9K1khbWR*BUEAIUHCr6s^((@!pM#*VMI;<9fr}x zz^O<*6wCmpi^8CBD3lIN4~f!8ppXbX92|whqYdyVEbQw?)kF&XMF^lV@Gh3tUxx!N zV^wcHpNmHz0s{ke1NC(|0Zar6hr=O|dI&u|IM@Tu3uf~vL2x!tZ6e6GIF@uCHGswC zvp8(nSX_!1XA|F8RdsBj@1L*h^5cFVh|T-T4y1?(qHqx?T_oaHA{zC(hPx@icYJCz zDuV7y_oK7*Uk6Gz8ii@(j+&+nH*^Y~VqK?Gls{xIw} zC65%$r6XMEJkF*7D&1-`xD>Ttt)9z383QIzw z@ECo(zTWC7`iV{uxg&?hVgyghQF?HcAqi!G$6)aKn6L6FouG1X!_X*v%D)RRwcC^s zG%B9K3Gk!vO;~;uCLO_LGYN>v#wk6&UqN^x$CncT&WLWJPeA;t`Ijp2OuBO7NNU1! zv9W;JSrM@)92N`L(?v}UGo{}z<5+U2o5r?+Ih#u7feGYINi3M&@y%{QVgA_q&Ed;3 z0kf$~W6|(592SQ|(hT7gBnk^>7@`f}6bc0iN7EPvUN|a-O2Z-vh_NjWiY8|=7HPco z$1$d^K+p`wt{6v0yd9gzr+^EvvmBof3!D$b&=6zbg`~j^(P$JLheTuHhFAjzoPqVC z>f*C-LLDpRCe*QNK&KH9 zKeSFx3o2v%oWQ?#K~2P;BLDpuf!=iXZ%WEUl<^L~*Yh|Gejp`)Zq5X^%fG2{69Ioz zKqLQpH-Kcu_na^5KfuqUZ2r&SWArgN8pRL?r&IMQa4ZU~2d5ZNCQIy8j^zj zmfU{|9}U+VFUWd^c#PpPu&^V+!tno+ficz-15>>zY$ly%g7`L*Zw>!TN&9;xZ(_m! zFlj&CMgO<+HL>-6EPdZ@20xcd!q~$S9xSuqzNd_rH}KB!Q`_W~GSQzrRxW)vjrYf4 za3~}ie5wXNU!_ysP^pJt=~OpVI;nJHv-l=@Uq^#9Pf?9M(M>#pxPpfdx(T>6XcM&e zN>&ivmu$%b9~*dM#U2Hgf^iMh@k^n{?}SqvUxgECnsP)Kzf(=Lf(H=r?1T7z`1$E3 z_Wc&~-~2JTqW@-8NG#zX5Fmn0AuhpuAYLIZ2oS-h5SL&+5U&sy1c+c$h)XaZh*yXU z0z|MW#3h&y#4E%F0V3EG;u6dU;uYe801<2oaS7%F@d|N4fCx5)xCHZoc!jtiKm?mY zT!Q&Pyh2BG?q-63hqU72<*b5o`)^3FZUw3UNVz2sVYd1oMG-g}5L<1e-!!g84waLR=6a zf=wYV!F(WIAub3I!KM(GU_KD95Elf9U{i=oFdv9lhzkNluqhCi)a2{LbT;@7aUl4z z@N2Oqcko4H7}eIr5dcD#06=&o0DK$;zk2{+6A}Pkc>(}F835*U_HDRn4FJ=m>@3Ym zK~Ih+8hb04D^zXMFG+f)XlfpiV5TY=(7H~gQUj)$ovcVSo5oZjd*__DSO|A%I(~L} z8Qw}1zCB95V2&vKJw7T@v3!eG>> zc+<5G-Py96zIy23?$e3bt~D?Go!&(n+u3^EJo=%0>&Gv zIOQCpzIeePvw!DP6%Ko78+)wa$6Z>>D7i2ryhP&)rK{Tcz?Q*E;#=|aLkry4Nap`IV&Bm0VQ`*}5(M1?&`V+=3^q z9CP`@uecOmVqEUAyiZltqb*&xau?duwG7XGTK4B7(FD7Z;YvlrwzjJFhNPC4(VnoX z>&<128i~(m78spfw0dW&q*DDh!@t7YjMe}oc^gW*v2$|3D(=yJhH{}Qp`V#C#Ffk9 zFdmmfKLgdxdqMf&2dk6fPP2DJm&&HSY4&m*8?+!~Z0 z7S&W7vcJpr^*|(fNE_EG?2?f^OotDWN6%en`+j_>=@)A-7fsr~g?z)c<9<_FQNps1 hy_-%x@EOFXSKqzz`}F;{{clV=&1kz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/items/manaweaveHelmHoliday.png b/src/main/resources/assets/botania/textures/items/manaweaveHelmHoliday.png new file mode 100644 index 0000000000000000000000000000000000000000..ca047acc79406059e7609a0e70cd1e4f9d4ff63b GIT binary patch literal 18654 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/items/manaweaveLegsHoliday.png b/src/main/resources/assets/botania/textures/items/manaweaveLegsHoliday.png new file mode 100644 index 0000000000000000000000000000000000000000..66e8894713825059780c55648e482ddcb3e0ca86 GIT binary patch literal 18848 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 Date: Fri, 18 Dec 2015 23:13:32 +0000 Subject: [PATCH 10/23] More skybox work... --- .../botania/client/lib/LibResources.java | 1 + .../render/world/SkyblockSkyRenderer.java | 187 ++++++++++++++---- .../botania/common/lib/LibObfuscation.java | 4 +- .../assets/botania/textures/misc/planet0.png | Bin 0 -> 17833 bytes .../assets/botania/textures/misc/planet1.png | Bin 0 -> 18073 bytes .../assets/botania/textures/misc/planet2.png | Bin 0 -> 17830 bytes .../assets/botania/textures/misc/planet3.png | Bin 0 -> 17873 bytes .../assets/botania/textures/misc/planet4.png | Bin 0 -> 18131 bytes .../assets/botania/textures/misc/planet5.png | Bin 0 -> 18114 bytes .../assets/botania/textures/misc/skybox.png | Bin 18561 -> 18681 bytes 10 files changed, 148 insertions(+), 44 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/misc/planet0.png create mode 100644 src/main/resources/assets/botania/textures/misc/planet1.png create mode 100644 src/main/resources/assets/botania/textures/misc/planet2.png create mode 100644 src/main/resources/assets/botania/textures/misc/planet3.png create mode 100644 src/main/resources/assets/botania/textures/misc/planet4.png create mode 100644 src/main/resources/assets/botania/textures/misc/planet5.png diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 20ace2246..5ff6c0c9e 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -147,6 +147,7 @@ public final class LibResources { public static final String MISC_GLOW_CYAN = PREFIX_MISC + "glow1.png"; public static final String MISC_BABYLON = PREFIX_MISC + "babylon.png"; public static final String MISC_SKYBOX = PREFIX_MISC + "skybox.png"; + public static final String MISC_PLANET = PREFIX_MISC + "planet"; public static final String OBJ_MODEL_PYLON = PREFIX_OBJ_MODEL + "pylon.obj"; diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index 8e7c7b9e4..57b1e8f91 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -30,24 +30,41 @@ import cpw.mods.fml.relauncher.ReflectionHelper; public class SkyblockSkyRenderer extends IRenderHandler { - private static final ResourceLocation textureFlowey = new ResourceLocation(LibResources.GUI_FLOWEY); private static final ResourceLocation textureSkybox = new ResourceLocation(LibResources.MISC_SKYBOX); - private static final ResourceLocation locationMoonPhases = new ResourceLocation("textures/environment/moon_phases.png"); - private static final ResourceLocation locationSun = new ResourceLocation("textures/environment/sun.png"); - + private static final ResourceLocation textureMoonPhases = new ResourceLocation("textures/environment/moon_phases.png"); + private static final ResourceLocation textureSun = new ResourceLocation("textures/environment/sun.png"); + private static final ResourceLocation[] planetTextures = new ResourceLocation[] { + new ResourceLocation(LibResources.MISC_PLANET + "0.png"), + new ResourceLocation(LibResources.MISC_PLANET + "1.png"), + new ResourceLocation(LibResources.MISC_PLANET + "2.png"), + new ResourceLocation(LibResources.MISC_PLANET + "3.png"), + new ResourceLocation(LibResources.MISC_PLANET + "4.png"), + new ResourceLocation(LibResources.MISC_PLANET + "5.png") + }; + @Override public void render(float partialTicks, WorldClient world, Minecraft mc) { - int glSkyList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST); - int glSkyList2 = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST2); + boolean test = false; + if(test) + return; + int glSkyList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST); + int glSkyList2 = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST2); // Horizon like. We don't have it here + int starGLCallList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.STAR_GL_CALL_LIST); + GL11.glDisable(GL11.GL_TEXTURE_2D); Vec3 vec3 = world.getSkyColor(mc.renderViewEntity, partialTicks); float f1 = (float)vec3.xCoord; float f2 = (float)vec3.yCoord; float f3 = (float)vec3.zCoord; float f6; + + int startFade = 25; + float insideVoid = Math.max(0F, ((float) (startFade - mc.thePlayer.posY) / startFade)); + f1 = Math.max(0F, f1 - insideVoid); + f2 = Math.max(0F, f2 - insideVoid); + f3 = Math.max(0F, f3 - insideVoid); - GL11.glColor3f(f1, f2, f3); Tessellator tessellator1 = Tessellator.instance; GL11.glDepthMask(false); GL11.glEnable(GL11.GL_FOG); @@ -78,7 +95,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { float f11; tessellator1.startDrawing(6); - tessellator1.setColorRGBA_F(f6, f7, f8, afloat[3]); + tessellator1.setColorRGBA_F(f6, f7, f8, afloat[3] * (1F - insideVoid)); tessellator1.addVertex(0.0D, 100.0D, 0.0D); byte b0 = 16; tessellator1.setColorRGBA_F(afloat[0], afloat[1], afloat[2], 0.0F); @@ -96,22 +113,60 @@ public class SkyblockSkyRenderer extends IRenderHandler { } GL11.glEnable(GL11.GL_TEXTURE_2D); - OpenGlHelper.glBlendFunc(770, 1, 1, 0); GL11.glPushMatrix(); - f6 = 1.0F - world.getRainStrength(partialTicks); + f6 = Math.max(0.2F, 1.0F - world.getRainStrength(partialTicks)) * (1F - insideVoid); f7 = 0.0F; f8 = 0.0F; f9 = 0.0F; - GL11.glColor4f(1.0F, 1.0F, 1.0F, f6); GL11.glTranslatef(f7, f8, f9); GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); - // === Ray / Planets - mc.renderEngine.bindTexture(textureSkybox); + float celAng = world.getCelestialAngle(partialTicks); + float effCelAng = celAng; + if(celAng > 0.5) + effCelAng = 0.5F - (celAng - 0.5F); + + // === Planets + f10 = 20F; + float a = Math.max(0F, effCelAng - 0.3F) * f6; - // TODO: Very WIP, needs tweaking so it doesn't vanish when the sun rises - float a = Math.max(0F, world.getCelestialAngle(partialTicks) - 0.2F); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GL11.glPushMatrix(); + GL11.glColor4f(1F, 1F, 1F, a * 4); + GL11.glRotatef(90F, 0.5F, 0.5F, 0.0F); + for(int p = 0; p < planetTextures.length; p++) { + mc.renderEngine.bindTexture(planetTextures[p]); + drawObject(tessellator1, f10); + + switch(p) { + case 0: + GL11.glRotatef(70F, 1F, 0F, 0F); + f10 = 12F; + break; + case 1: + GL11.glRotatef(120F, 0F, 0F, 1F); + f10 = 15F; + break; + case 2: + GL11.glRotatef(80F, 1F, 0F, 1F); + f10 = 25F; + break; + case 3: + GL11.glRotatef(100F, 0F, 0F, 1F); + f10 = 10F; + break; + case 4: + GL11.glRotatef(-60F, 1F, 0F, 0.5F); + f10 = 40F; + } + } + GL11.glColor4f(1F, 1F, 1F, 1F); + GL11.glPopMatrix(); + + // === Rays + mc.renderEngine.bindTexture(textureSkybox); + if(a > 0) { f10 = 20F; GL11.glPushMatrix(); @@ -119,7 +174,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { GL11.glTranslatef(0F, -1F, 0F); GL11.glColor4f(1F, 1F, 1F, a); GL11.glRotatef(220F, 1F, 0F, 0F); - int angles = 1440; + int angles = 90; float s = 3F; float m = 1F; float y = 2F; @@ -135,23 +190,24 @@ public class SkyblockSkyRenderer extends IRenderHandler { tessellator1.startDrawingQuads(); for(int i = 0; i < angles; i++) { - float ang = i * anglePer + baseAngle; + int j = i; + if(i % 2 == 0) + j--; + + float ang = j * anglePer + baseAngle; double xp = Math.cos(ang * Math.PI / 180F) * f10; double zp = Math.sin(ang * Math.PI / 180F) * f10; - double yo = Math.sin(fuzzPer * i) * 1; + double yo = Math.sin(fuzzPer * j) * 1; float ut = ang * uPer; - tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); - tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); + if(i % 2 == 0) { + tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); + tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); + } else { + tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); + tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); + } - ang = (i + 1) * anglePer + baseAngle; - xp = Math.cos(ang * Math.PI / 180F) * f10; - zp = Math.sin(ang * Math.PI / 180F) * f10; - ut = ang * uPer; - - - tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); - tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); } tessellator1.draw(); @@ -159,12 +215,12 @@ public class SkyblockSkyRenderer extends IRenderHandler { case 0: GL11.glRotatef(20F, 1F, 0F, 0F); GL11.glColor4f(1F, 0.4F, 0.4F, a); - fuzzPer = (Math.PI * 20) / angles; + fuzzPer = (Math.PI * 14) / angles; rotSpeed = 0.2F; break; case 1: GL11.glRotatef(50F, 1F, 0F, 0F); - GL11.glColor4f(0.4F, 1F, 0.4F, a); + GL11.glColor4f(0.4F, 1F, 0.7F, a); fuzzPer = (Math.PI * 6) / angles; rotSpeed = 2F; break; @@ -174,22 +230,18 @@ public class SkyblockSkyRenderer extends IRenderHandler { GL11.glPopMatrix(); } - GL11.glColor4f(1F, 1F, 1F, 1F); + GL11.glColor4f(1F, 1F, 1F, 1F - insideVoid); + OpenGlHelper.glBlendFunc(770, 1, 1, 0); // === Sun GL11.glRotatef(world.getCelestialAngle(partialTicks) * 360.0F, 1.0F, 0.0F, 0.0F); f10 = 60.0F; - mc.renderEngine.bindTexture(locationSun); - tessellator1.startDrawingQuads(); - tessellator1.addVertexWithUV((double)(-f10), 100.0D, (double)(-f10), 0.0D, 0.0D); - tessellator1.addVertexWithUV((double)f10, 100.0D, (double)(-f10), 1.0D, 0.0D); - tessellator1.addVertexWithUV((double)f10, 100.0D, (double)f10, 1.0D, 1.0D); - tessellator1.addVertexWithUV((double)(-f10), 100.0D, (double)f10, 0.0D, 1.0D); - tessellator1.draw(); - + mc.renderEngine.bindTexture(textureSun); + drawObject(tessellator1, f10); + // === Moon f10 = 60.0F; - mc.renderEngine.bindTexture(locationMoonPhases); + mc.renderEngine.bindTexture(textureMoonPhases); int k = world.getMoonPhase(); int l = k % 4; int i1 = k / 4 % 2; @@ -203,17 +255,66 @@ public class SkyblockSkyRenderer extends IRenderHandler { tessellator1.addVertexWithUV((double)f10, -100.0D, (double)(-f10), (double)f14, (double)f15); tessellator1.addVertexWithUV((double)(-f10), -100.0D, (double)(-f10), (double)f16, (double)f15); tessellator1.draw(); + + // === Stars + float t = (ClientTickHandler.ticksInGame + partialTicks + 2000) * 0.005F; + GL11.glPushMatrix(); GL11.glDisable(GL11.GL_TEXTURE_2D); + + GL11.glPushMatrix(); + GL11.glRotatef(t * 3, 0F, 1F, 0F); + GL11.glColor4f(1F, 1F, 1F, f6); + GL11.glCallList(starGLCallList); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glRotatef(t, 0F, 1F, 0F); + GL11.glColor4f(0.5F, 1F, 1F, f6); + GL11.glCallList(starGLCallList); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glRotatef(t * 2, 0F, 1F, 0F); + GL11.glColor4f(1F, 0.75F, 0.75F, f6); + GL11.glCallList(starGLCallList); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glRotatef(t * 3, 0F, 0F, 1F); + GL11.glColor4f(1F, 1F, 1F, 0.25F * f6); + GL11.glCallList(starGLCallList); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glRotatef(t, 0F, 0F, 1F); + GL11.glColor4f(0.5F, 1F, 1F, 0.25F * f6); + GL11.glCallList(starGLCallList); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glRotatef(t * 2, 0F, 0F, 1F); + GL11.glColor4f(1F, 0.75F, 0.75F, 0.25F * f6); + GL11.glCallList(starGLCallList); + GL11.glPopMatrix(); + + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glPopMatrix(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glDisable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glEnable(GL11.GL_FOG); GL11.glPopMatrix(); - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glColor3f(0.0F, 0.0F, 0.0F); - GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glDepthMask(true); } + + private void drawObject(Tessellator tess, float f10) { + tess.startDrawingQuads(); + tess.addVertexWithUV((double)(-f10), 100.0D, (double)(-f10), 0.0D, 0.0D); + tess.addVertexWithUV((double)f10, 100.0D, (double)(-f10), 1.0D, 0.0D); + tess.addVertexWithUV((double)f10, 100.0D, (double)f10, 1.0D, 1.0D); + tess.addVertexWithUV((double)(-f10), 100.0D, (double)f10, 0.0D, 1.0D); + tess.draw(); + } } diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index c10f3dd94..44f27a3c6 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -83,8 +83,10 @@ public final class LibObfuscation { // TextureAtlasSprite public static final String[] ANIMATION_METADATA = new String[] { "animationMetadata", "field_110982_k", "j" }; - // RenderGloba + // RenderGlobal + public static final String[] STAR_GL_CALL_LIST = new String[] { "starGLCallList", "field_72772_v", "F" }; public static final String[] GL_SKY_LIST = new String[] { "glSkyList", "field_72771_w", "G" }; public static final String[] GL_SKY_LIST2 = new String[] { "glSkyList2", "field_72781_x", "H" }; + } diff --git a/src/main/resources/assets/botania/textures/misc/planet0.png b/src/main/resources/assets/botania/textures/misc/planet0.png new file mode 100644 index 0000000000000000000000000000000000000000..29875ee382328aac34f2bf36dee2056e4cc855d1 GIT binary patch literal 17833 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 Qg+>K9+b^~&unpMsKO9KgkN^Mx literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/misc/planet2.png b/src/main/resources/assets/botania/textures/misc/planet2.png new file mode 100644 index 0000000000000000000000000000000000000000..1c2e40b42ebe31ebcba24e119a1af4ef600f8e3a GIT binary patch literal 17830 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 GTmJ_X*!$H0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/misc/planet5.png b/src/main/resources/assets/botania/textures/misc/planet5.png new file mode 100644 index 0000000000000000000000000000000000000000..bfb9ed2439f44cd7b664f6d33cf0cac7f5b5fbb0 GIT binary patch literal 18114 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 TkzG{^r4QIxtT!(*+qU=LI`H(V literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/misc/skybox.png b/src/main/resources/assets/botania/textures/misc/skybox.png index 0f96d693ab631fd1a9c6695cbd4c20ad88ff2491..2cad3db1d4f4c233d3a8911ed75b0ad0ec455a1f 100644 GIT binary patch delta 662 zcmZpi$oO+2F_|pMXNllM@tLU@nj5E@q@*P3CL1TF z=$e|Cr0H5Do0{qxB_^9%B$}C~ni{2S-oh8dGC5kXjVRTVS%qxjc5L<%n#*Wdkda@K zU!0L&VC9mZT$-DjSK^qLoLXFxUsPxz9X0f7)cSNNFs4gU!sDOb!eT z0t^f+3=E763Ad)4U$4(ESeU2P@MguSjtUcghh?%3E_YmA)@;A}@5$B3a_0*&m*wh@ zKmUCBbNA1phn@-w*ZCg&duF!J%>KV#L2cp5=bweYb{{=neOKq&lJy1GTYuKnMg5!4 zAmKHu>|yey_Vdr@&$}pP#=qy6Nuwbxp}pTz2#4 z_r-q`&6;PQcCqpN^W_i4=dTX6-4b=<=#5qmyZQC?yXtP1zc*NB0n~S0{*UwqZO6XI znNL3dT>kofJ|o{+8NQ|dpHBcC`N`d$gC(JA%IdS*BN>W#8#)f(=DB`*RdIG=^=n0- z=F9reP9L2u!}94Z!@NV<2ODHoa>cVTeL5Q5$jHb53z>$_&)f_Q|Nk>H%xIid@qbDz R?`#Gj@O1TaS?83{1OO^I5WD~Y delta 994 zcmV<810DSNkpY2`0kD$_0y-G8l?r?Vlh6$hlOPT|IN4+b|G)s_Eue#|_d|fdcIn+AH)7Jy@=g zT~CmOcLuWTA_20k56~h_T{~_3Q5P8{v@GjKnlw2xfDl{JP~qcy&!VLale57E9LEa) z9om%kI-$))q_iz)n`^I^kcc^ie_AMq0A|1M0O$gE31A<<9<`%?sBIUqB+%yo{sH(4 z-~qsl1|b_DF_3r!Ed1MG0DXr5W`nj5-~hl8fJ1uUrTlHXa7rM}2>2<034nWgpMfa` z5}$yDe>wgs03QgZR}}8*!BP{2)HSLF@QVzc~3yj#XzDIu<-Ah ze=`6N3cyDKp$-6lCIBYd;JpIyng(zeVgle7fIk|DX~YK7CPEjm@NYeTtN?rl@PA$7Xb7fo(It7C8Ws|AX)))PHJ2uK6jqk)j z7z>y?|DFuM7l3&%^(bq%2>3SnVj#Q)%$_|B{>0DD??oS$j=CVcO)|AVBB_!dbxF`B!-x&?SI%&);_LS(VS#Kt#ZN z`B!)w&?SI*ay6Ng>cncB&)q;w=dhs*m^=R}Zv$?B8$jP726D_=z})%wGzIVlpzjA+ z-uL>f4a9T~8@hnG^RM=UK-&ax(<7$0(@EjuruoNKP4mS-cng>_|BU|`$P_@|!QDW( z3z$3qlJm=98Zv-lAbqd>=PuyT`Da`Z#8R*>XyMa9Y(xYCX3IZ?$MRAghX6`Rs|qpb z`|5~)#pfKh>hEzRcHv*USSSErQLiYdEdZscuDROTK9tL6)16dm}O#ZE1QcCb8`vkCY6(9nRApQdY0RR6306t$q6z2AL QDF6Tf07*qoM6N<$f=zDB3jhEB From a6d61206d9142e7592696bfcd0108e2695ce096f Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 19 Dec 2015 03:05:28 +0000 Subject: [PATCH 11/23] Rainbow! --- .../botania/client/lib/LibResources.java | 1 + .../render/world/SkyblockRenderEvents.java | 2 +- .../render/world/SkyblockSkyRenderer.java | 168 +++++++++++------- .../assets/botania/textures/misc/rainbow.png | Bin 0 -> 18526 bytes 4 files changed, 109 insertions(+), 62 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/misc/rainbow.png diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 5ff6c0c9e..b65387acf 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -147,6 +147,7 @@ public final class LibResources { public static final String MISC_GLOW_CYAN = PREFIX_MISC + "glow1.png"; public static final String MISC_BABYLON = PREFIX_MISC + "babylon.png"; public static final String MISC_SKYBOX = PREFIX_MISC + "skybox.png"; + public static final String MISC_RAINBOW = PREFIX_MISC + "rainbow.png"; public static final String MISC_PLANET = PREFIX_MISC + "planet"; public static final String OBJ_MODEL_PYLON = PREFIX_OBJ_MODEL + "pylon.obj"; diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java index 93da99337..04cde0d03 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java @@ -21,7 +21,7 @@ public final class SkyblockRenderEvents { @SubscribeEvent public void onRender(RenderWorldLastEvent event) { World world = Minecraft.getMinecraft().theWorld; - if(world.provider.dimensionId == 0 && WorldTypeSkyblock.isWorldSkyblock(Minecraft.getMinecraft().theWorld)) { + if(world.provider.dimensionId == 0/* && WorldTypeSkyblock.isWorldSkyblock(Minecraft.getMinecraft().theWorld)*/) { if(!(world.provider.getSkyRenderer() instanceof SkyblockSkyRenderer)) world.provider.setSkyRenderer(new SkyblockSkyRenderer()); } diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index 57b1e8f91..f8e252e78 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -10,6 +10,8 @@ */ package vazkii.botania.client.render.world; +import java.util.Random; + import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.OpenGlHelper; @@ -31,6 +33,7 @@ import cpw.mods.fml.relauncher.ReflectionHelper; public class SkyblockSkyRenderer extends IRenderHandler { private static final ResourceLocation textureSkybox = new ResourceLocation(LibResources.MISC_SKYBOX); + private static final ResourceLocation textureRainbow = new ResourceLocation(LibResources.MISC_RAINBOW); private static final ResourceLocation textureMoonPhases = new ResourceLocation("textures/environment/moon_phases.png"); private static final ResourceLocation textureSun = new ResourceLocation("textures/environment/sun.png"); private static final ResourceLocation[] planetTextures = new ResourceLocation[] { @@ -167,72 +170,114 @@ public class SkyblockSkyRenderer extends IRenderHandler { // === Rays mc.renderEngine.bindTexture(textureSkybox); - if(a > 0) { - f10 = 20F; - GL11.glPushMatrix(); - OpenGlHelper.glBlendFunc(770, 1, 1, 0); - GL11.glTranslatef(0F, -1F, 0F); - GL11.glColor4f(1F, 1F, 1F, a); - GL11.glRotatef(220F, 1F, 0F, 0F); - int angles = 90; - float s = 3F; - float m = 1F; - float y = 2F; - float y0 = 0F; - float uPer = 1F / 360F; - float anglePer = 360F / angles; - double fuzzPer = (Math.PI * 10) / angles; - float rotSpeed = 1F; - - for(int p = 0; p < 3; p++) { - float baseAngle = rotSpeed * (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks); - GL11.glRotatef((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.25F * rotSpeed, 0F, 1F, 0F); - - tessellator1.startDrawingQuads(); - for(int i = 0; i < angles; i++) { - int j = i; - if(i % 2 == 0) - j--; - - float ang = j * anglePer + baseAngle; - double xp = Math.cos(ang * Math.PI / 180F) * f10; - double zp = Math.sin(ang * Math.PI / 180F) * f10; - double yo = Math.sin(fuzzPer * j) * 1; - - float ut = ang * uPer; - if(i % 2 == 0) { - tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); - tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); - } else { - tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); - tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); - } + f10 = 20F; + GL11.glPushMatrix(); + OpenGlHelper.glBlendFunc(770, 1, 1, 0); + GL11.glTranslatef(0F, -1F, 0F); + GL11.glRotatef(220F, 1F, 0F, 0F); + GL11.glColor4f(1F, 1F, 1F, a); + int angles = 90; + float s = 3F; + float m = 1F; + float y = 2F; + float y0 = 0F; + float uPer = 1F / 360F; + float anglePer = 360F / angles; + double fuzzPer = (Math.PI * 10) / angles; + float rotSpeed = 1F; + float rotSpeedMod = 0.4F; + + for(int p = 0; p < 3; p++) { + float baseAngle = rotSpeed * rotSpeedMod * (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks); + GL11.glRotatef((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.25F * rotSpeed * rotSpeedMod, 0F, 1F, 0F); + + tessellator1.startDrawingQuads(); + for(int i = 0; i < angles; i++) { + int j = i; + if(i % 2 == 0) + j--; + + float ang = j * anglePer + baseAngle; + double xp = Math.cos(ang * Math.PI / 180F) * f10; + double zp = Math.sin(ang * Math.PI / 180F) * f10; + double yo = Math.sin(fuzzPer * j) * 1; + + float ut = ang * uPer; + if(i % 2 == 0) { + tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); + tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); + } else { + tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); + tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); + } - } - tessellator1.draw(); + } + tessellator1.draw(); - switch(p) { - case 0: - GL11.glRotatef(20F, 1F, 0F, 0F); - GL11.glColor4f(1F, 0.4F, 0.4F, a); - fuzzPer = (Math.PI * 14) / angles; - rotSpeed = 0.2F; - break; - case 1: - GL11.glRotatef(50F, 1F, 0F, 0F); - GL11.glColor4f(0.4F, 1F, 0.7F, a); - fuzzPer = (Math.PI * 6) / angles; - rotSpeed = 2F; - break; - } - } - - GL11.glPopMatrix(); - } + switch(p) { + case 0: + GL11.glRotatef(20F, 1F, 0F, 0F); + GL11.glColor4f(1F, 0.4F, 0.4F, a); + fuzzPer = (Math.PI * 14) / angles; + rotSpeed = 0.2F; + break; + case 1: + GL11.glRotatef(50F, 1F, 0F, 0F); + GL11.glColor4f(0.4F, 1F, 0.7F, a); + fuzzPer = (Math.PI * 6) / angles; + rotSpeed = 2F; + break; + } + } + GL11.glPopMatrix(); + + // === Rainbow + GL11.glPushMatrix(); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + mc.renderEngine.bindTexture(textureRainbow); + f10 = 10F; + float effCelAng1 = celAng; + if(effCelAng1 > 0.25F) + effCelAng1 = 1F - effCelAng1; + effCelAng1 = 0.25F - Math.min(0.25F, effCelAng1); + + long time = world.getWorldTime() + 1000; + int day = (int) (time / 24000L); + Random rand = new Random(("" + day).hashCode()); + float angle1 = rand.nextFloat() * 360F; + float angle2 = rand.nextFloat() * 360F; + GL11.glColor4f(1F, 1F, 1F, effCelAng1); + GL11.glRotatef(angle1, 0F, 1F, 0F); + GL11.glRotatef(angle2, 0F, 0F, 1F); - GL11.glColor4f(1F, 1F, 1F, 1F - insideVoid); + tessellator1.startDrawingQuads(); + for(int i = 0; i < angles; i++) { + int j = i; + if(i % 2 == 0) + j--; + + float ang = j * anglePer; + double xp = Math.cos(ang * Math.PI / 180F) * f10; + double zp = Math.sin(ang * Math.PI / 180F) * f10; + double yo = 0; + + float ut = ang * uPer; + if(i % 2 == 0) { + tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); + tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); + } else { + tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); + tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); + } + + } + tessellator1.draw(); + GL11.glPopMatrix(); + + GL11.glColor4f(1F, 1F, 1F, 1F - insideVoid); OpenGlHelper.glBlendFunc(770, 1, 1, 0); + // === Sun GL11.glRotatef(world.getCelestialAngle(partialTicks) * 360.0F, 1.0F, 0.0F, 0.0F); f10 = 60.0F; @@ -257,6 +302,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { tessellator1.draw(); // === Stars + f6 *= Math.max(0.1F, effCelAng * 2); float t = (ClientTickHandler.ticksInGame + partialTicks + 2000) * 0.005F; GL11.glPushMatrix(); GL11.glDisable(GL11.GL_TEXTURE_2D); diff --git a/src/main/resources/assets/botania/textures/misc/rainbow.png b/src/main/resources/assets/botania/textures/misc/rainbow.png new file mode 100644 index 0000000000000000000000000000000000000000..32366c2e30830242948c326c0a666ecc1a3e2c27 GIT binary patch literal 18526 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 KZIO-NhW`Pp6F#{B literal 0 HcmV?d00001 From 0b28e37d2491108d4db5912edf81e4c68d71a876 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 19 Dec 2015 03:38:14 +0000 Subject: [PATCH 12/23] Change Christmas period. --- .../java/vazkii/botania/client/core/proxy/ClientProxy.java | 7 +++---- .../java/vazkii/botania/client/gui/lexicon/GuiLexicon.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) 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 28aad3046..75b068016 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -187,7 +187,7 @@ import cpw.mods.fml.relauncher.ReflectionHelper; public class ClientProxy extends CommonProxy { - public static boolean singAnnoyingChristmasSongsTillVazkiisHeadExplodesFromAllTheDamnJingle = false; + public static boolean jingleTheBells = false; public static boolean dootDoot = false; @Override @@ -231,13 +231,12 @@ public class ClientProxy extends CommonProxy { if(ConfigHandler.enableSeasonalFeatures) { Calendar calendar = Calendar.getInstance(); - if(calendar.get(2) == 11 && calendar.get(5) >= 24 && calendar.get(5) <= 26 || calendar.get(2) == 0 && calendar.get(5) <= 6) - singAnnoyingChristmasSongsTillVazkiisHeadExplodesFromAllTheDamnJingle = true; + if((calendar.get(2) == 11 && calendar.get(5) >= 16) || (calendar.get(2) == 0 && calendar.get(5) <= 2)) + jingleTheBells = true; if(calendar.get(2) == 9) dootDoot = true; } - initRenderers(); } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index c2e19b1d1..7d20632fb 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -206,7 +206,7 @@ public class GuiLexicon extends GuiScreen { mc.renderEngine.bindTexture(texture); drawTexturedModalRect(left, top, 0, 0, guiWidth, guiHeight); - if(ClientProxy.singAnnoyingChristmasSongsTillVazkiisHeadExplodesFromAllTheDamnJingle) + if(ClientProxy.jingleTheBells) drawTexturedModalRect(left + 3, top + 1, 0, 212, 138, 6); String subtitle = getSubtitle(); From 0e918f5449902a772c6ce418b78f16c566693a3f Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 19 Dec 2015 18:08:33 +0000 Subject: [PATCH 13/23] Added configs to move the Flugel Tiara's flight bar as apparently I'm not the only person that thought it was cute to put a bar there. --- .../vazkii/botania/common/core/handler/ConfigHandler.java | 8 ++++++++ .../common/item/equipment/bauble/ItemFlightTiara.java | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) 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 51067ef68..6d4429869 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -63,6 +63,8 @@ public final class ConfigHandler { public static boolean useShiftForQuickLookup = false; public static boolean enableArmorModels = true; public static int manaBarHeight = 29; + public static int flightBarHeight = 49; + public static int flightBarBreathHeight = 59; public static int glSecondaryTextureUnit = 7; public static boolean altFlowerTextures = false; @@ -177,6 +179,12 @@ public final class ConfigHandler { desc = "The height of the mana display bar in above the XP bar. You can change this if you have a mod that changes where the XP bar is."; manaBarHeight = loadPropInt("manaBar.height", desc, manaBarHeight); + desc = "The height of the Flugel Tiara flight bar. You can change this if you have a mod that adds a bar in that spot."; + flightBarHeight = loadPropInt("flightBar.height", desc, flightBarHeight); + + desc = "The height of the Flugel Tiara flight bar if your breath bar is shown. You can change this if you have a mod that adds a bar in that spot."; + flightBarBreathHeight = loadPropInt("flightBarBreath.height", desc, flightBarBreathHeight); + desc = "The GL Texture Unit to use for the secondary sampler passed in to the Lexica Botania's category button shader. DO NOT TOUCH THIS IF YOU DON'T KNOW WHAT YOU'RE DOING"; glSecondaryTextureUnit = loadPropInt("shaders.secondaryUnit", desc, glSecondaryTextureUnit); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 46a887b48..af3b711b4 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -54,6 +54,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; @@ -506,9 +507,9 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub mc.renderEngine.bindTexture(textureHud); int xo = resolution.getScaledWidth() / 2 + 10; int x = xo; - int y = resolution.getScaledHeight() - 49; + int y = resolution.getScaledHeight() - ConfigHandler.flightBarHeight; if(player.getAir() < 300) - y -= 10; + y = resolution.getScaledHeight() - ConfigHandler.flightBarBreathHeight; int left = ItemNBTHelper.getInt(stack, TAG_TIME_LEFT, MAX_FLY_TIME); From ff87b301741849f3d00366668c9aadb7740a47b9 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 19 Dec 2015 18:10:28 +0000 Subject: [PATCH 14/23] Removed your best friend --- .../assets/botania/textures/gui/flowey.png | Bin 16071 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/botania/textures/gui/flowey.png diff --git a/src/main/resources/assets/botania/textures/gui/flowey.png b/src/main/resources/assets/botania/textures/gui/flowey.png deleted file mode 100644 index 9f4576c70832e7dc9a4094c8fa7c92510d1f3467..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16071 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 Date: Sat, 19 Dec 2015 18:22:31 +0000 Subject: [PATCH 15/23] And complete the skybox stuffs --- .../client/core/proxy/ClientProxy.java | 3 +- .../render/world/SkyblockRenderEvents.java | 3 +- .../render/world/SkyblockSkyRenderer.java | 472 +++++++++--------- .../common/core/handler/ConfigHandler.java | 9 + 4 files changed, 249 insertions(+), 238 deletions(-) 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 75b068016..265950bf3 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -220,10 +220,9 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(new DebugHandler()); MinecraftForge.EVENT_BUS.register(new SubTileRadiusRenderHandler()); MinecraftForge.EVENT_BUS.register(new MultiblockRenderHandler()); + MinecraftForge.EVENT_BUS.register(new SkyblockRenderEvents()); FMLCommonHandler.instance().bus().register(new CorporeaAutoCompleteHandler()); - if(Botania.gardenOfGlassLoaded) - MinecraftForge.EVENT_BUS.register(new SkyblockRenderEvents()); if(ConfigHandler.useAdaptativeConfig) FMLCommonHandler.instance().bus().register(new AdaptorNotifier()); if(ConfigHandler.versionCheckEnabled) diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java index 04cde0d03..007b637fb 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java @@ -13,6 +13,7 @@ package vazkii.botania.client.render.world; import net.minecraft.client.Minecraft; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; +import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.world.WorldTypeSkyblock; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -21,7 +22,7 @@ public final class SkyblockRenderEvents { @SubscribeEvent public void onRender(RenderWorldLastEvent event) { World world = Minecraft.getMinecraft().theWorld; - if(world.provider.dimensionId == 0/* && WorldTypeSkyblock.isWorldSkyblock(Minecraft.getMinecraft().theWorld)*/) { + if(ConfigHandler.enableFancySkybox && world.provider.dimensionId == 0 && (ConfigHandler.enableFancySkyboxInNormalWorlds || WorldTypeSkyblock.isWorldSkyblock(Minecraft.getMinecraft().theWorld))) { if(!(world.provider.getSkyRenderer() instanceof SkyblockSkyRenderer)) world.provider.setSkyRenderer(new SkyblockSkyRenderer()); } diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index f8e252e78..64bef6bee 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -35,148 +35,150 @@ public class SkyblockSkyRenderer extends IRenderHandler { private static final ResourceLocation textureSkybox = new ResourceLocation(LibResources.MISC_SKYBOX); private static final ResourceLocation textureRainbow = new ResourceLocation(LibResources.MISC_RAINBOW); private static final ResourceLocation textureMoonPhases = new ResourceLocation("textures/environment/moon_phases.png"); - private static final ResourceLocation textureSun = new ResourceLocation("textures/environment/sun.png"); - private static final ResourceLocation[] planetTextures = new ResourceLocation[] { - new ResourceLocation(LibResources.MISC_PLANET + "0.png"), - new ResourceLocation(LibResources.MISC_PLANET + "1.png"), - new ResourceLocation(LibResources.MISC_PLANET + "2.png"), - new ResourceLocation(LibResources.MISC_PLANET + "3.png"), - new ResourceLocation(LibResources.MISC_PLANET + "4.png"), - new ResourceLocation(LibResources.MISC_PLANET + "5.png") - }; - + private static final ResourceLocation textureSun = new ResourceLocation("textures/environment/sun.png"); + private static final ResourceLocation[] planetTextures = new ResourceLocation[] { + new ResourceLocation(LibResources.MISC_PLANET + "0.png"), + new ResourceLocation(LibResources.MISC_PLANET + "1.png"), + new ResourceLocation(LibResources.MISC_PLANET + "2.png"), + new ResourceLocation(LibResources.MISC_PLANET + "3.png"), + new ResourceLocation(LibResources.MISC_PLANET + "4.png"), + new ResourceLocation(LibResources.MISC_PLANET + "5.png") + }; + @Override public void render(float partialTicks, WorldClient world, Minecraft mc) { boolean test = false; if(test) return; - + int glSkyList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST); - int glSkyList2 = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST2); // Horizon like. We don't have it here + int glSkyList2 = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST2); // Horizon line. We don't have it here int starGLCallList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.STAR_GL_CALL_LIST); - GL11.glDisable(GL11.GL_TEXTURE_2D); - Vec3 vec3 = world.getSkyColor(mc.renderViewEntity, partialTicks); - float f1 = (float)vec3.xCoord; - float f2 = (float)vec3.yCoord; - float f3 = (float)vec3.zCoord; - float f6; - - int startFade = 25; - float insideVoid = Math.max(0F, ((float) (startFade - mc.thePlayer.posY) / startFade)); - f1 = Math.max(0F, f1 - insideVoid); - f2 = Math.max(0F, f2 - insideVoid); - f3 = Math.max(0F, f3 - insideVoid); + GL11.glDisable(GL11.GL_TEXTURE_2D); + Vec3 vec3 = world.getSkyColor(mc.renderViewEntity, partialTicks); + float f1 = (float)vec3.xCoord; + float f2 = (float)vec3.yCoord; + float f3 = (float)vec3.zCoord; + float f6; - Tessellator tessellator1 = Tessellator.instance; - GL11.glDepthMask(false); - GL11.glEnable(GL11.GL_FOG); - GL11.glColor3f(f1, f2, f3); - GL11.glCallList(glSkyList); - GL11.glDisable(GL11.GL_FOG); - GL11.glDisable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_BLEND); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); - RenderHelper.disableStandardItemLighting(); - float[] afloat = world.provider.calcSunriseSunsetColors(world.getCelestialAngle(partialTicks), partialTicks); - float f7; - float f8; - float f9; - float f10; + int startFade = 25; + float insideVoid = Math.max(0F, ((float) (startFade - mc.thePlayer.posY) / startFade)); + f1 = Math.max(0F, f1 - insideVoid); + f2 = Math.max(0F, f2 - insideVoid); + f3 = Math.max(0F, f3 - insideVoid); - // === Sunset - if(afloat != null) { - GL11.glDisable(GL11.GL_TEXTURE_2D); - GL11.glShadeModel(GL11.GL_SMOOTH); - GL11.glPushMatrix(); - GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(MathHelper.sin(world.getCelestialAngleRadians(partialTicks)) < 0.0F ? 180.0F : 0.0F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); - f6 = afloat[0]; - f7 = afloat[1]; - f8 = afloat[2]; - float f11; + Tessellator tessellator1 = Tessellator.instance; + GL11.glDepthMask(false); + GL11.glEnable(GL11.GL_FOG); + GL11.glColor3f(f1, f2, f3); + GL11.glCallList(glSkyList); + GL11.glDisable(GL11.GL_FOG); + GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_BLEND); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + RenderHelper.disableStandardItemLighting(); + float[] afloat = world.provider.calcSunriseSunsetColors(world.getCelestialAngle(partialTicks), partialTicks); + float f7; + float f8; + float f9; + float f10; - tessellator1.startDrawing(6); - tessellator1.setColorRGBA_F(f6, f7, f8, afloat[3] * (1F - insideVoid)); - tessellator1.addVertex(0.0D, 100.0D, 0.0D); - byte b0 = 16; - tessellator1.setColorRGBA_F(afloat[0], afloat[1], afloat[2], 0.0F); + // === Sunset + if(afloat != null) { + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glShadeModel(GL11.GL_SMOOTH); + GL11.glPushMatrix(); + GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); + GL11.glRotatef(MathHelper.sin(world.getCelestialAngleRadians(partialTicks)) < 0.0F ? 180.0F : 0.0F, 0.0F, 0.0F, 1.0F); + GL11.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); + f6 = afloat[0]; + f7 = afloat[1]; + f8 = afloat[2]; + float f11; - for(int j = 0; j <= b0; ++j) { - f11 = (float)j * (float)Math.PI * 2.0F / (float)b0; - float f12 = MathHelper.sin(f11); - float f13 = MathHelper.cos(f11); - tessellator1.addVertex((double)(f12 * 120.0F), (double)(f13 * 120.0F), (double)(-f13 * 40.0F * afloat[3])); - } + tessellator1.startDrawing(6); + tessellator1.setColorRGBA_F(f6, f7, f8, afloat[3] * (1F - insideVoid)); + tessellator1.addVertex(0.0D, 100.0D, 0.0D); + byte b0 = 16; + tessellator1.setColorRGBA_F(afloat[0], afloat[1], afloat[2], 0.0F); - tessellator1.draw(); - GL11.glPopMatrix(); - GL11.glShadeModel(GL11.GL_FLAT); - } + for(int j = 0; j <= b0; ++j) { + f11 = (float)j * (float)Math.PI * 2.0F / (float)b0; + float f12 = MathHelper.sin(f11); + float f13 = MathHelper.cos(f11); + tessellator1.addVertex((double)(f12 * 120.0F), (double)(f13 * 120.0F), (double)(-f13 * 40.0F * afloat[3])); + } - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glPushMatrix(); - f6 = Math.max(0.2F, 1.0F - world.getRainStrength(partialTicks)) * (1F - insideVoid); - f7 = 0.0F; - f8 = 0.0F; - f9 = 0.0F; - - GL11.glTranslatef(f7, f8, f9); - GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); - - float celAng = world.getCelestialAngle(partialTicks); - float effCelAng = celAng; - if(celAng > 0.5) - effCelAng = 0.5F - (celAng - 0.5F); - - // === Planets - f10 = 20F; - float a = Math.max(0F, effCelAng - 0.3F) * f6; + tessellator1.draw(); + GL11.glPopMatrix(); + GL11.glShadeModel(GL11.GL_FLAT); + } - OpenGlHelper.glBlendFunc(770, 771, 1, 0); - GL11.glPushMatrix(); - GL11.glColor4f(1F, 1F, 1F, a * 4); - GL11.glRotatef(90F, 0.5F, 0.5F, 0.0F); - for(int p = 0; p < planetTextures.length; p++) { - mc.renderEngine.bindTexture(planetTextures[p]); - drawObject(tessellator1, f10); - - switch(p) { - case 0: - GL11.glRotatef(70F, 1F, 0F, 0F); - f10 = 12F; - break; - case 1: - GL11.glRotatef(120F, 0F, 0F, 1F); - f10 = 15F; - break; - case 2: - GL11.glRotatef(80F, 1F, 0F, 1F); - f10 = 25F; - break; - case 3: - GL11.glRotatef(100F, 0F, 0F, 1F); - f10 = 10F; - break; - case 4: - GL11.glRotatef(-60F, 1F, 0F, 0.5F); - f10 = 40F; - } - } - GL11.glColor4f(1F, 1F, 1F, 1F); - GL11.glPopMatrix(); - - // === Rays - mc.renderEngine.bindTexture(textureSkybox); - - f10 = 20F; - GL11.glPushMatrix(); - OpenGlHelper.glBlendFunc(770, 1, 1, 0); - GL11.glTranslatef(0F, -1F, 0F); - GL11.glRotatef(220F, 1F, 0F, 0F); - GL11.glColor4f(1F, 1F, 1F, a); - int angles = 90; + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glPushMatrix(); + f6 = Math.max(0.2F, 1.0F - world.getRainStrength(partialTicks)) * (1F - insideVoid); + f7 = 0.0F; + f8 = 0.0F; + f9 = 0.0F; + + GL11.glTranslatef(f7, f8, f9); + GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); + + float celAng = world.getCelestialAngle(partialTicks); + float effCelAng = celAng; + if(celAng > 0.5) + effCelAng = 0.5F - (celAng - 0.5F); + + // === Planets + f10 = 20F; + float lowA = Math.max(0F, effCelAng - 0.3F) * f6; + float a = Math.max(0.1F, lowA); + + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GL11.glPushMatrix(); + GL11.glColor4f(1F, 1F, 1F, a * 4); + GL11.glRotatef(90F, 0.5F, 0.5F, 0.0F); + for(int p = 0; p < planetTextures.length; p++) { + mc.renderEngine.bindTexture(planetTextures[p]); + drawObject(tessellator1, f10); + + switch(p) { + case 0: + GL11.glRotatef(70F, 1F, 0F, 0F); + f10 = 12F; + break; + case 1: + GL11.glRotatef(120F, 0F, 0F, 1F); + f10 = 15F; + break; + case 2: + GL11.glRotatef(80F, 1F, 0F, 1F); + f10 = 25F; + break; + case 3: + GL11.glRotatef(100F, 0F, 0F, 1F); + f10 = 10F; + break; + case 4: + GL11.glRotatef(-60F, 1F, 0F, 0.5F); + f10 = 40F; + } + } + GL11.glColor4f(1F, 1F, 1F, 1F); + GL11.glPopMatrix(); + + // === Rays + mc.renderEngine.bindTexture(textureSkybox); + + f10 = 20F; + a = lowA; + GL11.glPushMatrix(); + OpenGlHelper.glBlendFunc(770, 1, 1, 0); + GL11.glTranslatef(0F, -1F, 0F); + GL11.glRotatef(220F, 1F, 0F, 0F); + GL11.glColor4f(1F, 1F, 1F, a); + int angles = 90; float s = 3F; float m = 1F; float y = 2F; @@ -186,81 +188,81 @@ public class SkyblockSkyRenderer extends IRenderHandler { double fuzzPer = (Math.PI * 10) / angles; float rotSpeed = 1F; float rotSpeedMod = 0.4F; - + for(int p = 0; p < 3; p++) { float baseAngle = rotSpeed * rotSpeedMod * (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks); GL11.glRotatef((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.25F * rotSpeed * rotSpeedMod, 0F, 1F, 0F); - - tessellator1.startDrawingQuads(); + + tessellator1.startDrawingQuads(); for(int i = 0; i < angles; i++) { int j = i; if(i % 2 == 0) j--; - + float ang = j * anglePer + baseAngle; double xp = Math.cos(ang * Math.PI / 180F) * f10; double zp = Math.sin(ang * Math.PI / 180F) * f10; double yo = Math.sin(fuzzPer * j) * 1; - + float ut = ang * uPer; if(i % 2 == 0) { tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); - tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); + tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); } else { - tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); - tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); + tessellator1.addVertexWithUV(xp, yo + y0, zp, ut, 0); + tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); } } tessellator1.draw(); switch(p) { - case 0: - GL11.glRotatef(20F, 1F, 0F, 0F); - GL11.glColor4f(1F, 0.4F, 0.4F, a); - fuzzPer = (Math.PI * 14) / angles; - rotSpeed = 0.2F; - break; - case 1: - GL11.glRotatef(50F, 1F, 0F, 0F); - GL11.glColor4f(0.4F, 1F, 0.7F, a); - fuzzPer = (Math.PI * 6) / angles; - rotSpeed = 2F; - break; + case 0: + GL11.glRotatef(20F, 1F, 0F, 0F); + GL11.glColor4f(1F, 0.4F, 0.4F, a); + fuzzPer = (Math.PI * 14) / angles; + rotSpeed = 0.2F; + break; + case 1: + GL11.glRotatef(50F, 1F, 0F, 0F); + GL11.glColor4f(0.4F, 1F, 0.7F, a); + fuzzPer = (Math.PI * 6) / angles; + rotSpeed = 2F; + break; } } GL11.glPopMatrix(); - + // === Rainbow GL11.glPushMatrix(); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); - mc.renderEngine.bindTexture(textureRainbow); - f10 = 10F; - float effCelAng1 = celAng; - if(effCelAng1 > 0.25F) - effCelAng1 = 1F - effCelAng1; - effCelAng1 = 0.25F - Math.min(0.25F, effCelAng1); - - long time = world.getWorldTime() + 1000; - int day = (int) (time / 24000L); - Random rand = new Random(("" + day).hashCode()); - float angle1 = rand.nextFloat() * 360F; - float angle2 = rand.nextFloat() * 360F; - GL11.glColor4f(1F, 1F, 1F, effCelAng1); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + mc.renderEngine.bindTexture(textureRainbow); + f10 = 10F; + float effCelAng1 = celAng; + if(effCelAng1 > 0.25F) + effCelAng1 = 1F - effCelAng1; + effCelAng1 = 0.25F - Math.min(0.25F, effCelAng1); + + long time = world.getWorldTime() + 1000; + int day = (int) (time / 24000L); + Random rand = new Random(day * 0xFF); + float angle1 = rand.nextFloat() * 360F; + float angle2 = rand.nextFloat() * 360F; + GL11.glColor4f(1F, 1F, 1F, effCelAng1 * (1F - insideVoid)); GL11.glRotatef(angle1, 0F, 1F, 0F); GL11.glRotatef(angle2, 0F, 0F, 1F); - tessellator1.startDrawingQuads(); + tessellator1.startDrawingQuads(); for(int i = 0; i < angles; i++) { int j = i; if(i % 2 == 0) j--; - + float ang = j * anglePer; double xp = Math.cos(ang * Math.PI / 180F) * f10; double zp = Math.sin(ang * Math.PI / 180F) * f10; double yo = 0; - + float ut = ang * uPer; if(i % 2 == 0) { tessellator1.addVertexWithUV(xp, yo + y0 + y, zp, ut, 1F); @@ -275,92 +277,92 @@ public class SkyblockSkyRenderer extends IRenderHandler { GL11.glPopMatrix(); GL11.glColor4f(1F, 1F, 1F, 1F - insideVoid); - - OpenGlHelper.glBlendFunc(770, 1, 1, 0); - - // === Sun - GL11.glRotatef(world.getCelestialAngle(partialTicks) * 360.0F, 1.0F, 0.0F, 0.0F); - f10 = 60.0F; - mc.renderEngine.bindTexture(textureSun); - drawObject(tessellator1, f10); - - // === Moon - f10 = 60.0F; - mc.renderEngine.bindTexture(textureMoonPhases); - int k = world.getMoonPhase(); - int l = k % 4; - int i1 = k / 4 % 2; - float f14 = (float)(l + 0) / 4.0F; - float f15 = (float)(i1 + 0) / 2.0F; - float f16 = (float)(l + 1) / 4.0F; - float f17 = (float)(i1 + 1) / 2.0F; - tessellator1.startDrawingQuads(); - tessellator1.addVertexWithUV((double)(-f10), -100.0D, (double)f10, (double)f16, (double)f17); - tessellator1.addVertexWithUV((double)f10, -100.0D, (double)f10, (double)f14, (double)f17); - tessellator1.addVertexWithUV((double)f10, -100.0D, (double)(-f10), (double)f14, (double)f15); - tessellator1.addVertexWithUV((double)(-f10), -100.0D, (double)(-f10), (double)f16, (double)f15); - tessellator1.draw(); - - // === Stars - f6 *= Math.max(0.1F, effCelAng * 2); - float t = (ClientTickHandler.ticksInGame + partialTicks + 2000) * 0.005F; - GL11.glPushMatrix(); - GL11.glDisable(GL11.GL_TEXTURE_2D); - - GL11.glPushMatrix(); - GL11.glRotatef(t * 3, 0F, 1F, 0F); + + OpenGlHelper.glBlendFunc(770, 1, 1, 0); + + // === Sun + GL11.glRotatef(world.getCelestialAngle(partialTicks) * 360.0F, 1.0F, 0.0F, 0.0F); + f10 = 60.0F; + mc.renderEngine.bindTexture(textureSun); + drawObject(tessellator1, f10); + + // === Moon + f10 = 60.0F; + mc.renderEngine.bindTexture(textureMoonPhases); + int k = world.getMoonPhase(); + int l = k % 4; + int i1 = k / 4 % 2; + float f14 = (float)(l + 0) / 4.0F; + float f15 = (float)(i1 + 0) / 2.0F; + float f16 = (float)(l + 1) / 4.0F; + float f17 = (float)(i1 + 1) / 2.0F; + tessellator1.startDrawingQuads(); + tessellator1.addVertexWithUV((double)(-f10), -100.0D, (double)f10, (double)f16, (double)f17); + tessellator1.addVertexWithUV((double)f10, -100.0D, (double)f10, (double)f14, (double)f17); + tessellator1.addVertexWithUV((double)f10, -100.0D, (double)(-f10), (double)f14, (double)f15); + tessellator1.addVertexWithUV((double)(-f10), -100.0D, (double)(-f10), (double)f16, (double)f15); + tessellator1.draw(); + + // === Stars + f6 *= Math.max(0.1F, effCelAng * 2); + float t = (ClientTickHandler.ticksInGame + partialTicks + 2000) * 0.005F; + GL11.glPushMatrix(); + GL11.glDisable(GL11.GL_TEXTURE_2D); + + GL11.glPushMatrix(); + GL11.glRotatef(t * 3, 0F, 1F, 0F); GL11.glColor4f(1F, 1F, 1F, f6); GL11.glCallList(starGLCallList); GL11.glPopMatrix(); - + GL11.glPushMatrix(); - GL11.glRotatef(t, 0F, 1F, 0F); - GL11.glColor4f(0.5F, 1F, 1F, f6); + GL11.glRotatef(t, 0F, 1F, 0F); + GL11.glColor4f(0.5F, 1F, 1F, f6); GL11.glCallList(starGLCallList); GL11.glPopMatrix(); - + GL11.glPushMatrix(); - GL11.glRotatef(t * 2, 0F, 1F, 0F); - GL11.glColor4f(1F, 0.75F, 0.75F, f6); - GL11.glCallList(starGLCallList); - GL11.glPopMatrix(); - - GL11.glPushMatrix(); - GL11.glRotatef(t * 3, 0F, 0F, 1F); + GL11.glRotatef(t * 2, 0F, 1F, 0F); + GL11.glColor4f(1F, 0.75F, 0.75F, f6); + GL11.glCallList(starGLCallList); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + GL11.glRotatef(t * 3, 0F, 0F, 1F); GL11.glColor4f(1F, 1F, 1F, 0.25F * f6); GL11.glCallList(starGLCallList); GL11.glPopMatrix(); - + GL11.glPushMatrix(); - GL11.glRotatef(t, 0F, 0F, 1F); - GL11.glColor4f(0.5F, 1F, 1F, 0.25F * f6); + GL11.glRotatef(t, 0F, 0F, 1F); + GL11.glColor4f(0.5F, 1F, 1F, 0.25F * f6); GL11.glCallList(starGLCallList); GL11.glPopMatrix(); - - GL11.glPushMatrix(); - GL11.glRotatef(t * 2, 0F, 0F, 1F); - GL11.glColor4f(1F, 0.75F, 0.75F, 0.25F * f6); - GL11.glCallList(starGLCallList); - GL11.glPopMatrix(); - - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glPopMatrix(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_ALPHA_TEST); - GL11.glEnable(GL11.GL_FOG); - GL11.glPopMatrix(); - GL11.glDepthMask(true); + GL11.glPushMatrix(); + GL11.glRotatef(t * 2, 0F, 0F, 1F); + GL11.glColor4f(1F, 0.75F, 0.75F, 0.25F * f6); + GL11.glCallList(starGLCallList); + GL11.glPopMatrix(); + + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glPopMatrix(); + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glEnable(GL11.GL_FOG); + GL11.glPopMatrix(); + GL11.glDepthMask(true); } - + private void drawObject(Tessellator tess, float f10) { - tess.startDrawingQuads(); - tess.addVertexWithUV((double)(-f10), 100.0D, (double)(-f10), 0.0D, 0.0D); - tess.addVertexWithUV((double)f10, 100.0D, (double)(-f10), 1.0D, 0.0D); - tess.addVertexWithUV((double)f10, 100.0D, (double)f10, 1.0D, 1.0D); - tess.addVertexWithUV((double)(-f10), 100.0D, (double)f10, 0.0D, 1.0D); - tess.draw(); + tess.startDrawingQuads(); + tess.addVertexWithUV((double)(-f10), 100.0D, (double)(-f10), 0.0D, 0.0D); + tess.addVertexWithUV((double)f10, 100.0D, (double)(-f10), 1.0D, 0.0D); + tess.addVertexWithUV((double)f10, 100.0D, (double)f10, 1.0D, 1.0D); + tess.addVertexWithUV((double)(-f10), 100.0D, (double)f10, 0.0D, 1.0D); + tess.draw(); } } 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 6d4429869..240a503bf 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -62,6 +62,9 @@ public final class ConfigHandler { public static boolean enableSeasonalFeatures = true; public static boolean useShiftForQuickLookup = false; public static boolean enableArmorModels = true; + public static boolean enableFancySkybox = true; + public static boolean enableFancySkyboxInNormalWorlds = false; + public static int manaBarHeight = 29; public static int flightBarHeight = 49; public static int flightBarBreathHeight = 59; @@ -176,6 +179,12 @@ public final class ConfigHandler { desc = "Set this to false to disable custom armor models."; enableArmorModels = loadPropBool("armorModels.enable", desc, enableArmorModels); + desc = "Set this to false to disable the fancy skybox in Garden of Glass."; + enableFancySkybox = loadPropBool("fancySkybox.enable", desc, enableFancySkybox); + + desc = "Set this to true to enable the fancy skybox in non Garden of Glass worlds. (Does not require Garden of Glass loaded to use, needs 'fancySkybox.enable' to be true as well)"; + enableFancySkyboxInNormalWorlds = loadPropBool("fancySkybox.normalWorlds", desc, enableFancySkyboxInNormalWorlds); + desc = "The height of the mana display bar in above the XP bar. You can change this if you have a mod that changes where the XP bar is."; manaBarHeight = loadPropInt("manaBar.height", desc, manaBarHeight); From 501e50f983d3d7ede62a4c937eb322bd7d9bc0eb Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 19 Dec 2015 18:26:06 +0000 Subject: [PATCH 16/23] I can't live with myself if this stays like that --- .../vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java index 4995b4502..1b2646b9e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java @@ -1,5 +1,5 @@ /** -* This class was created by . It's distributed as + * This class was created by . It's distributed as * part of the Botania Mod. Get the Source Code in github: * https://github.com/Vazkii/Botania * From 8f480bda6ba79b23c6d9bf220366d10adc2b7b2a Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 19 Dec 2015 18:27:11 +0000 Subject: [PATCH 17/23] Increased the drop rate of Melon and Pumpkin seeds on Garden of Glass. Again. --- .../java/vazkii/botania/common/world/SkyblockWorldEvents.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index e7e4ced9e..5d84c8233 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -111,7 +111,7 @@ public final class SkyblockWorldEvents { if(WorldTypeSkyblock.isWorldSkyblock(event.world) && event.block == Blocks.tallgrass) { ItemStack stackToRemove = null; for(ItemStack stack : event.drops) - if(stack.getItem() == Items.wheat_seeds && event.world.rand.nextInt(10) == 0) { + if(stack.getItem() == Items.wheat_seeds && event.world.rand.nextInt(4) == 0) { stackToRemove = stack; break; } From 351d78bbc95435e48e34642203adb54b394dc8c2 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 19 Dec 2015 18:38:52 +0000 Subject: [PATCH 18/23] Fixed Luminizers that have been bound to another Luminizer that has then been removed taking you to the place where the removed one was. --- .../vazkii/botania/common/block/tile/TileLightRelay.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 72710c972..063526503 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -227,8 +227,9 @@ public class TileLightRelay extends TileMod implements IWandBindable { worldObj.scheduleBlockUpdate(x, y, z, tile.getBlockType(), tile.getBlockType().tickRate(worldObj)); } - ChunkCoordinates bind = ((TileLightRelay) tile).getBinding(); - if(bind != null) { + TileLightRelay relay = (TileLightRelay) tile; + ChunkCoordinates bind = relay.getBinding(); + if(bind != null && relay.isValidBinding()) { setExit(bind.posX, bind.posY, bind.posZ); return; } From 8b40d7420c980ed92fe634b97e3ed3a28d7a6255 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 19 Dec 2015 18:48:38 +0000 Subject: [PATCH 19/23] Fixed a bunch of stuff in the mod not rendering properly if something disables the OpenGL Lighting capability (See: NEI, Neat). Also using glPushAttrib now --- .../botania/client/core/handler/BoundTileRenderer.java | 3 +++ .../client/core/handler/MultiblockRenderHandler.java | 9 ++++++++- .../botania/client/core/handler/RedStringRenderer.java | 8 +++----- .../client/core/handler/SubTileRadiusRenderHandler.java | 6 ++---- .../core/handler/TooltipAdditionDisplayHandler.java | 5 ++--- .../botania/client/fx/ParticleRenderDispatcher.java | 8 +++----- .../java/vazkii/botania/client/model/ModelHourglass.java | 5 ++--- 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 968dbfdd6..232d8a310 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -39,8 +39,10 @@ public final class BoundTileRenderer { @SubscribeEvent public void onWorldRenderLast(RenderWorldLastEvent event) { GL11.glPushMatrix(); + GL11.glPushAttrib(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_DEPTH_TEST); GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glDisable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_BLEND); Tessellator.renderingWorldRenderer = false; @@ -85,6 +87,7 @@ public final class BoundTileRenderer { GL11.glEnable(GL11.GL_DEPTH_TEST); GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glDisable(GL11.GL_BLEND); + GL11.glPopAttrib(); GL11.glPopMatrix(); } diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index 179a68dbe..14295ff78 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -83,6 +83,11 @@ public final class MultiblockRenderHandler { int anchorY = anchor != null ? anchor.posY : src.blockY; int anchorZ = anchor != null ? anchor.posZ : src.blockZ; + GL11.glPushMatrix(); + GL11.glPushAttrib(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glDisable(GL11.GL_LIGHTING); rendering = true; Multiblock mb = anchor != null ? currentMultiblock.getForIndex(angle) : currentMultiblock.getForEntity(player); boolean didAny = false; @@ -93,7 +98,9 @@ public final class MultiblockRenderHandler { if(renderComponentInWorld(player.worldObj, mb, comp, anchorX, anchorY, anchorZ)) didAny = true; rendering = false; - + GL11.glPopAttrib(); + GL11.glPopMatrix(); + if(!didAny) { setMultiblock(null); player.addChatComponentMessage(new ChatComponentTranslation("botaniamisc.structureComplete").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GREEN))); diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index 12705600f..fdcd0a268 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -35,11 +35,10 @@ public final class RedStringRenderer { public static void renderAll() { if(!redStringTiles.isEmpty()) { GL11.glPushMatrix(); - boolean lighting = GL11.glGetBoolean(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_TEXTURE_2D); GL11.glEnable(GL11.GL_BLEND); - if(lighting) - GL11.glDisable(GL11.GL_LIGHTING); + GL11.glPushAttrib(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_LIGHTING); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glColor4f(1F, 0F, 0F, sizeAlpha); @@ -48,10 +47,9 @@ public final class RedStringRenderer { while((tile = redStringTiles.poll()) != null) renderTile(tile); - if(lighting) - GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glDisable(GL11.GL_BLEND); + GL11.glPopAttrib(); GL11.glPopMatrix(); } diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index a07d9236d..ca1333223 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -66,10 +66,9 @@ public final class SubTileRadiusRenderHandler { if(descriptor == null) return; - boolean light = GL11.glGetBoolean(GL11.GL_LIGHTING); - GL11.glPushMatrix(); GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glPushAttrib(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -79,10 +78,9 @@ public final class SubTileRadiusRenderHandler { renderCircle(descriptor.getSubtileCoords(), descriptor.getCircleRadius()); else renderRectangle(descriptor.getAABB()); - if(light) - GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_TEXTURE_2D); GL11.glDisable(GL11.GL_BLEND); + GL11.glPopAttrib(); GL11.glPopMatrix(); } diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index 79f519fc3..e7e7b8337 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -186,16 +186,15 @@ public final class TooltipAdditionDisplayHandler { Gui.drawRect(mouseX + offx + rainbowWidth, mouseY - offy - height, mouseX + offx + width, mouseY - offy, 0xFF555555); String rank = StatCollector.translateToLocal("botania.rank" + level).replaceAll("&", "\u00a7"); - boolean light = GL11.glGetBoolean(GL11.GL_LIGHTING); + GL11.glPushAttrib(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_LIGHTING); font.drawStringWithShadow(rank, mouseX + offx, mouseY - offy - 12, 0xFFFFFF); if(!ss) { rank = StatCollector.translateToLocal("botania.rank" + (level + 1)).replaceAll("&", "\u00a7"); font.drawStringWithShadow(rank, mouseX + offx + width - font.getStringWidth(rank), mouseY - offy - 12, 0xFFFFFF); } - if(light) - GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glPopAttrib(); } private static void drawManaBar(ItemStack stack, IManaTooltipDisplay display, int mouseX, int mouseY, int offx, int offy, int width, int height) { diff --git a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java index b711a9dcd..51915027f 100644 --- a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java +++ b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java @@ -30,15 +30,14 @@ public final class ParticleRenderDispatcher { public static void dispatch() { Tessellator tessellator = Tessellator.instance; - boolean isLightingEnabled = GL11.glGetBoolean(GL11.GL_LIGHTING); Profiler profiler = Minecraft.getMinecraft().mcProfiler; + GL11.glPushAttrib(GL11.GL_LIGHTING); GL11.glDepthMask(false); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F); - if(isLightingEnabled) - GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_LIGHTING); profiler.startSection("sparkle"); FXSparkle.dispatchQueuedRenders(tessellator); @@ -46,11 +45,10 @@ public final class ParticleRenderDispatcher { FXWisp.dispatchQueuedRenders(tessellator); profiler.endSection(); - if(isLightingEnabled) - GL11.glEnable(GL11.GL_LIGHTING); GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); GL11.glDisable(GL11.GL_BLEND); GL11.glDepthMask(true); + GL11.glPopAttrib(); } } diff --git a/src/main/java/vazkii/botania/client/model/ModelHourglass.java b/src/main/java/vazkii/botania/client/model/ModelHourglass.java index d32af9c75..a1ca14ddc 100644 --- a/src/main/java/vazkii/botania/client/model/ModelHourglass.java +++ b/src/main/java/vazkii/botania/client/model/ModelHourglass.java @@ -66,7 +66,7 @@ public class ModelHourglass extends ModelBase { base2.render(f); Color c = new Color(color); GL11.glColor3ub((byte) c.getRed(), (byte) c.getGreen(), (byte) c.getBlue()); - boolean normalize = GL11.glGetBoolean(GL11.GL_NORMALIZE); + GL11.glPushAttrib(GL11.GL_NORMALIZE); GL11.glEnable(GL11.GL_NORMALIZE); if(fract1 > 0) { @@ -97,8 +97,7 @@ public class ModelHourglass extends ModelBase { GL11.glPopMatrix(); } - if(!normalize) - GL11.glDisable(GL11.GL_NORMALIZE); + GL11.glPopAttrib(); GL11.glColor3f(1F, 1F, 1F); glass1.render(f); glass2.render(f); From deb6fa792a5512ddc19b199f1762baec036493d6 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 19 Dec 2015 19:11:53 +0000 Subject: [PATCH 20/23] YEAH, CHRISTMAS --- .../botania/client/lib/LibResources.java | 1 + .../armor/manasteel/ItemManasteelArmor.java | 22 +++++---- .../armor/manaweave/ItemManaweaveArmor.java | 45 +++++++++++++++++-- .../resources/assets/botania/lang/en_US.lang | 5 +++ 4 files changed, 60 insertions(+), 13 deletions(-) diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index b65387acf..584d12181 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -99,6 +99,7 @@ public final class LibResources { public static final String MODEL_MANAWEAVE_0 = PREFIX_MODEL + "manaweave0.png"; public static final String MODEL_MANAWEAVE_1 = PREFIX_MODEL + "manaweave1.png"; public static final String MODEL_MANAWEAVE_NEW = PREFIX_MODEL + "manaweaveNew.png"; + public static final String MODEL_MANAWEAVE_NEW_HOLIDAY = PREFIX_MODEL + "manaweaveNewHoliday.png"; public static final String MODEL_PIXIE = PREFIX_MODEL + "pixie.png"; public static final String MODEL_TINY_POTATO = PREFIX_MODEL + "tinyPotato.png"; public static final String MODEL_TINY_POTATO_GS = PREFIX_MODEL + "tinyPotatoGray.png"; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 0e843f727..b73a63f8e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -161,17 +161,21 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { - if(GuiScreen.isShiftKeyDown()) { - addStringToTooltip(getArmorSetTitle(player), list); - addArmorSetDescription(stack, list); - ItemStack[] stacks = getArmorSetStacks(); - for(int i = 0; i < stacks.length; i++) - addStringToTooltip((hasArmorSetItem(player, i) ? EnumChatFormatting.GREEN : "") + " - " + stacks[i].getDisplayName(), list); - if(hasPhantomInk(stack)) - addStringToTooltip(StatCollector.translateToLocal("botaniamisc.hasPhantomInk"), list); - } else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), list); + if(GuiScreen.isShiftKeyDown()) + addInformationAfterShift(stack, player, list, adv); + else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), list); } + public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { + addStringToTooltip(getArmorSetTitle(player), list); + addArmorSetDescription(stack, list); + ItemStack[] stacks = getArmorSetStacks(); + for(int i = 0; i < stacks.length; i++) + addStringToTooltip((hasArmorSetItem(player, i) ? EnumChatFormatting.GREEN : "") + " - " + stacks[i].getDisplayName(), list); + if(hasPhantomInk(stack)) + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.hasPhantomInk"), list); + } + public void addStringToTooltip(String s, List tooltip) { tooltip.add(s.replaceAll("&", "\u00a7")); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index ecfa2c090..97fec9a4d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -13,12 +13,16 @@ package vazkii.botania.common.item.equipment.armor.manaweave; import java.util.List; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.armor.ModelArmorManaweave; import vazkii.botania.common.achievement.ICraftAchievement; @@ -31,6 +35,8 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchievement { + IIcon iconChristmas; + public ItemManaweaveArmor(int type, String name) { super(type, name, BotaniaAPI.manaweaveArmorMaterial); } @@ -41,12 +47,32 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi models[slot] = new ModelArmorManaweave(slot); return models[slot]; } - + + @Override + public void registerIcons(IIconRegister par1IconRegister) { + super.registerIcons(par1IconRegister); + iconChristmas = IconHelper.forItem(par1IconRegister, this, "Holiday"); + } + @Override public String getArmorTextureAfterInk(ItemStack stack, int slot) { - return ConfigHandler.enableArmorModels ? LibResources.MODEL_MANAWEAVE_NEW : slot == 2 ? LibResources.MODEL_MANAWEAVE_1 : LibResources.MODEL_MANAWEAVE_0; + return ConfigHandler.enableArmorModels ? (ClientProxy.jingleTheBells ? LibResources.MODEL_MANAWEAVE_NEW_HOLIDAY : LibResources.MODEL_MANAWEAVE_NEW) : slot == 2 ? LibResources.MODEL_MANAWEAVE_1 : LibResources.MODEL_MANAWEAVE_0; } + @Override + public IIcon getIconFromDamage(int dmg) { + return ClientProxy.jingleTheBells ? iconChristmas : super.getIconFromDamage(dmg); + } + + @Override + @SideOnly(Side.CLIENT) + public String getUnlocalizedName(ItemStack p_77667_1_) { + String name = super.getUnlocalizedName(p_77667_1_); + if(ClientProxy.jingleTheBells) + name = name.replaceAll("manaweave", "santaweave"); + return name; + } + @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 22 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); @@ -87,11 +113,22 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi public String getArmorSetName() { return StatCollector.translateToLocal("botania.armorset.manaweave.name"); } - + + @Override + public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { + if(ClientProxy.jingleTheBells) { + addStringToTooltip(StatCollector.translateToLocal("botaniamisc.santaweaveInfo"), list); + addStringToTooltip("", list); + } + + super.addInformationAfterShift(stack, player, list, adv); + } + @Override public void addArmorSetDescription(ItemStack stack, List list) { addStringToTooltip(StatCollector.translateToLocal("botania.armorset.manaweave.desc0"), list); - addStringToTooltip(StatCollector.translateToLocal("botania.armorset.manaweave.desc1"), list); } + addStringToTooltip(StatCollector.translateToLocal("botania.armorset.manaweave.desc1"), list); + } @Override public Achievement getAchievementOnCraft(ItemStack stack, EntityPlayer player, IInventory matrix) { diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index a7b80078f..ae2aaf8a9 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -150,6 +150,7 @@ botaniamisc.noVideo=&4Video will be back soon. Sorry :( botaniamisc.adaptativeConfigChanges=Botania's Adaptative Config has changed the following config defaults for you: botaniamisc.altarRefill0=Right click with an empty hand to botaniamisc.altarRefill1=add back the last recipe +botaniamisc.santaweaveInfo=Manaweave, changed up for the &cs&fe&ca&fs&co&fn # NEI INTEGRATION botania.nei.brewery=Botanical Brewery @@ -1644,6 +1645,10 @@ item.botania:manaweaveHelm.name=Manaweave Cowl item.botania:manaweaveChest.name=Manaweave Robe Top item.botania:manaweaveLegs.name=Manaweave Robe Bottom item.botania:manaweaveBoots.name=Manaweave Boots +item.botania:santaweaveHelm.name=Santaweave Cowl +item.botania:santaweaveChest.name=Santaweave Robe Top +item.botania:santaweaveLegs.name=Santaweave Robe Bottom +item.botania:santaweaveBoots.name=Santaweave Boots item.botania:gaiaHead.name=Gaia Guardian's Head item.botania:sextant.name=Worldshaper's Sextant item.botania:speedUpBelt.name=Planestrider's Sash From 5bba479d6a047e1d59487838f2fe6770113605ad Mon Sep 17 00:00:00 2001 From: wiiv Date: Sat, 19 Dec 2015 19:18:37 +0000 Subject: [PATCH 21/23] The planets in the sky! --- .../assets/botania/textures/misc/planet0.png | Bin 17833 -> 18546 bytes .../assets/botania/textures/misc/planet1.png | Bin 18073 -> 18549 bytes .../assets/botania/textures/misc/planet2.png | Bin 17830 -> 18377 bytes .../assets/botania/textures/misc/planet3.png | Bin 17873 -> 18703 bytes .../assets/botania/textures/misc/planet4.png | Bin 18131 -> 18758 bytes .../assets/botania/textures/misc/planet5.png | Bin 18114 -> 18674 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/botania/textures/misc/planet0.png b/src/main/resources/assets/botania/textures/misc/planet0.png index 29875ee382328aac34f2bf36dee2056e4cc855d1..0f36c34ce8495b52953888536595840d05b2ff7e 100644 GIT binary patch delta 592 zcmZ44&G=~o;GFnUh$Hpc?ZuemfGHZ z_FH=7Bs^A5UJ*Rw^Dq0nYVqC&i+s~7EoII%XNOEJR+!VdU%aEAzqi;o^L9i7!?AsUN>`QYW|K7fH4L^J4oXPDqn(KG3%~=&BcfGPGsAYkdL+0McTC?jn zXmR25>2;Di)hq2<WMYSbr+%T`gxDU9+ifLt%BE{@ zypNZT3)5Z}>2}M1#U6FpL*_O#B&XAj7xe+NK+MA6K23#(ibCaN3q_aqqu# wHWW{DoaAxwmcaKaiHYx%_x=3OTF1sPv#EB=cK(X`^9(@X>FVdQ&MBb@04Xrws{jB1 delta 310 zcmew~fpKLwTk08_nwy)L>nIo*7@F!E80#Aw=o%SY znHX4^7;X08c4nH~CnPX=8gI#DYa!mr;(R7xI)cx5@*P37%^UfmSSIflxxP75?4$up zlzmU>WHWdD`i-70jv*DdlK%YvZ_ljS(Anr@z`LjIy#odcchAiPnd8pm{{BwO?jupIvdhIIF0f{quS=^a zcqr7BYrQV+kig-WP22tF9~3?Gr$?uaPs05(6LSIsBUga1dB>py1|aZs^>bP0l+XkK Dt&)7? diff --git a/src/main/resources/assets/botania/textures/misc/planet1.png b/src/main/resources/assets/botania/textures/misc/planet1.png index 4b156d1f72958e571d351b899169ed3d2421e653..d9b66c5327cfa70fd811d162f67f56c8e6b8e4d4 100644 GIT binary patch delta 503 zcmbQ)%lLHyo|9(?ZJewi zQZm^`gln>=@Y&5%M7|g>n@{tY-0iAg|J&2WF{I+wo5^SW4h0CfoiA9uR)XndDJt zQ|{LI@#u1Fp}C}dc+v~?Ipw0RVIK{<3y+!kUN)$Y47z$%kV*gGE6tuhCfyweg`7pg zzcpxh+-BV;uEbQi@Ba2x+5$INUjAFge&WCW2V(~AdqR1eKI+)^FaUw4tDnm{r-UW| Dm=L_* delta 342 zcmex5fpKOpX@Bu}t1AVmY};^z7tU zB6XYX#l9FYU+|qb+00$P{*+bT&E}c<}D1e*e5)qR(sp&;RfC z&i_C4%JskMry6#Dulu+DZOwrViNCGcfS~PJ5i5vh(_^e-ll{E+zvnlmGYX7_ijVdt ztT}%C01yP+{>h;C?ai~=wtRUzA+rVBJ~KKuEEfRbF6|vGKO_@?gdtCYi@!(t`@etq zi_LggD!2@fh{q)V`0z>g@YKoYdMbD~e6;@m|K{1>8rwKKxD5{+;gA9v&A|T_Xyzh` imUWWL8I^VP8Q2)2qN6{Hr0&RM00K`}KbLh*2~7Z@hm7X{ diff --git a/src/main/resources/assets/botania/textures/misc/planet2.png b/src/main/resources/assets/botania/textures/misc/planet2.png index 1c2e40b42ebe31ebcba24e119a1af4ef600f8e3a..7af89bb0da0d2e991678a0f38a74bc6c97132bc2 100644 GIT binary patch delta 528 zcmZ41&3Lk(al>RTChJ3!r*ieFn(8JS7#S*L?f)7#iyv8t5BY>KYna znV4G{nr-&rc4nG9fw!K^GQ`jlC}3r3Fz8IFt(SmJ6sh-R#WQ}Z#myqY?8A1|9EU)rA{U&d5 z(W_@v^K@|xskrrI@?LMILYZUs<@+WcOY~rM)fWqNW|`!8Md-$bN#4Q#UA_PNoV|KW z;L#-kml-burnu^BO^MSeZ@gE!G;V)cr(Z$F3(5Hp4}X4Ixo?s{Q=ZD@rT^p}iP|vwlwInOpK5@`nfnU=(kY0`LdR*Z5?gw zJ9R@Vjc1E|Enj2zOuT!s<2K=+_oH`ItTSHr!{UsXrS_E-SEPT~<~h~rALpM{+*JRA b`#v+nv6(pzn^~(*G5~?6tDnm{r-UW|{oc&a delta 304 zcmV-00nh%)j{&BO0kD$_0y-Cyl?sj}HZ5Z?Ha8$QIW93ZH#amlEFdy4F*PqRGcPkR zEiyAYG%z|eGP6hvLjseI5)hM?4Rn(`5)G3V4m6WH5)G4B4l|S75hk;-4q61WyA+@? z1o4{17Nkl0B z;4n#nt!79?lw7pwE-#P!&VBH_rfHa?1vB;g0KaSOx4YI+GL@5vn8PI{^aIk{$r~le zRF2dNfJDRqgnsZ{1sfDCSJMO5LF7oR3R7ZU_4o~JXGMUr){bIwg+#RTCYvvlr*ieFn(8JS7#S*L?f)7#iyv8t5BY>KYna znV4G{nr-&rc4nG9fw!K^GQ`l*%Fx)#&~maQpE)u&iqA|XDK$CSC@Ixk*V4?)T-V6V zBvCgh&B9dIAT`Z0)xa_-(byStW=jItg{)~nN8Tlpo z#ToepRxbI;rManjC60N?sl_GvMa6bp3P`}FC?(CxDKUMrub_myU1CapQmR!-esX4t z6~c(*M8nk7WOL)mjQnzw-38?)KjO2U{6|Pi8>kP-G#h<{77SZA-xj`Vz!J*6>g(h! zE_(HhR-P`7Ar-ftOy2Fq94O*?-Pgyb>0kyATc9*+cf$m~EtgImlK)`N61{Qz_TJE{ z{Rd9DiAc)}axM{&{4{IE?8@_Vvr{Lx`*LxYS6bwJyER97%Qc_H62Y(D^QN`2f6s5X z3XxM%W9a=-!zBB7@nc0<3(H-?`=vatCsx0f$dueue`UTwRc_QK=lg*!okyOq$c6G= zcyq&MkKLx7aVe>ljTNV!d-I-9QS#A#@a$U%^PBgv9fh(TTa%_8N@~%x&*ayca&5-4 z-Zxe^mYuGA8uX;-=1Go)VSCJ9{qTC+HsSnoO`X&UWgIJ?a5Vj}ROw%3*7NOz)Aq~K zx9fJ6sI>`qtUeWFx_bAtysx!2_KQ+I7`6!Pn5PtQVTI|@gU9%uUSer^KFjky-wgdT x6VEK`Jj$vhr@pe`rb%y9vCSd-f35Es8SeG=JhzdZc8>uFJYD@<);T3K0RR^p3fcew delta 351 zcmV-l0igbmk^#|+0kD$_0y-Cyl?sj}HZ5Z?Ha8$QIW93ZH#amlEFdy4F*PqRGcPkR zEiyAYG%z|eGP6hvLjseI5)hM?4Rn(`5)G3V4m6WH5)G4B4l|S75hk;-4q610yA;>6 z#1_dg1f7&$K$DS2E`I>oNklQ7Sbn z5xr8xKWJ^#GD?N0(Jk$6|1@T@L6B$^ZZgHZOzxaJ^PUnBzEO%V^@9fID3s(HuZD7t zLa7gG(wa2nBZB#6iax9X=#+Z^IG*#Kpv&Un24j@XXFh*}VsNfxNsNx$6Y(W}IGeuP zE8o>JDpUd3hdWDQB6L{*Fr)dLU=&sGU5)Q*OHwIRlM&<<0seBpaeKn?9D;rufBj3@jSQq4~v&;Yh002ovPDHLkV1fY9k4^vp diff --git a/src/main/resources/assets/botania/textures/misc/planet4.png b/src/main/resources/assets/botania/textures/misc/planet4.png index c804db1e8d517555ad90940f248fe33da8ec7cab..58d647dcc3200d80379e92cb1842eb2f791b4bc6 100644 GIT binary patch delta 635 zcmccI%Xn-O|^nS5HiB~hkz zez{$-r{^L~Y3oIvR{}hGG$JE6Y)EK!3pSfJrT5Hq`-YfPrrN0olgz|4o?a8-Hr7r& z(_xU>V>JDJweB4=J>y7=`U5|0pU{ANoariyI8<_>b#2Y0(;oa2AG7~pdz9=JXsvZoXn}fswE&Zda7Lj(!%D}R i&_zGK=hsLwEUoL@^`7&f5Ca1PCxfS}pUXO@geCy`VDowa delta 428 zcmX>$iScqTX@Bu}t1AVmY};G>kVn z(J(bN+1yw+(KN+$G9$m_}1 z{rUgjo>{e_v(d?65~J|+vp?&*A0GZ6%_IL$J>>a+^_vWprJ`+bPhT?tfts4n^KA4_ ztX>V~edy*e0x>pBSX6m<*H<3-`+M56(-MH-2hh;N|NsA&oVWk)7kSC+x;K9Q|9RX0 zzpSwKzu#it|F*BJcRsEWH)G#Vi^CJOze`F0fl;k4n679!a-y4chU1|}mySp;SgpZW z&dFo5r*7WE)4Ri4ctKj4d;63?xJw(T_CpnOp2M>Bs$g^aVs`SEcLJpx^$#rGSoE%} zt^NA>#W%KnU1HKE;U~VQ_NT}?foJI{hB49&g$Ih26Brhpuc^HAzgvd^2s~Z=T-G@y GGywou)wN*& diff --git a/src/main/resources/assets/botania/textures/misc/planet5.png b/src/main/resources/assets/botania/textures/misc/planet5.png index bfb9ed2439f44cd7b664f6d33cf0cac7f5b5fbb0..ced8e3cd5d527494fd2c9a186ef6b44e2f205509 100644 GIT binary patch delta 551 zcmX@q%lK&`p>Qd(MSnq{go|9(?ZJewi zQZm^`gln>=aMRo zg5O`;eZKhI#!eRLtmKA2nQ?jR^{z=;+3er*QQ9~Hr5~8qb|^5Qf}?Rs-<=DU3Mu8!~V4zak}&59e%V%r`<4dkMK0( zf5qtGSgr52qv_<`DQWuZ9MMls3*BAuYW;%a#!|NOSMNKui9PhnnWZdRviqu(w2HUe zcTKI3B~d}o7;hd@P?A?ou}!d;wQ+{XlWi=FseE(ivi&-&B=VKv_Y`AON$EXxtrJ=6 yv=a=d#Wzp$P!k7|9R- delta 412 zcmV;N0b~C1kpaSu0kD$_0y^%Kl?sj}HZ5Z?Ha8$QIW93ZH#amlEFdy4F*PqRGcPkR zEiyAYG%z|eGP6hvLjseI5)hM?4Rn(`5)G3V4m6WH5)G4B4l|S75hk;-4q610yA(N- zaurq$V_`96Wn(upEnzieHIo4k8I$f66q8*RJ(KDbezTeu^DqP%36>9&kw-3n0P{&i zK~#9!?31x-!cY{3zgz4b0uqYDg-k+slci)TzCsIq1D&&U>CmT0pTSuPIF%04DN|yf zprjyP&^92=5Qp1An!&*Y99;az!{I;w|G^Q)7>>~eN9yzjt^Glorj)6QLe0KaD6ut%9hZj>b$rrP`2cDI2QZ+;`|Hz4FDRuP!vU_z_tJj0000 Date: Sat, 19 Dec 2015 19:28:36 +0000 Subject: [PATCH 22/23] Santa's little tweaks. --- .../textures/items/manaweaveChestHoliday.png | Bin 18787 -> 18811 bytes .../textures/items/manaweaveLegsHoliday.png | Bin 18848 -> 18845 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/botania/textures/items/manaweaveChestHoliday.png b/src/main/resources/assets/botania/textures/items/manaweaveChestHoliday.png index a4a3b8bdfb32da1c889bd6c14ac0066ad4639939..3dfeef409cc51dd8f92950df2000afce2c4fa868 100644 GIT binary patch delta 741 zcmaDniShR&#tj^N;+7$XmR3e)R;HFwHu@F01y;WKDVb@NlOOPkPB!5as#kEl)2RYul#b)Rp3U%DPscLbnvXkask?1eZMNKE; zj4VIr8d~-3{BoeR`kn3b)6ee|ubX%z?o49;Hs^#prc&j-VZke7BeYjeITpKEvHtPf z9iLB4*5|*|RDM}v`3vS0E$E3|O$PmQ~xw`Yhi z61W60rE23vt|@0zrp%lblyLF#F}2w26_-Q#Z4YW}$hi7l^vAw;`H!Z1G5pxWc>dV2 z6|yo3hgL67ek+6l{ z<6rRB7hbIIx_IH?mgk?Ce}v>({ENQLr01~k#-p1}s=I9b^>mor*3Qt4Sanxm`8Gar z3&EyS?3&u`?|w-!Sk0LLG-ltt;xAj})MTZs<_I)wJ|1=Q)J@yYW|1?;x0W*8N-|t@ z`m>JeWSzA&>RGPQj|CaT#F=Kv+nT7h23ebZFE12{5IG)dy-!_juGLD5bxhswrtSR~ xR^z##=4j#6%>u_mWx}7P|35x!Z{72HW`@Lj=65w$+}39R0#8>zmvv4FO#p70KdJx# delta 717 zcmex8iSh9y#tj^N;uax>=2oVrR>r1LHu@F01y;WKDVb@NlOOPkPB!5a{h{K_?8-C$&;FS=(M3J&<%K`jjs~AMd3vWOHR}7cp7oQ>o<%<@toQ%g zZ0qTfbac^=gSAH=ySnnNy>UhSscQRypU_F0R{i>G`0PaB)S55HoIkQ}`7WhfpB(z>qK{f=1^4O`OSifS9g~=5{KEB{ zNpSrB$=emD&eJ*nTG4auv5>m~1xg&e=W7br<;^VUl)QB}-%)7(tAfPh$(^egulaTS z#Q!_bPOg^nPSvp3_)EL@I?F`Qe}9ijSlqvV{PET4cV4t5C>%e0`@l7|$q)J0S#Oky z>blD*eX-u6{zJok>u81$A@{_`wt+K>!U`5mvf!&$tp1(e?i`@qX&Sk!`ZvRg+Y^BL zzx;4r#_liJ(zb_p_KRy*m6$8q^yz4+{7!g?_qllIW7vRAg9Jv7JrOkPf; z{`5$0+jAn_JiPN$b-zUX-*h-H=jRLc+zxY5laMJj5l4cbC||m9VB19PpKnW-T`v4* Z%`o3YE>^bR!iE6|JYD@<);T3K0RUI$I;8*r diff --git a/src/main/resources/assets/botania/textures/items/manaweaveLegsHoliday.png b/src/main/resources/assets/botania/textures/items/manaweaveLegsHoliday.png index 66e8894713825059780c55648e482ddcb3e0ca86..ee437de87dc643d04b2dc0de60cdd456b5b7190d 100644 GIT binary patch delta 775 zcmZ25nQ`u9#tj^N;+7$XmR3gQRz{XlHu@F01y;WKDVb@NlOOPkPB!5a$rkGh+q$F7;nVF}WY*r9B&q9>S$qxn1`3#M8 z4Uw#g5Z!6WA|oVyX|kxhe!YvQi(^Q|ttFGsdxr$d9JT*`uE)%8VsNGf&mx|G3f?Y? zTvdM+xU>Y5q9mR!>fLf_?-%wbn|ck_vM?{s5OnfT*rK@ zd)tq`@R|H}&+7NFbBfPf-Y=foQ7}RHj zQhqya_gQe{bj@_T33Xd?&el)loTB40L9u?zpT8Uag-`sQJoCw)^t|~m518?6y1ve+ z=9kD{E7Hj_ejozTsy|Thb?ymo$%b8ARIn7qB+L$ZdAn@Rb)JsdbrR)~FzC_Ps znIX=7MU)HR321{jPO%5zj&(h>B>C zV8*?BaV{*!3qO?AEMh#nw!>h$ev;O#8J8wpI)gVW?|qrGmY9?@zj^Z6sB793 hy~kG^_kW(x$nayo_NMsacsT|j@O1TaS?83{1OQQ(QBME> delta 778 zcmbO`nQ_5n#tj^N;uax>=2oVrR>me#Hu@F01y;WKDVb@NlOOPkPB!5ay6e}wd%8G=RNPuJ`Mh^XpvZCi@8^2H&2j2hn~~U&5YX&! zMuDU1uL76O)`F-Ms|nJ%snsv}SENcinzOOFT~ta7)LjxAFp)JZK(N{9^RX?NI*Ti(OjY%GCdybT*CA!%g|Ws$Qj3L(9}KhKB_^>ZJn2 zzTes5_kS<@hK-DM_9ERIvL3g7GrB49)K5h#^@JFM!`av2ccOkCY<%WcqSjpeN`gB$ zIHgW^!M^u5vV2_x1a(dy+N9Ga8e~x)ywpDP)d4ov>-X?1wFCDWDV^`~a| zuVnn*-<)E?)Zn)?qR#rP(E}Ylq3)v@nVF0U2TKdjPCoPev&joz@le$p^X)%wSg>Q- zi(}8Vn(7ZKv^q6Tx6HhquNyl%enswZ9 z>+ZV1_7OEz69C1jg_yK7vvD$0d0r86?^q z-QC%hnsRUNcrDkg*v##ixGdrl!-`L4eLqDS_K5t@=&FmYx-fGaFcy2NJcMT*c4+=~ jr6Ky#%D3x2zh`9F6(b+uZD~K10SG)@{an^LB{Ts50*q1P From 27ae04ee2c7fcf1795296025a30767ab46cd8239 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 19 Dec 2015 19:31:59 +0000 Subject: [PATCH 23/23] Build 245 --- build.properties | 8 ++++---- version/1.7.10.txt | 2 +- web/changelog.txt | 8 ++++++++ web/versions.ini | 3 ++- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/build.properties b/build.properties index 638a436d0..16e1045e6 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Wed Dec 16 21:18:51 GMT 2015 +#Sat Dec 19 19:29:56 GMT 2015 version=r1.8 dir_output=../Build Output/Botania/ -mc_version=1.7.10 -forge_version=10.13.2.1291 dir_repo=./ -build_number=245 +forge_version=10.13.2.1291 +mc_version=1.7.10 +build_number=246 mod_name=Botania diff --git a/version/1.7.10.txt b/version/1.7.10.txt index cbfbed75a..88c892c4a 100644 --- a/version/1.7.10.txt +++ b/version/1.7.10.txt @@ -1 +1 @@ -r1.8-244 \ No newline at end of file +r1.8-245 \ No newline at end of file diff --git a/web/changelog.txt b/web/changelog.txt index eba8328e8..59a56b1ab 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,3 +1,11 @@ +r1.8 245 +*Added a new fancy skybox effect to Garden of Glass. Here's an album. It looks cooler ingame. (there are config options to disable it and enable it in normal worlds as well, if you want) +*Added configs to move the Flugel Tiara's flight bar as apparently I'm not the only person that thought it was cute to put a bar there. +*Changed the period in which the mod enabled Christmas features to be in sync with Winter's Veil in World of Warcraft. Priorities! +*Fixed a bunch of stuff in the mod not rendering properly (going all gray) if some mod disables GL_LIGHTING (See: NEI, Neat). +*Fixed Luminizers that have been bound to another Luminizer that has then been removed taking you to the position where the removed one was. +*Increased the drop rate of Melon and Pumpkin seeds on Garden of Glass. Again. +*Manaweave armor is now Santaweave during Christmas. r1.8 244 *Added a "Preventing Decay" entry to the Miscellaneous section. Something seems a bit off with it though. *Fixed a crash with NEI when some mods think it's a good idea to use stacks without a valid item. diff --git a/web/versions.ini b/web/versions.ini index 9c1ac7cf3..c97d8ea18 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -241,4 +241,5 @@ r1.8-240=1.7.10 r1.8-241=1.7.10 r1.8-242=1.7.10 r1.8-243=1.7.10 -r1.8-244=1.7.10 \ No newline at end of file +r1.8-244=1.7.10 +r1.8-245=1.7.10 \ No newline at end of file