diff --git a/src/main/java/singulariteam/eternalsingularity/EternalSingularityItem.java b/src/main/java/singulariteam/eternalsingularity/EternalSingularityItem.java index d28616a..68dd2b5 100644 --- a/src/main/java/singulariteam/eternalsingularity/EternalSingularityItem.java +++ b/src/main/java/singulariteam/eternalsingularity/EternalSingularityItem.java @@ -5,12 +5,10 @@ import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.avaritia.Avaritia; import fox.spiteful.avaritia.entity.EntityImmortalItem; import fox.spiteful.avaritia.items.ItemResource; -import fox.spiteful.avaritia.items.ItemSingularity; import fox.spiteful.avaritia.items.LudicrousItems; import fox.spiteful.avaritia.render.ICosmicRenderItem; import fox.spiteful.avaritia.render.IHaloRenderItem; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -19,20 +17,18 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import java.util.List; - public class EternalSingularityItem extends Item implements IHaloRenderItem, ICosmicRenderItem { + public static final EternalSingularityItem instance = new EternalSingularityItem(); + private IIcon cosmicMask; private IIcon foregroundIcon; - private IIcon haloIcon; - public EternalSingularityItem() + private EternalSingularityItem() { super(); setCreativeTab(Avaritia.tab); setTextureName("eternalsingularity:eternal_singularity2"); - setUnlocalizedName(Reference.MOD_ID + ".eternal.singularity"); } public EnumRarity getRarity(ItemStack stack) @@ -52,41 +48,41 @@ public class EternalSingularityItem extends Item implements IHaloRenderItem, ICo return true; } - @Override - @SideOnly(Side.CLIENT) - public IIcon getMaskTexture(ItemStack stack, EntityPlayer player) { - return cosmicMask; - } - - @Override + @Override @SideOnly(Side.CLIENT) - public float getMaskMultiplier(ItemStack stack, EntityPlayer player) { + public IIcon getMaskTexture(ItemStack stack, EntityPlayer player) + { + return cosmicMask; + } + + @Override + @SideOnly(Side.CLIENT) + public float getMaskMultiplier(ItemStack stack, EntityPlayer player) + { return 1.0f; } - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister ir) { - super.registerIcons(ir); + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister ir) + { + super.registerIcons(ir); + this.cosmicMask = ir.registerIcon("eternalsingularity:eternal_singularity_mask"); + this.foregroundIcon = ir.registerIcon("eternalsingularity:eternal_singularity"); + } - this.cosmicMask = ir.registerIcon("eternalsingularity:eternal_singularity_mask"); - this.foregroundIcon = ir.registerIcon("eternalsingularity:eternal_singularity"); - this.haloIcon = ir.registerIcon("eternalsingularity:halofire"); - } + @Override + public IIcon getIcon(ItemStack stack, int pass) + { + return pass == 1 ? foregroundIcon : super.getIcon(stack, pass); + } - @Override - public IIcon getIcon(ItemStack stack, int pass){ - if (pass == 1) { return this.foregroundIcon; } - - return super.getIcon(stack, pass); - } - - @SideOnly(Side.CLIENT) - @Override - public boolean requiresMultipleRenderPasses() - { - return true; -} + @SideOnly(Side.CLIENT) + @Override + public boolean requiresMultipleRenderPasses() + { + return true; + } @Override public Entity createEntity(World world, Entity location, ItemStack itemstack) @@ -95,27 +91,32 @@ public class EternalSingularityItem extends Item implements IHaloRenderItem, ICo } @SideOnly(Side.CLIENT) - public boolean drawHalo(ItemStack paramItemStack) { + public boolean drawHalo(ItemStack paramItemStack) + { return true; } @SideOnly(Side.CLIENT) - public IIcon getHaloTexture(ItemStack paramItemStack) { - return haloIcon; + public IIcon getHaloTexture(ItemStack paramItemStack) + { + return ((ItemResource) LudicrousItems.resource).halo[0]; } @SideOnly(Side.CLIENT) - public int getHaloSize(ItemStack paramItemStack) { - return 20; + public int getHaloSize(ItemStack paramItemStack) + { + return 4; } @SideOnly(Side.CLIENT) - public boolean drawPulseEffect(ItemStack paramItemStack) { - return true; + public boolean drawPulseEffect(ItemStack paramItemStack) + { + return false; } @SideOnly(Side.CLIENT) - public int getHaloColour(ItemStack paramItemStack) { - return 0xFFFFFFFF; + public int getHaloColour(ItemStack paramItemStack) + { + return -16777216; } } \ No newline at end of file diff --git a/src/main/java/singulariteam/eternalsingularity/EternalSingularityMod.java b/src/main/java/singulariteam/eternalsingularity/EternalSingularityMod.java index 48f6fd4..7137760 100644 --- a/src/main/java/singulariteam/eternalsingularity/EternalSingularityMod.java +++ b/src/main/java/singulariteam/eternalsingularity/EternalSingularityMod.java @@ -1,27 +1,31 @@ package singulariteam.eternalsingularity; -import static singulariteam.eternalsingularity.Reference.*; - import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import org.apache.logging.log4j.Logger; import singulariteam.eternalsingularity.proxy.CommonProxy; +import static singulariteam.eternalsingularity.Reference.*; + @Mod(modid = MOD_ID, name = MOD_NAME, version = MOD_VERSION, acceptedMinecraftVersions = MC_VERSION, dependencies = "required-after:Avaritia") public class EternalSingularityMod { @Mod.Instance(MOD_ID) public static EternalSingularityMod instance; + public static Logger logger; + @SidedProxy(serverSide = COMMON_PROXY, clientSide = CLIENT_PROXY) public static CommonProxy proxy; @Mod.EventHandler public void preInit(final FMLPreInitializationEvent event) { - proxy.preInit(); + logger = event.getModLog(); + proxy.preInit(event.getSuggestedConfigurationFile()); } @Mod.EventHandler diff --git a/src/main/java/singulariteam/eternalsingularity/proxy/ClientProxy.java b/src/main/java/singulariteam/eternalsingularity/proxy/ClientProxy.java index 6515275..5a4c9eb 100644 --- a/src/main/java/singulariteam/eternalsingularity/proxy/ClientProxy.java +++ b/src/main/java/singulariteam/eternalsingularity/proxy/ClientProxy.java @@ -1,12 +1,5 @@ package singulariteam.eternalsingularity.proxy; -import org.lwjgl.opengl.GL11; - -import fox.spiteful.avaritia.items.LudicrousItems; -import fox.spiteful.avaritia.render.CosmicItemRenderer; -import fox.spiteful.avaritia.render.FancyHaloRenderer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.MinecraftForgeClient; import singulariteam.eternalsingularity.EternalSingularityItem; import singulariteam.eternalsingularity.render.EternalItemRenderer; @@ -16,6 +9,6 @@ public final class ClientProxy extends CommonProxy @Override public void init() { - MinecraftForgeClient.registerItemRenderer(eternalSingularity, new EternalItemRenderer()); + MinecraftForgeClient.registerItemRenderer(EternalSingularityItem.instance, new EternalItemRenderer()); } } diff --git a/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java b/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java index 6ab7c4b..e458e4f 100644 --- a/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java +++ b/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java @@ -1,45 +1,50 @@ package singulariteam.eternalsingularity.proxy; -import fox.spiteful.avaritia.crafting.CompressorManager; -import fox.spiteful.avaritia.crafting.Grinder; -import fox.spiteful.avaritia.render.CosmicItemRenderer; -import fox.spiteful.avaritia.render.FancyHaloRenderer; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.oredict.OreDictionary; -import singulariteam.eternalsingularity.EternalSingularityItem; - -import javax.annotation.Nonnull; - import cpw.mods.fml.common.registry.GameRegistry; +import fox.spiteful.avaritia.crafting.Grinder; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.config.Configuration; +import singulariteam.eternalsingularity.EternalSingularityItem; +import singulariteam.eternalsingularity.EternalSingularityMod; import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import static fox.spiteful.avaritia.Config.craftingOnly; -import static java.io.File.separatorChar; public class CommonProxy { - protected final EternalSingularityItem eternalSingularity = new EternalSingularityItem(); + final List classList = new ArrayList<>(); - public CommonProxy() + public CommonProxy() {} + + public final void preInit(final File file) { + final Configuration config = new Configuration(file); + final List classNameList = Arrays.asList(config.getStringList("classNameList", Configuration.CATEGORY_GENERAL, new String[]{ + "com.rcx.aobdsingularities.item.AOBDItemSingularity", + "fox.spiteful.avaritia.items", + "wanion.thermsingul.ThermalSingularityItem", + "wealthyturtle.uiesingularities.UniversalSingularityItem" + }, "here is the absolute class name of the Item Classes that must be removed from Infinity Catalyst recipe and inserted into Eternal Singularity.")); + for (final String className : classNameList) { + try { + classList.add(Class.forName(className)); + } catch (ClassNotFoundException e) { + EternalSingularityMod.logger.warn("Couldn't find " + className); + } + } + GameRegistry.registerItem(EternalSingularityItem.instance, "eternal_singularity"); } - public final void preInit() - { - GameRegistry.registerItem(eternalSingularity, "eternal_singularity"); - } - - public void init() { - - } + public void init() {} public final void postInit() { - if (!craftingOnly) - Grinder.catalyst.getInput().add(new ItemStack(eternalSingularity, 1)); + if (craftingOnly) + return; + Grinder.catalyst.getInput().add(new ItemStack(EternalSingularityItem.instance, 1)); } -} +} \ No newline at end of file diff --git a/src/main/java/singulariteam/eternalsingularity/render/EternalItemRenderer.java b/src/main/java/singulariteam/eternalsingularity/render/EternalItemRenderer.java index 328e67c..54ae406 100644 --- a/src/main/java/singulariteam/eternalsingularity/render/EternalItemRenderer.java +++ b/src/main/java/singulariteam/eternalsingularity/render/EternalItemRenderer.java @@ -1,11 +1,5 @@ package singulariteam.eternalsingularity.render; -import java.util.Random; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import fox.spiteful.avaritia.Lumberjack; import fox.spiteful.avaritia.render.CosmicRenderShenanigans; import fox.spiteful.avaritia.render.ICosmicRenderItem; import fox.spiteful.avaritia.render.IHaloRenderItem; @@ -20,8 +14,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; -//import net.minecraft.util.WeightedRandom.Item; import net.minecraftforge.client.IItemRenderer; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import java.util.Random; public class EternalItemRenderer implements IItemRenderer { diff --git a/src/main/java/singulariteam/eternalsingularity/render/ShaderHelper.java b/src/main/java/singulariteam/eternalsingularity/render/ShaderHelper.java index 8289fb8..8a5e8aa 100644 --- a/src/main/java/singulariteam/eternalsingularity/render/ShaderHelper.java +++ b/src/main/java/singulariteam/eternalsingularity/render/ShaderHelper.java @@ -1,19 +1,17 @@ package singulariteam.eternalsingularity.render; -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; - +import fox.spiteful.avaritia.Lumberjack; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; - import org.apache.logging.log4j.Level; import org.lwjgl.opengl.ARBFragmentShader; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.ARBVertexShader; import org.lwjgl.opengl.GL11; -import fox.spiteful.avaritia.Lumberjack; +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; public final class ShaderHelper { private static final int VERT = ARBVertexShader.GL_VERTEX_SHADER_ARB; diff --git a/src/main/resources/assets/eternalsingularity/lang/en_US.lang b/src/main/resources/assets/eternalsingularity/lang/en_US.lang index 906c608..7969429 100644 --- a/src/main/resources/assets/eternalsingularity/lang/en_US.lang +++ b/src/main/resources/assets/eternalsingularity/lang/en_US.lang @@ -4,5 +4,5 @@ //Contact RCXcrafter/WanionCane/Wealthyturtle If You Would Like to Volunteer to Create a Localization File for Another Language. //Eternal Singularity - OMG -eternalSingularity.eternal.singularity=Eternal Singularity -//Eternal Singularity - OMG +item.eternal.singularity,name=Eternal Singularity +//Eternal Singularity - OMG \ No newline at end of file