mirror of
https://github.com/GTNewHorizons/Eternal-Singularity.git
synced 2026-11-21 20:42:21 +00:00
Compound Singularities!
This commit is contained in:
1 parent
a72d2f683e
commit
57972d4dde
5 files changed
+69
-29
No files matched your search
@@ -5,7 +5,12 @@ 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 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;
|
||||
|
||||
import static singulariteam.eternalsingularity.Reference.*;
|
||||
@@ -21,6 +26,16 @@ public class EternalSingularityMod
|
||||
@SidedProxy(serverSide = COMMON_PROXY, clientSide = CLIENT_PROXY)
|
||||
public static CommonProxy proxy;
|
||||
|
||||
public static final CreativeTabs creativeTabs = new CreativeTabs(MOD_ID)
|
||||
{
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public Item getTabIconItem()
|
||||
{
|
||||
return EternalSingularityItem.instance;
|
||||
}
|
||||
};
|
||||
|
||||
@Mod.EventHandler
|
||||
public void preInit(final FMLPreInitializationEvent event)
|
||||
{
|
||||
|
||||
+18
-22
@@ -17,26 +17,23 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import singulariteam.eternalsingularity.EternalSingularityMod;
|
||||
|
||||
public class CombinedSingularityItem extends Item implements IHaloRenderItem, ICosmicRenderItem
|
||||
public class CompoundSingularityItem extends Item implements IHaloRenderItem, ICosmicRenderItem
|
||||
{
|
||||
public static final CombinedSingularityItem instance = new CombinedSingularityItem();
|
||||
|
||||
public static final int[] types = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 , 11, 12, 13, 14, 15};
|
||||
private final int max;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private IIcon cosmicMask;
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon[] foregroundIcons;
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon[] backgroundIcons;
|
||||
private IIcon[] foregroundIcons, backgroundIcons;
|
||||
|
||||
private CombinedSingularityItem()
|
||||
public CompoundSingularityItem(final int max)
|
||||
{
|
||||
super();
|
||||
setHasSubtypes(true);
|
||||
setMaxDamage(0);
|
||||
setCreativeTab(Avaritia.tab);
|
||||
setTextureName("eternalsingularity:combined_singularity_0");
|
||||
this.max = max;
|
||||
setCreativeTab(EternalSingularityMod.creativeTabs);
|
||||
}
|
||||
|
||||
public EnumRarity getRarity(ItemStack stack)
|
||||
@@ -47,16 +44,15 @@ public class CombinedSingularityItem extends Item implements IHaloRenderItem, IC
|
||||
@Override
|
||||
public String getUnlocalizedName(final ItemStack stack)
|
||||
{
|
||||
int i = MathHelper.clamp_int(stack.getItemDamage(), 0, types.length);
|
||||
return "item.combined.singularity." + types[i];
|
||||
return "item.combined.singularity." + MathHelper.clamp_int(getDamage(stack), 0, max);
|
||||
}
|
||||
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(Item item, CreativeTabs tab, List list)
|
||||
{
|
||||
for (int j = 0; j < types.length; j++) {
|
||||
for (int j = 0; j < max; j++)
|
||||
list.add(new ItemStack(item, 1, j));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -78,13 +74,13 @@ public class CombinedSingularityItem extends Item implements IHaloRenderItem, IC
|
||||
public void registerIcons(IIconRegister ir)
|
||||
{
|
||||
super.registerIcons(ir);
|
||||
foregroundIcons = new IIcon[types.length];
|
||||
backgroundIcons = new IIcon[types.length];
|
||||
foregroundIcons = new IIcon[max];
|
||||
backgroundIcons = new IIcon[max];
|
||||
|
||||
for (int x = 0; x < types.length; x++) {
|
||||
foregroundIcons[x] = ir.registerIcon("eternalsingularity:combined_singularity_" + types[x] + "_overlay");
|
||||
backgroundIcons[x] = ir.registerIcon("eternalsingularity:combined_singularity_" + types[x]);
|
||||
}
|
||||
for (int x = 0; x < max; x++) {
|
||||
foregroundIcons[x] = ir.registerIcon("eternalsingularity:combined_singularity_" + x + "_overlay");
|
||||
backgroundIcons[x] = ir.registerIcon("eternalsingularity:combined_singularity_" + x);
|
||||
}
|
||||
this.cosmicMask = ir.registerIcon("eternalsingularity:combined_singularity_mask");
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
import singulariteam.eternalsingularity.EternalSingularityMod;
|
||||
|
||||
public class EternalSingularityItem extends Item implements IHaloRenderItem, ICosmicRenderItem
|
||||
{
|
||||
@@ -27,7 +28,7 @@ public class EternalSingularityItem extends Item implements IHaloRenderItem, ICo
|
||||
private EternalSingularityItem()
|
||||
{
|
||||
super();
|
||||
setCreativeTab(Avaritia.tab);
|
||||
setCreativeTab(EternalSingularityMod.creativeTabs);
|
||||
setTextureName("eternalsingularity:eternal_singularity2");
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package singulariteam.eternalsingularity.proxy;
|
||||
|
||||
import net.minecraftforge.client.MinecraftForgeClient;
|
||||
import singulariteam.eternalsingularity.item.CombinedSingularityItem;
|
||||
import singulariteam.eternalsingularity.item.EternalSingularityItem;
|
||||
import singulariteam.eternalsingularity.render.EternalItemRenderer;
|
||||
|
||||
@@ -12,6 +11,7 @@ public final class ClientProxy extends CommonProxy
|
||||
{
|
||||
EternalItemRenderer fancies = new EternalItemRenderer();
|
||||
MinecraftForgeClient.registerItemRenderer(EternalSingularityItem.instance, fancies);
|
||||
MinecraftForgeClient.registerItemRenderer(CombinedSingularityItem.instance, fancies);
|
||||
if (compoundSingularityItem != null)
|
||||
MinecraftForgeClient.registerItemRenderer(compoundSingularityItem, fancies);
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,7 @@ import net.minecraftforge.common.config.Configuration;
|
||||
import net.minecraftforge.oredict.ShapelessOreRecipe;
|
||||
import singulariteam.eternalsingularity.EternalRecipeTweaker;
|
||||
import singulariteam.eternalsingularity.EternalSingularityMod;
|
||||
import singulariteam.eternalsingularity.item.CombinedSingularityItem;
|
||||
import singulariteam.eternalsingularity.item.CompoundSingularityItem;
|
||||
import singulariteam.eternalsingularity.item.EternalSingularityItem;
|
||||
|
||||
import java.io.File;
|
||||
@@ -22,12 +22,14 @@ public class CommonProxy
|
||||
{
|
||||
public static final ShapelessOreRecipe eternalSingularityRecipe = new ShapelessOreRecipe(EternalSingularityItem.instance);
|
||||
private static final Set<Class> classSet = new HashSet<>();
|
||||
protected CompoundSingularityItem compoundSingularityItem = null;
|
||||
private File configFile;
|
||||
|
||||
public CommonProxy() {}
|
||||
|
||||
public final void preInit(final File file)
|
||||
{
|
||||
final Configuration config = new Configuration(file);
|
||||
final Configuration config = new Configuration(configFile = file);
|
||||
final String[] classNameList = config.getStringList("classNameList", Configuration.CATEGORY_GENERAL, new String[]{
|
||||
"com.rcx.aobdsingularities.item.AOBDItemSingularity",
|
||||
"fox.spiteful.avaritia.items.ItemSingularity",
|
||||
@@ -44,7 +46,6 @@ public class CommonProxy
|
||||
}
|
||||
}
|
||||
GameRegistry.registerItem(EternalSingularityItem.instance, "eternal_singularity");
|
||||
GameRegistry.registerItem(CombinedSingularityItem.instance, "combined_singularity");
|
||||
if (Loader.isModLoaded("MineTweaker3"))
|
||||
EternalRecipeTweaker.init();
|
||||
}
|
||||
@@ -57,7 +58,7 @@ public class CommonProxy
|
||||
if (classSet.isEmpty() || craftingOnly)
|
||||
return;
|
||||
ExtremeCraftingManager.getInstance().getRecipeList().add(eternalSingularityRecipe);
|
||||
for (final Iterator<Object> catalystRecipeIterator = Grinder.catalyst.getInput().iterator(); catalystRecipeIterator.hasNext();) {
|
||||
for (final Iterator<Object> catalystRecipeIterator = Grinder.catalyst.getInput().iterator(); catalystRecipeIterator.hasNext(); ) {
|
||||
final Object input = catalystRecipeIterator.next();
|
||||
if (!(input instanceof ItemStack))
|
||||
continue;
|
||||
@@ -67,6 +68,33 @@ public class CommonProxy
|
||||
eternalSingularityRecipe.getInput().add(((ItemStack) input).copy());
|
||||
}
|
||||
}
|
||||
final Configuration config = new Configuration(configFile);
|
||||
final int singularityCount = eternalSingularityRecipe.getInput().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]") || singularityCount > 81;
|
||||
if (useCompoundSingularities) {
|
||||
final int compoundMax = (int) Math.ceil(singularityCount / 9);
|
||||
GameRegistry.registerItem(compoundSingularityItem = new CompoundSingularityItem(compoundMax), "combined_singularity");
|
||||
final List<Object> eternalSingularityRecipeInputs = eternalSingularityRecipe.getInput();
|
||||
for (int i = 0; i < compoundMax; i++) {
|
||||
final ShapelessOreRecipe compoundRecipe = new ShapelessOreRecipe(new ItemStack(compoundSingularityItem, 1, i));
|
||||
for (int s = 0; s < 9; s++) {
|
||||
final int pos = 9 * i + s;
|
||||
if (pos > singularityCount)
|
||||
break;
|
||||
final Object input = eternalSingularityRecipeInputs.get(pos);
|
||||
if (!(input instanceof ItemStack))
|
||||
continue;
|
||||
compoundRecipe.getInput().add(((ItemStack) input).copy());
|
||||
}
|
||||
GameRegistry.addRecipe(compoundRecipe);
|
||||
}
|
||||
eternalSingularityRecipeInputs.clear();
|
||||
for (int i = 0; i < compoundMax; i++)
|
||||
eternalSingularityRecipeInputs.add(new ItemStack(compoundSingularityItem, 1, i));
|
||||
}
|
||||
if (config.hasChanged())
|
||||
config.save();
|
||||
Grinder.catalyst.getInput().add(new ItemStack(EternalSingularityItem.instance));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user