Skip to content

Commit

Permalink
Fix modifiers on bows rendering with minimal stuff and bla
Browse files Browse the repository at this point in the history
  • Loading branch information
@bonii-xx
bonii-xx committed Sep 26, 2014
1 parent a36559b commit 5ff0c3d
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 33 deletions.
57 changes: 33 additions & 24 deletions src/main/java/tconstruct/items/tools/BowBase.java
View file
Expand Up @@ -262,6 +262,7 @@ public void registerIcons (IIconRegister iconRegister)
effectIcons2.clear();
effectIcons3.clear();
for(Map.Entry<Integer, String> entry : effectStrings.entrySet()) {
effectIcons.put(entry.getKey(), iconRegister.registerIcon(entry.getValue()));
effectIcons1.put(entry.getKey(), iconRegister.registerIcon(entry.getValue() + "_1"));
effectIcons2.put(entry.getKey(), iconRegister.registerIcon(entry.getValue() + "_2"));
effectIcons3.put(entry.getKey(), iconRegister.registerIcon(entry.getValue() + "_3"));
Expand Down Expand Up @@ -433,44 +434,52 @@ else if (renderPass == 3) // Extra
if (renderPass == getPartAmount())
{
if (tags.hasKey("Effect1"))
return getCorrectIcon(effectIcons, tags.getInteger("Effect1"));
return getCorrectIcon2(effectIcons, tags.getInteger("Effect1"));
}

else if (renderPass == getPartAmount() + 1)
{
if (tags.hasKey("Effect2"))
return getCorrectIcon(effectIcons, tags.getInteger("Effect2"));
return getCorrectIcon2(effectIcons, tags.getInteger("Effect2"));
}

else if (renderPass == getPartAmount() + 2)
{
if (tags.hasKey("Effect3"))
return getCorrectIcon(effectIcons, tags.getInteger("Effect3"));
return getCorrectIcon2(effectIcons, tags.getInteger("Effect3"));
}

else if (renderPass == getPartAmount() + 3)
{
if (tags.hasKey("Effect4"))
return getCorrectIcon(effectIcons, tags.getInteger("Effect4"));
return getCorrectIcon2(effectIcons, tags.getInteger("Effect4"));
}

else if (renderPass == getPartAmount() + 4)
{
if (tags.hasKey("Effect5"))
return getCorrectIcon(effectIcons, tags.getInteger("Effect5"));
return getCorrectIcon2(effectIcons, tags.getInteger("Effect5"));
}

else if (renderPass == getPartAmount() + 5)
{
if (tags.hasKey("Effect6"))
return getCorrectIcon(effectIcons, tags.getInteger("Effect6"));
return getCorrectIcon2(effectIcons, tags.getInteger("Effect6"));
}
}
return blankSprite;
}
return emptyIcon;
}

protected IIcon getCorrectIcon2(Map<Integer, IIcon> icons, int id)
{
if(!icons.containsKey(id))
return blankSprite;

return icons.get(id);
}

/* Animations */
@Override
public void registerPartPaths (int index, String[] location)
Expand Down Expand Up @@ -574,37 +583,37 @@ else if (renderPass == 3) // Extra
if (renderPass == getPartAmount())
{
if (tags.hasKey("Effect1"))
return getCorrectIcon(effectIcons1, tags.getInteger("Effect1"));
return getCorrectIcon2(effectIcons1, tags.getInteger("Effect1"));
}

else if (renderPass == getPartAmount() + 1)
{
if (tags.hasKey("Effect2"))
return getCorrectIcon(effectIcons1, tags.getInteger("Effect2"));
return getCorrectIcon2(effectIcons1, tags.getInteger("Effect2"));
}

else if (renderPass == getPartAmount() + 2)
{
if (tags.hasKey("Effect3"))
return getCorrectIcon(effectIcons1, tags.getInteger("Effect3"));
return getCorrectIcon2(effectIcons1, tags.getInteger("Effect3"));
}

else if (renderPass == getPartAmount() + 3)
{
if (tags.hasKey("Effect4"))
return getCorrectIcon(effectIcons1, tags.getInteger("Effect4"));
return getCorrectIcon2(effectIcons1, tags.getInteger("Effect4"));
}

else if (renderPass == getPartAmount() + 4)
{
if (tags.hasKey("Effect5"))
return getCorrectIcon(effectIcons1, tags.getInteger("Effect5"));
return getCorrectIcon2(effectIcons1, tags.getInteger("Effect5"));
}

