tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed vanilla texture not loading

Browse source
This commit is contained in:
Calclavia 2014-01-11 00:15:40 +08:00
parent ab24bb2746
commit 0f2ab328f9
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/resonantinduction/core/ResonantInduction.java
View file

@ -40,7 +40,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
*
* @author Calclavia
*/
@Mod(modid = ResonantInduction.ID, name = ResonantInduction.NAME, version = Reference.VERSION, dependencies = "required-after:CalclaviaCore;before:ThermalExpansion;before:IC2")
@Mod(modid = ResonantInduction.ID, name = ResonantInduction.NAME, version = Reference.VERSION, dependencies = "required-after:CalclaviaCore;before:IC2")
@NetworkMod(channels = Reference.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
@ModstatInfo(prefix = "resonantin")
public class ResonantInduction

6
src/main/java/resonantinduction/core/resource/ResourceGenerator.java
View file

@ -104,9 +104,7 @@ public class ResourceGenerator
if (iconString != null && !iconString.contains("MISSING_ICON_ITEM"))
{
iconString = iconString.contains(":") ? iconString.replace(":", ":" + Reference.ITEM_TEXTURE_DIRECTORY) + ".png" : "minecraft:" + Reference.ITEM_TEXTURE_DIRECTORY + iconString;
System.out.println("LOAD:" + iconString);
System.out.println(iconString);
iconString = (iconString.contains(":") ? iconString.replace(":", ":" + Reference.ITEM_TEXTURE_DIRECTORY) : Reference.ITEM_TEXTURE_DIRECTORY + iconString) + ".png";
ResourceLocation textureLocation = new ResourceLocation(iconString);
InputStream inputstream = Minecraft.getMinecraft().getResourceManager().getResource(textureLocation).getInputStream();
@ -140,7 +138,7 @@ public class ResourceGenerator
totalR /= colorCount;
totalG /= colorCount;
totalB /= colorCount;
int resultantColor = new Color(totalR, totalG, totalB).getRGB();
int resultantColor = new Color(totalR, totalG, totalB).brighter().getRGB();
materialColors.put(ingotName, resultantColor);
}