Baubles and stuff

This commit is contained in:
Vincent Lee committed 2015-12-30 20:56:50 -06:00
1 parent 5293f811c8
commit 1cf175d412
27 files changed
+194 -2

No files matched your search

@@ -90,6 +90,8 @@ import vazkii.botania.common.block.subtile.generating.SubTileThermalily;
import vazkii.botania.common.item.ItemManaGun;
import vazkii.botania.common.item.ItemSpawnerMover;
import vazkii.botania.common.item.brew.ItemBrewBase;
import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing;
import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick;
import vazkii.botania.common.item.relic.ItemInfiniteFruit;
import vazkii.botania.common.lib.LibBlockNames;
@@ -212,6 +214,28 @@ public final class ModelHandler {
: new ModelResourceLocation("botania:manasteelSword", "inventory");
}
});
ModelLoader.registerItemVariants(magnetRing,
new ModelResourceLocation("botania:magnetRingOn", "inventory"),
new ModelResourceLocation("botania:magnetRingOff", "inventory"));
ModelLoader.setCustomMeshDefinition(magnetRing, new ItemMeshDefinition() {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack) {
return ItemMagnetRing.getCooldown(stack) <= 0 ? new ModelResourceLocation("botania:magnetRingOn", "inventory")
: new ModelResourceLocation("botania:magnetRingOff", "inventory");
}
});
ModelLoader.registerItemVariants(magnetRingGreater,
new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory"),
new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory"));
ModelLoader.setCustomMeshDefinition(magnetRingGreater, new ItemMeshDefinition() {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack) {
return ItemMagnetRing.getCooldown(stack) <= 0 ? new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory")
: new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory");
}
});
}
private static void registerSubtiles() {
@@ -445,6 +469,29 @@ public final class ModelHandler {
registerItemModel(auraRingGreater);
registerItemModel(spark);
registerItemModel(waterRing);
registerItemModel(miningRing);
registerItemModel(reachRing);
registerItemModel(swapRing);
registerItemModel(pixieRing);
registerItemModel(travelBelt);
registerItemModel(superTravelBelt);
registerItemModel(speedUpBelt);
registerItemModel(knockbackBelt);
registerItemModel(itemFinder);
registerItemModel(monocle);
registerItemModel(icePendant);
registerItemModel(lavaPendant);
registerItemModel(superLavaPendant);
registerItemModel(holyCloak);
registerItemModel(unholyCloak);
registerItemModel(goldLaurel);
registerItemModel(flightTiara);
registerItemModel(divaCharm);
registerItemModel(manaMirror);
// magnet ring and greater version - custom mesher
registerItemModelAllMeta(flightTiara, ItemFlightTiara.WING_TYPES);
registerItemModelAllMeta(laputaShard, 20);
registerItemModelAllMeta(signalFlare, EnumDyeColor.values().length);
registerItemModelAllMeta(dye, EnumDyeColor.values().length);
@@ -85,7 +85,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
//public static IIcon[] wingIcons;
private static final int SUBTYPES = 8;
private static final int WING_TYPES = 9;
public static final int WING_TYPES = 9;
public ItemFlightTiara() {
super(LibItemNames.FLIGHT_TIARA);
@@ -86,7 +86,7 @@ public class ItemMagnetRing extends ItemBauble {
if(cooldown <= 0) {
if(player.isSneaking() == ConfigHandler.invertMagnetRing) {
double x = player.posX;
double y = player.posY -(player.worldObj.isRemote ? 1.62 : 0) + 0.75;
double y = player.posY + 0.75;
double z = player.posZ;
List<EntityItem> items = player.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - range, y - range, z - range, x + range, y + range, z + range));