From f78505459e6c8c6a50c5208d10e5bf6b1d130a7a Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sun, 25 Jan 2015 16:01:33 +0000 Subject: [PATCH] Update the website for the new domain. --- .../common/core/version/ThreadDownloadMod.java | 3 +-- web/botania.php | 4 ++-- web/js/botania.js | 15 +++++++++++---- web/module/credits.php | 2 +- web/module/license.php | 4 +++- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index dd4857b22..440aece24 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -53,8 +53,7 @@ public class ThreadDownloadMod extends Thread { VersionChecker.startedDownload = true; - String domain = "vazkii.us"; // "localhost/xampp"; - String base = "http://" + domain + "/mod/Botania/"; + String base = "http://botaniamod.net/"; String file = fileName.replaceAll(" ", "%20"); URL url = new URL(base + "dl.php?file=" + file); diff --git a/web/botania.php b/web/botania.php index f0cbf4551..cbbae5cb8 100644 --- a/web/botania.php +++ b/web/botania.php @@ -1,6 +1,6 @@ - Botania | vazkii.us + Botania @@ -60,6 +60,6 @@ - \$(function(){\$('#header-btn-$module').addClass('active');});"; ?> + \$(function(){var module='$module';var btn=\$('#header-btn-'+module);var txt=btn.text();btn.addClass('active');document.title+=(' - '+txt);});"; ?> diff --git a/web/js/botania.js b/web/js/botania.js index 9c299f4bd..537977b5d 100644 --- a/web/js/botania.js +++ b/web/js/botania.js @@ -1,17 +1,24 @@ -$(function() { - $.material.init(); -}); - const censorChars = 'abcdefghijklmnopqrstuvwxyz'; var animating = false; $(function() { + var location = document.location; + var ignoreRegex = /(?:(?:http:\/\/localhost\/xampp\/mod\/Botania)|(?:http:\/\/(?:www\.)?botaniamod.net))(\/.*)/; + var elseRegex = /.+(\/.*)$/; + + if(elseRegex.test(location) && !ignoreRegex.test(location)) { + var elseMatch = elseRegex.exec(location); + document.location = 'http://botaniamod.net' + elseMatch[1]; + } + setInterval(changeCensor, 100); var hash = document.location.hash.substring(1); var offset = $("#" + hash + "-fake").offset(); if(offset != undefined) $('html, body').animate({ scrollTop: offset.top - 72 }, 1000); + + $.material.init(); }); $('.hide-div').click(function() { diff --git a/web/module/credits.php b/web/module/credits.php index 579922392..16f2fc893 100644 --- a/web/module/credits.php +++ b/web/module/credits.php @@ -27,6 +27,6 @@ No project is done with only one member, Botania is no exception, here's the cas
  • Rorax for the Pylon model.
  • ScottWears for hosting my website
  • The TConstruct and OpenBlocks teams for code snippets I took from their repositories.
  • -
  • wiiv for the old Pylon model and the Terra Blade texture.
  • +
  • wiiv for a bunch more texture work both before and after dylan4ever left.
  • WTFG33ks for making the getting started video that's linked within the Lexica Botania.
  • \ No newline at end of file diff --git a/web/module/license.php b/web/module/license.php index 781e52963..3a2db6d66 100644 --- a/web/module/license.php +++ b/web/module/license.php @@ -69,7 +69,9 @@ } ?> - is distributed under a reasonably open license. You probably want to have a read through this if you want to do something with it other than just play. + is distributed under a reasonably open license. You probably want to have a read through this if you want to do something with it other than just play.
    +You are completely free and have the right to Use, Share and Adapt the mod. These rights can not be removed from you as long as follow the license terms.
    +If you simply wish to play with the mod and do nothing else, go for it, this page is of no use to you.