doot doot

This commit is contained in:
Vasco Lavos committed 2015-10-18 02:12:22 +01:00
1 parent ec0afd3ab0
commit 10972d59ec
12 files changed
+39 -10

No files matched your search

@@ -175,6 +175,7 @@ import cpw.mods.fml.relauncher.ReflectionHelper;
public class ClientProxy extends CommonProxy {
public static boolean singAnnoyingChristmasSongsTillVazkiisHeadExplodesFromAllTheDamnJingle = false;
public static boolean dootDoot = false;
@Override
public void preInit(FMLPreInitializationEvent event) {
@@ -204,10 +205,14 @@ public class ClientProxy extends CommonProxy {
if(ConfigHandler.versionCheckEnabled)
new VersionChecker().init();
// Jingle bells jingle bells
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(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) == 9)
dootDoot = true;
}
initRenderers();
@@ -82,6 +82,7 @@ public class GuiLexicon extends GuiScreen {
public static Queue<LexiconEntry> tutorial = new ArrayDeque();
private static boolean checkedDoot = false;
public static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_LEXICON);
public static final ResourceLocation textureToff = new ResourceLocation(LibResources.GUI_TOFF);
@@ -110,7 +111,7 @@ public class GuiLexicon extends GuiScreen {
@Override
public final void initGui() {
super.initGui();
if(PersistentVariableHelper.firstLoad) {
PersistentVariableHelper.firstLoad = false;
PersistentVariableHelper.saveSafe();
@@ -67,6 +67,9 @@ public final class LibResources {
public static final String MODEL_SPREADER = PREFIX_MODEL + "spreader.png";
public static final String MODEL_SPREADER_REDSTONE = PREFIX_MODEL + "spreaderRedstone.png";
public static final String MODEL_SPREADER_DREAMWOOD = PREFIX_MODEL + "spreaderDreamwood.png";
public static final String MODEL_SPREADER_HALLOWEEN = PREFIX_MODEL + "spreader_halloween.png";
public static final String MODEL_SPREADER_REDSTONE_HALLOWEEN = PREFIX_MODEL + "spreaderRedstone_halloween.png";
public static final String MODEL_SPREADER_DREAMWOOD_HALLOWEEN = PREFIX_MODEL + "spreaderDreamwood_halloween.png";
public static final String MODEL_POOL = PREFIX_MODEL + "pool.png";
public static final String MODEL_INFINITE_POOL = PREFIX_MODEL + "infinitePool.png";
public static final String MODEL_DILUTED_POOL = PREFIX_MODEL + "dilutedPool.png";
@@ -91,6 +94,7 @@ public final class LibResources {
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";
public static final String MODEL_TINY_POTATO_HALLOWEEN = PREFIX_MODEL + "tinyPotato_halloween.png";
public static final String MODEL_SPAWNER_CLAW = PREFIX_MODEL + "spawnerClaw.png";
public static final String MODEL_BREWERY = PREFIX_MODEL + "brewery.png";
public static final String MODEL_TRAVEL_BELT = PREFIX_MODEL + "travelBelt.png";
@@ -112,7 +116,8 @@ public final class LibResources {
public static final String MODEL_COCOON = PREFIX_MODEL + "cocoon.png";
public static final String MODEL_BELLOWS = PREFIX_MODEL + "bellows.png";
public static final String MODEL_TERU_TERU_BOZU = PREFIX_MODEL + "teruTeruBozu.png";
public static final String MODEL_TERU_TERU_BOZU_HALLOWEEN = PREFIX_MODEL + "teruTeruBozu_halloween.png";
public static final String MISC_PARTICLES = PREFIX_MISC + "particles.png";
public static final String MISC_WISP_LARGE = PREFIX_MISC + "wispLarge.png";
public static final String MISC_WISP_SMALL = PREFIX_MISC + "wispSmall.png";
@@ -135,5 +140,5 @@ public final class LibResources {
public static final String SHADER_TERRA_PLATE_RUNE_FRAG = PREFIX_SHADER + "terra_plate_rune.frag";
public static final String SHADER_FILM_GRAIN_FRAG = PREFIX_SHADER + "film_grain.frag";
public static final String SHADER_GOLD_FRAG = PREFIX_SHADER + "gold.frag";
}
@@ -22,6 +22,7 @@ import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.core.proxy.ClientProxy;
import vazkii.botania.client.gui.lexicon.GuiLexicon;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.item.ItemLexicon;
@@ -28,6 +28,7 @@ import org.lwjgl.opengl.GL12;
import vazkii.botania.api.mana.ILens;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.core.proxy.ClientProxy;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.client.model.ModelSpreader;
import vazkii.botania.client.render.item.RenderLens;
@@ -39,6 +40,10 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer {
private static final ResourceLocation textureRs = new ResourceLocation(LibResources.MODEL_SPREADER_REDSTONE);
private static final ResourceLocation textureDw = new ResourceLocation(LibResources.MODEL_SPREADER_DREAMWOOD);
private static final ResourceLocation textureHalloween = new ResourceLocation(LibResources.MODEL_SPREADER_HALLOWEEN);
private static final ResourceLocation textureRsHalloween = new ResourceLocation(LibResources.MODEL_SPREADER_REDSTONE_HALLOWEEN);
private static final ResourceLocation textureDwHalloween = new ResourceLocation(LibResources.MODEL_SPREADER_DREAMWOOD_HALLOWEEN);
private static final ModelSpreader model = new ModelSpreader();
@Override
@@ -55,7 +60,11 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer {
GL11.glRotatef(spreader.rotationY, 1F, 0F, 0F);
GL11.glTranslatef(0F, 1F, 0F);
Minecraft.getMinecraft().renderEngine.bindTexture(spreader.isRedstone() ? textureRs : spreader.isDreamwood() ? textureDw : texture);
ResourceLocation r = spreader.isRedstone() ? textureRs : spreader.isDreamwood() ? textureDw : texture;
if(ClientProxy.dootDoot)
r = spreader.isRedstone() ? textureRsHalloween : spreader.isDreamwood() ? textureDwHalloween : textureHalloween;
Minecraft.getMinecraft().renderEngine.bindTexture(r);
GL11.glScalef(1F, -1F, -1F);
double time = ClientTickHandler.ticksInGame + ticks;
@@ -20,6 +20,7 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import vazkii.botania.client.core.proxy.ClientProxy;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.client.model.ModelTeruTeruBozu;
import vazkii.botania.common.Botania;
@@ -27,6 +28,7 @@ import vazkii.botania.common.Botania;
public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer {
private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TERU_TERU_BOZU);
private static final ResourceLocation textureHalloween = new ResourceLocation(LibResources.MODEL_TERU_TERU_BOZU_HALLOWEEN);
ModelTeruTeruBozu model = new ModelTeruTeruBozu();
@Override
@@ -38,7 +40,7 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer {
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glColor4f(1F, 1F, 1F, 1F);
GL11.glTranslated(d0, d1, d2);
Minecraft.getMinecraft().renderEngine.bindTexture(texture);
Minecraft.getMinecraft().renderEngine.bindTexture(ClientProxy.dootDoot ? textureHalloween : texture);
GL11.glRotatef(180F, 1F, 0F, 0F);
double time = Botania.proxy.getWorldElapsedTicks() + f;
boolean hasWorld = tileentity.getWorldObj() != null;
@@ -32,6 +32,7 @@ import org.lwjgl.opengl.GL12;
import vazkii.botania.api.item.TinyPotatoRenderEvent;
import vazkii.botania.client.core.handler.ContributorFancinessHandler;
import vazkii.botania.client.core.helper.ShaderHelper;
import vazkii.botania.client.core.proxy.ClientProxy;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.client.model.ModelTinyPotato;
import vazkii.botania.common.block.tile.TileTinyPotato;
@@ -44,6 +45,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer {
private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TINY_POTATO);
private static final ResourceLocation textureGrayscale = new ResourceLocation(LibResources.MODEL_TINY_POTATO_GS);
private static final ResourceLocation textureHalloween = new ResourceLocation(LibResources.MODEL_TINY_POTATO_HALLOWEEN);
private static final ModelTinyPotato model = new ModelTinyPotato();
@Override
@@ -55,7 +57,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer {
GL11.glTranslated(d0, d1, d2);
Minecraft mc = Minecraft.getMinecraft();
mc.renderEngine.bindTexture(texture);
mc.renderEngine.bindTexture(ClientProxy.dootDoot ? textureHalloween : texture);
String name = potato.name.toLowerCase();
boolean usedShader = false;
@@ -46,6 +46,7 @@ public final class ConfigHandler {
public static boolean useVanillaParticleLimiter = true;
public static boolean silentSpreaders = false;
public static boolean renderBaubles = true;
public static boolean enableSeasonalFeatures = true;
public static int manaBarHeight = 29;
public static boolean altFlowerTextures = false;
@@ -143,6 +144,9 @@ public final class ConfigHandler {
desc = "Set this to false to disable rendering of baubles in the player.";
renderBaubles = loadPropBool("baubleRender.enabled", desc, renderBaubles);
desc = "Set this to false to disable seasonal features, such as halloween and christmas.";
enableSeasonalFeatures = loadPropBool("seasonalFeatures.enabled", desc, enableSeasonalFeatures);
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);