From e2006d2b81095f641eb46f8dac4b960e189779cd Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 30 Sep 2015 06:56:33 +0200 Subject: [PATCH] Fix typo --- .../ellpeck/actuallyadditions/booklet/GuiBooklet.java | 10 +++++----- .../ellpeck/actuallyadditions/event/CraftEvent.java | 4 ++-- .../event/EntityConstructingEvent.java | 6 +++--- .../ellpeck/actuallyadditions/proxy/ClientProxy.java | 4 ++-- ...istantClientData.java => PersistentClientData.java} | 2 +- ...istantServerData.java => PersistentServerData.java} | 8 ++++---- 6 files changed, 17 insertions(+), 17 deletions(-) rename src/main/java/ellpeck/actuallyadditions/util/playerdata/{PersistantClientData.java => PersistentClientData.java} (99%) rename src/main/java/ellpeck/actuallyadditions/util/playerdata/{PersistantServerData.java => PersistentServerData.java} (86%) diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java b/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java index 023ecc6bd..a570a385b 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java @@ -19,7 +19,7 @@ import ellpeck.actuallyadditions.util.AssetUtil; import ellpeck.actuallyadditions.util.KeyUtil; import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.StringUtil; -import ellpeck.actuallyadditions.util.playerdata.PersistantClientData; +import ellpeck.actuallyadditions.util.playerdata.PersistentClientData; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; @@ -133,7 +133,7 @@ public class GuiBooklet extends GuiScreen{ @Override public void onGuiClosed(){ - PersistantClientData.saveBookPage(this.currentIndexEntry, this.currentChapter, this.currentPage, this.pageOpenInIndex); + PersistentClientData.saveBookPage(this.currentIndexEntry, this.currentChapter, this.currentPage, this.pageOpenInIndex); } @Override @@ -178,14 +178,14 @@ public class GuiBooklet extends GuiScreen{ this.currentChapter = null; this.currentIndexEntry = null; - if(!PersistantClientData.getBoolean("BookAlreadyOpened")){ + if(!PersistentClientData.getBoolean("BookAlreadyOpened")){ this.openIndexEntry(InitBooklet.chapterIntro.entry, 1, true); this.openChapter(InitBooklet.chapterIntro, null); - PersistantClientData.setBoolean("BookAlreadyOpened", true); + PersistentClientData.setBoolean("BookAlreadyOpened", true); } else{ - PersistantClientData.openLastBookPage(this); + PersistentClientData.openLastBookPage(this); } } diff --git a/src/main/java/ellpeck/actuallyadditions/event/CraftEvent.java b/src/main/java/ellpeck/actuallyadditions/event/CraftEvent.java index e2e53c3f7..4d39915ba 100644 --- a/src/main/java/ellpeck/actuallyadditions/event/CraftEvent.java +++ b/src/main/java/ellpeck/actuallyadditions/event/CraftEvent.java @@ -17,7 +17,7 @@ import ellpeck.actuallyadditions.achievement.TheAchievements; import ellpeck.actuallyadditions.config.values.ConfigBoolValues; import ellpeck.actuallyadditions.items.InitItems; import ellpeck.actuallyadditions.util.INameableItem; -import ellpeck.actuallyadditions.util.playerdata.PersistantServerData; +import ellpeck.actuallyadditions.util.playerdata.PersistentServerData; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -31,7 +31,7 @@ public class CraftEvent{ if(ConfigBoolValues.GIVE_BOOKLET_ON_FIRST_CRAFT.isEnabled()){ if(!event.player.worldObj.isRemote && event.crafting.getItem() != InitItems.itemLexicon && (event.crafting.getItem() instanceof INameableItem || Block.getBlockFromItem(event.crafting.getItem()) instanceof INameableItem)){ - PersistantServerData data = PersistantServerData.get(event.player); + PersistentServerData data = PersistentServerData.get(event.player); if(data != null && !data.bookGottenAlready){ data.bookGottenAlready = true; diff --git a/src/main/java/ellpeck/actuallyadditions/event/EntityConstructingEvent.java b/src/main/java/ellpeck/actuallyadditions/event/EntityConstructingEvent.java index 53960ee18..b6a65afe8 100644 --- a/src/main/java/ellpeck/actuallyadditions/event/EntityConstructingEvent.java +++ b/src/main/java/ellpeck/actuallyadditions/event/EntityConstructingEvent.java @@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import ellpeck.actuallyadditions.util.ModUtil; -import ellpeck.actuallyadditions.util.playerdata.PersistantServerData; +import ellpeck.actuallyadditions.util.playerdata.PersistentServerData; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.event.entity.EntityEvent; @@ -21,8 +21,8 @@ public class EntityConstructingEvent{ @SubscribeEvent public void onEntityConstructing(EntityEvent.EntityConstructing event){ if(event.entity instanceof EntityPlayer){ - if(PersistantServerData.get((EntityPlayer)event.entity) == null){ - event.entity.registerExtendedProperties(ModUtil.MOD_ID, new PersistantServerData()); + if(PersistentServerData.get((EntityPlayer)event.entity) == null){ + event.entity.registerExtendedProperties(ModUtil.MOD_ID, new PersistentServerData()); } } } diff --git a/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java b/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java index 822711d21..468bc161d 100644 --- a/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java +++ b/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java @@ -25,7 +25,7 @@ import ellpeck.actuallyadditions.tile.*; import ellpeck.actuallyadditions.util.AssetUtil; import ellpeck.actuallyadditions.util.KeyBinds; import ellpeck.actuallyadditions.util.ModUtil; -import ellpeck.actuallyadditions.util.playerdata.PersistantClientData; +import ellpeck.actuallyadditions.util.playerdata.PersistentClientData; import net.minecraft.client.Minecraft; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; @@ -40,7 +40,7 @@ public class ClientProxy implements IProxy{ public void preInit(FMLPreInitializationEvent event){ ModUtil.LOGGER.info("PreInitializing ClientProxy..."); - PersistantClientData.setTheFile(new File(Minecraft.getMinecraft().mcDataDir, ModUtil.MOD_ID+"Data.dat")); + PersistentClientData.setTheFile(new File(Minecraft.getMinecraft().mcDataDir, ModUtil.MOD_ID+"Data.dat")); KeyBinds.init(); } diff --git a/src/main/java/ellpeck/actuallyadditions/util/playerdata/PersistantClientData.java b/src/main/java/ellpeck/actuallyadditions/util/playerdata/PersistentClientData.java similarity index 99% rename from src/main/java/ellpeck/actuallyadditions/util/playerdata/PersistantClientData.java rename to src/main/java/ellpeck/actuallyadditions/util/playerdata/PersistentClientData.java index eddfb75d2..25eb486af 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/playerdata/PersistantClientData.java +++ b/src/main/java/ellpeck/actuallyadditions/util/playerdata/PersistentClientData.java @@ -27,7 +27,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; @SideOnly(Side.CLIENT) -public class PersistantClientData{ +public class PersistentClientData{ private static File theFile; diff --git a/src/main/java/ellpeck/actuallyadditions/util/playerdata/PersistantServerData.java b/src/main/java/ellpeck/actuallyadditions/util/playerdata/PersistentServerData.java similarity index 86% rename from src/main/java/ellpeck/actuallyadditions/util/playerdata/PersistantServerData.java rename to src/main/java/ellpeck/actuallyadditions/util/playerdata/PersistentServerData.java index 01d782b14..487c2baae 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/playerdata/PersistantServerData.java +++ b/src/main/java/ellpeck/actuallyadditions/util/playerdata/PersistentServerData.java @@ -18,7 +18,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.IExtendedEntityProperties; -public class PersistantServerData implements IExtendedEntityProperties{ +public class PersistentServerData implements IExtendedEntityProperties{ public boolean bookGottenAlready; @@ -46,10 +46,10 @@ public class PersistantServerData implements IExtendedEntityProperties{ } - public static PersistantServerData get(EntityPlayer player){ + public static PersistentServerData get(EntityPlayer player){ IExtendedEntityProperties properties = player.getExtendedProperties(ModUtil.MOD_ID); - if(properties != null && properties instanceof PersistantServerData){ - return (PersistantServerData)properties; + if(properties != null && properties instanceof PersistentServerData){ + return (PersistentServerData)properties; } return null; }