From 2a20460d3e952c5d71ba5d47de054758bb02f85d Mon Sep 17 00:00:00 2001 From: RCXcrafter Date: Mon, 31 Oct 2016 19:33:05 +0100 Subject: [PATCH] Remove some files Also more or less added the eternal singularity. --- .../EternalSingularityItem.java | 109 ++++++++----- .../UniversalSingularity.java | 24 --- .../UniversalSingularityItem.java | 54 ------- .../UniversalSingularityWrapper.java | 29 ---- .../eternalsingularity/proxy/ClientProxy.java | 6 +- .../eternalsingularity/proxy/CommonProxy.java | 153 +----------------- .../lang/en_US.lang | 0 .../shader/cosmic.frag | 0 .../shader/cosmic.vert | 0 .../textures/items/cosmic0.png | Bin .../textures/items/cosmic0.png.mcmeta | 0 .../textures/items/cosmic1.png | Bin .../textures/items/cosmic1.png.mcmeta | 0 .../textures/items/cosmic2.png | Bin .../textures/items/cosmic2.png.mcmeta | 0 .../textures/items/cosmic3.png | Bin .../textures/items/cosmic3.png.mcmeta | 0 .../textures/items/cosmic4.png | Bin .../textures/items/cosmic4.png.mcmeta | 0 .../textures/items/cosmic5.png | Bin .../textures/items/cosmic5.png.mcmeta | 0 .../textures/items/cosmic6.png | Bin .../textures/items/cosmic6.png.mcmeta | 0 .../textures/items/cosmic7.png | Bin .../textures/items/cosmic7.png.mcmeta | 0 .../textures/items/cosmic8.png | Bin .../textures/items/cosmic8.png.mcmeta | 0 .../textures/items/cosmic9.png | Bin .../textures/items/cosmic9.png.mcmeta | 0 .../textures/items/eternal_singularity.png} | Bin .../items/eternal_singularity.png.mcmeta} | 0 .../textures/items/eternal_singularity2.png | Bin 0 -> 1508 bytes .../items/eternal_singularity2.png.mcmeta} | 0 .../items/eternal_singularity_mask.png | Bin 0 -> 1445 bytes .../items/eternal_singularity_mask.png.mcmeta | 3 + .../items/eternalSingularity_cosmicMask2.png | Bin 3264 -> 0 bytes 36 files changed, 82 insertions(+), 296 deletions(-) delete mode 100644 src/main/java/singulariteam/eternalsingularity/UniversalSingularity.java delete mode 100644 src/main/java/singulariteam/eternalsingularity/UniversalSingularityItem.java delete mode 100644 src/main/java/singulariteam/eternalsingularity/UniversalSingularityWrapper.java rename src/main/resources/assets/{uiesingularities => eternalsingularity}/lang/en_US.lang (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/shader/cosmic.frag (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/shader/cosmic.vert (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic0.png (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic0.png.mcmeta (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic1.png (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic1.png.mcmeta (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic2.png (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic2.png.mcmeta (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic3.png (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic3.png.mcmeta (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic4.png (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic4.png.mcmeta (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic5.png (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic5.png.mcmeta (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic6.png (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic6.png.mcmeta (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic7.png (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic7.png.mcmeta (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic8.png (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic8.png.mcmeta (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic9.png (100%) rename src/main/resources/assets/{uiesingularities => eternalsingularity}/textures/items/cosmic9.png.mcmeta (100%) rename src/main/resources/assets/{uiesingularities/textures/items/eternalSingularity_cosmicMask.png => eternalsingularity/textures/items/eternal_singularity.png} (100%) rename src/main/resources/assets/{uiesingularities/textures/items/eternalSingularity_cosmicMask.mcmeta => eternalsingularity/textures/items/eternal_singularity.png.mcmeta} (100%) create mode 100644 src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity2.png rename src/main/resources/assets/{uiesingularities/textures/items/eternalSingularity_cosmicMask2.mcmeta => eternalsingularity/textures/items/eternal_singularity2.png.mcmeta} (100%) create mode 100644 src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity_mask.png create mode 100644 src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity_mask.png.mcmeta delete mode 100644 src/main/resources/assets/uiesingularities/textures/items/eternalSingularity_cosmicMask2.png diff --git a/src/main/java/singulariteam/eternalsingularity/EternalSingularityItem.java b/src/main/java/singulariteam/eternalsingularity/EternalSingularityItem.java index 3288984..ae857c3 100644 --- a/src/main/java/singulariteam/eternalsingularity/EternalSingularityItem.java +++ b/src/main/java/singulariteam/eternalsingularity/EternalSingularityItem.java @@ -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; + } } \ No newline at end of file diff --git a/src/main/java/singulariteam/eternalsingularity/UniversalSingularity.java b/src/main/java/singulariteam/eternalsingularity/UniversalSingularity.java deleted file mode 100644 index 2b829ed..0000000 --- a/src/main/java/singulariteam/eternalsingularity/UniversalSingularity.java +++ /dev/null @@ -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 singularities; - - public UniversalSingularity(@Nonnull final String name, @Nonnull final List singularities) - { - this.name = name; - this.singularities = singularities; - } -} \ No newline at end of file diff --git a/src/main/java/singulariteam/eternalsingularity/UniversalSingularityItem.java b/src/main/java/singulariteam/eternalsingularity/UniversalSingularityItem.java deleted file mode 100644 index 9b2c58e..0000000 --- a/src/main/java/singulariteam/eternalsingularity/UniversalSingularityItem.java +++ /dev/null @@ -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 universalSingularities; - - public UniversalSingularityItem(@Nonnull final String name, @Nonnull final List 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)); - } -} \ No newline at end of file diff --git a/src/main/java/singulariteam/eternalsingularity/UniversalSingularityWrapper.java b/src/main/java/singulariteam/eternalsingularity/UniversalSingularityWrapper.java deleted file mode 100644 index 0c2f419..0000000 --- a/src/main/java/singulariteam/eternalsingularity/UniversalSingularityWrapper.java +++ /dev/null @@ -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; - } -} \ No newline at end of file diff --git a/src/main/java/singulariteam/eternalsingularity/proxy/ClientProxy.java b/src/main/java/singulariteam/eternalsingularity/proxy/ClientProxy.java index aa6580a..967b261 100644 --- a/src/main/java/singulariteam/eternalsingularity/proxy/ClientProxy.java +++ b/src/main/java/singulariteam/eternalsingularity/proxy/ClientProxy.java @@ -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()); } } diff --git a/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java b/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java index a5fdb2a..6ab7c4b 100644 --- a/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java +++ b/src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java @@ -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 singularities = new ArrayList<>(); protected final EternalSingularityItem eternalSingularity = new EternalSingularityItem(); - - private final Map> allowed = new HashMap<>(); - //Base Values were Generated by random.org [Min: 65, Max: 95] public CommonProxy() { - final List 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 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)); } } diff --git a/src/main/resources/assets/uiesingularities/lang/en_US.lang b/src/main/resources/assets/eternalsingularity/lang/en_US.lang similarity index 100% rename from src/main/resources/assets/uiesingularities/lang/en_US.lang rename to src/main/resources/assets/eternalsingularity/lang/en_US.lang diff --git a/src/main/resources/assets/uiesingularities/shader/cosmic.frag b/src/main/resources/assets/eternalsingularity/shader/cosmic.frag similarity index 100% rename from src/main/resources/assets/uiesingularities/shader/cosmic.frag rename to src/main/resources/assets/eternalsingularity/shader/cosmic.frag diff --git a/src/main/resources/assets/uiesingularities/shader/cosmic.vert b/src/main/resources/assets/eternalsingularity/shader/cosmic.vert similarity index 100% rename from src/main/resources/assets/uiesingularities/shader/cosmic.vert rename to src/main/resources/assets/eternalsingularity/shader/cosmic.vert diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic0.png b/src/main/resources/assets/eternalsingularity/textures/items/cosmic0.png similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic0.png rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic0.png diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic0.png.mcmeta b/src/main/resources/assets/eternalsingularity/textures/items/cosmic0.png.mcmeta similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic0.png.mcmeta rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic0.png.mcmeta diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic1.png b/src/main/resources/assets/eternalsingularity/textures/items/cosmic1.png similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic1.png rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic1.png diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic1.png.mcmeta b/src/main/resources/assets/eternalsingularity/textures/items/cosmic1.png.mcmeta similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic1.png.mcmeta rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic1.png.mcmeta diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic2.png b/src/main/resources/assets/eternalsingularity/textures/items/cosmic2.png similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic2.png rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic2.png diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic2.png.mcmeta b/src/main/resources/assets/eternalsingularity/textures/items/cosmic2.png.mcmeta similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic2.png.mcmeta rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic2.png.mcmeta diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic3.png b/src/main/resources/assets/eternalsingularity/textures/items/cosmic3.png similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic3.png rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic3.png diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic3.png.mcmeta b/src/main/resources/assets/eternalsingularity/textures/items/cosmic3.png.mcmeta similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic3.png.mcmeta rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic3.png.mcmeta diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic4.png b/src/main/resources/assets/eternalsingularity/textures/items/cosmic4.png similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic4.png rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic4.png diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic4.png.mcmeta b/src/main/resources/assets/eternalsingularity/textures/items/cosmic4.png.mcmeta similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic4.png.mcmeta rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic4.png.mcmeta diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic5.png b/src/main/resources/assets/eternalsingularity/textures/items/cosmic5.png similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic5.png rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic5.png diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic5.png.mcmeta b/src/main/resources/assets/eternalsingularity/textures/items/cosmic5.png.mcmeta similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic5.png.mcmeta rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic5.png.mcmeta diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic6.png b/src/main/resources/assets/eternalsingularity/textures/items/cosmic6.png similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic6.png rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic6.png diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic6.png.mcmeta b/src/main/resources/assets/eternalsingularity/textures/items/cosmic6.png.mcmeta similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic6.png.mcmeta rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic6.png.mcmeta diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic7.png b/src/main/resources/assets/eternalsingularity/textures/items/cosmic7.png similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic7.png rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic7.png diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic7.png.mcmeta b/src/main/resources/assets/eternalsingularity/textures/items/cosmic7.png.mcmeta similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic7.png.mcmeta rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic7.png.mcmeta diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic8.png b/src/main/resources/assets/eternalsingularity/textures/items/cosmic8.png similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic8.png rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic8.png diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic8.png.mcmeta b/src/main/resources/assets/eternalsingularity/textures/items/cosmic8.png.mcmeta similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic8.png.mcmeta rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic8.png.mcmeta diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic9.png b/src/main/resources/assets/eternalsingularity/textures/items/cosmic9.png similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic9.png rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic9.png diff --git a/src/main/resources/assets/uiesingularities/textures/items/cosmic9.png.mcmeta b/src/main/resources/assets/eternalsingularity/textures/items/cosmic9.png.mcmeta similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/cosmic9.png.mcmeta rename to src/main/resources/assets/eternalsingularity/textures/items/cosmic9.png.mcmeta diff --git a/src/main/resources/assets/uiesingularities/textures/items/eternalSingularity_cosmicMask.png b/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity.png similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/eternalSingularity_cosmicMask.png rename to src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity.png diff --git a/src/main/resources/assets/uiesingularities/textures/items/eternalSingularity_cosmicMask.mcmeta b/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity.png.mcmeta similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/eternalSingularity_cosmicMask.mcmeta rename to src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity.png.mcmeta diff --git a/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity2.png b/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity2.png new file mode 100644 index 0000000000000000000000000000000000000000..02027541858a51a0291f205defa07f45bebcde5c GIT binary patch literal 1508 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!3-qz8@W<}ltQvckS_y6l_~>6Lo)-z&;LOB zB?CjL0RzLU1O^7H84L{K`IF+0x-l>?GX(gAxB~UKySsaMc!Y+ACMPEs6cp6e)%EoB z%$zxM`SRskw{8V07zLvtFkC|*=-c~$3=E76B|(0{|3@}p2>#9vEH@Z93p^r=85p>Q zK$!8;-MT+OLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33JwqdBmh3mcP}KEwaSXBW z_nj1-bU=ZFCAnt7&i}P9brPcM7d6|IJ$}5iYPE0U#!s^w9?WV|J~+ef%=4&hA*MA? zU%%O`temH_{r&I0yCU(w8MthhoVBT+?ezDh$qi1vwYQu(SNE(<3|Ty3=PIrZFREUg z6LsjGd8h6CE3Cgb5j^^Jhos7W(KFCQ4?lH~Vu^XmeTPY> zmfqVVxGU(R@6PA-3*tN)rq}KYZ1`)-euDjz_Iyc+S2Gmr_bhZRTOt-^JGZ(@zy6cv zbOlb+Q+$8xnl3Kwuqyq-aB_ix%e;Ne%{}{!matuR`D(+Iky$cV|H96_w^V=B%D%H# X`?^?L;$!?QP}cHv^>bP0l+XkK_@2rw literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/uiesingularities/textures/items/eternalSingularity_cosmicMask2.mcmeta b/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity2.png.mcmeta similarity index 100% rename from src/main/resources/assets/uiesingularities/textures/items/eternalSingularity_cosmicMask2.mcmeta rename to src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity2.png.mcmeta diff --git a/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity_mask.png b/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity_mask.png new file mode 100644 index 0000000000000000000000000000000000000000..c5ebce7087862f9ea3badacaca05aea484e44ec6 GIT binary patch literal 1445 zcmV;W1zP%vP)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm0017h0017h0cUq) z{{R308FWQhbW?9;ba!ELWdLwtX>N2bZe?^JG%heMF)~90YwQ331qMk(K~z{rwU^gQ zWI+&yeHwj>z3@4F5MRKYbo0S9PB$@}jh~w79r98017*Sy@|KTQJB1bBT6&c{#%G6d2+{OCgw&62i>P zOjT9Y+S=OC&=A_PcNuCy!u|dI(b3WQ`FSFd(5eU88Ugp0mzUT81cuCeC}98rT%t5F zG4U$}1R1B9897KpgJo1TgTN4aghUwFknUv4kr*?}TBZSB@THl+J9}ZnzAR@_f+uX@ zoHB{P%*0#93|V5{V_?7~G(-!cqKFpX>+9?4>S{|%OK1i;64Ke( z+11rWtT;wBx$slo*VotBz!00TA5dLcSy7!j2KDvz?d|P&Y-nf*LRSFzSXfvffG8zh z1+1bb<{@N8l*Ec-@bdCv{ouwO1ui*b=s{Ax`IQg?a@G%^wY7D9eVvw&<81w)1?qw{ zFw~NJ%nsl~qRluj;Ie>z$U(q?w40loHH1|TVldG?fPgCb0iHcIg$B*AxVWgGwd99F zM5(*G`{Lq)t4U{!3s1VVwS?*E>94OZmB!uO-R|x##{K>Mcnpcjjbth!T72K%-^a(t zV`F0-9UZKOHdG=u(7-XOnnYkoRZ}Sxxh4aUN6LX7$}~`yk_=4-yU>IqBO?a~2LuqM zL>N*_3mqF`B5n$9etw=T;TU{=esYaVkJZpXQ0SV42Gn^X$dB@&yvG71(m;y&m5VSx z1|z0@$P9tya12nDOXbnyI1BRCF4!wAT2WD@a!bO!F0MDM9!m&;ORiz)< zc1wfO#~Ozchq-w}VnzUihlht~ z@x8shNr$H8*R}EX1Cy+3CIscqY@C6LMU%lUOmVePKX8ardVhbXtE7--Lza4bd*|ln zxMQB4o^T8vA0K(I)XikYCB~R{sivle&;d-CXu5NMJLqszsLUbOgbZ*SSqjVBpk zYKna^KvnYyshxZ+!C2IRV<1W?pFW$+CyQs!6oQ(yxG6irutyPNzA*Rp_U!oyG|3mq zCXao6edKXtV}s`l12$xJe0*G2n+xs*J&hV#pq!@PAc|ywKOq*T4e8*3;>i9p>WJ$~t!)6-MFB=~${sB15+AK02lfd1mM z*gmEC4v+rl2*R^|z~J!kF!N*GjywcoO`V*a;22fSBQS)X--cOkjZA~Hvok69ZJfU} zFeG$7;iTa910YI!ABdhI9mltq{%r)B+un1Kem0RcT9>5R0fbr2nlSii-XK$41wVXmb#f00000NkvXXu0mjfW;LRz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity_mask.png.mcmeta b/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity_mask.png.mcmeta new file mode 100644 index 0000000..dd1bedb --- /dev/null +++ b/src/main/resources/assets/eternalsingularity/textures/items/eternal_singularity_mask.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation": {} +} diff --git a/src/main/resources/assets/uiesingularities/textures/items/eternalSingularity_cosmicMask2.png b/src/main/resources/assets/uiesingularities/textures/items/eternalSingularity_cosmicMask2.png deleted file mode 100644 index 3934f8ed54df1f89e983222aa61cc864848e8c01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3264 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 yonl4JW`nDkb}E0q8xtK&_I