Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

Added Valentine's Day Seasonal. You might consider not playing between the 12th and the 16th of Feb.

Browse source
This commit is contained in:
Ellpeck 2015-10-23 23:08:53 +02:00
parent cbe54459a1
commit f8529cb878
14 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java
View file

@ -14,6 +14,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.actuallyadditions.ActuallyAdditions;
import ellpeck.actuallyadditions.inventory.GuiHandler;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import ellpeck.actuallyadditions.tile.TileEntityCoalGenerator;
import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
import ellpeck.actuallyadditions.util.ModUtil;
@ -60,7 +61,7 @@ public class BlockCoalGenerator extends BlockContainerBase implements IActAddIte
if(meta == 1){
for(int i = 0; i < 5; i++){
world.spawnParticle("smoke", (double)x+0.5F, (double)y+1.0F, (double)z+0.5F, 0.0D, 0.0D, 0.0D);
world.spawnParticle(ClientProxy.bulletForMyValentine ? "heart" : "smoke", (double)x+0.5F, (double)y+1.0F, (double)z+0.5F, 0.0D, 0.0D, 0.0D);
}
}
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java
View file

@ -14,6 +14,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.actuallyadditions.ActuallyAdditions;
import ellpeck.actuallyadditions.inventory.GuiHandler;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble;
import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
import ellpeck.actuallyadditions.util.ModUtil;
@ -108,7 +109,7 @@ public class BlockFurnaceDouble extends BlockContainerBase implements IActAddIte
}
for(int i = 0; i < 5; i++){
world.spawnParticle("smoke", (double)x+0.5F, (double)y+1.0F, (double)z+0.5F, 0.0D, 0.0D, 0.0D);
world.spawnParticle(ClientProxy.bulletForMyValentine ? "heart" : "smoke", (double)x+0.5F, (double)y+1.0F, (double)z+0.5F, 0.0D, 0.0D, 0.0D);
}
}
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java
View file

@ -14,6 +14,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.actuallyadditions.ActuallyAdditions;
import ellpeck.actuallyadditions.inventory.GuiHandler;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import ellpeck.actuallyadditions.tile.TileEntityGrinder;
import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
import ellpeck.actuallyadditions.util.ModUtil;
@ -77,7 +78,7 @@ public class BlockGrinder extends BlockContainerBase implements IActAddItemOrBlo
double zRand = new Random().nextDouble()/0.75D-0.5D;
world.spawnParticle("crit", (double)x+0.4F, (double)y+0.8F, (double)z+0.4F, xRand, 0.5D, zRand);
}
world.spawnParticle("smoke", (double)x+0.5F, (double)y+1.0F, (double)z+0.5F, 0.0D, 0.0D, 0.0D);
world.spawnParticle(ClientProxy.bulletForMyValentine ? "heart" : "smoke", (double)x+0.5F, (double)y+1.0F, (double)z+0.5F, 0.0D, 0.0D, 0.0D);
}
}

3
src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java
View file

@ -14,6 +14,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.actuallyadditions.ActuallyAdditions;
import ellpeck.actuallyadditions.inventory.GuiHandler;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import ellpeck.actuallyadditions.tile.TileEntityOilGenerator;
import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
import ellpeck.actuallyadditions.util.ModUtil;
@ -60,7 +61,7 @@ public class BlockOilGenerator extends BlockContainerBase implements IActAddItem
if(meta == 1){
for(int i = 0; i < 5; i++){
world.spawnParticle("smoke", (double)x+0.5F, (double)y+1.0F, (double)z+0.5F, 0.0D, 0.0D, 0.0D);
world.spawnParticle(ClientProxy.bulletForMyValentine ? "heart" : "smoke", (double)x+0.5F, (double)y+1.0F, (double)z+0.5F, 0.0D, 0.0D, 0.0D);
}
}
}

6
src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java
View file

