Autoformat: spaces to tabs, remove unused imports

This commit is contained in:
mezz committed 2015-01-08 21:48:13 -08:00
1 parent a6d1a9f1a4
commit dac7c0ddef
93 files changed
+3159 -3058

No files matched your search

@@ -24,17 +24,17 @@ public class ContainerEffectJar extends Container
("forestry", "beeDroneGE", 1)));
for (int i = 0; i < 3; ++i)
{
for (int j = 0; j < 9; ++j)
{
this.addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, 74 + i * 18));
}
}
{
for (int j = 0; j < 9; ++j)
{
this.addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, 74 + i * 18));
}
}
for (int i = 0; i < 9; ++i)
{
this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 132));
}
for (int i = 0; i < 9; ++i)
{
this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 132));
}
}
@Override
@@ -2,11 +2,9 @@ package magicbees.client.gui;
import magicbees.main.CommonProxy;
import magicbees.tileentity.TileEntityEffectJar;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
@@ -1,10 +1,9 @@
package magicbees.client.gui;
import cpw.mods.fml.common.network.IGuiHandler;
import magicbees.tileentity.TileEntityEffectJar;
import magicbees.tileentity.TileEntityThaumicApiary;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.IGuiHandler;
public class GUIHandler implements IGuiHandler
{
@@ -18,10 +17,10 @@ public class GUIHandler implements IGuiHandler
{
value = new ContainerEffectJar((TileEntityEffectJar)world.getTileEntity(x, y, z), player);
}
else if (ID == UIScreens.THAUMIC_APIARY.ordinal())
{
//value = new Container((TileEntityThaumicApiary)world.getTileEntity(x, y, z), player);
}
else if (ID == UIScreens.THAUMIC_APIARY.ordinal())
{
//value = new Container((TileEntityThaumicApiary)world.getTileEntity(x, y, z), player);
}
return value;
}
@@ -1,30 +1,35 @@
package magicbees.client.gui;
import java.util.Set;
import cpw.mods.fml.client.IModGuiFactory;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import java.util.Set;
public class GuiFactory implements IModGuiFactory
{
public class GuiFactory implements IModGuiFactory {
@Override
public void initialize(Minecraft minecraftInstance)
{
@Override
public void initialize(Minecraft minecraftInstance) {
}
}
@Override
public Class<? extends GuiScreen> mainConfigGuiClass()
{
return ModGuiConfig.class;
}
@Override
public Class<? extends GuiScreen> mainConfigGuiClass() {
return ModGuiConfig.class;
}
@Override
public Set<RuntimeOptionCategoryElement> runtimeGuiCategories()
{
return null;
}
@Override
public Set<RuntimeOptionCategoryElement> runtimeGuiCategories() {
return null;
}
@Override
public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) {
return null;
}
@Override
public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element)
{
return null;
}
}
@@ -1,23 +1,21 @@
package magicbees.client.gui;
import cpw.mods.fml.client.config.GuiConfig;
import cpw.mods.fml.client.config.IConfigElement;
import magicbees.main.Config;
import magicbees.main.utils.VersionInfo;
import net.minecraft.client.gui.GuiScreen;
import net.minecraftforge.common.config.ConfigElement;
import net.minecraftforge.common.config.Configuration;
import java.util.List;
public class ModGuiConfig extends GuiConfig {
public ModGuiConfig(GuiScreen guiScreen)
{
super(guiScreen,
new ConfigElement(Config.configuration.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(),
VersionInfo.ModName,
false,
false,
GuiConfig.getAbridgedConfigPath(Config.configuration.toString()));
}
public class ModGuiConfig extends GuiConfig
{
public ModGuiConfig(GuiScreen guiScreen)
{
super(guiScreen,
new ConfigElement(Config.configuration.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(),
VersionInfo.ModName,
false,
false,
GuiConfig.getAbridgedConfigPath(Config.configuration.toString()));
}
}
@@ -9,9 +9,7 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
/**
*
* @author MysteriousAges
*
*/
public class SlotCustomItems extends Slot
{
@@ -34,7 +32,6 @@ public class SlotCustomItems extends Slot
}
/**
*
* @return List of valid ItemStacks
*/
public List<ItemStack> getValidItems()
@@ -69,7 +66,6 @@ public class SlotCustomItems extends Slot
}
/**
*
* @param removeItem ItemStack to remove.
*/
public void removeValidItem(ItemStack removeItem)
@@ -108,7 +104,7 @@ public class SlotCustomItems extends Slot
}
else
{
flag = this.items.get(i).getItemDamage() ==OreDictionary.WILDCARD_VALUE;
flag = this.items.get(i).getItemDamage() == OreDictionary.WILDCARD_VALUE;
break;
}
}
@@ -3,6 +3,5 @@ package magicbees.client.gui;
public enum UIScreens
{
EFFECT_JAR,
THAUMIC_APIARY,
;
THAUMIC_APIARY,;
}
@@ -1,15 +1,13 @@
package magicbees.client.model;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import magicbees.main.CommonProxy;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.AdvancedModelLoader;
import net.minecraftforge.client.model.IModelCustom;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ModelEffectJar
{
@@ -1,17 +1,14 @@
package magicbees.client.render;
import cpw.mods.fml.client.FMLClientHandler;
import magicbees.client.model.ModelEffectJar;
import magicbees.tileentity.TileEntityEffectJar;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.client.FMLClientHandler;
public class EffectJarRenderer extends TileEntitySpecialRenderer implements IItemRenderer
{
public static EffectJarRenderer instance = new EffectJarRenderer();
@@ -42,22 +39,22 @@ public class EffectJarRenderer extends TileEntitySpecialRenderer implements IIte
{
switch (type)
{
default:
case ENTITY:
doRender(0, 0, 0, 1.8f);
break;
default:
case ENTITY:
doRender(0, 0, 0, 1.8f);
break;
case EQUIPPED:
doRender(0, 0, 0, 1.5f);
break;
case EQUIPPED:
doRender(0, 0, 0, 1.5f);
break;
case EQUIPPED_FIRST_PERSON:
doRender(-.5, .5, 0.25, 1f);
break;
case EQUIPPED_FIRST_PERSON:
doRender(-.5, .5, 0.25, 1f);
break;
case INVENTORY:
doRender(0.3, 0.25, 0.3, 1.5f);
break;
case INVENTORY:
doRender(0.3, 0.25, 0.3, 1.5f);
break;
}
}