From 1cf175d41291d6eeef8e493c22c397ab74a7d642 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 30 Dec 2015 20:56:50 -0600 Subject: [PATCH] Baubles and stuff --- .../client/core/handler/ModelHandler.java | 47 +++++++++++++++++++ .../equipment/bauble/ItemFlightTiara.java | 2 +- .../item/equipment/bauble/ItemMagnetRing.java | 2 +- .../assets/botania/models/item/divaCharm.json | 6 +++ .../botania/models/item/flightTiara.json | 6 +++ .../botania/models/item/goldenLaurel.json | 6 +++ .../assets/botania/models/item/holyCloak.json | 6 +++ .../botania/models/item/icePendant.json | 6 +++ .../botania/models/item/itemFinder.json | 6 +++ .../botania/models/item/knockbackBelt.json | 6 +++ .../botania/models/item/lavaPendant.json | 6 +++ .../models/item/magnetRingGreaterOff.json | 6 +++ .../models/item/magnetRingGreaterOn.json | 6 +++ .../botania/models/item/magnetRingOff.json | 6 +++ .../botania/models/item/magnetRingOn.json | 6 +++ .../botania/models/item/manaMirror.json | 7 +++ .../botania/models/item/miningRing.json | 6 +++ .../assets/botania/models/item/monocle.json | 6 +++ .../assets/botania/models/item/pixieRing.json | 6 +++ .../assets/botania/models/item/reachRing.json | 6 +++ .../botania/models/item/speedUpBelt.json | 6 +++ .../botania/models/item/superLavaPendant.json | 6 +++ .../botania/models/item/superTravelBelt.json | 6 +++ .../assets/botania/models/item/swapRing.json | 6 +++ .../botania/models/item/travelBelt.json | 6 +++ .../botania/models/item/unholyCloak.json | 6 +++ .../assets/botania/models/item/waterRing.json | 6 +++ 27 files changed, 194 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/botania/models/item/divaCharm.json create mode 100644 src/main/resources/assets/botania/models/item/flightTiara.json create mode 100644 src/main/resources/assets/botania/models/item/goldenLaurel.json create mode 100644 src/main/resources/assets/botania/models/item/holyCloak.json create mode 100644 src/main/resources/assets/botania/models/item/icePendant.json create mode 100644 src/main/resources/assets/botania/models/item/itemFinder.json create mode 100644 src/main/resources/assets/botania/models/item/knockbackBelt.json create mode 100644 src/main/resources/assets/botania/models/item/lavaPendant.json create mode 100644 src/main/resources/assets/botania/models/item/magnetRingGreaterOff.json create mode 100644 src/main/resources/assets/botania/models/item/magnetRingGreaterOn.json create mode 100644 src/main/resources/assets/botania/models/item/magnetRingOff.json create mode 100644 src/main/resources/assets/botania/models/item/magnetRingOn.json create mode 100644 src/main/resources/assets/botania/models/item/manaMirror.json create mode 100644 src/main/resources/assets/botania/models/item/miningRing.json create mode 100644 src/main/resources/assets/botania/models/item/monocle.json create mode 100644 src/main/resources/assets/botania/models/item/pixieRing.json create mode 100644 src/main/resources/assets/botania/models/item/reachRing.json create mode 100644 src/main/resources/assets/botania/models/item/speedUpBelt.json create mode 100644 src/main/resources/assets/botania/models/item/superLavaPendant.json create mode 100644 src/main/resources/assets/botania/models/item/superTravelBelt.json create mode 100644 src/main/resources/assets/botania/models/item/swapRing.json create mode 100644 src/main/resources/assets/botania/models/item/travelBelt.json create mode 100644 src/main/resources/assets/botania/models/item/unholyCloak.json create mode 100644 src/main/resources/assets/botania/models/item/waterRing.json diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 1691f19f9..9fde0cc52 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 094a9d700..282d31e48 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index 62a0c1e42..6e2442e8c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -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 items = player.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - range, y - range, z - range, x + range, y + range, z + range)); diff --git a/src/main/resources/assets/botania/models/item/divaCharm.json b/src/main/resources/assets/botania/models/item/divaCharm.json new file mode 100644 index 000000000..c20e146c3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/divaCharm.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/divaCharm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flightTiara.json b/src/main/resources/assets/botania/models/item/flightTiara.json new file mode 100644 index 000000000..8b234b549 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flightTiara.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/flightTiara0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/goldenLaurel.json b/src/main/resources/assets/botania/models/item/goldenLaurel.json new file mode 100644 index 000000000..d2f97da5b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/goldenLaurel.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/goldenLaurel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/holyCloak.json b/src/main/resources/assets/botania/models/item/holyCloak.json new file mode 100644 index 000000000..1b8163e5f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/holyCloak.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/holyCloak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/icePendant.json b/src/main/resources/assets/botania/models/item/icePendant.json new file mode 100644 index 000000000..dbb2f45b9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/icePendant.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/icePendant" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemFinder.json b/src/main/resources/assets/botania/models/item/itemFinder.json new file mode 100644 index 000000000..bf6ab538d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemFinder.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/itemFinder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/knockbackBelt.json b/src/main/resources/assets/botania/models/item/knockbackBelt.json new file mode 100644 index 000000000..50c0779a7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/knockbackBelt.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/knockbackBelt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lavaPendant.json b/src/main/resources/assets/botania/models/item/lavaPendant.json new file mode 100644 index 000000000..3d1b8e25a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lavaPendant.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/lavaPendant" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetRingGreaterOff.json b/src/main/resources/assets/botania/models/item/magnetRingGreaterOff.json new file mode 100644 index 000000000..3154c59b4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magnetRingGreaterOff.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/magnetRingGreater1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetRingGreaterOn.json b/src/main/resources/assets/botania/models/item/magnetRingGreaterOn.json new file mode 100644 index 000000000..5c07378f9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magnetRingGreaterOn.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/magnetRingGreater0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetRingOff.json b/src/main/resources/assets/botania/models/item/magnetRingOff.json new file mode 100644 index 000000000..abaf8684e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magnetRingOff.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/magnetRing1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetRingOn.json b/src/main/resources/assets/botania/models/item/magnetRingOn.json new file mode 100644 index 000000000..4ab9474f1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magnetRingOn.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/magnetRing0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaMirror.json b/src/main/resources/assets/botania/models/item/manaMirror.json new file mode 100644 index 000000000..0171429d3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaMirror.json @@ -0,0 +1,7 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaMirror0", + "layer1": "botania:items/manaMirror1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/miningRing.json b/src/main/resources/assets/botania/models/item/miningRing.json new file mode 100644 index 000000000..243994e8f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/miningRing.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/miningRing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/monocle.json b/src/main/resources/assets/botania/models/item/monocle.json new file mode 100644 index 000000000..13eccda05 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/monocle.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/monocle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pixieRing.json b/src/main/resources/assets/botania/models/item/pixieRing.json new file mode 100644 index 000000000..1033fe8bf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pixieRing.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/pixieRing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/reachRing.json b/src/main/resources/assets/botania/models/item/reachRing.json new file mode 100644 index 000000000..912bf2073 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/reachRing.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/reachRing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/speedUpBelt.json b/src/main/resources/assets/botania/models/item/speedUpBelt.json new file mode 100644 index 000000000..39105b839 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/speedUpBelt.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/speedUpBelt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/superLavaPendant.json b/src/main/resources/assets/botania/models/item/superLavaPendant.json new file mode 100644 index 000000000..2e3f9e1d8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/superLavaPendant.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/superLavaPendant" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/superTravelBelt.json b/src/main/resources/assets/botania/models/item/superTravelBelt.json new file mode 100644 index 000000000..f0c5f2f11 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/superTravelBelt.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/superTravelBelt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/swapRing.json b/src/main/resources/assets/botania/models/item/swapRing.json new file mode 100644 index 000000000..003e659aa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/swapRing.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/swapRing" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/travelBelt.json b/src/main/resources/assets/botania/models/item/travelBelt.json new file mode 100644 index 000000000..8d5af6d86 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/travelBelt.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/travelBelt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/unholyCloak.json b/src/main/resources/assets/botania/models/item/unholyCloak.json new file mode 100644 index 000000000..a65a1145d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/unholyCloak.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/unholyCloak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/waterRing.json b/src/main/resources/assets/botania/models/item/waterRing.json new file mode 100644 index 000000000..211c95ee8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/waterRing.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/waterRing" + } +} \ No newline at end of file