@ -14,6 +14,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.actuallyadditions.ActuallyAdditions;
import ellpeck.actuallyadditions.inventory.GuiHandler;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import ellpeck.actuallyadditions.tile.TileEntitySmileyCloud;
import ellpeck.actuallyadditions.util.AssetUtil;
import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
@ -90,6 +91,11 @@ public class BlockSmileyCloud extends BlockContainerBase implements IActAddItemO
}
}
@Override
public String getUnlocalizedName(){
return super.getUnlocalizedName()+(ClientProxy.bulletForMyValentine ? "Valentine" : "");
}
@Override
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack){
int rotation = MathHelper.floor_double((double)(player.rotationYaw*4.0F/360.0F)+0.5D) & 3;

3
src/main/java/ellpeck/actuallyadditions/blocks/render/ModelSmileyCloud.java
View file

@ -10,6 +10,7 @@
package ellpeck.actuallyadditions.blocks.render;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import net.minecraft.client.model.ModelRenderer;
public class ModelSmileyCloud extends ModelBaseAA{
@ -161,7 +162,7 @@ public class ModelSmileyCloud extends ModelBaseAA{
@Override
public String getName(){
return "modelSmileyCloud";
return ClientProxy.bulletForMyValentine ? "modelPinkFluffyUnicloud" : "modelSmileyCloud";
}
@Override

3
src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java
View file

@ -42,6 +42,7 @@ public class GuiBooklet extends GuiScreen{
public static final ResourceLocation resLoc = AssetUtil.getGuiLocation("guiBooklet");
public static final ResourceLocation resLocHalloween = AssetUtil.getGuiLocation("guiBookletHalloween");
public static final ResourceLocation resLocChristmas = AssetUtil.getGuiLocation("guiBookletChristmas");
public static final ResourceLocation resLocValentine = AssetUtil.getGuiLocation("guiBookletValentinesDay");
public static final int CHAPTER_BUTTONS_AMOUNT = 13;
public static final int TOOLTIP_SPLIT_LENGTH = 200;
public int xSize;
@ -86,7 +87,7 @@ public class GuiBooklet extends GuiScreen{
this.fontRendererObj.setUnicodeFlag(true);
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.mc.getTextureManager().bindTexture(ClientProxy.jingleAllTheWay ? resLocChristmas : (ClientProxy.pumpkinBlurPumpkinBlur ? resLocHalloween : resLoc));
this.mc.getTextureManager().bindTexture(ClientProxy.jingleAllTheWay ? resLocChristmas : (ClientProxy.pumpkinBlurPumpkinBlur ? resLocHalloween : (ClientProxy.bulletForMyValentine ? resLocValentine : resLoc)));
this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize);
this.mc.getTextureManager().bindTexture(resLoc);

3
src/main/java/ellpeck/actuallyadditions/booklet/page/PageCoffeeRecipe.java
View file

@ -14,6 +14,7 @@ import ellpeck.actuallyadditions.booklet.GuiBooklet;
import ellpeck.actuallyadditions.items.InitItems;
import ellpeck.actuallyadditions.items.ItemCoffee;
import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import ellpeck.actuallyadditions.util.Util;
import net.minecraft.item.ItemStack;
@ -28,7 +29,7 @@ public class PageCoffeeRecipe extends BookletPage{
@Override
public void renderPre(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
gui.mc.getTextureManager().bindTexture(GuiBooklet.resLoc);
gui.mc.getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
gui.drawTexturedModalRect(gui.guiLeft+19, gui.guiTop+20, 146, 94, 99, 60);
}

3
src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java
View file

@ -13,6 +13,7 @@ package ellpeck.actuallyadditions.booklet.page;
import cpw.mods.fml.relauncher.ReflectionHelper;
import ellpeck.actuallyadditions.booklet.GuiBooklet;
import ellpeck.actuallyadditions.booklet.InitBooklet;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import ellpeck.actuallyadditions.util.ModUtil;
import ellpeck.actuallyadditions.util.StringUtil;
import ellpeck.actuallyadditions.util.Util;
@ -45,7 +46,7 @@ public class PageCrafting extends BookletPage{
@Override
public void renderPre(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
if(this.recipes[this.recipePos] != null){
gui.mc.getTextureManager().bindTexture(GuiBooklet.resLoc);
gui.mc.getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
gui.drawTexturedModalRect(gui.guiLeft+27, gui.guiTop+20, 146, 20, 99, 60);
}
}

3
src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java
View file

@ -12,6 +12,7 @@ package ellpeck.actuallyadditions.booklet.page;
import ellpeck.actuallyadditions.booklet.GuiBooklet;
import ellpeck.actuallyadditions.booklet.InitBooklet;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import ellpeck.actuallyadditions.recipe.CrusherRecipeRegistry;
import ellpeck.actuallyadditions.util.ModUtil;
import ellpeck.actuallyadditions.util.StringUtil;
@ -39,7 +40,7 @@ public class PageCrusherRecipe extends BookletPage{
@Override
public void renderPre(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
if(recipe != null){
gui.mc.getTextureManager().bindTexture(GuiBooklet.resLoc);
gui.mc.getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
gui.drawTexturedModalRect(gui.guiLeft+37, gui.guiTop+20, 60, 180, 60, 60);
}
}

3
src/main/java/ellpeck/actuallyadditions/booklet/page/PageFurnace.java
View file

@ -12,6 +12,7 @@ package ellpeck.actuallyadditions.booklet.page;
import ellpeck.actuallyadditions.booklet.GuiBooklet;
import ellpeck.actuallyadditions.booklet.InitBooklet;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import ellpeck.actuallyadditions.util.ModUtil;
import ellpeck.actuallyadditions.util.StringUtil;
import ellpeck.actuallyadditions.util.Util;
@ -40,7 +41,7 @@ public class PageFurnace extends BookletPage{
@Override
public void renderPre(GuiBooklet gui, int mouseX, int mouseY, int ticksElapsed, boolean mousePressed){
if(this.input != null || this.getInputForOutput(this.result) != null){
gui.mc.getTextureManager().bindTexture(GuiBooklet.resLoc);
gui.mc.getTextureManager().bindTexture(ClientProxy.bulletForMyValentine ? GuiBooklet.resLocValentine : GuiBooklet.resLoc);
gui.drawTexturedModalRect(gui.guiLeft+37, gui.guiTop+20, 0, 180, 60, 60);
}
}

4
src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java
View file

@ -38,14 +38,16 @@ public class ClientProxy implements IProxy{
public static boolean pumpkinBlurPumpkinBlur;
public static boolean jingleAllTheWay;
public static boolean bulletForMyValentine;
@Override
public void preInit(FMLPreInitializationEvent event){
ModUtil.LOGGER.info("PreInitializing ClientProxy...");
Calendar c = Calendar.getInstance();
pumpkinBlurPumpkinBlur = c.get(Calendar.MONTH) == Calendar.OCTOBER;
pumpkinBlurPumpkinBlur = false;//c.get(Calendar.MONTH) == Calendar.OCTOBER;
jingleAllTheWay = c.get(Calendar.MONTH) == Calendar.DECEMBER && c.get(Calendar.DAY_OF_MONTH) >= 6 && c.get(Calendar.DAY_OF_MONTH) <= 26;
bulletForMyValentine = true;//c.get(Calendar.MONTH) == Calendar.FEBRUARY && c.get(Calendar.DAY_OF_MONTH) >= 12 && c.get(Calendar.DAY_OF_MONTH) <= 16;
PersistentClientData.setTheFile(new File(Minecraft.getMinecraft().mcDataDir, ModUtil.MOD_ID+"Data.dat"));
}

1
src/main/resources/assets/actuallyadditions/lang/en_US.lang
View file

@ -102,6 +102,7 @@ tile.actuallyadditions.blockFlax.name=Flax Plant
tile.actuallyadditions.blockCoffeeMachine.name=Coffee Machine
tile.actuallyadditions.blockXPSolidifier.name=Experience Solidifier
tile.actuallyadditions.blockSmileyCloud.name=Smiley Cloud
tile.actuallyadditions.blockSmileyCloudValentine.name=Pink Fluffy Unicloud
tile.actuallyadditions.blockLeafGenerator.name=Leaf-Eating Generator
tile.actuallyadditions.blockDirectionalBreaker.name=Long-Range Breaker
tile.actuallyadditions.blockRangedCollector.name=Ranged Collector

BIN
src/main/resources/assets/actuallyadditions/textures/gui/guiBookletValentinesDay.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 11 KiB