else if (renderPass == getPartAmount() + 5)
{
if (tags.hasKey("Effect6"))
return getCorrectIcon(effectIcons1, tags.getInteger("Effect6"));
return getCorrectIcon2(effectIcons1, tags.getInteger("Effect6"));
}
else
{
Expand Down Expand Up @@ -651,37 +660,37 @@ else if (renderPass == 3) // Extra
if (renderPass == getPartAmount())
{
if (tags.hasKey("Effect1"))
return getCorrectIcon(effectIcons2, tags.getInteger("Effect1"));
return getCorrectIcon2(effectIcons2, tags.getInteger("Effect1"));
}

else if (renderPass == getPartAmount() + 1)
{
if (tags.hasKey("Effect2"))
return getCorrectIcon(effectIcons2, tags.getInteger("Effect2"));
return getCorrectIcon2(effectIcons2, tags.getInteger("Effect2"));
}

else if (renderPass == getPartAmount() + 2)
{
if (tags.hasKey("Effect3"))
return getCorrectIcon(effectIcons2, tags.getInteger("Effect3"));
return getCorrectIcon2(effectIcons2, tags.getInteger("Effect3"));
}

else if (renderPass == getPartAmount() + 3)
{
if (tags.hasKey("Effect4"))
return getCorrectIcon(effectIcons2, tags.getInteger("Effect4"));
return getCorrectIcon2(effectIcons2, tags.getInteger("Effect4"));
}

else if (renderPass == getPartAmount() + 4)
{
if (tags.hasKey("Effect5"))
return getCorrectIcon(effectIcons2, tags.getInteger("Effect5"));
return getCorrectIcon2(effectIcons2, tags.getInteger("Effect5"));
}

else if (renderPass == getPartAmount() + 5)
{
if (tags.hasKey("Effect6"))
return getCorrectIcon(effectIcons2, tags.getInteger("Effect6"));
return getCorrectIcon2(effectIcons2, tags.getInteger("Effect6"));
}
else
{
Expand Down Expand Up @@ -728,37 +737,37 @@ else if (renderPass == 3) // Extra
if (renderPass == getPartAmount())
{
if (tags.hasKey("Effect1"))
return getCorrectIcon(effectIcons3, tags.getInteger("Effect1"));
return getCorrectIcon2(effectIcons3, tags.getInteger("Effect1"));
}

else if (renderPass == getPartAmount() + 1)
{
if (tags.hasKey("Effect2"))
return getCorrectIcon(effectIcons3, tags.getInteger("Effect2"));
return getCorrectIcon2(effectIcons3, tags.getInteger("Effect2"));
}

else if (renderPass == getPartAmount() + 2)
{
if (tags.hasKey("Effect3"))
return getCorrectIcon(effectIcons3, tags.getInteger("Effect3"));
return getCorrectIcon2(effectIcons3, tags.getInteger("Effect3"));
}

else if (renderPass == getPartAmount() + 3)
{
if (tags.hasKey("Effect4"))
return getCorrectIcon(effectIcons3, tags.getInteger("Effect4"));
return getCorrectIcon2(effectIcons3, tags.getInteger("Effect4"));
}

else if (renderPass == getPartAmount() + 4)
{
if (tags.hasKey("Effect5"))
return getCorrectIcon(effectIcons3, tags.getInteger("Effect5"));
return getCorrectIcon2(effectIcons3, tags.getInteger("Effect5"));
}

else if (renderPass == getPartAmount() + 5)
{
if (tags.hasKey("Effect6"))
return getCorrectIcon(effectIcons3, tags.getInteger("Effect6"));
return getCorrectIcon2(effectIcons3, tags.getInteger("Effect6"));
}
else
{
Expand Down
16 changes: 7 additions & 9 deletions src/main/java/tconstruct/library/tools/ToolCore.java
View file
Expand Up @@ -215,16 +215,14 @@ public void registerIcons (IIconRegister iconRegister)

private void addIcons(HashMap<Integer, String> textures, HashMap<Integer, IIcon> icons, IIconRegister iconRegister, String standard)
{
// compatibility mode: no specific textures
if(PHConstruct.minimalTextures)
textures.clear();

icons.clear();
for(Map.Entry<Integer, String> entry : textures.entrySet())
{
if(TextureHelper.itemTextureExists(entry.getValue()))
icons.put(entry.getKey(), iconRegister.registerIcon(entry.getValue()));
}

if(!PHConstruct.minimalTextures) // compatibility mode: no specific textures
for(Map.Entry<Integer, String> entry : textures.entrySet())
{
if(TextureHelper.itemTextureExists(entry.getValue()))
icons.put(entry.getKey(), iconRegister.registerIcon(entry.getValue()));
}

if(standard != null && !standard.isEmpty()) {
standard = getDefaultTexturePath() + "/" + standard;
Expand Down

0 comments on commit 5ff0c3d

Please sign in to comment.