mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-20 04:09:40 +00:00
Update forge and close #52
This commit is contained in:
1 parent
6d7fe40cd3
commit
b12cd80ad3
3 files changed
+7
-5
No files matched your search
@@ -51,7 +51,7 @@ import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class SpecialFlowerModel implements IModelCustomData {
|
||||
public class SpecialFlowerModel implements IModelCustomData<SpecialFlowerModel> {
|
||||
|
||||
// SpecialFlowerModel for when there are no blockModels registered for a subtile
|
||||
public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap.<Optional<String>, ModelResourceLocation>of(), ImmutableMap.<Optional<String>, ModelResourceLocation>of());
|
||||
|
||||
+5
-3
@@ -114,18 +114,20 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) {
|
||||
public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot, ModelBiped original) {
|
||||
if(ConfigHandler.enableArmorModels) {
|
||||
armorSlot--; // 1.8: mojang is dumb and made armorSlot 1-4 instead of 0-3.
|
||||
ModelBiped model = getArmorModelForSlot(entityLiving, itemStack, armorSlot);
|
||||
if(model == null)
|
||||
model = provideArmorModelForSlot(itemStack, armorSlot);
|
||||
|
||||
if(model != null)
|
||||
if(model != null) {
|
||||
model.setModelAttributes(original);
|
||||
return model;
|
||||
}
|
||||
}
|
||||
|
||||
return super.getArmorModel(entityLiving, itemStack, armorSlot);
|
||||
return super.getArmorModel(entityLiving, itemStack, armorSlot, original);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
Reference in new issue
Block a user