diff --git a/src/main/java/singulariteam/eternalsingularity/EternalRecipeTweaker.java b/src/main/java/singulariteam/eternalsingularity/EternalRecipeTweaker.java index c49d3c7..4c79509 100644 --- a/src/main/java/singulariteam/eternalsingularity/EternalRecipeTweaker.java +++ b/src/main/java/singulariteam/eternalsingularity/EternalRecipeTweaker.java @@ -1,11 +1,15 @@ package singulariteam.eternalsingularity; import java.util.Iterator; + import javax.annotation.Nonnull; + import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; + import net.minecraft.item.ItemStack; + import singulariteam.eternalsingularity.proxy.CommonProxy; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -13,6 +17,7 @@ import wanion.lib.common.MineTweakerHelper; @ZenClass("mods.eternalsingularity") public final class EternalRecipeTweaker { + private EternalRecipeTweaker() {} public static void init() { @@ -32,6 +37,7 @@ public final class EternalRecipeTweaker { } private static class Add implements IUndoableAction { + private final ItemStack itemStack; public Add(@Nonnull final ItemStack itemStack) { @@ -70,13 +76,13 @@ public final class EternalRecipeTweaker { } private static class Remove implements IUndoableAction { + private final ItemStack itemStack; private Remove(@Nonnull final ItemStack itemStackToRemove) { ItemStack itemStack = null; - for (final Iterator eternalSingularityRecipeIterator = - CommonProxy.getEternalSingularityRecipe().getInput().iterator(); - eternalSingularityRecipeIterator.hasNext() && itemStack == null; ) { + for (final Iterator eternalSingularityRecipeIterator = CommonProxy.getEternalSingularityRecipe() + .getInput().iterator(); eternalSingularityRecipeIterator.hasNext() && itemStack == null;) { final Object input = eternalSingularityRecipeIterator.next(); if (input instanceof ItemStack && ((ItemStack) input).isItemEqual(itemStackToRemove)) itemStack = (ItemStack) input; diff --git a/src/main/java/singulariteam/eternalsingularity/EternalSingularityMod.java b/src/main/java/singulariteam/eternalsingularity/EternalSingularityMod.java index 4ebb3eb..708a67e 100644 --- a/src/main/java/singulariteam/eternalsingularity/EternalSingularityMod.java +++ b/src/main/java/singulariteam/eternalsingularity/EternalSingularityMod.java @@ -2,6 +2,13 @@ package singulariteam.eternalsingularity; import static singulariteam.eternalsingularity.Reference.*; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; + +import org.apache.logging.log4j.Logger; + +import singulariteam.eternalsingularity.item.EternalSingularityItem; +import singulariteam.eternalsingularity.proxy.CommonProxy; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -9,20 +16,15 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import org.apache.logging.log4j.Logger; -import singulariteam.eternalsingularity.item.EternalSingularityItem; -import singulariteam.eternalsingularity.proxy.CommonProxy; @Mod( modid = MOD_ID, name = MOD_NAME, version = MOD_VERSION, acceptedMinecraftVersions = MC_VERSION, - dependencies = - "required-after:Avaritia;required-after:wanionlib@[1.7.10-1.3,);after:thermsingul;after:universalsingularities;after:aobdsingularities") + dependencies = "required-after:Avaritia;required-after:wanionlib@[1.7.10-1.3,);after:thermsingul;after:universalsingularities;after:aobdsingularities") public class EternalSingularityMod { + @Mod.Instance(MOD_ID) public static EternalSingularityMod instance; @@ -32,6 +34,7 @@ public class EternalSingularityMod { public static CommonProxy proxy; public static final CreativeTabs creativeTabs = new CreativeTabs(MOD_ID) { + @SideOnly(Side.CLIENT) @Override public Item getTabIconItem() { diff --git a/src/main/java/singulariteam/eternalsingularity/Reference.java b/src/main/java/singulariteam/eternalsingularity/Reference.java index de24509..a65fdd4 100644 --- a/src/main/java/singulariteam/eternalsingularity/Reference.java +++ b/src/main/java/singulariteam/eternalsingularity/Reference.java @@ -1,6 +1,7 @@ package singulariteam.eternalsingularity; public final class Reference { + public static final String MOD_ID = "eternalsingularity"; public static final String MOD_NAME = "Eternal Singularity"; public static final String MOD_VERSION = "GRADLETOKEN_VERSION"; diff --git a/src/main/java/singulariteam/eternalsingularity/item/CompoundSingularityItem.java b/src/main/java/singulariteam/eternalsingularity/item/CompoundSingularityItem.java index 855a804..1ea0f20 100644 --- a/src/main/java/singulariteam/eternalsingularity/item/CompoundSingularityItem.java +++ b/src/main/java/singulariteam/eternalsingularity/item/CompoundSingularityItem.java @@ -1,12 +1,7 @@ package singulariteam.eternalsingularity.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import fox.spiteful.avaritia.items.ItemResource; -import fox.spiteful.avaritia.items.LudicrousItems; -import fox.spiteful.avaritia.render.ICosmicRenderItem; -import fox.spiteful.avaritia.render.IHaloRenderItem; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -15,9 +10,17 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; + import singulariteam.eternalsingularity.EternalSingularityMod; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import fox.spiteful.avaritia.items.ItemResource; +import fox.spiteful.avaritia.items.LudicrousItems; +import fox.spiteful.avaritia.render.ICosmicRenderItem; +import fox.spiteful.avaritia.render.IHaloRenderItem; public class CompoundSingularityItem extends Item implements IHaloRenderItem, ICosmicRenderItem { + private final int max; @SideOnly(Side.CLIENT) @@ -76,8 +79,7 @@ public class CompoundSingularityItem extends Item implements IHaloRenderItem, IC @Override public IIcon getIcon(ItemStack stack, int pass) { - return pass == 1 - ? this.foregroundIcons[stack.getItemDamage() % foregroundIcons.length] + return pass == 1 ? this.foregroundIcons[stack.getItemDamage() % foregroundIcons.length] : this.backgroundIcons[stack.getItemDamage() % backgroundIcons.length]; } diff --git a/src/main/java/singulariteam/eternalsingularity/item/EternalSingularityItem.java b/src/main/java/singulariteam/eternalsingularity/item/EternalSingularityItem.java index fa84e92..4802fc6 100644 --- a/src/main/java/singulariteam/eternalsingularity/item/EternalSingularityItem.java +++ b/src/main/java/singulariteam/eternalsingularity/item/EternalSingularityItem.java @@ -1,12 +1,5 @@ package singulariteam.eternalsingularity.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import fox.spiteful.avaritia.entity.EntityImmortalItem; -import fox.spiteful.avaritia.items.ItemResource; -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.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -15,9 +8,18 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; + import singulariteam.eternalsingularity.EternalSingularityMod; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import fox.spiteful.avaritia.entity.EntityImmortalItem; +import fox.spiteful.avaritia.items.ItemResource; +import fox.spiteful.avaritia.items.LudicrousItems; +import fox.spiteful.avaritia.render.ICosmicRenderItem; +import fox.spiteful.avaritia.render.IHaloRenderItem; public class EternalSingularityItem extends Item implements IHaloRenderItem, ICosmicRenderItem { + public static final EternalSingularityItem instance = new EternalSingularityItem(); private IIcon cosmicMask; diff --git a/src/main/java/singulariteam/eternalsingularity/proxy/ClientProxy.java b/src/main/java/singulariteam/eternalsingularity/proxy/ClientProxy.java index 9a6ceb9..4cd6c92 100644 --- a/src/main/java/singulariteam/eternalsingularity/proxy/ClientProxy.java +++ b/src/main/java/singulariteam/eternalsingularity/proxy/ClientProxy.java @@ -1,11 +1,13 @@ package singulariteam.eternalsingularity.proxy; import net.minecraftforge.client.MinecraftForgeClient; + import singulariteam.eternalsingularity.item.EternalSingularityItem; import singulariteam.eternalsingularity.render.EternalItemRenderer; import singulariteam.eternalsingularity.render.ShaderHelper; public final class ClientProxy extends CommonProxy { + EternalItemRenderer fancies = new EternalItemRenderer(); @Override diff --git a/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java b/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java index 2eeb749..a32a654 100644 --- a/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java +++ b/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java @@ -2,24 +2,28 @@ package singulariteam.eternalsingularity.proxy; import static fox.spiteful.avaritia.Config.craftingOnly; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; -import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; -import fox.spiteful.avaritia.crafting.Grinder; import java.io.File; import java.util.*; + import javax.annotation.Nonnull; + import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.oredict.ShapelessOreRecipe; + import singulariteam.eternalsingularity.EternalRecipeTweaker; import singulariteam.eternalsingularity.EternalSingularityMod; import singulariteam.eternalsingularity.item.CompoundSingularityItem; import singulariteam.eternalsingularity.item.EternalSingularityItem; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; +import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; +import fox.spiteful.avaritia.crafting.Grinder; public class CommonProxy { + private static ShapelessOreRecipe eternalSingularityRecipe = null; private static final Set classSet = new HashSet<>(); protected CompoundSingularityItem compoundSingularityItem = null; @@ -32,12 +36,9 @@ public class CommonProxy { final String[] classNameList = config.getStringList( "classNameList", Configuration.CATEGORY_GENERAL, - new String[] { - "com.rcx.aobdsingularities.item.AOBDItemSingularity", - "fox.spiteful.avaritia.items.ItemSingularity", - "wanion.thermsingul.ThermalSingularityItem", - "wealthyturtle.uiesingularities.UniversalSingularityItem" - }, + new String[] { "com.rcx.aobdsingularities.item.AOBDItemSingularity", + "fox.spiteful.avaritia.items.ItemSingularity", "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."); if (config.hasChanged()) config.save(); for (final String className : classNameList) { @@ -62,9 +63,8 @@ public class CommonProxy { public void postInit() { if (classSet.isEmpty() || craftingOnly) return; final List singularities = new ArrayList<>(); - for (final Iterator catalystRecipeIterator = - Grinder.catalyst.getInput().iterator(); - catalystRecipeIterator.hasNext(); ) { + for (final Iterator catalystRecipeIterator = Grinder.catalyst.getInput() + .iterator(); catalystRecipeIterator.hasNext();) { final Object input = catalystRecipeIterator.next(); if (!(input instanceof ItemStack)) continue; final Item item = ((ItemStack) input).getItem(); @@ -77,10 +77,10 @@ public class CommonProxy { final int singularityCount = singularities.size(); final boolean aboveTheLimit = singularityCount > 81; final boolean useCompoundSingularities = config.getBoolean( - "useCompoundSingularities", - Configuration.CATEGORY_GENERAL, - aboveTheLimit, - "When useCompoundSingularities is Enabled, Basic Singularities will Need to be Crafted into Compound Singularities First.\n[If there are > 81 Basic Singularities, this Config Option will be Set to True Automatically]") + "useCompoundSingularities", + Configuration.CATEGORY_GENERAL, + aboveTheLimit, + "When useCompoundSingularities is Enabled, Basic Singularities will Need to be Crafted into Compound Singularities First.\n[If there are > 81 Basic Singularities, this Config Option will be Set to True Automatically]") || aboveTheLimit; final boolean easyMode = config.getBoolean( "easyMode", @@ -89,13 +89,14 @@ public class CommonProxy { "If this Config Option is Enabled, for Every 9 Singularities Used in the Eternal Singularity Recipe, You will Receive an Additional Eternal Singularity for the Recipe Output."); if (config.hasChanged()) config.save(); final int compoundMax = 16; - (eternalSingularityRecipe = new ShapelessOreRecipe(new ItemStack( - EternalSingularityItem.instance, easyMode ? MathHelper.clamp_int(compoundMax, 1, 64) : 1))) - .getInput() - .addAll(singularities); + (eternalSingularityRecipe = new ShapelessOreRecipe( + new ItemStack( + EternalSingularityItem.instance, + easyMode ? MathHelper.clamp_int(compoundMax, 1, 64) : 1))).getInput().addAll(singularities); if (useCompoundSingularities) { GameRegistry.registerItem( - compoundSingularityItem = new CompoundSingularityItem(compoundMax), "combined_singularity"); + compoundSingularityItem = new CompoundSingularityItem(compoundMax), + "combined_singularity"); final List eternalSingularityRecipeInputs = eternalSingularityRecipe.getInput(); for (int i = 0; i < compoundMax; i++) { final ShapelessOreRecipe compoundRecipe = new ShapelessOreRecipe( diff --git a/src/main/java/singulariteam/eternalsingularity/render/CosmicRenderStuffs.java b/src/main/java/singulariteam/eternalsingularity/render/CosmicRenderStuffs.java index 369989f..918d0f0 100644 --- a/src/main/java/singulariteam/eternalsingularity/render/CosmicRenderStuffs.java +++ b/src/main/java/singulariteam/eternalsingularity/render/CosmicRenderStuffs.java @@ -1,25 +1,30 @@ package singulariteam.eternalsingularity.render; -import cpw.mods.fml.relauncher.ReflectionHelper; -import fox.spiteful.avaritia.render.LudicrousRenderEvents; import java.lang.reflect.Field; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.world.World; + import org.lwjgl.opengl.ARBShaderObjects; +import cpw.mods.fml.relauncher.ReflectionHelper; +import fox.spiteful.avaritia.render.LudicrousRenderEvents; + public class CosmicRenderStuffs { + public static final ShaderCallback shaderCallback; public static float[] lightlevel = new float[3]; - public static String[] lightmapobf = new String[] {"lightmapColors", "field_78504_Q", "U"}; + public static String[] lightmapobf = new String[] { "lightmapColors", "field_78504_Q", "U" }; public static boolean inventoryRender = false; public static float cosmicOpacity = 1.0f; static { shaderCallback = new ShaderCallback() { + @Override public void call(int shader) { Minecraft mc = Minecraft.getMinecraft(); @@ -80,8 +85,7 @@ public class CosmicRenderStuffs { int[] map = null; try { map = (int[]) mapfield.get(Minecraft.getMinecraft().entityRenderer); - } catch (Exception e) { - } + } catch (Exception e) {} if (map == null) { setLightLevel(1.0f); return; diff --git a/src/main/java/singulariteam/eternalsingularity/render/EternalItemRenderer.java b/src/main/java/singulariteam/eternalsingularity/render/EternalItemRenderer.java index da4c464..5f0e252 100644 --- a/src/main/java/singulariteam/eternalsingularity/render/EternalItemRenderer.java +++ b/src/main/java/singulariteam/eternalsingularity/render/EternalItemRenderer.java @@ -1,8 +1,7 @@ package singulariteam.eternalsingularity.render; -import fox.spiteful.avaritia.render.ICosmicRenderItem; -import fox.spiteful.avaritia.render.IHaloRenderItem; import java.util.Random; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderHelper; @@ -15,9 +14,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import fox.spiteful.avaritia.render.ICosmicRenderItem; +import fox.spiteful.avaritia.render.IHaloRenderItem; + public class EternalItemRenderer implements IItemRenderer { public Random rand = new Random(); @@ -233,7 +236,14 @@ public class EternalItemRenderer implements IItemRenderer { b = (float) (colour & 255) / 255.0F; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); ItemRenderer.renderItemIn2D( - Tessellator.instance, f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), scale); + Tessellator.instance, + f1, + f2, + f, + f3, + icon.getIconWidth(), + icon.getIconHeight(), + scale); } if (item.getItem() instanceof ICosmicRenderItem) { diff --git a/src/main/java/singulariteam/eternalsingularity/render/ShaderCallback.java b/src/main/java/singulariteam/eternalsingularity/render/ShaderCallback.java index 824ad58..65fe85c 100644 --- a/src/main/java/singulariteam/eternalsingularity/render/ShaderCallback.java +++ b/src/main/java/singulariteam/eternalsingularity/render/ShaderCallback.java @@ -1,5 +1,6 @@ package singulariteam.eternalsingularity.render; public abstract class ShaderCallback { + public abstract void call(int paramInt); } diff --git a/src/main/java/singulariteam/eternalsingularity/render/ShaderHelper.java b/src/main/java/singulariteam/eternalsingularity/render/ShaderHelper.java index aab4a4d..f5b7438 100644 --- a/src/main/java/singulariteam/eternalsingularity/render/ShaderHelper.java +++ b/src/main/java/singulariteam/eternalsingularity/render/ShaderHelper.java @@ -5,14 +5,17 @@ package singulariteam.eternalsingularity.render; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; + import org.lwjgl.opengl.ARBFragmentShader; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.ARBVertexShader; import org.lwjgl.opengl.GL11; public final class ShaderHelper { + private static final int VERT = ARBVertexShader.GL_VERTEX_SHADER_ARB; private static final int FRAG = ARBFragmentShader.GL_FRAGMENT_SHADER_ARB; private static final String PREFIX = "/assets/eternalsingularity/shader/"; @@ -108,7 +111,8 @@ public final class ShaderHelper { private static String getLogInfo(int obj) { return ARBShaderObjects.glGetInfoLogARB( - obj, ARBShaderObjects.glGetObjectParameteriARB(obj, ARBShaderObjects.GL_OBJECT_INFO_LOG_LENGTH_ARB)); + obj, + ARBShaderObjects.glGetObjectParameteriARB(obj, ARBShaderObjects.GL_OBJECT_INFO_LOG_LENGTH_ARB)); } private static String readFileAsString(String filename) throws Exception {