mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 11:49:37 +00:00
Fixes and tweaks~
This commit is contained in:
1 parent
40a1f6e520
commit
e2c240cf78
9 files changed
+94
-42
No files matched your search
@@ -66,8 +66,8 @@ public final class BaubleRenderHandler {
|
||||
ItemStack helm = player.inventory.armorItemInSlot(3);
|
||||
if(helm != null && helm.getItem() instanceof ItemTerrasteelHelm)
|
||||
ItemTerrasteelHelm.renderOnPlayer(helm, event);
|
||||
//if(event.entityPlayer.getCommandSenderName().equals("Vazkii"))
|
||||
//renderFancyExclusiveDevStuffBecauseImAnEvilDevWhoDoesntCareAboutTheCommunityBooo(event);
|
||||
if(event.entityPlayer.getCommandSenderName().equals("Vazkii"))
|
||||
renderFancyExclusiveDevStuffBecauseImAnEvilDevWhoDoesntCareAboutTheCommunityBooo(event);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
|
||||
@@ -18,6 +18,7 @@ import java.util.List;
|
||||
import java.util.Queue;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.audio.PositionedSoundRecord;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
@@ -47,6 +48,7 @@ public class GuiLexicon extends GuiScreen {
|
||||
public static GuiLexicon currentOpenLexicon = new GuiLexicon();
|
||||
public static ItemStack stackUsed;
|
||||
|
||||
private static final int[] KONAMI_CODE = { 200, 200, 208, 208, 203, 205, 203, 205, 48, 30 };
|
||||
public static final int BOOKMARK_START = 1337;
|
||||
public static List<GuiLexicon> bookmarks = new ArrayList();
|
||||
boolean bookmarksNeedPopulation = false;
|
||||
@@ -64,7 +66,8 @@ public class GuiLexicon extends GuiScreen {
|
||||
private static final int TUTORIAL_ARROW_HEIGHT = 12;
|
||||
boolean hasTutorialArrow;
|
||||
int tutorialArrowX, tutorialArrowY;
|
||||
|
||||
int konamiIndex;
|
||||
|
||||
List<LexiconCategory> allCategories;
|
||||
|
||||
String title;
|
||||
@@ -381,7 +384,16 @@ public class GuiLexicon extends GuiScreen {
|
||||
mc.displayGuiScreen(null);
|
||||
mc.setIngameFocus();
|
||||
}
|
||||
|
||||
|
||||
System.out.println(par2);
|
||||
if(par2 == KONAMI_CODE[konamiIndex]) {
|
||||
konamiIndex++;
|
||||
if(konamiIndex >= KONAMI_CODE.length) {
|
||||
mc.getSoundHandler().playSound(PositionedSoundRecord.func_147673_a(new ResourceLocation("botania:way")));
|
||||
konamiIndex = 0;
|
||||
}
|
||||
} else konamiIndex = 0;
|
||||
|
||||
super.keyTyped(par1, par2);
|
||||
}
|
||||
|
||||
|
||||
@@ -135,6 +135,12 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
|
||||
mc.renderEngine.bindTexture(texture);
|
||||
GL11.glColor4f(1F, 1F, 1F, 1F);
|
||||
drawTexturedModalRect(left + 134, top + guiHeight - 26, 86, 180, 12, 12);
|
||||
} else {
|
||||
boolean unicode = mc.fontRenderer.getUnicodeFlag();
|
||||
mc.fontRenderer.setUnicodeFlag(true);
|
||||
String s = StatCollector.translateToLocal("botaniamisc.typeToSearch");
|
||||
mc.fontRenderer.drawString(s, left + 120 - mc.fontRenderer.getStringWidth(s), top + guiHeight - 18, 0x666666);
|
||||
mc.fontRenderer.setUnicodeFlag(unicode);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@ import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -60,7 +61,8 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
|
||||
private static final int COST = 35;
|
||||
|
||||
public static IIcon[] wingIcons;
|
||||
private static final int WING_TYPES = 7;
|
||||
private static final int SUBTYPES = 7;
|
||||
private static final int WING_TYPES = 8;
|
||||
|
||||
public ItemFlightTiara() {
|
||||
super(LibItemNames.FLIGHT_TIARA);
|
||||
@@ -85,7 +87,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
|
||||
|
||||
@Override
|
||||
public void getSubItems(Item item, CreativeTabs tab, List list) {
|
||||
for(int i = 0; i < WING_TYPES + 1; i++)
|
||||
for(int i = 0; i < SUBTYPES + 1; i++)
|
||||
list.add(new ItemStack(item, 1, i));
|
||||
}
|
||||
|
||||
@@ -94,6 +96,15 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
|
||||
par3List.add(StatCollector.translateToLocal("botania.wings" + par1ItemStack.getItemDamage()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onWornTick(ItemStack stack, EntityLivingBase player) {
|
||||
super.onWornTick(stack, player);
|
||||
if(stack.getItemDamage() != 8 && stack.getDisplayName().hashCode() == 0x7867EB0B) {
|
||||
stack.setItemDamage(8);
|
||||
stack.getTagCompound().removeTag("display");
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void updatePlayerFlyStatus(LivingUpdateEvent event) {
|
||||
if(event.entityLiving instanceof EntityPlayer) {
|
||||
@@ -150,6 +161,12 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
|
||||
r = 0.2F;
|
||||
g = 0.6F;
|
||||
b = 0.2F;
|
||||
break;
|
||||
}
|
||||
case 8 : {
|
||||
r = 0F;
|
||||
b = 0F;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -216,6 +233,9 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
|
||||
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GL11.glColor4f(1F, 1F, 1F, 1F);
|
||||
|
||||
int light = 15728880;
|
||||
int lightmapX = light % 65536;
|
||||
int lightmapY = light / 65536;
|
||||
switch(meta) {
|
||||
case 1 : { // Jibril
|
||||
h = 0.4F;
|
||||
@@ -233,9 +253,6 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
|
||||
break;
|
||||
}
|
||||
case 4 : { // Fire
|
||||
int light = 15728880;
|
||||
int lightmapX = light % 65536;
|
||||
int lightmapY = light / 65536;
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
|
||||
break;
|
||||
}
|
||||
@@ -259,6 +276,14 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
|
||||
GL11.glColor4f(1F, 1F, 1F, 0.5F + (float) Math.cos((double) (event.entityPlayer.ticksExisted + event.partialRenderTick) * 0.3F) * 0.2F);
|
||||
break;
|
||||
}
|
||||
case 8 : { // The One
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
|
||||
rz = 180F;
|
||||
rx = 0F;
|
||||
s = 1.5F;
|
||||
h = 1.2F;
|
||||
GL11.glColor4f(1F, 1F, 1F, 0.5F + (flying ? ((float) Math.cos((double) (event.entityPlayer.ticksExisted + event.partialRenderTick) * 0.3F) * 0.25F) + 0.25F : 0F));
|
||||
}
|
||||
}
|
||||
|
||||
float f = icon.getMinU();
|
||||
@@ -334,5 +359,4 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
|
||||
return stack.getItemDamage() == 1 ? ModAchievements.tiaraWings : null;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user