Remove some files

Also more or less added the eternal singularity.
This commit is contained in:
RCXcrafter committed 2016-10-31 19:33:05 +01:00
1 parent 5a7ab357b5
commit 2a20460d3e
36 files changed
+82 -296

No files matched your search

@@ -2,10 +2,13 @@ package singulariteam.eternalsingularity;
import cpw.mods.fml.relauncher.Side;
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;
@@ -18,25 +21,17 @@ import net.minecraft.world.World;
import java.util.List;
public class EternalSingularityItem extends ItemSingularity implements ICosmicRenderItem
public class EternalSingularityItem extends Item implements IHaloRenderItem, ICosmicRenderItem
{
private IIcon cosmicMask;
private IIcon foregroundIcon;
public EternalSingularityItem()
{
super();
setHasSubtypes(false);
}
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack itemstack, int renderpass)
{
return 0xFFFFFF;
}
public void setDamage(ItemStack stack, int damage)
{
super.setDamage(stack, 0);
setCreativeTab(Avaritia.tab);
setTextureName("eternalsingularity:eternal_singularity2");
setUnlocalizedName(Reference.MOD_ID + ".eternal.singularity");
}
public EnumRarity getRarity(ItemStack stack)
@@ -44,35 +39,10 @@ public class EternalSingularityItem extends ItemSingularity implements ICosmicRe
return LudicrousItems.cosmic;
}
@SideOnly(Side.CLIENT)
public IIcon getMaskTexture(ItemStack stack, EntityPlayer player)
{
return this.cosmicMask;
}
@SideOnly(Side.CLIENT)
public float getMaskMultiplier(ItemStack stack, EntityPlayer player)
{
return 1.0F;
}
@Override
public String getUnlocalizedName(final ItemStack stack)
{
return "item.eternalSingularity";
}
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister ir)
{
super.registerIcons(ir);
this.cosmicMask = ir.registerIcon("universalsingularities:eternalSingularity_cosmicMask2");
}
@SideOnly(Side.CLIENT)
public boolean requiresMultipleRenderPasses()
{
return true;
return "item.eternal_singularity";
}
@Override
@@ -81,12 +51,69 @@ public class EternalSingularityItem extends ItemSingularity implements ICosmicRe
return true;
}
@Override
@SideOnly(Side.CLIENT)
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);
this.cosmicMask = ir.registerIcon("eternalsingularity:eternal_singularity_mask");
this.foregroundIcon = ir.registerIcon("eternalsingularity:eternal_singularity");
}
@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;
}
@Override
public Entity createEntity(World world, Entity location, ItemStack itemstack)
{
return new EntityImmortalItem(world, location, itemstack);
}
@Override
public void getSubItems(final Item item, final CreativeTabs tab, final List list) {}
@SideOnly(Side.CLIENT)
public boolean drawHalo(ItemStack paramItemStack) {
return true;
}
@SideOnly(Side.CLIENT)
public IIcon getHaloTexture(ItemStack paramItemStack) {
return ((ItemResource)LudicrousItems.resource).halo[0];
}
@SideOnly(Side.CLIENT)
public int getHaloSize(ItemStack paramItemStack) {
return 30;
}
@SideOnly(Side.CLIENT)
public boolean drawPulseEffect(ItemStack paramItemStack) {
return true;
}
@SideOnly(Side.CLIENT)
public int getHaloColour(ItemStack paramItemStack) {
return 0xFF20DB9A;
}
}
@@ -1,24 +0,0 @@
package singulariteam.eternalsingularity;
/*
* Created by WanionCane(https://github.com/WanionCane).
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
import javax.annotation.Nonnull;
import java.util.List;
public final class UniversalSingularity
{
public final String name;
public final List<UniversalSingularityWrapper> singularities;
public UniversalSingularity(@Nonnull final String name, @Nonnull final List<UniversalSingularityWrapper> singularities)
{
this.name = name;
this.singularities = singularities;
}
}
@@ -1,54 +0,0 @@
package singulariteam.eternalsingularity;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import fox.spiteful.avaritia.items.ItemSingularity;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import javax.annotation.Nonnull;
import java.util.List;
public final class UniversalSingularityItem extends ItemSingularity
{
public final String name;
public final List<UniversalSingularityWrapper> universalSingularities;
public UniversalSingularityItem(@Nonnull final String name, @Nonnull final List<UniversalSingularityWrapper> universalSingularities)
{
super();
this.name = name;
this.universalSingularities = universalSingularities;
}
@SideOnly(Side.CLIENT)
@Override
public int getColorFromItemStack(final ItemStack itemstack, final int renderPass)
{
final int metadata = getDamage(itemstack);
return renderPass == 0 ? universalSingularities.get(metadata).dColor : universalSingularities.get(metadata).cColor;
}
@Override
public String getUnlocalizedName(final ItemStack stack)
{
return "item.universalSingularities." + name + "." + universalSingularities.get(getDamage(stack)).name;
}
@Override
public int getDamage(final ItemStack itemStack)
{
return MathHelper.clamp_int(super.getDamage(itemStack), 0, universalSingularities.size() - 1);
}
@SuppressWarnings({"unchecked", "rawtypes"})
@SideOnly(Side.CLIENT)
@Override
public void getSubItems(final Item item, final CreativeTabs tab, final List list)
{
for (int i = 0; i < universalSingularities.size(); i++)
list.add(new ItemStack(item, 1, i));
}
}
@@ -1,29 +0,0 @@
package singulariteam.eternalsingularity;
/*
* Created by WanionCane(https://github.com/WanionCane).
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
import javax.annotation.Nonnull;
public final class UniversalSingularityWrapper
{
public final String name;
public final String oreName;
public final int recipeBaseValue;
public final int cColor;
public final int dColor;
public UniversalSingularityWrapper(@Nonnull final String name, @Nonnull final String oreName, final int recipeBaseValue, final int cColor, final int dColor)
{
this.name = name;
this.oreName = oreName;
this.recipeBaseValue = recipeBaseValue;
this.cColor = cColor;
this.dColor = dColor;
}
}
@@ -3,6 +3,7 @@ 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;
@@ -14,8 +15,7 @@ public final class ClientProxy extends CommonProxy
@Override
public void init()
{
final FancyHaloRenderer fancyHaloRenderer = new FancyHaloRenderer();
singularities.forEach(singularity -> MinecraftForgeClient.registerItemRenderer(singularity, fancyHaloRenderer));
MinecraftForgeClient.registerItemRenderer(eternalSingularity, fancyHaloRenderer);
MinecraftForgeClient.registerItemRenderer(eternalSingularity, new CosmicItemRenderer());
MinecraftForgeClient.registerItemRenderer(eternalSingularity, new FancyHaloRenderer());
}
}
@@ -2,13 +2,13 @@ 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 singulariteam.eternalsingularity.UniversalSingularity;
import singulariteam.eternalsingularity.UniversalSingularityItem;
import singulariteam.eternalsingularity.UniversalSingularityWrapper;
import javax.annotation.Nonnull;
@@ -22,161 +22,24 @@ import static java.io.File.separatorChar;
public class CommonProxy
{
protected final List<UniversalSingularityItem> singularities = new ArrayList<>();
protected final EternalSingularityItem eternalSingularity = new EternalSingularityItem();
private final Map<String, Set<String>> allowed = new HashMap<>();
//Base Values were Generated by random.org [Min: 65, Max: 95]
public CommonProxy()
{
final List<UniversalSingularity> universalSingularities = Arrays.asList(
// Vanilla Singularities
new UniversalSingularity("vanilla", Arrays.asList(
new UniversalSingularityWrapper("coal", "blockCoal", 90, 0x282828, 0x0C0C0C),
new UniversalSingularityWrapper("emerald", "blockEmerald", 81, 0x60DB83, 0x2CA746),
new UniversalSingularityWrapper("diamond", "blockDiamond", 76, 0x4AEDD1, 0x30DBBD)
)),
// Applied Energistics Singularities
/*
new UniversalSingularity("appliedEnergistics", Arrays.asList(
new UniversalSingularityWrapper("certus", "blockCertus", 71, 0xC6D4F8, 0xB9CAE7),
new UniversalSingularityWrapper("fluix", "blockFluix", 67, 0x903BC8, 0x572FA3)
)),
*/
// Big Reactors Singularities
new UniversalSingularity("bigReactors", Arrays.asList(
new UniversalSingularityWrapper("blutonium", "blockBlutonium", 68, 0x4642D6, 0x1B00E6),
new UniversalSingularityWrapper("cyanite", "blockCyanite", 86, 0x5CAFDB, 0x0087EF),
new UniversalSingularityWrapper("graphite", "blockGraphite", 94, 0x5D5D5D, 0x444444),
new UniversalSingularityWrapper("ludicrite", "blockLudicrite", 88, 0xF001E8, 0xF103B1),
new UniversalSingularityWrapper("yellorium", "blockYellorium", 75, 0xD9DB5C, 0xEBFF3D)
)),
// Botania Singularities
/*
new UniversalSingularity("botania", Arrays.asList(
new UniversalSingularityWrapper("manasteel", "blockManasteel", 71, 0x7ACDFD, 0x2CAEF8),
new UniversalSingularityWrapper("terrasteel", "blockTerrasteel", 91, 0x62D62A, 0x31AF04)
)),
*/
// Draconic Evolution Singularities
new UniversalSingularity("draconicEvolution", Collections.singletonList(
new UniversalSingularityWrapper("awakenedDraconium", "blockAwakenedDraconium", 83, 0xFF7200, 0xFF6600)
)),
// Ender IO Singularities
new UniversalSingularity("enderIO", Arrays.asList(
new UniversalSingularityWrapper("conductiveIron", "blockConductiveIron", 65, 0xCA9D9D, 0xC39499),
new UniversalSingularityWrapper("electricalSteel", "blockElectricalSteel", 91, 0x949494, 0x8D8D8D),
new UniversalSingularityWrapper("energeticAlloy", "blockEnergeticAlloy", 83, 0xFFA638, 0xFF9C21),
new UniversalSingularityWrapper("darkSteel", "blockDarkSteel", 77, 0x3C3C3C, 0x383838),
new UniversalSingularityWrapper("pulsatingIron", "blockPulsatingIron", 74, 0x82FA9E, 0x69EA88),
new UniversalSingularityWrapper("redstoneAlloy", "blockRedstoneAlloy", 89, 0xF25757, 0xD63C3C),
new UniversalSingularityWrapper("soularium", "blockSoularium", 73, 0x5C4527, 0x5A3E25),
new UniversalSingularityWrapper("vibrantAlloy", "blockVibrantAlloy", 74, 0xA7CA52, 0x98BB40)
)),
// ExtraTiC Singularities
new UniversalSingularity("extraTiC", Arrays.asList(
new UniversalSingularityWrapper("fairy", "blockFairy", 90, 0xFF83C3, 0xFF65B4),
new UniversalSingularityWrapper("pokefennium", "blockPokefennium", 71, 0x436B73, 0x485361),
new UniversalSingularityWrapper("red_aurum", "blockRed_aurum", 78, 0xFF4809, 0xFF3D09)
)),
// Extra Utilities Singularities
new UniversalSingularity("extraUtilities", Collections.singletonList(
new UniversalSingularityWrapper("unstable", "blockUnstable", 67, 0xC5C5C5, 0xB1B1B1)
)),
// Metallurgy Singularities
new UniversalSingularity("metallurgy", Collections.singletonList(
new UniversalSingularityWrapper("tartarite", "blockTartarite", 89, 0xAE3400, 0x792400)
)),
// ProjectE Singularities
/*
new UniversalSingularity("projectE", Arrays.asList(
new UniversalSingularityWrapper("darkMatter", "blockDarkMatter", 67, 0x38173C, 0x240F27),
new UniversalSingularityWrapper("redMatter", "blockRedMatter", 95, 0x9A0707, 0x7B0606)
)),
*/
// Redstone Arsenal Singularities
new UniversalSingularity("redstoneArsenal", Arrays.asList(
new UniversalSingularityWrapper("electrumFlux", "blockElectrumFlux", 77, 0xD0B64D, 0xA40606),
new UniversalSingularityWrapper("crystalFlux", "blockCrystalFlux", 76, 0xFE333A, 0xE8111A)
)),
// Tinkers' Construct Singularities
new UniversalSingularity("tinkersConstruct", Arrays.asList(
new UniversalSingularityWrapper("aluminumBrass", "blockAluminumBrass", 88, 0xE2BE4E, 0xD4B148),
new UniversalSingularityWrapper("alumite", "blockAlumite", 84, 0xE9ADDA, 0xE298D1),
new UniversalSingularityWrapper("ardite", "blockArdite", 86, 0xD24900, 0x960000),
new UniversalSingularityWrapper("cobalt", "blockCobalt", 67, 0x2376DD, 0x023C9B),
new UniversalSingularityWrapper("manyullyn", "blockManyullyn", 73, 0xA97DE0, 0x926AC3)//,
//new UniversalSingularityWrapper("pigIron", "blockPigIron", 93, 0xF0A8A4, 0xEF7E4A)
)),
// General (Not Mod Specific)
new UniversalSingularity("general", Arrays.asList(
new UniversalSingularityWrapper("aluminum", "blockAluminum", 92, 0xEDEDED, 0xC5C5C5),
new UniversalSingularityWrapper("brass", "blockBrass", 67, 0xD89634, 0x8B5F1B),
new UniversalSingularityWrapper("bronze", "blockBronze", 90, 0xCA904E, 0xC97A25),
new UniversalSingularityWrapper("charcoal", "blockCharcoal", 81, 0x605543, 0x100E0B),
new UniversalSingularityWrapper("electrum", "blockElectrum", 94, 0xFDEF5A, 0xEFE252),
new UniversalSingularityWrapper("invar", "blockInvar", 95, 0xD0D7CE, 0xACB4B1),
new UniversalSingularityWrapper("osmium", "blockOsmium", 69, 0xAABACE, 0x9BABC4),
new UniversalSingularityWrapper("steel", "blockSteel", 88, 0x9F9F9F, 0x888888),
new UniversalSingularityWrapper("zinc", "blockZinc", 76, 0xBFC55C, 0x939836),
new UniversalSingularityWrapper("ruby", "blockRuby", 91, 0xB44848, 0x993D3D),
new UniversalSingularityWrapper("sapphire", "blockSapphire", 86, 0x5173D1, 0x466ACE),
new UniversalSingularityWrapper("peridot", "blockPeridot", 95, 0x58A52B, 0x4E9226)
))
);
final Configuration config = new Configuration(new File("." + separatorChar + "config" + separatorChar + "UniversalSingularities.cfg"));
universalSingularities.forEach(universalSingularity -> {
if (config.get(universalSingularity.name, "enabled", true).getBoolean()) {
universalSingularity.singularities.forEach(universalSingularityWrapper -> {
if (config.get(universalSingularity.name, universalSingularityWrapper.name, true).getBoolean()) {
if (!allowed.containsKey(universalSingularity.name))
allowed.put(universalSingularity.name, new HashSet<>());
allowed.get(universalSingularity.name).add(universalSingularityWrapper.name);
}
});
singularities.add(new UniversalSingularityItem(universalSingularity.name, universalSingularity.singularities));
}
});
if (config.hasChanged())
config.save();
}
public final void preInit()
{
singularities.forEach(singularity -> GameRegistry.registerItem(singularity, "universal." + singularity.name + ".singularity"));
GameRegistry.registerItem(eternalSingularity, "eternalSingularity");
GameRegistry.registerItem(eternalSingularity, "eternal_singularity");
}
public void init() {}
public void init() {
}
public final void postInit()
{
if (!craftingOnly)
addToRecipeInput();
}
private void addToRecipeInput()
{
singularities.forEach(singularity -> {
for (int i = 0; i < singularity.universalSingularities.size(); i++) {
final UniversalSingularityWrapper universalSingularityWrapper = singularity.universalSingularities.get(i);
if (allowed.get(singularity.name).contains(universalSingularityWrapper.name)) {
final List<ItemStack> oreList = OreDictionary.getOres(universalSingularityWrapper.oreName, false);
if (oreList != null && !oreList.isEmpty()) {
CompressorManager.addOreRecipe(new ItemStack(singularity, 1, i), universalSingularityWrapper.recipeBaseValue, universalSingularityWrapper.oreName);
Grinder.catalyst.getInput().add(new ItemStack(singularity, 1, i));
}
}
}
});
}
public UniversalSingularityItem getSingularityByName(@Nonnull final String name)
{
for (final UniversalSingularityItem singularity : singularities)
if (singularity.name.equals(name))
return singularity;
return null;
Grinder.catalyst.getInput().add(new ItemStack(eternalSingularity, 1));
}
}